From e01d676bb13b9d6ac178d75b6a53f21b8635ca1c Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 15 Dec 2021 14:45:45 +0100 Subject: [PATCH] feat(ticket_basic-data_step-two): show visible and option withoutNegatives --- .../back/methods/ticket/priceDifference.js | 15 ++++++++--- .../front/basic-data/step-two/index.html | 14 ++++++++++ .../ticket/front/basic-data/step-two/index.js | 27 +++++++++++++++++-- .../front/basic-data/step-two/locale/es.yml | 3 ++- 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index 2456d3de0..56f6ad7d2 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -100,19 +100,25 @@ module.exports = Self => { totalDifference: 0.00, }; - const query = `CALL vn.ticket_priceDifference(?, ?, ?, ?, ?)`; + // Get items visible + let query = `CALL ticketGetVisibleAvailable(?)`; + const [salesVisible] = await Self.rawSql(query, [args.id], myOptions); + + const itemVisible = new Map(); + for (sale of salesVisible) + itemVisible.set(sale.id, sale.visible); + + // Sale price component, one per sale + query = `CALL vn.ticket_priceDifference(?, ?, ?, ?, ?)`; const params = [args.id, args.landed, args.addressId, args.zoneId, args.warehouseId]; const [difComponents] = await Self.rawSql(query, params, myOptions); const map = new Map(); - - // Sale price component, one per sale for (difComponent of difComponents) map.set(difComponent.saleFk, difComponent); for (sale of salesObj.items) { const difComponent = map.get(sale.id); - if (difComponent) { sale.component = difComponent; @@ -125,6 +131,7 @@ module.exports = Self => { salesObj.totalUnitPrice += sale.price; salesObj.totalUnitPrice = round(salesObj.totalUnitPrice); + sale.visible = itemVisible.get(sale.id); } if (tx) await tx.commit(); diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html index 439f2b527..324133578 100644 --- a/modules/ticket/front/basic-data/step-two/index.html +++ b/modules/ticket/front/basic-data/step-two/index.html @@ -9,6 +9,7 @@ Item Description + Visible Quantity Price (PPU) New (PPU) @@ -31,6 +32,13 @@ tabindex="-1"> + + + {{::sale.visible}} + + {{::sale.quantity}} {{::sale.price | currency: 'EUR': 2}} {{::sale.component.newPrice | currency: 'EUR': 2}} @@ -66,6 +74,12 @@ +
+ + +
diff --git a/modules/ticket/front/basic-data/step-two/index.js b/modules/ticket/front/basic-data/step-two/index.js index 7ffdb8315..fbaa52a7e 100644 --- a/modules/ticket/front/basic-data/step-two/index.js +++ b/modules/ticket/front/basic-data/step-two/index.js @@ -20,6 +20,7 @@ class Controller extends Component { this.getTotalNewPrice(); this.getTotalDifferenceOfPrice(); this.loadDefaultTicketAction(); + this.ticketHaveNegatives(); } loadDefaultTicketAction() { @@ -63,15 +64,37 @@ class Controller extends Component { this.totalPriceDifference = totalPriceDifference; } + ticketHaveNegatives() { + let haveNegatives = false; + this.ticket.sale.items.forEach(item => { + if (item.quantity > item.visible) + haveNegatives = true; + }); + this.haveNegatives = haveNegatives; + } + onSubmit() { if (!this.ticket.option) { return this.vnApp.showError( this.$t('Choose an option') ); } + if (this.ticket.withoutNegatives) { + let salesNewTicket = []; + this.ticket.sale.items.forEach(item => { + if (item.visible >= item.quantity) + salesNewTicket.push(item); + }); - let query = `tickets/${this.ticket.id}/componentUpdate`; - let params = { + const params = { + sales: salesNewTicket + }; + + const query = `tickets/${this.ticket.id}/transferSales`; + this.$http.post(query, params); + } + const query = `tickets/${this.ticket.id}/componentUpdate`; + const params = { clientFk: this.ticket.clientFk, nickname: this.ticket.nickname, agencyModeFk: this.ticket.agencyModeFk, 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 a2a07991b..4f68d33e2 100644 --- a/modules/ticket/front/basic-data/step-two/locale/es.yml +++ b/modules/ticket/front/basic-data/step-two/locale/es.yml @@ -5,4 +5,5 @@ Charge difference to: Cargar diferencia a The ticket has been unrouted: El ticket ha sido desenrutado Price: Precio New price: Nuevo precio -Price difference: Diferencia de precio \ No newline at end of file +Price difference: Diferencia de precio +Without create negatives: Sin crear negativos \ No newline at end of file