db/routines/vn/procedures/ticketClon.sql

@@ -2,9 +2,54 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketClon`(vTicketFk INT, vNewShipped DATE)
 BEGIN
 	
+    DECLARE done INT DEFAULT FALSE;
 	DECLARE vNewTicketFk INT;    
+	DECLARE vOldSaleFk INT;
+    DECLARE vNewSaleFk INT;
     
-	CALL ticket_cloneAll(vTicketFk, vNewShipped, TRUE, vNewTicketFk);
+    DECLARE cur1 CURSOR FOR
+		SELECT id
+			FROM vn.sale
+            WHERE ticketFk = vTicketFk;
+            
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+    
+    SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
+        
+    CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
+    
+    UPDATE vn.ticket 
+		SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed),
+			shipped = vNewShipped
+        WHERE id = vNewTicketFk;
+        
+	OPEN cur1;
+    
+	read_loop: LOOP
+ 
+    FETCH cur1 INTO vOldSaleFk;
+    
+    IF done THEN
+      LEAVE read_loop;
+    END IF;
+    
+		INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed)
+			SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed
+				FROM vn.sale
+                WHERE id = vOldSaleFk;
+        
+        SELECT max(id) INTO vNewSaleFk
+			FROM vn.sale
+            WHERE ticketFk = vNewTicketFk;
+        
+		INSERT INTO vn.saleComponent(saleFk, componentFk, value, isGreuge)
+			SELECT vNewSaleFk, componentFk, value, isGreuge
+				FROM vn.saleComponent
+                WHERE saleFk = vOldSaleFk;
+    
+	END LOOP;
+
+	CLOSE cur1;
     
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_cloneAll.sql

@@ -1,55 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_cloneAll`(vTicketFk INT, vNewShipped DATE, vWithWarehouse BOOLEAN, OUT vNewTicketFk INT)
-BEGIN
-	
-	DECLARE vDone BOOLEAN DEFAULT FALSE;
-	DECLARE vOldSaleFk INT;
-	DECLARE vNewSaleFk INT;
-	
-	DECLARE cur1 CURSOR FOR
-		SELECT id
-			FROM sale
-			WHERE ticketFk = vTicketFk;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	
-	SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
-
-	CALL ticket_Clone(vTicketFk, vNewTicketFk);
-	
-	UPDATE ticket 
-		SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed),
-			shipped = vNewShipped,
-			warehouseFk = IF(vWithWarehouse, warehouseFk, NULL)
-		WHERE id = vNewTicketFk;
-		
-	OPEN cur1;
-	
-	read_loop: LOOP
- 
-		FETCH cur1 INTO vOldSaleFk;
-	
-		IF vDone THEN
-			LEAVE read_loop;
-		END IF;
-	
-		INSERT INTO sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed)
-			SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed
-				FROM sale
-				WHERE id = vOldSaleFk;
-		
-		SELECT max(id) INTO vNewSaleFk
-			FROM sale
-			WHERE ticketFk = vNewTicketFk;
-		
-		INSERT INTO saleComponent(saleFk, componentFk, value, isGreuge)
-			SELECT vNewSaleFk, componentFk, value, isGreuge
-				FROM saleComponent
-				WHERE saleFk = vOldSaleFk;
-	
-	END LOOP;
-
-	CLOSE cur1;
-	
-END$$
-DELIMITER ;

db/versions/10957-goldenAnthurium/00-aclTicketClone.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
-    VALUES('Ticket', 'clone', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

modules/ticket/back/methods/ticket/clone.js

@@ -1,54 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('clone', {
-        description: 'clone a ticket and return the new ticket id',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'id',
-            type: 'number',
-            required: true,
-            description: 'The ticket id',
-            http: {source: 'path'}
-        }, {
-            arg: 'shipped',
-            type: 'date',
-        }, {
-            arg: 'withWarehouse',
-            type: 'boolean',
-        }
-        ],
-        returns: {
-            type: 'number',
-            root: true
-        },
-        http: {
-            path: `/:id/clone`,
-            verb: 'POST'
-        }
-    });
-
-    Self.clone = async(ctx, id, shipped, withWarehouse, options) => {
-        const myOptions = {userId: ctx.req.accessToken.userId};
-        let tx;
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const [, [{clonedTicketId}]] = await Self.rawSql(`
-                CALL vn.ticket_cloneAll(?, ?, ?, @clonedTicketId); 
-                SELECT @clonedTicketId clonedTicketId;`,
-            [id, shipped, withWarehouse], myOptions);
-
-            if (tx) await tx.commit();
-            return clonedTicketId;
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

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

@@ -1,56 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
-
-describe('Ticket cloning - clone function', () => {
-    let ctx;
-    let options;
-    let tx;
-    const ticketId = 1;
-    const shipped = Date.vnNew();
-
-    beforeEach(async() => {
-        ctx = {
-            req: {
-                accessToken: {userId: 9},
-                headers: {origin: 'http://localhost'}
-            },
-            args: {}
-        };
-
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: ctx.req
-        });
-
-        options = {transaction: tx};
-        tx = await models.Ticket.beginTransaction({});
-        options.transaction = tx;
-    });
-
-    afterEach(async() => {
-        await tx.rollback();
-    });
-
-    it('should clone a new ticket without warehouse', async() => {
-        const originalTicket = await models.Ticket.findById(ticketId, null, options);
-
-        const newTicketId = await models.Ticket.clone(ctx, ticketId, shipped, false, options);
-        const newTicket = await models.Ticket.findById(newTicketId, null, options);
-
-        expect(newTicket.clientFk).toEqual(originalTicket.clientFk);
-        expect(newTicket.companyFk).toEqual(originalTicket.companyFk);
-        expect(newTicket.addressFk).toEqual(originalTicket.addressFk);
-        expect(newTicket.warehouseFk).toBeFalsy();
-    });
-
-    it('should clone a new ticket with warehouse', async() => {
-        const originalTicket = await models.Ticket.findById(ticketId, null, options);
-
-        const newTicketId = await models.Ticket.clone(ctx, ticketId, shipped, true, options);
-        const newTicket = await models.Ticket.findById(newTicketId, null, options);
-
-        expect(newTicket.clientFk).toEqual(originalTicket.clientFk);
-        expect(newTicket.companyFk).toEqual(originalTicket.companyFk);
-        expect(newTicket.addressFk).toEqual(originalTicket.addressFk);
-        expect(newTicket.warehouseFk).toEqual(originalTicket.warehouseFk);
-    });
-});

modules/ticket/back/models/ticket-methods.js

@@ -46,6 +46,4 @@ module.exports = function(Self) {
     require('../methods/ticket/invoiceTicketsAndPdf')(Self);
     require('../methods/ticket/docuwareDownload')(Self);
     require('../methods/ticket/myLastModified')(Self);
-    require('../methods/ticket/addSaleByCode')(Self);
-    require('../methods/ticket/clone')(Self);
 };

modules/ticket/back/models/ticket.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('./ticket-methods')(Self);
     require('../methods/ticket/state')(Self);
+    require('../methods/ticket/addSaleByCode')(Self);
 };