From e0924ea373a4b72bf5a6338740500bcd11957259 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 15 Mar 2022 15:18:27 +0100
Subject: [PATCH] refactor(item_fixed-price): add checkbox hasMinPrice,
 tooltips, more witdh

---
 modules/item/front/fixed-price/index.html    | 45 ++++++++++++++------
 modules/item/front/fixed-price/locale/es.yml |  4 +-
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/modules/item/front/fixed-price/index.html b/modules/item/front/fixed-price/index.html
index 6f98ba65b3..34d63ffe2f 100644
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@@ -22,16 +22,27 @@
         model="model">
     </vn-searchbar>
 </vn-portal>
-<div class="vn-w-lg">
+<div class="vn-w-xl">
     <vn-card>
         <vn-table model="model">
             <vn-thead>
                 <vn-tr>
                     <vn-th field="itemFk" shrink>Item ID</vn-th>
                     <vn-th field="itemFk">Description</vn-th>
-                    <vn-th field="warehouseFk">Warehouse</vn-th>
-                    <vn-th field="rate2">P.P.U.</vn-th>
-                    <vn-th field="rate3">P.P.P.</vn-th>
+                    <vn-th field="warehouseFk" shrink>Warehouse</vn-th>
+                    <vn-th 
+                        field="rate2"
+                        vn-tooltip="Price By Unit"
+                        center>
+                        P.P.U.
+                    </vn-th>
+                    <vn-th 
+                        field="rate3"
+                        vn-tooltip="Price By Package"
+                        center>
+                        P.P.P.
+                    </vn-th>
+                    <vn-th></vn-th>
                     <vn-th field="minPrice">Min price</vn-th>
                     <vn-th field="started" style="width: 90px">Started</vn-th>
                     <vn-th field="ended" style="width: 90px">Ended</vn-th>
@@ -41,12 +52,7 @@
             <vn-tbody>
                 <vn-tr ng-repeat="price in prices">
                     <vn-td shrink>
-                        <span
-                            ng-if="price.itemFk"
-                            ng-click="itemDescriptor.show($event, price.itemFk)"
-                            class="link">
-                            {{price.itemFk}}
-                        </span>
+                        <text>{{price.itemFk}}</text>
                         <vn-autocomplete
                             class="dense"
                             ng-if="!price.itemFk"
@@ -66,7 +72,13 @@
                     </vn-td>
                     <vn-td vn-fetched-tags>
                         <div>
-                            <vn-one title="{{price.name}}">{{price.name}}</vn-one>
+                            <span
+                                vn-one
+                                ng-if="price.itemFk"
+                                ng-click="itemDescriptor.show($event, price.itemFk)"
+                                class="link">
+                                {{price.name}}
+                            </span>
                             <vn-one ng-if="price.subName">
                                 <h3 title="{{price.subName}}">{{price.subName}}</h3>
                             </vn-one>
@@ -77,7 +89,7 @@
                             tabindex="-1">
                         </vn-fetched-tags>
                     </vn-td>
-                    <vn-td>
+                    <vn-td shrink>
                         <vn-autocomplete
                             vn-one
                             label="Warehouse"
@@ -109,10 +121,17 @@
                             </vn-input-number>
                         </field>
                     </vn-td-editable>
+                    <vn-td shrink>
+                        <vn-check
+                            vn-one
+                            ng-model="price.hasMinPrice">
+                        </vn-check>
+                    </vn-td>
                     <vn-td-editable number>
-                        <text>{{(price.hasMinPrice ? (price.minPrice | currency: 'EUR':2) : "-")}}</text>
+                        <text>{{price.minPrice | currency: 'EUR':2}}</text>
                         <field>
                             <vn-input-number
+                                disabled="!price.hasMinPrice"
                                 class="dense"
                                 vn-focus
                                 ng-model="price.minPrice"
diff --git a/modules/item/front/fixed-price/locale/es.yml b/modules/item/front/fixed-price/locale/es.yml
index f52aef02cb..3f400336d9 100644
--- a/modules/item/front/fixed-price/locale/es.yml
+++ b/modules/item/front/fixed-price/locale/es.yml
@@ -2,4 +2,6 @@ Fixed prices: Precios fijados
 Search prices by item ID or code: Buscar por ID de artículo o código
 Search fixed prices: Buscar precios fijados
 Add fixed price: Añadir precio fijado
-This row will be removed: Esta linea se eliminará
\ No newline at end of file
+This row will be removed: Esta linea se eliminará
+Price By Unit: Precio Por Unidad
+Price By Package: Precio Por Paquete
\ No newline at end of file