From 6465a5c460d5bf695d1e2613b158510dbb3be89f Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 14 Dec 2021 08:23:11 +0100 Subject: [PATCH 01/10] feat(supplier): payMethodChecked for financial --- db/changes/10390-constitution/00-supplier.sql | 17 +++++++++ e2e/paths/13-supplier/02_basic_data.spec.js | 2 +- loopback/locale/es.json | 3 +- .../back/models/specs/supplier.spec.js | 35 ++++++++++++------- modules/supplier/back/models/supplier.js | 21 +++++++++-- modules/supplier/front/basic-data/index.html | 3 +- modules/supplier/front/billing-data/index.js | 6 +++- 7 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 db/changes/10390-constitution/00-supplier.sql diff --git a/db/changes/10390-constitution/00-supplier.sql b/db/changes/10390-constitution/00-supplier.sql new file mode 100644 index 000000000..f86a1c534 --- /dev/null +++ b/db/changes/10390-constitution/00-supplier.sql @@ -0,0 +1,17 @@ +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`%` TRIGGER `vn`.`supplier_beforeUpdate` + BEFORE UPDATE ON `vn`.`supplier` FOR EACH ROW +BEGIN + DECLARE vHasChange BOOL; + SET vHasChange = !((NEW.payMethodFk <=> OLD.payMethodFk) + AND (NEW.payDemFk <=> OLD.payDemFk) + AND (NEW.payDay <=> OLD.payDay)); + + IF vHasChange THEN + SET NEW.isPayMethodChecked = false; + END IF; + +END +$$ +DELIMITER ; diff --git a/e2e/paths/13-supplier/02_basic_data.spec.js b/e2e/paths/13-supplier/02_basic_data.spec.js index f98fa779e..4f3c49512 100644 --- a/e2e/paths/13-supplier/02_basic_data.spec.js +++ b/e2e/paths/13-supplier/02_basic_data.spec.js @@ -8,7 +8,7 @@ describe('Supplier basic data path', () => { beforeAll(async() => { browser = await getBrowser(); page = browser.page; - await page.loginAndModule('administrative', 'supplier'); + await page.loginAndModule('financial', 'supplier'); await page.accessToSearchResult('1'); await page.accessToSection('supplier.card.basicData'); }); diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 2611ee0dd..c7797fe6a 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -216,5 +216,6 @@ "The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos", "You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días", "The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día", - "The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día" + "The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día", + "You can not modify is pay method checked": "No se puede modificar el campo método de pago validado" } \ No newline at end of file diff --git a/modules/supplier/back/models/specs/supplier.spec.js b/modules/supplier/back/models/specs/supplier.spec.js index 27bd873ad..8721e826c 100644 --- a/modules/supplier/back/models/specs/supplier.spec.js +++ b/modules/supplier/back/models/specs/supplier.spec.js @@ -8,6 +8,19 @@ describe('loopback model Supplier', () => { beforeAll(async() => { supplierOne = await models.Supplier.findById(1); supplierTwo = await models.Supplier.findById(442); + + const activeCtx = { + accessToken: {userId: 9}, + http: { + req: { + headers: {origin: 'http://localhost'} + } + } + }; + + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); }); afterAll(async() => { @@ -32,19 +45,6 @@ describe('loopback model Supplier', () => { }); it('should not throw if the payMethod id is valid', async() => { - const activeCtx = { - accessToken: {userId: 9}, - http: { - req: { - headers: {origin: 'http://localhost'} - } - } - }; - - spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ - active: activeCtx - }); - let error; const supplier = await models.Supplier.findById(442); await supplier.updateAttribute('payMethodFk', 4) @@ -54,5 +54,14 @@ describe('loopback model Supplier', () => { expect(error).not.toBeDefined(); }); + + it('should have unchecked isPayMethodChecked', async() => { + const supplier = await models.Supplier.findById(442); + await supplier.updateAttribute('payMethodFk', 5); + + const result = await models.Supplier.findById(442); + + expect(result.isPayMethodChecked).toEqual(false); + }); }); }); diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js index 1ac6e3bd2..2912a3577 100644 --- a/modules/supplier/back/models/supplier.js +++ b/modules/supplier/back/models/supplier.js @@ -1,5 +1,6 @@ const UserError = require('vn-loopback/util/user-error'); const validateTin = require('vn-loopback/util/validateTin'); +const LoopBackContext = require('loopback-context'); module.exports = Self => { require('../methods/supplier/filter')(Self); @@ -88,8 +89,24 @@ module.exports = Self => { } Self.observe('before save', async function(ctx) { - let changes = ctx.data || ctx.instance; - let orgData = ctx.currentInstance; + const loopbackContext = LoopBackContext.getCurrentContext(); + const changes = ctx.data || ctx.instance; + const orgData = ctx.currentInstance; + const userId = loopbackContext.active.accessToken.userId; + + const isNotFinancial = !await Self.app.models.Account.hasRole(userId, 'financial'); + const isPayMethodChecked = changes.isPayMethodChecked || orgData.isPayMethodChecked; + const hasChanges = orgData && changes; + const isPayMethodCheckedChanged = hasChanges + && orgData.isPayMethodChecked != isPayMethodChecked; + + if (isNotFinancial && isPayMethodCheckedChanged) + throw new UserError('You can not modify is pay method checked'); + }); + + Self.observe('before save', async function(ctx) { + const changes = ctx.data || ctx.instance; + const orgData = ctx.currentInstance; const socialName = changes.name || orgData.name; const hasChanges = orgData && changes; diff --git a/modules/supplier/front/basic-data/index.html b/modules/supplier/front/basic-data/index.html index 0ec80641d..9991908d4 100644 --- a/modules/supplier/front/basic-data/index.html +++ b/modules/supplier/front/basic-data/index.html @@ -38,7 +38,8 @@ + ng-model="$ctrl.supplier.isPayMethodChecked" + vn-acl="financial"> diff --git a/modules/supplier/front/billing-data/index.js b/modules/supplier/front/billing-data/index.js index 0c9cbb0dc..9d2863f64 100644 --- a/modules/supplier/front/billing-data/index.js +++ b/modules/supplier/front/billing-data/index.js @@ -11,7 +11,8 @@ export default class Controller extends Section { } onSubmit() { - return this.$.watcher.submit(); + this.$.watcher.submit() + .then(() => this.card.reload()); } } @@ -20,5 +21,8 @@ ngModule.vnComponent('vnSupplierBillingData', { controller: Controller, bindings: { supplier: '<' + }, + require: { + card: '^vnSupplierCard' } }); From 9cfe6b5b7a38145b5da116efbc11a57dc0af4730 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 14 Dec 2021 12:05:06 +0100 Subject: [PATCH 02/10] feat(ticket): filter by route --- modules/ticket/back/methods/ticket/filter.js | 12 +++- .../back/methods/ticket/specs/filter.spec.js | 57 +++++++++++++++++++ modules/ticket/front/search-panel/index.html | 6 ++ .../ticket/front/search-panel/locale/es.yml | 1 + 4 files changed, 75 insertions(+), 1 deletion(-) diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js index a015d2165..e0b563fe2 100644 --- a/modules/ticket/back/methods/ticket/filter.js +++ b/modules/ticket/back/methods/ticket/filter.js @@ -83,6 +83,11 @@ module.exports = Self => { type: 'boolean', description: `Whether to show only tickets with problems` }, + { + arg: 'route', + type: 'boolean', + description: `Whether to show only tickets with route` + }, { arg: 'pending', type: 'boolean', @@ -186,6 +191,10 @@ module.exports = Self => { case 'alertLevel': return {'ts.alertLevel': value}; + case 'route': + if (value == true) + return {'t.routeFk': {neq: null}}; + return {'t.routeFk': null}; case 'pending': if (value) { return {and: [ @@ -264,7 +273,8 @@ module.exports = Self => { LEFT JOIN state st ON st.id = ts.stateFk LEFT JOIN client c ON c.id = t.clientFk LEFT JOIN worker wk ON wk.id = c.salesPersonFk - LEFT JOIN account.user u ON u.id = wk.userFk`); + LEFT JOIN account.user u ON u.id = wk.userFk + LEFT JOIN route r ON r.id = t.routeFk`); if (args.orderFk) { stmt.merge({ diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js index 01a652b73..f99a80827 100644 --- a/modules/ticket/back/methods/ticket/specs/filter.spec.js +++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js @@ -221,4 +221,61 @@ describe('ticket filter()', () => { throw e; } }); + + it('should return the tickets matching the route on true', async() => { + const tx = await models.Ticket.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const ctx = {req: {accessToken: {userId: 9}}, args: {route: true}}; + const filter = {}; + const result = await models.Ticket.filter(ctx, filter, options); + + expect(result.length).toEqual(22); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should return the tickets matching the route on false', async() => { + const tx = await models.Ticket.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const ctx = {req: {accessToken: {userId: 9}}, args: {route: false}}; + const filter = {}; + const result = await models.Ticket.filter(ctx, filter, options); + + expect(result.length).toEqual(2); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should return the tickets matching the route on null', async() => { + const tx = await models.Ticket.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const ctx = {req: {accessToken: {userId: 9}}, args: {route: null}}; + const filter = {}; + const result = await models.Ticket.filter(ctx, filter, options); + + expect(result.length).toEqual(24); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); }); diff --git a/modules/ticket/front/search-panel/index.html b/modules/ticket/front/search-panel/index.html index 445729952..78ae72734 100644 --- a/modules/ticket/front/search-panel/index.html +++ b/modules/ticket/front/search-panel/index.html @@ -135,6 +135,12 @@ ng-model="filter.pending" triple-state="true"> + + diff --git a/modules/ticket/front/search-panel/locale/es.yml b/modules/ticket/front/search-panel/locale/es.yml index d6d01d0aa..fcb7cc7e3 100644 --- a/modules/ticket/front/search-panel/locale/es.yml +++ b/modules/ticket/front/search-panel/locale/es.yml @@ -12,6 +12,7 @@ Order id: Id cesta Grouped States: Estado agrupado Days onward: Días adelante With problems: Con problemas +With route: Con ruta Pending: Pendiente FREE: Libre DELIVERED: Servido From f4a07cab706d947ad1216bfeff132529a6cc21a3 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 16 Dec 2021 12:21:47 +0100 Subject: [PATCH 03/10] sql update supplier --- db/changes/10400-christmas/updateSupplier.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 db/changes/10400-christmas/updateSupplier.sql diff --git a/db/changes/10400-christmas/updateSupplier.sql b/db/changes/10400-christmas/updateSupplier.sql new file mode 100644 index 000000000..49fa2eb15 --- /dev/null +++ b/db/changes/10400-christmas/updateSupplier.sql @@ -0,0 +1,2 @@ +UPDATE `vn`.`supplier` + SET isPayMethodChecked = TRUE; \ No newline at end of file From 7c17250919a3b78c354da6f3290d29e1d7944863 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 16 Dec 2021 15:19:56 +0100 Subject: [PATCH 04/10] trigger payment_beforeInsert sql --- .../10400-christmas/payment_beforeInsert.sql | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 db/changes/10400-christmas/payment_beforeInsert.sql diff --git a/db/changes/10400-christmas/payment_beforeInsert.sql b/db/changes/10400-christmas/payment_beforeInsert.sql new file mode 100644 index 000000000..537bf0c54 --- /dev/null +++ b/db/changes/10400-christmas/payment_beforeInsert.sql @@ -0,0 +1,61 @@ +DROP TRIGGER IF EXISTS vn.payment_beforeInsert; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`%` TRIGGER `payment_beforeInsert` BEFORE INSERT ON `payment` FOR EACH ROW +-- Edit trigger body code below this line. Do not edit lines above this one +BEGIN + DECLARE cuenta_banco,cuenta_proveedor DOUBLE; + DECLARE vNewBookEntry INT; + DECLARE bolCASH BOOLEAN; + DECLARE isSupplierActive BOOLEAN; + DECLARE vIsPayMethodChecked BOOLEAN; + + -- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH + SELECT (at2.code = 'cash') INTO bolCASH FROM vn.bank b JOIN vn.accountingType at2 ON at2.id = b.cash WHERE b.id = NEW.bankFk ; + + IF bolCASH THEN + + SELECT account INTO cuenta_banco + FROM bank + WHERE id = NEW.bankFk; + + SELECT account INTO cuenta_proveedor + FROM supplier + WHERE id = NEW.supplierFk; + + CALL vn.ledger_next(vNewBookEntry); + + INSERT INTO XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id) + SELECT vNewBookEntry,NEW.received,SUBCTA,CONTRA,NEW.concept,EURODEBE,EUROHABER,NEW.companyFk + FROM + ( SELECT cuenta_banco SUBCTA,cuenta_proveedor CONTRA,0 EURODEBE, NEW.amount + NEW.bankingFees EUROHABER + UNION ALL + SELECT cuenta_proveedor SUBCTA, cuenta_banco CONTRA,NEW.amount EURODEBE, 0 EUROHABER + ) gf; + + IF NEW.bankingFees <> 0 THEN + INSERT INTO XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id) + SELECT vNewBookEntry,NEW.received,IF(c.id = 1,6260000002,IF(CEE = 1,6260000003,6260000004)),cuenta_banco,NEW.concept,NEW.bankingFees,0,NEW.companyFk + FROM supplier s + JOIN country c ON s.countryFk = c.id + WHERE s.id = NEW.supplierFk; + END IF; + END IF; + + SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received); + + SELECT isActive, isPayMethodChecked INTO vIsSupplierActive, vIsPayMethodChecked + FROM supplier + WHERE id = NEW.supplierFk; + + IF isSupplierActive = FALSE THEN + CALL util.throw('SUPPLIER_INACTIVE'); + END IF; + + IF vIsPayMethodChecked = FALSE THEN + CALL util.throw('SUPPLIER_DOES_NOT_HAVE_PAYMETHODCHECKED'); + END IF; + + END$$ +DELIMITER ; From 0ea1dea8b505da9a32a7b4dcdf50f7900f60f608 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 17 Dec 2021 12:52:37 +0100 Subject: [PATCH 05/10] refactor sqls --- db/changes/10400-christmas/00-payMethod_hasVerified.sql | 1 + .../{payment_beforeInsert.sql => 00-payment_beforeInsert.sql} | 0 .../{10390-constitution => 10400-christmas}/00-supplier.sql | 0 .../{updateSupplier.sql => 00-updateSupplier.sql} | 0 db/changes/10400-christmas/delete.keep | 1 - 5 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 db/changes/10400-christmas/00-payMethod_hasVerified.sql rename db/changes/10400-christmas/{payment_beforeInsert.sql => 00-payment_beforeInsert.sql} (100%) rename db/changes/{10390-constitution => 10400-christmas}/00-supplier.sql (100%) rename db/changes/10400-christmas/{updateSupplier.sql => 00-updateSupplier.sql} (100%) delete mode 100644 db/changes/10400-christmas/delete.keep diff --git a/db/changes/10400-christmas/00-payMethod_hasVerified.sql b/db/changes/10400-christmas/00-payMethod_hasVerified.sql new file mode 100644 index 000000000..7ebafc420 --- /dev/null +++ b/db/changes/10400-christmas/00-payMethod_hasVerified.sql @@ -0,0 +1 @@ +ALTER TABLE vn.payMethod ADD hasVerified TINYINT(1) DEFAULT 0 NULL; \ No newline at end of file diff --git a/db/changes/10400-christmas/payment_beforeInsert.sql b/db/changes/10400-christmas/00-payment_beforeInsert.sql similarity index 100% rename from db/changes/10400-christmas/payment_beforeInsert.sql rename to db/changes/10400-christmas/00-payment_beforeInsert.sql diff --git a/db/changes/10390-constitution/00-supplier.sql b/db/changes/10400-christmas/00-supplier.sql similarity index 100% rename from db/changes/10390-constitution/00-supplier.sql rename to db/changes/10400-christmas/00-supplier.sql diff --git a/db/changes/10400-christmas/updateSupplier.sql b/db/changes/10400-christmas/00-updateSupplier.sql similarity index 100% rename from db/changes/10400-christmas/updateSupplier.sql rename to db/changes/10400-christmas/00-updateSupplier.sql diff --git a/db/changes/10400-christmas/delete.keep b/db/changes/10400-christmas/delete.keep deleted file mode 100644 index 603d82d74..000000000 --- a/db/changes/10400-christmas/delete.keep +++ /dev/null @@ -1 +0,0 @@ -Delete me! \ No newline at end of file From 9247bc98f1181b3710dde00abeb094e358c16bf6 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 20 Dec 2021 08:01:13 +0100 Subject: [PATCH 06/10] feat(db): sql for supplier isPayMethodChecked --- .../00-payMethod_hasVerified.sql | 2 +- .../00-payment_beforeInsert.sql | 25 ++++++++++++------ db/changes/10400-christmas/00-supplier.sql | 17 ------------ .../01-supplier_beforeUpdate.sql | 26 +++++++++++++++++++ db/dump/fixtures.sql | 14 +++++----- 5 files changed, 51 insertions(+), 33 deletions(-) delete mode 100644 db/changes/10400-christmas/00-supplier.sql create mode 100644 db/changes/10400-christmas/01-supplier_beforeUpdate.sql diff --git a/db/changes/10400-christmas/00-payMethod_hasVerified.sql b/db/changes/10400-christmas/00-payMethod_hasVerified.sql index 7ebafc420..280a9e097 100644 --- a/db/changes/10400-christmas/00-payMethod_hasVerified.sql +++ b/db/changes/10400-christmas/00-payMethod_hasVerified.sql @@ -1 +1 @@ -ALTER TABLE vn.payMethod ADD hasVerified TINYINT(1) DEFAULT 0 NULL; \ No newline at end of file +ALTER TABLE `vn`.`payMethod` ADD hasVerified TINYINT(1) DEFAULT 0 NULL; \ No newline at end of file diff --git a/db/changes/10400-christmas/00-payment_beforeInsert.sql b/db/changes/10400-christmas/00-payment_beforeInsert.sql index 537bf0c54..ef76ad876 100644 --- a/db/changes/10400-christmas/00-payment_beforeInsert.sql +++ b/db/changes/10400-christmas/00-payment_beforeInsert.sql @@ -1,15 +1,15 @@ -DROP TRIGGER IF EXISTS vn.payment_beforeInsert; +DROP TRIGGER IF EXISTS `vn`.`payment_beforeInsert`; DELIMITER $$ $$ -CREATE DEFINER=`root`@`%` TRIGGER `payment_beforeInsert` BEFORE INSERT ON `payment` FOR EACH ROW +CREATE DEFINER=`root`@`%` TRIGGER `vn`.`payment_beforeInsert` BEFORE INSERT ON `payment` FOR EACH ROW -- Edit trigger body code below this line. Do not edit lines above this one BEGIN DECLARE cuenta_banco,cuenta_proveedor DOUBLE; DECLARE vNewBookEntry INT; DECLARE bolCASH BOOLEAN; - DECLARE isSupplierActive BOOLEAN; - DECLARE vIsPayMethodChecked BOOLEAN; + DECLARE vIsSupplierActive BOOLEAN; + DECLARE vIsPayMethodChecked BOOLEAN; -- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH SELECT (at2.code = 'cash') INTO bolCASH FROM vn.bank b JOIN vn.accountingType at2 ON at2.id = b.cash WHERE b.id = NEW.bankFk ; @@ -45,16 +45,25 @@ BEGIN SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received); - SELECT isActive, isPayMethodChecked INTO vIsSupplierActive, vIsPayMethodChecked + SELECT isActive, isPayMethodChecked INTO vIsSupplierActive, vIsPayMethodChecked FROM supplier WHERE id = NEW.supplierFk; - IF isSupplierActive = FALSE THEN + IF vIsSupplierActive = FALSE THEN CALL util.throw('SUPPLIER_INACTIVE'); END IF; - IF vIsPayMethodChecked = FALSE THEN - CALL util.throw('SUPPLIER_DOES_NOT_HAVE_PAYMETHODCHECKED'); + IF vIsPayMethodChecked = FALSE THEN + CALL mail_insert('finanzas@verdnatura.es', + null, + 'Pago con método sin verificar', + CONCAT('Se ha realizado el pago ', + LAST_INSERT_ID(), + ' al proveedor ', + NEW.supplierFk, + ' con el método de pago sin verificar.' + ) + ); END IF; END$$ diff --git a/db/changes/10400-christmas/00-supplier.sql b/db/changes/10400-christmas/00-supplier.sql deleted file mode 100644 index f86a1c534..000000000 --- a/db/changes/10400-christmas/00-supplier.sql +++ /dev/null @@ -1,17 +0,0 @@ -DELIMITER $$ -$$ -CREATE DEFINER=`root`@`%` TRIGGER `vn`.`supplier_beforeUpdate` - BEFORE UPDATE ON `vn`.`supplier` FOR EACH ROW -BEGIN - DECLARE vHasChange BOOL; - SET vHasChange = !((NEW.payMethodFk <=> OLD.payMethodFk) - AND (NEW.payDemFk <=> OLD.payDemFk) - AND (NEW.payDay <=> OLD.payDay)); - - IF vHasChange THEN - SET NEW.isPayMethodChecked = false; - END IF; - -END -$$ -DELIMITER ; diff --git a/db/changes/10400-christmas/01-supplier_beforeUpdate.sql b/db/changes/10400-christmas/01-supplier_beforeUpdate.sql new file mode 100644 index 000000000..b3ffccf9c --- /dev/null +++ b/db/changes/10400-christmas/01-supplier_beforeUpdate.sql @@ -0,0 +1,26 @@ +DROP TRIGGER IF EXISTS `vn`.`supplier_beforeUpdate`; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`%` TRIGGER `vn`.`supplier_beforeUpdate` + BEFORE UPDATE ON `vn`.`supplier` FOR EACH ROW +BEGIN + DECLARE vHasChange BOOL DEFAULT FALSE; + DECLARE vPayMethodHasVerified BOOL; + + SELECT hasVerified INTO vPayMethodHasVerified + FROM payMethod + WHERE id = NEW.payMethodFk; + + SET vHasChange = (NEW.payDemFk <> OLD.payDemFk) OR (NEW.payDay <> OLD.payDay); + + IF vPayMethodHasVerified AND !vHasChange THEN + SET vHasChange = (NEW.payMethodFk <> OLD.payMethodFk); + END IF; + + IF vHasChange THEN + SET NEW.isPayMethodChecked = FALSE; + END IF; + +END$$ +DELIMITER ; diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index efdd0e315..bef8a7a31 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -217,14 +217,14 @@ UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com' UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE `id` = 23; -INSERT INTO `vn`.`payMethod`(`id`,`code`, `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`) +INSERT INTO `vn`.`payMethod`(`id`,`code`, `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`, `hasVerified`) VALUES - (1, NULL, 'PayMethod one', 0, 001, 0, 0), - (2, NULL, 'PayMethod two', 10, 001, 0, 0), - (3, 'compensation', 'PayMethod three', 0, 001, 0, 0), - (4, NULL, 'PayMethod with IBAN', 0, 001, 1, 0), - (5, NULL, 'PayMethod five', 10, 001, 0, 0), - (8,'wireTransfer', 'WireTransfer', 5, 001, 1, 1); + (1, NULL, 'PayMethod one', 0, 001, 0, 0, 0), + (2, NULL, 'PayMethod two', 10, 001, 0, 0, 1), + (3, 'compensation', 'PayMethod three', 0, 001, 0, 0, 0), + (4, NULL, 'PayMethod with IBAN', 0, 001, 1, 0, 0), + (5, NULL, 'PayMethod five', 10, 001, 0, 0, 0), + (8,'wireTransfer', 'WireTransfer', 5, 001, 1, 1, 0); INSERT INTO `vn`.`payDem`(`id`, `payDem`) VALUES From 7a0221c17d510e23d7c4f75e8a01fc1ff50dc08a Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 20 Dec 2021 08:02:28 +0100 Subject: [PATCH 07/10] test(supplier): add backTest to check changes in isPayMethodChecked --- .../back/models/specs/supplier.spec.js | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/supplier/back/models/specs/supplier.spec.js b/modules/supplier/back/models/specs/supplier.spec.js index 8721e826c..3140981c3 100644 --- a/modules/supplier/back/models/specs/supplier.spec.js +++ b/modules/supplier/back/models/specs/supplier.spec.js @@ -55,13 +55,39 @@ describe('loopback model Supplier', () => { expect(error).not.toBeDefined(); }); - it('should have unchecked isPayMethodChecked', async() => { + it('should have checked isPayMethodChecked for payMethod hasVerfified is false', async() => { const supplier = await models.Supplier.findById(442); + await supplier.updateAttribute('isPayMethodChecked', true); await supplier.updateAttribute('payMethodFk', 5); const result = await models.Supplier.findById(442); + expect(result.isPayMethodChecked).toEqual(true); + }); + + it('should have unchecked isPayMethodChecked for payMethod hasVerfified is true', async() => { + const supplier = await models.Supplier.findById(442); + await supplier.updateAttribute('isPayMethodChecked', true); + await supplier.updateAttribute('payMethodFk', 2); + + const result = await models.Supplier.findById(442); + expect(result.isPayMethodChecked).toEqual(false); }); + + it('should have unchecked isPayMethodChecked for payDay and peyDemFk', async() => { + const supplier = await models.Supplier.findById(442); + + await supplier.updateAttribute('isPayMethodChecked', true); + await supplier.updateAttribute('payDay', 5); + const firstResult = await models.Supplier.findById(442); + + await supplier.updateAttribute('isPayMethodChecked', true); + await supplier.updateAttribute('payDemFk', 1); + const secondResult = await models.Supplier.findById(442); + + expect(firstResult.isPayMethodChecked).toEqual(false); + expect(secondResult.isPayMethodChecked).toEqual(false); + }); }); }); From 412acfbff23e1960866b3cd7f0f54cedba2821c1 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 20 Dec 2021 14:46:09 +0100 Subject: [PATCH 08/10] refactor(payment_afterInsert): email --- .../00-payment_beforeInsert.sql | 70 ------------------- .../10400-christmas/00-updateDepartment.sql | 3 + .../01-payment_afterInsert.sql | 33 +++++++++ 3 files changed, 36 insertions(+), 70 deletions(-) delete mode 100644 db/changes/10400-christmas/00-payment_beforeInsert.sql create mode 100644 db/changes/10400-christmas/00-updateDepartment.sql create mode 100644 db/changes/10400-christmas/01-payment_afterInsert.sql diff --git a/db/changes/10400-christmas/00-payment_beforeInsert.sql b/db/changes/10400-christmas/00-payment_beforeInsert.sql deleted file mode 100644 index ef76ad876..000000000 --- a/db/changes/10400-christmas/00-payment_beforeInsert.sql +++ /dev/null @@ -1,70 +0,0 @@ -DROP TRIGGER IF EXISTS `vn`.`payment_beforeInsert`; - -DELIMITER $$ -$$ -CREATE DEFINER=`root`@`%` TRIGGER `vn`.`payment_beforeInsert` BEFORE INSERT ON `payment` FOR EACH ROW --- Edit trigger body code below this line. Do not edit lines above this one -BEGIN - DECLARE cuenta_banco,cuenta_proveedor DOUBLE; - DECLARE vNewBookEntry INT; - DECLARE bolCASH BOOLEAN; - DECLARE vIsSupplierActive BOOLEAN; - DECLARE vIsPayMethodChecked BOOLEAN; - - -- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH - SELECT (at2.code = 'cash') INTO bolCASH FROM vn.bank b JOIN vn.accountingType at2 ON at2.id = b.cash WHERE b.id = NEW.bankFk ; - - IF bolCASH THEN - - SELECT account INTO cuenta_banco - FROM bank - WHERE id = NEW.bankFk; - - SELECT account INTO cuenta_proveedor - FROM supplier - WHERE id = NEW.supplierFk; - - CALL vn.ledger_next(vNewBookEntry); - - INSERT INTO XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id) - SELECT vNewBookEntry,NEW.received,SUBCTA,CONTRA,NEW.concept,EURODEBE,EUROHABER,NEW.companyFk - FROM - ( SELECT cuenta_banco SUBCTA,cuenta_proveedor CONTRA,0 EURODEBE, NEW.amount + NEW.bankingFees EUROHABER - UNION ALL - SELECT cuenta_proveedor SUBCTA, cuenta_banco CONTRA,NEW.amount EURODEBE, 0 EUROHABER - ) gf; - - IF NEW.bankingFees <> 0 THEN - INSERT INTO XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id) - SELECT vNewBookEntry,NEW.received,IF(c.id = 1,6260000002,IF(CEE = 1,6260000003,6260000004)),cuenta_banco,NEW.concept,NEW.bankingFees,0,NEW.companyFk - FROM supplier s - JOIN country c ON s.countryFk = c.id - WHERE s.id = NEW.supplierFk; - END IF; - END IF; - - SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received); - - SELECT isActive, isPayMethodChecked INTO vIsSupplierActive, vIsPayMethodChecked - FROM supplier - WHERE id = NEW.supplierFk; - - IF vIsSupplierActive = FALSE THEN - CALL util.throw('SUPPLIER_INACTIVE'); - END IF; - - IF vIsPayMethodChecked = FALSE THEN - CALL mail_insert('finanzas@verdnatura.es', - null, - 'Pago con método sin verificar', - CONCAT('Se ha realizado el pago ', - LAST_INSERT_ID(), - ' al proveedor ', - NEW.supplierFk, - ' con el método de pago sin verificar.' - ) - ); - END IF; - - END$$ -DELIMITER ; diff --git a/db/changes/10400-christmas/00-updateDepartment.sql b/db/changes/10400-christmas/00-updateDepartment.sql new file mode 100644 index 000000000..ce46220ca --- /dev/null +++ b/db/changes/10400-christmas/00-updateDepartment.sql @@ -0,0 +1,3 @@ +UPDATE `vn`.`department` + SET `notificationEmail` = 'finanzas@verdnatura.es' + WHERE `name` = 'FINANZAS'; \ No newline at end of file diff --git a/db/changes/10400-christmas/01-payment_afterInsert.sql b/db/changes/10400-christmas/01-payment_afterInsert.sql new file mode 100644 index 000000000..f422ebce2 --- /dev/null +++ b/db/changes/10400-christmas/01-payment_afterInsert.sql @@ -0,0 +1,33 @@ +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`%` TRIGGER `vn`.`payment_afterInsert` AFTER INSERT ON `payment` FOR EACH ROW +BEGIN + DECLARE vIsPayMethodChecked BOOLEAN; + DECLARE vEmail VARCHAR(150); + + SELECT isPayMethodChecked INTO vIsPayMethodChecked + FROM supplier + WHERE id = NEW.supplierFk; + + + IF vIsPayMethodChecked = FALSE THEN + + SELECT notificationEmail INTO vEmail + FROM department + WHERE name = 'FINANZAS'; + + CALL mail_insert( + vEmail, + NULL, + 'Pago con método sin verificar', + CONCAT( + 'Se ha realizado el pago ', + NEW.id, + ' al proveedor ', + NEW.supplierFk, + ' con el método de pago sin verificar.' + ) + ); + END IF; +END$$ +DELIMITER ; From df34debcc60a86ff635b46b7423276aee22a28e5 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 21 Dec 2021 08:05:22 +0100 Subject: [PATCH 09/10] test(ticket_descriptor): repair --- e2e/helpers/selectors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 24b87b398..8675797e7 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -524,7 +524,7 @@ export default { saturdayButton: '.vn-popup.shown vn-tool-bar > vn-button:nth-child(6)', acceptDialog: '.vn-dialog.shown button[response="accept"]', acceptChangeHourButton: '.vn-dialog.shown button[response="accept"]', - descriptorDeliveryDate: 'vn-ticket-descriptor slot-body > .attributes > vn-label-value:nth-child(3) > section > span', + descriptorDeliveryDate: 'vn-ticket-descriptor slot-body > .attributes > vn-label-value:nth-child(4) > section > span', acceptInvoiceOutButton: '.vn-confirm.shown button[response="accept"]', acceptDeleteStowawayButton: '.vn-dialog.shown button[response="accept"]' }, From 831bfb0352b9cefad5877c5e988a1891b58bc85a Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 21 Dec 2021 08:52:39 +0100 Subject: [PATCH 10/10] change route for hasRoute --- modules/ticket/back/methods/ticket/filter.js | 4 ++-- .../ticket/back/methods/ticket/specs/filter.spec.js | 10 +++++----- modules/ticket/front/search-panel/index.html | 4 ++-- modules/ticket/front/search-panel/locale/es.yml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js index 9e51d3607..58c440e95 100644 --- a/modules/ticket/back/methods/ticket/filter.js +++ b/modules/ticket/back/methods/ticket/filter.js @@ -84,7 +84,7 @@ module.exports = Self => { description: `Whether to show only tickets with problems` }, { - arg: 'route', + arg: 'hasRoute', type: 'boolean', description: `Whether to show only tickets with route` }, @@ -193,7 +193,7 @@ module.exports = Self => { case 'alertLevel': return {'ts.alertLevel': value}; - case 'route': + case 'hasRoute': if (value == true) return {'t.routeFk': {neq: null}}; return {'t.routeFk': null}; diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js index d1d44bb9c..b251d5335 100644 --- a/modules/ticket/back/methods/ticket/specs/filter.spec.js +++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js @@ -228,7 +228,7 @@ describe('ticket filter()', () => { try { const options = {transaction: tx}; - const ctx = {req: {accessToken: {userId: 9}}, args: {route: true}}; + const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: true}}; const filter = {}; const result = await models.Ticket.filter(ctx, filter, options); @@ -247,11 +247,11 @@ describe('ticket filter()', () => { try { const options = {transaction: tx}; - const ctx = {req: {accessToken: {userId: 9}}, args: {route: false}}; + const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: false}}; const filter = {}; const result = await models.Ticket.filter(ctx, filter, options); - expect(result.length).toEqual(2); + expect(result.length).toEqual(5); await tx.rollback(); } catch (e) { @@ -266,11 +266,11 @@ describe('ticket filter()', () => { try { const options = {transaction: tx}; - const ctx = {req: {accessToken: {userId: 9}}, args: {route: null}}; + const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: null}}; const filter = {}; const result = await models.Ticket.filter(ctx, filter, options); - expect(result.length).toEqual(24); + expect(result.length).toEqual(27); await tx.rollback(); } catch (e) { diff --git a/modules/ticket/front/search-panel/index.html b/modules/ticket/front/search-panel/index.html index 78ae72734..b0d4963bd 100644 --- a/modules/ticket/front/search-panel/index.html +++ b/modules/ticket/front/search-panel/index.html @@ -137,8 +137,8 @@ diff --git a/modules/ticket/front/search-panel/locale/es.yml b/modules/ticket/front/search-panel/locale/es.yml index fcb7cc7e3..52cc04d6e 100644 --- a/modules/ticket/front/search-panel/locale/es.yml +++ b/modules/ticket/front/search-panel/locale/es.yml @@ -12,7 +12,7 @@ Order id: Id cesta Grouped States: Estado agrupado Days onward: Días adelante With problems: Con problemas -With route: Con ruta +Has route: Con ruta Pending: Pendiente FREE: Libre DELIVERED: Servido