Merge branch 'dev' into 7161-deleteItemTrash

db/routines/bs/procedures/manaCustomerUpdate.sql

@@ -5,97 +5,90 @@ BEGIN
 	DECLARE vFromDated DATE;
 	DECLARE vForDeleteDated DATE;
 	DECLARE vManaId INT;
-    DECLARE vManaAutoId INT;
-    DECLARE vClaimManaId INT;
-    DECLARE vManaBankId INT;
-    DECLARE vManaGreugeTypeId INT;
-    DECLARE vManaFromDays INT;
-    DECLARE vManaToDays INT;
+	DECLARE vManaAutoId INT;
+	DECLARE vClaimManaId INT;
+	DECLARE vManaBankId INT;
+	DECLARE vManaGreugeTypeId INT;
+	DECLARE vManaFromDays INT;
+	DECLARE vManaToDays INT;
 
-	SELECT id INTO vManaId 
-			FROM vn.component WHERE code = 'mana';
+	SELECT id INTO vManaId
+		FROM vn.component WHERE code = 'mana';
 		
-	SELECT id INTO vManaAutoId 
+	SELECT id INTO vManaAutoId
 		FROM vn.component WHERE code = 'autoMana';
 	
 	SELECT id INTO vClaimManaId
 		FROM vn.component WHERE code = 'manaClaim';
 	
-	SELECT id INTO vManaBankId 
+	SELECT id INTO vManaBankId
 		FROM vn.accounting WHERE code = 'mana';
 	
-	SELECT id INTO vManaGreugeTypeId 
+	SELECT id INTO vManaGreugeTypeId
 		FROM vn.greugeType WHERE code = 'mana';
 
-    SELECT manaFromDays, manaToDays
-        INTO vManaFromDays, vManaToDays
-        FROM vn.salespersonConfig;
+	SELECT manaFromDays, manaToDays
+		INTO vManaFromDays, vManaToDays
+		FROM vn.salespersonConfig;
 
-	SELECT MAX(dated)
-        INTO vFromDated 
-        FROM vn.clientManaCache;
+	SELECT MAX(dated) INTO vFromDated
+		FROM vn.clientManaCache;
 
-	 DELETE
-        FROM vn.clientManaCache
-        WHERE dated = vFromDated;
-    
-    SELECT MAX(dated)
-        INTO vFromDated 
-        FROM vn.clientManaCache;
-            
-    IF ISNULL(vFromDated) THEN
-        SELECT manaDateFrom
-            INTO vFromDated
-            FROM vn.salespersonConfig;
-    END IF;
+	DELETE FROM vn.clientManaCache
+		WHERE dated = vFromDated;
+	
+	SELECT MAX(dated) INTO vFromDated 
+		FROM vn.clientManaCache;
+			
+	IF vFromDated IS NULL THEN
+		SELECT manaDateFrom
+			INTO vFromDated
+			FROM vn.salespersonConfig;
+	END IF;
 
-    WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
-        SELECT
-                vFromDated + INTERVAL vManaToDays DAY,
-                vFromDated - INTERVAL vManaFromDays DAY 
-            INTO 
-                vToDated,
-                vForDeleteDated;
-            
-        DELETE FROM vn.clientManaCache
-            WHERE dated <= vForDeleteDated;
+	WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
+		SELECT vFromDated + INTERVAL vManaToDays DAY,
+				vFromDated - INTERVAL vManaFromDays DAY 
+			INTO  vToDated,
+				vForDeleteDated;
+			
+		DELETE FROM vn.clientManaCache
+			WHERE dated <= vForDeleteDated;
 
-        INSERT INTO vn.clientManaCache(clientFk, mana, dated)
-            SELECT 
-                    Id_Cliente,
-                    SUM(mana),
-                    vToDated 
-                FROM 
-                (
-                    SELECT a.clientFk Id_Cliente, s.quantity * sc.value as mana
-                        FROM vn.ticket t
-                            JOIN vn.address a ON a.id = t.addressFk
-                            JOIN vn.sale s on s.ticketFk = t.id
-                            JOIN vn.saleComponent sc on sc.saleFk = s.id
-                        WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
-                            AND t.shipped > vFromDated 
-                            AND date(t.shipped) <= vToDated
-                    UNION ALL
-                    SELECT clientFk, - amountPaid
-                        FROM vn.receipt
-                        WHERE bankFk = vManaBankId
-                            AND payed > vFromDated 
-                            AND payed <= vToDated
-                    UNION ALL
-                    SELECT clientFk, amount
-                        FROM vn.greuge
-                        WHERE greugeTypeFk = vManaGreugeTypeId
-                            AND shipped > vFromDated 
-                            AND shipped <= vToDated
-                    UNION ALL
-                    SELECT clientFk, mana
-                        FROM vn.clientManaCache
-                        WHERE dated = vFromDated
-                ) sub
-                GROUP BY Id_Cliente
-                HAVING Id_Cliente;
+		INSERT INTO vn.clientManaCache(clientFk, mana, dated)
+			SELECT Id_Cliente,
+					SUM(mana),
+					vToDated 
+				FROM (
+					SELECT a.clientFk Id_Cliente, s.quantity * sc.value mana
+						FROM vn.ticket t
+							JOIN vn.address a ON a.id = t.addressFk
+							JOIN vn.sale s ON s.ticketFk = t.id
+							JOIN vn.saleComponent sc ON sc.saleFk = s.id
+						WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
+							AND t.shipped > vFromDated 
+							AND DATE(t.shipped) <= vToDated
+					UNION ALL
+					SELECT clientFk, - amountPaid
+						FROM vn.receipt
+						WHERE bankFk = vManaBankId
+							AND payed > vFromDated 
+							AND payed <= vToDated
+					UNION ALL
+					SELECT clientFk, amount
+						FROM vn.greuge
+						WHERE greugeTypeFk = vManaGreugeTypeId
+							AND shipped > vFromDated 
+							AND shipped <= vToDated
+					UNION ALL
+					SELECT clientFk, mana
+						FROM vn.clientManaCache
+						WHERE dated = vFromDated
+				) sub
+				GROUP BY Id_Cliente
+				HAVING Id_Cliente;
 
