Merge branch 'master' into 7801-franceGoLabel

2024-07-30 06:44:17 +00:00 · 2024-07-30 06:44:17 +00:00 · 90f7cc0583
parent 6c1de1d6bd c713c3a5c0
commit 90f7cc0583
14 changed files with 35 additions and 68 deletions
--- a/db/routines/vn/procedures/saleGroup_setParking.sql
+++ b/db/routines/vn/procedures/saleGroup_setParking.sql
@ -10,15 +10,10 @@ BEGIN
 * @param vSaleGroupFk id de la preparación previa
 * @param vParkingFk id del parking
 */
- 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		RESIGNAL;
-	END;
-
 	UPDATE saleGroup sg
 		SET sg.parkingFk = vParkingFk
-			WHERE sg.id = vSaleGroupFk
-				AND sg.created >= util.VN_CURDATE() - INTERVAL 1 WEEK;
+		WHERE sg.id = vSaleGroupFk
+			AND sg.created >= util.VN_CURDATE() - INTERVAL 1 WEEK;

 	CALL ticket_setNextState(ticket_get(vSaleGroupFk));
 END$$
--- a/db/routines/vn/procedures/setParking.sql
+++ b/db/routines/vn/procedures/setParking.sql
@ -13,12 +13,6 @@ BEGIN
 	DECLARE vParkingFk INT;
 	DECLARE vLastWeek DATE;

-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
 	SET vParkingCode = REPLACE(vParkingCode, ' ', '');

 	SELECT id INTO vParkingFk
@ -29,8 +23,6 @@ BEGIN
 		CALL util.throw('parkingNotExist');
 	END IF;

-	START TRANSACTION;
-
 	SET vLastWeek = util.VN_CURDATE() - INTERVAL 1 WEEK;

 	-- Comprobamos si es una prep. previa, ticket, colección o shelving
@ -45,7 +37,5 @@ BEGIN
 	ELSE
 		CALL util.throw('paramNotExist');
 	END IF;
-
-	COMMIT;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/shelving_setParking.sql
+++ b/db/routines/vn/procedures/shelving_setParking.sql
@ -1,20 +1,20 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`shelving_setParking`(IN `vShelvingCode` VARCHAR(8), IN `vParkingFk` INT)
-proc: BEGIN
+BEGIN
 /**
 * Aparca una matrícula en un parking
 *
 * @param vShelvingCode code de la matrícula
 * @param vParkingFk id del parking
 */
-	INSERT INTO vn.shelvingLog (originFk, userFk, action , description,changedModel,changedModelId)
+	INSERT INTO shelvingLog (originFk, userFk, action , description,changedModel,changedModelId)
 		SELECT s.id, account.myUser_getId(), 'update', CONCAT("Cambio parking ",vShelvingCode," de ", p.code," a ", pNew.code),'Shelving',s.id
 			FROM parking p
 				JOIN shelving s ON s.parkingFk = p.id
 				JOIN parking pNew ON pNew.id = vParkingFk
 			WHERE s.code = vShelvingCode COLLATE utf8_unicode_ci;

-	UPDATE vn.shelving
+	UPDATE shelving
 		SET parkingFk = vParkingFk,
 			parked = util.VN_NOW(),
 			isPrinted = TRUE
--- a/db/routines/vn/procedures/ticket_setParking.sql
+++ b/db/routines/vn/procedures/ticket_setParking.sql
@ -21,11 +21,6 @@ BEGIN

 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		RESIGNAL;
-	END;
-
 	INSERT INTO vn.ticketParking(ticketFk, parkingFk)
 		SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
 			FROM ticket t
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -367,5 +367,6 @@
 	"It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono",
 	"Payment method is required": "El método de pago es obligatorio",
 	"Cannot send mail": "Não é possível enviar o email",
