From 7358dab1d00632aa6bc6ff86d16e5a4d60f8f84e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:16:01 +0200
Subject: [PATCH 1/5] fix: call upsert when crudModel haschanges

---
 src/components/VnTable/VnTable.vue | 1 +
 src/pages/Item/ItemFixedPrice.vue  | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6745a2f49..899e4d000 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -296,6 +296,7 @@ defineExpose({
     reload,
     redirect: redirectFn,
     selected,
+    CrudModelRef,
 });
 
 function handleOnDataSaved(_, res) {
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 59a3e74db..16091d473 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -262,10 +262,13 @@ const updateMinPrice = async (value, props) => {
     });
 };
 
-const upsertPrice = async ({ row }, resetMinPrice = false) => {
+const upsertPrice = async (props, resetMinPrice = false) => {
     try {
-        if (resetMinPrice) row.hasMinPrice = 0;
-        row = await upsertFixedPrice(row);
+        const { row } = props;
+        if (tableRef.value.CrudModelRef.getChanges().updates.length > 0) {
+            if (resetMinPrice) row.hasMinPrice = 0;
+            await upsertFixedPrice(row);
+        }
     } catch (err) {
         console.error('Error editing price', err);
     }
-- 
2.40.1


From 9c86fd0ed50a6bc1821d2ab622cc08965bda7149 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:17:13 +0200
Subject: [PATCH 2/5] perf: order by

---
 src/pages/Item/ItemFixedPrice.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 16091d473..4f78bd6ce 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -462,7 +462,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['name ASC', 'itemFk DESC']"
+            :order="['itemFk ASC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
-- 
2.40.1


From 41939315be61ef17a5108ff61410d4b11b124239 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:17:39 +0200
Subject: [PATCH 3/5] style: show subName value

---
 src/pages/Item/ItemFixedPrice.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 4f78bd6ce..a195bc615 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -519,16 +519,12 @@ function handleOnDataSave({ CrudModelRef }) {
                 </QTd>
             </template>
             <template #column-description="{ row }">
-                <QTd class="col">
-                    <span class="link">
-                        {{ row.name }}
-                    </span>
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                    <FetchedTags
-                        style="width: max-content; max-width: 220px"
-                        :item="row"
-                    />
-                </QTd>
+                <span class="link">
+                    {{ row.name }}
+                </span>
+                <span class="subName">{{ row.subName }}</span>
+                <ItemDescriptorProxy :id="row.itemFk" />
+                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
             </template>
             <template #column-rate2="props">
                 <QTd class="col">
@@ -682,6 +678,12 @@ tbody tr.highlight .q-td {
         background-color: transparent;
     }
 }
+.subName {
+    margin-left: 5%;
+    font-size: 0.75rem;
+    text-transform: uppercase;
+    color: var(--vn-label-color);
+}
 </style>
 <i18n>
 es:
-- 
2.40.1


From b4b65ad0fd2c21a1a846d5fc9d68bf6926fd0a71 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:17:59 +0200
Subject: [PATCH 4/5] fix: minor error whit dates

---
 src/pages/Item/ItemFixedPrice.vue | 32 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index a195bc615..1d7a30dee 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -570,26 +570,22 @@ function handleOnDataSave({ CrudModelRef }) {
                 </QTd>
             </template>
             <template #column-started="props">
-                <QTd class="col">
-                    <VnInputDate
-                        class="vnInputDate"
-                        :show-event="true"
-                        v-model="props.row.started"
-                        v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="dateStyle(isBigger(props.row.started))"
-                    />
-                </QTd>
+                <VnInputDate
+                    class="vnInputDate"
+                    :show-event="true"
+                    v-model="props.row.started"
+                    v-on="getRowUpdateInputEvents(props, false, 'date')"
+                    v-bind="dateStyle(isBigger(props.row.started))"
+                />
             </template>
             <template #column-ended="props">
-                <QTd class="col">
-                    <VnInputDate
-                        class="vnInputDate"
-                        :show-event="true"
-                        v-model="props.row.ended"
-                        v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="dateStyle(isLower(props.row.started))"
-                    />
-                </QTd>
+                <VnInputDate
+                    class="vnInputDate"
+                    :show-event="true"
+                    v-model="props.row.ended"
+                    v-on="getRowUpdateInputEvents(props, false, 'date')"
+                    v-bind="dateStyle(isLower(props.row.ended))"
+                />
             </template>
             <template #column-warehouseFk="props">
                 <QTd class="col">
-- 
2.40.1


From d734674eb6c47c6e9af6a2954c69880a2a7293df Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:18:09 +0200
Subject: [PATCH 5/5] fix: minor changes

---
 src/pages/Item/ItemFixedPrice.vue | 149 ++++++++++++++----------------
 1 file changed, 67 insertions(+), 82 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 1d7a30dee..d91b5189e 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -212,15 +212,6 @@ const editTableFieldsOptions = [
             type: 'number',
         },
     },
-    {
-        field: 'hasMinPrice',
-        label: t('item.fixedPrice.hasMinPrice'),
-        component: 'checkbox',
-        attrs: {
-            'false-value': 0,
-            'true-value': 1,
-        },
-    },
     {
         field: 'started',
         label: t('item.fixedPrice.started'),
@@ -286,8 +277,7 @@ async function upsertFixedPrice(row) {
 async function saveOnRowChange(row) {
     if (rowsSelected.value.length > 1) return;
     if (rowsSelected.value[0]?.id === row.id) return;
-    else if (rowsSelected.value.length === 1)
-        await upsertFixedPrice(rowsSelected.value[0]);
+    else if (rowsSelected.value.length === 1) await upsertPrice(rowsSelected.value[0]);
     rowsSelected.value = [row];
 }
 
@@ -457,6 +447,12 @@ function handleOnDataSave({ CrudModelRef }) {
     </VnSubToolbar>
     <QPage>
         <VnTable
+            @on-fetch="
+                (data) =>
+                    data.forEach((item) => {
+                        item.hasMinPrice = `${item.hasMinPrice !== 0}`;
+                    })
+            "
             :default-remove="false"
             :default-reset="false"
             :default-save="false"
@@ -497,26 +493,24 @@ function handleOnDataSave({ CrudModelRef }) {
             </template>
 
             <template #column-itemId="props">
-                <QTd>
-                    <VnSelect
-                        style="max-width: 100px"
-                        url="Items/withName"
-                        hide-selected
-                        option-label="id"
-                        option-value="id"
-                        v-model="props.row.itemFk"
-                        v-on="getRowUpdateInputEvents(props, true, 'select')"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                    <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QTd>
+                <VnSelect
+                    style="max-width: 100px"
+                    url="Items/withName"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="props.row.itemFk"
+                    v-on="getRowUpdateInputEvents(props, true, 'select')"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </template>
             <template #column-description="{ row }">
                 <span class="link">
@@ -527,26 +521,22 @@ function handleOnDataSave({ CrudModelRef }) {
                 <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
             </template>
             <template #column-rate2="props">
-                <QTd class="col">
-                    <VnInput
-                        mask="###.##"
-                        v-model.number="props.row.rate2"
-                        v-on="getRowUpdateInputEvents(props)"
-                    >
-                        <template #append>€</template>
-                    </VnInput>
-                </QTd>
+                <VnInput
+                    mask="###.##"
+                    v-model.number="props.row.rate2"
+                    v-on="getRowUpdateInputEvents(props)"
+                >
+                    <template #append>€</template>
+                </VnInput>
             </template>
             <template #column-rate3="props">
-                <QTd class="col">
-                    <VnInput
-                        mask="###.##"
-                        v-model.number="props.row.rate3"
-                        v-on="getRowUpdateInputEvents(props)"
-                    >
-                        <template #append>€</template>
-                    </VnInput>
-                </QTd>
+                <VnInput
+                    mask="###.##"
+                    v-model.number="props.row.rate3"
+                    v-on="getRowUpdateInputEvents(props)"
+                >
+                    <template #append>€</template>
+                </VnInput>
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
@@ -554,12 +544,11 @@ function handleOnDataSave({ CrudModelRef }) {
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
-                            :false-value="0"
-                            :true-value="1"
+                            :false-value="'false'"
+                            :true-value="'true'"
                         />
                         <VnInput
                             class="col"
-                            mask="###.##"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
@@ -588,38 +577,34 @@ function handleOnDataSave({ CrudModelRef }) {
                 />
             </template>
             <template #column-warehouseFk="props">
-                <QTd class="col">
-                    <VnSelect
-                        style="max-width: 150px"
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="props.row.warehouseFk"
-                        v-on="getRowUpdateInputEvents(props, false, 'select')"
-                    />
-                </QTd>
+                <VnSelect
+                    style="max-width: 150px"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="props.row.warehouseFk"
+                    v-on="getRowUpdateInputEvents(props, false, 'select')"
+                />
             </template>
             <template #column-deleteAction="{ row, rowIndex }">
-                <QTd class="col">
-                    <QIcon
-                        name="delete"
-                        size="sm"
-                        class="cursor-pointer fill-icon-on-hover"
-                        color="primary"
-                        @click.stop="
-                            openConfirmationModal(
-                                t('globals.rowWillBeRemoved'),
-                                t('Do you want to clone this item?'),
-                                () => removePrice(row.id, rowIndex)
-                            )
-                        "
-                    >
-                        <QTooltip class="text-no-wrap">
-                            {{ t('globals.delete') }}
-                        </QTooltip>
-                    </QIcon>
-                </QTd>
+                <QIcon
+                    name="delete"
+                    size="sm"
+                    class="cursor-pointer fill-icon-on-hover"
+                    color="primary"
+                    @click.stop="
+                        openConfirmationModal(
+                            t('globals.rowWillBeRemoved'),
+                            t('Do you want to clone this item?'),
+                            () => removePrice(row.id, rowIndex)
+                        )
+                    "
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('globals.delete') }}
+                    </QTooltip>
+                </QIcon>
             </template>
         </VnTable>
 
-- 
2.40.1