From d2ce920f13ea8aa2e7857de2951b43a38654fad3 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 10 Oct 2023 13:49:11 +0200
Subject: [PATCH] refs #6199 Added minQuantity in catalog and more

---
 modules/item/front/basic-data/index.html      |  2 +-
 modules/item/front/basic-data/locale/es.yml   |  3 +-
 modules/item/front/summary/locale/es.yml      |  1 +
 .../order/back/methods/order/catalogFilter.js | 43 ++++++++++---------
 modules/order/front/catalog-view/index.html   | 13 ++++++
 .../order/front/catalog-view/locale/es.yml    |  1 +
 6 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index d3b30a7c2..f412626bf 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -185,7 +185,7 @@
         </vn-horizontal>
         <vn-horizontal>
             <vn-input-number
-                min="0"
+                min="1"
                 label="Minimum sales quantity"
                 ng-model="$ctrl.item.minQuantity"
                 vn-name="minQuantity"
diff --git a/modules/item/front/basic-data/locale/es.yml b/modules/item/front/basic-data/locale/es.yml
index 8f459c417..51cbdabd9 100644
--- a/modules/item/front/basic-data/locale/es.yml
+++ b/modules/item/front/basic-data/locale/es.yml
@@ -15,4 +15,5 @@ Generic: Genérico
 This item does need a photo: Este artículo necesita una foto
 Do photo: Hacer foto
 Recycled Plastic: Plástico reciclado
-Non recycled plastic: Plástico no reciclado
+Non recycled plastic: Plástico no 
+Minimum sales quantity: Cantidad mínima de venta
diff --git a/modules/item/front/summary/locale/es.yml b/modules/item/front/summary/locale/es.yml
index 2e78841ae..80988c491 100644
--- a/modules/item/front/summary/locale/es.yml
+++ b/modules/item/front/summary/locale/es.yml
@@ -2,3 +2,4 @@ Barcode: Códigos de barras
 Other data: Otros datos
 Go to the item: Ir al artículo
 WarehouseFk: Calculado sobre el almacén de {{ warehouseName }}
+Minimum sales quantity: Cantidad mínima de venta
diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js
index 0d83f9f4a..dca82322a 100644
--- a/modules/order/back/methods/order/catalogFilter.js
+++ b/modules/order/back/methods/order/catalogFilter.js
@@ -100,31 +100,32 @@ module.exports = Self => {
         ));
 
         stmt = new ParameterizedSQL(`
-            SELECT 
-                i.id,
-                i.name,
-                i.subName,
-                i.image,
-                i.tag5,
-                i.value5,
-                i.tag6,
-                i.value6,
-                i.tag7,
-                i.value7,
-                i.tag8,
-                i.value8,
-                i.stars,
-                tci.price,
-                tci.available,
-                w.lastName AS lastName,
-                w.firstName,
-                tci.priceKg,
-                ink.hex
+            SELECT i.id,
+                    i.name,
+                    i.subName,
+                    i.image,
+                    i.tag5,
+                    i.value5,
+                    i.tag6,
+                    i.value6,
+                    i.tag7,
+                    i.value7,
+                    i.tag8,
+                    i.value8,
+                    i.stars,
+                    tci.price,
+                    tci.available,
+                    w.lastName lastName,
+                    w.firstName,
+                    tci.priceKg,
+                    ink.hex,
+                    i.minQuantity
             FROM tmp.ticketCalculateItem tci
                 JOIN vn.item i ON i.id = tci.itemFk
                 JOIN vn.itemType it ON it.id = i.typeFk
                 JOIN vn.worker w on w.id = it.workerFk
-                LEFT JOIN vn.ink ON ink.id = i.inkFk`);
+                LEFT JOIN vn.ink ON ink.id = i.inkFk
+        `);
 
         // Apply order by tag
         if (orderBy.isTag) {
diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html
index fca728855..9333e923b 100644
--- a/modules/order/front/catalog-view/index.html
+++ b/modules/order/front/catalog-view/index.html
@@ -37,6 +37,19 @@
                         value="{{::item.value7}}">
                     </vn-label-value>
                 </div>
+                <div class="container text-right text-caption" ng-if="::item.minQuantity" style="
+                    display: flex;
+                    align-items: center;
+                    justify-content: flex-end;
+                    color: #fb5252;
+                ">
+                    <vn-icon
+                        icon="production_quantity_limits"
+                        translate-attr="{title: 'Minimal quantity'}"
+                        style="font-size: 18px; margin-right: 3px;">
+                    </vn-icon>
+                    <span>{{::item.minQuantity}}</span>
+                </div>
                 <vn-rating ng-if="::item.stars" 
                     ng-model="::item.stars">
                 </vn-rating>
diff --git a/modules/order/front/catalog-view/locale/es.yml b/modules/order/front/catalog-view/locale/es.yml
index 82fe5e9e8..8fb3c7896 100644
--- a/modules/order/front/catalog-view/locale/es.yml
+++ b/modules/order/front/catalog-view/locale/es.yml
@@ -1 +1,2 @@
 Order created: Orden creada
+Minimal quantity: Cantidad mínima
\ No newline at end of file