From 9dcad609d44d92d8d05cde07ec8e2c158e0ac25f Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Fri, 11 Jan 2019 12:41:07 +0100 Subject: [PATCH 1/6] #776 e2e de ticket.log --- e2e/helpers/selectors.js | 6 ++++++ e2e/paths/client-module/13_log.spec.js | 8 ++++---- ...s => 02_ticket_expeditions_and_log.spec.js} | 18 ++++++++++++++++-- e2e/paths/ticket-module/03_list_sale.spec.js | 12 ++++++------ 4 files changed, 32 insertions(+), 12 deletions(-) rename e2e/paths/ticket-module/{02_delete_ticket_expeditions.spec.js => 02_ticket_expeditions_and_log.spec.js} (57%) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 7df9af409..29d8a7577 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -413,6 +413,12 @@ export default { firstDescription: 'vn-ticket-request-index > form > vn-card > div > vn-horizontal > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(2)', }, + ticketLog: { + logButton: `vn-left-menu a[ui-sref="ticket.card.log"]`, + changedBy: 'vn-ticket-log > vn-log > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(1) > div > div:nth-child(1) > span.value.ng-scope.ng-binding', + actionTaken: 'vn-ticket-log > vn-log > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(1) > div > div:nth-child(3) > span.value.ng-scope.ng-binding', + id: 'vn-ticket-log > vn-log > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr > vn-td.before > vn-one:nth-child(1) > div > span.value.ng-scope.ng-binding' + }, createStateView: { stateAutocomplete: `vn-autocomplete[field="$ctrl.ticket.stateFk"]`, clearStateInputButton: `vn-autocomplete[field="$ctrl.ticket.stateFk"] > div > div > div > vn-icon > i`, diff --git a/e2e/paths/client-module/13_log.spec.js b/e2e/paths/client-module/13_log.spec.js index 03d930340..046c281fc 100644 --- a/e2e/paths/client-module/13_log.spec.js +++ b/e2e/paths/client-module/13_log.spec.js @@ -11,7 +11,7 @@ describe('Client log path', () => { .accessToSection('client.card.basicData'); }); - it('should update the clients name', async () => { + it('should update the clients name', async() => { let result = await nightmare .wait(selectors.clientBasicData.nameInput) .clearInput(selectors.clientBasicData.nameInput) @@ -22,7 +22,7 @@ describe('Client log path', () => { expect(result).toEqual('Data saved!'); }); - it('should navigate to the log section', async () => { + it('should navigate to the log section', async() => { let url = await nightmare .waitToClick(selectors.clientLog.logButton) .waitForURL('log') @@ -31,14 +31,14 @@ describe('Client log path', () => { expect(url.hash).toContain('log'); }); - it('should check the previous value of the last logged change', async () => { + it('should check the previous value of the last logged change', async() => { let lastModificationPreviousValue = await nightmare .waitToGetProperty(selectors.clientLog.lastModificationPreviousValue, 'innerText'); expect(lastModificationPreviousValue).toContain('DavidCharlesHaller'); }); - it('should check the current value of the last logged change', async () => { + it('should check the current value of the last logged change', async() => { let lastModificationCurrentValue = await nightmare .waitToGetProperty(selectors.clientLog.lastModificationCurrentValue, 'innerText'); diff --git a/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js b/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js similarity index 57% rename from e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js rename to e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js index 087613b3f..8e107adb4 100644 --- a/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js +++ b/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js @@ -1,12 +1,12 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -describe('Ticket Delete expeditions path', () => { +fdescribe('Ticket Delete expeditions path', () => { const nightmare = createNightmare(); beforeAll(() => { return nightmare - .loginAndModule('production', 'ticket') + .loginAndModule('developer', 'ticket') .accessToSearchResult('id:1') .accessToSection('ticket.card.expedition'); }); @@ -23,4 +23,18 @@ describe('Ticket Delete expeditions path', () => { expect(result).toEqual(3); }); + + it(`should confirm the expedition deleted is shown now in the ticket log`, async() => { + const changedBy = await nightmare + .waitToClick(selectors.ticketLog.logButton) + .waitToGetProperty(selectors.ticketLog.changedBy, 'innerText'); + const actionTaken = await nightmare + .waitToGetProperty(selectors.ticketLog.actionTaken, 'innerText'); + const id = await nightmare + .waitToGetProperty(selectors.ticketLog.id, 'innerText'); + + expect(changedBy).toEqual('production'); + expect(actionTaken).toEqual('Deletes'); + expect(id).toEqual('3'); + }); }); diff --git a/e2e/paths/ticket-module/03_list_sale.spec.js b/e2e/paths/ticket-module/03_list_sale.spec.js index bd7b485c6..2813bb988 100644 --- a/e2e/paths/ticket-module/03_list_sale.spec.js +++ b/e2e/paths/ticket-module/03_list_sale.spec.js @@ -11,42 +11,42 @@ describe('Ticket List sale path', () => { .accessToSection('ticket.card.sale'); }); - it('should confirm the first ticket sale contains the colour', async () => { + it('should confirm the first ticket sale contains the colour', async() => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSaleColour, 'innerText'); expect(value).toContain('Red'); }); - it('should confirm the first ticket sale contains the lenght', async () => { + it('should confirm the first ticket sale contains the lenght', async() => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSaleText, 'innerText'); expect(value).toContain('3'); }); - it('should confirm the first ticket sale contains the price', async () => { + it('should confirm the first ticket sale contains the price', async() => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSalePrice, 'innerText'); expect(value).toContain('1.30'); }); - it('should confirm the first ticket sale contains the discount', async () => { + it('should confirm the first ticket sale contains the discount', async() => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSaleDiscount, 'innerText'); expect(value).toContain('0 %'); }); - it('should confirm the first ticket sale contains the total import', async () => { + it('should confirm the first ticket sale contains the total import', async() => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText'); expect(value).toContain('19.50'); }); - it('should navigate to the catalog by pressing the new item button', async () => { + it('should navigate to the catalog by pressing the new item button', async() => { const url = await nightmare .waitToClick(selectors.ticketSales.newItemButton) .waitForURL('/catalog') From abfa544a4cccc8b35c06ada6ab8f0bb3307ca1f0 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Fri, 11 Jan 2019 12:48:52 +0100 Subject: [PATCH 2/6] removed fdescribe --- e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js b/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js index 8e107adb4..779c8c59e 100644 --- a/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js +++ b/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -fdescribe('Ticket Delete expeditions path', () => { +describe('Ticket Delete expeditions path', () => { const nightmare = createNightmare(); beforeAll(() => { From 9bb888f52f73c4387e9c6e8e7d4b4a52f7f30349 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Fri, 11 Jan 2019 18:00:29 +0100 Subject: [PATCH 3/6] section bugs #776 unfinished --- e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js b/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js index 779c8c59e..8cf348320 100644 --- a/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js +++ b/e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js @@ -1,7 +1,8 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -describe('Ticket Delete expeditions path', () => { +// #776 +xdescribe('Ticket expeditions and log path', () => { const nightmare = createNightmare(); beforeAll(() => { From 6865f606a4da4fc1b1ea16a41bc3699702e5396c Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Mon, 14 Jan 2019 11:19:39 +0100 Subject: [PATCH 4/6] #892 e2e ticket.services --- e2e/helpers/selectors.js | 10 +++ e2e/paths/ticket-module/07_edit_sale.spec.js | 2 +- .../12_delete_ticket_from_descriptor.spec.js | 10 +-- .../13_create_ticket_services.spec.js | 71 +++++++++++++++++++ 4 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 e2e/paths/ticket-module/13_create_ticket_services.spec.js diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 20627b4db..83b6f446f 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -412,6 +412,16 @@ export default { actionTaken: 'vn-ticket-log > vn-log > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(1) > div > div:nth-child(3) > span.value.ng-scope.ng-binding', id: 'vn-ticket-log > vn-log > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr > vn-td.before > vn-one:nth-child(1) > div > span.value.ng-scope.ng-binding' }, + ticketService: { + serviceButton: 'vn-left-menu a[ui-sref="ticket.card.service"]', + addServiceButton: 'vn-ticket-service > form > vn-card > div > vn-one:nth-child(3) > vn-icon-button > button > vn-icon', + descriptionInput: 'vn-ticket-service vn-textfield[label="Description"] input', + quantityInput: 'vn-ticket-service vn-textfield[label="Quantity"] input', + priceInput: 'vn-ticket-service vn-textfield[label="Price"] input', + vatTypeAutocomplete: 'vn-ticket-service vn-autocomplete[label="Tax class"]', + fistDeleteServiceButton: 'vn-ticket-service > form > vn-card > div > vn-one:nth-child(2) > vn-horizontal > vn-auto > vn-icon', + saveServiceButton: `${components.vnSubmit}` + }, createStateView: { stateAutocomplete: `vn-autocomplete[field="$ctrl.ticket.stateFk"]`, clearStateInputButton: `vn-autocomplete[field="$ctrl.ticket.stateFk"] > div > div > div > vn-icon > i`, diff --git a/e2e/paths/ticket-module/07_edit_sale.spec.js b/e2e/paths/ticket-module/07_edit_sale.spec.js index 6499a6c83..562dcfb3d 100644 --- a/e2e/paths/ticket-module/07_edit_sale.spec.js +++ b/e2e/paths/ticket-module/07_edit_sale.spec.js @@ -381,7 +381,7 @@ describe('Ticket Edit sale path', () => { expect(result).toEqual(3); }); - it('should go back to the original ticket sales section', async() => { + it('should now go back to the original ticket sales section', async() => { const url = await nightmare .waitToClick(selectors.itemsIndex.goBackToModuleIndexButton) .wait(selectors.ticketsIndex.searchTicketInput) diff --git a/e2e/paths/ticket-module/12_delete_ticket_from_descriptor.spec.js b/e2e/paths/ticket-module/12_delete_ticket_from_descriptor.spec.js index 2a7c6df15..47951b608 100644 --- a/e2e/paths/ticket-module/12_delete_ticket_from_descriptor.spec.js +++ b/e2e/paths/ticket-module/12_delete_ticket_from_descriptor.spec.js @@ -9,7 +9,7 @@ describe('Ticket descriptor path', () => { .loginAndModule('employee', 'ticket'); }); - it('should search for a specific ticket', async () => { + it('should search for a specific ticket', async() => { const result = await nightmare .wait(selectors.ticketsIndex.searchTicketInput) .type(selectors.ticketsIndex.searchTicketInput, 'id:17') @@ -20,7 +20,7 @@ describe('Ticket descriptor path', () => { expect(result).toEqual(1); }); - it(`should click on the search result to access to the ticket Sale`, async () => { + it(`should click on the search result to access to the ticket Sale`, async() => { const url = await nightmare .waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 26') .waitToClick(selectors.ticketsIndex.searchResult) @@ -30,7 +30,7 @@ describe('Ticket descriptor path', () => { expect(url.hash).toContain('/summary'); }); - it('should delete the ticket using the descriptor more menu', async () => { + it('should delete the ticket using the descriptor more menu', async() => { const result = await nightmare .waitToClick(selectors.ticketDescriptor.moreMenu) .waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket) @@ -40,14 +40,14 @@ describe('Ticket descriptor path', () => { expect(result).toEqual('Ticket deleted'); }); - it('should have been relocated to the ticket index', async () => { + it('should have been relocated to the ticket index', async() => { const url = await nightmare .parsedUrl(); expect(url.hash).toEqual('#!/ticket/index'); }); - it(`should search for the deleted ticket and check it's date`, async () => { + it(`should search for the deleted ticket and check it's date`, async() => { const result = await nightmare .wait(selectors.ticketsIndex.searchTicketInput) .type(selectors.ticketsIndex.searchTicketInput, 'id:17') diff --git a/e2e/paths/ticket-module/13_create_ticket_services.spec.js b/e2e/paths/ticket-module/13_create_ticket_services.spec.js new file mode 100644 index 000000000..a2c6d11d9 --- /dev/null +++ b/e2e/paths/ticket-module/13_create_ticket_services.spec.js @@ -0,0 +1,71 @@ +import selectors from '../../helpers/selectors.js'; +import createNightmare from '../../helpers/nightmare'; + +// Bug #961 ticket.service fallo en borrado +xdescribe('Ticket services path', () => { + const nightmare = createNightmare(); + + beforeAll(() => { + nightmare + .loginAndModule('employee', 'ticket') + .accessToSearchResult('id:1') + .accessToSection('ticket.card.service'); + }); + + it('should create a new service', async() => { + const result = await nightmare + .waitToClick(selectors.ticketService.addServiceButton) + .write(selectors.ticketService.descriptionInput, 'my service') + .clearInput(selectors.ticketService.quantityInput) + .write(selectors.ticketService.quantityInput, 99) + .write(selectors.ticketService.priceInput, 999) + .autocompleteSearch(selectors.ticketService.vatTypeAutocomplete, 'Reduced VAT') + .waitToClick(selectors.ticketService.saveServiceButton) + .waitForLastSnackbar(); + + expect(result).toEqual('Data saved!'); + }); + + it('should confirm the service description was created correctly', async() => { + const result = await nightmare + .waitToClick(selectors.ticketBasicData.basicDataButton) + .wait(selectors.ticketBasicData.clientAutocomplete) + .click(selectors.ticketService.serviceButton) + .waitToGetProperty(selectors.ticketService.descriptionInput, 'value'); + + expect(result).toEqual('my service'); + }); + + it('should confirm the service quantity was created correctly', async() => { + const result = await nightmare + .waitToGetProperty(selectors.ticketService.quantityInput, 'value'); + + expect(result).toEqual('99'); + }); + + it('should confirm the service price was created correctly', async() => { + const result = await nightmare + .waitToGetProperty(selectors.ticketService.priceInput, 'value'); + + expect(result).toEqual('999'); + }); + + it('should confirm the service VAT was created correctly', async() => { + const result = await nightmare + .waitToGetProperty(`${selectors.ticketService.vatTypeAutocomplete} input`, 'value'); + + expect(result).toEqual('Reduced VAT'); + }); + + it('should delete the service and check there are none now', async() => { + const result = await nightmare + .waitToClick(selectors.ticketService.fistDeleteServiceButton) + .waitToClick(selectors.ticketBasicData.basicDataButton) + .wait(selectors.ticketBasicData.clientAutocomplete) + .click(selectors.ticketService.serviceButton) + .waitForNumberOfElements(selectors.ticketService.descriptionInput, 0) + .countElement(selectors.ticketService.descriptionInput); + + expect(result).toEqual(0); + }); +}); From 1d5cd1c86de9fe66d93d31b1660cc69810f54469 Mon Sep 17 00:00:00 2001 From: Gerard Date: Mon, 14 Jan 2019 11:35:48 +0100 Subject: [PATCH 5/6] #960 order.line bugs solved --- modules/order/back/methods/order/confirm.js | 26 +++++++++++ modules/order/back/models/order.js | 1 + modules/order/front/descriptor/index.html | 2 +- modules/order/front/line/index.html | 15 +++++-- modules/order/front/line/index.js | 50 ++++++++++++++++----- modules/order/front/prices-popover/index.js | 13 +++--- modules/order/front/volume/index.html | 4 +- 7 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 modules/order/back/methods/order/confirm.js diff --git a/modules/order/back/methods/order/confirm.js b/modules/order/back/methods/order/confirm.js new file mode 100644 index 000000000..b1046ebf3 --- /dev/null +++ b/modules/order/back/methods/order/confirm.js @@ -0,0 +1,26 @@ +module.exports = Self => { + Self.remoteMethod('confirm', { + description: 'Gets the taxes of a given order', + accessType: 'WRITE', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'order id', + http: {source: 'path'} + }], + returns: { + type: 'object', + root: true + }, + http: { + path: `/:id/confirm`, + verb: 'POST' + } + }); + + Self.confirm = async orderFk => { + let query = `CALL hedera.orderConfirm(?);`; + return await Self.rawSql(query, [orderFk]); + }; +}; diff --git a/modules/order/back/models/order.js b/modules/order/back/models/order.js index 24a778440..1b07222f3 100644 --- a/modules/order/back/models/order.js +++ b/modules/order/back/models/order.js @@ -11,4 +11,5 @@ module.exports = Self => { require('../methods/order/getSourceValues')(Self); require('../methods/order/newFromTicket')(Self); require('../methods/order/updateBasicData')(Self); + require('../methods/order/confirm')(Self); }; diff --git a/modules/order/front/descriptor/index.html b/modules/order/front/descriptor/index.html index fc5e6f10c..8809baae4 100644 --- a/modules/order/front/descriptor/index.html +++ b/modules/order/front/descriptor/index.html @@ -22,7 +22,7 @@ value="{{$ctrl.order.client.salesPerson.firstName}} {{$ctrl.order.client.salesPerson.name}}"> + value="{{$ctrl.order.landed | date: 'dd/MM/yyyy' }}"> diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html index 732fd4276..807ebd17e 100644 --- a/modules/order/front/line/index.html +++ b/modules/order/front/line/index.html @@ -11,7 +11,7 @@
Subtotal - {{$ctrl.order.total - $ctrl.VAT | currency:'€':2}} + {{$ctrl.subtotal | currency:'€':2}}

