Merge branch 'master' into Hotfix-SalesMana

2024-11-15 13:31:53 +00:00 · 2024-11-15 13:31:53 +00:00 · 1dc2f54f61
parent 141cb32cae b8293d91e8
commit 1dc2f54f61
8 changed files with 103 additions and 82 deletions
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@ -37,6 +37,9 @@ const entityId = computed(() => {

 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
+const debtWarning = computed(() => {
+    return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
+});
 </script>

 <template>
@ -111,7 +114,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                    v-if="customer.debt > customer.credit"
                    name="vn:risk"
                    size="xs"
-                    color="primary"
+                    :color="debtWarning"
                >
                    <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                </QIcon>
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@ -8,9 +8,6 @@ import { useQuasar } from 'quasar';
 import useNotify from 'src/composables/useNotify';

 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
-import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
-import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
-import { ref } from 'vue';

 const $props = defineProps({
    customer: {
@ -44,13 +41,38 @@ const sendSms = async (payload) => {
    }
 };

-const ticketCreateFormDialog = ref(null);
 const openTicketCreateForm = () => {
-    ticketCreateFormDialog.value.show();
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            clientId: $props.customer.id,
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    openWindow('ticket', query);
 };
-const orderCreateFormDialog = ref(null);
 const openOrderCreateForm = () => {
-    orderCreateFormDialog.value.show();
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            clientFk: $props.customer.id,
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    openWindow('order', query);
+};
+
+const openWindow = (type, { createForm, table }) => {
+    window.open(
+        `/#/${type}/list?createForm=${JSON.stringify(createForm)}&table=${JSON.stringify(
+            table
+        )}`,
+        '_blank'
+    );
 };
 </script>

@ -58,17 +80,11 @@ const openOrderCreateForm = () => {
    <QItem v-ripple clickable @click="openTicketCreateForm()">
        <QItemSection>
            {{ t('globals.pageTitles.createTicket') }}
-            <QDialog ref="ticketCreateFormDialog">
-                <TicketCreateDialog />
-            </QDialog>
        </QItemSection>
    </QItem>
    <QItem v-ripple clickable @click="openOrderCreateForm()">
        <QItemSection>
            {{ t('globals.pageTitles.createOrder') }}
-            <QDialog ref="orderCreateFormDialog">
-                <OrderCreateDialog :client-fk="customer.id" />
-            </QDialog>
        </QItemSection>
    </QItem>
    <QItem v-ripple clickable>
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@ -68,7 +68,6 @@ const columns = computed(() => [
            fields: ['id', 'name'],
            where: { role: 'salesPerson' },
            optionFilter: 'firstName',
-            useLike: false,
        },
        create: false,
        columnField: {
@ -429,9 +428,10 @@ function handleLocation(data, location) {
                :params="{
                    departmentCodes: ['VT', 'shopping'],
                }"
-                :fields="['id', 'nickname']"
+                :fields="['id', 'nickname', 'code']"
                sort-by="nickname ASC"
-                :use-like="false"
+                option-label="nickname"
+                option-value="id"
                emit-value
                auto-load
            >
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@ -23,6 +23,7 @@ const incoterms = ref([]);
 const customsAgents = ref([]);
 const observationTypes = ref([]);
 const notes = ref([]);
+let originalNotes = [];
 const deletes = ref([]);

 onBeforeMount(() => {
@ -42,7 +43,8 @@ const getData = async (observations) => {
        });

        if (data.length) {
-            notes.value = data
+            originalNotes = data;
+            notes.value = originalNotes
                .map((observation) => {
                    const type = observationTypes.value.find(
                        (type) => type.id === observation.observationTypeFk
@ -81,14 +83,24 @@ const deleteNote = (id, index) => {
 };

 const onDataSaved = async () => {
-    let payload = {};
-    const creates = notes.value.filter((note) => note.$isNew);
-    if (creates.length) {
-        payload.creates = creates;
-    }
-    if (deletes.value.length) {
-        payload.deletes = deletes.value;
-    }
+    let payload = {
+        creates: notes.value.filter((note) => note.$isNew),
+        deletes: deletes.value,
+        updates: notes.value
+            .filter((note) =>
+                originalNotes.some(
+                    (oNote) =>
+                        oNote.id === note.id &&
+                        (note.description !== oNote.description ||
+                            note.observationTypeFk !== oNote.observationTypeFk)
+                )
+            )
+            .map((note) => ({
+                data: note,
+                where: { id: note.id },
+            })),
+    };
+
    await axios.post('AddressObservations/crud', payload);
    notes.value = [];
    deletes.value = [];
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@ -17,21 +17,6 @@ const props = defineProps({
 });

 const itemTypeWorkersOptions = ref([]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return { 'i.name': { like: `%${value}%` } };
-        case 'itemFk':
-        case 'warehouseFk':
-        case 'rate2':
-        case 'rate3':
-            param = `fp.${param}`;
-            return { [param]: value };
-        case 'minPrice':
-            param = `i.${param}`;
-            return { [param]: value };
-    }
-};
 </script>

 <template>
@ -66,7 +51,7 @@ const exprBuilder = (param, value) => {
                        url="Warehouses"
                        auto-load
                        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-                        :label="t('components.itemsFilterPanel.warehouseFk')"
+                        :label="t('globals.warehouse')"
                        v-model="params.warehouseFk"
                        option-label="name"
                        option-value="id"
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@ -14,7 +14,6 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-import { onMounted } from 'vue';
 import { useRoute } from 'vue-router';

 const { t } = useI18n();
@ -142,8 +141,13 @@ const columns = computed(() => [
        ],
    },
 ]);
-
-async function fetchClientAddress(id, formData) {
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk);
+});
+async function fetchClientAddress(id, formData = {}) {
    const { data } = await axios.get(`Clients/${id}`, {
        params: { filter: { include: { relation: 'addresses' } } },
    });
@ -170,13 +174,6 @@ const getDateColor = (date) => {
    if (comparation == 0) return 'bg-warning';
    if (comparation < 0) return 'bg-success';
 };
-
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk, id);
-});
 </script>
 <template>
    <OrderSearchbar />
@ -194,7 +191,7 @@ onMounted(() => {
            urlCreate: 'Orders/new',
            title: t('module.cerateOrder'),
            onDataSaved: (url) => {
-                tableRef.redirect(url);
+               tableRef.redirect(`${url}/catalog`);
            },
            formInitialData: {
                active: true,
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@ -19,7 +19,6 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';

 const route = useRoute();
@ -87,10 +86,6 @@ async function changeState(value) {
 function toTicketUrl(section) {
    return '#/ticket/' + entityId.value + '/' + section;
 }
-function isOnTicketCard() {
-    const currentPath = route.path;
-    return currentPath.startsWith('/ticket');
-}
 </script>

 <template>
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@ -24,6 +24,8 @@ import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';

 const route = useRoute();
+const router = useRouter();
+
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@ -40,16 +42,18 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-
 const userParams = {
    from: null,
    to: null,
 };
-// Método para inicializar las variables desde la query string
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+    if (!route.query.createForm) return;
+    onClientSelected(JSON.parse(route.query.createForm));
+});
 const initializeFromQuery = () => {
    const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
    from.value = query.from || from.toISOString();
    to.value = query.to || to.toISOString();
    Object.assign(userParams, { from, to });
@ -206,13 +210,19 @@ const columns = computed(() => [
            {
                title: t('ticketList.summary'),
                icon: 'preview',
-                isPrimary: true,
-                action: (row) => viewSummary(row.id, TicketSummary),
+                action: (row, evt) => {
+                    if (evt && evt.ctrlKey) {
+                        const url = router.resolve({
+                            params: { id: row.id },
+                            name: 'TicketCard',
+                        }).href;
+                        window.open(url, '_blank');
+                    } else viewSummary(row.id, TicketSummary);
+                },
            },
        ],
    },
 ]);
-
 function redirectToLines(id) {
    const url = `#/ticket/${id}/sale`;
    window.open(url, '_blank');
@ -302,11 +312,6 @@ const getDateColor = (date) => {
    if (comparation < 0) return 'bg-success';
 };

-onMounted(() => {
-    initializeFromQuery();
-    stateStore.rightDrawer = true;
-});
-
 async function makeInvoice(ticket) {
    const ticketsIds = ticket.map((item) => item.id);
    const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });
@ -472,7 +477,7 @@ function setReference(data) {
            urlCreate: 'Tickets/new',
            title: t('ticketList.createTicket'),
            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
+            formInitialData: { clientId: null },
        }"
        default-mode="table"
        :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
@ -574,17 +579,17 @@ function setReference(data) {
            </span>
        </template>
        <template #column-stateFk="{ row }">
-            <span v-if="getColor(row)">
-                <QChip :class="getColor(row)" dense square>
-                    {{ row.state }}
-                </QChip>
-            </span>
-            <span v-else-if="row.state === 'Entregado'">
+            <span v-if="row.refFk">
                <span class="link" @click.stop>
                    {{ row.refFk }}
                    <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
                </span>
            </span>
+            <span v-else-if="getColor(row)">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
+            </span>
            <span v-else>
                {{ row.state }}
            </span>
@ -616,6 +621,7 @@ function setReference(data) {
                    option-value="id"
                    option-label="name"
                    hide-selected
+                    required
                    @update:model-value="(client) => onClientSelected(data)"
                    :sort-by="'id ASC'"
                >
@ -635,7 +641,7 @@ function setReference(data) {
            </VnRow>
            <VnRow>
                <VnSelect
-                    url="Addresses"
+                    required
                    :label="t('ticket.create.address')"
                    v-model="data.addressId"
                    :options="addressesOptions"
@ -680,6 +686,7 @@ function setReference(data) {
                        option-value="id"
                        option-label="name"
                        hide-selected
+                        required
                        @update:model-value="() => fetchAvailableAgencies(data)"
                    />
                </div>
@ -693,7 +700,6 @@ function setReference(data) {
                        option-value="agencyModeFk"
                        option-label="agencyMode"
                        hide-selected
-                        :disable="!data.clientId || !data.landed || !data.warehouseId"
                    />
                </div>
            </VnRow>
@ -829,7 +835,14 @@ function setReference(data) {
        </QTooltip>
    </QPageSticky>
 </template>
-
+<style scoped>
+.disabled,
+.disabled *,
+[disabled],
+[disabled] * {
+    cursor: pointer !important;
+}
+</style>
 <i18n>
 es:
    Search ticket: Buscar ticket