back/methods/collection/getTickets.js

@@ -63,8 +63,7 @@ module.exports = Self => {
                     iss.isPicked
                 FROM ticketCollection tc
                     LEFT JOIN collection c ON c.id = tc.collectionFk
-                    JOIN ticket t ON t.id = tc.ticketFk
+                    JOIN sale s ON s.ticketFk = tc.ticketFk
-                    JOIN sale s ON s.ticketFk = t.id
                     LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
                     LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
                     LEFT JOIN parking p2 ON p2.id = sg.parkingFk
@@ -103,9 +102,8 @@ module.exports = Self => {
             FROM sectorCollection sc
                 JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk  = sc.id 
                 JOIN saleGroup sg ON sg.id = ss.saleGroupFk
-                JOIN ticket t ON t.id = sg.ticketFk 
+                LEFT JOIN saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
-                JOIN sale s ON s.ticketFk = t.id
+                JOIN sale s ON s.id = sgd.saleFk 
-                LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
                 LEFT JOIN parking p2 ON p2.id = sg.parkingFk
                 JOIN item i ON i.id = s.itemFk
                 JOIN itemShelvingSale iss ON iss.saleFk = s.id

back/methods/mrw-config/cancelShipment.ejs

@@ -2,7 +2,7 @@
     <soap:Header>
         <mrw:AuthInfo>
             <mrw:CodigoFranquicia><%= mrw.franchiseCode %></mrw:CodigoFranquicia>
-            <mrw:CodigoAbonado><%= mrw.subscriberCode %></mrw:CodigoAbonado>
+            <mrw:CodigoAbonado><%= clientType %></mrw:CodigoAbonado>
             <mrw:CodigoDepartamento/>
             <mrw:UserName><%= mrw.user %></mrw:UserName>
             <mrw:Password><%= mrw.password %></mrw:Password>

back/methods/mrw-config/cancelShipment.js

@@ -27,9 +27,9 @@ module.exports = Self => {
 
         const mrw = await models.MrwConfig.findOne();
         const {externalId} = await models.Expedition.findById(expeditionFk);
-
+        const clientType = await models.MrwConfig.getClientType(expeditionFk);
         const template = fs.readFileSync(__dirname + '/cancelShipment.ejs', 'utf-8');
-        const renderedXml = ejs.render(template, {mrw, externalId});
+        const renderedXml = ejs.render(template, {mrw, externalId, clientType});
         const response = await axios.post(mrw.url, renderedXml, {
             headers: {
                 'Content-Type': 'application/soap+xml; charset=utf-8'

back/methods/mrw-config/createShipment.ejs

@@ -3,7 +3,7 @@
     <soap:Header>
         <mrw:AuthInfo>
             <mrw:CodigoFranquicia><%= mrw.franchiseCode %></mrw:CodigoFranquicia>
-            <mrw:CodigoAbonado><%= expeditionData.clientType %></mrw:CodigoAbonado>
+            <mrw:CodigoAbonado><%= clientType %></mrw:CodigoAbonado>
             <mrw:CodigoDepartamento/>
             <mrw:UserName><%= mrw.user %></mrw:UserName>
             <mrw:Password><%= mrw.password %></mrw:Password>

back/methods/mrw-config/createShipment.js

@@ -22,6 +22,7 @@ module.exports = Self => {
     Self.createShipment = async expeditionFk => {
         const models = Self.app.models;
         const mrw = await Self.getConfig();
+        const clientType = await models.MrwConfig.getClientType(expeditionFk);
 
         const today = Date.vnNew();
         const [hours, minutes] = mrw?.expeditionDeadLine ? mrw.expeditionDeadLine.split(':').map(Number) : [0, 0];
@@ -52,8 +53,7 @@ module.exports = Self => {
                 CONCAT( e.ticketFk, LPAD(e.counter, mc.counterWidth, '0')) reference,
                 LPAD(IF(mw.serviceType IS NULL, ms.serviceType, mw.serviceType), mc.serviceTypeWidth, '0') serviceType,
                 IF(mw.weekdays, 'S', 'N') weekDays,
-                oa.description deliveryObservation,
+                oa.description deliveryObservation
-                LPAD(ms.clientType, mc.clientTypeWidth, '0') clientType
             FROM expedition e
                 JOIN ticket t ON e.ticketFk = t.id
                 JOIN agencyMode am ON am.id = t.agencyModeFk
@@ -73,22 +73,19 @@ module.exports = Self => {
 
         const [expeditionData] = await Self.rawSql(query, [expeditionFk]);
 
-        if (!expeditionData)
-            throw new UserError(`This expedition is not a MRW shipment`);
-
         if (expeditionData?.shipped.setHours(0, 0, 0, 0) < today.setHours(0, 0, 0, 0))
             throw new UserError(`This ticket has a shipped date earlier than today`);
 
         const shipmentResponse = await Self.sendXmlDoc(
             __dirname + `/createShipment.ejs`,
-            {mrw, expeditionData},
+            {mrw, expeditionData, clientType},
             'application/soap+xml'
         );
         const shipmentId = Self.getTextByTag(shipmentResponse, 'NumeroEnvio');
 
         if (!shipmentId) throw new UserError(Self.getTextByTag(shipmentResponse, 'Mensaje'));
 
-        const file = await models.MrwConfig.getLabel(shipmentId);
+        const file = await models.MrwConfig.getLabel(shipmentId, clientType);
 
         return {shipmentId, file};
     };

back/methods/mrw-config/getLabel.ejs

@@ -2,7 +2,7 @@
     <soapenv:Header>
         <mrw:AuthInfo>
             <mrw:CodigoFranquicia><%= mrw.franchiseCode %></mrw:CodigoFranquicia>
-            <mrw:CodigoAbonado><%= mrw.subscriberCode %></mrw:CodigoAbonado>
+            <mrw:CodigoAbonado><%= clientType %></mrw:CodigoAbonado>
             <mrw:CodigoDepartamento/>
             <mrw:UserName><%= mrw.user %></mrw:UserName>
             <mrw:Password><%= mrw.password %></mrw:Password>

back/methods/mrw-config/getLabel.js

@@ -6,7 +6,13 @@ module.exports = Self => {
             arg: 'shipmentId',
             type: 'string',
             required: true
-        }],
+        },
+        {
+            arg: 'clientType',
+            type: 'string',
+            required: true
+        },
+        ],
         returns: {
             type: 'string',
             root: true
@@ -17,10 +23,14 @@ module.exports = Self => {
         }
     });
 
-    Self.getLabel = async shipmentId => {
+    Self.getLabel = async(shipmentId, clientType) => {
         const mrw = await Self.getConfig();
 
-        const getLabelResponse = await Self.sendXmlDoc(__dirname + `/getLabel.ejs`, {mrw, shipmentId}, 'text/xml');
+        const getLabelResponse = await Self.sendXmlDoc(
+            __dirname + `/getLabel.ejs`,
+            {mrw, shipmentId, clientType},
+            'text/xml'
+        );
 
         return Self.getTextByTag(getLabelResponse, 'EtiquetaFile');
     };

back/methods/mrw-config/specs/createShipment.spec.js

@@ -40,15 +40,12 @@ describe('MRWConfig createShipment()', () => {
 
         );
 
+        await models.MrwService.create(
+            {'agencyModeCodeFk': 'mrw', 'clientType': '000001', 'serviceType': 105, 'kg': 10}
+        );
+
         await createMrwConfig();
 
-        await models.Application.rawSql(
-            `INSERT INTO vn.mrwService 
-                    SET agencyModeCodeFk = 'mrw',
-                        clientType = 1,
-                        serviceType = 1,
-                        kg = 1`, null
-        );
         await models.Ticket.create(ticket1);
         await models.Expedition.create(expedition1);
     });
@@ -82,7 +79,8 @@ describe('MRWConfig createShipment()', () => {
                 'user': 'user',
                 'password': 'password',
                 'franchiseCode': 'franchiseCode',
-                'subscriberCode': 'subscriberCode'
+                'subscriberCode': 'subscriberCode',
+                'clientTypeWidth': 6
             }
         );
     }
@@ -115,10 +113,10 @@ describe('MRWConfig createShipment()', () => {
 
     it('should fail if expeditionFk is not a MrwExpedition', async() => {
         let error;
-        await models.MrwConfig.createShipment(undefined).catch(e => {
+        await models.MrwConfig.createShipment(15).catch(e => {
             error = e;
         }).finally(async() => {
-            expect(error.message).toEqual(`This expedition is not a MRW shipment`);
+            expect(error.message).toEqual(`ClientType not available`);
         });
     });
 

back/methods/viaexpress-config/renderer.js

@@ -20,7 +20,7 @@ module.exports = Self => {
         }
     });
 
-    Self.renderer = async (expeditionFk) => {
+    Self.renderer = async expeditionFk => {
         const models = Self.app.models;
 
         const viaexpressConfig = await models.ViaexpressConfig.findOne({
@@ -109,7 +109,7 @@ module.exports = Self => {
         const ticket = expedition.ticket();
         const sender = ticket.company().client();
         const shipped = ticket.shipped.toISOString();
-        const isInterdia = (ticket.agencyModeFk === viaexpressConfig.agencyModeFk)
+        const isInterdia = (ticket.agencyModeFk === viaexpressConfig.agencyModeFk);
         const data = {
             viaexpressConfig,
             sender,

back/model-config.json

@@ -192,5 +192,8 @@
     },
     "RouteConfig": {
         "dataSource": "vn"
+    },
+    "MrwService": {
+        "dataSource": "vn"
     }
 }

back/models/mrw-config.js

@@ -31,5 +31,30 @@ module.exports = Self => {
         });
         return parser.parseFromString(data.data, 'text/xml');
     };
+
+    Self.getClientType = async function(expeditionFk) {
+        if (!expeditionFk) throw new UserError(`No expeditionFk defined`);
+
+        const {clientTypeWidth} = await Self.getConfig();
+        const result = await Self.app.models.Expedition.findById(expeditionFk,
+            {include: [{
+                relation: 'ticket',
+                scope: {
+                    include: {
+                        relation: 'agencyMode',
+                        scope: {
+                            include: {
+                                relation: 'mrwService',
+                            }
+                        }
+                    }
+                }
+            }]}
+        );
+        const clientType = result?.ticket()?.agencyMode()?.mrwService()?.clientType;
+        if (!clientType || !clientTypeWidth) throw new UserError(`ClientType not available`);
+
+        return clientType.toString().padStart(clientTypeWidth, '0');
+    };
 };
 

back/models/mrw-config.json

@@ -45,6 +45,9 @@
 		},
 		"notified":{
 			"type": "date"
+		},
+		"clientTypeWidth": {
+			"type": "number"
 		}
 	}
 }

back/models/mrw-service.json

@@ -0,0 +1,33 @@
+{
+	"name": "MrwService",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "mrwService"
+		}
+	},
+	"properties": {
+		"agencyModeCodeFk": {
+			"id": true,
+			"type": "string",
+			"required": true
+		},
+		"clientType": {
+			"type": "number",
+			"required": true
+		},
+		"serviceType": {
+			"type": "number"
+		},
+		"kg": {
+			"type": "number"
+		}
+	},
+	"relations": {
+        "agency": {
+            "type": "hasOne",
+            "model": "AgencyMode",
+            "foreignKey": "code"
+        }
+	}
+}

db/routines/vn/procedures/itemShelvingSale_addBySale.sql

@@ -16,6 +16,8 @@ proc: BEGIN
 	DECLARE vReservedQuantity INT;
 	DECLARE vOutStanding INT;
 	DECLARE vUserFk INT; 
+    DECLARE vTotalReservedQuantity INT; 
+	DECLARE vSaleQuantity INT;
 
 	DECLARE vItemShelvingAvailable CURSOR FOR 
 		SELECT ish.id itemShelvingFk,
@@ -43,8 +45,8 @@ proc: BEGIN
 			RESIGNAL;
 		END;
 	
-	SELECT MAX(p.pickingOrder), s.quantity - SUM(IFNULL(iss.quantity, 0))
+	SELECT MAX(p.pickingOrder), s.quantity - SUM(IFNULL(iss.quantity, 0)), s.quantity
-		INTO vLastPickingOrder, vOutStanding
+		INTO vLastPickingOrder, vOutStanding, vSaleQuantity
 		FROM sale s
 			LEFT JOIN itemShelvingSale iss ON iss.saleFk = s.id
 			LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
@@ -64,6 +66,16 @@ proc: BEGIN
 		FETCH vItemShelvingAvailable INTO vItemShelvingFk, vAvailable;
 
 		IF vOutStanding <= 0 OR vDone THEN
+			SELECT SUM(IFNULL(quantity, 0))
+					INTO vTotalReservedQuantity
+				FROM itemShelvingSale
+				WHERE saleFk = vSaleFk;
+
+			IF vTotalReservedQuantity <> vSaleQuantity THEN
+				UPDATE sale 
+					SET quantity = vTotalReservedQuantity
+					WHERE id = vSaleFk;
+			END IF;
 			LEAVE l;
 		END IF;
 

db/routines/vn/procedures/itemShelvingSale_setQuantity.sql

@@ -21,6 +21,7 @@ BEGIN
 	DECLARE vRemainingQuantity INT;
 	DECLARE vItemFk INT;
 	DECLARE vTotalQuantity INT;
+	DECLARE vStateCode VARCHAR(45);
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 		BEGIN
@@ -32,10 +33,19 @@ BEGIN
 		CALL util.throw('Reservation completed');
 	END IF;
 
-	SELECT s.itemFk, iss.saleFk, iss.itemShelvingFk, SUM(IFNULL(iss.quantity,0))
+	SELECT s.itemFk, 
-			INTO vItemFk, vSaleFk, vItemShelvingFk, vReservedQuantity
+			iss.saleFk, 
+			iss.itemShelvingFk, 
+			SUM(IFNULL(iss.quantity,0)), 
+			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED')
+		INTO vItemFk, 
+			vSaleFk, 
+			vItemShelvingFk, 
+			vReservedQuantity, 
+			vStateCode
 		FROM itemShelvingSale iss
 			JOIN sale s ON s.id = iss.saleFk
+			LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
 		WHERE iss.id = vItemShelvingSaleFk
 			AND NOT iss.isPicked;
 
@@ -74,7 +84,7 @@ BEGIN
 			vTotalQuantity, 
 			`account`.`myUser_getId`(), 
 			NULL,
-			'PREPARED',
+			vStateCode,
 			TRUE);
 
 		UPDATE sale s

db/routines/vn/procedures/sale_getBoxPickingList.sql

@@ -19,8 +19,7 @@ BEGIN
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 	(saleFk INT PRIMARY KEY)
-	SELECT
+	SELECT s.ticketFk,	
-		s.ticketFk,	
 			s.id saleFk,
 			s.itemFk,
 			s.concept,
@@ -29,7 +28,7 @@ BEGIN
 			pb.routeFk,
 			FLOOR(s.quantity / IF(i.isBoxPickingMode, ish.packing, i.packingOut)) stickers,
 			IF(i.isBoxPickingMode, ish.packing, i.packingOut) packing,
-		b.packagingFk
+			IF(pa.isPackageReturnable, pc.defaultBigPackageFk, b.packagingFk) packagingFk
 		FROM sale s
 			JOIN item i ON i.id = s.itemFk
 			JOIN itemShelving ish ON ish.itemFk = s.itemFk
@@ -52,6 +51,8 @@ BEGIN
 			LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
 			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN buy b ON b.id = lb.buy_id
+			LEFT JOIN packaging pa ON pa.id = b.packagingFk 
+			JOIN packagingConfig pc
 		WHERE IF(i.isBoxPickingMode, ish.packing, i.packingOut) 
 				<= LEAST(s.quantity, ish.visible - IFNULL(tISS.reserve,0))
 			AND NOT pb.problem

db/routines/vn/procedures/ticket_close.sql

@@ -64,8 +64,12 @@ BEGIN
 			(SELECT vCurTicketFk, p.id, COUNT(*)
 				FROM expedition e 
 					JOIN packaging p ON p.id = e.packagingFk
+					JOIN ticket t ON t.id = e.ticketFk
+					LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+					LEFT JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
 				WHERE e.ticketFk = vCurTicketFk AND p.isPackageReturnable
 					AND vWithPackage
+					AND NOT dm.`code`= 'PICKUP'
 				GROUP BY p.itemFk);
 
 		-- No retornables o no catalogados

db/versions/11147-brownBamboo/00-firstScript.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE vn.ticketLastState MODIFY COLUMN name varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;

db/versions/11147-brownBamboo/00-firstScript.vn.sql

@@ -0,0 +1,5 @@
+-- Place your SQL code here
+
+
+INSERT INTO vn.state ( name, `order`, alertLevel, code, sectorProdPriority, nextStateFk, isPreviousPreparable, isPicked, isPreparable, semaphore, isPrintable, isOK, graphCategory, isNotValidated, classColor) VALUES('Entregado en parte', 13, 3, 'PARTIAL_DELIVERED', NULL, 16, 0, 1, 0, 0, 0, 0, 0, 0, NULL);
+

modules/client/front/postcode/index.html

@@ -53,7 +53,7 @@
             <vn-autocomplete vn-one
                 ng-model="$ctrl.location.countryFk"
                 url="Countries"
-                show-field="country"
+                show-field="name"
                 value-field="id"
                 label="Country">
             </vn-autocomplete>

modules/route/front/summary/index.html

@@ -35,10 +35,10 @@
         </vn-one>
         <vn-one>
             <vn-label-value label="Starting time"
-                value="{{$ctrl.summary.route.time | date: 'HH:MM'}}">
+                value="{{$ctrl.summary.route.started | date: 'HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Finishing time"
-                value="{{$ctrl.summary.route.finished | date: 'HH:MM'}}">
+                value="{{$ctrl.summary.route.finished | date: 'HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Km Start"
                 value="{{$ctrl.summary.route.kmStart}}">

modules/ticket/back/methods/ticket/saveSign.js

@@ -140,7 +140,16 @@ module.exports = Self => {
                     await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions);
                 await ticket.updateAttribute('isSigned', true, myOptions);
 
-                await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketId, 'DELIVERED'], myOptions);
+                const [{stateCode}] = await Self.rawSql(`
+                         SELECT 
+                            IF((SUM(CASE WHEN est.code = 'DELIVERED' THEN 1 ELSE 0 END) = COUNT(*)),
+                                'DELIVERED','PARTIAL_DELIVERED') stateCode
+                        FROM vn.expedition e
+                            JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk 
+                        WHERE e.ticketFk = ?;
+                        `, [ticketId], myOptions);
+
+                await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketId, stateCode], myOptions);
 
                 if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.cmrFk) {
                     await models.Ticket.saveCmr(ctx, [ticketId], myOptions);

modules/ticket/back/methods/ticket/specs/saveSign.spec.js

@@ -26,4 +26,36 @@ describe('Ticket saveSign()', () => {
 
         expect(error).toBeDefined();
     });
+
+    it('should change state for ticket', async() => {
+        const tx = await models.State.beginTransaction({});
+        const ticketWithOkState = 7;
+        const ticketStateId = 16;
+        const ticketCode = 'PARTIAL_DELIVERED';
+        spyOn(models.Dms, 'uploadFile').and.returnValue([{id: 1}]);
+        let ticketTrackingAfter;
+
+        try {
+            const options = {transaction: tx};
+            const tickets = [ticketWithOkState];
+
+            const state = await models.State.findById(ticketStateId, null, options);
+            await state.updateAttributes({
+                code: ticketCode,
+                name: ticketCode
+            }, options);
+
+            await models.Ticket.saveSign(ctx, tickets, null, null, options);
+            ticketTrackingAfter = await models.TicketLastState.findOne({
+                where: {ticketFk: ticketWithOkState}
+            }, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+
+        expect(ticketTrackingAfter.name).toBe('PARTIAL_DELIVERED');
+    });
 });

modules/worker/back/methods/worker/new.js

@@ -171,8 +171,8 @@ module.exports = Self => {
                 const address = await models.Address.create({
                     clientFk: user.id,
                     street: street,
-                    city: city,
+                    city,
-                    provinceFk: provinceFk,
+                    provinceFk,
                     postalCode: postcode,
                     mobile: phone,
                     nickname: nickname,
@@ -193,7 +193,9 @@ module.exports = Self => {
             }
 
             await user.updateAttribute('email', email, myOptions);
-
+            const {countryFk} = await Self.app.models.Province.findById(provinceFk, {
+                fields: ['countryFk']
+            });
             await models.Worker.create({
                 id: user.id,
                 firstName,
@@ -202,6 +204,7 @@ module.exports = Self => {
                 bossFk,
                 fi,
                 birth,
+                originCountryFk: countryFk
 
             }, myOptions);
 
@@ -212,11 +215,8 @@ module.exports = Self => {
             const message = e.sqlMessage;
 
             if (e.message && e.message.includes(`Email already exists`)) throw new UserError(`This personal mail already exists`);
-
             if (code === 'ER_DUP_ENTRY' && message.includes(`CodigoTrabajador_UNIQUE`)) throw new UserError(`This worker code already exists`);
-
             if (code === 'ER_DUP_ENTRY' && message.includes(`PRIMARY`)) throw new UserError(`This worker already exists`);
-
             throw e;
         }
 

modules/worker/back/models/worker.js

@@ -27,11 +27,10 @@ module.exports = Self => {
     });
 
     async function tinIsValid(err, done) {
-        const filter = {
+        const country = await Self.app.models.Country.findOne({
             fields: ['code'],
-            where: {id: this.countryFk}
+            where: {id: this.originCountryFk}
-        };
+        });
-        const country = await Self.app.models.Country.findOne(filter);
         const code = country ? country.code.toLowerCase() : null;
 
         if (!this.fi || !validateTin(this.fi, code))

modules/zone/back/models/agency-mode.json

@@ -60,6 +60,11 @@
             "type": "hasMany",
             "model": "Zone",
             "foreignKey": "agencyModeFk"
+        },
+        "mrwService": {
+            "type": "belongsTo",
+            "model": "MrwService",
+            "foreignKey": "code"
         }
     },
     "acls": [