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

back/methods/image/download.js

@@ -57,6 +57,9 @@ module.exports = Self => {
         const entity = await models[imageCollection.model].findById(id, {
             fields: ['id', imageCollection.property]
         });
+
+        if (!entity) return false;
+
         const image = await models.Image.findOne({where: {
             collectionFk: collection,
             name: entity[imageCollection.property]}

back/models/image.json

@@ -26,7 +26,7 @@
         "nRefs": {
             "type": "Number",
             "required": true,
-            "default": 0
+            "default": 1
         }
     },
     "relations": {

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

@@ -48,7 +48,11 @@ module.exports = Self => {
 
             const srcFile = image.url.split('/').pop();
             const dotIndex = srcFile.lastIndexOf('.');
-            const fileName = srcFile.substring(0, dotIndex);
+
+            let fileName = srcFile.substring(0, dotIndex);
+            if (dotIndex == -1)
+                fileName = srcFile;
+
             const file = `${fileName}.png`;
             const filePath = path.join(tempPath, file);
 

modules/item/back/models/item.json

@@ -68,7 +68,8 @@
         "stemMultiplier": {
             "type": "number",
             "description": "Multiplier"
-        },"image": {
+        },
+        "image": {
             "type": "string",
             "description": "Image"
         },

modules/ticket/front/sale/index.js

@@ -367,6 +367,7 @@ class Controller extends Section {
             notAvailables
         };
         this.newSMS = {
+            ticketId: this.ticket.id,
             destinationFk: this.ticket.clientFk,
             destination: phone,
             message: this.$t('Product not available', params)

modules/worker/front/descriptor/index.js

@@ -57,7 +57,7 @@ class Controller extends Descriptor {
     onUploadResponse() {
         const timestamp = new Date().getTime();
         const src = this.$rootScope.imagePath('user', '520x520', this.worker.id);
-        const zoomSrc = this.$rootScope.imagePath('user', '1600x900', this.worker.id);
+        const zoomSrc = this.$rootScope.imagePath('user', '1600x1600', this.worker.id);
         const newSrc = `${src}&t=${timestamp}`;
         const newZoomSrc = `${zoomSrc}&t=${timestamp}`;