Merge branch 'dev' into test
This commit is contained in:
Vicente Falco
commit
e90fe28578
|
|
@ -1,26 +1,6 @@
|
||||||
{
|
{
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
|
||||||
"name": "Iniciar",
|
|
||||||
"type": "node",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "${workspaceRoot}/services/auth/server/server.js",
|
|
||||||
"stopOnEntry": false,
|
|
||||||
"args": [],
|
|
||||||
"cwd": "${workspaceRoot}",
|
|
||||||
"preLaunchTask": null,
|
|
||||||
"runtimeExecutable": null,
|
|
||||||
"runtimeArgs": [
|
|
||||||
"--nolazy"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"NODE_ENV": "development"
|
|
||||||
},
|
|
||||||
"console": "internalConsole",
|
|
||||||
"sourceMaps": false,
|
|
||||||
"outFiles": []
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Asociar",
|
"name": "Asociar",
|
||||||
"type": "node",
|
"type": "node",
|
||||||
|
|
|
||||||
|
|
@ -27,13 +27,13 @@
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal margin-medium-bottom>
|
<vn-horizontal margin-medium-bottom>
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<vn-check label="Recibido core VNH" field="$ctrl.client.coreVnh" vn-acl="administrative"></vn-check>
|
<vn-check label="Recibido core VNH" field="$ctrl.client.hasCoreVnh" vn-acl="administrative"></vn-check>
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<vn-check label="Recibido core VNL" field="$ctrl.client.coreVnl" vn-acl="administrative"></vn-check>
|
<vn-check label="Recibido core VNL" field="$ctrl.client.hasCoreVnl" vn-acl="administrative"></vn-check>
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<vn-check label="Recibido B2B VNL" field="$ctrl.client.sepaVnl" vn-acl="administrative"></vn-check>
|
<vn-check label="Recibido B2B VNL" field="$ctrl.client.hasSepaVnl" vn-acl="administrative"></vn-check>
|
||||||
</vn-one>
|
</vn-one>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ export default class Controller {
|
||||||
}
|
}
|
||||||
returnDialog(response) {
|
returnDialog(response) {
|
||||||
if (response === 'ACCEPT') {
|
if (response === 'ACCEPT') {
|
||||||
this.$http.post(`/mailer/manuscript/payment-update/${this.client.id}`).then(
|
this.$http.post(`/mailer/notification/payment-update/${this.client.id}`).then(
|
||||||
() => {
|
() => {
|
||||||
this.vnApp.showMessage(this.translate.instant('Notification sent!'));
|
this.vnApp.showMessage(this.translate.instant('Notification sent!'));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
vn-descriptor {
|
vn-descriptor {
|
||||||
font-family: raleway-bold;
|
font-family: vn-font-bold;
|
||||||
}
|
}
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
<div class="margin-none">{{::$ctrl.client.id}}</div>
|
<div class="margin-none">{{::$ctrl.client.id}}</div>
|
||||||
<div class="margin-none">{{$ctrl.client.name}}</div>
|
<div class="margin-none">{{$ctrl.client.name}}</div>
|
||||||
<div class="margin-none">{{$ctrl.client.phone}}</div>
|
<div class="margin-none">{{$ctrl.client.phone}}</div>
|
||||||
<vn-switch label="Activo" model="$ctrl.active"></vn-switch>
|
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-textfield autofocus vn-two label="Social name" field="$ctrl.client.socialName" vn-acl="administrative"></vn-textfield>
|
<vn-textfield autofocus vn-two label="Social name" field="$ctrl.client.socialName" vn-acl="administrative"></vn-textfield>
|
||||||
<vn-textfield vn-one label="Tax number" field="$ctrl.client.fi" vn-acl="administrative"></vn-textfield>
|
<vn-textfield vn-one label="Tax number" field="$ctrl.client.fi" vn-acl="administrative"></vn-textfield>
|
||||||
|
<vn-check vn-one label="Equalization tax" field="$ctrl.client.isEqualizated" vn-acl="administrative"></vn-check>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-textfield vn-two label="Street" field="$ctrl.client.street" vn-focus vn-acl="administrative"></vn-textfield>
|
<vn-textfield vn-two label="Street" field="$ctrl.client.street" vn-focus vn-acl="administrative"></vn-textfield>
|
||||||
|
|
@ -42,25 +43,26 @@
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal margin-small-bottom>
|
<vn-horizontal margin-small-bottom>
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<vn-check label="Equalization tax" field="$ctrl.client.equalizationTax" vn-acl="administrative"></vn-check>
|
<vn-check label="Active" field="$ctrl.client.isActive" vn-acl="administrative"></vn-check>
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<vn-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative"></vn-check>
|
<vn-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative"></vn-check>
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-one></vn-one>
|
<vn-one>
|
||||||
|
<vn-check label="Datos comprobados" field="$ctrl.client.isTaxDataChecked" vn-acl="administrative"></vn-check>
|
||||||
|
</vn-one>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-one>
|
||||||
|
<vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice" vn-acl="administrative"></vn-check>
|
||||||
|
</vn-one>
|
||||||
|
<vn-one>
|
||||||
|
<vn-check vn-one label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check>
|
||||||
|
</vn-one>
|
||||||
|
<vn-one>
|
||||||
|
<vn-check vn-one label="Vies" field="$ctrl.client.isVies" vn-acl="administrative"></vn-check>
|
||||||
|
</vn-one>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal>
|
|
||||||
<vn-one>
|
|
||||||
<vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice" vn-acl="administrative"></vn-check>
|
|
||||||
</vn-one>
|
|
||||||
<vn-one>
|
|
||||||
<vn-check label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check>
|
|
||||||
</vn-one>
|
|
||||||
<vn-one>
|
|
||||||
<vn-check label="Vies" field="$ctrl.client.vies" vn-acl="administrative"></vn-check>
|
|
||||||
</vn-one>
|
|
||||||
</vn-horizontal>
|
|
||||||
|
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
|
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
@ -70,13 +72,13 @@
|
||||||
</vn-button-bar>
|
</vn-button-bar>
|
||||||
</form>
|
</form>
|
||||||
<vn-dialog
|
<vn-dialog
|
||||||
vn-id="propagate-equalizationTax"
|
vn-id="propagate-isEqualizated"
|
||||||
on-response="$ctrl.returnDialogEt(response)"
|
on-response="$ctrl.returnDialogEt(response)"
|
||||||
>
|
>
|
||||||
<tpl-body>
|
<tpl-body>
|
||||||
<vn-vertical>
|
<vn-vertical>
|
||||||
<vn-one text-center translate>You changes the equivalent tax</vn-one>
|
<vn-one text-center translate>You changes the equivalen
|
||||||
<vn-one text-center translate>Do you want to spread the change to their consignees?</vn-one>
|
<vn-one text-center translate>Do you want to spread the change to their consig
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
</tpl-body>
|
</tpl-body>
|
||||||
<tpl-buttons>
|
<tpl-buttons>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ export default class ClientFiscalData {
|
||||||
this.$http = $http;
|
this.$http = $http;
|
||||||
this.vnApp = vnApp;
|
this.vnApp = vnApp;
|
||||||
this.translate = $translate;
|
this.translate = $translate;
|
||||||
this.equalizationTax = undefined;
|
this.isEqualizated = undefined;
|
||||||
this.copyData();
|
this.copyData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -16,7 +16,7 @@ export default class ClientFiscalData {
|
||||||
|
|
||||||
copyData() {
|
copyData() {
|
||||||
if (this.client) {
|
if (this.client) {
|
||||||
this.equalizationTax = this.client.equalizationTax;
|
this.isEqualizated = this.client.isEqualizated;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -26,16 +26,16 @@ export default class ClientFiscalData {
|
||||||
}
|
}
|
||||||
|
|
||||||
checkEtChanges() {
|
checkEtChanges() {
|
||||||
let equals = this.equalizationTax == this.client.equalizationTax;
|
let equals = this.isEqualizated == this.client.isEqualizated;
|
||||||
this.equalizationTax = this.client.equalizationTax;
|
this.isEqualizated = this.client.isEqualizated;
|
||||||
|
|
||||||
if (!equals)
|
if (!equals)
|
||||||
this.$.propagateEqualizationTax.show();
|
this.$.propagateIsEqualizated.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
returnDialogEt(response) {
|
returnDialogEt(response) {
|
||||||
if (response === 'ACCEPT') {
|
if (response === 'ACCEPT') {
|
||||||
this.$http.patch(`/client/api/Clients/${this.client.id}/addressesPropagateRe`, {isEqualizated: this.client.equalizationTax}).then(
|
this.$http.patch(`/client/api/Clients/${this.client.id}/addressesPropagateRe`, {isEqualizated: this.client.isEqualizated}).then(
|
||||||
res => {
|
res => {
|
||||||
if (res.data)
|
if (res.data)
|
||||||
this.vnApp.showMessage(this.translate.instant('Equivalent tax spreaded'));
|
this.vnApp.showMessage(this.translate.instant('Equivalent tax spreaded'));
|
||||||
|
|
|
||||||
|
|
@ -12,5 +12,5 @@ vn-item-client a:hover {
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-item-client-name {
|
.vn-item-client-name {
|
||||||
font-family: raleway-bold;
|
font-family: vn-font-bold;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
"Active": "Activo",
|
||||||
"Client": "Cliente",
|
"Client": "Cliente",
|
||||||
"Clients": "Clientes",
|
"Clients": "Clientes",
|
||||||
"Fiscal data": "Datos Fiscales",
|
"Fiscal data": "Datos Fiscales",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<vn-vertical ng-click="$ctrl.showDropDown = true">
|
<vn-vertical ng-click="$ctrl.showDropDown = true">
|
||||||
<vn-textfield vn-one label="{{$ctrl.label}}" model="$ctrl.displayValue" readonly="$ctrl.readonly"></vn-textfield>
|
<vn-textfield vn-auto label="{{$ctrl.label}}" model="$ctrl.displayValue" readonly="$ctrl.readonly"></vn-textfield>
|
||||||
<vn-drop-down vn-one
|
<vn-drop-down vn-auto
|
||||||
items="$ctrl.items"
|
items="$ctrl.items"
|
||||||
show="$ctrl.showDropDown"
|
show="$ctrl.showDropDown"
|
||||||
selected="$ctrl.field"
|
selected="$ctrl.field"
|
||||||
|
|
@ -11,5 +11,6 @@
|
||||||
filter-action="$ctrl.findItems(search)"
|
filter-action="$ctrl.findItems(search)"
|
||||||
item-width="$ctrl.width"
|
item-width="$ctrl.width"
|
||||||
multiple="$ctrl.multiple"
|
multiple="$ctrl.multiple"
|
||||||
|
parent = "$ctrl.element"
|
||||||
><vn-item ng-transclude="tplItem">{{$parent.item.name}}</vn-item></vn-drop-down>
|
><vn-item ng-transclude="tplItem">{{$parent.item.name}}</vn-item></vn-drop-down>
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
|
|
@ -18,18 +18,20 @@ ul.vn-autocomplete {
|
||||||
}
|
}
|
||||||
&.load-more {
|
&.load-more {
|
||||||
color: #ffa410;
|
color: #ffa410;
|
||||||
font-weight: bold;
|
font-family: vn-font-bold;
|
||||||
padding: .4em .8em;
|
padding: .4em .8em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
vn-autocomplete {
|
vn-autocomplete {
|
||||||
|
position: relative;
|
||||||
|
|
||||||
.mdl-chip__action {
|
.mdl-chip__action {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
right: -6px;
|
right: -6px;
|
||||||
margin: 22px 0px;
|
margin: 22px 0px;
|
||||||
background-color: white;
|
background: transparent;
|
||||||
}
|
}
|
||||||
.material-icons {
|
.material-icons {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
vn-confirm .dialog-title {
|
vn-confirm .dialog-title {
|
||||||
color:#424242;
|
color:#424242;
|
||||||
font-family: raleway-bold;
|
font-family: vn-font-bold;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,68 +1,68 @@
|
||||||
.vn-dialog {
|
.vn-dialog {
|
||||||
display: none;
|
display: none;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background-color: rgba(1,1,1,.4);
|
background-color: rgba(1,1,1,.4);
|
||||||
|
|
||||||
button.close {
|
button.close {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
border-style: none;
|
border-style: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
padding: .3em;
|
padding: .3em;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
||||||
vn-icon {
|
vn-icon {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
||||||
i {
|
i {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: rgba(0, 0, 0, .1);
|
background-color: rgba(0, 0, 0, .1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
& > div {
|
& > div {
|
||||||
position: relative;
|
position: relative;
|
||||||
box-shadow: 0 0 .4em rgba(1,1,1,.4);
|
box-shadow: 0 0 .4em rgba(1,1,1,.4);
|
||||||
background-color: white;
|
background-color: white;
|
||||||
border-radius: .2em;
|
border-radius: .2em;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
padding: 2em;
|
padding: 2em;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
width: 28em;
|
width: 28em;
|
||||||
margin-top: -10em;
|
margin-top: -10em;
|
||||||
margin-left: -14em;
|
margin-left: -14em;
|
||||||
}
|
}
|
||||||
.button-bar {
|
.button-bar {
|
||||||
margin-top: 1.5em;
|
margin-top: 1.5em;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
|
||||||
button {
|
button {
|
||||||
background: none;
|
background: none;
|
||||||
border: none;
|
border: none;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
font-size: 1.1em;
|
font-size: 1.1em;
|
||||||
color: #ffa410;
|
color: #ffa410;
|
||||||
font-weight: bold;
|
font-family: vn-font-bold;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: .5em;
|
padding: .5em;
|
||||||
margin: -0.5em;
|
margin: -0.5em;
|
||||||
margin-left: .5em;
|
margin-left: .5em;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: rgba(1,1,1,.1);
|
background-color: rgba(1,1,1,.1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,25 @@
|
||||||
import {module} from '../module';
|
import {module} from '../module';
|
||||||
|
|
||||||
function vnAcl(aclService, $timeout) {
|
function vnAcl(aclService, $timeout) {
|
||||||
|
function getMaterialType(className) {
|
||||||
|
let type = '';
|
||||||
|
if (className) {
|
||||||
|
type = className.replace('mdl-', '').replace('__input', '');
|
||||||
|
type = type.charAt(0).toUpperCase() + type.slice(1);
|
||||||
|
}
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
function udateMaterial(input) {
|
||||||
|
if (input && input.className) {
|
||||||
|
let find = input.className.match(/mdl-[\w]+input/g);
|
||||||
|
if (find.length && find[0]) {
|
||||||
|
let type = getMaterialType(find[0]);
|
||||||
|
if (type && input.parentNode[`Material${type}`] && input.parentNode[`Material${type}`].updateClasses_) {
|
||||||
|
input.parentNode[`Material${type}`].updateClasses_();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
restrict: 'A',
|
restrict: 'A',
|
||||||
priority: -1,
|
priority: -1,
|
||||||
|
|
@ -18,6 +37,7 @@ function vnAcl(aclService, $timeout) {
|
||||||
if (input) {
|
if (input) {
|
||||||
$timeout(() => {
|
$timeout(() => {
|
||||||
input.setAttribute("disabled", "true");
|
input.setAttribute("disabled", "true");
|
||||||
|
udateMaterial(input);
|
||||||
});
|
});
|
||||||
$element[0].querySelectorAll('i, vn-drop-down').forEach(element => {
|
$element[0].querySelectorAll('i, vn-drop-down').forEach(element => {
|
||||||
element.parentNode.removeChild(element);
|
element.parentNode.removeChild(element);
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
<vn-vertical class="dropdown-body" ng-show="$ctrl.show">
|
<vn-vertical class="dropdown-body" ng-show="$ctrl.show">
|
||||||
<vn-one ng-show="$ctrl.filter" class="filter">
|
<vn-auto ng-show="$ctrl.filter" class="filter">
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<input vn-one placeholder="{{'Search' | translate}}" type="text" ng-model="$ctrl.search"/>
|
<input vn-one placeholder="{{'Search' | translate}}" type="text" ng-model="$ctrl.search"/>
|
||||||
<vn-icon vn-none icon="clear" ng-click="$ctrl.clearSearch()"></vn-icon>
|
<vn-icon vn-none icon="clear" ng-click="$ctrl.clearSearch()"></vn-icon>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
</vn-one>
|
</vn-auto>
|
||||||
<vn-one>
|
<vn-auto>
|
||||||
<ul class="dropdown">
|
<ul class="dropdown">
|
||||||
<li tabIndex="-1"
|
<li tabIndex="-1"
|
||||||
ng-repeat="item in $ctrl.itemsFiltered track by $index"
|
ng-repeat="item in $ctrl.itemsFiltered track by $index"
|
||||||
|
|
@ -25,5 +25,5 @@
|
||||||
translate="{{$ctrl.showLoadMore ? 'Show More' : 'No more results'}}"
|
translate="{{$ctrl.showLoadMore ? 'Show More' : 'No more results'}}"
|
||||||
></li>
|
></li>
|
||||||
</ul>
|
</ul>
|
||||||
</vn-one>
|
</vn-auto>
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
|
|
@ -7,11 +7,12 @@ export default class DropDown {
|
||||||
this.$filter = $filter;
|
this.$filter = $filter;
|
||||||
this.$timeout = $timeout;
|
this.$timeout = $timeout;
|
||||||
|
|
||||||
this.parent = this.parent || $element[0].parentNode;
|
this.container = $element[0].querySelector('ul.dropdown');
|
||||||
this._search = null;
|
this._search = null;
|
||||||
this.itemsFiltered = [];
|
this.itemsFiltered = [];
|
||||||
this._activeOption = -1;
|
this._activeOption = -1;
|
||||||
this._focusingFilter = false;
|
this._focusingFilter = false;
|
||||||
|
this._tryToShow = 0;
|
||||||
}
|
}
|
||||||
get show() {
|
get show() {
|
||||||
return this._show;
|
return this._show;
|
||||||
|
|
@ -19,14 +20,19 @@ export default class DropDown {
|
||||||
|
|
||||||
set show(value) {
|
set show(value) {
|
||||||
let oldValue = this.show;
|
let oldValue = this.show;
|
||||||
this._show = value;
|
// I wait up to 1 second if the dropdown opens but there is no data to show
|
||||||
if (value && !this._focusingFilter && oldValue !== value && this.filter) {
|
if (value && !oldValue && !this.itemsFiltered.length && this._tryToShow < 4) {
|
||||||
let inputFilterSearch = this.$element[0].querySelector('input');
|
|
||||||
this._focusingFilter = true;
|
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
inputFilterSearch.focus();
|
this._tryToShow++;
|
||||||
this._focusingFilter = false;
|
this.show = true;
|
||||||
}, 250);
|
}, 250);
|
||||||
|
} else {
|
||||||
|
this._tryToShow = 0;
|
||||||
|
this._show = value;
|
||||||
|
this._setFocusInFilterInput(value, oldValue);
|
||||||
|
this.$timeout(() => {
|
||||||
|
this._calculatePosition(value, oldValue);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -51,18 +57,66 @@ export default class DropDown {
|
||||||
set activeOption(value) {
|
set activeOption(value) {
|
||||||
if (value < 0) {
|
if (value < 0) {
|
||||||
value = 0;
|
value = 0;
|
||||||
} else if (value >= this.items.length) {
|
} else if (value >= this.itemsFiltered.length) {
|
||||||
value = this.showLoadMore ? this.items.length : this.items.length - 1;
|
value = this.showLoadMore ? this.itemsFiltered.length : this.itemsFiltered.length - 1;
|
||||||
}
|
}
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this._activeOption = value;
|
this._activeOption = value;
|
||||||
// AutoLoad items with "scroll" (1st version):
|
if (value && value >= this.itemsFiltered.length - 3 && !this.removeLoadMore) {
|
||||||
if (value && value >= this.items.length - 3 && !this.removeLoadMore) {
|
|
||||||
this.loadItems();
|
this.loadItems();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_setFocusInFilterInput(value, oldValue) {
|
||||||
|
if (value && !this._focusingFilter && oldValue !== value && this.filter) {
|
||||||
|
let inputFilterSearch = this.$element[0].querySelector('input');
|
||||||
|
this._focusingFilter = true;
|
||||||
|
this.$timeout(() => {
|
||||||
|
inputFilterSearch.focus();
|
||||||
|
this._focusingFilter = false;
|
||||||
|
}, 250);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_background(create) {
|
||||||
|
let el = document.getElementById('ddBack');
|
||||||
|
if (el) {
|
||||||
|
el.parentNode.removeChild(el);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (create) {
|
||||||
|
el = document.createElement('div');
|
||||||
|
el.id = 'ddBack';
|
||||||
|
document.body.appendChild(el);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_calculatePosition(value, oldValue) {
|
||||||
|
if (value && !oldValue) {
|
||||||
|
if (this.parent === undefined) {
|
||||||
|
this.parent = this.$element.parent().parent();
|
||||||
|
}
|
||||||
|
|
||||||
|
let parentRect = this.parent.getBoundingClientRect();
|
||||||
|
let elemetRect = this.$element[0].getBoundingClientRect();
|
||||||
|
let instOffset = parentRect.bottom + elemetRect.height;
|
||||||
|
|
||||||
|
if (instOffset >= window.innerHeight) {
|
||||||
|
this._background(true);
|
||||||
|
this.$element.addClass('fixed-dropDown');
|
||||||
|
this.$element.css('top', `${(parentRect.top - elemetRect.height)}px`);
|
||||||
|
this.$element.css('left', `${(parentRect.x)}px`);
|
||||||
|
this.$element.css('height', `${elemetRect.height}px`);
|
||||||
|
}
|
||||||
|
} else if (!value && oldValue) {
|
||||||
|
this.$element.removeAttr('style');
|
||||||
|
if (this.itemWidth) {
|
||||||
|
this.$element.css('width', this.itemWidth + 'px');
|
||||||
|
}
|
||||||
|
this.$element.removeClass('fixed-dropDown');
|
||||||
|
this._background();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
filterItems() {
|
filterItems() {
|
||||||
this.itemsFiltered = this.search ? this.$filter('filter')(this.items, this.search) : this.items;
|
this.itemsFiltered = this.search ? this.$filter('filter')(this.items, this.search) : this.items;
|
||||||
}
|
}
|
||||||
|
|
@ -73,18 +127,6 @@ export default class DropDown {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$onChanges(changesObj) {
|
|
||||||
if (changesObj.show && changesObj.top && changesObj.top.currentValue) {
|
|
||||||
this.$element.css('top', changesObj.top.currentValue + 'px');
|
|
||||||
}
|
|
||||||
if (changesObj.show && changesObj.itemWidth && changesObj.itemWidth.currentValue) {
|
|
||||||
this.$element.css('width', changesObj.itemWidth.currentValue + 'px');
|
|
||||||
}
|
|
||||||
if (changesObj.items) {
|
|
||||||
this.filterItems();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
clearSearch() {
|
clearSearch() {
|
||||||
this.search = null;
|
this.search = null;
|
||||||
}
|
}
|
||||||
|
|
@ -123,20 +165,31 @@ export default class DropDown {
|
||||||
this.setScrollPosition();
|
this.setScrollPosition();
|
||||||
}, 100);
|
}, 100);
|
||||||
break;
|
break;
|
||||||
|
case 35: // End
|
||||||
|
this.activeOption = this.itemsFiltered.length - 1;
|
||||||
|
this.$timeout(() => {
|
||||||
|
this.setScrollPosition();
|
||||||
|
}, 100);
|
||||||
|
break;
|
||||||
|
case 36: // Start
|
||||||
|
this.activeOption = 0;
|
||||||
|
this.$timeout(() => {
|
||||||
|
this.setScrollPosition();
|
||||||
|
}, 100);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setScrollPosition() {
|
setScrollPosition() {
|
||||||
let dropdown = this.$element[0].querySelector('ul.dropdown');
|
let child = this.$element[0].querySelector('ul.dropdown li.active');
|
||||||
let child = dropdown ? dropdown.childNodes[this.activeOption] : null;
|
let childRect = child.getBoundingClientRect();
|
||||||
if (child && typeof child.scrollIntoView === 'function') {
|
let containerRect = this.container.getBoundingClientRect();
|
||||||
|
if (typeof child.scrollIntoView === 'function' && (childRect.top > containerRect.top + containerRect.height || childRect.top < containerRect.top)) {
|
||||||
child.scrollIntoView();
|
child.scrollIntoView();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
selectItem(item) {
|
selectItem(item) {
|
||||||
this.selected = item;
|
this.selected = item;
|
||||||
if (this.multiple) {
|
if (this.multiple) {
|
||||||
|
|
@ -146,21 +199,37 @@ export default class DropDown {
|
||||||
this.show = false;
|
this.show = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
loadItems() {
|
loadItems() {
|
||||||
if (this.showLoadMore && this.loadMore) {
|
if (this.showLoadMore && this.loadMore) {
|
||||||
this.loadMore();
|
this.loadMore();
|
||||||
}
|
}
|
||||||
this.show = true;
|
this.show = true;
|
||||||
}
|
}
|
||||||
|
loadFromScroll(e) {
|
||||||
|
let containerRect = e.target.getBoundingClientRect();
|
||||||
|
if (e.target.scrollHeight - e.target.scrollTop - containerRect.height <= 50) {
|
||||||
|
this.loadItems();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$onChanges(changesObj) {
|
||||||
|
if (changesObj.show && changesObj.itemWidth && changesObj.itemWidth.currentValue) {
|
||||||
|
this.$element.css('width', changesObj.itemWidth.currentValue + 'px');
|
||||||
|
}
|
||||||
|
if (changesObj.items) {
|
||||||
|
this.filterItems();
|
||||||
|
}
|
||||||
|
}
|
||||||
$onInit() {
|
$onInit() {
|
||||||
if (this.parent)
|
if (this.parent)
|
||||||
this.parent.addEventListener('keydown', e => this.onKeydown(e));
|
this.parent.addEventListener('keydown', e => this.onKeydown(e));
|
||||||
|
if (this.container)
|
||||||
|
this.container.addEventListener('scroll', e => this.loadFromScroll(e));
|
||||||
}
|
}
|
||||||
$onDestroy() {
|
$onDestroy() {
|
||||||
if (this.parent)
|
if (this.parent)
|
||||||
this.parent.removeEventListener('keydown', e => this.onKeydown(e));
|
this.parent.removeEventListener('keydown', e => this.onKeydown(e));
|
||||||
|
if (this.container)
|
||||||
|
this.container.removeEventListener('scroll', e => this.loadFromScroll(e));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -179,7 +248,6 @@ module.component('vnDropDown', {
|
||||||
removeLoadMore: '<?',
|
removeLoadMore: '<?',
|
||||||
filterAction: '&?',
|
filterAction: '&?',
|
||||||
showLoadMore: '<?',
|
showLoadMore: '<?',
|
||||||
top: '<?',
|
|
||||||
itemWidth: '<?',
|
itemWidth: '<?',
|
||||||
parent: '<?',
|
parent: '<?',
|
||||||
multiple: '<?'
|
multiple: '<?'
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ describe('Component vnDropDown', () => {
|
||||||
$timeout = _$timeout_;
|
$timeout = _$timeout_;
|
||||||
$filter = _$filter_;
|
$filter = _$filter_;
|
||||||
controller = $componentController('vnDropDown', {$element, $timeout, $filter});
|
controller = $componentController('vnDropDown', {$element, $timeout, $filter});
|
||||||
|
controller.parent = angular.element('<vn-parent></vn-parent>')[0];
|
||||||
}));
|
}));
|
||||||
|
|
||||||
describe('show() setter', () => {
|
describe('show() setter', () => {
|
||||||
|
|
@ -62,43 +63,43 @@ describe('Component vnDropDown', () => {
|
||||||
it(`should set _activeOption as items.length if showLoadMore is defined if activeOption is bigger than items.length then call loadItems()`, () => {
|
it(`should set _activeOption as items.length if showLoadMore is defined if activeOption is bigger than items.length then call loadItems()`, () => {
|
||||||
spyOn(controller, 'loadItems');
|
spyOn(controller, 'loadItems');
|
||||||
controller.showLoadMore = true;
|
controller.showLoadMore = true;
|
||||||
controller.items = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
controller.itemsFiltered = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
||||||
controller.activeOption = 10;
|
controller.activeOption = 10;
|
||||||
$timeout.flush();
|
$timeout.flush();
|
||||||
|
|
||||||
expect(controller._activeOption).toEqual(4);
|
expect(controller.activeOption).toEqual(4);
|
||||||
expect(controller.loadItems).toHaveBeenCalledWith();
|
expect(controller.loadItems).toHaveBeenCalledWith();
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should set _activeOption as activeOption if showLoadMore is defined if activeOption is smaller than items.length then call loadItems()`, () => {
|
it(`should set _activeOption as activeOption if showLoadMore is defined if activeOption is smaller than items.length then call loadItems()`, () => {
|
||||||
spyOn(controller, 'loadItems');
|
spyOn(controller, 'loadItems');
|
||||||
controller.showLoadMore = true;
|
controller.showLoadMore = true;
|
||||||
controller.items = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
controller.itemsFiltered = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
||||||
controller.activeOption = 2;
|
controller.activeOption = 2;
|
||||||
$timeout.flush();
|
$timeout.flush();
|
||||||
|
|
||||||
expect(controller._activeOption).toEqual(2);
|
expect(controller.activeOption).toEqual(2);
|
||||||
expect(controller.loadItems).toHaveBeenCalledWith();
|
expect(controller.loadItems).toHaveBeenCalledWith();
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should set _activeOption as items.length -1 if showLoadMore is not defined then call loadItems()`, () => {
|
it(`should set _activeOption as items.length -1 if showLoadMore is not defined then call loadItems()`, () => {
|
||||||
spyOn(controller, 'loadItems');
|
spyOn(controller, 'loadItems');
|
||||||
controller.showLoadMore = undefined;
|
controller.showLoadMore = undefined;
|
||||||
controller.items = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
controller.itemsFiltered = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
||||||
controller.activeOption = 10;
|
controller.activeOption = 10;
|
||||||
$timeout.flush();
|
$timeout.flush();
|
||||||
|
|
||||||
expect(controller._activeOption).toEqual(3);
|
expect(controller.activeOption).toEqual(3);
|
||||||
expect(controller.loadItems).toHaveBeenCalledWith();
|
expect(controller.loadItems).toHaveBeenCalledWith();
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should define _activeOption as activeOption and never call loadItems()`, () => {
|
it(`should define _activeOption as activeOption and never call loadItems()`, () => {
|
||||||
spyOn(controller, 'loadItems');
|
spyOn(controller, 'loadItems');
|
||||||
controller.items = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}, {id: 5, name: 'Doctor X'}];
|
controller.itemsFiltered = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}, {id: 5, name: 'Doctor X'}];
|
||||||
controller.activeOption = 1;
|
controller.activeOption = 1;
|
||||||
$timeout.flush();
|
$timeout.flush();
|
||||||
|
|
||||||
expect(controller._activeOption).toEqual(1);
|
expect(controller.activeOption).toEqual(1);
|
||||||
expect(controller.loadItems).not.toHaveBeenCalledWith();
|
expect(controller.loadItems).not.toHaveBeenCalledWith();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -235,7 +236,7 @@ describe('Component vnDropDown', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should call clearSearch() Esc key is pressed and take off 1 from _activeOption`, () => {
|
it(`should call clearSearch() Esc key is pressed and take off 1 from _activeOption`, () => {
|
||||||
controller.items = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
controller.itemsFiltered = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
||||||
spyOn(controller, 'setScrollPosition');
|
spyOn(controller, 'setScrollPosition');
|
||||||
controller._show = true;
|
controller._show = true;
|
||||||
controller.element = document.createElement('div');
|
controller.element = document.createElement('div');
|
||||||
|
|
@ -250,7 +251,7 @@ describe('Component vnDropDown', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should call clearSearch() Esc key is pressed and add up 1 to _activeOption`, () => {
|
it(`should call clearSearch() Esc key is pressed and add up 1 to _activeOption`, () => {
|
||||||
controller.items = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
controller.itemsFiltered = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce'}, {id: 3, name: 'Logan'}, {id: 4, name: 'Wolverine'}];
|
||||||
spyOn(controller, 'setScrollPosition');
|
spyOn(controller, 'setScrollPosition');
|
||||||
controller._show = true;
|
controller._show = true;
|
||||||
controller.element = document.createElement('div');
|
controller.element = document.createElement('div');
|
||||||
|
|
@ -265,18 +266,19 @@ describe('Component vnDropDown', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('setScrollPosition()', () => {
|
// describe('setScrollPosition()', () => {
|
||||||
it(`should call child.scrollIntoView if defined `, () => {
|
// it(`should call child.scrollIntoView if defined `, () => {
|
||||||
$element[0].firstChild.setAttribute('class', 'dropdown');
|
// $element[0].firstChild.setAttribute('class', 'dropdown');
|
||||||
let child = $element[0].firstChild.firstChild;
|
// let child = $element[0].firstChild.firstChild;
|
||||||
child.scrollIntoView = () => {};
|
|
||||||
spyOn(child, 'scrollIntoView');
|
|
||||||
controller._activeOption = 0;
|
|
||||||
controller.setScrollPosition();
|
|
||||||
|
|
||||||
expect(child.scrollIntoView).toHaveBeenCalledWith();
|
// child.scrollIntoView = () => {};
|
||||||
});
|
// spyOn(child, 'scrollIntoView');
|
||||||
});
|
// controller._activeOption = 0;
|
||||||
|
// controller.setScrollPosition();
|
||||||
|
|
||||||
|
// expect(child.scrollIntoView).toHaveBeenCalledWith();
|
||||||
|
// });
|
||||||
|
// });
|
||||||
|
|
||||||
describe('selectItem()', () => {
|
describe('selectItem()', () => {
|
||||||
it(`should pass item to selected and set controller._show to false`, () => {
|
it(`should pass item to selected and set controller._show to false`, () => {
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@ vn-drop-down {
|
||||||
padding: 0 15px;
|
padding: 0 15px;
|
||||||
margin-left: -15px;
|
margin-left: -15px;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
|
max-height: 446px;
|
||||||
|
overflow: hidden;
|
||||||
.dropdown-body{
|
.dropdown-body{
|
||||||
background: white;
|
background: white;
|
||||||
border: 1px solid #A7A7A7;
|
border: 1px solid #A7A7A7;
|
||||||
|
|
@ -27,7 +29,7 @@ vn-drop-down {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
background: white;
|
background: white;
|
||||||
max-height: 400px;
|
max-height: 378px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
li {
|
li {
|
||||||
outline: none;
|
outline: none;
|
||||||
|
|
@ -55,4 +57,24 @@ vn-drop-down {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
#ddBack {
|
||||||
|
position: fixed;
|
||||||
|
z-index: 9998;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
vn-drop-down.fixed-dropDown {
|
||||||
|
position: fixed;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
.dropdown-body{
|
||||||
|
height: 100%;
|
||||||
|
ul{
|
||||||
|
border-bottom: 1px solid #A7A7A7;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<div class="icon-menu">
|
<div class="icon-menu" ng-click="$ctrl.showDropDown = true">
|
||||||
<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored icon-square icon-menu__button">
|
<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored icon-square icon-menu__button">
|
||||||
<vn-icon vn-none icon="{{::$ctrl.icon}}"></vn-icon>
|
<vn-icon vn-none icon="{{::$ctrl.icon}}"></vn-icon>
|
||||||
<vn-icon vn-none class="icon-menu__arrow_down" icon="keyboard_arrow_down" ng-click="$ctrl.showDropDown = true"></vn-icon>
|
<vn-icon vn-none class="icon-menu__arrow_down" icon="keyboard_arrow_down"></vn-icon>
|
||||||
</button>
|
</button>
|
||||||
<div ng-if="!$ctrl.findMore">
|
<div ng-if="!$ctrl.findMore">
|
||||||
<vn-drop-down
|
<vn-drop-down
|
||||||
|
|
|
||||||
|
|
@ -79,25 +79,32 @@ export default class IconMenu {
|
||||||
|
|
||||||
this.findMore = this.url && this.maxRow;
|
this.findMore = this.url && this.maxRow;
|
||||||
|
|
||||||
|
this.mouseFocus = false;
|
||||||
|
this.focused = false;
|
||||||
|
|
||||||
this.$element.bind('mouseover', e => {
|
this.$element.bind('mouseover', e => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.showDropDown = true;
|
this.mouseFocus = true;
|
||||||
|
this.showDropDown = this.focused;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$element.bind('mouseout', () => {
|
this.$element.bind('mouseout', () => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.showDropDown = false;
|
this.mouseFocus = false;
|
||||||
|
this.showDropDown = this.focused;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
this.$element.bind('focusin', e => {
|
this.$element.bind('focusin', e => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
|
this.focused = true;
|
||||||
this.showDropDown = true;
|
this.showDropDown = true;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
this.$element.bind('focusout', e => {
|
this.$element.bind('focusout', e => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.showDropDown = false;
|
this.focused = false;
|
||||||
|
this.showDropDown = this.mouseFocus;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,60 +1,60 @@
|
||||||
/**
|
/**
|
||||||
* Rewrited CSS rules from Material Design Lite.
|
* Rewrited CSS rules from Material Design Lite.
|
||||||
* TODO: don't use !important
|
* TODO: don't use !important
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.mdl-textfield {
|
.mdl-textfield {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mdl-button {
|
.mdl-button {
|
||||||
font-weight: bolder;
|
font-weight: bolder;
|
||||||
color: #ffa410;
|
color: #ffa410;
|
||||||
}
|
}
|
||||||
.mdl-button--colored {
|
.mdl-button--colored {
|
||||||
color: white !important;
|
color: white !important;
|
||||||
}
|
}
|
||||||
.mdl-button--colored,
|
.mdl-button--colored,
|
||||||
.mdl-button--colored:focus,
|
.mdl-button--colored:focus,
|
||||||
.mdl-button--colored:active {
|
.mdl-button--colored:active {
|
||||||
background-color: #ffa410 !important;
|
background-color: #ffa410 !important;
|
||||||
}
|
}
|
||||||
.mdl-button--colored:hover,
|
.mdl-button--colored:hover,
|
||||||
.mdl-button--raised:hover {
|
.mdl-button--raised:hover {
|
||||||
background-color: #ffa410 !important;
|
background-color: #ffa410 !important;
|
||||||
}
|
}
|
||||||
.mdl-button--fab{
|
.mdl-button--fab{
|
||||||
color: white !important;
|
color: white !important;
|
||||||
background-color: #ff9400 !important;
|
background-color: #ff9400 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mdl-dialog__actions--full-width>*{
|
.mdl-dialog__actions--full-width>*{
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mdl-dialog{
|
.mdl-dialog{
|
||||||
width: 400px;
|
width: 400px;
|
||||||
font-family: raleway-regular;
|
font-family: vn-font;
|
||||||
line-height:60px;
|
line-height:60px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mdl-textfield__error {
|
.mdl-textfield__error {
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
.mdl-textfield.invalid .mdl-textfield__input {
|
.mdl-textfield.invalid .mdl-textfield__input {
|
||||||
border-color: #d50000;
|
border-color: #d50000;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
.mdl-textfield.invalid .mdl-textfield__label::after {
|
.mdl-textfield.invalid .mdl-textfield__label::after {
|
||||||
background-color: #d50000;
|
background-color: #d50000;
|
||||||
}
|
}
|
||||||
.mdl-textfield--floating-label.invalid .mdl-textfield__label {
|
.mdl-textfield--floating-label.invalid .mdl-textfield__label {
|
||||||
color: #d50000;
|
color: #d50000;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
top: 4px;
|
top: 4px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,12 @@ vn-textfield {
|
||||||
top: 0px;
|
top: 0px;
|
||||||
right: -6px;
|
right: -6px;
|
||||||
margin: 22px 0px;
|
margin: 22px 0px;
|
||||||
background-color: white;
|
background: transparent;
|
||||||
|
z-index: 9999;
|
||||||
}
|
}
|
||||||
.material-icons {
|
.material-icons {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
float: right;
|
float: right;
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<mg-ajax path="/production/api/States/list" options="vnIndex as states" actions="$ctrl.states = states.model;"></mg-ajax>
|
<mg-ajax path="/production/api/States/list" options="vnIndex as states" actions="$ctrl.sharedData.states = states.model;"></mg-ajax>
|
||||||
<mg-ajax path="/production/api/FakeProductions/list" options="vnIndexNonAuto as index"></mg-ajax>
|
<mg-ajax path="/production/api/FakeProductions/list" options="vnIndexNonAuto as index"></mg-ajax>
|
||||||
<vn-card margin-large>
|
<vn-card margin-large>
|
||||||
<vn-vertical pad-medium>
|
<vn-vertical pad-medium>
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
advanced="true"
|
advanced="true"
|
||||||
popover="vn-production-filter-panel"
|
popover="vn-production-filter-panel"
|
||||||
ignore-keys = "['page', 'size', 'search', 'warehouseFk']"
|
ignore-keys = "['page', 'size', 'search', 'warehouseFk']"
|
||||||
|
data ="$ctrl.sharedData"
|
||||||
>
|
>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
|
|
||||||
|
|
@ -30,7 +31,7 @@
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal vn-one margin-large-bottom>
|
<vn-horizontal vn-one margin-large-bottom>
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<vn-production-actions tickets="$ctrl.tickets" states="$ctrl.states" hour-items="$ctrl.hourItems"></vn-production-actions>
|
<vn-production-actions tickets="$ctrl.tickets" states="$ctrl.sharedData.states" hour-items="$ctrl.sharedData.hourItems"></vn-production-actions>
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-two></vn-two>
|
<vn-two></vn-two>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ export default class ProductionIndex {
|
||||||
this.$http = $http;
|
this.$http = $http;
|
||||||
this.filter = {};
|
this.filter = {};
|
||||||
this.tickets = [];
|
this.tickets = [];
|
||||||
this.states = [];
|
|
||||||
this.checkAll = 0;
|
this.checkAll = 0;
|
||||||
this.footer = {
|
this.footer = {
|
||||||
total: null,
|
total: null,
|
||||||
|
|
@ -16,7 +16,12 @@ export default class ProductionIndex {
|
||||||
meters: null
|
meters: null
|
||||||
};
|
};
|
||||||
this._search = null;
|
this._search = null;
|
||||||
this.hourItems = [];
|
|
||||||
|
this.sharedData = {
|
||||||
|
states: [],
|
||||||
|
hourItems: []
|
||||||
|
};
|
||||||
|
|
||||||
this.child = undefined;
|
this.child = undefined;
|
||||||
this.userProfile = aclConstant.userProfile;
|
this.userProfile = aclConstant.userProfile;
|
||||||
this.filter.warehouseFk = this.userProfile.warehouseId;
|
this.filter.warehouseFk = this.userProfile.warehouseId;
|
||||||
|
|
@ -89,7 +94,7 @@ export default class ProductionIndex {
|
||||||
hour = [0, i].join('');
|
hour = [0, i].join('');
|
||||||
}
|
}
|
||||||
hour += ':00';
|
hour += ':00';
|
||||||
this.hourItems.push({id: i, name: hour});
|
this.sharedData.hourItems.push({id: i, name: hour});
|
||||||
}
|
}
|
||||||
this.filter.warehouseFk = this.$.displayValue = this.userProfile.warehouseId;
|
this.filter.warehouseFk = this.$.displayValue = this.userProfile.warehouseId;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,8 @@ export default class Controller {
|
||||||
var childCtrl = angular.element(this.child).isolateScope().$ctrl;
|
var childCtrl = angular.element(this.child).isolateScope().$ctrl;
|
||||||
childCtrl.filter = Object.assign({}, this.index.filter);
|
childCtrl.filter = Object.assign({}, this.index.filter);
|
||||||
childCtrl.onSubmit = filter => this.onChildSubmit(filter);
|
childCtrl.onSubmit = filter => this.onChildSubmit(filter);
|
||||||
|
if (this.data)
|
||||||
|
childCtrl.data = Object.assign({}, this.data);
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}
|
}
|
||||||
onChildSubmit(filter) {
|
onChildSubmit(filter) {
|
||||||
|
|
@ -112,7 +113,8 @@ ngModule.component('vnSearchbar', {
|
||||||
advanced: '=',
|
advanced: '=',
|
||||||
popover: '@',
|
popover: '@',
|
||||||
label: '@?',
|
label: '@?',
|
||||||
ignoreKeys: '<?'
|
ignoreKeys: '<?',
|
||||||
|
data: '<?'
|
||||||
},
|
},
|
||||||
controller: Controller
|
controller: Controller
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.popover-label {
|
.popover-label {
|
||||||
font-weight: bold;
|
font-family: vn-font-bold;
|
||||||
color: black;
|
color: black;
|
||||||
padding-top:5px;
|
padding-top:5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Icon cuadrado */
|
/* Icon cuadrado */
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,12 @@
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: raleway-italic;
|
font-family: vn-font-medium;
|
||||||
src: url(./fonts/Raleway-Italic.ttf);
|
src: url(./fonts/Roboto-Medium.ttf);
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: raleway-thin;
|
font-family: vn-font;
|
||||||
src: url(./fonts/Raleway-Thin.ttf);
|
src: url(./fonts/Roboto.ttf);
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: raleway-regular;
|
font-family: vn-font-bold;
|
||||||
src: url(./fonts/Raleway-Regular.ttf);
|
src: url(./fonts/Roboto-Bold.ttf);
|
||||||
}
|
}
|
||||||
@font-face {
|
|
||||||
font-family: raleway-bold;
|
|
||||||
src: url(./fonts/Raleway-Bold.ttf);
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: raleway-semi-bold;
|
|
||||||
src: url(./fonts/Raleway-SemiBold.ttf);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
@import "colors";
|
@import "colors";
|
||||||
@import "font-family";
|
@import "font-family";
|
||||||
|
|
||||||
$font-color: $color-dark-grey;
|
$font-color: $color-dark-grey;
|
||||||
|
|
||||||
body {
|
body {
|
||||||
color: $font-color;
|
color: $font-color;
|
||||||
font-family: raleway-regular;
|
font-family: vn-font;
|
||||||
}
|
}
|
||||||
html [uppercase], .uppercase {
|
html [uppercase], .uppercase {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -64,7 +64,7 @@ html [vn-center], .vn-center{
|
||||||
.tooltip {
|
.tooltip {
|
||||||
.list-header{
|
.list-header{
|
||||||
border-bottom: 3px solid $color-medium-grey;
|
border-bottom: 3px solid $color-medium-grey;
|
||||||
font-weight: bold;
|
font-family: vn-font-bold;
|
||||||
text-align: center
|
text-align: center
|
||||||
}
|
}
|
||||||
.list-element{
|
.list-element{
|
||||||
|
|
@ -72,7 +72,7 @@ html [vn-center], .vn-center{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.list-footer{
|
.list-footer{
|
||||||
font-weight: bold;
|
font-family: vn-font-bold;
|
||||||
border-top: 3px solid $color-medium-grey;
|
border-top: 3px solid $color-medium-grey;
|
||||||
}
|
}
|
||||||
.list-element.warning{
|
.list-element.warning{
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
font-size: 32pt;
|
font-size: 32pt;
|
||||||
}
|
}
|
||||||
h2 {
|
h2 {
|
||||||
font-size: 28pt;
|
font-size: 28pt;
|
||||||
}
|
}
|
||||||
h3 {
|
h3 {
|
||||||
font-size: 24pt;
|
font-size: 24pt;
|
||||||
}
|
}
|
||||||
h4 {
|
h4 {
|
||||||
font-size: 20pt;
|
font-size: 20pt;
|
||||||
}
|
}
|
||||||
h5 {
|
h5 {
|
||||||
font-size: 16pt;
|
font-size: 16pt;
|
||||||
}
|
}
|
||||||
h6 {
|
h6 {
|
||||||
font-size: 12pt;
|
font-size: 12pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
h1, h2, h3, h4, h5, h6 {
|
h1, h2, h3, h4, h5, h6 {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin: .4em 0;
|
margin: .4em 0;
|
||||||
font-family: raleway-semi-bold;
|
font-family: vn-font-bold;
|
||||||
}
|
}
|
||||||
|
|
@ -85,7 +85,6 @@ module.exports = function(app) {
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get('/logout', function(req, res) {
|
app.get('/logout', function(req, res) {
|
||||||
console.log(req.accessToken);
|
|
||||||
User.logout(req.accessToken.id,
|
User.logout(req.accessToken.id,
|
||||||
() => res.redirect('/'));
|
() => res.redirect('/'));
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"user": {
|
"user": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"AccessToken": {
|
"AccessToken": {
|
||||||
"dataSource": "auth",
|
"dataSource": "salix",
|
||||||
"relations": {
|
"relations": {
|
||||||
"user": {
|
"user": {
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
|
|
@ -13,15 +13,15 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ACL": {
|
"ACL": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"RoleMapping": {
|
"RoleMapping": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Role": {
|
"Role": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Account": {
|
"Account": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -49,7 +49,7 @@ module.exports = function(Client) {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'content-type': 'application/json',
|
'content-type': 'application/json',
|
||||||
'authorization': ctx.req.headers.authorization
|
'Authorization': ctx.req.headers.authorization
|
||||||
},
|
},
|
||||||
json: {}
|
json: {}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,10 @@ module.exports = function(Client) {
|
||||||
|
|
||||||
Client.employeeList = function(callback) {
|
Client.employeeList = function(callback) {
|
||||||
let query = `SELECT em.id, CASE em.surname WHEN NULL THEN em.name ELSE concat(em.name, " ", em.surname) END \`name\`
|
let query = `SELECT em.id, CASE em.surname WHEN NULL THEN em.name ELSE concat(em.name, " ", em.surname) END \`name\`
|
||||||
FROM Employee em
|
FROM salix.Employee em
|
||||||
JOIN Account ac ON em.userFk = ac.id
|
JOIN salix.Account ac ON em.userFk = ac.id
|
||||||
JOIN RoleMapping rm on ac.id=rm.principalId
|
JOIN salix.RoleMapping rm on ac.id=rm.principalId
|
||||||
JOIN Role rl on rm.roleId = rl.id
|
JOIN salix.Role rl on rm.roleId = rl.id
|
||||||
WHERE ac.active
|
WHERE ac.active
|
||||||
and rl.\`name\`='employee'
|
and rl.\`name\`='employee'
|
||||||
ORDER BY em.name ASC`;
|
ORDER BY em.name ASC`;
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ module.exports = Client => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Client.getRoleCustomer = (id, context, callback) => {
|
Client.getRoleCustomer = (id, context, callback) => {
|
||||||
let query = `SELECT count(*) isCustomer FROM Account ac JOIN Role ON Role.id = ac.roleFK WHERE Role.\`name\`='customer' AND ac.id IN (?)`;
|
let query = `SELECT count(*) isCustomer FROM salix.Account ac JOIN salix.Role r ON r.id = ac.roleFK WHERE r.\`name\`='customer' AND ac.id IN (?)`;
|
||||||
const params = [id];
|
const params = [id];
|
||||||
Client.rawSql(query, params, callback)
|
Client.rawSql(query, params, callback)
|
||||||
.then(response => {
|
.then(response => {
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@ module.exports = Client => {
|
||||||
let where = getCondition(filter.where, limit, skip);
|
let where = getCondition(filter.where, limit, skip);
|
||||||
|
|
||||||
let query = `SELECT em.id, em.name, em.surname
|
let query = `SELECT em.id, em.name, em.surname
|
||||||
FROM Employee em
|
FROM salix.Employee em
|
||||||
JOIN Account ac ON em.userFk = ac.id
|
JOIN salix.Account ac ON em.userFk = ac.id
|
||||||
JOIN Role ON Role.id = ac.roleFK
|
JOIN salix.Role r ON r.id = ac.roleFK
|
||||||
WHERE ac.active AND Role.\`name\`='salesPerson' ${where.sql}
|
WHERE ac.active AND r.\`name\`='salesPerson' ${where.sql}
|
||||||
ORDER BY em.name ASC
|
ORDER BY em.name ASC
|
||||||
LIMIT ? OFFSET ?`;
|
LIMIT ? OFFSET ?`;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "Client",
|
"name": "Client",
|
||||||
"base": "VnModel",
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "client",
|
||||||
|
"database": "vn"
|
||||||
|
}
|
||||||
|
},
|
||||||
"properties": {
|
"properties": {
|
||||||
"id": {
|
"id": {
|
||||||
"type": "Number",
|
"type": "Number",
|
||||||
|
|
@ -39,15 +45,9 @@
|
||||||
"mobile": {
|
"mobile": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"fax": {
|
"isActive": {
|
||||||
"type": "string"
|
|
||||||
},
|
|
||||||
"active": {
|
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"discount":{
|
|
||||||
"type": "Number"
|
|
||||||
},
|
|
||||||
"credit": {
|
"credit": {
|
||||||
"type": "Number"
|
"type": "Number"
|
||||||
},
|
},
|
||||||
|
|
@ -60,7 +60,7 @@
|
||||||
"dueDay": {
|
"dueDay": {
|
||||||
"type": "Number"
|
"type": "Number"
|
||||||
},
|
},
|
||||||
"equalizationTax": {
|
"isEqualizated": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "The client has equalization tax"
|
"description": "The client has equalization tax"
|
||||||
},
|
},
|
||||||
|
|
@ -76,13 +76,16 @@
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Send invoices by email"
|
"description": "Send invoices by email"
|
||||||
},
|
},
|
||||||
"sepaVnl": {
|
"hasSepaVnl": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"coreVnl": {
|
"hasCoreVnl": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"coreVnh": {
|
"hasCoreVnh": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"isTaxDataChecked":{
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"eypbc": {
|
"eypbc": {
|
||||||
|
|
@ -91,7 +94,7 @@
|
||||||
"quality": {
|
"quality": {
|
||||||
"type": "Number"
|
"type": "Number"
|
||||||
},
|
},
|
||||||
"vies": {
|
"isVies": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"isRelevant": {
|
"isRelevant": {
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"user": {
|
"user": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"AccessToken": {
|
"AccessToken": {
|
||||||
"dataSource": "auth",
|
"dataSource": "salix",
|
||||||
"relations": {
|
"relations": {
|
||||||
"user": {
|
"user": {
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
|
|
@ -13,51 +13,51 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ACL": {
|
"ACL": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"RoleMapping": {
|
"RoleMapping": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Role": {
|
"Role": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Account": {
|
"Account": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Client": {
|
"Client": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"ClientCredit": {
|
"ClientCredit": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"ClientCreditLimit": {
|
"ClientCreditLimit": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"ClientObservation": {
|
"ClientObservation": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"PayMethod": {
|
"PayMethod": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Address": {
|
"Address": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"AgencyMode": {
|
"AgencyMode": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Province": {
|
"Province": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Country": {
|
"Country": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"ContactChannel": {
|
"ContactChannel": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Employee": {
|
"Employee": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"CreditClassification": {
|
"CreditClassification": {
|
||||||
"dataSource": "vn"
|
"dataSource": "salix"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,17 @@
|
||||||
{
|
{
|
||||||
"db":
|
"vn": {
|
||||||
{
|
|
||||||
"name": "db",
|
|
||||||
"connector": "memory",
|
|
||||||
"file": "db.json"
|
|
||||||
},
|
|
||||||
"auth":
|
|
||||||
{
|
|
||||||
"name": "mysql",
|
"name": "mysql",
|
||||||
"connector": "mysql",
|
"connector": "mysql",
|
||||||
"database": "salix",
|
"database": "vn",
|
||||||
"debug": false,
|
"debug": false,
|
||||||
"host": "localhost",
|
"host": "localhost",
|
||||||
"port": 3306,
|
"port": 3306,
|
||||||
"username": "root",
|
"username": "root",
|
||||||
"password": ""
|
"password": "",
|
||||||
|
"connectTimeout": 20000,
|
||||||
|
"acquireTimeout": 20000
|
||||||
},
|
},
|
||||||
"vn": {
|
"salix": {
|
||||||
"name": "mysql",
|
"name": "mysql",
|
||||||
"connector": "mysql",
|
"connector": "mysql",
|
||||||
"database": "salix",
|
"database": "salix",
|
||||||
|
|
@ -27,11 +22,6 @@
|
||||||
"password": "",
|
"password": "",
|
||||||
"connectTimeout": 20000,
|
"connectTimeout": 20000,
|
||||||
"acquireTimeout": 20000
|
"acquireTimeout": 20000
|
||||||
},
|
|
||||||
"client": {
|
|
||||||
"name": "client",
|
|
||||||
"connector": "remote",
|
|
||||||
"url": "http://localhost:3002/api"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,10 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"user": {
|
"user": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"AccessToken": {
|
"AccessToken": {
|
||||||
"dataSource": "auth",
|
"dataSource": "salix",
|
||||||
"relations": {
|
"relations": {
|
||||||
"user": {
|
"user": {
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
|
|
@ -27,15 +27,15 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ACL": {
|
"ACL": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"RoleMapping": {
|
"RoleMapping": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Role": {
|
"Role": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
},
|
},
|
||||||
"Account": {
|
"Account": {
|
||||||
"dataSource": "auth"
|
"dataSource": "salix"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
var database = require('./database.js');
|
var database = require('./database.js');
|
||||||
|
let config = require('./config.js');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|
||||||
|
|
@ -31,7 +32,23 @@ module.exports = {
|
||||||
if (this.isTokenExpired(token.created, token.ttl))
|
if (this.isTokenExpired(token.created, token.ttl))
|
||||||
return this.response.status(401).send({message: 'Token expired'});
|
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();
|
this.next();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -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')
|
||||||
|
return require(configPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
config.proxy = require('../../nginx/config.json');
|
||||||
|
config.package = require('../package.json');
|
||||||
|
|
||||||
|
module.exports = config;
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
{
|
|
||||||
"name": "MailServer",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"port": 3003,
|
|
||||||
"debug": false,
|
|
||||||
"defaultLanguage": "es",
|
|
||||||
"senderMail": "noreply@localhost",
|
|
||||||
"senderName": ""
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
{
|
|
||||||
"name": "MailServer",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"port": 3003,
|
|
||||||
"debug": false,
|
|
||||||
"defaultLanguage": "es",
|
|
||||||
"senderMail": "noreply@localhost",
|
|
||||||
"senderName": ""
|
|
||||||
}
|
|
||||||
|
|
@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"host": "localhost",
|
|
||||||
"port": 3306,
|
|
||||||
"user": "reports",
|
|
||||||
"password": "",
|
|
||||||
"database": ""
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"host": "localhost",
|
|
||||||
"port": 3306,
|
|
||||||
"user": "root",
|
|
||||||
"password": "",
|
|
||||||
"database": "vn"
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
"host": "localhost",
|
|
||||||
"port": 465,
|
|
||||||
"secure": true,
|
|
||||||
"auth": {
|
|
||||||
"user": "noreply",
|
|
||||||
"pass": ""
|
|
||||||
},
|
|
||||||
"tls": {
|
|
||||||
"rejectUnauthorized": false
|
|
||||||
},
|
|
||||||
"pool": true
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
var mysql = require('mysql');
|
var mysql = require('mysql');
|
||||||
let settings = require('./settings.js');
|
let config = require('./config.js');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
/**
|
/**
|
||||||
|
|
@ -11,12 +11,12 @@ module.exports = {
|
||||||
* Start database pool
|
* Start database pool
|
||||||
*/
|
*/
|
||||||
init: function() {
|
init: function() {
|
||||||
this.pool = mysql.createPool(settings.mysql());
|
this.pool = mysql.createPool(config.mysql);
|
||||||
|
|
||||||
this.pool.getConnection(function(error, connection) {
|
this.pool.getConnection(function(error, connection) {
|
||||||
if (error) {
|
if (error) {
|
||||||
throw new Error('Can\'t connect to database: ' + error.code);
|
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');
|
console.log('Database connection stablished');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -27,7 +27,7 @@ module.exports = {
|
||||||
*/
|
*/
|
||||||
testEmail: function() {
|
testEmail: function() {
|
||||||
this.pool.query('SELECT fakeEmail as email FROM vn.config', function(error, qryRs) {
|
this.pool.query('SELECT fakeEmail as email FROM vn.config', function(error, qryRs) {
|
||||||
settings.testEmail = qryRs[0].email;
|
config.smtp.testEmail = qryRs[0].email;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var settings = require('./settings.js');
|
var config = require('./config.js');
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|
@ -11,7 +11,7 @@ module.exports = {
|
||||||
*/
|
*/
|
||||||
load: function(template, countryCode, cb) {
|
load: function(template, countryCode, cb) {
|
||||||
var localeFile = path.join(__dirname, 'template', `${template}`, 'locale', `${countryCode}.json`);
|
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) => {
|
fs.stat(localeFile, (error, stats) => {
|
||||||
if (error) {
|
if (error) {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
var nodemailer = require('nodemailer');
|
var nodemailer = require('nodemailer');
|
||||||
var settings = require('./settings.js');
|
var config = require('./config.js');
|
||||||
var template = require('./template.js');
|
var template = require('./template.js');
|
||||||
var database = require('./database.js');
|
var database = require('./database.js');
|
||||||
|
|
||||||
|
|
@ -9,15 +9,15 @@ var database = require('./database.js');
|
||||||
module.exports = {
|
module.exports = {
|
||||||
transporter: null,
|
transporter: null,
|
||||||
/**
|
/**
|
||||||
* Load mail settings.
|
* Load mail config.
|
||||||
*/
|
*/
|
||||||
init: function() {
|
init: function() {
|
||||||
this.transporter = nodemailer.createTransport(settings.smtp());
|
this.transporter = nodemailer.createTransport(config.smtp);
|
||||||
|
|
||||||
this.transporter.verify(function(error, success) {
|
this.transporter.verify(function(error, success) {
|
||||||
if (error) {
|
if (error) {
|
||||||
throw new Error(error);
|
throw new Error(error);
|
||||||
} else if (settings.app().debug) {
|
} else if (config.app.debug) {
|
||||||
console.log('SMTP connection stablished');
|
console.log('SMTP connection stablished');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -34,15 +34,15 @@ module.exports = {
|
||||||
*/
|
*/
|
||||||
send: function(recipient, subject, body, attachments, params, cb) {
|
send: function(recipient, subject, body, attachments, params, cb) {
|
||||||
let mailOptions = {
|
let mailOptions = {
|
||||||
from: '"' + settings.app().senderName + '" <' + settings.app().senderMail + '>',
|
from: '"' + config.app.senderName + '" <' + config.app.senderMail + '>',
|
||||||
to: recipient,
|
to: recipient,
|
||||||
subject: subject,
|
subject: subject,
|
||||||
html: body,
|
html: body,
|
||||||
attachments
|
attachments
|
||||||
};
|
};
|
||||||
|
|
||||||
if (settings.app().debug) {
|
if (config.app.debug) {
|
||||||
mailOptions.to = settings.testEmail;
|
mailOptions.to = config.smtp.testEmail;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.transporter.sendMail(mailOptions, (error, info) => {
|
this.transporter.sendMail(mailOptions, (error, info) => {
|
||||||
|
|
@ -53,7 +53,7 @@ module.exports = {
|
||||||
if (error)
|
if (error)
|
||||||
return cb(new Error('Email not sent: ' + 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 + ']');
|
console.log('Mail sent ' + info.messageId + ' [' + info.response + ']');
|
||||||
|
|
||||||
cb();
|
cb();
|
||||||
|
|
@ -70,10 +70,16 @@ module.exports = {
|
||||||
* @param {Object} cb - Callback
|
* @param {Object} cb - Callback
|
||||||
*/
|
*/
|
||||||
sendWithTemplate: function(tplName, params, cb) {
|
sendWithTemplate: function(tplName, params, cb) {
|
||||||
template.get(tplName, params, false, (error, result) => {
|
template.get(tplName, params, (error, result) => {
|
||||||
if (error)
|
if (error)
|
||||||
return cb(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 => {
|
this.send(result.recipient, result.subject, result.body, result.attachments, params, error => {
|
||||||
if (error)
|
if (error)
|
||||||
return cb(error);
|
return cb(error);
|
||||||
|
|
@ -96,10 +102,10 @@ module.exports = {
|
||||||
log: function(senderId, recipientId, sender, subject, body, plainTextBody, status) {
|
log: function(senderId, recipientId, sender, subject, body, plainTextBody, status) {
|
||||||
let qry = `INSERT INTO mail(senderFk, recipientFk, sender, replyTo, subject, body, plainTextBody, sent, status)
|
let qry = `INSERT INTO mail(senderFk, recipientFk, sender, replyTo, subject, body, plainTextBody, sent, status)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`;
|
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) {
|
database.pool.query(qry, qryParams, function(error, result) {
|
||||||
if (settings.app().debug && error)
|
if (config.app.debug && error)
|
||||||
console.log('Mail log: ' + error);
|
console.log('Mail log: ' + error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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;
|
|
||||||
|
|
@ -1,8 +1,92 @@
|
||||||
var express = require('express');
|
var express = require('express');
|
||||||
var router = new express.Router();
|
var router = new express.Router();
|
||||||
|
var config = require('../config.js');
|
||||||
var mail = require('../mail.js');
|
var mail = require('../mail.js');
|
||||||
var database = require('../database.js');
|
var template = require('../template.js');
|
||||||
var settings = require('../settings.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
|
// Single user notification
|
||||||
/* router.post('/:recipient/noticeUserSend', function(request, response) {
|
/* 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
|
// Send notification to alias creditInsurance on client deactivate
|
||||||
router.post('/client-deactivate/:clientId', function(request, response) {
|
router.post('/client-deactivate/:clientId', function(request, response) {
|
||||||
var params = {
|
var params = {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,11 @@
|
||||||
var express = require('express');
|
var express = require('express');
|
||||||
var router = new express.Router();
|
var router = new express.Router();
|
||||||
var settings = require('./settings.js');
|
|
||||||
|
|
||||||
// Mailer default page
|
// Mailer default page
|
||||||
router.get('/', function(request, response) {
|
router.get('/', function(request, response) {
|
||||||
response.json({});
|
response.json({});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Manuscripts
|
|
||||||
router.use('/manuscript', require('./route/manuscript.js'));
|
|
||||||
|
|
||||||
// Notifications
|
// Notifications
|
||||||
router.use('/notification', require('./route/notification.js'));
|
router.use('/notification', require('./route/notification.js'));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var mustache = require('mustache');
|
var mustache = require('mustache');
|
||||||
var locale = require('./locale.js');
|
var locale = require('./locale.js');
|
||||||
var path = require('path');
|
|
||||||
var inlineCss = require('inline-css');
|
var inlineCss = require('inline-css');
|
||||||
|
var path = require('path');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
/**
|
/**
|
||||||
|
|
@ -12,10 +12,10 @@ module.exports = {
|
||||||
* @param {Object} params - Params
|
* @param {Object} params - Params
|
||||||
* @param {Object} cb - Callback
|
* @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 templatePath = path.join(__dirname, 'template', `${template}`, `index.html`);
|
||||||
var classPath = path.join(__dirname, 'template', `${template}`, `${template}.js`);
|
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) => {
|
fs.stat(templatePath, (error, stat) => {
|
||||||
if (error)
|
if (error)
|
||||||
|
|
@ -24,14 +24,26 @@ module.exports = {
|
||||||
let TemplateClass = require(classPath);
|
let TemplateClass = require(classPath);
|
||||||
let instance = new TemplateClass();
|
let instance = new TemplateClass();
|
||||||
|
|
||||||
let getRenderedStyles = body => {
|
let getRenderedStyles = (error, body) => {
|
||||||
|
if (error)
|
||||||
|
return cb(error);
|
||||||
|
|
||||||
this.renderStyles(stylePath, body, (error, body) => {
|
this.renderStyles(stylePath, body, (error, body) => {
|
||||||
|
if (error)
|
||||||
|
return cb(error);
|
||||||
|
|
||||||
|
// Check if has a subject param
|
||||||
params.subject = params.subject || instance.subject;
|
params.subject = params.subject || instance.subject;
|
||||||
|
|
||||||
if (params.subject == undefined)
|
if (params.subject == undefined) {
|
||||||
params.subject = body.match(new RegExp('<title>(.*?)</title>', 'i'))[1];
|
// Try to find a subject from Html source
|
||||||
|
let title = body.match(new RegExp('<title>(.*?)</title>', 'i'));
|
||||||
|
|
||||||
this.getAttachments(template, body, isPreview, (error, result) => {
|
if (title)
|
||||||
|
params.subject = title[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
this.getAttachments(template, body, params.isPreview, (error, result) => {
|
||||||
if (error)
|
if (error)
|
||||||
return cb(error);
|
return cb(error);
|
||||||
|
|
||||||
|
|
@ -41,7 +53,7 @@ module.exports = {
|
||||||
};
|
};
|
||||||
|
|
||||||
let getDataCb = () => {
|
let getDataCb = () => {
|
||||||
this.render(templatePath, instance, (error, result) => getRenderedStyles(result));
|
this.render(templatePath, instance, (error, result) => getRenderedStyles(error, result));
|
||||||
};
|
};
|
||||||
|
|
||||||
instance.getData(params, (error, result) => {
|
instance.getData(params, (error, result) => {
|
||||||
|
|
@ -66,9 +78,54 @@ module.exports = {
|
||||||
* @param {Object} cb - Callback
|
* @param {Object} cb - Callback
|
||||||
*/
|
*/
|
||||||
render: function(path, data, cb) {
|
render: function(path, data, cb) {
|
||||||
fs.readFile(path, 'utf8', function(error, body) {
|
fs.readFile(path, 'utf8', (error, body) => {
|
||||||
mustache.parse(body);
|
// Find matching sub-templates
|
||||||
cb(null, mustache.render(body, data));
|
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 {String} body - Rendered html
|
||||||
* @param {Object} cb - Callback
|
* @param {Object} cb - Callback
|
||||||
*/
|
*/
|
||||||
renderStyles: function(path, html, cb) {
|
renderStyles: function(stylePath, html, cb) {
|
||||||
fs.stat(path, error => {
|
// Common components
|
||||||
if (error) return cb(new Error('Template stylesheet not found'));
|
let comPath = path.join(__dirname, '../', 'static', 'css', 'component.css');
|
||||||
fs.readFile(path, 'utf8', (error, css) => {
|
|
||||||
let style = '<style>' + css + '</style>';
|
|
||||||
let body = style + html;
|
|
||||||
let options = {url: ' '};
|
|
||||||
|
|
||||||
inlineCss(body, options)
|
fs.readFile(comPath, 'utf8', (error, comCss) => {
|
||||||
.then(function(body) {
|
fs.stat(stylePath, error => {
|
||||||
cb(null, body);
|
if (error)
|
||||||
});
|
return cb(new Error('Template stylesheet not found'));
|
||||||
|
|
||||||
|
fs.readFile(stylePath, 'utf8', (error, css) => {
|
||||||
|
let style = '<style>' + comCss + css + '</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 attachments = [];
|
||||||
let tplAttachments = body.match(new RegExp('src="cid:(.*?)"', 'ig'));
|
let tplAttachments = body.match(new RegExp('src="cid:(.*?)"', 'ig'));
|
||||||
|
|
||||||
|
if (!tplAttachments)
|
||||||
|
tplAttachments = {};
|
||||||
|
|
||||||
// Template default attachments
|
// Template default attachments
|
||||||
for (var i = 0; i < tplAttachments.length; i++) {
|
for (var i = 0; i < tplAttachments.length; i++) {
|
||||||
let name = tplAttachments[i].replace('src="cid:', '').replace('"', '');
|
let name = tplAttachments[i].replace('src="cid:', '').replace('"', '');
|
||||||
|
|
@ -125,7 +192,7 @@ module.exports = {
|
||||||
|
|
||||||
fs.stat(attachmentsPath, (error, stats) => {
|
fs.stat(attachmentsPath, (error, stats) => {
|
||||||
if (error)
|
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);
|
let attachObj = require(attachmentsPath);
|
||||||
|
|
||||||
|
|
@ -145,10 +212,10 @@ module.exports = {
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check all template attachments
|
* Check all template attachments
|
||||||
* @param {Object} attachments - Attachments object
|
* @param {Object} attachments - Attachments object
|
||||||
* @param {Object} cb - Callback
|
* @param {Object} cb - Callback
|
||||||
*/
|
*/
|
||||||
checkAttachments: function(attachments, cb) {
|
checkAttachments: function(attachments, cb) {
|
||||||
for (var i = 0; i < attachments.length; i++) {
|
for (var i = 0; i < attachments.length; i++) {
|
||||||
var attachment = attachments[i];
|
var attachment = attachments[i];
|
||||||
|
|
@ -159,4 +226,4 @@ module.exports = {
|
||||||
}
|
}
|
||||||
cb();
|
cb();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -5,6 +5,7 @@ var format = require(path.join(__dirname, '../../util/format.js'));
|
||||||
module.exports = class ClientWelcome {
|
module.exports = class ClientWelcome {
|
||||||
getData(params, cb) {
|
getData(params, cb) {
|
||||||
let query = `SELECT
|
let query = `SELECT
|
||||||
|
c.id clientId,
|
||||||
CONCAT(w.name, ' ', w.firstName) name,
|
CONCAT(w.name, ' ', w.firstName) name,
|
||||||
w.phone AS phone,
|
w.phone AS phone,
|
||||||
CONCAT(wu.name, '@verdnatura.es') AS email,
|
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
|
LEFT JOIN account.user wu ON wu.id = w.userFk
|
||||||
JOIN country ct ON ct.id = c.countryFk
|
JOIN country ct ON ct.id = c.countryFk
|
||||||
WHERE c.id = ?`;
|
WHERE c.id = ?`;
|
||||||
database.pool.query(query, [params.recipient], (error, result) => {
|
database.pool.query(query, [params.clientId], (error, result) => {
|
||||||
if (error || result.length == 0)
|
if (error || result.length == 0)
|
||||||
return cb(new Error('No template data found'));
|
return cb(new Error('No template data found'));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,9 @@
|
||||||
<body>
|
<body>
|
||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<!-- Banner block -->
|
<!-- Header block -->
|
||||||
<div class="banner">
|
{{$.header}}
|
||||||
<a href="https://www.verdnatura.es"/><img src="cid:header.png" alt="VerdNatura"/></a>
|
<!-- Header block end -->
|
||||||
</div>
|
|
||||||
<!-- Banner block end -->
|
|
||||||
|
|
||||||
<!-- Title block -->
|
<!-- Title block -->
|
||||||
<div class="title">
|
<div class="title">
|
||||||
|
|
@ -21,108 +19,47 @@
|
||||||
|
|
||||||
<!-- Mail body block -->
|
<!-- Mail body block -->
|
||||||
<div class="body">
|
<div class="body">
|
||||||
<p style="text-align: justify">{{_.dear}},</p>
|
<p>{{_.dear}}</p>
|
||||||
<p style="text-align: justify">{{_.bodyDescription}}</p>
|
<p>{{{_.bodyDescription}}}</p>
|
||||||
|
|
||||||
<p style="text-align: justify">
|
|
||||||
Sus datos para poder comprar en la web de verdnatura (<a href="https://www.verdnatura.es" title="Visitar Verdnatura" target="_blank" style="color:#8dba25">https://www.verdnatura.es</a>)
|
|
||||||
o en nuestras aplicaciones para iOS (<a href="https://goo.gl/3hC2mG" title="App Store" target="_blank" style="color:#8dba25">https://goo.gl/3hC2mG</a>) y Android (<a href="https://goo.gl/8obvLc" title="Google Play" target="_blank" style="color:#8dba25">https://goo.gl/8obvLc</a>), son:
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<div>Usuario: <strong>{{userName}}</strong></div>
|
<div>{{_.user}} <strong>{{userName}}</strong></div>
|
||||||
<div>Contraseña: <strong>********</strong> (Va a recibir un correo para establecer la contraseña)</div>
|
<div>{{_.password}} <strong>********</strong> {{_.passwordResetText}}</div>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h1 style="color:#999">Cómo hacer un pedido</h1>
|
<h1>{{_.sectionHowToBuyTitle}}</h1>
|
||||||
|
<p>{{_.sectionHowToBuyDescription}}</p>
|
||||||
<p style="text-align: justify">Para realizar un pedido en nuestra web, debe configurarlo indicando:</p>
|
|
||||||
|
|
||||||
<ol>
|
<ol>
|
||||||
<li>Si quiere recibir el pedido (por agencia o por nuestro propio reparto) o si lo prefiere recoger en alguno de nuestros almacenes.</li>
|
<li>{{_.sectionHowToBuyRequeriment1}}</li>
|
||||||
<li>La fecha en la que quiera recibir el pedido (se preparará el día anterior).</li>
|
<li>{{_.sectionHowToBuyRequeriment2}}</li>
|
||||||
<li>La dirección de entrega o el almacén donde quiera recoger el pedido.</li>
|
<li>{{_.sectionHowToBuyRequeriment3}}</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
<p>{{_.sectionHowToBuyStock}}</p>
|
||||||
<p style="text-align: justify">En nuestra web y aplicaciones puedes visualizar el stock disponible de flor cortada, verdes, plantas, complementos y artificial.
|
<p>{{_.sectionHowToBuyDelivery}}</p>
|
||||||
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.</p>
|
|
||||||
|
<h1>{{_.sectionHowToPayTitle}}</h1>
|
||||||
<p style="text-align: justify">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
|
<p>{{_.sectionHowToPayDescription}}</p>
|
||||||
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. </p>
|
|
||||||
|
|
||||||
<h1 style="color:#999">Cómo pagar</h1>
|
|
||||||
|
|
||||||
<p style="text-align: justify">Las formas de pago admitidas en Verdnatura son</p>
|
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>Con <strong>tarjeta</strong> a través de nuestra plataforma web (al confirmar el pedido).</li>
|
<li>{{{_.sectionHowToPayOption1}}}</li>
|
||||||
<li>Mediante <strong>giro bancario mensual</strong>, modalidad que hay que solicitar y tramitar.</li>
|
<li>{{{_.sectionHowToPayOption2}}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<h1 style="color:#999">Cosas a tener en cuenta</h1>
|
<h1>{{_.sectionToConsiderTitle}}</h1>
|
||||||
|
<p>{{_.sectionToConsiderDescription}}</p>
|
||||||
<p style="text-align: justify">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.</p>
|
|
||||||
|
|
||||||
<h3 style="font-size:16px">POLÍTICA DE RECLAMACIONES</h3>
|
|
||||||
|
|
||||||
<p style="text-align: justify">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.</p>
|
|
||||||
|
|
||||||
<p style="text-align: justify">Cualquier duda que le surja, no dude en consultarla, <strong>¡estamos para atenderle!</strong></p>
|
|
||||||
|
|
||||||
|
<h3>{{_.sectionClaimsPolicyTitle}}</h3>
|
||||||
|
<p>{{_.sectionClaimsPolicyDescription}}</p>
|
||||||
|
<p>{{{_.doubtsText}}}</p>
|
||||||
<p>
|
<p>
|
||||||
{{{salesPersonName}}}
|
{{{salesPersonName}}}
|
||||||
{{{salesPersonPhone}}}
|
{{{salesPersonPhone}}}
|
||||||
{{{salesPersonEmail}}}
|
{{{salesPersonEmail}}}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!-- Mail body block end -->
|
<!-- Mail body block end -->
|
||||||
|
|
||||||
<!-- Action button block -->
|
|
||||||
<div class="buttons">
|
|
||||||
<a href="https://www.verdnatura.es" target="_blank"><div class="btn">
|
|
||||||
<span class="text">{{_.actionButton}}</span>
|
|
||||||
<span class="icon"><img src="cid:action.png"/></span>
|
|
||||||
</div></a><a href="https://goo.gl/forms/j8WSL151ZW6QtlT72" target="_blank"><div class="btn">
|
|
||||||
<span class="text">{{_.infoButton}}</span>
|
|
||||||
<span class="icon"><img src="cid:info.png"/></span>
|
|
||||||
</div></a>
|
|
||||||
</div>
|
|
||||||
<!-- Action button block -->
|
|
||||||
|
|
||||||
<!-- Networks block -->
|
<!-- Footer block -->
|
||||||
<div class="footer">
|
{{$.footer}}
|
||||||
<a href="https://www.facebook.com/Verdnatura" target="_blank">
|
<!-- Footer block end -->
|
||||||
<img src="cid:facebook.png" alt="Facebook"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.twitter.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:twitter.png" alt="Twitter"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.youtube.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:youtube.png" alt="Youtube"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.pinterest.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:pinterest.png" alt="Pinterest"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.instagram.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:instagram.png" alt="Instagram"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.linkedin.com/company/verdnatura" target="_blank">
|
|
||||||
<img src="cid:linkedin.png" alt="Linkedin"/>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<!-- Networks block end -->
|
|
||||||
|
|
||||||
<!-- Privacy block -->
|
|
||||||
<div class="privacy">
|
|
||||||
<p style="text-align: justify">{{_.fiscalAddress}}</p>
|
|
||||||
<p style="text-align: justify">{{_.privacy}}</p>
|
|
||||||
<p style="text-align: justify">{{_.privacyLaw}}</p>
|
|
||||||
</div>
|
|
||||||
<!-- Privacy block end -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,28 @@
|
||||||
{
|
{
|
||||||
"subject": "¡Le damos la bienvenida!",
|
"subject": "¡Le damos la bienvenida!",
|
||||||
"title": "¡LE DAMOS LA BIENVENIDA!",
|
"title": "¡LE DAMOS LA BIENVENIDA!",
|
||||||
"dear": "Estimado cliente",
|
"dear": "Estimado cliente,",
|
||||||
"bodyDescription": "Siga las intrucciones especificadas en este correo para llevar a cabo la instalación de la impresora.",
|
"bodyDescription": "Sus datos para poder comprar en la web de verdnatura (<a href=\"https://www.verdnatura.es\" title=\"Visitar Verdnatura\" target=\"_blank\">https://www.verdnatura.es</a>) o en nuestras aplicaciones para <a href=\"https://goo.gl/3hC2mG\" title=\"App Store\" target=\"_blank\">iOS</a> y <a href=\"https://goo.gl/8obvLc\" title=\"Google Play\" target=\"_blank\">Android</a> (<a href=\"https://www.youtube.com/watch?v=gGfEtFm8qkw\" target=\"_blank\"><strong>Ver tutorial de uso</strong></a>), 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 <strong>tarjeta</strong> a través de nuestra plataforma web (al confirmar el pedido).",
|
||||||
|
"sectionHowToPayOption2": "Mediante <strong>giro bancario mensual</strong>, 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, <strong>¡estamos para atenderle!</strong>",
|
||||||
"salesPersonNameText": "Soy tu comercial y mi nombre es",
|
"salesPersonNameText": "Soy tu comercial y mi nombre es",
|
||||||
"salesPersonPhoneText": "Teléfono y whatsapp",
|
"salesPersonPhoneText": "Teléfono y whatsapp",
|
||||||
"salesPersonEmailText": "Dirección de e-mail",
|
"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."
|
|
||||||
}
|
}
|
||||||
|
|
@ -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();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
<!-- Action button block -->
|
||||||
|
<div class="buttons">
|
||||||
|
<a href="https://www.verdnatura.es" target="_blank"><div class="btn">
|
||||||
|
<span class="text">{{_.actionButton}}</span>
|
||||||
|
<span class="icon"><img src="cid:action.png"/></span>
|
||||||
|
</div></a><a href="https://goo.gl/forms/j8WSL151ZW6QtlT72" target="_blank"><div class="btn">
|
||||||
|
<span class="text">{{_.infoButton}}</span>
|
||||||
|
<span class="icon"><img src="cid:info.png"/></span>
|
||||||
|
</div></a>
|
||||||
|
</div>
|
||||||
|
<!-- Action button block -->
|
||||||
|
|
||||||
|
<!-- Networks block -->
|
||||||
|
<div class="footer">
|
||||||
|
<a href="https://www.facebook.com/Verdnatura" target="_blank">
|
||||||
|
<img src="cid:facebook.png" alt="Facebook"/>
|
||||||
|
</a>
|
||||||
|
<a href="https://www.twitter.com/Verdnatura" target="_blank">
|
||||||
|
<img src="cid:twitter.png" alt="Twitter"/>
|
||||||
|
</a>
|
||||||
|
<a href="https://www.youtube.com/Verdnatura" target="_blank">
|
||||||
|
<img src="cid:youtube.png" alt="Youtube"/>
|
||||||
|
</a>
|
||||||
|
<a href="https://www.pinterest.com/Verdnatura" target="_blank">
|
||||||
|
<img src="cid:pinterest.png" alt="Pinterest"/>
|
||||||
|
</a>
|
||||||
|
<a href="https://www.instagram.com/Verdnatura" target="_blank">
|
||||||
|
<img src="cid:instagram.png" alt="Instagram"/>
|
||||||
|
</a>
|
||||||
|
<a href="https://www.linkedin.com/company/verdnatura" target="_blank">
|
||||||
|
<img src="cid:linkedin.png" alt="Linkedin"/>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<!-- Networks block end -->
|
||||||
|
|
||||||
|
<!-- Privacy block -->
|
||||||
|
<div class="privacy">
|
||||||
|
<p>{{_.fiscalAddress}}</p>
|
||||||
|
<p>{{_.privacy}}</p>
|
||||||
|
<p>{{_.privacyLaw}}</p>
|
||||||
|
</div>
|
||||||
|
<!-- Privacy block end -->
|
||||||
|
|
@ -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."
|
||||||
|
}
|
||||||
|
|
@ -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 {
|
.buttons {
|
||||||
background-color: #FFF;
|
background-color: #FFF;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
|
|
@ -0,0 +1,48 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
|
||||||
|
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" x="0px" y="0px" width="226.229px" height="31.038px" viewBox="0 0 226.229 31.038" enable-background="new 0 0 226.229 31.038" xml:space="preserve" id="svg2" inkscape:version="0.48.1 r9760" sodipodi:docname="logo.svg"><metadata id="metadata61"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs59"/><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1366" inkscape:window-height="710" id="namedview57" showgrid="false" inkscape:zoom="4.0755163" inkscape:cx="138.56745" inkscape:cy="16.509992" inkscape:window-x="0" inkscape:window-y="26" inkscape:window-maximized="1" inkscape:current-layer="svg2"/>
|
||||||
|
<g id="Background">
|
||||||
|
</g>
|
||||||
|
<g id="Guides">
|
||||||
|
</g>
|
||||||
|
<g id="Foreground">
|
||||||
|
<g id="g7">
|
||||||
|
<g id="g9">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.417,30.321L0,0h8.233l4.26,15.582l0.349,1.276 c0.521,1.866,0.918,3.431,1.191,4.693c0.15-0.618,0.335-1.345,0.555-2.182c0.219-0.837,0.528-1.935,0.925-3.293L19.981,0h8.19 L17.671,30.321H10.417z" id="path11"/>
|
||||||
|
</g>
|
||||||
|
<g id="g13">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M139.809,19.787c-0.665,0.357-1.748,0.686-3.25,0.988 c-0.727,0.137-1.283,0.254-1.667,0.35c-0.95,0.247-1.661,0.563-2.134,0.947c-0.472,0.384-0.799,0.899-0.979,1.544 c-0.223,0.796-0.155,1.438,0.204,1.925c0.359,0.488,0.945,0.731,1.757,0.731c1.252,0,2.375-0.36,3.369-1.081 c0.994-0.721,1.653-1.665,1.98-2.831L139.809,19.787z M144.915,30.321h-7.458c0.017-0.356,0.048-0.726,0.094-1.11l0.159-1.192 c-1.318,1.026-2.627,1.786-3.927,2.279c-1.299,0.493-2.643,0.739-4.031,0.739c-2.158,0-3.7-0.593-4.625-1.779 c-0.925-1.187-1.106-2.788-0.542-4.804c0.519-1.851,1.431-3.356,2.737-4.515c1.307-1.159,3.021-1.972,5.142-2.438 c1.169-0.247,2.641-0.515,4.413-0.803c2.646-0.412,4.082-1.016,4.304-1.812l0.151-0.539c0.182-0.65,0.076-1.145-0.317-1.483 c-0.393-0.339-1.071-0.508-2.033-0.508c-1.045,0-1.934,0.214-2.666,0.643c-0.731,0.428-1.289,1.058-1.673,1.887h-6.748 c1.065-2.53,2.64-4.413,4.723-5.65s4.724-1.856,7.923-1.856c1.991,0,3.602,0.241,4.833,0.722s2.095,1.209,2.59,2.185 c0.339,0.701,0.483,1.536,0.432,2.504c-0.052,0.969-0.377,2.525-0.978,4.669l-2.375,8.483c-0.284,1.014-0.416,1.812-0.396,2.395 s0.188,0.962,0.503,1.141L144.915,30.321z" id="path15" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g17">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M185.7,30.321l6.27-22.393h7.049l-1.097,3.918 c1.213-1.537,2.502-2.659,3.867-3.366c1.365-0.707,2.951-1.074,4.758-1.101l-2.03,7.25c-0.304-0.042-0.608-0.072-0.912-0.093 c-0.303-0.02-0.592-0.03-0.867-0.03c-1.126,0-2.104,0.168-2.932,0.504c-0.829,0.336-1.561,0.854-2.197,1.555 c-0.406,0.467-0.789,1.136-1.149,2.007c-0.361,0.872-0.814,2.282-1.359,4.232l-2.104,7.516H185.7z" id="path19" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g21">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M217.631,19.787c-0.664,0.357-1.748,0.686-3.25,0.988 c-0.727,0.137-1.282,0.254-1.667,0.35c-0.95,0.247-1.661,0.563-2.134,0.947c-0.472,0.384-0.799,0.899-0.979,1.544 c-0.223,0.796-0.155,1.438,0.205,1.925c0.359,0.488,0.945,0.731,1.757,0.731c1.252,0,2.375-0.36,3.369-1.081 c0.994-0.721,1.654-1.665,1.98-2.831L217.631,19.787z M222.737,30.321h-7.458c0.017-0.356,0.048-0.726,0.094-1.11l0.159-1.192 c-1.318,1.026-2.627,1.786-3.927,2.279c-1.299,0.493-2.643,0.739-4.031,0.739c-2.158,0-3.7-0.593-4.625-1.779 c-0.926-1.187-1.106-2.788-0.542-4.804c0.519-1.851,1.431-3.356,2.737-4.515c1.306-1.159,3.02-1.972,5.142-2.438 c1.169-0.247,2.641-0.515,4.413-0.803c2.647-0.412,4.082-1.016,4.304-1.812l0.151-0.539c0.182-0.65,0.077-1.145-0.317-1.483 c-0.393-0.339-1.071-0.508-2.033-0.508c-1.045,0-1.934,0.214-2.666,0.643c-0.731,0.428-1.289,1.058-1.672,1.887h-6.748 c1.065-2.53,2.64-4.413,4.723-5.65s4.724-1.856,7.923-1.856c1.99,0,3.601,0.241,4.833,0.722s2.095,1.209,2.591,2.185 c0.339,0.701,0.483,1.536,0.431,2.504c-0.051,0.969-0.377,2.525-0.978,4.669l-2.375,8.483c-0.284,1.014-0.416,1.812-0.396,2.395 c0.02,0.583,0.188,0.962,0.503,1.141L222.737,30.321z" id="path23" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g25">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M188.386,7.928l-6.269,22.393h-7.174l0.864-3.085 c-1.227,1.246-2.476,2.163-3.746,2.751s-2.625,0.882-4.067,0.882c-2.471,0-4.154-0.634-5.048-1.901 c-0.895-1.268-0.993-3.149-0.294-5.644l4.31-15.396h7.338l-3.508,12.53c-0.516,1.842-0.641,3.109-0.375,3.803 s0.967,1.041,2.105,1.041c1.275,0,2.323-0.422,3.142-1.267c0.819-0.845,1.497-2.223,2.031-4.133l3.353-11.974H188.386z" id="path27" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g29">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M149.937,12.356l1.239-4.428h2.995l1.771-6.326h7.338 l-1.771,6.326h3.753l-1.24,4.428h-3.753l-2.716,9.702c-0.416,1.483-0.498,2.465-0.247,2.946c0.25,0.48,0.905,0.721,1.964,0.721 l0.549-0.011l0.39-0.031l-1.31,4.678c-0.811,0.148-1.596,0.263-2.354,0.344c-0.758,0.081-1.48,0.122-2.167,0.122 c-2.543,0-4.108-0.621-4.695-1.863c-0.587-1.242-0.313-3.887,0.82-7.936l2.428-8.672H149.937z" id="path31" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g33">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M73.875,18.896c-0.561,2.004-0.616,3.537-0.167,4.601 s1.375,1.595,2.774,1.595c1.399,0,2.605-0.524,3.62-1.574s1.806-2.59,2.375-4.622c0.526-1.879,0.556-3.334,0.09-4.363 c-0.466-1.029-1.393-1.543-2.778-1.543c-1.304,0-2.487,0.528-3.551,1.585S74.386,17.071,73.875,18.896z M96.513,0l-8.489,30.321 h-7.337l0.824-2.944c-1.166,1.22-2.369,2.121-3.61,2.703s-2.583,0.874-4.025,0.874c-2.802,0-4.772-1.081-5.912-3.243 c-1.139-2.162-1.218-4.993-0.238-8.493c0.988-3.528,2.668-6.404,5.042-8.627c2.374-2.224,4.927-3.336,7.661-3.336 c1.47,0,2.695,0.296,3.676,0.887c0.981,0.591,1.681,1.465,2.099,2.62L89.217,0H96.513z" id="path35"/>
|
||||||
|
<g id="g37">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M73.875,18.896c-0.561,2.004-0.616,3.537-0.167,4.601s1.375,1.595,2.774,1.595 c1.399,0,2.605-0.524,3.62-1.574s1.806-2.59,2.375-4.622c0.526-1.879,0.556-3.334,0.09-4.363 c-0.466-1.029-1.393-1.543-2.778-1.543c-1.304,0-2.487,0.528-3.551,1.585S74.386,17.071,73.875,18.896z M96.513,0l-8.489,30.321 h-7.337l0.824-2.944c-1.166,1.22-2.369,2.121-3.61,2.703s-2.583,0.874-4.025,0.874c-2.802,0-4.772-1.081-5.912-3.243 c-1.139-2.162-1.218-4.993-0.238-8.493c0.988-3.528,2.668-6.404,5.042-8.627c2.374-2.224,4.927-3.336,7.661-3.336 c1.47,0,2.695,0.296,3.676,0.887c0.981,0.591,1.681,1.465,2.099,2.62L89.217,0H96.513z" id="path39"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g id="g41">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M46.488,30.321l6.269-22.393h7.049l-1.098,3.918 c1.213-1.537,2.502-2.659,3.868-3.366s6.015-1.074,7.822-1.101l-2.03,7.25c-0.304-0.042-0.608-0.072-0.911-0.093 c-0.304-0.02-0.592-0.03-0.867-0.03c-1.126,0-5.167,0.168-5.997,0.504c-0.829,0.336-1.561,0.854-2.196,1.555 c-0.406,0.467-0.789,1.136-1.149,2.007c-0.361,0.872-0.814,2.282-1.36,4.232l-2.104,7.516H46.488z" id="path43"/>
|
||||||
|
</g>
|
||||||
|
<g id="g45">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M32.673,16.742l8.351-0.021 c0.375-1.436,0.308-2.558-0.201-3.365s-1.402-1.211-2.68-1.211c-1.209,0-2.285,0.397-3.229,1.19S33.224,15.265,32.673,16.742z M38.817,23.278h7.043c-1.347,2.456-3.172,4.356-5.477,5.7c-2.305,1.345-4.885,2.017-7.74,2.017 c-3.473,0-5.923-1.054-7.351-3.161c-1.427-2.107-1.632-4.98-0.613-8.618c1.038-3.707,2.875-6.641,5.512-8.803 c2.637-2.163,5.678-3.244,9.123-3.244c3.555,0,6.04,1.099,7.456,3.298c1.417,2.198,1.582,5.234,0.498,9.109l-0.239,0.814 l-0.167,0.484H31.721c-0.441,1.575-0.438,2.777,0.01,3.606c0.448,0.829,1.332,1.244,2.65,1.244c0.975,0,1.836-0.206,2.583-0.617 S38.33,24.086,38.817,23.278z" id="path47"/>
|
||||||
|
<g id="g49">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M32.673,16.742l8.351-0.021c0.375-1.436,0.308-2.558-0.201-3.365 s-1.402-1.211-2.68-1.211c-1.209,0-2.285,0.397-3.229,1.19S33.224,15.265,32.673,16.742z M38.817,23.278h7.043 c-1.347,2.456-3.172,4.356-5.477,5.7c-2.305,1.345-4.885,2.017-7.74,2.017c-3.473,0-5.923-1.054-7.351-3.161 c-1.427-2.107-1.632-4.98-0.613-8.618c1.038-3.707,2.875-6.641,5.512-8.803c2.637-2.163,5.678-3.244,9.123-3.244 c3.555,0,6.04,1.099,7.456,3.298c1.417,2.198,1.582,5.234,0.498,9.109l-0.239,0.814l-0.167,0.484H31.721 c-0.441,1.575-0.438,2.777,0.01,3.606c0.448,0.829,1.332,1.244,2.65,1.244c0.975,0,1.836-0.206,2.583-0.617 S38.33,24.086,38.817,23.278z" id="path51"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g id="g53">
|
||||||
|
<path fill="#A0CE67" d="M112.881,30.643l-6.404-18.639l-6.455,18.639h-7.254l9.565-30.321h8.19l4.434,15.582l0.35,1.276 c0.521,1.866,0.917,3.431,1.191,4.693l0.555-2.182c0.219-0.837,0.528-1.935,0.925-3.293l4.468-16.076h8.19l-10.501,30.321 H112.881z" id="path55" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 9.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
|
|
@ -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();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
<div>
|
||||||
|
<a href="https://www.verdnatura.es"/><img src="cid:header.png" alt="VerdNatura"/></a>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
.banner img {
|
||||||
|
width: 100%
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
|
|
@ -0,0 +1,48 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
|
||||||
|
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" x="0px" y="0px" width="226.229px" height="31.038px" viewBox="0 0 226.229 31.038" enable-background="new 0 0 226.229 31.038" xml:space="preserve" id="svg2" inkscape:version="0.48.1 r9760" sodipodi:docname="logo.svg"><metadata id="metadata61"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs59"/><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1366" inkscape:window-height="710" id="namedview57" showgrid="false" inkscape:zoom="4.0755163" inkscape:cx="138.56745" inkscape:cy="16.509992" inkscape:window-x="0" inkscape:window-y="26" inkscape:window-maximized="1" inkscape:current-layer="svg2"/>
|
||||||
|
<g id="Background">
|
||||||
|
</g>
|
||||||
|
<g id="Guides">
|
||||||
|
</g>
|
||||||
|
<g id="Foreground">
|
||||||
|
<g id="g7">
|
||||||
|
<g id="g9">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.417,30.321L0,0h8.233l4.26,15.582l0.349,1.276 c0.521,1.866,0.918,3.431,1.191,4.693c0.15-0.618,0.335-1.345,0.555-2.182c0.219-0.837,0.528-1.935,0.925-3.293L19.981,0h8.19 L17.671,30.321H10.417z" id="path11"/>
|
||||||
|
</g>
|
||||||
|
<g id="g13">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M139.809,19.787c-0.665,0.357-1.748,0.686-3.25,0.988 c-0.727,0.137-1.283,0.254-1.667,0.35c-0.95,0.247-1.661,0.563-2.134,0.947c-0.472,0.384-0.799,0.899-0.979,1.544 c-0.223,0.796-0.155,1.438,0.204,1.925c0.359,0.488,0.945,0.731,1.757,0.731c1.252,0,2.375-0.36,3.369-1.081 c0.994-0.721,1.653-1.665,1.98-2.831L139.809,19.787z M144.915,30.321h-7.458c0.017-0.356,0.048-0.726,0.094-1.11l0.159-1.192 c-1.318,1.026-2.627,1.786-3.927,2.279c-1.299,0.493-2.643,0.739-4.031,0.739c-2.158,0-3.7-0.593-4.625-1.779 c-0.925-1.187-1.106-2.788-0.542-4.804c0.519-1.851,1.431-3.356,2.737-4.515c1.307-1.159,3.021-1.972,5.142-2.438 c1.169-0.247,2.641-0.515,4.413-0.803c2.646-0.412,4.082-1.016,4.304-1.812l0.151-0.539c0.182-0.65,0.076-1.145-0.317-1.483 c-0.393-0.339-1.071-0.508-2.033-0.508c-1.045,0-1.934,0.214-2.666,0.643c-0.731,0.428-1.289,1.058-1.673,1.887h-6.748 c1.065-2.53,2.64-4.413,4.723-5.65s4.724-1.856,7.923-1.856c1.991,0,3.602,0.241,4.833,0.722s2.095,1.209,2.59,2.185 c0.339,0.701,0.483,1.536,0.432,2.504c-0.052,0.969-0.377,2.525-0.978,4.669l-2.375,8.483c-0.284,1.014-0.416,1.812-0.396,2.395 s0.188,0.962,0.503,1.141L144.915,30.321z" id="path15" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g17">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M185.7,30.321l6.27-22.393h7.049l-1.097,3.918 c1.213-1.537,2.502-2.659,3.867-3.366c1.365-0.707,2.951-1.074,4.758-1.101l-2.03,7.25c-0.304-0.042-0.608-0.072-0.912-0.093 c-0.303-0.02-0.592-0.03-0.867-0.03c-1.126,0-2.104,0.168-2.932,0.504c-0.829,0.336-1.561,0.854-2.197,1.555 c-0.406,0.467-0.789,1.136-1.149,2.007c-0.361,0.872-0.814,2.282-1.359,4.232l-2.104,7.516H185.7z" id="path19" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g21">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M217.631,19.787c-0.664,0.357-1.748,0.686-3.25,0.988 c-0.727,0.137-1.282,0.254-1.667,0.35c-0.95,0.247-1.661,0.563-2.134,0.947c-0.472,0.384-0.799,0.899-0.979,1.544 c-0.223,0.796-0.155,1.438,0.205,1.925c0.359,0.488,0.945,0.731,1.757,0.731c1.252,0,2.375-0.36,3.369-1.081 c0.994-0.721,1.654-1.665,1.98-2.831L217.631,19.787z M222.737,30.321h-7.458c0.017-0.356,0.048-0.726,0.094-1.11l0.159-1.192 c-1.318,1.026-2.627,1.786-3.927,2.279c-1.299,0.493-2.643,0.739-4.031,0.739c-2.158,0-3.7-0.593-4.625-1.779 c-0.926-1.187-1.106-2.788-0.542-4.804c0.519-1.851,1.431-3.356,2.737-4.515c1.306-1.159,3.02-1.972,5.142-2.438 c1.169-0.247,2.641-0.515,4.413-0.803c2.647-0.412,4.082-1.016,4.304-1.812l0.151-0.539c0.182-0.65,0.077-1.145-0.317-1.483 c-0.393-0.339-1.071-0.508-2.033-0.508c-1.045,0-1.934,0.214-2.666,0.643c-0.731,0.428-1.289,1.058-1.672,1.887h-6.748 c1.065-2.53,2.64-4.413,4.723-5.65s4.724-1.856,7.923-1.856c1.99,0,3.601,0.241,4.833,0.722s2.095,1.209,2.591,2.185 c0.339,0.701,0.483,1.536,0.431,2.504c-0.051,0.969-0.377,2.525-0.978,4.669l-2.375,8.483c-0.284,1.014-0.416,1.812-0.396,2.395 c0.02,0.583,0.188,0.962,0.503,1.141L222.737,30.321z" id="path23" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g25">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M188.386,7.928l-6.269,22.393h-7.174l0.864-3.085 c-1.227,1.246-2.476,2.163-3.746,2.751s-2.625,0.882-4.067,0.882c-2.471,0-4.154-0.634-5.048-1.901 c-0.895-1.268-0.993-3.149-0.294-5.644l4.31-15.396h7.338l-3.508,12.53c-0.516,1.842-0.641,3.109-0.375,3.803 s0.967,1.041,2.105,1.041c1.275,0,2.323-0.422,3.142-1.267c0.819-0.845,1.497-2.223,2.031-4.133l3.353-11.974H188.386z" id="path27" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g29">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#A0CE67" d="M149.937,12.356l1.239-4.428h2.995l1.771-6.326h7.338 l-1.771,6.326h3.753l-1.24,4.428h-3.753l-2.716,9.702c-0.416,1.483-0.498,2.465-0.247,2.946c0.25,0.48,0.905,0.721,1.964,0.721 l0.549-0.011l0.39-0.031l-1.31,4.678c-0.811,0.148-1.596,0.263-2.354,0.344c-0.758,0.081-1.48,0.122-2.167,0.122 c-2.543,0-4.108-0.621-4.695-1.863c-0.587-1.242-0.313-3.887,0.82-7.936l2.428-8.672H149.937z" id="path31" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
<g id="g33">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M73.875,18.896c-0.561,2.004-0.616,3.537-0.167,4.601 s1.375,1.595,2.774,1.595c1.399,0,2.605-0.524,3.62-1.574s1.806-2.59,2.375-4.622c0.526-1.879,0.556-3.334,0.09-4.363 c-0.466-1.029-1.393-1.543-2.778-1.543c-1.304,0-2.487,0.528-3.551,1.585S74.386,17.071,73.875,18.896z M96.513,0l-8.489,30.321 h-7.337l0.824-2.944c-1.166,1.22-2.369,2.121-3.61,2.703s-2.583,0.874-4.025,0.874c-2.802,0-4.772-1.081-5.912-3.243 c-1.139-2.162-1.218-4.993-0.238-8.493c0.988-3.528,2.668-6.404,5.042-8.627c2.374-2.224,4.927-3.336,7.661-3.336 c1.47,0,2.695,0.296,3.676,0.887c0.981,0.591,1.681,1.465,2.099,2.62L89.217,0H96.513z" id="path35"/>
|
||||||
|
<g id="g37">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M73.875,18.896c-0.561,2.004-0.616,3.537-0.167,4.601s1.375,1.595,2.774,1.595 c1.399,0,2.605-0.524,3.62-1.574s1.806-2.59,2.375-4.622c0.526-1.879,0.556-3.334,0.09-4.363 c-0.466-1.029-1.393-1.543-2.778-1.543c-1.304,0-2.487,0.528-3.551,1.585S74.386,17.071,73.875,18.896z M96.513,0l-8.489,30.321 h-7.337l0.824-2.944c-1.166,1.22-2.369,2.121-3.61,2.703s-2.583,0.874-4.025,0.874c-2.802,0-4.772-1.081-5.912-3.243 c-1.139-2.162-1.218-4.993-0.238-8.493c0.988-3.528,2.668-6.404,5.042-8.627c2.374-2.224,4.927-3.336,7.661-3.336 c1.47,0,2.695,0.296,3.676,0.887c0.981,0.591,1.681,1.465,2.099,2.62L89.217,0H96.513z" id="path39"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g id="g41">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M46.488,30.321l6.269-22.393h7.049l-1.098,3.918 c1.213-1.537,2.502-2.659,3.868-3.366s6.015-1.074,7.822-1.101l-2.03,7.25c-0.304-0.042-0.608-0.072-0.911-0.093 c-0.304-0.02-0.592-0.03-0.867-0.03c-1.126,0-5.167,0.168-5.997,0.504c-0.829,0.336-1.561,0.854-2.196,1.555 c-0.406,0.467-0.789,1.136-1.149,2.007c-0.361,0.872-0.814,2.282-1.36,4.232l-2.104,7.516H46.488z" id="path43"/>
|
||||||
|
</g>
|
||||||
|
<g id="g45">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M32.673,16.742l8.351-0.021 c0.375-1.436,0.308-2.558-0.201-3.365s-1.402-1.211-2.68-1.211c-1.209,0-2.285,0.397-3.229,1.19S33.224,15.265,32.673,16.742z M38.817,23.278h7.043c-1.347,2.456-3.172,4.356-5.477,5.7c-2.305,1.345-4.885,2.017-7.74,2.017 c-3.473,0-5.923-1.054-7.351-3.161c-1.427-2.107-1.632-4.98-0.613-8.618c1.038-3.707,2.875-6.641,5.512-8.803 c2.637-2.163,5.678-3.244,9.123-3.244c3.555,0,6.04,1.099,7.456,3.298c1.417,2.198,1.582,5.234,0.498,9.109l-0.239,0.814 l-0.167,0.484H31.721c-0.441,1.575-0.438,2.777,0.01,3.606c0.448,0.829,1.332,1.244,2.65,1.244c0.975,0,1.836-0.206,2.583-0.617 S38.33,24.086,38.817,23.278z" id="path47"/>
|
||||||
|
<g id="g49">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M32.673,16.742l8.351-0.021c0.375-1.436,0.308-2.558-0.201-3.365 s-1.402-1.211-2.68-1.211c-1.209,0-2.285,0.397-3.229,1.19S33.224,15.265,32.673,16.742z M38.817,23.278h7.043 c-1.347,2.456-3.172,4.356-5.477,5.7c-2.305,1.345-4.885,2.017-7.74,2.017c-3.473,0-5.923-1.054-7.351-3.161 c-1.427-2.107-1.632-4.98-0.613-8.618c1.038-3.707,2.875-6.641,5.512-8.803c2.637-2.163,5.678-3.244,9.123-3.244 c3.555,0,6.04,1.099,7.456,3.298c1.417,2.198,1.582,5.234,0.498,9.109l-0.239,0.814l-0.167,0.484H31.721 c-0.441,1.575-0.438,2.777,0.01,3.606c0.448,0.829,1.332,1.244,2.65,1.244c0.975,0,1.836-0.206,2.583-0.617 S38.33,24.086,38.817,23.278z" id="path51"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g id="g53">
|
||||||
|
<path fill="#A0CE67" d="M112.881,30.643l-6.404-18.639l-6.455,18.639h-7.254l9.565-30.321h8.19l4.434,15.582l0.35,1.276 c0.521,1.866,0.917,3.431,1.191,4.693l0.555-2.182c0.219-0.837,0.528-1.935,0.925-3.293l4.468-16.076h8.19l-10.501,30.321 H112.881z" id="path55" style="fill:#8ed300;fill-opacity:1"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 9.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
|
|
@ -5,70 +5,29 @@
|
||||||
<meta charset="utf8"/>
|
<meta charset="utf8"/>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div style="width: 600px;margin: 0 auto;font-family: arial, sans-serif;font-size: 16px;color: #555">
|
<div class="wrapper">
|
||||||
<!-- Banner block -->
|
<div class="container">
|
||||||
<div>
|
<!-- Header block -->
|
||||||
<a href="https://www.verdnatura.es"/><img src="cid:header.png" alt="VerdNatura" style="margin:0"/></a>
|
{{$.header}}
|
||||||
</div>
|
<!-- Header block end -->
|
||||||
<!-- Banner block end -->
|
|
||||||
|
|
||||||
<!-- Title block -->
|
<!-- Title block -->
|
||||||
<div style="padding: 35px 0;background-color:#95d831;text-align: center">
|
<div class="title">
|
||||||
<h1 style="margin: 0;font-size: 32px;color: #333;">{{_.title}}</h1>
|
<h1>{{_.title}}</h1>
|
||||||
</div>
|
</div>
|
||||||
<!-- Title block end -->
|
<!-- Title block end -->
|
||||||
|
|
||||||
<!-- Mail body block -->
|
<!-- Mail body block -->
|
||||||
<div style="padding: 20px 0">
|
<div class="body">
|
||||||
<p style="text-align: justify">{{_.hello}}, <strong>#{{alias}}</strong></p>
|
<p>{{_.hello}} <strong>#{{alias}}</strong></p>
|
||||||
<p style="text-align: justify;font-size: 22px">{{message}}<p>
|
<p>{{message}}</p>
|
||||||
</div>
|
</div>
|
||||||
<!-- Mail body block end -->
|
<!-- Mail body block end -->
|
||||||
|
|
||||||
<!-- Action button block -->
|
<!-- Footer block -->
|
||||||
<div style="background-color: #333;overflow:hidden">
|
{{$.footer}}
|
||||||
<a href="https://www.verdnatura.es" target="_blank" style="display:block;float:left;width:300px;height:72px;color:#fff;font-size:22px;text-decoration:none">
|
<!-- Footer block end -->
|
||||||
<div style="float:left;width:230px;padding:22px 0;height:72px;text-align:center">{{_.actionButton}}</div>
|
</div>
|
||||||
<div style="background-color:#95d831;text-align:center;float:right;padding-top:22px;height:50px;width:70px"><img style="margin:0" src="cid:action.png"/></div>
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<a href="https://goo.gl/forms/j8WSL151ZW6QtlT72" target="_blank" style="display:block;float:left;width:300px;height:72px;color:#fff;font-size:22px;text-decoration:none">
|
|
||||||
<div style="float:left;width:230px;padding:22px 0;height:72px;text-align:center">{{_.infoButton}}</div>
|
|
||||||
<div style="background-color:#95d831;text-align:center;float:right;padding-top:22px;height:50px;width:70px"><img style="margin:0" src="cid:info.png"/></div>
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
<!-- Action button block end-->
|
|
||||||
|
|
||||||
<!-- Networks block -->
|
|
||||||
<div style="padding:20px 0;background-color:#555;text-align:center">
|
|
||||||
<a href="https://www.facebook.com/Verdnatura" target="_blank" style="text-decoration:none;margin-right: 10px">
|
|
||||||
<img src="cid:facebook.png" alt="Visita nuestro Facebook" style="margin:0"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.twitter.com/Verdnatura" target="_blank" style="text-decoration:none;margin-right: 10px">
|
|
||||||
<img src="cid:twitter.png" alt="Visita nuestro Twitter" style="margin:0"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.youtube.com/Verdnatura" target="_blank" style="text-decoration:none;margin-right: 10px">
|
|
||||||
<img src="cid:youtube.png" alt="Visita nuestro canal de Youtube" style="margin:0"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.pinterest.com/Verdnatura" target="_blank" style="text-decoration:none;margin-right: 10px">
|
|
||||||
<img src="cid:pinterest.png" alt="Visita nuestro Pinterest" style="margin:0"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.instagram.com/Verdnatura" target="_blank" style="text-decoration:none;margin-right: 10px">
|
|
||||||
<img src="cid:instagram.png" alt="Visita nuestro Instagram" style="margin:0"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.linkedin.com/company/verdnatura" target="_blank" style="text-decoration:none;margin-right: 10px">
|
|
||||||
<img src="cid:linkedin.png" alt="Visita nuestro Linkedin" style="width:50px;margin:0"/>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<!-- Networks block end -->
|
|
||||||
|
|
||||||
<!-- Privacy block -->
|
|
||||||
<div style="padding:20px 0;font-size:10px;font-weight:100">
|
|
||||||
<p style="text-align: justify">{{_.fiscalAddress}}</p>
|
|
||||||
<p style="text-align: justify">{{_.privacy}}</p>
|
|
||||||
<p style="text-align: justify">{{_.privacyLaw}}</p>
|
|
||||||
</div>
|
|
||||||
<!-- Privacy block end -->
|
|
||||||
</div>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -1,16 +1,11 @@
|
||||||
{
|
{
|
||||||
"subject": "Has recibido una nueva notificación",
|
"subject": "Has recibido una nueva notificación",
|
||||||
"title": "Nueva notificación",
|
"title": "Nueva notificación",
|
||||||
"hello": "Hola",
|
"hello": "Hola,",
|
||||||
"notificationCode": {
|
"notificationCode": {
|
||||||
"clientDeactivate": {
|
"clientDeactivate": {
|
||||||
"subject": "Gestionar baja de contrato",
|
"subject": "Gestionar baja de contrato",
|
||||||
"message": "El cliente con id %clientId% está clasificado, por favor, gestione la baja del contrato primero."
|
"message": "El cliente con id %clientId% está clasificado, por favor, gestione la baja del contrato primero."
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
"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."
|
|
||||||
}
|
}
|
||||||
|
|
@ -7,11 +7,9 @@
|
||||||
<body>
|
<body>
|
||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<!-- Banner block -->
|
<!-- Header block -->
|
||||||
<div class="banner">
|
{{$.header}}
|
||||||
<a href="https://www.verdnatura.es"/><img src="cid:header.png" alt="VerdNatura"/></a>
|
<!-- Header block end -->
|
||||||
</div>
|
|
||||||
<!-- Banner block end -->
|
|
||||||
|
|
||||||
<!-- Title block -->
|
<!-- Title block -->
|
||||||
<div class="title">
|
<div class="title">
|
||||||
|
|
@ -21,59 +19,20 @@
|
||||||
|
|
||||||
<!-- Mail body block -->
|
<!-- Mail body block -->
|
||||||
<div class="body">
|
<div class="body">
|
||||||
<p style="text-align: justify">{{_.dear}},</p>
|
<p>{{_.dear}}</p>
|
||||||
<p style="text-align: justify">{{_.bodyDescription}}</p>
|
<p>{{_.bodyDescription}}</p>
|
||||||
<p style="text-align: justify">
|
<p>
|
||||||
<div>{{_.paymentMethod}}: <strong style="font-size: 16px">{{payMethodName}}</strong></div>
|
<div>{{_.paymentMethod}} <strong>{{payMethodName}}</strong></div>
|
||||||
{{{paymentDay}}}
|
{{{paymentDay}}}
|
||||||
</p>
|
</p>
|
||||||
<p style="text-align: justify">{{paymentAdvice}}</p>
|
<p>{{paymentAdvice}}</p>
|
||||||
<p style="text-align: justify">{{_.notifyError}}</p>
|
<p>{{_.notifyError}}</p>
|
||||||
</div>
|
</div>
|
||||||
<!-- Mail body block end -->
|
<!-- Mail body block end -->
|
||||||
|
|
||||||
<!-- Action button block -->
|
<!-- Footer block -->
|
||||||
<div class="buttons">
|
{{$.footer}}
|
||||||
<a href="https://www.verdnatura.es" target="_blank"><div class="btn">
|
<!-- Footer block end -->
|
||||||
<span class="text">{{_.actionButton}}</span>
|
|
||||||
<span class="icon"><img src="cid:action.png"/></span>
|
|
||||||
</div></a><a href="https://goo.gl/forms/j8WSL151ZW6QtlT72" target="_blank"><div class="btn">
|
|
||||||
<span class="text">{{_.infoButton}}</span>
|
|
||||||
<span class="icon"><img src="cid:info.png"/></span>
|
|
||||||
</div></a>
|
|
||||||
</div>
|
|
||||||
<!-- Action button block -->
|
|
||||||
|
|
||||||
<!-- Networks block -->
|
|
||||||
<div class="footer">
|
|
||||||
<a href="https://www.facebook.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:facebook.png" alt="Facebook"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.twitter.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:twitter.png" alt="Twitter"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.youtube.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:youtube.png" alt="Youtube"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.pinterest.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:pinterest.png" alt="Pinterest"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.instagram.com/Verdnatura" target="_blank">
|
|
||||||
<img src="cid:instagram.png" alt="Instagram"/>
|
|
||||||
</a>
|
|
||||||
<a href="https://www.linkedin.com/company/verdnatura" target="_blank">
|
|
||||||
<img src="cid:linkedin.png" alt="Linkedin"/>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<!-- Networks block end -->
|
|
||||||
|
|
||||||
<!-- Privacy block -->
|
|
||||||
<div class="privacy">
|
|
||||||
<p style="text-align: justify">{{_.fiscalAddress}}</p>
|
|
||||||
<p style="text-align: justify">{{_.privacy}}</p>
|
|
||||||
<p style="text-align: justify">{{_.privacyLaw}}</p>
|
|
||||||
</div>
|
|
||||||
<!-- Privacy block end -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,13 @@
|
||||||
{
|
{
|
||||||
"subject": "Cambios en las condiciones de pago",
|
"subject": "Cambios en las condiciones de pago",
|
||||||
"title": "Cambio en las condiciones",
|
"title": "Cambio en las condiciones",
|
||||||
"dear": "Estimado cliente",
|
"dear": "Estimado cliente,",
|
||||||
"bodyDescription": "Le informamos que han cambiado las condiciones de pago de su cuenta. A continuación le indicamos las nuevas condiciones:",
|
"bodyDescription": "Le informamos que han cambiado las condiciones de pago de su cuenta. A continuación le indicamos las nuevas condiciones:",
|
||||||
"paymentMethod": "Método de pago",
|
"paymentMethod": "Método de pago:",
|
||||||
"paymentDay": "Día de pago",
|
"paymentDay": "Día de pago:",
|
||||||
"everyMonth": "de cada mes",
|
"everyMonth": "de cada mes",
|
||||||
"cardPaymentAdvice": "Su modo de pago actual implica que deberá abonar el importe de los pedidos realizados en el mismo día para que se puedan enviar.",
|
"cardPaymentAdvice": "Su modo de pago actual implica que deberá abonar el importe de los pedidos realizados en el mismo día para que se puedan enviar.",
|
||||||
"accountPaymentAdviceBefore": "Su modo de pago actual implica que se le pasará un cargo a la cuenta",
|
"accountPaymentAdviceBefore": "Su modo de pago actual implica que se le pasará un cargo a la cuenta",
|
||||||
"accountPaymentAdviceAfter": "por el importe pendiente, al vencimiento establecido en las condiciones.",
|
"accountPaymentAdviceAfter": "por el importe pendiente, al vencimiento establecido en las condiciones.",
|
||||||
"notifyError": "En el caso de detectar algún error en los datos indicados o para cualquier aclaración, debe dirigirse a su comercial.",
|
"notifyError": "En el caso de detectar algún error en los datos indicados o para cualquier aclaración, debe dirigirse a su comercial."
|
||||||
"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."
|
|
||||||
}
|
}
|
||||||
|
|
@ -5,6 +5,7 @@ var format = require(path.join(__dirname, '../../util/format.js'));
|
||||||
module.exports = class PaymentUpdate {
|
module.exports = class PaymentUpdate {
|
||||||
getData(params, cb) {
|
getData(params, cb) {
|
||||||
let query = `SELECT
|
let query = `SELECT
|
||||||
|
c.id clientId,
|
||||||
pm.id payMethodFk,
|
pm.id payMethodFk,
|
||||||
pm.name payMethodName,
|
pm.name payMethodName,
|
||||||
c.dueDay,
|
c.dueDay,
|
||||||
|
|
@ -15,7 +16,7 @@ module.exports = class PaymentUpdate {
|
||||||
JOIN payMethod pm ON pm.id = c.paymentMethodFk
|
JOIN payMethod pm ON pm.id = c.paymentMethodFk
|
||||||
JOIN country ct ON ct.id = c.countryFk
|
JOIN country ct ON ct.id = c.countryFk
|
||||||
WHERE c.id = ?`;
|
WHERE c.id = ?`;
|
||||||
database.pool.query(query, [params.recipient], (error, result) => {
|
database.pool.query(query, [params.clientId], (error, result) => {
|
||||||
if (error || result.length == 0)
|
if (error || result.length == 0)
|
||||||
return cb(new Error('No template data found'));
|
return cb(new Error('No template data found'));
|
||||||
|
|
||||||
|
|
@ -26,7 +27,7 @@ module.exports = class PaymentUpdate {
|
||||||
|
|
||||||
get paymentDay() {
|
get paymentDay() {
|
||||||
if (this.payMethodFk != 5)
|
if (this.payMethodFk != 5)
|
||||||
return `<div>${this._.paymentDay}: <strong style="font-size: 16px">${this.dueDay} ${this._.everyMonth}</strong></div>`;
|
return `<div>${this._.paymentDay} <strong>${this.dueDay} ${this._.everyMonth}</strong></div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
get paymentAdvice() {
|
get paymentAdvice() {
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue