From 649824b97f94b9b7447618a08e3fc394a42ae676 Mon Sep 17 00:00:00 2001 From: Gerard Date: Mon, 10 Dec 2018 14:24:10 +0100 Subject: [PATCH] #904 ticket.summary incluir las secciones cubos y servicios --- client/ticket/src/summary/index.html | 195 +++++++++++++----- .../loopback/common/methods/ticket/summary.js | 29 +++ 2 files changed, 177 insertions(+), 47 deletions(-) diff --git a/client/ticket/src/summary/index.html b/client/ticket/src/summary/index.html index 03a23b85fd..d09490a577 100644 --- a/client/ticket/src/summary/index.html +++ b/client/ticket/src/summary/index.html @@ -52,55 +52,156 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + +
ItemDescriptionQuantityPriceDiscountAmount
- - +
Sale
+ + + + + + + + + + + + + + + - - - - - - - - - - - -
ItemDescriptionQuantityPriceDiscountAmount
+ + + + + + icon="warning" + vn-tooltip="Visible: {{::sale.visible || 0}}
{{::$ctrl.translate.instant('Available')}} {{::sale.available || 0}}"> - - - - - 		- - {{("000000"+sale.itemFk).slice(-6)}} - - {{::sale.quantity}}{{::sale.price | currency:'€':2}}{{::sale.discount}} %{{::sale.quantity * sale.price | currency:'€':2}}
No results
+ + 		+ + {{("000000"+sale.itemFk).slice(-6)}} + + {{::sale.quantity}}{{::sale.price | currency:'€':2}}{{::sale.discount}} %{{::sale.quantity * sale.price | currency:'€':2}}
No results
+ + + + +
Packages
+ + + + Created + Package + Quantity + + + + + {{package.created | dateTime: 'dd/MM/yyyy'}} + {{package.packaging.item.name}} + {{package.quantity}} + + + + No results + + + + +
Service
+ + + + Id + Description + Quantity + Price + Tax class + + + + + {{::service.id}} + {{::service.description}} + {{::service.quantity}} + {{::service.price}} + {{::service.taxClass.description}} + + + + No results + + + + + + +
Purchase request
+ + + + Id + Description + Created + Requester + Atender + Quantity + Price + Sale id + Ok + + + + + {{::request.id}} + {{::request.description}} + {{::request.created | dateTime: 'dd/MM/yyyy'}} + {{::request.requester.firstName}} {{::request.requester.name}} + {{::request.atender.firstName}} {{::request.atender.name}} + {{::request.quantity}} + {{::request.price}} + + + {{("000000"+request.saleFk).slice(-6)}} + + + + + + + + + + No results + + + diff --git a/services/loopback/common/methods/ticket/summary.js b/services/loopback/common/methods/ticket/summary.js index 27fdebbe1c..e67b438ff7 100644 --- a/services/loopback/common/methods/ticket/summary.js +++ b/services/loopback/common/methods/ticket/summary.js @@ -26,6 +26,22 @@ module.exports = Self => { summaryObj.subTotal = getSubTotal(summaryObj.sales); summaryObj.VAT = await models.Ticket.getVAT(ticketFk); summaryObj.total = await models.Ticket.getTotal(ticketFk); + summaryObj.packagings = await models.TicketPackaging.find({ + where: {ticketFk: ticketFk}, + include: [{relation: 'packaging', + scope: { + fields: ['itemFk', 'name'], + include: { + relation: 'item' + } + } + }] + }); + summaryObj.requests = await getRequests(Self, ticketFk); + summaryObj.services = await models.TicketService.find({ + where: {ticketFk: ticketFk}, + include: [{relation: 'taxClass'}] + }); return summaryObj; }; @@ -98,6 +114,19 @@ module.exports = Self => { return await Sale.find(filter); } + async function getRequests(Self, ticketFk) { + let filter = { + where: { + ticketFk: ticketFk + }, + include: [ + {relation: 'requester'}, + {relation: 'atender'} + ] + }; + return await Self.app.models.TicketRequest.find(filter); + } + function getSubTotal(sales) { let subTotal = 0.00;