From 78a98cd6b74776a34e2c72b1ac1f0c13dad98e7f Mon Sep 17 00:00:00 2001 From: jgallego Date: Sun, 15 Aug 2021 08:35:14 +0200 Subject: [PATCH] shrink-datetime --- db/dump/fixtures.sql | 11 +++++----- front/salix/components/log/index.html | 4 ++-- modules/client/back/models/pay-method.json | 3 +++ modules/client/front/balance/index/index.html | 4 ++-- modules/client/front/credit/index/index.html | 2 +- modules/client/front/dms/index/index.html | 6 +++--- modules/client/front/greuge/index/index.html | 2 +- modules/client/front/mandate/index.html | 8 +++---- modules/client/front/sample/index/index.html | 4 ++-- modules/client/front/web-payment/index.html | 2 +- modules/item/front/last-entries/index.html | 4 ++-- modules/supplier/front/account/index.html | 14 +++++++++++-- modules/supplier/front/account/index.js | 21 +++++++++++++++++++ modules/supplier/front/account/locale/es.yml | 3 ++- modules/ticket/front/dms/index/index.html | 4 ++-- .../ticket/front/tracking/index/index.html | 2 +- modules/worker/front/dms/index/index.html | 4 ++-- 17 files changed, 67 insertions(+), 31 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 867a830df7..482f86e095 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -214,11 +214,12 @@ UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE `id` = 23; INSERT INTO `vn`.`payMethod`(`id`,`code`, `name`, `graceDays`, `outstandingDebt`, `ibanRequired`) VALUES - (1, NULL, 'PayMethod one', 0, 001, 0), - (2, NULL, 'PayMethod two', 10, 001, 0), - (3, 'compensation', 'PayMethod three', 0, 001, 0), - (4, NULL, 'PayMethod with IBAN', 0, 001, 1), - (5, NULL, 'PayMethod five', 10, 001, 0); + (1, NULL, 'PayMethod one', 0, 001, 0), + (2, NULL, 'PayMethod two', 10, 001, 0), + (3, 'compensation', 'PayMethod three', 0, 001, 0), + (4, NULL, 'PayMethod with IBAN', 0, 001, 1), + (5, NULL, 'PayMethod five', 10, 001, 0), + (8,'wireTransfer', 'WireTransfer', 5, 001, 1); INSERT INTO `vn`.`payDem`(`id`, `payDem`) VALUES diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 15a7b38b34..c78e00f445 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -8,7 +8,7 @@ Date Author - Model + Model Action Name Before @@ -17,7 +17,7 @@ - + {{::log.creationDate | date:'dd/MM/yyyy HH:mm'}}
diff --git a/modules/client/back/models/pay-method.json b/modules/client/back/models/pay-method.json index 152544c01a..a025bee477 100644 --- a/modules/client/back/models/pay-method.json +++ b/modules/client/back/models/pay-method.json @@ -12,6 +12,9 @@ "id": true, "description": "Identifier" }, + "code": { + "type": "string" + }, "name": { "type": "string", "required": true diff --git a/modules/client/front/balance/index/index.html b/modules/client/front/balance/index/index.html index 596838c0c2..3c61d8543d 100644 --- a/modules/client/front/balance/index/index.html +++ b/modules/client/front/balance/index/index.html @@ -47,7 +47,7 @@ Date - Creation date + Creation date Employee Reference Bank @@ -65,7 +65,7 @@ {{::balance.payed | date:'dd/MM/yyyy'}} - + {{::balance.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/client/front/credit/index/index.html b/modules/client/front/credit/index/index.html index 8e072a8869..989a0129f3 100644 --- a/modules/client/front/credit/index/index.html +++ b/modules/client/front/credit/index/index.html @@ -22,7 +22,7 @@ - {{::credit.created | date:'dd/MM/yyyy HH:mm'}} + {{::credit.created | date:'dd/MM/yyyy HH:mm'}} Description Original File - Employee - Created + Employee + Created @@ -70,7 +70,7 @@ ng-click="workerDescriptor.show($event, document.dms.workerFk)"> {{::document.dms.worker.user.name | dashIfEmpty}} - + {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/client/front/greuge/index/index.html b/modules/client/front/greuge/index/index.html index 4fd10192f7..b48fe94669 100644 --- a/modules/client/front/greuge/index/index.html +++ b/modules/client/front/greuge/index/index.html @@ -36,7 +36,7 @@ - {{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }} + {{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }} {{::greuge.description}} diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html index e6a9b97fe1..e2f2cd27b4 100644 --- a/modules/client/front/mandate/index.html +++ b/modules/client/front/mandate/index.html @@ -18,8 +18,8 @@ Id Company Type - Register date - End date + Register date + End date @@ -27,8 +27,8 @@ {{::mandate.id}} {{::mandate.company.code}} {{::mandate.mandateType.name}} - {{::mandate.created | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}} - {{::mandate.finished | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}} + {{::mandate.created | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}} + {{::mandate.finished | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}} diff --git a/modules/client/front/sample/index/index.html b/modules/client/front/sample/index/index.html index 7bb503fa2c..5909e12831 100644 --- a/modules/client/front/sample/index/index.html +++ b/modules/client/front/sample/index/index.html @@ -23,8 +23,8 @@ - {{::sample.created | date:'dd/MM/yyyy HH:mm' }} - {{::sample.created | date:'dd/MM/yyyy HH:mm' }} + {{::sample.type.description}} diff --git a/modules/client/front/web-payment/index.html b/modules/client/front/web-payment/index.html index 5e09036223..203d4bb60c 100644 --- a/modules/client/front/web-payment/index.html +++ b/modules/client/front/web-payment/index.html @@ -36,7 +36,7 @@ {{::transaction.id}} - {{::transaction.created | date:'dd/MM/yyyy HH:mm'}} + {{::transaction.created | date:'dd/MM/yyyy HH:mm'}} {{::transaction.amount | currency: 'EUR':2}} Ig Warehouse - Landed + Landed Entry P.P.U P.P.P @@ -49,7 +49,7 @@ {{::entry.warehouse| dashIfEmpty}} - {{::entry.landed | date:'dd/MM/yyyy HH:mm'}} + {{::entry.landed | date:'dd/MM/yyyy HH:mm'}} + ng-click="$ctrl.showBankEntity($event, $index)" + tabindex="-1"> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/modules/supplier/front/account/index.js b/modules/supplier/front/account/index.js index 26f4af9887..b93f1080f3 100644 --- a/modules/supplier/front/account/index.js +++ b/modules/supplier/front/account/index.js @@ -10,6 +10,14 @@ class Controller extends Section { fields: ['countryFk', 'id', 'name', 'bic'] } }; + const filter = { + where: {code: 'wireTransfer'} + }; + + this.$http.get(`payMethods/findOne`, {filter}) + .then(res => { + this.wireTransferFk = res.data.id; + }); } add() { @@ -37,9 +45,22 @@ class Controller extends Section { .then(res => this.supplierAccount.bankEntityFk = res.data.id); } + onAddSave() { + const values = { + id: this.$params.id, + payMethodFk: this.wireTransferFk + }; + const query = `Suppliers/${this.$params.id}`; + return this.$http.patch(query, values) + .then(this.$.watcher.notifySaved()); + } + onSubmit() { this.$.watcher.check(); this.$.model.save().then(() => { + if (this.supplier.payMethodFk != this.wireTransferFk) + this.$.payMethodToTransfer.show(); + this.$.watcher.notifySaved(); this.$.watcher.updateOriginalData(); this.card.reload(); diff --git a/modules/supplier/front/account/locale/es.yml b/modules/supplier/front/account/locale/es.yml index c9c6971711..f445a3fb81 100644 --- a/modules/supplier/front/account/locale/es.yml +++ b/modules/supplier/front/account/locale/es.yml @@ -2,4 +2,5 @@ Bank entity: Entidad bancaria swift: Swift BIC Add account: Añadir cuenta Beneficiary: Beneficiario -Beneficiary information: Nombre del titular de la cuenta bancaria en caso de ser diferente del proveedor \ No newline at end of file +Beneficiary information: Nombre del titular de la cuenta bancaria en caso de ser diferente del proveedor +Do you want to change the pay method to wire transfer?: ¿Quieres modificar la forma de pago a transferencia? \ No newline at end of file diff --git a/modules/ticket/front/dms/index/index.html b/modules/ticket/front/dms/index/index.html index 526a3e3794..5e55ab366e 100644 --- a/modules/ticket/front/dms/index/index.html +++ b/modules/ticket/front/dms/index/index.html @@ -21,7 +21,7 @@ Original File Employee - Created + Created @@ -69,7 +69,7 @@ {{::document.dms.worker.user.name | dashIfEmpty}} - + {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html index 7cb9431ab4..12c4778c99 100644 --- a/modules/ticket/front/tracking/index/index.html +++ b/modules/ticket/front/tracking/index/index.html @@ -28,7 +28,7 @@ {{::tracking.worker.user.name || 'System' | translate}} - {{::tracking.created | date:'dd/MM/yyyy HH:mm'}} + {{::tracking.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/worker/front/dms/index/index.html b/modules/worker/front/dms/index/index.html index 6ad1cffd88..1404336a2a 100644 --- a/modules/worker/front/dms/index/index.html +++ b/modules/worker/front/dms/index/index.html @@ -20,7 +20,7 @@ Description Original File - Created + Created @@ -57,7 +57,7 @@ {{::document.file}} - + {{::document.created | date:'dd/MM/yyyy HH:mm'}}