Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component

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

@@ -26,7 +26,9 @@ module.exports = Self => {
             await fs.mkdir(tempPath, {recursive: true});
 
             const timer = setInterval(async() => {
-                const image = await Self.findOne({where: {error: null}});
+                const image = await Self.findOne({
+                    where: {error: null, url: {neq: null}}
+                });
 
                 // Exit loop
                 if (!image) return clearInterval(timer);

modules/order/front/catalog/index.html

@@ -63,7 +63,7 @@
             ng-model="$ctrl.orderField"
             selection="$ctrl.orderSelection"
             translate-fields="['name']"
-            order="name"
+            order="priority DESC"
             show-field="name"
             value-field="field"
             label="Order by"

modules/order/front/catalog/index.js

@@ -14,10 +14,10 @@ class Controller extends Section {
             {way: 'DESC', name: 'Descendant'},
         ];
         this.defaultOrderFields = [
-            {field: 'relevancy DESC, name', name: 'Relevancy'},
-            {field: 'showOrder, price', name: 'Color and price'},
-            {field: 'name', name: 'Name'},
-            {field: 'price', name: 'Price'}
+            {field: 'relevancy DESC, name', name: 'Relevancy', priority: 999},
+            {field: 'showOrder, price', name: 'Color and price', priority: 999},
+            {field: 'name', name: 'Name', priority: 999},
+            {field: 'price', name: 'Price', priority: 999}
         ];
         this.orderFields = [].concat(this.defaultOrderFields);
         this._orderWay = this.orderWays[0].way;
@@ -312,9 +312,11 @@ class Controller extends Section {
                     tags.push({
                         name: itemTag.name,
                         field: itemTag.tagFk,
-                        isTag: true
+                        isTag: true,
+                        priority: 1
                     });
-                }
+                } else
+                    tags[alreadyAdded].priority += 1;
             });
         });
         let newFilterList = [].concat(this.defaultOrderFields);

modules/order/front/catalog/index.spec.js

@@ -45,7 +45,7 @@ describe('Order', () => {
                 jest.spyOn(controller, 'buildTagsFilter');
                 jest.spyOn(controller, 'buildOrderFilter');
 
-                const expectedResult = [{field: 'showOrder, price', name: 'Color and price'}];
+                const expectedResult = [{field: 'showOrder, price', name: 'Color and price', priority: 999}];
                 const items = [{id: 1, name: 'My Item', tags: [
                     {tagFk: 4, name: 'Length'},
                     {tagFk: 5, name: 'Color'}

modules/ticket/back/methods/ticket/filter.js

@@ -245,7 +245,7 @@ module.exports = Self => {
                 SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped 
                     FROM tmp.filter f
                         LEFT JOIN alertLevel al ON al.alertLevel = f.alertLevel
-                    WHERE (f.alertLevelCode = 'FREE' OR f.alertLevel IS NULL)
+                    WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
                         AND f.shipped >= CURDATE()`);
         stmts.push('CALL ticketGetProblems()');