-
+
{{::$ctrl.text}}
diff --git a/client/core/src/column-header/column-header.js b/client/core/src/column-header/column-header.js
index 2f5f4d3c3..4c52e7e3d 100644
--- a/client/core/src/column-header/column-header.js
+++ b/client/core/src/column-header/column-header.js
@@ -1,19 +1,25 @@
import {module} from '../module';
export default class ColumnHeader {
- constructor() {
+ constructor($attrs) {
this.order = undefined;
this.mouseIsOver = false;
+ this.orderLocked = ($attrs.orderLocked !== undefined);
}
onClick() {
- if (this.order === 'ASC') {
- this.order = 'DESC';
- } else {
- this.order = 'ASC';
+ if (!this.orderLocked) {
+ if (this.order === 'ASC') {
+ this.order = 'DESC';
+ } else {
+ this.order = 'ASC';
+ }
+ this.gridHeader.selectColum(this);
}
- this.gridHeader.selectColum(this);
}
showArrow(type) {
+ if (this.orderLocked)
+ return false;
+
let showArrow = (this.gridHeader && this.gridHeader.currentColumn && this.gridHeader.currentColumn.field === this.field && this.order === type);
let showOther = (this.gridHeader && this.gridHeader.currentColumn && this.gridHeader.currentColumn.field === this.field && this.order !== type);
if (type === 'DESC' && this.mouseIsOver && !showOther) {
@@ -22,13 +28,13 @@ export default class ColumnHeader {
return showArrow;
}
$onInit() {
- if (this.defaultOrder) {
+ if (this.defaultOrder && !this.orderLocked) {
this.order = this.defaultOrder;
this.onClick();
}
}
}
-ColumnHeader.$inject = [];
+ColumnHeader.$inject = ['$attrs'];
module.component('vnColumnHeader', {
template: require('./column-header.html'),
diff --git a/client/core/src/column-header/column-header.spec.js b/client/core/src/column-header/column-header.spec.js
index 5c6d29d73..48954826e 100644
--- a/client/core/src/column-header/column-header.spec.js
+++ b/client/core/src/column-header/column-header.spec.js
@@ -3,6 +3,7 @@ import './column-header.js';
describe('Component vnColumnHeader', () => {
let $componentController;
let controller;
+ let $attrs;
beforeEach(() => {
angular.mock.module('client');
@@ -10,7 +11,8 @@ describe('Component vnColumnHeader', () => {
beforeEach(angular.mock.inject(_$componentController_ => {
$componentController = _$componentController_;
- controller = $componentController('vnColumnHeader', {});
+ $attrs = {};
+ controller = $componentController('vnColumnHeader', {$attrs});
}));
describe('onClick()', () => {
diff --git a/client/core/src/datePicker/datePicker.html b/client/core/src/datePicker/datePicker.html
index d91f0a53f..21839aa16 100644
--- a/client/core/src/datePicker/datePicker.html
+++ b/client/core/src/datePicker/datePicker.html
@@ -4,7 +4,8 @@
ng-focus="$ctrl.hasFocus = true"
ng-blur="$ctrl.hasFocus = false"
ng-mouseenter="$ctrl.hasMouseIn = true"
- ng-mouseleave="$ctrl.hasMouseIn = false"
+ ng-mouseleave="$ctrl.hasMouseIn = false"
+ ng-click="$ctrl.onClick()"
>
{
});
describe('$onChanges()', () => {
- it(`should set the top css of the $element`, () => {
- let argumentObject = {show: true, top: {currentValue: 100}};
- spyOn(controller.$element, 'css');
- controller.$onChanges(argumentObject);
-
- expect(controller.$element.css).toHaveBeenCalledWith('top', '100px');
- });
-
it(`should set the width css of the $element`, () => {
let argumentObject = {show: true, itemWidth: {currentValue: 100}};
spyOn(controller.$element, 'css');
@@ -295,26 +287,40 @@ describe('Component vnDropDown', () => {
controller.selectItem(item);
expect(controller.selected).toEqual(item);
- expect(controller._show).toEqual(true);
+ expect(controller._show).not.toBeDefined();
});
});
describe('loadItems()', () => {
- it(`should set controller._show to true`, () => {
+ it(`should set controller.show to true`, () => {
+ controller.show = false;
+ controller.itemsFiltered = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
controller.loadItems();
- expect(controller._show).toEqual(true);
+ expect(controller.show).toEqual(true);
});
- it(`should call loadMore() and then set controller._show to true`, () => {
+ it(`should call loadMore() and then set controller._show to true if there are items`, () => {
controller.showLoadMore = () => {};
controller.loadMore = () => {};
spyOn(controller, 'loadMore');
+ controller.itemsFiltered = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
controller.loadItems();
expect(controller._show).toEqual(true);
expect(controller.loadMore).toHaveBeenCalledWith();
});
+
+ it(`should call loadMore() and then set controller._show to undefined if there are not items`, () => {
+ controller.showLoadMore = () => {};
+ controller.loadMore = () => {};
+ spyOn(controller, 'loadMore');
+ controller.itemsFiltered = [];
+ controller.loadItems();
+
+ expect(controller._show).not.toBeDefined();
+ expect(controller.loadMore).toHaveBeenCalledWith();
+ });
});
describe('$onInit()', () => {
diff --git a/client/core/src/grid-header/style.scss b/client/core/src/grid-header/style.scss
index cc983dcf1..324e488d1 100644
--- a/client/core/src/grid-header/style.scss
+++ b/client/core/src/grid-header/style.scss
@@ -2,7 +2,6 @@ vn-grid-header {
border-bottom: 3px solid #9D9D9D;
font-weight: bold;
.orderly{
- cursor: pointer;
text-align: center;
white-space: nowrap;
justify-content: center;
diff --git a/client/core/src/watcher/watcher.js b/client/core/src/watcher/watcher.js
index 2dbc5a2bc..d259f6f39 100644
--- a/client/core/src/watcher/watcher.js
+++ b/client/core/src/watcher/watcher.js
@@ -68,9 +68,9 @@ export default class Watcher extends Component {
*
* @param {String} state The state name
*/
- submitGo(state) {
+ submitGo(state, params) {
return this.submit().then(
- () => this.$state.go(state)
+ () => this.$state.go(state, params || {})
);
}
/**
diff --git a/client/core/src/watcher/watcher.spec.js b/client/core/src/watcher/watcher.spec.js
index 0ed342e31..7cd629cd8 100644
--- a/client/core/src/watcher/watcher.spec.js
+++ b/client/core/src/watcher/watcher.spec.js
@@ -100,11 +100,11 @@ describe('Component vnWatcher', () => {
it(`should call controller.$state.go() function after calling controllers submit() function`, done => {
spyOn(controller, 'submit').and.returnValue(Promise.resolve());
spyOn(controller.$state, 'go');
- let state = 'the state';
+ let state = 'the.State';
controller.submitGo(state)
.then(() => {
expect(controller.submit).toHaveBeenCalledWith();
- expect(controller.$state.go).toHaveBeenCalledWith(state);
+ expect(controller.$state.go).toHaveBeenCalledWith(state, {});
done();
});
});
diff --git a/client/production/src/production-table/production-table.js b/client/production/src/production-table/production-table.js
index 91c24314f..288118a0d 100644
--- a/client/production/src/production-table/production-table.js
+++ b/client/production/src/production-table/production-table.js
@@ -13,6 +13,8 @@ export class ProductionTable {
},
model: []
};
+ this.filteredField = null;
+ this.filteredReverse = null;
}
get checkAll() {
return this._checkAll;
@@ -21,7 +23,7 @@ export class ProductionTable {
this._checkAll = value;
}
set tickets(value) {
- this._tickets = value;
+ this._tickets = this.filteredField ? this.$filter('orderBy')(value, this.filteredField, this.filteredReverse) : value;
this.totalFilter = this._tickets.length;
this.pageTable.filter.page = 1;
this.pageTickets();
@@ -30,8 +32,9 @@ export class ProductionTable {
return this._tickets;
}
onOrder(field, order) {
- let reverse = order === 'DESC';
- this.tickets = this.$filter('orderBy')(this.tickets, field, reverse);
+ this.filteredField = field;
+ this.filteredReverse = order === 'DESC';
+ this.tickets = this.tickets; // call tickets setter
}
pageTickets() {
let init = (this.pageTable.filter.page - 1) * this.itemsDisplayedInList;
diff --git a/client/salix/src/components/left-menu/actions.js b/client/salix/src/components/left-menu/actions.js
index 4d4d6ee6d..30d379df1 100644
--- a/client/salix/src/components/left-menu/actions.js
+++ b/client/salix/src/components/left-menu/actions.js
@@ -9,7 +9,7 @@ export default class MenuActions {
switchItem() {
if (!this.items || !this.items.length) return;
- let stateName = this.$state.current.name.replace('create', 'list').replace('edit', 'list');
+ let stateName = this.$state.current.name.replace('.create', '.list').replace('.edit', '.list');
for (let i = 0; i < this.items.length; i++) {
this.items[i].active = (this.items[i].href === stateName);
diff --git a/client/salix/src/configroutes.js b/client/salix/src/configroutes.js
index 1d79c5bc2..e5ab72fb8 100644
--- a/client/salix/src/configroutes.js
+++ b/client/salix/src/configroutes.js
@@ -47,9 +47,8 @@ function config($stateProvider, $urlRouterProvider, aclServiceProvider, modulesF
for (let i = 0; i < count; i++) {
let route = fileRoutes[i];
if (aclService.routeHasPermission(route)) {
- $stateProvider.state(route.state, {
+ let configRoute = {
url: route.url,
- abstract: route.abstract || false,
template: `<${route.component} ${getParams(route)}>`,
resolve: {
loader: loader(moduleName, validations)
@@ -57,7 +56,13 @@ function config($stateProvider, $urlRouterProvider, aclServiceProvider, modulesF
data: {
routes: fileRoutes
}
- });
+ };
+ if (route.abstract)
+ configRoute.abstract = true;
+ if (route.routeParams)
+ configRoute.params = route.routeParams;
+
+ $stateProvider.state(route.state, configRoute);
} else if (route.state === mainModule.state) {
break;
}
diff --git a/services/auth/server/boot/routes.js b/services/auth/server/boot/routes.js
index 9aa76896b..3812a50fb 100644
--- a/services/auth/server/boot/routes.js
+++ b/services/auth/server/boot/routes.js
@@ -88,29 +88,4 @@ module.exports = function(app) {
User.logout(req.accessToken.id,
() => res.redirect('/'));
});
-
- app.get('/validateToken', function(req, res) {
- let token = req.headers.authorization;
-
- validateToken(token, function(isValid) {
- if (isValid) {
- res.status(200);
- } else {
- res.status(401).json({
- message: 'Invalid token'
- });
- }
- });
- });
-
- function validateToken(tokenId, cb) {
- app.models.AccessToken.findById(tokenId, function(err, token) {
- if (token) {
- token.validate(function (err, isValid) {
- cb(isValid === true, token);
- });
- } else
- cb(false);
- });
- }
};
diff --git a/services/client/common/methods/client/activate.js b/services/client/common/methods/client/activate.js
index 9d78d0d63..279baffbf 100644
--- a/services/client/common/methods/client/activate.js
+++ b/services/client/common/methods/client/activate.js
@@ -49,7 +49,7 @@ module.exports = function(Client) {
method: 'POST',
headers: {
'content-type': 'application/json',
- 'authorization': ctx.req.headers.authorization
+ 'Authorization': ctx.req.headers.authorization
},
json: {}
};
diff --git a/services/client/common/methods/client/before-save.js b/services/client/common/methods/client/before-save.js
index 470b7ba3f..b761a71f1 100644
--- a/services/client/common/methods/client/before-save.js
+++ b/services/client/common/methods/client/before-save.js
@@ -116,12 +116,7 @@ module.exports = function(Client) {
}
function maxCb(_, instances) {
- if (!instances) {
- done(generateErrorCredit());
- return;
- }
-
- if (instances.length !== 1 || instances[0].employeeFk == userId || instances[0].amount > 0) {
+ if (!instances || instances.length !== 1 || instances[0].employeeFk == userId || instances[0].amount > 0) {
done();
return;
}
diff --git a/services/client/common/methods/greuge/filter.js b/services/client/common/methods/greuge/filter.js
new file mode 100644
index 000000000..dba4e8ef6
--- /dev/null
+++ b/services/client/common/methods/greuge/filter.js
@@ -0,0 +1,20 @@
+module.exports = Self => {
+ Self.installMethod('filter', filterParams);
+
+ function filterParams(params) {
+ return {
+ where: {
+ clientFk: params.clientFk
+ },
+ skip: (params.page - 1) * params.size,
+ limit: params.size,
+ order: params.order || 'shipped DESC',
+ include: {
+ relation: "greugeType",
+ scope: {
+ fields: ["id", "name"]
+ }
+ }
+ };
+ }
+};
diff --git a/services/client/common/methods/greuge/totalGreuge.js b/services/client/common/methods/greuge/totalGreuge.js
new file mode 100644
index 000000000..849746493
--- /dev/null
+++ b/services/client/common/methods/greuge/totalGreuge.js
@@ -0,0 +1,34 @@
+module.exports = Self => {
+ Self.remoteMethod('sumAmount', {
+ description: 'returns sum greuge.ammount from client',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'clientFk',
+ http: {source: 'path'}
+ }],
+ returns: {
+ arg: 'sumAmount'
+ },
+ http: {
+ path: `/:id/sumAmount`,
+ verb: 'get'
+ }
+ });
+
+ Self.sumAmount = (clientFk, callback) => {
+ let query = `SELECT sum(amount) as sumAmount FROM vn.greuge WHERE clientFk = ?`;
+ Self.rawSql(query, [clientFk], callback).then(response => {
+ if (response.length) {
+ callback(null, response[0].sumAmount);
+ } else {
+ callback(null, 0);
+ }
+ })
+ .catch(reject => {
+ callback(reject, null);
+ });
+ };
+};
diff --git a/services/client/common/models/client-credit.js b/services/client/common/models/client-credit.js
new file mode 100644
index 000000000..7205be03e
--- /dev/null
+++ b/services/client/common/models/client-credit.js
@@ -0,0 +1,31 @@
+module.exports = function(Self) {
+ Self.installMethod('filter', filterParams, filterResults);
+
+ function filterParams(params) {
+ return {
+ where: {
+ clientFk: params.clientFk
+ },
+ skip: (params.page - 1) * params.size,
+ limit: params.size,
+ order: params.order || 'created DESC',
+ include: {
+ relation: "employee",
+ scope: {
+ fields: ["id", "name", "surname"]
+ }
+ }
+ };
+ }
+
+ function filterResults(instances) {
+ let result = JSON.parse(JSON.stringify(instances));
+ if (result && result.instances && result.instances.length) {
+ result.instances.forEach((element, i) => {
+ result.instances[i].employee.name = `${element.employee.name} ${element.employee.surname}`;
+ delete result.instances[i].employee.surname;
+ });
+ }
+ return result;
+ }
+};
diff --git a/services/client/common/models/client-credit.json b/services/client/common/models/client-credit.json
index f6512bfc7..26a1733ad 100644
--- a/services/client/common/models/client-credit.json
+++ b/services/client/common/models/client-credit.json
@@ -1,5 +1,5 @@
{
- "name": "ClientCredit",
+ "name": "clientCredit",
"base": "VnModel",
"validateUpsert": true,
"properties": {
diff --git a/services/client/common/models/greuge-type.json b/services/client/common/models/greuge-type.json
new file mode 100644
index 000000000..151aea5a6
--- /dev/null
+++ b/services/client/common/models/greuge-type.json
@@ -0,0 +1,14 @@
+{
+ "name": "greugeType",
+ "base": "VnModel",
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "Number",
+ "description": "Identifier"
+ },
+ "name": {
+ "type": "String"
+ }
+ }
+ }
\ No newline at end of file
diff --git a/services/client/common/models/greuge.js b/services/client/common/models/greuge.js
new file mode 100644
index 000000000..7bacecc4e
--- /dev/null
+++ b/services/client/common/models/greuge.js
@@ -0,0 +1,4 @@
+module.exports = function(Self) {
+ require('../methods/greuge/filter.js')(Self);
+ require('../methods/greuge/totalGreuge.js')(Self);
+};
diff --git a/services/client/common/models/greuge.json b/services/client/common/models/greuge.json
new file mode 100644
index 000000000..2c00f9f73
--- /dev/null
+++ b/services/client/common/models/greuge.json
@@ -0,0 +1,35 @@
+{
+ "name": "greuge",
+ "base": "VnModel",
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "Number",
+ "description": "Identifier"
+ },
+ "description": {
+ "type": "String"
+ },
+ "amount": {
+ "type": "Number"
+ },
+ "shipped": {
+ "type": "date"
+ },
+ "created": {
+ "type": "date"
+ }
+ },
+ "relations": {
+ "client": {
+ "type": "belongsTo",
+ "model": "Client",
+ "foreignKey": "clientFk"
+ },
+ "greugeType": {
+ "type": "belongsTo",
+ "model": "greugeType",
+ "foreignKey": "greugeTypeFk"
+ }
+ }
+ }
\ No newline at end of file
diff --git a/services/client/common/validations/validateDni.js b/services/client/common/validations/validateDni.js
index ab9008605..94b595f09 100644
--- a/services/client/common/validations/validateDni.js
+++ b/services/client/common/validations/validateDni.js
@@ -1,4 +1,7 @@
module.exports = fi => {
+ if (fi === undefined || fi === null) {
+ return true;
+ }
let dni = fi;
let getLetterDni = dni => {
const regExpDni = 'TRWAGMYFPDXBNJZSQVHLCKE';
diff --git a/services/client/server/model-config.json b/services/client/server/model-config.json
index 3c9c2199d..c95fb15c7 100644
--- a/services/client/server/model-config.json
+++ b/services/client/server/model-config.json
@@ -27,8 +27,8 @@
"Client": {
"dataSource": "vn"
},
- "ClientCredit": {
- "dataSource": "salix"
+ "clientCredit": {
+ "dataSource": "vn"
},
"ClientCreditLimit": {
"dataSource": "salix"
@@ -59,5 +59,11 @@
},
"CreditClassification": {
"dataSource": "salix"
+ },
+ "greuge": {
+ "dataSource": "vn"
+ },
+ "greugeType": {
+ "dataSource": "vn"
}
}
diff --git a/services/loopback/common/models/vn-model.js b/services/loopback/common/models/vn-model.js
index 3305cb67d..30f358204 100644
--- a/services/loopback/common/models/vn-model.js
+++ b/services/loopback/common/models/vn-model.js
@@ -130,7 +130,7 @@ module.exports = function(Self) {
};
};
- Self.installMethod = function(methodName, filterCb) {
+ Self.installMethod = function(methodName, filterCb, filterResult) {
this.remoteMethod(methodName, {
description: 'List items using a filter',
accessType: 'READ',
@@ -161,8 +161,12 @@ module.exports = function(Self) {
var response = {};
function returnValues() {
- if (response.instances !== undefined && response.count !== undefined)
- cb(null, response);
+ if (response.instances !== undefined && response.count !== undefined) {
+ if (filterResult)
+ cb(null, filterResult(response));
+ else
+ cb(null, response);
+ }
}
function error() {
diff --git a/services/mailer/application/auth.js b/services/mailer/application/auth.js
index ee8f114e1..7e9457537 100644
--- a/services/mailer/application/auth.js
+++ b/services/mailer/application/auth.js
@@ -1,4 +1,5 @@
var database = require('./database.js');
+let config = require('./config.js');
module.exports = {
@@ -31,7 +32,23 @@ module.exports = {
if (this.isTokenExpired(token.created, token.ttl))
return this.response.status(401).send({message: 'Token expired'});
- this.request.userId = token.userId;
+ // Set proxy host
+ let host = this.request.headers.host.split(':')[0];
+ let proxy;
+
+ if (host == '127.0.0.1')
+ proxy = config.proxy.localhost;
+ else if (process.env.NODE_ENV == 'production')
+ proxy = config.proxy.salix;
+ else if (process.env.NODE_ENV == 'development')
+ proxy = config.proxy.testSalix;
+
+ this.request.proxyHost = `http://${proxy.host}:${proxy.port}`;
+ this.request.user = {
+ id: token.userId,
+ token: this.getToken()
+ }
+
this.next();
});
},
diff --git a/services/mailer/application/config.js b/services/mailer/application/config.js
new file mode 100644
index 000000000..1442e85ed
--- /dev/null
+++ b/services/mailer/application/config.js
@@ -0,0 +1,18 @@
+var path = require('path');
+var fs = require('fs');
+var config = {};
+
+let devConfigPath = path.join(__dirname, '/config/datasources.development.json');
+let configPath = path.join(__dirname, '/config/datasources.json');
+
+try {
+ config = Object.assign(require(configPath), require(devConfigPath));
+} catch (e) {
+ if (e.code == 'MODULE_NOT_FOUND')
+ config = require(configPath);
+}
+
+config.proxy = require('../../nginx/config.json');
+config.package = require('../package.json');
+
+module.exports = config;
\ No newline at end of file
diff --git a/services/mailer/application/config/app.json b/services/mailer/application/config/app.json
deleted file mode 100644
index c9ec4174b..000000000
--- a/services/mailer/application/config/app.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "name": "MailServer",
- "version": "1.0.0",
- "port": 3003,
- "debug": false,
- "defaultLanguage": "es",
- "senderMail": "noreply@localhost",
- "senderName": ""
-}
\ No newline at end of file
diff --git a/services/mailer/application/config/app.test.json b/services/mailer/application/config/app.test.json
deleted file mode 100644
index c9ec4174b..000000000
--- a/services/mailer/application/config/app.test.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "name": "MailServer",
- "version": "1.0.0",
- "port": 3003,
- "debug": false,
- "defaultLanguage": "es",
- "senderMail": "noreply@localhost",
- "senderName": ""
-}
\ No newline at end of file
diff --git a/services/mailer/application/config/datasources.json b/services/mailer/application/config/datasources.json
new file mode 100644
index 000000000..69943439d
--- /dev/null
+++ b/services/mailer/application/config/datasources.json
@@ -0,0 +1,29 @@
+{
+ "app": {
+ "port": 3003,
+ "debug": false,
+ "defaultLanguage": "es",
+ "senderMail": "noreply@localhost",
+ "senderName": ""
+ },
+ "mysql": {
+ "host": "localhost",
+ "port": 3306,
+ "user": "reports",
+ "password": "",
+ "database": ""
+ },
+ "smtp": {
+ "host": "localhost",
+ "port": 465,
+ "secure": true,
+ "auth": {
+ "user": "noreply",
+ "pass": ""
+ },
+ "tls": {
+ "rejectUnauthorized": false
+ },
+ "pool": true
+ }
+}
\ No newline at end of file
diff --git a/services/mailer/application/config/datasources.test.json b/services/mailer/application/config/datasources.test.json
new file mode 100644
index 000000000..69943439d
--- /dev/null
+++ b/services/mailer/application/config/datasources.test.json
@@ -0,0 +1,29 @@
+{
+ "app": {
+ "port": 3003,
+ "debug": false,
+ "defaultLanguage": "es",
+ "senderMail": "noreply@localhost",
+ "senderName": ""
+ },
+ "mysql": {
+ "host": "localhost",
+ "port": 3306,
+ "user": "reports",
+ "password": "",
+ "database": ""
+ },
+ "smtp": {
+ "host": "localhost",
+ "port": 465,
+ "secure": true,
+ "auth": {
+ "user": "noreply",
+ "pass": ""
+ },
+ "tls": {
+ "rejectUnauthorized": false
+ },
+ "pool": true
+ }
+}
\ No newline at end of file
diff --git a/services/mailer/application/config/mysql.json b/services/mailer/application/config/mysql.json
deleted file mode 100644
index ddfd88bed..000000000
--- a/services/mailer/application/config/mysql.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "host": "localhost",
- "port": 3306,
- "user": "reports",
- "password": "",
- "database": ""
-}
\ No newline at end of file
diff --git a/services/mailer/application/config/mysql.test.json b/services/mailer/application/config/mysql.test.json
deleted file mode 100644
index 5b00829b3..000000000
--- a/services/mailer/application/config/mysql.test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "host": "localhost",
- "port": 3306,
- "user": "root",
- "password": "",
- "database": "vn"
-}
\ No newline at end of file
diff --git a/services/mailer/application/config/smtp.json b/services/mailer/application/config/smtp.json
deleted file mode 100644
index 1ffa81024..000000000
--- a/services/mailer/application/config/smtp.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "host": "localhost",
- "port": 465,
- "secure": true,
- "auth": {
- "user": "noreply",
- "pass": ""
- },
- "tls": {
- "rejectUnauthorized": false
- },
- "pool": true
-}
\ No newline at end of file
diff --git a/services/mailer/application/database.js b/services/mailer/application/database.js
index 53ce363f8..4fe4a0ba9 100644
--- a/services/mailer/application/database.js
+++ b/services/mailer/application/database.js
@@ -1,5 +1,5 @@
var mysql = require('mysql');
-let settings = require('./settings.js');
+let config = require('./config.js');
module.exports = {
/**
@@ -11,12 +11,12 @@ module.exports = {
* Start database pool
*/
init: function() {
- this.pool = mysql.createPool(settings.mysql());
+ this.pool = mysql.createPool(config.mysql);
this.pool.getConnection(function(error, connection) {
if (error) {
throw new Error('Can\'t connect to database: ' + error.code);
- } else if (settings.app().debug) {
+ } else if (config.app.debug) {
console.log('Database connection stablished');
}
});
@@ -27,7 +27,7 @@ module.exports = {
*/
testEmail: function() {
this.pool.query('SELECT fakeEmail as email FROM vn.config', function(error, qryRs) {
- settings.testEmail = qryRs[0].email;
+ config.smtp.testEmail = qryRs[0].email;
});
}
};
diff --git a/services/mailer/application/locale.js b/services/mailer/application/locale.js
index 496d48bb8..f9737fea3 100644
--- a/services/mailer/application/locale.js
+++ b/services/mailer/application/locale.js
@@ -1,5 +1,5 @@
var fs = require('fs');
-var settings = require('./settings.js');
+var config = require('./config.js');
var path = require('path');
module.exports = {
@@ -11,7 +11,7 @@ module.exports = {
*/
load: function(template, countryCode, cb) {
var localeFile = path.join(__dirname, 'template', `${template}`, 'locale', `${countryCode}.json`);
- var defaultLocaleFile = path.join(__dirname, 'template', `${template}`, 'locale', `${settings.app().defaultLanguage}.json`);
+ var defaultLocaleFile = path.join(__dirname, 'template', `${template}`, 'locale', `${config.app.defaultLanguage}.json`);
fs.stat(localeFile, (error, stats) => {
if (error) {
diff --git a/services/mailer/application/mail.js b/services/mailer/application/mail.js
index 4807157a9..3980e5128 100644
--- a/services/mailer/application/mail.js
+++ b/services/mailer/application/mail.js
@@ -1,5 +1,5 @@
var nodemailer = require('nodemailer');
-var settings = require('./settings.js');
+var config = require('./config.js');
var template = require('./template.js');
var database = require('./database.js');
@@ -9,15 +9,15 @@ var database = require('./database.js');
module.exports = {
transporter: null,
/**
- * Load mail settings.
+ * Load mail config.
*/
init: function() {
- this.transporter = nodemailer.createTransport(settings.smtp());
+ this.transporter = nodemailer.createTransport(config.smtp);
this.transporter.verify(function(error, success) {
if (error) {
throw new Error(error);
- } else if (settings.app().debug) {
+ } else if (config.app.debug) {
console.log('SMTP connection stablished');
}
});
@@ -34,15 +34,15 @@ module.exports = {
*/
send: function(recipient, subject, body, attachments, params, cb) {
let mailOptions = {
- from: '"' + settings.app().senderName + '" <' + settings.app().senderMail + '>',
+ from: '"' + config.app.senderName + '" <' + config.app.senderMail + '>',
to: recipient,
subject: subject,
html: body,
attachments
};
- if (settings.app().debug) {
- mailOptions.to = settings.testEmail;
+ if (config.app.debug) {
+ mailOptions.to = config.smtp.testEmail;
}
this.transporter.sendMail(mailOptions, (error, info) => {
@@ -53,7 +53,7 @@ module.exports = {
if (error)
return cb(new Error('Email not sent: ' + error));
- if (settings.app().debug)
+ if (config.app.debug)
console.log('Mail sent ' + info.messageId + ' [' + info.response + ']');
cb();
@@ -70,10 +70,16 @@ module.exports = {
* @param {Object} cb - Callback
*/
sendWithTemplate: function(tplName, params, cb) {
- template.get(tplName, params, false, (error, result) => {
+ template.get(tplName, params, (error, result) => {
if (error)
return cb(error);
+ // Custom attachments
+ if (params.attachments)
+ params.attachments.forEach(function(attachment) {
+ result.attachments.push(attachment);
+ });
+
this.send(result.recipient, result.subject, result.body, result.attachments, params, error => {
if (error)
return cb(error);
@@ -96,10 +102,10 @@ module.exports = {
log: function(senderId, recipientId, sender, subject, body, plainTextBody, status) {
let qry = `INSERT INTO mail(senderFk, recipientFk, sender, replyTo, subject, body, plainTextBody, sent, status)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`;
- let qryParams = [senderId, recipientId, sender, settings.app().senderMail, subject, body, plainTextBody, 1, status];
+ let qryParams = [senderId, recipientId, sender, config.app.senderMail, subject, body, plainTextBody, 1, status];
database.pool.query(qry, qryParams, function(error, result) {
- if (settings.app().debug && error)
+ if (config.app.debug && error)
console.log('Mail log: ' + error);
});
}
diff --git a/services/mailer/application/route/manuscript.js b/services/mailer/application/route/manuscript.js
deleted file mode 100644
index b8c54d43b..000000000
--- a/services/mailer/application/route/manuscript.js
+++ /dev/null
@@ -1,85 +0,0 @@
-var express = require('express');
-var router = new express.Router();
-var mail = require('../mail.js');
-var template = require('../template.js');
-var httpRequest = require('request');
-
-// Payment method changes
-router.post('/payment-update/:clientId', function(request, response, next) {
- mail.sendWithTemplate('payment-update', {recipient: request.params.clientId}, error => {
- if (error)
- return response.status(400).json({message: error.message});
-
- return response.json();
- });
-});
-
-// Printer setup
-router.post('/printer-setup/:clientId', function(request, response, next) {
- mail.sendWithTemplate('printer-setup', {recipient: request.params.clientId}, error => {
- if (error)
- return response.status(400).json({message: error.message});
-
- return response.json();
- });
-});
-
-// Printer setup preview
-router.get('/printer-setup/:clientId', function(request, response, next) {
- template.get('printer-setup', {recipient: request.params.clientId}, true, (error, result) => {
- if (error)
- return response.status(400).json({message: error.message});
-
- response.send(result.body);
- });
-});
-
-// Client welcome
-router.post('/client-welcome/:clientId', function(request, response, next) {
- mail.sendWithTemplate('client-welcome', {recipient: request.params.clientId}, error => {
- if (error)
- return response.status(400).json({message: error.message});
-
- return response.json();
- });
-});
-
-// Client welcome preview
-router.get('/client-welcome/:clientId', function(request, response, next) {
- template.get('client-welcome', {recipient: request.params.clientId}, true, (error, result) => {
- if (error)
- return response.status(400).json({message: error.message});
-
- response.send(result.body);
- });
-});
-
-// Sepa core
-/* router.post('/sepa-core/:clientId', function(request, response, next) {
- var options = {
- url: 'http://localhost:3008/manuscript/sepa-core/7422',
- method: 'POST',
- headers: {
- 'authorization': request.headers.authorization
- }
- }
-
- let httpStream = httpRequest(options, function(error, httpResponse, body) {
- if (error)
- return response.status(400).json({message: httpResponse.message});
- });
-
- if (httpStream)
- mail.send('joan@verdnatura.es', 'Correu de prova', 'test message', [{filename: 'test.pdf', content: httpStream}], function(error, result) {
- if (error)
- return response.status(400).json({message: error.message});
- });
- /* mail.sendWithTemplate('sepa-core', {recipient: request.params.clientId}, error => {
- if (error)
- return response.status(400).json({message: error.message});
-
- return response.json();
- });
-}); */
-
-module.exports = router;
diff --git a/services/mailer/application/route/notification.js b/services/mailer/application/route/notification.js
index d33f6f07b..bd7a81f11 100644
--- a/services/mailer/application/route/notification.js
+++ b/services/mailer/application/route/notification.js
@@ -1,8 +1,92 @@
var express = require('express');
var router = new express.Router();
+var config = require('../config.js');
var mail = require('../mail.js');
-var database = require('../database.js');
-var settings = require('../settings.js');
+var template = require('../template.js');
+var httpRequest = require('request');
+
+
+// Printer setup
+router.post('/printer-setup/:clientId', function(request, response) {
+ mail.sendWithTemplate('printer-setup', {clientId: request.params.clientId}, error => {
+ if (error)
+ return response.status(400).json({message: error.message});
+
+ return response.json();
+ });
+});
+
+// Printer setup preview
+router.get('/printer-setup/:clientId', function(request, response) {
+ template.get('printer-setup', {clientId: request.params.clientId, isPreview: true}, (error, result) => {
+ if (error)
+ return response.status(400).json({message: error.message});
+
+ response.send(result.body);
+ });
+});
+
+// Client welcome
+router.post('/client-welcome/:clientId', function(request, response) {
+ mail.sendWithTemplate('client-welcome', {clientId: request.params.clientId}, error => {
+ if (error)
+ return response.status(400).json({message: error.message});
+
+ return response.json();
+ });
+});
+
+// Client welcome preview
+router.get('/client-welcome/:clientId', function(request, response) {
+ template.get('client-welcome', {clientId: request.params.clientId, isPreview: true}, (error, result) => {
+ if (error)
+ return response.status(400).json({message: error.message});
+
+ response.send(result.body);
+ });
+});
+
+// Client SEPA CORE
+router.post('/sepa-core/:clientId', function(request, response) {
+ let path = `${request.proxyHost}/print/manuscript/sepa-core/${request.params.clientId}`;
+ let options = {
+ url: path,
+ method: 'GET',
+ headers: {
+ 'Authorization': request.headers.authorization
+ }
+ }
+
+ let httpStream = httpRequest(options, function(error, httpResponse, body) {
+ if (error || httpResponse.statusCode != 200)
+ return response.status(400).json({message: error.message});
+ });
+
+ if (httpStream)
+ mail.sendWithTemplate('sepa-core', {
+ clientId: request.params.clientId,
+ attachments: [{filename: 'sepa-core.pdf', content: httpStream}]
+ }, error => {
+ if (error)
+ return response.status(400).json({message: error.message});
+
+ return response.json();
+ });
+});
+
+// Client SEPA CORE preview
+router.get('/sepa-core/:clientId', function(request, response) {
+ template.get('sepa-core', {
+ clientId: request.params.clientId,
+ token: request.user.token,
+ isPreview: true
+ }, (error, result) => {
+ if (error)
+ return response.status(400).json({message: error.message});
+
+ response.send(result.body);
+ });
+});
// Single user notification
/* router.post('/:recipient/noticeUserSend', function(request, response) {
@@ -64,6 +148,16 @@ var settings = require('../settings.js');
});
}); */
+// Payment method changes
+router.post('/payment-update/:clientId', function(request, response) {
+ mail.sendWithTemplate('payment-update', {clientId: request.params.clientId}, error => {
+ if (error)
+ return response.status(400).json({message: error.message});
+
+ return response.json();
+ });
+});
+
// Send notification to alias creditInsurance on client deactivate
router.post('/client-deactivate/:clientId', function(request, response) {
var params = {
diff --git a/services/mailer/application/router.js b/services/mailer/application/router.js
index b51b8a195..ed5794bbe 100644
--- a/services/mailer/application/router.js
+++ b/services/mailer/application/router.js
@@ -1,15 +1,11 @@
var express = require('express');
var router = new express.Router();
-var settings = require('./settings.js');
// Mailer default page
router.get('/', function(request, response) {
response.json({});
});
-// Manuscripts
-router.use('/manuscript', require('./route/manuscript.js'));
-
// Notifications
router.use('/notification', require('./route/notification.js'));
diff --git a/services/mailer/application/settings.js b/services/mailer/application/settings.js
deleted file mode 100644
index 3858cf719..000000000
--- a/services/mailer/application/settings.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var path = require('path');
-/**
- * Módulo de configuración
- */
-module.exports = {
- /**
- * Obtiene la configuración en función del entorno en el que se está
- * ejecutando la aplicación.
- * @param {String} name Nombre del fichero
- * @return {Object} Objeto de configuración
- */
- getConfig: function(name) {
- let env = process.env.NODE_ENV;
-
- if (!env)
- env = 'development';
-
- return require(path.join(__dirname, 'config', `${name}.${env}.json`));
- },
- /**
- * Configuración de la aplicación
- * @return {Object} Objeto de configuración app
- */
- app: function() {
- return this.getConfig('app');
- },
- /**
- * Configuración de smtp
- * @return {Object} Objeto de configuración smtp
- */
- smtp: function() {
- return this.getConfig('smtp');
- },
- /**
- * Configuración de mysql
- * @return {Object} Objeto de configuración MySQL
- */
- mysql: function() {
- return this.getConfig('mysql');
- },
-
- testEmail: function() {
- return this.getConfig('app').testEmail;
- }
-};
diff --git a/services/mailer/application/template.js b/services/mailer/application/template.js
index 382b7202d..d2c13f222 100644
--- a/services/mailer/application/template.js
+++ b/services/mailer/application/template.js
@@ -1,8 +1,8 @@
var fs = require('fs');
var mustache = require('mustache');
var locale = require('./locale.js');
-var path = require('path');
var inlineCss = require('inline-css');
+var path = require('path');
module.exports = {
/**
@@ -12,10 +12,10 @@ module.exports = {
* @param {Object} params - Params
* @param {Object} cb - Callback
*/
- get: function(template, params, isPreview, cb) {
+ get: function(template, params, cb) {
var templatePath = path.join(__dirname, 'template', `${template}`, `index.html`);
var classPath = path.join(__dirname, 'template', `${template}`, `${template}.js`);
- var stylePath = path.join(__dirname, '../static', 'css', 'style.css');
+ var stylePath = path.join(__dirname, 'template', `${template}`, 'static', 'css', 'style.css');
fs.stat(templatePath, (error, stat) => {
if (error)
@@ -24,14 +24,26 @@ module.exports = {
let TemplateClass = require(classPath);
let instance = new TemplateClass();
- let getRenderedStyles = body => {
+ let getRenderedStyles = (error, body) => {
+ if (error)
+ return cb(error);
+
this.renderStyles(stylePath, body, (error, body) => {
+ if (error)
+ return cb(error);
+
+ // Check if has a subject param
params.subject = params.subject || instance.subject;
- if (params.subject == undefined)
- params.subject = body.match(new RegExp('(.*?) ', 'i'))[1];
+ if (params.subject == undefined) {
+ // Try to find a subject from Html source
+ let title = body.match(new RegExp('(.*?) ', 'i'));
- this.getAttachments(template, body, isPreview, (error, result) => {
+ if (title)
+ params.subject = title[1];
+ }
+
+ this.getAttachments(template, body, params.isPreview, (error, result) => {
if (error)
return cb(error);
@@ -41,7 +53,7 @@ module.exports = {
};
let getDataCb = () => {
- this.render(templatePath, instance, (error, result) => getRenderedStyles(result));
+ this.render(templatePath, instance, (error, result) => getRenderedStyles(error, result));
};
instance.getData(params, (error, result) => {
@@ -66,9 +78,54 @@ module.exports = {
* @param {Object} cb - Callback
*/
render: function(path, data, cb) {
- fs.readFile(path, 'utf8', function(error, body) {
- mustache.parse(body);
- cb(null, mustache.render(body, data));
+ fs.readFile(path, 'utf8', (error, body) => {
+ // Find matching sub-templates
+ let regexp = new RegExp(/\{\{\$\.(.*?)\}\}/, 'ig');
+ let subTpl = body.match(regexp);
+
+ if (!subTpl) {
+ mustache.parse(body);
+ return cb(null, mustache.render(body, data));
+ }
+
+ let parentBody = body;
+ this.renderSub(parentBody, subTpl, data, regexp, (error, body) => {
+ if (error)
+ return cb(error);
+
+ mustache.parse(body);
+ cb(null, mustache.render(body, data));
+ });
+ });
+ },
+
+/**
+ * Render sub-template
+ * @param {String} body - Raw body
+ * @param {Object} subTpl - Sub-template name
+ * @param {Object} data - Params
+ * @param {Object} regexp - Regexp
+ * @param {Object} cb - Callback
+ */
+ renderSub: function(body, subTpl, data, regexp, cb) {
+ let index = 1;
+
+ subTpl.forEach(keyName => {
+ subTplName = keyName.replace(regexp, '$1');
+
+ this.get(subTplName, data, (error, result) => {
+ if (error)
+ return cb(error);
+
+ let subTplBody = result.body;
+ body = body.replace(keyName, subTplBody);
+
+ if (index === subTpl.length)
+ cb(null, body);
+
+ index++;
+ });
+
});
},
@@ -78,18 +135,25 @@ module.exports = {
* @param {String} body - Rendered html
* @param {Object} cb - Callback
*/
- renderStyles: function(path, html, cb) {
- fs.stat(path, error => {
- if (error) return cb(new Error('Template stylesheet not found'));
- fs.readFile(path, 'utf8', (error, css) => {
- let style = '';
- let body = style + html;
- let options = {url: ' '};
+ renderStyles: function(stylePath, html, cb) {
+ // Common components
+ let comPath = path.join(__dirname, '../', 'static', 'css', 'component.css');
- inlineCss(body, options)
- .then(function(body) {
- cb(null, body);
- });
+ fs.readFile(comPath, 'utf8', (error, comCss) => {
+ fs.stat(stylePath, error => {
+ if (error)
+ return cb(new Error('Template stylesheet not found'));
+
+ fs.readFile(stylePath, 'utf8', (error, css) => {
+ let style = '';
+ let body = style + html;
+ let options = {url: ' '};
+
+ inlineCss(body, options)
+ .then(function(body) {
+ cb(null, body);
+ });
+ });
});
});
},
@@ -104,6 +168,9 @@ module.exports = {
let attachments = [];
let tplAttachments = body.match(new RegExp('src="cid:(.*?)"', 'ig'));
+ if (!tplAttachments)
+ tplAttachments = {};
+
// Template default attachments
for (var i = 0; i < tplAttachments.length; i++) {
let name = tplAttachments[i].replace('src="cid:', '').replace('"', '');
@@ -125,7 +192,7 @@ module.exports = {
fs.stat(attachmentsPath, (error, stats) => {
if (error)
- return cb(new Error(`Could not load attachments.js from template ${template}`));
+ return cb(null, {body: body, attachments: attachments});
let attachObj = require(attachmentsPath);
@@ -145,10 +212,10 @@ module.exports = {
},
/**
- * Check all template attachments
- * @param {Object} attachments - Attachments object
- * @param {Object} cb - Callback
- */
+* Check all template attachments
+* @param {Object} attachments - Attachments object
+* @param {Object} cb - Callback
+*/
checkAttachments: function(attachments, cb) {
for (var i = 0; i < attachments.length; i++) {
var attachment = attachments[i];
@@ -159,4 +226,4 @@ module.exports = {
}
cb();
}
-};
+};
\ No newline at end of file
diff --git a/services/mailer/application/template/client-welcome/client-welcome.js b/services/mailer/application/template/client-welcome/client-welcome.js
index 851c9a12e..469e74386 100644
--- a/services/mailer/application/template/client-welcome/client-welcome.js
+++ b/services/mailer/application/template/client-welcome/client-welcome.js
@@ -5,6 +5,7 @@ var format = require(path.join(__dirname, '../../util/format.js'));
module.exports = class ClientWelcome {
getData(params, cb) {
let query = `SELECT
+ c.id clientId,
CONCAT(w.name, ' ', w.firstName) name,
w.phone AS phone,
CONCAT(wu.name, '@verdnatura.es') AS email,
@@ -17,7 +18,7 @@ module.exports = class ClientWelcome {
LEFT JOIN account.user wu ON wu.id = w.userFk
JOIN country ct ON ct.id = c.countryFk
WHERE c.id = ?`;
- database.pool.query(query, [params.recipient], (error, result) => {
+ database.pool.query(query, [params.clientId], (error, result) => {
if (error || result.length == 0)
return cb(new Error('No template data found'));
diff --git a/services/mailer/application/template/client-welcome/index.html b/services/mailer/application/template/client-welcome/index.html
index 661f0986a..a8a711c8e 100644
--- a/services/mailer/application/template/client-welcome/index.html
+++ b/services/mailer/application/template/client-welcome/index.html
@@ -7,11 +7,9 @@
-
-
-
+
+ {{$.header}}
+
diff --git a/services/mailer/application/template/client-welcome/locale/es.json b/services/mailer/application/template/client-welcome/locale/es.json
index c99fe0c8e..b1149d62b 100644
--- a/services/mailer/application/template/client-welcome/locale/es.json
+++ b/services/mailer/application/template/client-welcome/locale/es.json
@@ -1,14 +1,28 @@
{
"subject": "¡Le damos la bienvenida!",
"title": "¡LE DAMOS LA BIENVENIDA!",
- "dear": "Estimado cliente",
- "bodyDescription": "Siga las intrucciones especificadas en este correo para llevar a cabo la instalación de la impresora.",
+ "dear": "Estimado cliente,",
+ "bodyDescription": "Sus datos para poder comprar en la web de verdnatura (https://www.verdnatura.es) o en nuestras aplicaciones para iOS y Android (Ver tutorial de uso), son:",
+ "user": "Usuario:",
+ "password": "Contraseña:",
+ "passwordResetText": "(Va a recibir un correo para establecer la contraseña)",
+ "sectionHowToBuyTitle": "Cómo hacer un pedido",
+ "sectionHowToBuyDescription": "Para realizar un pedido en nuestra web, debe configurarlo indicando:",
+ "sectionHowToBuyRequeriment1": "Si quiere recibir el pedido (por agencia o por nuestro propio reparto) o si lo prefiere recoger en alguno de nuestros almacenes.",
+ "sectionHowToBuyRequeriment2": "La fecha en la que quiera recibir el pedido (se preparará el día anterior).",
+ "sectionHowToBuyRequeriment3": "La dirección de entrega o el almacén donde quiera recoger el pedido.",
+ "sectionHowToBuyStock": "En nuestra web y aplicaciones puedes visualizar el stock disponible de flor cortada, verdes, plantas, complementos y artificial. Tenga en cuenta que dicho stock puede variar en función de la fecha seleccionada al configurar el pedido. Es importante CONFIRMAR los pedidos para que la mercancía quede reservada.",
+ "sectionHowToBuyDelivery": "El reparto se realiza de lunes a sábado según la zona en la que se encuentre. Por regla general, los pedidos que se entregan por agencia, deben estar confirmados y pagados antes de las 17h del día en que se preparan (el día anterior a recibirlos), aunque esto puede variar si el pedido se envía a través de nuestro reparto y según la zona.",
+ "sectionHowToPayTitle": "Cómo pagar",
+ "sectionHowToPayDescription": "Las formas de pago admitidas en Verdnatura son:",
+ "sectionHowToPayOption1": "Con tarjeta a través de nuestra plataforma web (al confirmar el pedido).",
+ "sectionHowToPayOption2": "Mediante giro bancario mensual, modalidad que hay que solicitar y tramitar.",
+ "sectionToConsiderTitle": "Cosas a tener en cuenta",
+ "sectionToConsiderDescription": "Verdnatura vende EXCLUSIVAMENTE a profesionales, por lo que debe remitirnos el Modelo 036 ó 037, para comprobar que está dado/a de alta en el epígrafe correspondiente al comercio de flores.",
+ "sectionClaimsPolicyTitle": "POLÍTICA DE RECLAMACIONES",
+ "sectionClaimsPolicyDescription": "Verdnatura aceptará las reclamaciones que se realicen dentro de los dos días naturales siguientes a la recepción del pedido (incluyendo el mismo día de la recepción). Pasado este plazo no se aceptará ninguna reclamación.",
+ "doubtsText": "Cualquier duda que le surja, no dude en consultarla, ¡estamos para atenderle!",
"salesPersonNameText": "Soy tu comercial y mi nombre es",
"salesPersonPhoneText": "Teléfono y whatsapp",
- "salesPersonEmailText": "Dirección de e-mail",
- "actionButton": "Visita nuestra Web",
- "infoButton": "Ayúdanos a mejorar",
- "fiscalAddress": "VERDNATURA LEVANTE SL, B97367486 Avda. Espioca, 100, 46460 Silla _ www.verdnatura.es _ clientes@verdnatura.es",
- "privacy": "- AVISO - Este mensaje es privado y confidencial, y debe ser utilizado exclusivamente por la persona destinataria del mismo. Si usted ha recibido este mensaje por error, le rogamos lo comunique al remitente y borre dicho mensaje y cualquier documento adjunto que pudiera contener. Verdnatura Levante SL no renuncia a la confidencialidad ni a ningún privilegio por causa de transmisión errónea o mal funcionamiento. Igualmente no se hace responsable de los cambios, alteraciones, errores u omisiones que pudieran hacerse al mensaje una vez enviado.",
- "privacyLaw": "En cumplimiento de lo dispuesto en la Ley Orgánica 15/1999, de Protección de Datos de Carácter Personal, le comunicamos que los datos personales que facilite se incluirán en ficheros automatizados de VERDNATURA LEVANTE S.L., pudiendo en todo momento ejercitar los derechos de acceso, rectificación, cancelación y oposición, comunicándolo por escrito al domicilio social de la entidad. La finalidad del fichero es la gestión administrativa, contabilidad, y facturación."
+ "salesPersonEmailText": "Dirección de e-mail"
}
\ No newline at end of file
diff --git a/services/mailer/application/template/client-welcome/static/css/style.css b/services/mailer/application/template/client-welcome/static/css/style.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/services/mailer/application/template/footer/footer.js b/services/mailer/application/template/footer/footer.js
new file mode 100644
index 000000000..3b4020bf4
--- /dev/null
+++ b/services/mailer/application/template/footer/footer.js
@@ -0,0 +1,20 @@
+var path = require('path');
+var database = require(path.join(__dirname, '../../database.js'));
+var format = require(path.join(__dirname, '../../util/format.js'));
+
+module.exports = class Footer {
+ getData(params, cb) {
+ let query = `SELECT
+ socialName
+ FROM client c
+ JOIN country ct ON ct.id = c.countryFk
+ WHERE c.id = ?`;
+ database.pool.query(query, [params.clientId], (error, result) => {
+ if (error || result.length == 0)
+ return cb(new Error('No template data found'));
+
+ Object.assign(this, result[0]);
+ cb();
+ });
+ }
+};
diff --git a/services/mailer/application/template/footer/index.html b/services/mailer/application/template/footer/index.html
new file mode 100644
index 000000000..e52f7a695
--- /dev/null
+++ b/services/mailer/application/template/footer/index.html
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
-
@@ -21,108 +19,47 @@
-
-
-
-
-
-
-
-
-
-
- {{_.dear}},
-{{_.bodyDescription}}
- -- Sus datos para poder comprar en la web de verdnatura (https://www.verdnatura.es) - o en nuestras aplicaciones para iOS (https://goo.gl/3hC2mG) y Android (https://goo.gl/8obvLc), son: -
- +{{_.dear}}
+{{{_.bodyDescription}}}
-
Usuario: {{userName}}
- Contraseña: ******** (Va a recibir un correo para establecer la contraseña)
+ {{_.user}} {{userName}}
+ {{_.password}} ******** {{_.passwordResetText}}
- Cómo hacer un pedido
- -Para realizar un pedido en nuestra web, debe configurarlo indicando:
- +{{_.sectionHowToBuyTitle}}
+{{_.sectionHowToBuyDescription}}
-
-
- Si quiere recibir el pedido (por agencia o por nuestro propio reparto) o si lo prefiere recoger en alguno de nuestros almacenes. -
- La fecha en la que quiera recibir el pedido (se preparará el día anterior). -
- La dirección de entrega o el almacén donde quiera recoger el pedido. +
- {{_.sectionHowToBuyRequeriment1}} +
- {{_.sectionHowToBuyRequeriment2}} +
- {{_.sectionHowToBuyRequeriment3}}
En nuestra web y aplicaciones puedes visualizar el stock disponible de flor cortada, verdes, plantas, complementos y artificial. - Tenga en cuenta que dicho stock puede variar en función de la fecha seleccionada al configurar el pedido. Es importante CONFIRMAR los pedidos para que la mercancía quede reservada.
- -El reparto se realiza de lunes a sábado según la zona en la que se encuentre. Por regla general, los pedidos que se entregan por agencia, deben estar confirmados y pagados antes de las 17h - del día en que se preparan (el día anterior a recibirlos), aunque esto puede variar si el pedido se envía a través de nuestro reparto y según la zona.
- -Cómo pagar
- -Las formas de pago admitidas en Verdnatura son
- +{{_.sectionHowToBuyStock}}
+{{_.sectionHowToBuyDelivery}}
+ +{{_.sectionHowToPayTitle}}
+{{_.sectionHowToPayDescription}}
-
-
- Con tarjeta a través de nuestra plataforma web (al confirmar el pedido). -
- Mediante giro bancario mensual, modalidad que hay que solicitar y tramitar. +
- {{{_.sectionHowToPayOption1}}} +
- {{{_.sectionHowToPayOption2}}}
Cosas a tener en cuenta
- -Verdnatura vende EXCLUSIVAMENTE a profesionales, por lo que debe remitirnos el Modelo 036 ó 037, - para comprobar que está dado/a de alta en el epígrafe correspondiente al comercio de flores.
- -POLÍTICA DE RECLAMACIONES
- -Verdnatura aceptará las reclamaciones que se realicen dentro de los dos días naturales - siguientes a la recepción del pedido (incluyendo el mismo día de la recepción). Pasado este plazo no se aceptará ninguna reclamación.
- -Cualquier duda que le surja, no dude en consultarla, ¡estamos para atenderle!
+{{_.sectionToConsiderTitle}}
+{{_.sectionToConsiderDescription}}
+{{_.sectionClaimsPolicyTitle}}
+{{_.sectionClaimsPolicyDescription}}
+{{{_.doubtsText}}}
{{{salesPersonName}}} {{{salesPersonPhone}}} {{{salesPersonEmail}}}
- -
- 
- 
- 
- 
- 
-
-
-
+
+ {{$.footer}}
+
{{_.fiscalAddress}}
-{{_.privacy}}
-{{_.privacyLaw}}
-
+
+
\ No newline at end of file
diff --git a/services/mailer/application/template/footer/locale/es.json b/services/mailer/application/template/footer/locale/es.json
new file mode 100644
index 000000000..1ad532d34
--- /dev/null
+++ b/services/mailer/application/template/footer/locale/es.json
@@ -0,0 +1,7 @@
+{
+ "actionButton": "Visita nuestra Web",
+ "infoButton": "Ayúdanos a mejorar",
+ "fiscalAddress": "VERDNATURA LEVANTE SL, B97367486 Avda. Espioca, 100, 46460 Silla · www.verdnatura.es · clientes@verdnatura.es",
+ "privacy": "- AVISO - Este mensaje es privado y confidencial, y debe ser utilizado exclusivamente por la persona destinataria del mismo. Si usted ha recibido este mensaje por error, le rogamos lo comunique al remitente y borre dicho mensaje y cualquier documento adjunto que pudiera contener. Verdnatura Levante SL no renuncia a la confidencialidad ni a ningún privilegio por causa de transmisión errónea o mal funcionamiento. Igualmente no se hace responsable de los cambios, alteraciones, errores u omisiones que pudieran hacerse al mensaje una vez enviado.",
+ "privacyLaw": "En cumplimiento de lo dispuesto en la Ley Orgánica 15/1999, de Protección de Datos de Carácter Personal, le comunicamos que los datos personales que facilite se incluirán en ficheros automatizados de VERDNATURA LEVANTE S.L., pudiendo en todo momento ejercitar los derechos de acceso, rectificación, cancelación y oposición, comunicándolo por escrito al domicilio social de la entidad. La finalidad del fichero es la gestión administrativa, contabilidad, y facturación."
+}
\ No newline at end of file
diff --git a/services/mailer/static/css/style.css b/services/mailer/application/template/footer/static/css/style.css
similarity index 58%
rename from services/mailer/static/css/style.css
rename to services/mailer/application/template/footer/static/css/style.css
index 1243a091c..f35364e8c 100644
--- a/services/mailer/static/css/style.css
+++ b/services/mailer/application/template/footer/static/css/style.css
@@ -1,41 +1,3 @@
-img {
- margin: 0
-}
-
-.wrapper {
- background-color: #EEE
-}
-
-.container {
- font-family: arial, sans-serif;
- max-width: 600px;
- min-width: 320px;
- font-size: 16px;
- margin: 0 auto;
- color: #555
-}
-
-.banner img {
- width: 100%
-}
-
-.title {
- background-color: #95d831;
- text-align: center;
- padding: 35px 0
-}
-
-.title h1 {
- font-size: 32px;
- color: #333;
- margin: 0
-}
-
-.body {
- background-color:#FFF;
- padding: 20px
-}
-
.buttons {
background-color: #FFF;
text-align: center;
diff --git a/services/mailer/application/template/footer/static/image/action.png b/services/mailer/application/template/footer/static/image/action.png
new file mode 100644
index 000000000..2cd16c453
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/action.png differ
diff --git a/services/mailer/application/template/footer/static/image/facebook.png b/services/mailer/application/template/footer/static/image/facebook.png
new file mode 100644
index 000000000..7ab54c538
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/facebook.png differ
diff --git a/services/mailer/application/template/footer/static/image/header.png b/services/mailer/application/template/footer/static/image/header.png
new file mode 100644
index 000000000..3c063ae44
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/header.png differ
diff --git a/services/mailer/application/template/footer/static/image/info.png b/services/mailer/application/template/footer/static/image/info.png
new file mode 100644
index 000000000..fb75cbc4e
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/info.png differ
diff --git a/services/mailer/application/template/footer/static/image/instagram.png b/services/mailer/application/template/footer/static/image/instagram.png
new file mode 100644
index 000000000..66550c4a5
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/instagram.png differ
diff --git a/services/mailer/application/template/footer/static/image/linkedin.png b/services/mailer/application/template/footer/static/image/linkedin.png
new file mode 100644
index 000000000..0d191e5ae
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/linkedin.png differ
diff --git a/services/mailer/application/template/footer/static/image/logo.png b/services/mailer/application/template/footer/static/image/logo.png
new file mode 100644
index 000000000..55e26fec6
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/logo.png differ
diff --git a/services/mailer/application/template/footer/static/image/logo.svg b/services/mailer/application/template/footer/static/image/logo.svg
new file mode 100644
index 000000000..51baf46d3
--- /dev/null
+++ b/services/mailer/application/template/footer/static/image/logo.svg
@@ -0,0 +1,48 @@
+
+
+
\ No newline at end of file
diff --git a/services/mailer/application/template/footer/static/image/pinterest.png b/services/mailer/application/template/footer/static/image/pinterest.png
new file mode 100644
index 000000000..4d7b28ef8
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/pinterest.png differ
diff --git a/services/mailer/application/template/footer/static/image/twitter.png b/services/mailer/application/template/footer/static/image/twitter.png
new file mode 100644
index 000000000..c4a8ab0c1
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/twitter.png differ
diff --git a/services/mailer/application/template/footer/static/image/youtube.png b/services/mailer/application/template/footer/static/image/youtube.png
new file mode 100644
index 000000000..11871deb5
Binary files /dev/null and b/services/mailer/application/template/footer/static/image/youtube.png differ
diff --git a/services/mailer/application/template/header/header.js b/services/mailer/application/template/header/header.js
new file mode 100644
index 000000000..82c78e003
--- /dev/null
+++ b/services/mailer/application/template/header/header.js
@@ -0,0 +1,20 @@
+var path = require('path');
+var database = require(path.join(__dirname, '../../database.js'));
+var format = require(path.join(__dirname, '../../util/format.js'));
+
+module.exports = class Header {
+ getData(params, cb) {
+ let query = `SELECT
+ c.name AS clientName
+ FROM client c
+ JOIN country ct ON ct.id = c.countryFk
+ WHERE c.id = ?`;
+ database.pool.query(query, [params.clientId], (error, result) => {
+ if (error || result.length == 0)
+ return cb(new Error('No template data found'));
+
+ Object.assign(this, result[0]);
+ cb();
+ });
+ }
+};
diff --git a/services/mailer/application/template/header/index.html b/services/mailer/application/template/header/index.html
new file mode 100644
index 000000000..c5234bbc8
--- /dev/null
+++ b/services/mailer/application/template/header/index.html
@@ -0,0 +1,3 @@
+
diff --git a/services/mailer/application/template/header/locale/es.json b/services/mailer/application/template/header/locale/es.json
new file mode 100644
index 000000000..7a73a41bf
--- /dev/null
+++ b/services/mailer/application/template/header/locale/es.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/services/mailer/application/template/header/static/css/style.css b/services/mailer/application/template/header/static/css/style.css
new file mode 100644
index 000000000..4ea8ee36d
--- /dev/null
+++ b/services/mailer/application/template/header/static/css/style.css
@@ -0,0 +1,3 @@
+.banner img {
+ width: 100%
+}
\ No newline at end of file
diff --git a/services/mailer/application/template/header/static/image/action.png b/services/mailer/application/template/header/static/image/action.png
new file mode 100644
index 000000000..2cd16c453
Binary files /dev/null and b/services/mailer/application/template/header/static/image/action.png differ
diff --git a/services/mailer/application/template/header/static/image/facebook.png b/services/mailer/application/template/header/static/image/facebook.png
new file mode 100644
index 000000000..7ab54c538
Binary files /dev/null and b/services/mailer/application/template/header/static/image/facebook.png differ
diff --git a/services/mailer/application/template/header/static/image/header.png b/services/mailer/application/template/header/static/image/header.png
new file mode 100644
index 000000000..3c063ae44
Binary files /dev/null and b/services/mailer/application/template/header/static/image/header.png differ
diff --git a/services/mailer/application/template/header/static/image/info.png b/services/mailer/application/template/header/static/image/info.png
new file mode 100644
index 000000000..fb75cbc4e
Binary files /dev/null and b/services/mailer/application/template/header/static/image/info.png differ
diff --git a/services/mailer/application/template/header/static/image/instagram.png b/services/mailer/application/template/header/static/image/instagram.png
new file mode 100644
index 000000000..66550c4a5
Binary files /dev/null and b/services/mailer/application/template/header/static/image/instagram.png differ
diff --git a/services/mailer/application/template/header/static/image/linkedin.png b/services/mailer/application/template/header/static/image/linkedin.png
new file mode 100644
index 000000000..0d191e5ae
Binary files /dev/null and b/services/mailer/application/template/header/static/image/linkedin.png differ
diff --git a/services/mailer/application/template/header/static/image/logo.png b/services/mailer/application/template/header/static/image/logo.png
new file mode 100644
index 000000000..55e26fec6
Binary files /dev/null and b/services/mailer/application/template/header/static/image/logo.png differ
diff --git a/services/mailer/application/template/header/static/image/logo.svg b/services/mailer/application/template/header/static/image/logo.svg
new file mode 100644
index 000000000..51baf46d3
--- /dev/null
+++ b/services/mailer/application/template/header/static/image/logo.svg
@@ -0,0 +1,48 @@
+
+
+
\ No newline at end of file
diff --git a/services/mailer/application/template/header/static/image/pinterest.png b/services/mailer/application/template/header/static/image/pinterest.png
new file mode 100644
index 000000000..4d7b28ef8
Binary files /dev/null and b/services/mailer/application/template/header/static/image/pinterest.png differ
diff --git a/services/mailer/application/template/header/static/image/twitter.png b/services/mailer/application/template/header/static/image/twitter.png
new file mode 100644
index 000000000..c4a8ab0c1
Binary files /dev/null and b/services/mailer/application/template/header/static/image/twitter.png differ
diff --git a/services/mailer/application/template/header/static/image/youtube.png b/services/mailer/application/template/header/static/image/youtube.png
new file mode 100644
index 000000000..11871deb5
Binary files /dev/null and b/services/mailer/application/template/header/static/image/youtube.png differ
diff --git a/services/mailer/application/template/notification-alias/index.html b/services/mailer/application/template/notification-alias/index.html
index ab00f8ef6..6e79e1278 100644
--- a/services/mailer/application/template/notification-alias/index.html
+++ b/services/mailer/application/template/notification-alias/index.html
@@ -5,70 +5,29 @@
-{{_.fiscalAddress}}
+{{_.privacy}}
+{{_.privacyLaw}}
+