From 231f67df5c90ccfea1cffade85a9832dcef5fc24 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 19:54:12 +0100
Subject: [PATCH] feat: refs #6321 style updates

---
 src/pages/Item/locale/en.yml                  |  1 +
 src/pages/Ticket/Card/TicketTransfer.vue      | 12 ++++++++-
 .../Ticket/Negative/TicketLackDetail.vue      | 11 +++-----
 src/pages/Ticket/Negative/TicketLackTable.vue | 27 ++++++++++---------
 src/pages/Ticket/locale/en.yml                |  2 +-
 src/pages/Ticket/locale/es.yml                |  2 +-
 6 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index 60f965698a..9345b4c65f 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -223,6 +223,7 @@ item:
     search: 'Search item'
     searchInfo: 'You can search by id'
     regularizeStock: Regularize stock
+itemProposal: Items proposal
 proposal:
     difference: Difference
     title: Items proposal
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index ec5a3743a5..5e2e569ca3 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -6,6 +6,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const $props = defineProps({
     mana: {
@@ -24,6 +25,10 @@ const $props = defineProps({
         type: Object,
         default: () => {},
     },
+    split: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 onMounted(() => (_transfer.value = $props.transfer));
@@ -31,7 +36,7 @@ const { t } = useI18n();
 const QPopupProxyRef = ref(null);
 const transferFormRef = ref(null);
 const _transfer = ref();
-
+const splitDate = ref(Date.vnNew());
 const transferLinesColumns = computed(() => [
     {
         label: t('ticketList.id'),
@@ -91,6 +96,11 @@ const handleRowClick = (row) => {
 
 <template>
     <QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
+        <div class="flex row items-center q-ma-lg" v-if="$props.split">
+            <QBtn class="q-mr-sm" color="primary" label="Split"></QBtn>
+            <VnInputDate :label="$t('New date')" v-model="splitDate"></VnInputDate>
+        </div>
+        <QSeparator class="q-my-lg" color="primary" />
         <QCard class="full-width q-px-md" style="display: flex; width: 80vw">
             <QTable
                 :rows="transfer.sales"
diff --git a/src/pages/Ticket/Negative/TicketLackDetail.vue b/src/pages/Ticket/Negative/TicketLackDetail.vue
index 94ffe233b5..3613383174 100644
--- a/src/pages/Ticket/Negative/TicketLackDetail.vue
+++ b/src/pages/Ticket/Negative/TicketLackDetail.vue
@@ -182,15 +182,12 @@ const filterTable = { stateFk: 0, warehouseFk: useState().getUser().value.wareho
                     data-cy="transferLines"
                     color="primary"
                     icon="vn:splitline"
-                    :disable="selectedRows.length < 1 || someBasket"
+                    :disable="selectedRows.length < 1"
                 >
-                    <QTooltip v-if="someBasket"
-                        >{{ t('Some row selected is basket') }} {{ someBasket }}</QTooltip
-                    >
-                    <QTooltip v-else
-                        >{{ t('ticketSale.transferLines') }} {{ someBasket }}</QTooltip
-                    >
+                    <QTooltip>{{ t('ticketSale.transferLines') }} </QTooltip>
                     <TicketTransfer
+                        ref="transferFormRef"
+                        split="true"
                         class="full-width"
                         :transfer="{
                             sales: selectedRows,
diff --git a/src/pages/Ticket/Negative/TicketLackTable.vue b/src/pages/Ticket/Negative/TicketLackTable.vue
index 2747313079..b59f0fde1b 100644
--- a/src/pages/Ticket/Negative/TicketLackTable.vue
+++ b/src/pages/Ticket/Negative/TicketLackTable.vue
@@ -77,9 +77,10 @@ const saveChange = async (field, { rowIndex, row }) => {
 };
 const entityId = computed(() => route.params.id);
 const item = ref({});
+const hasToIgnore = (row) => row.hasToIgnore === 1;
 const rowColor = (row) => {
-    if (row.hasToIgnore) return 'negative';
-    return 'transparent';
+    if (hasToIgnore(row)) return 'transparent';
+    return 'negative';
 };
 // const textRowColor = (row) => {
 //     if (row.hasToIgnore) return 'black';
@@ -151,11 +152,11 @@ const columns = computed(() => [
         },
     },
     {
-        name: 'theoreticalhour',
+        name: 'minTimed',
         label: t('negative.detail.theoreticalhour'),
-        field: 'theoreticalhour',
+        field: 'minTimed',
         align: 'left',
-        format: ({ theoreticalhour }) => toHour(theoreticalhour),
+        format: ({ minTimed }) => toHour(minTimed),
         sortable: true,
         component: 'time',
         columnClass: 'shrink',
@@ -214,10 +215,6 @@ function onBuysFetched(data) {
 </script>
 
 <template>
-    <pre>
-            {{ $props.filter }}
-             </pre
-    >
     <FetchData
         :url="`Items/${entityId}/getCard`"
         :fields="['longName']"
@@ -320,11 +317,15 @@ function onBuysFetched(data) {
         </template>
 
         <template #column-ticketFk="{ row }">
-            <QBadge class="q-pa-sm" :color="rowColor(row)">
-                {{ row.ticketFk }}
+            <QBadge
+                class="q-pa-sm"
+                :class="{ link: hasToIgnore(row) }"
+                :color="rowColor(row)"
+            >
+                {{ row.id }}
+                <TicketDescriptorProxy :id="row.id" />
             </QBadge>
-            <TicketDescriptorProxy :id="row.ticketFk"
-        /></template>
+        </template>
         <template #column-alertLevelCode="props">
             <VnSelect
                 url="States/editableStates"
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index b71af89891..69a844155b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -23,7 +23,7 @@ ticketSale:
     hasComponentLack: Component lack
     ok: Ok
     more: More
-    transferLines: Transfer lines
+    transferLines: Transfer lines(no basket)/ Split
     transferBasket: Some row selected is basket
 advanceTickets:
     preparation: Preparation
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 57156289eb..a111063d57 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -127,7 +127,7 @@ ticketSale:
     ok: Ok
     more: Más
     address: Consignatario
-    transferLines: Transferir líneas
+    transferLines: Transferir líneas(no cesta)/ Separar
     transferBasket: No disponible para una cesta
     size: Medida
 ticketComponents: