pull from dev

db/changes/10100-allSaints/03-ticketCreateWithoutZone.sql

@@ -36,7 +36,7 @@ BEGIN
 
 	CALL vn.zone_getShippedWarehouse(vlanded, vAddressFk, vAgencyModeFk);
     
-	SELECT id INTO vZoneFk FROM tmp.zoneGetShipped
+	SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetShipped
 		WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
 	
 	INSERT INTO vn2008.Tickets (

e2e/paths/06-claim-module/02_development.spec.js

@@ -94,34 +94,4 @@ describe('Claim development', () => {
         expect(worker).toEqual('deliveryNick');
         expect(redelivery).toEqual('Reparto');
     });
-
-    it('should delete the first development, add an empty one and save it', async() => {
-        const result = await nightmare
-            .waitToClick(selectors.claimDevelopment.firstDeleteDevelopmentButton)
-            .waitToClick(selectors.claimDevelopment.addDevelopmentButton)
-            .waitToClick(selectors.claimDevelopment.saveDevelopmentButton)
-            .waitForLastSnackbar();
-
-        expect(result).toEqual('Data saved!');
-    });
-
-    it('should confirm the second development was auto filled', async() => {
-        const reason = await nightmare
-            .reloadSection('claim.card.development')
-            .waitToGetProperty(`${selectors.claimDevelopment.secondClaimReasonAutocomplete} input`, 'value');
-
-        const result = await nightmare
-            .waitToGetProperty(`${selectors.claimDevelopment.secondClaimResultAutocomplete} input`, 'value');
-
-        const responsible = await nightmare
-            .waitToGetProperty(`${selectors.claimDevelopment.secondClaimResponsibleAutocomplete} input`, 'value');
-
-        const redelivery = await nightmare
-            .waitToGetProperty(`${selectors.claimDevelopment.secondClaimRedeliveryAutocomplete} input`, 'value');
-
-        expect(reason).toEqual('Prisas');
-        expect(result).toEqual('Otros daños');
-        expect(responsible).toEqual('Compradores');
-        expect(redelivery).toEqual('Cliente');
-    });
 });

loopback/locale/es.json

@@ -118,5 +118,5 @@
 	"You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fín",
 	"Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fín",
 	"You should mark at least one week day": "Debes marcar al menos un día de la semana",
-	"Swift / BIC can't be empty": "El Swift / BIC no puede quedar vacío"
+	"Swift / BIC can't be empty": "Swift / BIC no puede estar vacío"
 }

modules/claim/back/methods/claim/getSummary.js

@@ -104,9 +104,6 @@ module.exports = Self => {
                         }
                     }
                 },
-                {
-                    relation: 'claimDestination'
-                },
                 {
                     relation: 'claimReason'
                 },

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

@@ -18,9 +18,6 @@
         "claimResponsibleFk": {
             "required": true
         },
-        "workerFk": {
-            "required": true
-        },
         "claimReasonFk": {
             "required": true
         },
@@ -29,9 +26,6 @@
         },
         "claimRedeliveryFk": {
             "required": true
-        },
-        "claimDestinationFk": {
-            "required": true
         }
     },
     "relations": {
@@ -64,11 +58,6 @@
             "type": "belongsTo",
             "model": "ClaimRedelivery",
             "foreignKey": "claimRedeliveryFk"
-        },
-        "claimDestination": {
-            "type": "belongsTo",
-            "model": "ClaimDestination",
-            "foreignKey": "claimDestinationFk"
         }
     }
 }