From 5d65d3e20cfbe5f96e42978a17f9b9e7d4df2883 Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Mon, 7 Oct 2024 09:48:57 +0200 Subject: [PATCH 1/4] refs #6898 hotfix agency --- src/pages/Supplier/Card/SupplierAgencyTermCreate.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue index a87ea502b..515d157e5 100644 --- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue +++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue @@ -15,12 +15,12 @@ const route = useRoute(); const agenciesOptions = ref(null); const newAgencyTermForm = reactive({ agencyFk: null, - minimumM3: null, - packagePrice: null, - kmPrice: null, - m3Price: null, - routePrice: null, - minimumKm: null, + minimumM3: 0, + packagePrice: 0, + kmPrice: 0, + m3Price: 0, + routePrice: 0, + minimumKm: 0, supplierFk: route.params.id, }); From e396cd0cac48bf8bf5761d575758489e69a93102 Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Mon, 7 Oct 2024 12:16:32 +0200 Subject: [PATCH 2/4] hotfix: routePrice null --- src/pages/Supplier/Card/SupplierAgencyTermCreate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue index 515d157e5..038eaa356 100644 --- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue +++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue @@ -19,7 +19,7 @@ const newAgencyTermForm = reactive({ packagePrice: 0, kmPrice: 0, m3Price: 0, - routePrice: 0, + routePrice: null, minimumKm: 0, supplierFk: route.params.id, }); From 0ed9fdd55da1c3939848129bc0c7b72daa3660b8 Mon Sep 17 00:00:00 2001 From: Javier Segarra <jsegarra@verdnatura.es> Date: Mon, 7 Oct 2024 13:02:40 +0200 Subject: [PATCH 3/4] fix: refs VnImg zoom resolution missing property --- src/components/ui/CatalogItem.vue | 2 +- src/pages/Item/ItemList.vue | 3 +-- src/pages/Order/Card/OrderLines.vue | 6 +++++- src/pages/Ticket/Card/TicketSale.vue | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue index 545bfbbb4..7dca19770 100644 --- a/src/components/ui/CatalogItem.vue +++ b/src/components/ui/CatalogItem.vue @@ -31,7 +31,7 @@ const dialog = ref(null); <div class="container order-catalog-item overflow-hidden"> <QCard class="card shadow-6"> <div class="img-wrapper"> - <VnImg :id="item.id" class="image" /> + <VnImg :id="item.id" class="image" zoom-resolution="1600x900" /> <div v-if="item.hex && isCatalog" class="item-color-container"> <div class="item-color" diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue index e3fcceb3a..ae4c9531c 100644 --- a/src/pages/Item/ItemList.vue +++ b/src/pages/Item/ItemList.vue @@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false)); <QTd> <VnImg size="50x50" + zoom-resolution="1600x900" :id="row.id" - height="50px" - width="50px" class="image" /> </QTd> diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue index 17a157797..0223aa9c6 100644 --- a/src/pages/Order/Card/OrderLines.vue +++ b/src/pages/Order/Card/OrderLines.vue @@ -278,7 +278,11 @@ watch( > <template #column-image="{ row }"> <div class="image-wrapper"> - <VnImg :id="parseInt(row?.item?.image)" class="rounded" /> + <VnImg + :id="parseInt(row?.item?.image)" + class="rounded" + zoom-resolution="1600x900" + /> </div> </template> <template #column-id="{ row }"> diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index f86863f05..f179257f7 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -591,7 +591,7 @@ onUnmounted(() => (stateStore.rightDrawer = false)); <template #body-cell-picture="{ row }"> <QTd> <div class="image-wrapper"> - <VnImg :id="row.itemFk" class="rounded" /> + <VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" /> </div> </QTd> </template> From 56fff55f71bc97c59d1300144adcfee69f3241cf Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Tue, 8 Oct 2024 09:26:00 +0200 Subject: [PATCH 4/4] fix: unnecessary property --- src/pages/Item/Card/ItemTags.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue index 1b5eb28f0..6f31d0cf8 100644 --- a/src/pages/Item/Card/ItemTags.vue +++ b/src/pages/Item/Card/ItemTags.vue @@ -171,7 +171,6 @@ const insertTag = (rows) => { <QBtn @click="insertTag(rows)" class="cursor-pointer" - :disable="!validRow" color="primary" flat icon="add"