Merge pull request 'refs #6156 new field' (!1718) from 6156-advanceTicketsNewField into dev

Reviewed-on: #1718
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

db/routines/vn/procedures/ticket_canAdvance.sql

@@ -19,8 +19,7 @@ BEGIN
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.filter
 		(INDEX (id))
-		SELECT
-				origin.ticketFk futureId,
+		SELECT origin.ticketFk futureId,
 				dest.ticketFk id,
 				dest.state,
 				origin.futureState,
@@ -51,48 +50,48 @@ BEGIN
 				origin.warehouseFk futureWarehouseFk,
 				origin.companyFk futureCompanyFk,
 				IFNULL(dest.nickname, origin.nickname) nickname,
-				dest.landed
+				dest.landed,
+				dest.preparation
 			FROM (
-					SELECT
-							s.ticketFk,
-							c.salesPersonFk workerFk,
-							t.shipped,
-							t.totalWithVat,
-							st.name futureState,
-							am.name futureAgency,
-							count(s.id) futureLines,
-							GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
-							CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
-							SUM(s.quantity <= (IFNULL(il.stock,0) + IFNULL(im.amount, 0))) hasStock,
-							z.id futureZoneFk,
-							z.name futureZoneName,
-							st.classColor,
-							t.clientFk,
-							t.nickname,
-							t.addressFk,
-							t.warehouseFk,
-							t.companyFk,
-							t.agencyModeFk
-						FROM ticket t
-                            JOIN client c ON c.id = t.clientFk
-							JOIN sale s ON s.ticketFk = t.id
-							JOIN saleVolume sv ON sv.saleFk = s.id
-							JOIN item i ON i.id = s.itemFk
-							JOIN ticketState ts ON ts.ticketFk = t.id
-							JOIN state st ON st.id = ts.stateFk
-							JOIN agencyMode am ON t.agencyModeFk = am.id
-                            JOIN zone z ON t.zoneFk = z.id
-							LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
-							LEFT JOIN tmp.itemMinacum im ON im.itemFk = i.id
-								AND im.warehouseFk = vWarehouseFk
-				            LEFT JOIN tmp.itemList il ON il.itemFk = i.id
-						WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
-							AND t.warehouseFk = vWarehouseFk
-						GROUP BY t.id
+				SELECT s.ticketFk,
+						c.salesPersonFk workerFk,
+						t.shipped,
+						t.totalWithVat,
+						st.name futureState,
+						am.name futureAgency,
+						count(s.id) futureLines,
+						GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
+						CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+						SUM(s.quantity <= (IFNULL(il.stock,0) + IFNULL(im.amount, 0))) hasStock,
+						z.id futureZoneFk,
+						z.name futureZoneName,
+						st.classColor,
+						t.clientFk,
+						t.nickname,
+						t.addressFk,
+						t.warehouseFk,
+						t.companyFk,
+						t.agencyModeFk
+					FROM ticket t
+						JOIN client c ON c.id = t.clientFk
+						JOIN sale s ON s.ticketFk = t.id
+						JOIN saleVolume sv ON sv.saleFk = s.id
+						JOIN item i ON i.id = s.itemFk
+						JOIN ticketState ts ON ts.ticketFk = t.id
+						JOIN `state` st ON st.id = ts.stateFk
+						JOIN agencyMode am ON t.agencyModeFk = am.id
+						JOIN `zone` z ON t.zoneFk = z.id
+						LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+						LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+						LEFT JOIN tmp.itemMinacum im ON im.itemFk = i.id
+							AND im.warehouseFk = vWarehouseFk
+						LEFT JOIN tmp.itemList il ON il.itemFk = i.id
+					WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+						AND t.warehouseFk = vWarehouseFk
+					GROUP BY t.id
 				) origin
 				LEFT JOIN (
-					SELECT
-							t.id ticketFk,
+					SELECT t.id ticketFk,
 							st.name state,
 							GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
 							t.shipped,
@@ -108,18 +107,25 @@ BEGIN
 							t.warehouseFk,
 							t.companyFk,
 							t.landed,
-							t.agencyModeFk
+							t.agencyModeFk,
+							SEC_TO_TIME(
+							    COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)) * 3600 + 
+							    COALESCE(MINUTE(t.shipped), MINUTE(zc.hour), MINUTE(z.hour)) * 60
+							) preparation
 						FROM ticket t
 							JOIN sale s ON s.ticketFk = t.id
 							JOIN saleVolume sv ON sv.saleFk = s.id
 							JOIN item i ON i.id = s.itemFk
 							JOIN ticketState ts ON ts.ticketFk = t.id
