Merge branch 'master' into Hotfix-CreateRequest

2024-11-13 12:41:40 +00:00 · 2024-11-13 12:41:40 +00:00 · 75c33dabf1
parent 244c23be1d 8d296daf1e
commit 75c33dabf1
12 changed files with 121 additions and 59 deletions
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@ -38,7 +38,7 @@ const onDataSaved = (dataSaved) => {
        @on-fetch="(data) => (warehousesOptions = data)"
        auto-load
        url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
    />
    <FetchData
        @on-fetch="(data) => (temperaturesOptions = data)"
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import FetchData from 'components/FetchData.vue';
+import { getClientRisk } from '../composables/getClientRisk';

 import { toCurrency, toDate, toDateHourMin } from 'src/filters';
 import { useState } from 'composables/useState';
@ -16,7 +16,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnFilter from 'components/VnTable/VnFilter.vue';

 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
@ -25,7 +25,7 @@ const { openConfirmationModal } = useVnConfirm();
 const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
 const { hasAny } = useAcl();
-const currentBalance = ref({});
+
 const quasar = useQuasar();
 const route = useRoute();
 const state = useState();
@ -33,28 +33,53 @@ const stateStore = useStateStore();
 const user = state.getUser();

 const clientRisk = ref([]);
-const companies = ref([]);
 const tableRef = ref();
-const companyId = ref(user.value.companyFk);
+const companyId = ref();
+const companyUser = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
 const filter = computed(() => {
    return {
        clientId: route.params.id,
-        companyId: companyId.value ?? user.value.companyFk,
+        companyId: companyId.value ?? companyUser.value,
    };
 });

+const companyFilterColumn = {
+    align: 'left',
+    name: 'companyId',
+    label: t('Company'),
+    component: 'select',
+    attrs: {
+        url: 'Companies',
+        optionLabel: 'code',
+        optionValue: 'id',
+        sortBy: 'code',
+    },
+    columnFilter: {
+        event: {
+            remove: () => (companyId.value = null),
+            'update:modelValue': (newCompanyFk) => {
+                if (!newCompanyFk) return;
+                vnFilterRef.value.addFilter(newCompanyFk);
+                companyUser.value = newCompanyFk;
+            },
+            blur: () => !companyId.value && (companyId.value = companyUser.value),
+        },
+    },
+    visible: false,
+};
+
 const columns = computed(() => [
    {
-        align: 'right',
+        align: 'left',
        name: 'payed',
        label: t('Date'),
        format: ({ payed }) => toDate(payed),
        cardVisible: true,
    },
    {
-        align: 'right',
+        align: 'left',
        name: 'created',
        label: t('Creation date'),
        format: ({ created }) => toDateHourMin(created),
@ -65,7 +90,12 @@ const columns = computed(() => [
        label: t('Employee'),
        columnField: {
            component: 'userLink',
-            attrs: ({ row }) => ({ workerId: row.workerFk, name: row.userName }),
+            attrs: ({ row }) => {
+                return {
+                    workerId: row.workerFk,
+                    name: row.userName,
+                };
+            },
        },
        cardVisible: true,
    },
@ -77,13 +107,13 @@ const columns = computed(() => [
        class: 'extend',
    },
    {
-        align: 'right',
+        align: 'left',
        name: 'bankFk',
        label: t('Bank'),
        cardVisible: true,
    },
    {
-        align: 'right',
+        align: 'left',
        name: 'debit',
        label: t('Debit'),
        format: ({ debit }) => debit && toCurrency(debit),
@ -136,20 +166,37 @@ const columns = computed(() => [

 onBeforeMount(() => {
    stateStore.rightDrawer = true;
+    companyId.value = companyUser.value;
 });

-async function getCurrentBalance(data) {
-    currentBalance.value[companyId.value] = {
-        amount: 0,
-        code: companies.value.find((c) => c.id === companyId.value)?.code,
+async function getClientRisks() {
+    const filter = {
+        where: { clientFk: route.params.id, companyFk: companyUser.value },
    };
+    const { data } = await getClientRisk(filter);
+    clientRisk.value = data;
+    return clientRisk.value;
+}

-    for (const balance of data) {
-        currentBalance.value[balance.companyFk] = {
-            code: balance.company.code,
-            amount: balance.amount,
-        };
+async function getCurrentBalance() {
+    const currentBalance = (await getClientRisks()).find((balance) => {
+        return balance.companyFk === companyId.value;
+    });
+    return currentBalance && currentBalance.amount;
+}
+
+async function onFetch(data) {
+    balances.value = [];
+    for (const [index, balance] of data.entries()) {
+        if (index === 0) {
+            balance.balance = await getCurrentBalance();
+            continue;
        }
+        const previousBalance = data[index - 1];
+        balance.balance =
+            previousBalance?.balance - (previousBalance?.debit - previousBalance?.credit);
+    }
+    balances.value = data;
 }

 const showNewPaymentDialog = () => {
@ -169,43 +216,25 @@ const showBalancePdf = ({ id }) => {
 </script>

 <template>
-    <FetchData
-        url="Companies"
-        auto-load
-        @on-fetch="(data) => (companies = data)"
-    ></FetchData>
-    <FetchData
-        v-if="companies.length > 0"
-        url="clientRisks"
-        :filter="{
-            include: { relation: 'company', scope: { fields: ['code'] } },
-            where: { clientFk: route.params.id },
-        }"
-        auto-load
-        @on-fetch="getCurrentBalance"
-    ></FetchData>
-
    <VnSubToolbar class="q-mb-md">
        <template #st-data>
            <div class="column justify-center q-px-md q-py-sm">
                <span class="text-bold">{{ t('Total by company') }}</span>
-                <div class="row justify-center">
-                    {{ currentBalance[companyId]?.code }}:
-                    {{ toCurrency(currentBalance[companyId]?.amount) }}
+                <div class="row justify-center" v-if="clientRisk?.length">
+                    {{ clientRisk[0].company.code }}:
+                    {{ toCurrency(clientRisk[0].amount) }}
                </div>
            </div>
        </template>
        <template #st-actions>
            <div>
-                <VnSelect
-                    :label="t('Company')"
+                <VnFilter
                    ref="vnFilterRef"
                    v-model="companyId"
                    data-key="CustomerBalance"
-                    :options="companies"
-                    option-label="code"
-                    option-value="id"
-                ></VnSelect>
+                    :column="companyFilterColumn"
+                    search-url="balance"
+                />
            </div>
        </template>
    </VnSubToolbar>
@ -219,6 +248,7 @@ const showBalancePdf = ({ id }) => {
        :right-search="false"
        :is-editable="false"
        :column-search="false"
+        @on-fetch="onFetch"
        :disable-option="{ card: true }"
        auto-load
    >
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@ -28,7 +28,7 @@ const showSmsDialog = () => {
    quasar.dialog({
        component: VnSmsDialog,
        componentProps: {
-            phone: $props.customer.phone || $props.customer.mobile,
+            phone: $props.customer.mobile || $props.customer.phone,
            promise: sendSms,
        },
    });
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@ -184,6 +184,7 @@ const getItemPackagingType = (ticketSales) => {
        :disable-option="{ card: true, table: true }"
        class="full-width"
        :disable-infinite-scroll="true"
+        redirect="ticket"
    >
        <template #column-nickname="{ row }">
            <span class="link">
--- a/src/pages/Customer/composables/getClientRisk.js
+++ b/src/pages/Customer/composables/getClientRisk.js
@ -0,0 +1,12 @@
+import axios from 'axios';
+
+export async function getClientRisk(_filter) {
+    const filter = {
+        ..._filter,
+        include: { relation: 'company', scope: { fields: ['code'] } },
+    };
+
+    return await axios(`ClientRisks`, {
+        params: { filter: JSON.stringify(filter) },
+    });
+}
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@ -99,7 +99,7 @@ const travelDialogRef = ref(false);
 const tableRef = ref();
 const travel = ref(null);
 const userParams = ref({
-    dated: Date.vnNew(),
+    dated: Date.vnNew().toJSON(),
 });

 const filter = ref({
@ -219,6 +219,7 @@ function round(value) {
                data-key="StockBoughts"
                url="StockBoughts/getStockBought"
                save-url="StockBoughts/crud"
+                search-url="StockBoughts"
                order="reserve DESC"
                :right-search="false"
                :is-editable="true"
@ -281,6 +282,7 @@ function round(value) {
    display: flex;
    flex-direction: column;
    align-items: center;
+    min-width: 35%;
 }
 .text-negative {
    color: $negative !important;
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@ -18,7 +18,7 @@ const $props = defineProps({
        required: true,
    },
 });
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&dated=${$props.dated}`;
 const columns = [
    {
        align: 'left',
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@ -27,7 +27,7 @@ onMounted(async () => {
    <VnFilterPanel
        :data-key="props.dataKey"
        :search-button="true"
-        search-url="table"
+        search-url="StockBoughts"
        @set-user-params="setUserParams"
    >
        <template #tags="{ tag, formatFn }">
@ -36,12 +36,19 @@ onMounted(async () => {
                <span>{{ formatFn(tag.value) }}</span>
            </div>
        </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
            <QItem class="q-my-sm">
                <QItemSection>
                    <VnInputDate
                        id="date"
                        v-model="params.dated"
+                        @update:model-value="
+                            (value) => {
+                                params.dated = value;
+                                setUserParams(params);
+                                searchFn();
+                            }
+                        "
                        :label="t('Date')"
                        is-outlined
                    />
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@ -207,6 +207,7 @@ const onThermographCreated = async (data) => {
                        option-label="thermographFk"
                        :disable="viewAction === 'edit'"
                        :tooltip="t('New thermograph')"
+                        :roles-allowed-to-create="['logistic']"
                    >
                        <template #form>
                            <CreateThermographForm
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@ -96,7 +96,7 @@ watch(
                sort-by="code, townFk"
                option-value="geoFk"
                option-label="code"
-                :filter-options="['code', 'geoFk']"
+                :filter-options="['code']"
                hide-selected
                dense
                outlined
@ -105,11 +105,14 @@ watch(
                <template #option="{ itemProps, opt }">
                    <QItem v-bind="itemProps">
                        <QItemSection v-if="opt.code">
-                            <QItemLabel>{{ opt.code }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ opt.town?.province?.name }},
-                                {{ opt.town?.province?.country?.name }}</QItemLabel
-                            >
+                            <QItemLabel>
+                                {{ `${opt.code}, ${opt.town?.name}` }}
+                            </QItemLabel>
+                            <QItemLabel caption>
+                                {{
+                                    `${opt.town?.province?.name}, ${opt.town?.province?.country?.name}`
+                                }}
+                            </QItemLabel>
                        </QItemSection>
                    </QItem>
                </template>
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@ -22,7 +22,12 @@ const agencies = ref([]);
 </script>

 <template>
-    <FetchData url="agencies" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
    <VnFilterPanel
        :data-key="props.dataKey"
        :search-button="true"
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@ -73,6 +73,7 @@ const columns = computed(() => [
            inWhere: true,
            attrs: {
                url: 'AgencyModes',
+                fields: ['id', 'name'],
            },
        },
        columnField: {