Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

back/methods/mrw-config/cancelShipment.js

@@ -39,6 +39,9 @@ module.exports = Self => {
         const xmlString = response.data;
         const parser = new DOMParser();
         const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
+
+        await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipment', xmlDoc]);
+
         const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
         return result.toLowerCase().includes('se ha cancelado correctamente');
     };

db/routines/vn/procedures/stockBought_calculate.sql

@@ -59,7 +59,7 @@ proc: BEGIN
 	
 	INSERT INTO stockBought(workerFk, bought, dated)
 		SELECT tb.workerFk, 
-				ROUND(GREATEST(tb.bought - IFNULL(ts.sold, 0), 0), 1), 
+				ROUND(GREATEST(tb.bought - IFNULL(ts.sold, 0), 0), 2), 
 				vDated
 			FROM tStockBought tb 
 				LEFT JOIN tStockSold ts ON ts.workerFk = tb.workerFk;

db/versions/11251-navyChrysanthemum/00-firstScript.sql

@@ -1,3 +1,2 @@
-UPDATE vn.sale
+-- Debido a que tardaba mucho en la subida a master, se ha creado una nueva versión para que el proceso no se vea afectado y se ejecute por la noche.
-    SET originalQuantity = quantity
+-- Se crea de nuevo en la versión 11344-grayBamboo
-    WHERE originalQuantity IS NULL

db/versions/11344-grayBamboo/00-firstScript.sql

@@ -0,0 +1,3 @@
+UPDATE vn.sale
+    SET originalQuantity = quantity
+    WHERE originalQuantity IS NULL

modules/entry/back/methods/stock-bought/getStockBought.js

@@ -6,6 +6,9 @@ module.exports = Self => {
             arg: 'workerFk',
             type: 'number',
             description: 'The id for a buyer',
+        }, {
+            arg: 'filter',
+            type: 'object',
         },
         {
             arg: 'dated',
@@ -23,7 +26,7 @@ module.exports = Self => {
         }
     });
 
-    Self.getStockBought = async(workerFk, dated = Date.vnNew()) => {
+    Self.getStockBought = async(workerFk, filter, dated = Date.vnNew()) => {
         const models = Self.app.models;
         const today = Date.vnNew();
         dated.setHours(0, 0, 0, 0);
@@ -31,7 +34,7 @@ module.exports = Self => {
 
         await models.StockBought.rawSql(`CALL vn.stockBought_calculate(?)`, [dated]);
 
-        const filter = {
+        const defaultFilter = {
             where: {dated},
             include: [
                 {
@@ -53,6 +56,6 @@ module.exports = Self => {
 
         if (workerFk) filter.where.workerFk = workerFk;
 
-        return models.StockBought.find(filter);
+        return models.StockBought.find({...filter, ...defaultFilter});
     };
 };

modules/entry/back/methods/stock-bought/getStockBoughtDetail.js

@@ -1,3 +1,4 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 module.exports = Self => {
     Self.remoteMethod('getStockBoughtDetail', {
         description: 'Returns the detail of stock bought for a given date and a worker',
@@ -12,6 +13,9 @@ module.exports = Self => {
             type: 'string',
             description: 'The date to filter',
             required: true,
+        }, {
+            arg: 'filter',
+            type: 'object',
         }
         ],
         returns: {
@@ -24,11 +28,10 @@ module.exports = Self => {
         }
     });
 
-    Self.getStockBoughtDetail = async(workerFk, dated) => {
+    Self.getStockBoughtDetail = async(workerFk, dated, filter, options) => {
-        const models = Self.app.models;
+        const conn = Self.dataSource.connector;
         const myOptions = {};
         let tx;
-        let result;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -39,8 +42,10 @@ module.exports = Self => {
         }
 
         try {
-            await models.StockBought.rawSql(`CALL vn.item_calculateStock(?)`, [dated], myOptions);
+            const stmts = [];
-            result = await Self.rawSql(
+            stmts.push(new ParameterizedSQL(`CALL vn.item_calculateStock(?)`, [dated]));
+
+            const query = new ParameterizedSQL(
                 `SELECT b.entryFk entryFk,
                         i.id itemFk,
                         i.name itemName,
@@ -61,11 +66,17 @@ module.exports = Self => {
                         JOIN volumeConfig vc
                     WHERE ic.display
                         AND w.id = ?`,
-                [workerFk], myOptions
+                [workerFk]
             );
-            await Self.rawSql(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate;`, [], myOptions);
+
+            stmts.push(query.merge(conn.makeSuffix(filter)));
+
+            stmts.push(new ParameterizedSQL(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate`));
+
+            const sql = ParameterizedSQL.join(stmts, ';');
+            const result = await conn.executeStmt(sql, myOptions);
             if (tx) await tx.commit();
-            return result;
+            return result[1];
         } catch (e) {
             await tx.rollback();
             throw e;