diff --git a/client/claim/src/action/index.html b/client/claim/src/action/index.html index 1edda72a37..fad1ad9247 100644 --- a/client/claim/src/action/index.html +++ b/client/claim/src/action/index.html @@ -1,4 +1,4 @@ -
- + ID diff --git a/client/claim/src/detail/index.html b/client/claim/src/detail/index.html index da53aad345..cb698afba0 100644 --- a/client/claim/src/detail/index.html +++ b/client/claim/src/detail/index.html @@ -1,4 +1,4 @@ - + data="insurances" auto-load="false"> diff --git a/client/client/src/credit/index/index.html b/client/client/src/credit/index/index.html index 8cc03dd947..717e0da3c4 100644 --- a/client/client/src/credit/index/index.html +++ b/client/client/src/credit/index/index.html @@ -4,7 +4,7 @@ filter="::$ctrl.filter" link="{clientFk: $ctrl.$stateParams.id}" limit="20" - data="credits"> + data="credits" auto-load="false"> diff --git a/client/client/src/greuge/index/index.html b/client/client/src/greuge/index/index.html index 6532cc9d09..59ac47ce44 100644 --- a/client/client/src/greuge/index/index.html +++ b/client/client/src/greuge/index/index.html @@ -4,7 +4,7 @@ filter="::$ctrl.filter" link="{clientFk: $ctrl.$stateParams.id}" limit="20" - data="greuges"> + data="greuges" auto-load="false"> + data="$ctrl.logs" auto-load="false"> \ No newline at end of file diff --git a/client/client/src/mandate/index.html b/client/client/src/mandate/index.html index db2769bc12..c943eca880 100644 --- a/client/client/src/mandate/index.html +++ b/client/client/src/mandate/index.html @@ -4,7 +4,7 @@ filter="::$ctrl.filter" link="{clientFk: $ctrl.$stateParams.id}" limit="20" - data="mandates"> + data="mandates" auto-load="false"> diff --git a/client/client/src/recovery/index/index.html b/client/client/src/recovery/index/index.html index 5cc874dcfd..2b967d37bc 100644 --- a/client/client/src/recovery/index/index.html +++ b/client/client/src/recovery/index/index.html @@ -4,7 +4,7 @@ filter="{}" link="{clientFk: $ctrl.$stateParams.id}" limit="20" - data="recoveries"> + data="recoveries" auto-load="false"> diff --git a/client/client/src/risk/index/index.html b/client/client/src/risk/index/index.html index 85250bf456..500a2f8b7b 100644 --- a/client/client/src/risk/index/index.html +++ b/client/client/src/risk/index/index.html @@ -3,7 +3,7 @@ url="/client/api/receipts/filter" params="$ctrl.params" limit="20" - data="$ctrl.risks"> + data="$ctrl.risks" auto-load="false"> + data="samples" auto-load="false"> diff --git a/client/client/src/web-payment/index.html b/client/client/src/web-payment/index.html index c46b046dfc..fcebb3df0a 100644 --- a/client/client/src/web-payment/index.html +++ b/client/client/src/web-payment/index.html @@ -3,7 +3,7 @@ url="/client/api/clients/getTransactions" link="{clientFk: $ctrl.$stateParams.id}" limit="20" - data="transactions"> + data="transactions" auto-load="false"> diff --git a/client/core/src/components/table/index.js b/client/core/src/components/table/index.js index a379c1d604..d28ece3a42 100644 --- a/client/core/src/components/table/index.js +++ b/client/core/src/components/table/index.js @@ -7,6 +7,7 @@ export default class Table { this.table = $element[0]; this.field = null; this.order = null; + this.autoLoad = true; $transclude($scope.$parent, clone => { angular.element($element[0].querySelector('div')).append(clone); @@ -19,15 +20,16 @@ export default class Table { } applyOrder(field = this.field, order = this.order) { - if (!field) return; + if (field && order) { + this.model.order = `${field} ${order}`; + this.setActiveArrow(); + } - this.model.order = `${field} ${order}`; this.model.refresh(); - this.setActiveArrow(); } $onChanges() { - if (this.model && this.model.autoLoad) + if (this.model && this.autoLoad) this.applyOrder(); } @@ -50,6 +52,7 @@ ngModule.component('vnTable', { transclude: true, controller: Table, bindings: { - model: ' + data="sales" auto-load="false"> diff --git a/client/item/src/history/index.html b/client/item/src/history/index.html index dc34204894..8cd756dfd8 100644 --- a/client/item/src/history/index.html +++ b/client/item/src/history/index.html @@ -4,7 +4,7 @@ filter="::$ctrl.filter" link="{originFk: $ctrl.$stateParams.id}" limit="20" - data="logs"> + data="logs" auto-load="false"> diff --git a/client/item/src/last-entries/index.html b/client/item/src/last-entries/index.html index 1f427719fb..1c8929350f 100644 --- a/client/item/src/last-entries/index.html +++ b/client/item/src/last-entries/index.html @@ -2,7 +2,7 @@ vn-id="model" url="/item/api/Items/getLastEntries" filter="::$ctrl.filter" - data="entries"> + data="entries" auto-load="false"> diff --git a/client/order/src/index/index.html b/client/order/src/index/index.html index 54bb00621b..d648fd4b7f 100644 --- a/client/order/src/index/index.html +++ b/client/order/src/index/index.html @@ -3,12 +3,12 @@ url="/order/api/Orders" filter="::$ctrl.filter" limit="20" - data="orders"> + data="orders" auto-load="false">
- {{$ctrl.order.total | currency:'€':2}}
- + Item diff --git a/client/order/src/volume/index.html b/client/order/src/volume/index.html index 73a6f2d655..1aee6bdb28 100644 --- a/client/order/src/volume/index.html +++ b/client/order/src/volume/index.html @@ -1,4 +1,4 @@ - + order="shipped DESC">
@@ -30,7 +29,7 @@
- + diff --git a/client/ticket/src/log/index.html b/client/ticket/src/log/index.html index 05e302c39c..6f6daf6c01 100644 --- a/client/ticket/src/log/index.html +++ b/client/ticket/src/log/index.html @@ -1,4 +1,4 @@ - diff --git a/client/ticket/src/tracking/index/index.html b/client/ticket/src/tracking/index/index.html index cbbf2b74c2..b2b575b1a9 100644 --- a/client/ticket/src/tracking/index/index.html +++ b/client/ticket/src/tracking/index/index.html @@ -1,4 +1,4 @@ -
- + Id diff --git a/e2e/paths/client-module/12_lock_of_verified_data.spec.js b/e2e/paths/client-module/12_lock_of_verified_data.spec.js index 822c4f619e..d861f4174a 100644 --- a/e2e/paths/client-module/12_lock_of_verified_data.spec.js +++ b/e2e/paths/client-module/12_lock_of_verified_data.spec.js @@ -307,14 +307,14 @@ describe('Client lock verified data path', () => { expect(url.hash).toContain('fiscal-data'); }); - it('should confirm verified data button is disabled for salesAssistant', async () => { + it('should confirm verified data button is enabled for salesAssistant', async () => { const result = await nightmare .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { return document.querySelector(selector).disabled; }, selectors.clientFiscalData.verifiedDataCheckbox); - expect(result).toBeTruthy(); + expect(result).toBeFalsy(); }); it('should now edit the social name', async () => { diff --git a/services/loopback/common/locale/en.json b/services/loopback/common/locale/en.json index 09532e8489..b05f755cb5 100644 --- a/services/loopback/common/locale/en.json +++ b/services/loopback/common/locale/en.json @@ -18,5 +18,7 @@ "Package cannot be blank": "Package cannot be blank", "The new quantity should be smaller than the old one": "The new quantity should be smaller than the old one", "The sales of this ticket can't be modified": "The sales of this ticket can't be modified", - "Cannot check VIES and Equalization Tax": "Cannot check VIES and Equalization Tax" + "Cannot check VIES and Equalization Tax": "Cannot check VIES and Equalization Tax", + "Cannot check Equalization Tax in this NIF/CIF": "Cannot check Equalization Tax in this NIF/CIF", + "You can't create an order for a frozen client": "You can't create an order for a frozen client" } \ No newline at end of file