-							JOIN state st ON st.id = ts.stateFk
+							JOIN `state` st ON st.id = ts.stateFk
 							JOIN agencyMode am ON t.agencyModeFk = am.id
 							LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+							LEFT JOIN `zone` z ON z.id = t.zoneFk
+							LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+							JOIN ticketCanAdvanceConfig tc
 						WHERE t.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
 							AND t.warehouseFk = vWarehouseFk
-							AND st.order <= 5
+							AND st.order <= tc.destinationOrder
 						GROUP BY t.id
 				) dest ON dest.addressFk = origin.addressFk
 			WHERE origin.hasStock;

db/versions/11221-chocolateSalal/00-firstScript.sql

@@ -0,0 +1,9 @@
+-- Place your SQL code here
+CREATE TABLE IF NOT EXISTS vn.ticketCanAdvanceConfig (
+  id int(10) unsigned NOT NULL,
+  destinationOrder INT NULL,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `ticketCanAdvanceConfig_check` CHECK (`id` = 1)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO vn.ticketCanAdvanceConfig SET id =1, destinationOrder = 5;

modules/ticket/back/methods/ticket/getTicketsAdvance.js

@@ -105,13 +105,12 @@ module.exports = Self => {
 
         stmt = new ParameterizedSQL(
             `CALL vn.ticket_canAdvance(?,?,?)`,
-            [args.dateFuture, args.dateToAdvance, args.warehouseFk]);
+            [args.dateFuture, args.dateToAdvance, args.warehouseFk]
+        );
 
         stmts.push(stmt);
 
-        stmt = new ParameterizedSQL(`
-            SELECT f.*
-            FROM tmp.filter f`);
+        stmt = new ParameterizedSQL(`SELECT f.* FROM tmp.filter f`);
 
         stmt.merge(conn.makeWhere(filter.where));
 
@@ -119,9 +118,7 @@ module.exports = Self => {
         stmt.merge(conn.makeLimit(filter));
         const ticketsIndex = stmts.push(stmt) - 1;
 
-        stmts.push(
-            `DROP TEMPORARY TABLE
-                tmp.filter`);
+        stmts.push(`DROP TEMPORARY TABLE tmp.filter`);
 
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await conn.executeStmt(sql, myOptions);

modules/ticket/front/advance/index.html

@@ -39,14 +39,8 @@
                 <thead>
                     <tr second-header>
                         <td></td>
-                        <th colspan="7">
-                            <span translate>Destination</span>
-                            {{model.userParams.dateToAdvance| date: 'dd/MM/yyyy'}}
-                        </th>
-                        <th colspan="11">
-                            <span translate>Origin</span>
-                            {{model.userParams.dateFuture | date: 'dd/MM/yyyy'}}
-                        </th>
+                        <th colspan="9" translate>Destination</th>
+                        <th colspan="11" translate>Origin</th>
                     </tr>
                     <tr>
                         <th shrink>
@@ -56,14 +50,16 @@
                                 check-field="checked">
                             </vn-multi-check>
                         </th>
-                        <th shrink>
-                        </th>
+                        <th shrink></th>
                         <th field="id">
                             <span translate>ID</span>
                         </th>
                         <th field="ipt" title="{{'Item Packing Type' | translate}}">
                             <span>IPT</span>
                         </th>
+                        <th field="preparation">
+                            <span translate>Preparation</span>
+                        </th>
                         <th field="state">
                             <span translate>State</span>
                         </th>
@@ -125,6 +121,7 @@
                             </span>
                         </td>
                         <td>{{::ticket.ipt | dashIfEmpty}}</td>
+                        <td>{{::ticket.preparation | dashIfEmpty}}</td>
                         <td>
                             <span
                                 class="chip {{ticket.classColor}}">
@@ -165,7 +162,6 @@
                                 {{::(ticket.futureTotalWithVat ? ticket.futureTotalWithVat : 0) | currency: 'EUR': 2}}
                             </span>
                         </td>
-
                     </tr>
                 </tbody>
             </table>

modules/ticket/front/future/locale/es.yml

@@ -14,3 +14,4 @@ Success: Tickets movidos correctamente
 IPT: Encajado
 Origin Date: Fecha origen
 Destination Date: Fecha destino
+Preparation: Preparación