VAT {{$ctrl.VAT | currency:'€':2}} @@ -49,7 +49,7 @@ {{row.warehouse.name}} - {{row.shipped | dashIfEmpty}} + {{row.shipped | date: 'dd/MM/yyyy'}} {{row.quantity}} {{row.price | currency:'€':2}} @@ -59,7 +59,7 @@ medium-grey vn-tooltip="Remove item" icon="delete" - ng-click="$ctrl.removeRow($index)" + ng-click="$ctrl.showDeleteRow($index)" tabindex="-1"> @@ -81,4 +81,11 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/modules/order/front/line/index.js b/modules/order/front/line/index.js index fdfa4f8a2..e25d50532 100644 --- a/modules/order/front/line/index.js +++ b/modules/order/front/line/index.js @@ -13,9 +13,17 @@ class Controller { $onInit() { this.getRows(); + } + + set order(value) { + this._order = value; this.getVAT(); } + get order() { + return this._order; + } + getRows() { let filter = { where: {orderFk: this.$state.params.id}, @@ -40,9 +48,32 @@ class Controller { }); } - removeRow(index) { - let [lineRemoved] = this.rows.splice(index, 1); - this.idsToRemove.push(lineRemoved.id); + get subtotal() { + return this.order.total - this.VAT || 0; + } + + showDeleteRow(index) { + this.lineIdToRemove = index; + this.$scope.deleteRow.show(); + } + + deleteRow(response) { + if (response == 'ACCEPT') { + let [lineRemoved] = this.rows.splice(this.lineIdToRemove, 1); + this.idsToRemove.push(lineRemoved.id); + let params = { + rows: this.idsToRemove, + actualOrderId: this.$state.params.id + }; + let query = `/order/api/OrderRows/removes`; + + this.$http.post(query, params).then(() => { + this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + }); + this.getVAT(); + this.card.reload(); + } + this.lineIdToRemove = undefined; } // Item Descriptor @@ -57,14 +88,10 @@ class Controller { } save() { - let params = { - rows: this.idsToRemove, - actualOrderId: this.$state.params.id - }; - let query = `/order/api/OrderRows/removes`; + let query = `/api/Orders/${this.order.id}/confirm`; - this.$http.post(query, params).then(() => { - this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + this.$http.post(query).then(() => { + this.vnApp.showSuccess(this.$translate.instant('Order confirmed')); }); } } @@ -76,5 +103,8 @@ ngModule.component('vnOrderLine', { controller: Controller, bindings: { order: '<' + }, + require: { + card: '^vnOrderCard' } }); diff --git a/modules/order/front/prices-popover/index.js b/modules/order/front/prices-popover/index.js index b31dab0f8..e1f8e3775 100644 --- a/modules/order/front/prices-popover/index.js +++ b/modules/order/front/prices-popover/index.js @@ -58,9 +58,9 @@ class Controller { } addQuantity(price) { - if (this.total + price.grouping <= this.max) { + if (this.total + price.grouping <= this.max) price.quantity += price.grouping; - } + this.validate(); } validate() { @@ -76,11 +76,10 @@ class Controller { }); let wrongInputs = this.$element[0].querySelectorAll('vn-input-number[name="quantity"] div.infix.invalid'); - if (wrongInputs.length > 0) { + if (wrongInputs.length > 0) this.$element[0].querySelector('vn-vertical.prices').classList.add('invalid'); - } else { + else this.$element[0].querySelector('vn-vertical.prices').classList.remove('invalid'); - } }); } getFilledLines() { @@ -119,6 +118,7 @@ class Controller { this.$http.post(`/order/api/OrderRows/addToOrder`, params).then(res => { this.vnApp.showSuccess(this.$translate.instant('Data saved!')); this.$.popover.hide(); + this.card.reload(); }); }); } @@ -131,5 +131,8 @@ ngModule.component('vnOrderPricesPopover', { controller: Controller, bindings: { order: '<' + }, + require: { + card: '^vnOrderCard' } }); diff --git a/modules/order/front/volume/index.html b/modules/order/front/volume/index.html index 1aee6bdb2..175cf7808 100644 --- a/modules/order/front/volume/index.html +++ b/modules/order/front/volume/index.html @@ -14,10 +14,10 @@ Volume

+ value="{{::edit.model.totalVolume}} M³"> + value="{{::edit.model.totalBoxes | dashIfEmpty}} U">
From 24837b231f0e6306aab29d089b8447226b65c223 Mon Sep 17 00:00:00 2001 From: Gerard Date: Mon, 14 Jan 2019 11:47:34 +0100 Subject: [PATCH 6/6] added missing autoload property --- modules/claim/front/development/index.html | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/claim/front/development/index.html b/modules/claim/front/development/index.html index 67b0a0c3b..0335b7ec0 100644 --- a/modules/claim/front/development/index.html +++ b/modules/claim/front/development/index.html @@ -4,27 +4,32 @@ fields="['id', 'claimFk', 'claimReasonFk', 'claimResultFk', 'claimResponsibleFk', 'workerFk', 'claimRedeliveryFk']" link="{claimFk: $ctrl.$state.params.id}" filter="$ctrl.filter" - data="claimDevelopments"> + data="claimDevelopments" + auto-load="true"> + order="description" + auto-load="true"> + order="description" + auto-load="true"> + order="description" + auto-load="true"> + order="description" + auto-load="true">