Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)

db/changes/232001/00-procedurecanAdvance.sql

@@ -0,0 +1,127 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar.
+ *
+ * @param vDateFuture Fecha de los tickets que se quieren adelantar.
+ * @param vDateToAdvance Fecha a cuando se quiere adelantar.
+ * @param vWarehouseFk Almacén
+ */
+ 
+	DECLARE vDateInventory DATE;
+
+	SELECT inventoried INTO vDateInventory FROM config;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.stock;
+	CREATE TEMPORARY TABLE tmp.stock
+		(itemFk INT PRIMARY KEY,
+		amount INT)
+		ENGINE = MEMORY;
+
+	INSERT INTO tmp.stock(itemFk, amount)
+		SELECT itemFk, SUM(quantity) amount FROM
+		(
+			SELECT itemFk, quantity
+				FROM itemTicketOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM itemEntryIn
+				WHERE landed >= vDateInventory
+					AND landed < vDateFuture
+					AND isVirtualStock = FALSE
+					AND warehouseInFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM itemEntryOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseOutFk = vWarehouseFk
+		) t
+		GROUP BY itemFk HAVING amount != 0;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+SELECT
+                origin.ticketFk futureId,
+                dest.ticketFk id,
+                dest.state,
+                origin.futureState,
+                origin.futureIpt,
+                dest.ipt,
+                origin.workerFk,
+                origin.futureLiters,
+                origin.futureLines,
+                dest.shipped,
+                origin.shipped futureShipped,
+                dest.totalWithVat,
+                origin.totalWithVat futureTotalWithVat,
+                dest.agency,
+                origin.futureAgency,
+                dest.lines,
+                dest.liters,
+                origin.futureLines - origin.hasStock AS notMovableLines,
+                (origin.futureLines = origin.hasStock) AS isFullMovable,
+                origin.classColor,
+                dest.classColor futureClassColor
+            FROM (
+                    SELECT
+                            s.ticketFk,
+                            t.workerFk,
+                            t.shipped,
+                            t.totalWithVat,
+                            st.name futureState,
+                            t.addressFk,
+                            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(st.amount,0))) hasStock,
+                            st.classColor
+                        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 agencyMode am ON t.agencyModeFk = am.id
+                            LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                            LEFT JOIN tmp.stock st ON st.itemFk = i.id
+                        WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+                            AND t.warehouseFk = vWarehouseFk
+                        GROUP BY t.id
+                ) origin
+                JOIN (
+                    SELECT
+                            t.id ticketFk,
+                            t.addressFk,
+                            st.name state,
+                            GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
+                            t.shipped,
+                            t.totalWithVat,
+                            am.name agency,
+                            CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+                            CAST(COUNT(*) AS DECIMAL(10,0)) `lines`,
+                            st.classColor
+                        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 agencyMode am ON t.agencyModeFk = am.id
+                            LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                        WHERE t.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+                            AND t.warehouseFk = vWarehouseFk
+                            AND st.order <= 5
+                        GROUP BY t.id
+                ) dest ON dest.addressFk = origin.addressFk
+            WHERE origin.hasStock != 0;
+	DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;

db/changes/232001/00-procedurecanbePostponed.sql

