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

back/models/warehouse.json

@@ -25,6 +25,9 @@
     "isManaged": {
       "type": "boolean"
     },
+    "isDestiny": {
+      "type": "boolean"
+    },
     "countryFk": {
       "type": "number"
     }

modules/item/back/methods/fixed-price/filter.js

@@ -128,6 +128,9 @@ module.exports = Self => {
                 return {[param]: value};
             }
         });
+        if (ctx.req.query?.showBadDates === 'true')
+            where['fp.started'] = {gte: Date.vnNew()};
+
         filter = mergeFilters(filter, {where});
 
         const stmts = [];
@@ -136,6 +139,7 @@ module.exports = Self => {
             SELECT DISTINCT fp.id,
                 fp.itemFk,
                 fp.warehouseFk,
+                w.name warehouseName,
                 fp.rate2,
                 fp.rate3,
                 fp.started,
@@ -159,6 +163,7 @@ module.exports = Self => {
             FROM priceFixed fp
             JOIN item i ON i.id = fp.itemFk
             JOIN itemType it ON it.id = i.typeFk
+            JOIN warehouse w ON fp.warehouseFk = w.id
         `);
 
         if (ctx.args.tags) {
@@ -184,7 +189,6 @@ module.exports = Self => {
         }
 
         stmt.merge(conn.makeSuffix(filter));
-
         const fixedPriceIndex = stmts.push(stmt) - 1;
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await conn.executeStmt(sql, myOptions);