From 778e6299cea5f2c1bdb32749fd39068ce8e07bd4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 08:57:04 +0200
Subject: [PATCH] fix: solve conflicts from test to dev

---
 src/components/VnTable/VnTable.vue            | 14 ++++-
 src/components/common/VnLocation.vue          |  2 +
 src/components/common/VnLog.vue               |  1 +
 src/pages/Customer/Card/CustomerBasicData.vue |  1 +
 .../Customer/Card/CustomerFiscalData.vue      |  1 +
 src/pages/Customer/Card/CustomerSummary.vue   |  1 +
 src/pages/Customer/CustomerList.vue           |  3 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  |  7 ---
 src/pages/Entry/EntryStockBoughtFilter.vue    | 63 -------------------
 .../Supplier/Card/SupplierAddressesCreate.vue |  1 +
 .../Supplier/Card/SupplierFiscalData.vue      |  1 +
 src/pages/Ticket/Card/TicketSummary.vue       | 34 ++++++----
 src/pages/Worker/WorkerList.vue               |  1 +
 src/router/modules/entry.js                   |  9 ---
 .../integration/entry/stockBought.spec.js     | 39 ------------
 15 files changed, 43 insertions(+), 135 deletions(-)
 delete mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue
 delete mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 861a79432..3bcd91b1f 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -317,8 +317,8 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>
@@ -771,6 +771,16 @@ es:
     color: var(--vn-text-color);
 }
 
+.q-table--dark .q-table__bottom,
+.q-table--dark thead,
+.q-table--dark tr {
+    border-color: var(--vn-section-color);
+}
+
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-color);
+}
+
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 633d32b85..ffbc7a656 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -37,9 +37,11 @@ const locationProperties = [
             : null,
     (obj) => obj.country?.name,
 ];
+
 const modelValue = ref(
     props.location ? formatLocation(props.location, locationProperties) : null
 );
+
 function showLabel(data) {
     const dataProperties = [
         'code',
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index ab522cfde..8c71c0997 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 79ae79ad9..d31669b43 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -18,6 +18,7 @@ const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => ({
     or: [
+        { id: val },
         { name: val },
         { nickname: { like: '%' + val + '%' } },
         { code: { like: `${val}%` } },
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 300d275c0..1f5775715 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,6 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index f049426e2..8b5f0f2c2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 5e24a1c2d..63f5149e8 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -429,10 +429,9 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                option-label="nickname"
-                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
+                :use-like="false"
                 emit-value
                 auto-load
             >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 11f6362f8..7b9cb67f7 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
deleted file mode 100644
index 7694cfe6c..000000000
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-const stateStore = useStateStore();
-const emit = defineEmits(['set-user-params']);
-const setUserParams = (params) => {
-    emit('set-user-params', params);
-};
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        search-url="table"
-        @set-user-params="setUserParams"
-    >
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInputDate
-                        id="date"
-                        v-model="params.dated"
-                        :label="t('Date')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-    en:
-        params:
-            dated: Date
-            workerFk: Worker
-    es:
-        Date: Fecha
-        params:
-            dated: Date
-            workerFk: Trabajador
-</i18n>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 290373039..0feceb74a 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -84,6 +84,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :location="
                             data.postalCode
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 553fc0f94..396cf15a2 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -146,6 +146,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="{
                         postcode: data.postCode,
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index b6a60122c..2ca0b5727 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,7 +1,7 @@
 <script setup>
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -12,6 +12,8 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@@ -19,8 +21,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -38,6 +39,8 @@ const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -64,15 +67,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 
 function getNoteValue(description) {
@@ -125,6 +132,7 @@ function toTicketUrl(section) {
         </template>
         <template #header-right>
             <QBtnDropdown
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
@@ -137,7 +145,7 @@ function toTicketUrl(section) {
                     option-value="code"
                     hide-dropdown-icon
                     focus-on-mount
-                    @update:model-value="changeState(item.code)"
+                    @update:model-value="changeState"
                 />
             </QBtnDropdown>
         </template>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4c9964c0b..6b3b117b6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -262,6 +262,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 76b4a6e23..d66ea0e0c 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -58,15 +58,6 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
-                {
-                    path: 'stock-bought',
-                    name: 'EntryStockBought',
-                    meta: {
-                        title: 'reserves',
-                        icon: 'deployed_code_history',
-                    },
-                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
-                },
             ],
         },
         {
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
deleted file mode 100644
index 66e06b79e..000000000
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('EntryStockBought', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('buyer');
-        cy.visit(`/#/entry/stock-Bought`);
-    });
-    it('Should edit the reserved space', () => {
-        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('input[name="reserve"]').type('10{enter}');
-        cy.get('button[title="Save"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-    });
-    it('Should add a new reserved space for buyerBoss', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="Reserve"]').type('1');
-        cy.get('input[aria-label="Date"]').eq(1).clear();
-        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-    });
-    it('Should check detail for the buyer', () => {
-        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
-    });
-    it('Should check detail for the buyerBoss and had no content', () => {
-        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
-            'have.text',
-            'warningNo data available'
-        );
-    });
-    it('Should edit travel m3 and refresh', () => {
-        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="m3"]').clear();
-        cy.get('input[aria-label="m3"]').type('60');
-        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
-        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
-    });
-});