-	"CONSTRAINT `supplierAccountTooShort` failed for `vn`.`supplier`": "La cuenta debe tener exactamente 10 dígitos"
-}
+	"CONSTRAINT `supplierAccountTooShort` failed for `vn`.`supplier`": "La cuenta debe tener exactamente 10 dígitos",
+	"The sale not exists in the item shelving": "La venta no existe en la estantería del artículo"
+}
--- a/modules/client/back/methods/client/hasCustomerRole.js
+++ b/modules/client/back/methods/client/hasCustomerRole.js
@ -29,7 +29,7 @@ module.exports = Self => {
            SELECT COUNT(*) > 0 isCustomer
                FROM salix.Account A
                    JOIN salix.Role r ON r.id = A.roleFK
-                WHERE r.name = 'customer'
+                WHERE r.name IN ('customer', 'supplier')
                    AND A.id IN (?)`;
        const [result] = await Self.rawSql(query, [id], myOptions);
        const {isCustomer} = result;
--- a/modules/item/back/methods/item-shelving/updateFromSale.js
+++ b/modules/item/back/methods/item-shelving/updateFromSale.js
@ -1,3 +1,4 @@
+const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
    Self.remoteMethod('updateFromSale', {
        description: 'Update the visible items',
@ -32,6 +33,9 @@ module.exports = Self => {
                include: {relation: 'itemShelving'}
            }, myOptions);

+            if (!itemShelvingSale?.itemShelving())
+                throw new UserError('The sale not exists in the item shelving');
+
            const itemShelving = itemShelvingSale.itemShelving();
            const quantity = itemShelving.visible + itemShelvingSale.quantity;

--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/index.js
@ -62,8 +62,11 @@ export default class Controller extends Section {

    setDefaultFilter() {
        let today = Date.vnNew();
+        today.setHours(0, 0, 0, 0);
        const tomorrow = new Date(today);
        tomorrow.setDate(tomorrow.getDate() + 1);
+        tomorrow.setHours(23, 59, 59, 999);
+
        this.$http.get(`UserConfigs/getUserConfig`)
            .then(res => {
                this.filterParams = {
@ -86,15 +89,6 @@ export default class Controller extends Section {
        return checkedLines;
    }

-    dateRange(value) {
-        const minHour = new Date(value);
-        minHour.setHours(0, 0, 0, 0);
-        const maxHour = new Date(value);
-        maxHour.setHours(23, 59, 59, 59);
-
-        return [minHour, maxHour];
-    }
-
    totalPriceColor(totalWithVat) {
        return this.isLessThan50(totalWithVat) ? 'warning' : '';
    }
--- a/modules/ticket/front/advance/index.spec.js
+++ b/modules/ticket/front/advance/index.spec.js
@ -36,24 +36,6 @@ describe('Component vnTicketAdvance', () => {
        });
    });

-    describe('dateRange()', () => {
-        it('should return two dates with the hours at the start and end of the given date', () => {
-            const now = Date.vnNew();
-
-            const today = now.getDate();
-
-            const dateRange = controller.dateRange(now);
-            const start = dateRange[0].toString();
-            const end = dateRange[1].toString();
-
-            expect(start).toContain(today);
-            expect(start).toContain('00:00:00');
-
-            expect(end).toContain(today);
-            expect(end).toContain('23:59:59');
-        });
-    });
-
    describe('moveTicketsAdvance()', () => {
        it('should make an HTTP Post query', () => {
            jest.spyOn(controller.$.model, 'refresh');
--- a/print/templates/reports/buy-label/assets/css/style.css
+++ b/print/templates/reports/buy-label/assets/css/style.css
@ -33,9 +33,6 @@ span {
 .barcode {
    text-align: center;
 }
-#variant {
+.one-third {
    width: 314px;
-}
-#producer {
-    width: 471px;
 }
--- a/print/templates/reports/buy-label/buy-label.html
+++ b/print/templates/reports/buy-label/buy-label.html
@ -4,7 +4,7 @@
    <tbody>
        <tr>
            <td colspan="2">
-                <div id="variant" class="cell">
+                <div class="cell one-third">
                    <span class="lbl">{{$t('variety')}}</span>
                    {{buy.name}}
                </div>
@ -63,18 +63,24 @@
            </td>
        </tr>
        <tr>
-            <td colspan="3">
-                <div id="producer" class="cell">
+            <td colspan="2">
+                <div class="cell one-third">
                    <span class="lbl">{{$t('producer')}}</span>
                    {{buy.producer}}
                </div>
            </td>
+            <td>
+                <div class="cell">
+                    <span class="lbl">{{$t('control')}}</span>
+                    {{`${weekNum} / ${dayNum}`}}
+                </div>
+            </td>
        </tr>
        <tr>
            <td colspan="2">
-                <div class="cell">
-                    <span class="lbl">{{$t('control')}}</span>
-                    {{`${weekNum} / ${dayNum}`}}
+                <div class="cell one-third">
+                    <span class="lbl">{{$t('reference')}}</span>
+                    {{buy.comment}}
                </div>
             </td>
            <td>
--- a/print/templates/reports/buy-label/locale/en.yml
+++ b/print/templates/reports/buy-label/locale/en.yml
@ -9,4 +9,5 @@ grouping: Grouping
 unitSale: Un. sale
 producer: Producer
 control: Control
-boxNum: Box no.
+boxNum: Box no.
+reference: Reference
--- a/print/templates/reports/buy-label/locale/es.yml
+++ b/print/templates/reports/buy-label/locale/es.yml
@ -9,4 +9,5 @@ grouping: Grouping
 saleUnit: Sale un.
 producer: Productor
 control: Control
-boxNum: Caja nº
+boxNum: Caja nº
+reference: Referencia
--- a/print/templates/reports/buy-label/sql/buys.sql
+++ b/print/templates/reports/buy-label/sql/buys.sql
@ -20,7 +20,8 @@ SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) labelNum,
 		i.stems,
 		b.id,
 		b.itemFk,
-		p.name producer
+		p.name producer,
+		i.comment
 	FROM buy b
 		JOIN item i ON i.id = b.itemFk
 		LEFT JOIN producer p ON p.id = i.producerFk