db/changes/10180-holyWeek/00-claimState.sql

@@ -15,3 +15,14 @@ UPDATE `vn`.`claimState` SET `code` = 'resolved' WHERE (`id` = '3');
 UPDATE `vn`.`claimState` SET `code` = 'disputed' WHERE (`id` = '5');
 UPDATE `vn`.`claimState` SET `code` = 'mana' WHERE (`id` = '6');
 UPDATE `vn`.`claimState` SET `code` = 'managed' WHERE (`id` = '2');
+
+ALTER TABLE `vn`.`claimState` 
+ADD COLUMN `priority` INT NOT NULL DEFAULT 1 AFTER `roleFk`;
+
+UPDATE `vn`.`claimState` SET `priority` = '1' WHERE (`id` = '1');
+UPDATE `vn`.`claimState` SET `priority` = '5' WHERE (`id` = '2');
+UPDATE `vn`.`claimState` SET `priority` = '7' WHERE (`id` = '3');
+UPDATE `vn`.`claimState` SET `priority` = '6' WHERE (`id` = '4');
+UPDATE `vn`.`claimState` SET `priority` = '3' WHERE (`id` = '5');
+UPDATE `vn`.`claimState` SET `priority` = '4' WHERE (`id` = '6');
+UPDATE `vn`.`claimState` SET `priority` = '2' WHERE (`id` = '7');

db/changes/10190-postRegulation/00-claimState.sql

@@ -1,10 +0,0 @@
-ALTER TABLE `vn`.`claimState` 
-ADD COLUMN `priority` INT NOT NULL DEFAULT 1 AFTER `roleFk`;
-
-UPDATE `vn`.`claimState` SET `priority` = '1' WHERE (`id` = '1');
-UPDATE `vn`.`claimState` SET `priority` = '5' WHERE (`id` = '2');
-UPDATE `vn`.`claimState` SET `priority` = '7' WHERE (`id` = '3');
-UPDATE `vn`.`claimState` SET `priority` = '6' WHERE (`id` = '4');
-UPDATE `vn`.`claimState` SET `priority` = '3' WHERE (`id` = '5');
-UPDATE `vn`.`claimState` SET `priority` = '4' WHERE (`id` = '6');
-UPDATE `vn`.`claimState` SET `priority` = '2' WHERE (`id` = '7');

db/dump/fixtures.sql

@@ -1185,16 +1185,16 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
         (7, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 2, 1, 50.00,  500,   'seventh travel',   1),
         (8, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 2, 1, 50.00,  500,   'eight travel',   1);
 
-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `companyFk`, `ref`,`isInventory`, `isRaid`, `notes`, `evaNotes`)
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `ref`,`isInventory`, `isRaid`, `notes`, `evaNotes`)
     VALUES
