From 7370269e4de6f795f0bc4debe3ae6bee68f5faf3 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 16 Jun 2021 17:06:11 +0200 Subject: [PATCH 1/4] ticket.sale now shows Packing type --- modules/item/back/models/item.json | 3 +++ modules/ticket/back/methods/ticket/getSales.js | 3 ++- modules/ticket/front/sale/index.html | 4 ++++ modules/ticket/front/sale/locale/es.yml | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json index ee1f46e646..ce03ba1ea5 100644 --- a/modules/item/back/models/item.json +++ b/modules/item/back/models/item.json @@ -117,6 +117,9 @@ "value10": { "type": "string" }, + "itemPackingTypeFk": { + "type": "string" + }, "compression": { "type": "number" }, diff --git a/modules/ticket/back/methods/ticket/getSales.js b/modules/ticket/back/methods/ticket/getSales.js index 7520e72705..7bd2eabbe1 100644 --- a/modules/ticket/back/methods/ticket/getSales.js +++ b/modules/ticket/back/methods/ticket/getSales.js @@ -11,7 +11,7 @@ module.exports = Self => { http: {source: 'path'} }], returns: { - type: ['Object'], + type: ['object'], root: true }, http: { @@ -35,6 +35,7 @@ module.exports = Self => { fields: [ 'id', 'name', + 'itemPackingTypeFk', 'tag5', 'value5', 'tag6', diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 276bcfe661..a66d8a4de7 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -63,6 +63,7 @@ Id Quantity Item + Packing type Price Disc Amount @@ -168,6 +169,9 @@ + + {{::sale.item.itemPackingTypeFk == 'H' ? 'Horizontal' : (sale.item.itemPackingTypeFk == 'V' ? 'Vertical' : '-')}} + Date: Wed, 16 Jun 2021 17:58:47 +0200 Subject: [PATCH 2/4] e2e fix --- e2e/helpers/selectors.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 850a8c3fbc..a31f11b563 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -572,11 +572,11 @@ export default { firstSaleZoomedImage: 'body > div > div > img', firstSaleQuantity: 'vn-ticket-sale [ng-model="sale.quantity"]', firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td-editable:nth-child(6)', - firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(8) > span', + firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(9) > span', firstSalePriceInput: '.vn-popover.shown input[ng-model="$ctrl.field"]', - firstSaleDiscount: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(9) > span', + firstSaleDiscount: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(10) > span', firstSaleDiscountInput: '.vn-popover.shown [ng-model="$ctrl.field"]', - firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(10)', + firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(11)', firstSaleReservedIcon: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td:nth-child(2) > vn-icon:nth-child(3)', firstSaleColour: 'vn-ticket-sale vn-tr:nth-child(1) vn-fetched-tags section', firstSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(1) vn-check[ng-model="sale.checked"]', From 27240339092e89c3171953add14f898a0dae6224 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 17 Jun 2021 16:17:18 +0200 Subject: [PATCH 3/4] added a waitForTimeout to allow descriptor component to load --- e2e/paths/10-travel/03_descriptor.spec.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js index f3d573b9b6..d7d38c7af3 100644 --- a/e2e/paths/10-travel/03_descriptor.spec.js +++ b/e2e/paths/10-travel/03_descriptor.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -// Tarea #2972 -xdescribe('Travel descriptor path', () => { + +describe('Travel descriptor path', () => { let browser; let page; @@ -136,6 +136,7 @@ xdescribe('Travel descriptor path', () => { it('should navigate to the summary and then clone the travel and its entries using the descriptor menu to get redirected to the cloned travel basic data', async() => { await page.waitToClick('vn-icon[icon="preview"]'); // summary icon await page.waitForState('travel.card.summary'); + await page.waitForTimeout(1000); await page.waitToClick(selectors.travelDescriptor.dotMenu); await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries); await page.waitToClick(selectors.travelDescriptor.acceptClonation); From 325afe2245573725d8dd70cb4cf1a4fb610142f5 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 18 Jun 2021 08:42:55 +0200 Subject: [PATCH 4/4] 2906 - Number of packages --- modules/client/back/models/receipt.json | 3 --- print/templates/reports/delivery-note/delivery-note.html | 4 ++++ print/templates/reports/delivery-note/locale/en.yml | 3 ++- print/templates/reports/delivery-note/locale/es.yml | 3 ++- print/templates/reports/delivery-note/locale/fr.yml | 3 ++- print/templates/reports/delivery-note/locale/pt.yml | 3 ++- print/templates/reports/delivery-note/sql/ticket.sql | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/modules/client/back/models/receipt.json b/modules/client/back/models/receipt.json index 3207546a30..19107f5618 100644 --- a/modules/client/back/models/receipt.json +++ b/modules/client/back/models/receipt.json @@ -16,9 +16,6 @@ "type": "number", "required": true }, - "amountUnpaid": { - "type": "number" - }, "payed": { "type": "date", "required": true diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index 0004d171b0..771f1fd0cc 100644 --- a/print/templates/reports/delivery-note/delivery-note.html +++ b/print/templates/reports/delivery-note/delivery-note.html @@ -30,6 +30,10 @@ {{$t('date')}} {{ticket.shipped | date('%d-%m-%Y')}} + + {{$t('packages')}} + {{ticket.packages}} + diff --git a/print/templates/reports/delivery-note/locale/en.yml b/print/templates/reports/delivery-note/locale/en.yml index 74caa0eb64..ec961cabec 100644 --- a/print/templates/reports/delivery-note/locale/en.yml +++ b/print/templates/reports/delivery-note/locale/en.yml @@ -24,4 +24,5 @@ services: Services vatType: VAT Type digitalSignature: Digital signature ticket: Delivery note {0} -plantPassport: Plant passport \ No newline at end of file +plantPassport: Plant passport +packages: Packages \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/es.yml b/print/templates/reports/delivery-note/locale/es.yml index d9890d9247..674cb875e0 100644 --- a/print/templates/reports/delivery-note/locale/es.yml +++ b/print/templates/reports/delivery-note/locale/es.yml @@ -24,4 +24,5 @@ services: Servicios vatType: Tipo de IVA digitalSignature: Firma digital ticket: Albarán {0} -plantPassport: Pasaporte fitosanitario \ No newline at end of file +plantPassport: Pasaporte fitosanitario +packages: Bultos \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/fr.yml b/print/templates/reports/delivery-note/locale/fr.yml index 22d77012a8..526df30686 100644 --- a/print/templates/reports/delivery-note/locale/fr.yml +++ b/print/templates/reports/delivery-note/locale/fr.yml @@ -24,4 +24,5 @@ services: Service vatType: Type de TVA digitalSignature: Signature numérique ticket: BL {0} -plantPassport: Passeport phytosanitaire \ No newline at end of file +plantPassport: Passeport phytosanitaire +packages: Paquets \ No newline at end of file diff --git a/print/templates/reports/delivery-note/locale/pt.yml b/print/templates/reports/delivery-note/locale/pt.yml index a1f93550cd..95bcd857ec 100644 --- a/print/templates/reports/delivery-note/locale/pt.yml +++ b/print/templates/reports/delivery-note/locale/pt.yml @@ -24,4 +24,5 @@ services: Serviços vatType: Tipo de IVA digitalSignature: Assinatura digital ticket: Nota de Entrega {0} -plantPassport: Passaporte vegetal \ No newline at end of file +plantPassport: Passaporte vegetal +packages: Pacotes \ No newline at end of file diff --git a/print/templates/reports/delivery-note/sql/ticket.sql b/print/templates/reports/delivery-note/sql/ticket.sql index ccc3f9d25e..f78c725444 100644 --- a/print/templates/reports/delivery-note/sql/ticket.sql +++ b/print/templates/reports/delivery-note/sql/ticket.sql @@ -1,7 +1,8 @@ SELECT t.id, t.shipped, - c.code companyCode + c.code companyCode, + t.packages FROM ticket t JOIN company c ON c.id = t.companyFk WHERE t.id = ? \ No newline at end of file