@@ -0,0 +1,72 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canbePostponed`(vOriginDated DATE, vFutureDated DATE, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
+ *
+ * @param vOriginDated Fecha en cuestión
+ * @param vFutureDated Fecha en el futuro a sondear
+ * @param vWarehouseFk Identificador de vn.warehouse
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+	SELECT 	sv.ticketFk id,
+			sub2.id futureId,
+			GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
+			CAST(sum(litros) AS DECIMAL(10,0)) liters,
+			CAST(count(*) AS DECIMAL(10,0)) `lines`,
+			st.name state,
+			sub2.iptd futureIpt,
+			sub2.state futureState,
+			t.clientFk,
+			t.warehouseFk,
+			ts.alertLevel,
+			t.shipped,
+			sub2.shipped futureShipped,
+			t.workerFk,
+			st.code stateCode,
+			sub2.code futureStateCode,
+			st.classColor
+		FROM vn.saleVolume sv
+			JOIN vn.sale s ON s.id = sv.saleFk
+			JOIN vn.item i ON i.id = s.itemFk
+			JOIN vn.ticket t ON t.id = sv.ticketFk
+			JOIN vn.address a ON a.id = t.addressFk
+			JOIN vn.province p ON p.id = a.provinceFk
+			JOIN vn.country c ON c.id = p.countryFk
+			JOIN vn.ticketState ts ON ts.ticketFk = t.id
+			JOIN vn.state st ON st.id = ts.stateFk
+			JOIN vn.alertLevel al ON al.id = ts.alertLevel
+			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+			LEFT JOIN (
+				SELECT *
+					FROM (
+						SELECT
+							t.addressFk,
+							t.id,
+							t.shipped,
+							st.name state,
+							st.code code,
+							GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd
+							FROM vn.ticket t
+								JOIN vn.ticketState ts ON ts.ticketFk = t.id
+								JOIN vn.state st ON st.id = ts.stateFk
+								JOIN vn.sale s ON s.ticketFk = t.id
+								JOIN vn.item i ON i.id = s.itemFk
+							WHERE t.shipped BETWEEN vFutureDated
+											AND util.dayend(vFutureDated)
+								AND t.warehouseFk = vWarehouseFk
+							GROUP BY t.id
+					) sub
+					GROUP BY sub.addressFk
+				) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id
+		WHERE t.shipped BETWEEN vOriginDated AND util.dayend(vOriginDated)
+			AND t.warehouseFk = vWarehouseFk
+			AND al.code = 'FREE'
+			AND tp.ticketFk IS NULL
+		GROUP BY sv.ticketFk
+		HAVING futureId;
+END$$
+DELIMITER ;

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -251,6 +251,7 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
         await page.waitToClick(selectors.globalItems.acceptButton);
+        await page.waitToClick(selectors.globalItems.acceptButton);
         await page.waitForState('claim.card.basicData');
     });
 

modules/route/front/main/index.html

@@ -2,7 +2,7 @@
     vn-id="model"
     url="Routes/filter"
     limit="20"
-    order="created DESC">
+    order="created DESC, id DESC">
 </vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
@@ -17,4 +17,4 @@
 <vn-portal slot="menu">
     <vn-left-menu></vn-left-menu>
 </vn-portal>
-<ui-view></ui-view>
+<ui-view></ui-view>

modules/ticket/front/advance/index.html

@@ -122,7 +122,7 @@
                         <td>{{::ticket.ipt | dashIfEmpty}}</td>
                         <td>
                             <span
-                                class="chip {{$ctrl.stateColor(ticket.state)}}">
+                                class="chip {{ticket.classColor}}">
                                 {{::ticket.state | dashIfEmpty}}
                             </span>
                         </td>
@@ -150,7 +150,7 @@
                         <td>{{::ticket.futureIpt | dashIfEmpty}}</td>
                         <td>
                             <span
-                                class="chip {{$ctrl.stateColor(ticket.futureState)}}">
+                                class="chip {{ticket.classColor}}">
                                 {{::ticket.futureState | dashIfEmpty}}
                             </span>
                         </td>

modules/ticket/front/future/index.html

@@ -137,7 +137,7 @@
                         <td>{{::ticket.ipt | dashIfEmpty}}</td>
                         <td>
                             <span
-                            class="chip {{$ctrl.stateColor(ticket.state)}}">
+                            class="chip {{ticket.classColor}}">
                                 {{::ticket.state}}
                             </span>
                         </td>
@@ -158,7 +158,7 @@
                         <td>{{::ticket.futureIpt | dashIfEmpty}}</td>
                         <td>
                             <span
-                            class="chip {{$ctrl.stateColor(ticket.futureState)}}">
+                            class="chip {{ticket.classColor}}">
                                 {{::ticket.futureState}}
                             </span>
                         </td>

modules/ticket/front/future/index.js

@@ -95,13 +95,6 @@ export default class Controller extends Section {
         return checkedLines;
     }
 
-    stateColor(state) {
-        if (state === 'OK')
-            return 'success';
-        else if (state === 'Libre')
-            return 'notice';
-    }
-
     dateRange(value) {
         const minHour = new Date(value);
         minHour.setHours(0, 0, 0, 0);

modules/ticket/front/future/index.spec.js

@@ -60,24 +60,6 @@ describe('Component vnTicketFuture', () => {
         });
     });
 
-    describe('stateColor()', () => {
-        it('should return success to the OK tickets', () => {
-            const ok = controller.stateColor(controller.$.model.data[0].state);
-            const notOk = controller.stateColor(controller.$.model.data[1].state);
-
-            expect(ok).toEqual('success');
-            expect(notOk).not.toEqual('success');
-        });
-
-        it('should return success to the FREE tickets', () => {
-            const notFree = controller.stateColor(controller.$.model.data[0].state);
-            const free = controller.stateColor(controller.$.model.data[1].state);
-
-            expect(free).toEqual('notice');
-            expect(notFree).not.toEqual('notice');
-        });
-    });
-
     describe('dateRange()', () => {
         it('should return two dates with the hours at the start and end of the given date', () => {
             const dateRange = controller.dateRange(today);

modules/ticket/front/sale/index.html

@@ -488,6 +488,12 @@
     on-accept="$ctrl.onCreateClaimAccepted()">
 </vn-confirm>
 
+<vn-confirm
+    vn-id="claimSure"
+    message="Do you want to create a claim?"
+    on-accept="$ctrl.createClaim()">
+</vn-confirm>
+
 <vn-menu vn-id="moreOptions">
     <vn-item translate
         name="sms"
@@ -507,10 +513,9 @@
     </vn-item>
     <vn-item translate
         name="claim"
-        ng-click="$ctrl.createClaim()"
+        ng-click="claimSure.show()"
         ng-if="$ctrl.isClaimable">
-        Add claim
-    
+        Add claim 
     </vn-item>
     <vn-item translate
         name="reserve"

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

@@ -42,3 +42,4 @@ Claim mana: Maná reclamación
 History: Historial
 Do you want to continue?: ¿Desea continuar?
 Claim out of time: Reclamación fuera de plazo
+Do you want to create a claim?: ¿Quieres crear una reclamación?