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

docker-compose.yml

@@ -12,6 +12,9 @@ services:
       placement:
         constraints:
           - node.role == worker
+      resources:
+        limits:
+          memory: 1G
   back:
     image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
     build: .
@@ -38,6 +41,9 @@ services:
       placement:
         constraints:
           - node.role == worker
+      resources:
+        limits:
+          memory: 4G
 configs:
   datasources:
     external: true

modules/client/back/methods/tpv-transaction/confirm.js

@@ -32,7 +32,9 @@ module.exports = Self => {
 
     Self.confirm = async(signatureVersion, merchantParameters, signature) => {
         const $ = Self.app.models;
+        let transaction;
 
+        try {
             const decodedParams = JSON.parse(
                 base64url.decode(merchantParameters, 'utf8'));
             const params = {};
@@ -41,16 +43,28 @@ module.exports = Self => {
                 params[param] = decodeURIComponent(decodedParams[param]);
 
             const orderId = params['Ds_Order'];
-        const merchantId = parseInt(params['Ds_MerchantCode']);
-
             if (!orderId)
-            throw new UserError('Order id not found');
+                throw new UserError('Order id not provided');
+
+            transaction = await Self.findById(orderId, {fields: ['id']});
+            if (!transaction)
+                throw new UserError('Order not found');
+
+            await transaction.updateAttributes({
+                merchantParameters,
+                signature,
+                signatureVersion,
+            });
+
+            const merchantId = parseInt(params['Ds_MerchantCode']);
             if (!merchantId)
-            throw new UserError('Mechant id not found');
+                throw new UserError('Merchant id not provided');
 
             const merchant = await $.TpvMerchant.findById(merchantId, {
                 fields: ['id', 'secretKey']
             });
+            if (!merchant)
+                throw new UserError('Merchant not found');
 
             const base64hmac = Self.createSignature(
                 orderId,
@@ -72,5 +86,12 @@ module.exports = Self => {
                 ]);
 
             return true;
+        } catch (err) {
+            if (transaction)
+                await transaction.updateAttribute('responseError', err.message);
+            else
+                console.error(err);
+            throw err;
+        }
     };
 };

modules/client/back/models/tpv-transaction.json

@@ -35,6 +35,18 @@
         },
         "created": {
             "type": "date"
+        },
+        "merchantParameters": {
+            "type": "string"
+        },
+        "signature": {
+            "type": "string"
+        },
+        "signatureVersion": {
+            "type": "string"
+        },
+        "responseError": {
+            "type": "string"
         }
     },
     "relations": {
@@ -45,4 +57,3 @@
         }
     }
 }
-  

modules/invoiceOut/front/descriptor/index.html

@@ -54,3 +54,6 @@
 <vn-popup vn-id="summary">
     <vn-invoice-out-summary invoice-out="$ctrl.invoiceOut"></vn-invoice-out-summary>
 </vn-popup>
+<vn-client-descriptor-popover
+    vn-id="clientDescriptor">
+</vn-client-descriptor-popover>

modules/item/back/methods/item-image-queue/downloadImages.js

@@ -59,17 +59,10 @@ module.exports = Self => {
                 }
 
                 const writeStream = fs.createWriteStream(filePath);
-                writeStream.on('open', () => {
-                    response.pipe(writeStream);
-                });
-
-                writeStream.on('error', async error => {
-                    await errorHandler(image.itemFk, error, filePath);
-                });
-
-                writeStream.on('finish', async function() {
-                    writeStream.end();
-                });
+                writeStream.on('open', () => response.pipe(writeStream));
+                writeStream.on('error', async error =>
+                    await errorHandler(image.itemFk, error, filePath));
+                writeStream.on('finish', writeStream.end());
 
                 writeStream.on('close', async function() {
                     try {

print/templates/reports/invoice/sql/rectified.sql

@@ -1,10 +1,11 @@
 SELECT
-    io.amount,
-    io.ref,
-    io.issued,
+    io2.amount,
+    io2.ref,
+    io2.issued,
     ict.description
 FROM invoiceOut io
     JOIN invoiceCorrection ic ON ic.correctingFk = io.id
-    JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
+    JOIN invoiceOut io2 ON io2.id = ic.correctedFk
     LEFT JOIN ticket t ON t.refFk = io.ref
+    JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
 WHERE io.ref = ?