From 7e3bfce7320beb2bdba80d8cefbd37c71aa5c4d5 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 30 Jul 2024 13:31:12 +0200
Subject: [PATCH] fix: refs #7717 fix basic data form & minor errors

---
 src/pages/Order/Card/OrderForm.vue   | 9 ++-------
 src/pages/Order/Card/OrderLines.vue  | 5 ++++-
 src/pages/Order/Card/OrderVolume.vue | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index f447950d2..91640101c 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
@@ -15,7 +15,6 @@ const route = useRoute();
 const state = useState();
 const ORDER_MODEL = 'order';
 
-const router = useRouter();
 const isNew = Boolean(!route.params.id);
 const clientList = ref([]);
 const agencyList = ref([]);
@@ -106,10 +105,6 @@ const onClientChange = async (clientId) => {
         console.error('Error al cambiar el cliente:', error);
     }
 };
-
-async function onDataSaved({ id }) {
-    await router.push({ path: `/order/${id}/catalog` });
-}
 </script>
 
 <template>
@@ -117,7 +112,7 @@ async function onDataSaved({ id }) {
     <div class="q-pa-md">
         <FormModel
             :url="`Orders/${route.params.id}`"
-            @on-data-saved="onDataSaved"
+            :url-update="`Orders/${route.params.id}/updateBasicData`"
             :model="ORDER_MODEL"
             :mapper="orderMapper"
             :filter="orderFilter"
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 391a4e374..9165cfd67 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -106,6 +106,7 @@ const columns = computed(() => [
             component: null,
         },
         format: (row) => row?.item?.name,
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -149,7 +150,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'amount',
         label: t('lines.amount'),
-        format: (row) => toCurrency(row.amount),
     },
     {
         align: 'right',
@@ -278,6 +278,9 @@ watch(
                     </div>
                     <FetchedTags :item="row?.item" :max-length="6" />
                 </template>
+                <template #column-amount="{ row }">
+                    {{ toCurrency(row.quantity * row.price) }}
+                </template>
             </VnTable>
         </div>
         <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed" style="z-index: 2">
diff --git a/src/pages/Order/Card/OrderVolume.vue b/src/pages/Order/Card/OrderVolume.vue
index 62aa08bc3..69f0a9c6b 100644
--- a/src/pages/Order/Card/OrderVolume.vue
+++ b/src/pages/Order/Card/OrderVolume.vue
@@ -166,7 +166,7 @@ es:
     total: Total
     boxes: Cajas
     item: Artículo
-    subName: Subname
+    subName: Subnombre
     quantity: Cantidad
     volume: m³ por cantidad
 </i18n>