From 56c461f085aecf4ba8f994871085a2f0fb3de890 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 21 Aug 2024 12:41:04 +0200
Subject: [PATCH] refactor: refs #7553 refs #7356 changed generatePdf name,
 fixed changeTime & added order in TicketVolume

---
 .../Ticket/Card/TicketDescriptorMenu.vue      | 19 ++++++++++++-------
 src/pages/Ticket/Card/TicketVolume.vue        |  1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index aec920002..3354da966 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -166,16 +166,16 @@ function openConfirmDialog(callback) {
     });
 }
 
-function createPdfDialog() {
+function generatePdfDialog() {
     dialog({
         component: VnConfirm,
         componentProps: {
-            promise: createPdfInvoice,
+            promise: generatePdfInvoice,
         },
     });
 }
 
-async function createPdfInvoice() {
+async function generatePdfInvoice() {
     const { data } = await axios.get('invoiceOuts', {
         params: {
             filter: JSON.stringify({
@@ -478,7 +478,12 @@ async function handleInvoiceOutData() {
         </QItemSection>
         <QItemSection>{{ t('Show Proforma') }}</QItemSection>
     </QItem>
-    <QItem @click="showChangeTimeDialog = !showChangeTimeDialog" v-ripple clickable>
+    <QItem
+        v-if="isEditable"
+        @click="showChangeTimeDialog = !showChangeTimeDialog"
+        v-ripple
+        clickable
+    >
         <QItemSection avatar>
             <QIcon name="schedule" />
         </QItemSection>
@@ -487,7 +492,7 @@ async function handleInvoiceOutData() {
     <QDialog ref="dialogRef" v-model="showChangeTimeDialog">
         <FormPopup @on-submit="changeShippedHour(time)" :title="t('Change shipped hour')">
             <template #form-inputs>
-                <!--TODO: pone el año a 1970, corregir-->
+                <!--TODO: pone el año a 1970, esperar corrección componente VnInputTime-->
                 <VnInputTime v-model="time" :label="t('Shipped hour')" clearable />
             </template>
         </FormPopup>
@@ -526,7 +531,7 @@ async function handleInvoiceOutData() {
     </QItem>
     <!--TODO: acabar esta parte, falta el campo hasInvoicing-->
     <QItem
-        @click="createPdfDialog()"
+        @click="generatePdfDialog()"
         v-ripple
         clickable
         v-if="ticket.refFk !== null && (ticket.hasInvoicing || hasPdf)"
@@ -544,7 +549,7 @@ async function handleInvoiceOutData() {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
-    <QItem @click="openRecalculateDialog()" v-ripple clickable>
+    <QItem v-if="isEditable" @click="openRecalculateDialog()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="refresh" />
         </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index e6db759d0..61f9b83d9 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -130,6 +130,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :columns="columns"
         :right-search="false"
         :column-search="false"
+        :order="['itemPackingTypeFk']"
         auto-load
     >
         <template #column-itemFk="{ row }">