From f8a00943216a0b37f58829f95415a2fa4a3db396 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 26 Jan 2022 08:54:48 +0100 Subject: [PATCH] word movible --- .../10410-january/00-ticket_getAdvancable.sql | 10 +++++----- .../ticket/back/methods/ticket/componentUpdate.js | 6 +++--- .../ticket/back/methods/ticket/priceDifference.js | 14 +++++++------- .../methods/ticket/specs/priceDifference.spec.js | 6 +++--- .../ticket/front/basic-data/step-two/index.html | 6 +++--- modules/ticket/front/basic-data/step-two/index.js | 2 +- .../ticket/front/basic-data/step-two/index.spec.js | 4 ++-- .../ticket/front/basic-data/step-two/locale/es.yml | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/db/changes/10410-january/00-ticket_getAdvancable.sql b/db/changes/10410-january/00-ticket_getAdvancable.sql index b8d9337e34..5f5b0a93a3 100644 --- a/db/changes/10410-january/00-ticket_getAdvancable.sql +++ b/db/changes/10410-january/00-ticket_getAdvancable.sql @@ -1,15 +1,15 @@ -DROP PROCEDURE IF EXISTS `vn`.`ticket_getAdvanceable`; +DROP PROCEDURE IF EXISTS `vn`.`ticket_getMovable`; DELIMITER $$ $$ -CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticket_getAdvanceable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT) +CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT) BEGIN /** - * Cálcula el stock avanzable para los artículos de un ticket + * Cálcula el stock movible para los artículos de un ticket * * @param vTicketFk -> Ticket * @param vDatedNew -> Nueva fecha - * @return Sales con Avanzable + * @return Sales con Movible */ DECLARE vDatedOld DATETIME; @@ -29,7 +29,7 @@ BEGIN s.discount, i.image, i.subName, - il.stock + IFNULL(im.amount, 0) AS advanceable + il.stock + IFNULL(im.amount, 0) AS movable FROM ticket t JOIN sale s ON s.ticketFk = t.id JOIN item i ON i.id = s.itemFk diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js index 64b02e2f2c..e01798887d 100644 --- a/modules/ticket/back/methods/ticket/componentUpdate.js +++ b/modules/ticket/back/methods/ticket/componentUpdate.js @@ -134,11 +134,11 @@ module.exports = Self => { } if (args.isWithoutNegatives) { - const query = `CALL ticket_getAdvanceable(?,?,?)`; + const query = `CALL ticket_getMovable(?,?,?)`; const params = [args.id, args.shipped, args.warehouseFk]; - const [salesAdvanceable] = await Self.rawSql(query, params, myOptions); + const [salesMovable] = await Self.rawSql(query, params, myOptions); - const salesNewTicket = salesAdvanceable.filter(sale => (sale.advanceable ?? 0) >= sale.quantity); + const salesNewTicket = salesMovable.filter(sale => (sale.movable ?? 0) >= sale.quantity); if (salesNewTicket.length) { const newTicket = await models.Ticket.transferSales(ctx, args.id, null, salesNewTicket, myOptions); args.id = newTicket.id; diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index e6688da969..ffcdc19ef1 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -110,14 +110,14 @@ module.exports = Self => { totalDifference: 0.00, }; - // Get items advanceable - let query = `CALL ticket_getAdvanceable(?,?,?)`; + // Get items movable + let query = `CALL ticket_getMovable(?,?,?)`; let params = [args.id, args.shipped, args.warehouseId]; - const [salesAdvanceable] = await Self.rawSql(query, params, myOptions); + const [salesMovable] = await Self.rawSql(query, params, myOptions); - const itemAdvanceable = new Map(); - for (sale of salesAdvanceable) - itemAdvanceable.set(sale.id, sale.advanceable ?? 0); + const itemMovable = new Map(); + for (sale of salesMovable) + itemMovable.set(sale.id, sale.movable ?? 0); // Sale price component, one per sale query = `CALL vn.ticket_priceDifference(?, ?, ?, ?, ?)`; @@ -142,7 +142,7 @@ module.exports = Self => { salesObj.totalUnitPrice += sale.price; salesObj.totalUnitPrice = round(salesObj.totalUnitPrice); - sale.advanceable = itemAdvanceable.get(sale.id); + sale.movable = itemMovable.get(sale.id); } if (tx) await tx.commit(); diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js index 362c3e923e..6659ed26e7 100644 --- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js +++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js @@ -60,7 +60,7 @@ describe('sale priceDifference()', () => { expect(error).toEqual(new UserError(`The sales of this ticket can't be modified`)); }); - it('should return ticket advanceable', async() => { + it('should return ticket movable', async() => { const tx = await models.Ticket.beginTransaction({}); try { @@ -83,8 +83,8 @@ describe('sale priceDifference()', () => { const firstItem = result.items[0]; const secondtItem = result.items[1]; - expect(firstItem.advanceable).toEqual(440); - expect(secondtItem.advanceable).toEqual(1980); + expect(firstItem.movable).toEqual(440); + expect(secondtItem.movable).toEqual(1980); await tx.rollback(); } catch (e) { diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html index 2987251898..88475daa24 100644 --- a/modules/ticket/front/basic-data/step-two/index.html +++ b/modules/ticket/front/basic-data/step-two/index.html @@ -9,7 +9,7 @@ Item Description - Advanceable + Movable Quantity Price (PPU) New (PPU) @@ -35,8 +35,8 @@ - {{::sale.advanceable}} + ng-class="{'alert': sale.quantity>sale.movable}"> + {{::sale.movable}} {{::sale.quantity}} diff --git a/modules/ticket/front/basic-data/step-two/index.js b/modules/ticket/front/basic-data/step-two/index.js index db0bb6d448..2daa98af98 100644 --- a/modules/ticket/front/basic-data/step-two/index.js +++ b/modules/ticket/front/basic-data/step-two/index.js @@ -69,7 +69,7 @@ class Controller extends Component { let haveNotNegatives = false; this.ticket.sale.items.forEach(item => { - if (item.quantity > item.advanceable) + if (item.quantity > item.movable) haveNegatives = true; else haveNotNegatives = true; diff --git a/modules/ticket/front/basic-data/step-two/index.spec.js b/modules/ticket/front/basic-data/step-two/index.spec.js index 0567785e98..0c299521bf 100644 --- a/modules/ticket/front/basic-data/step-two/index.spec.js +++ b/modules/ticket/front/basic-data/step-two/index.spec.js @@ -73,12 +73,12 @@ describe('Ticket', () => { { item: 1, quantity: 2, - advanceable: 1 + movable: 1 }, { item: 2, quantity: 1, - advanceable: 5 + movable: 5 } ] } diff --git a/modules/ticket/front/basic-data/step-two/locale/es.yml b/modules/ticket/front/basic-data/step-two/locale/es.yml index ccf1f55721..1a7427d2ec 100644 --- a/modules/ticket/front/basic-data/step-two/locale/es.yml +++ b/modules/ticket/front/basic-data/step-two/locale/es.yml @@ -8,4 +8,4 @@ New price: Nuevo precio Price difference: Diferencia de precio Without create negatives: Sin crear negativos Clone this ticket with the changes and only sales availables: Clona este ticket con los cambios y solo las ventas disponibles. -Advanceable: Avanzable \ No newline at end of file +Movable: Movible \ No newline at end of file