-        (1, 1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 442, 'Movement 1', 0, 0, '',    ''),
+        (1, 1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'Movement 1', 0, 0, '',    ''),
-        (2, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 442, 'Movement 2', 0, 0, 'this is the note two',    'observation two'),
+        (2, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'Movement 2', 0, 0, 'this is the note two',    'observation two'),
-        (3, 1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 3, 442, 'Movement 3', 0, 0, 'this is the note three',  'observation three'),
+        (3, 1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'Movement 3', 0, 0, 'this is the note three',  'observation three'),
-        (4, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 69,  'Movement 4', 0, 0, 'this is the note four',   'observation four'),
+        (4, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'Movement 4', 0, 0, 'this is the note four',   'observation four'),
-        (5, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 442, 'Movement 5', 0, 0, 'this is the note five',   'observation five'),
+        (5, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'Movement 5', 0, 0, 'this is the note five',   'observation five'),
-        (6, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 6, 442, 'Movement 6', 0, 0, 'this is the note six',    'observation six'),
+        (6, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'Movement 6', 0, 0, 'this is the note six',    'observation six'),
-        (7, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 7, 442, 'Movement 7', 0, 0, 'this is the note seven',  'observation seven'),
+        (7, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'Movement 7', 0, 0, 'this is the note seven',  'observation seven'),
-        (8, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 7, 442, 'Movement 8', 1, 1, '',  '');
+        (8, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'Movement 8', 1, 1, '',  '');
 
 INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`)
     VALUES

e2e/paths/07-order/03_lines.spec.js

@@ -35,7 +35,7 @@ describe('Order lines', () => {
         const result = await page
             .waitToGetProperty(selectors.orderLine.orderSubtotal, 'innerText');
 
-        expect(result).toContain('80.54');
+        expect(result).toContain('90.10');
     });
 
     it('should confirm the whole order and redirect to ticket index filtered by clientFk', async() => {

front/core/components/datalist/index.js

@@ -33,9 +33,6 @@ export default class Datalist extends Textfield {
 
         if (this.validSelection(value)) return;
 
-        if (!oldValue)
-            return this.fetchSelection();
-
         this.$timeout.cancel(this.searchTimeout);
 
         if (this.model) {

front/core/filters/specs/percentage.spec.js

@@ -3,8 +3,9 @@ describe('Percentage filter', () => {
 
     beforeEach(ngModule('vnCore'));
 
-    beforeEach(inject(_percentageFilter_ => {
+    beforeEach(inject((_percentageFilter_, $translate) => {
         percentageFilter = _percentageFilter_;
+        jest.spyOn($translate, 'use').mockReturnValue('en-US');
     }));
 
     it('should return null for input null', () => {

front/core/lib/module-loader.js

@@ -11,7 +11,7 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t
             this.loaded = {};
             this.imports = {};
             this.moduleImport = moduleImport;
-            this.modelInfo = $http.get(`modelInfo`)
+            this.modelInfo = $http.get(`Schemas/modelInfo`)
                 .then(json => {
                     this.onModelInfoReady(json);
                     this.modelInfo = true;

front/core/lib/specs/module-loader.spec.js

@@ -23,7 +23,7 @@ describe('factory vnModuleLoader', () => {
             }
         ];
 
-        $httpBackend.whenGET('modelInfo')
+        $httpBackend.whenGET('Schemas/modelInfo')
             .respond({
                 FooModel: {
                     properties: {

loopback/common/models/schema.json

@@ -3,11 +3,10 @@
   "base": "PersistedModel",
   "acls": [
     {
-      "property": "validations",
+      "property": "modelInfo",
-      "accessType": "EXECUTE",
       "principalType": "ROLE",
       "principalId": "$everyone",
       "permission": "ALLOW"
     }
   ]
-}
+}

loopback/server/boot/salix.js

@@ -1,9 +0,0 @@
-module.exports = function(app) {
-    // FIXME: Fix until the original can be used
-    app.get('/api/modelInfo', function(req, res) {
-        app.models.Schema.modelInfo({req}).then(json => {
-            res.set('Content-Type', 'application/json');
-            res.send(JSON.stringify(json));
-        });
-    });
-};

modules/claim/back/models/claim-state.json

@@ -21,7 +21,7 @@
             "required": true
         },
         "priority": {
-            "type": "nomber",
+            "type": "Number",
             "required": true
         }
     },

modules/client/front/address/create/index.js

@@ -45,7 +45,8 @@ export default class Controller extends Section {
         const province = selection.province;
         const postcodes = selection.postcodes;
 
-        this.address.provinceId = province.id;
+        if (!this.address.provinceI)
+            this.address.provinceId = province.id;
 
         if (postcodes.length === 1)
             this.address.postalCode = postcodes[0].code;
@@ -64,8 +65,11 @@ export default class Controller extends Section {
         const town = selection.town;
         const province = town.province;
 
-        this.address.city = town.name;
+        if (!this.address.city)
-        this.address.provinceId = province.id;
+            this.address.city = town.name;
+
+        if (!this.address.provinceId)
+            this.address.provinceId = province.id;
     }
 
     onResponse(response) {

modules/client/front/address/edit/index.js

@@ -42,15 +42,15 @@ export default class Controller extends Section {
 
     // Town auto complete
     set town(selection) {
-        const oldValue = this._town;
         this._town = selection;
 
-        if (!oldValue) return;
+        if (!selection) return;
 
         const province = selection.province;
         const postcodes = selection.postcodes;
 
-        this.address.provinceFk = province.id;
+        if (!this.address.provinceFk)
+            this.address.provinceFk = province.id;
 
         if (postcodes.length === 1)
             this.address.postalCode = postcodes[0].code;
@@ -62,16 +62,18 @@ export default class Controller extends Section {
 
     // Postcode auto complete
     set postcode(selection) {
-        const oldValue = this._postcode;
         this._postcode = selection;
 
-        if (!oldValue) return;
+        if (!selection) return;
 
         const town = selection.town;
         const province = town.province;
 
-        this.address.city = town.name;
+        if (!this.address.city)
-        this.address.provinceFk = province.id;
+            this.address.city = town.name;
+
+        if (!this.address.provinceFk)
+            this.address.provinceFk = province.id;
     }
 
     onResponse(response) {

modules/client/front/create/index.js

@@ -27,7 +27,8 @@ export default class Controller extends Section {
 
         const country = selection.country;
 
-        this.client.countryFk = country.id;
+        if (!this.client.countryFk)
+            this.client.countryFk = country.id;
     }
 
     get town() {
@@ -44,8 +45,11 @@ export default class Controller extends Section {
         const country = province.country;
         const postcodes = selection.postcodes;
 
-        this.client.provinceFk = province.id;
+        if (!this.client.provinceFk)
-        this.client.countryFk = country.id;
+            this.client.provinceFk = province.id;
+
+        if (!this.client.countryFk)
+            this.client.countryFk = country.id;
 
         if (postcodes.length === 1)
             this.client.postcode = postcodes[0].code;
@@ -65,9 +69,14 @@ export default class Controller extends Section {
         const province = town.province;
         const country = province.country;
 
-        this.client.city = town.name;
+        if (!this.client.city)
-        this.client.provinceFk = province.id;
+            this.client.city = town.name;
-        this.client.countryFk = country.id;
+
+        if (!this.client.provinceFk)
+            this.client.provinceFk = province.id;
+
+        if (!this.client.countryFk)
+            this.client.countryFk = country.id;
     }
 
     onResponse(response) {

modules/client/front/create/index.spec.js

@@ -41,6 +41,7 @@ describe('Client', () => {
 
         describe('province() setter', () => {
             it(`should set countryFk property`, () => {
+                controller.client.countryFk = null;
                 controller.province = {
                     id: 1,
                     name: 'New york',

modules/client/front/fiscal-data/index.js

@@ -98,14 +98,14 @@ export default class Controller extends Section {
 
     // Province auto complete
     set province(selection) {
-        const oldValue = this._province;
         this._province = selection;
 
-        if (!selection || !oldValue) return;
+        if (!selection) return;
 
         const country = selection.country;
 
-        this.client.countryFk = country.id;
+        if (!this.client.countryFk)
+            this.client.countryFk = country.id;
     }
 
     get town() {
@@ -114,17 +114,19 @@ export default class Controller extends Section {
 
     // Town auto complete
     set town(selection) {
-        const oldValue = this._town;
         this._town = selection;
 
-        if (!selection || !oldValue) return;
+        if (!selection) return;
 
         const province = selection.province;
         const country = province.country;
         const postcodes = selection.postcodes;
 
-        this.client.provinceFk = province.id;
+        if (!this.client.provinceFk)
-        this.client.countryFk = country.id;
+            this.client.provinceFk = province.id;
+
+        if (!this.client.countryFk)
+            this.client.countryFk = country.id;
 
         if (postcodes.length === 1)
             this.client.postcode = postcodes[0].code;
@@ -145,9 +147,14 @@ export default class Controller extends Section {
         const province = town.province;
         const country = province.country;
 
-        this.client.city = town.name;
+        if (!this.client.city)
-        this.client.provinceFk = province.id;
+            this.client.city = town.name;
-        this.client.countryFk = country.id;
+
+        if (!this.client.provinceFk)
+            this.client.provinceFk = province.id;
+
+        if (!this.client.countryFk)
+            this.client.countryFk = country.id;
     }
 
     onResponse(response) {

modules/client/front/fiscal-data/index.spec.js

@@ -26,9 +26,9 @@ describe('Client', () => {
                 isTaxDataChecked: false
             };
 
-            controller.province = {};
+            controller._province = {};
-            controller.town = {};
+            controller._town = {};
-            controller.postcode = {};
+            controller._postcode = {};
         }));
 
         describe('onSubmit()', () => {
@@ -135,6 +135,7 @@ describe('Client', () => {
 
         describe('province() setter', () => {
             it(`should set countryFk property`, () => {
+                controller.client.countryFk = null;
                 controller.province = {
                     id: 1,
                     name: 'New york',

modules/travel/front/summary/index.html

@@ -71,7 +71,7 @@
                     <vn-tr ng-repeat="entry in $ctrl.entries">
                         <vn-td shrink>
                             <vn-check 
-                                value="{{entry.isConfirmed}}"
+                                ng-model="entry.isConfirmed"
                                 disabled="true">
                             </vn-check>
                         </vn-td>
@@ -109,15 +109,15 @@
                         <vn-td shrink><strong>{{$ctrl.total('hb')}}</strong></vn-td>
                         <vn-td shrink><strong>{{$ctrl.total('freightValue') | currency: 'EUR': 2}}</strong></vn-td>
                         <vn-td shrink><strong>{{$ctrl.total('packageValue') | currency: 'EUR': 2}}</strong></vn-td>
-                        <vn-td shrink><strong>{{$ctrl.total('cc')}}</strong></vn-td>
+                        <vn-td shrink><strong>{{$ctrl.total('cc') | number:2}}</strong></vn-td>
-                        <vn-td shrink><strong>{{$ctrl.total('pallet')}}</strong></vn-td>
+                        <vn-td shrink><strong>{{$ctrl.total('pallet') | number:2}}</strong></vn-td>
-                        <vn-td shrink><strong>{{$ctrl.total('m3')}}</strong></vn-td>
+                        <vn-td shrink><strong>{{$ctrl.total('m3') | number:2}}</strong></vn-td>
                         <vn-td></vn-td>
                     </vn-tr>
                 </vn-tfoot>
             </vn-table>
         </vn-auto>
-        <vn-auto>
+        <vn-auto ng-if="$ctrl.travelThermographs.length != 0">
             <h4 translate>Thermographs</h4>
             <vn-table>
                 <vn-thead>