Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section

back/models/image.js

@@ -90,7 +90,9 @@ module.exports = Self => {
                 );
             }
 
-            await fs.unlink(srcFilePath);
+            if (fs.existsSync(srcFilePath))
+                await fs.unlink(srcFilePath);
+
             await tx.commit();
             return newImage;
         } catch (e) {

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

@@ -19,7 +19,6 @@ module.exports = Self => {
     Self.downloadImages = async() => {
         const models = Self.app.models;
 
-        let image;
         try {
             const tempPath = path.join('/tmp/salix-image');
 
@@ -27,7 +26,7 @@ module.exports = Self => {
             await fs.mkdir(tempPath, {recursive: true});
 
             const timer = setInterval(async() => {
-                image = await Self.findOne({where: {error: null}});
+                const image = await Self.findOne({where: {error: null}});
 
                 // Exit loop
                 if (!image) return clearInterval(timer);
@@ -62,9 +61,9 @@ module.exports = Self => {
                         await errorHandler(image.itemFk, error, filePath);
                     }
                 });
-            }, 1500);
+            }, 1000);
         } catch (error) {
-            await errorHandler(image.itemFk, error);
+            throw new Error('Try-catch error: ', error);
         }
 
         async function errorHandler(rowId, error, filePath) {
@@ -76,10 +75,10 @@ module.exports = Self => {
 
                 await row.updateAttribute('error', error);
 
-                if (filePath)
+                if (filePath && fs.existsSync(filePath))
                     await fs.unlink(filePath);
-            } catch (error) {
-                throw error;
+            } catch (err) {
+                throw new Error(`ErrorHandler error: ${err}`);
             }
         }
     };

modules/ticket/front/sale/index.html

@@ -58,7 +58,7 @@
                     </vn-th>
                     <vn-th shrink></vn-th>
                     <vn-th shrink></vn-th>
-                    <vn-th number>Id</vn-th>
+                    <vn-th number id="ticketId">Id</vn-th>
                     <vn-th>Quantity</vn-th>
                     <vn-th>Item</vn-th>
                     <vn-th number>Price</vn-th>
@@ -102,9 +102,8 @@
                         ng-click="descriptor.show($event, sale.itemFk, sale.id)">
                         {{sale.itemFk}}
                     </span>
-                    <vn-autocomplete ng-if="!sale.id"
+                    <vn-autocomplete ng-if="!sale.id" class="dense"
                         vn-focus
-                        vn-one
                         url="Items"
                         ng-model="sale.itemFk"
                         show-field="name"

modules/ticket/front/sale/style.scss

@@ -53,6 +53,9 @@ vn-ticket-sale {
             padding: 0!important;
         }
     }
+    #ticketId {
+        min-width: 150px
+    }
 }
 .vn-popover .transfer {
     .vn-textfield {