-        SET vFromDated = vToDated;  
-    END WHILE;
+		SET vFromDated = vToDated;
+	END WHILE;
 END$$
 DELIMITER ;

db/versions/11030-salmonCyca/00-firstScript.sql

@@ -0,0 +1,10 @@
+-- Place your SQL code here
+ALTER TABLE vn.absenceType ADD isFestiveEligible BOOL DEFAULT 1 NOT NULL COMMENT 'Para marcar un tipo de absence';
+
+UPDATE vn.absenceType
+SET isFestiveEligible = 0
+WHERE code = 'holiday';
+
+UPDATE vn.absenceType
+	SET isFestiveEligible=0
+	WHERE code = 'halfHoliday';

loopback/locale/en.json

@@ -226,4 +226,4 @@
     "This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
     "They're not your subordinate": "They're not your subordinate",
 	"InvoiceIn is already booked": "InvoiceIn is already booked"
-}
+}

modules/client/back/models/business.json

@@ -10,6 +10,9 @@
         "id": {
             "type": "number",
             "id": true
+        },
+        "workcenterFk" : {
+            "type": "number"
         }
     },
     "relations": {
@@ -24,4 +27,4 @@
             "foreignKey": "departmentFk"
         }
     }
-}
+}

modules/worker/back/methods/worker/createAbsence.js

@@ -98,6 +98,22 @@ module.exports = Self => {
             if (isHalfHoliday && hasHalfHoliday)
                 throw new UserError(`Cannot add more than one '1/2 day vacation'`);
 
+            const isFestive = absenceType.isFestiveEligible;
+
+            const workCenter = await models.Business.findOne({
+                where: {id: args.businessFk}
+            },);
+
+            const [holiday] = await models.CalendarHoliday.find({
+                where: {
+                    dated: args.dated,
+                    workCenterFk: workCenter.workCenterFk
+                }
+            });
+
+            if (holiday && isFestive)
+                throw new UserError(`Cannot add holidays on this day`);
+
             const absence = await models.Calendar.create({
                 businessFk: labour.businessFk,
                 dayOffTypeFk: args.absenceTypeId,

modules/worker/back/methods/worker/specs/createAbsence.spec.js

@@ -104,6 +104,35 @@ describe('Worker createAbsence()', () => {
         expect(error.message).toEqual(`Cannot add more than one '1/2 day vacation'`);
     });
 
+    it(`should throw an error when adding a "Holiday" absence if there's a festivity`, async() => {
+        const ctx = {
+            req: {accessToken: {userId: 9}},
+            args: {
+                id: 3,
+                businessFk: 3,
+                absenceTypeId: 1,
+                dated: '2001-12-08T23:00:00.000Z'
+            }
+        };
+        const workerId = 1;
+
+        const tx = await app.models.Calendar.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+
+            await app.models.Worker.createAbsence(ctx, workerId, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error.message).toEqual(`Cannot add holidays on this day`);
+    });
+
     it(`should throw an error when adding a absence if the worker has hours recorded that day and not is a half absence`, async() => {
         const ctx = {
             req: {accessToken: {userId: 19}},

modules/worker/back/models/absence-type.json

@@ -22,7 +22,10 @@
 		},
 		"holidayEntitlementRate": {
 			"type": "number"
-		}
+		},
+        "isFestiveEligible": {
+            "type": "boolean"
+        }
 	},
 	"acls": [
         {
@@ -32,4 +35,4 @@
         "permission": "ALLOW"
         }
     ]
-}
+}

modules/worker/back/models/worker.json

@@ -59,6 +59,9 @@
         },
         "isF11Allowed": {
             "type" : "boolean"
+        },
+        "isFreelance": {
+            "type" : "boolean"
         }
     },
     "relations": {