From 1166a7966985973a52e204eb842d95ee5b465fc1 Mon Sep 17 00:00:00 2001 From: Kevin Martinez Date: Tue, 26 Dec 2023 15:59:52 -0400 Subject: [PATCH 1/9] Fix order descriptor total --- src/pages/Order/Card/OrderDescriptor.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue index 09c87f138..d9fa46471 100644 --- a/src/pages/Order/Card/OrderDescriptor.vue +++ b/src/pages/Order/Card/OrderDescriptor.vue @@ -10,6 +10,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v import CardDescriptor from 'components/ui/CardDescriptor.vue'; import VnLv from 'src/components/ui/VnLv.vue'; import OrderDescriptorMenu from "pages/Order/Card/OrderDescriptorMenu.vue"; +import FetchData from "components/FetchData.vue"; const $props = defineProps({ id: { @@ -60,9 +61,15 @@ const setData = (entity) => { data.value = useCardDescription(entity.client.name, entity.id); state.set('ClaimDescriptor', entity); }; +const total = ref(null); - diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue index 38ed8f9b0..316c9ae3f 100644 --- a/src/pages/Order/OrderLines.vue +++ b/src/pages/Order/OrderLines.vue @@ -75,7 +75,10 @@ async function confirmOrder() { />
- +
+ {{ t('globals.noResults') }} +
+

{{ t('summary') }}

@@ -159,7 +162,10 @@ async function confirmOrder() { :label="t('shipped')" :value="toDate(row.shipped)" /> - + en: diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue index 2c962600e..48d91574b 100644 --- a/src/pages/Order/OrderVolume.vue +++ b/src/pages/Order/OrderVolume.vue @@ -34,14 +34,17 @@ const loadVolumes = async (rows) => { />
- +
+ {{ t('globals.noResults') }} +
+

{{ t('summary') }}

- + { font-size: 20px; display: inline-block; } + +.no-result { + font-size: 24px; + font-weight: bold; + color: var(--vn-label); + text-align: center; +} en: From 677660f5ccae7d5b1192681a686e1aa78cc630bf Mon Sep 17 00:00:00 2001 From: carlosfonseca Date: Tue, 2 Jan 2024 06:54:15 -0500 Subject: [PATCH 5/9] Se hacen maquetado general de menu izquierdo en summary de clientes --- src/i18n/en/index.js | 15 +- src/i18n/es/index.js | 15 +- src/pages/Customer/Card/CustomerBalance.vue | 3 + .../Customer/Card/CustomerBillingData.vue | 3 + .../Customer/Card/CustomerConsignees.vue | 3 + .../Card/CustomerCreditManagement.vue | 3 + src/pages/Customer/Card/CustomerCredits.vue | 3 + .../Customer/Card/CustomerFiscalData.vue | 3 + src/pages/Customer/Card/CustomerGreuges.vue | 3 + src/pages/Customer/Card/CustomerLog.vue | 3 + src/pages/Customer/Card/CustomerNotes.vue | 3 + src/pages/Customer/Card/CustomerOthers.vue | 3 + .../Customer/Card/CustomerRecoveries.vue | 3 + src/pages/Customer/Card/CustomerSms.vue | 3 + src/pages/Customer/Card/CustomerWebAccess.vue | 3 + .../CustomerExtendedListFilter.vue | 5 - src/router/modules/customer.js | 143 +++++++++++++++++- 17 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 src/pages/Customer/Card/CustomerBalance.vue create mode 100644 src/pages/Customer/Card/CustomerBillingData.vue create mode 100644 src/pages/Customer/Card/CustomerConsignees.vue create mode 100644 src/pages/Customer/Card/CustomerCreditManagement.vue create mode 100644 src/pages/Customer/Card/CustomerCredits.vue create mode 100644 src/pages/Customer/Card/CustomerFiscalData.vue create mode 100644 src/pages/Customer/Card/CustomerGreuges.vue create mode 100644 src/pages/Customer/Card/CustomerLog.vue create mode 100644 src/pages/Customer/Card/CustomerNotes.vue create mode 100644 src/pages/Customer/Card/CustomerOthers.vue create mode 100644 src/pages/Customer/Card/CustomerRecoveries.vue create mode 100644 src/pages/Customer/Card/CustomerSms.vue create mode 100644 src/pages/Customer/Card/CustomerWebAccess.vue diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 65e8c4cf2..6904353da 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -116,7 +116,20 @@ export default { defaulter: 'Defaulter', createCustomer: 'Create customer', summary: 'Summary', - basicData: 'Basic Data', + basicData: 'Basic data', + fiscalData: 'Fiscal data', + billingData: 'Billing data', + consignees: 'Consignees', + notes: 'Notes', + credits: 'Credits', + greuges: 'Greuges', + balance: 'Balance', + recoveries: 'Recoveries', + webAccess: 'Web access', + log: 'Log', + sms: 'Sms', + creditManagement: 'Credit management', + others: 'Other', }, list: { phone: 'Phone', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index ed658c87c..59bf0027b 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -115,8 +115,21 @@ export default { notifications: 'Notificaciones', defaulter: 'Morosos', createCustomer: 'Crear cliente', - basicData: 'Datos básicos', summary: 'Resumen', + basicData: 'Datos básicos', + fiscalData: 'Datos fiscales', + billingData: 'Forma de pago', + consignees: 'Consignatarios', + notes: 'Notas', + credits: 'Créditos', + greuges: 'Greuges', + balance: 'Balance', + recoveries: 'Recobros', + webAccess: 'Acceso web', + log: 'Historial', + sms: 'Sms', + creditManagement: 'Gestión de crédito', + others: 'Otros', }, list: { phone: 'Teléfono', diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue new file mode 100644 index 000000000..9e44f67f5 --- /dev/null +++ b/src/pages/Customer/Card/CustomerBalance.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue new file mode 100644 index 000000000..c14f3b499 --- /dev/null +++ b/src/pages/Customer/Card/CustomerBillingData.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue new file mode 100644 index 000000000..bab2bd1ff --- /dev/null +++ b/src/pages/Customer/Card/CustomerConsignees.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerCreditManagement.vue b/src/pages/Customer/Card/CustomerCreditManagement.vue new file mode 100644 index 000000000..fe24ddfd0 --- /dev/null +++ b/src/pages/Customer/Card/CustomerCreditManagement.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue new file mode 100644 index 000000000..e8a4c3b48 --- /dev/null +++ b/src/pages/Customer/Card/CustomerCredits.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue new file mode 100644 index 000000000..ced6012b8 --- /dev/null +++ b/src/pages/Customer/Card/CustomerFiscalData.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue new file mode 100644 index 000000000..d322e04a5 --- /dev/null +++ b/src/pages/Customer/Card/CustomerGreuges.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue new file mode 100644 index 000000000..fe59bf2dc --- /dev/null +++ b/src/pages/Customer/Card/CustomerLog.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue new file mode 100644 index 000000000..65ade2903 --- /dev/null +++ b/src/pages/Customer/Card/CustomerNotes.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerOthers.vue b/src/pages/Customer/Card/CustomerOthers.vue new file mode 100644 index 000000000..bd4729cab --- /dev/null +++ b/src/pages/Customer/Card/CustomerOthers.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue new file mode 100644 index 000000000..54274717c --- /dev/null +++ b/src/pages/Customer/Card/CustomerRecoveries.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerSms.vue b/src/pages/Customer/Card/CustomerSms.vue new file mode 100644 index 000000000..fa4a34e30 --- /dev/null +++ b/src/pages/Customer/Card/CustomerSms.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue new file mode 100644 index 000000000..95ec77c3d --- /dev/null +++ b/src/pages/Customer/Card/CustomerWebAccess.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue index a4d26a78a..3a9cebc96 100644 --- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue +++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue @@ -565,12 +565,7 @@ const shouldRenderColumn = (colName) => { -<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue es: Identifier: Identificador -======= - -es: ->>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue Social name: Razón social diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js index 51511bcbf..a79ab8a6b 100644 --- a/src/router/modules/customer.js +++ b/src/router/modules/customer.js @@ -17,7 +17,22 @@ export default { 'CustomerNotifications', 'CustomerDefaulter', ], - card: ['CustomerBasicData'], + card: [ + 'CustomerBasicData', + 'CustomerFiscalData', + 'CustomerBillingData', + 'CustomerConsignees', + 'CustomerNotes', + 'CustomerCredits', + 'CustomerGreuges', + 'CustomerBalance', + 'CustomerRecoveries', + 'CustomerWebAccess', + 'CustomerLog', + 'CustomerSms', + 'CustomerCreditManagement', + 'CustomerOthers', + ], }, children: [ { @@ -115,6 +130,132 @@ export default { component: () => import('src/pages/Customer/Card/CustomerBasicData.vue'), }, + { + path: 'fiscal-data', + name: 'CustomerFiscalData', + meta: { + title: 'fiscalData', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerFiscalData.vue'), + }, + { + path: 'billing-data', + name: 'CustomerBillingData', + meta: { + title: 'billingData', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerBillingData.vue'), + }, + { + path: 'consignees', + name: 'CustomerConsignees', + meta: { + title: 'consignees', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerConsignees.vue'), + }, + { + path: 'notes', + name: 'CustomerNotes', + meta: { + title: 'notes', + icon: 'vn:settings', + }, + component: () => import('src/pages/Customer/Card/CustomerNotes.vue'), + }, + { + path: 'credits', + name: 'CustomerCredits', + meta: { + title: 'credits', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerCredits.vue'), + }, + { + path: 'greuges', + name: 'CustomerGreuges', + meta: { + title: 'greuges', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerGreuges.vue'), + }, + { + path: 'balance', + name: 'CustomerBalance', + meta: { + title: 'balance', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerBalance.vue'), + }, + { + path: 'recoveries', + name: 'CustomerRecoveries', + meta: { + title: 'recoveries', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerRecoveries.vue'), + }, + { + path: 'web-access', + name: 'CustomerWebAccess', + meta: { + title: 'webAccess', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerWebAccess.vue'), + }, + { + path: 'log', + name: 'CustomerLog', + meta: { + title: 'log', + icon: 'vn:settings', + }, + component: () => import('src/pages/Customer/Card/CustomerLog.vue'), + }, + { + path: 'sms', + name: 'CustomerSms', + meta: { + title: 'sms', + icon: 'vn:settings', + }, + component: () => import('src/pages/Customer/Card/CustomerSms.vue'), + }, + { + path: 'credit-management', + name: 'CustomerCreditManagement', + meta: { + title: 'creditManagement', + icon: 'vn:settings', + }, + component: () => + import('src/pages/Customer/Card/CustomerCreditManagement.vue'), + }, + { + path: 'others', + name: 'CustomerOthers', + meta: { + title: 'others', + icon: 'vn:settings', + }, + component: () => import('src/pages/Customer/Card/CustomerOthers.vue'), + }, ], }, ], From 24fdc1ff979e2d19a4eda38a2d155867a9fb7dd0 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Wed, 3 Jan 2024 10:56:13 -0300 Subject: [PATCH 6/9] wip --- src/components/common/TableVisibleColumns.vue | 47 +++++++++++++----- src/filters/dateRange.js | 8 +++ src/filters/index.js | 2 + .../CustomerExtendedListFilter.vue | 49 ++++++++++++++++++- src/pages/Travel/ExtraCommunityFilter.vue | 2 +- 5 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 src/filters/dateRange.js diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue index 94e3bfbc7..663a7bb93 100644 --- a/src/components/common/TableVisibleColumns.vue +++ b/src/components/common/TableVisibleColumns.vue @@ -43,17 +43,17 @@ const areAllChecksMarked = computed(() => { }); const setUserConfigViewData = (data) => { - initialUserConfigViewData.value = data; - if (data.length === 0) return; - formattedCols.value = $props.allColumns.map((col) => { - // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config - const obj = { - name: col, - active: data[0].configuration[col], - }; - return obj; - }); - emitSavedConfig(); + // initialUserConfigViewData.value = data; + // if (data.length === 0) return; + // formattedCols.value = $props.allColumns.map((col) => { + // // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config + // const obj = { + // name: col, + // active: data[0].configuration[col], + // }; + // return obj; + // }); + // emitSavedConfig(); }; const toggleMarkAll = (val) => { @@ -80,6 +80,22 @@ const saveConfig = async () => { console.error('Error saving user view config'); } }; + +const setDefaultViewConfig = (data) => { + initialUserConfigViewData.value = data; + if (data.length === 0) return; + formattedCols.value = $props.allColumns.map((col) => { + // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config + const obj = { + name: col, + active: data[0].columns[col], + }; + return obj; + }); + console.log('formattedCols:: ', formattedCols); + emitSavedConfig(); +}; + const emitSavedConfig = () => { const filteredCols = formattedCols.value.filter((col) => col.active); const mappedCols = filteredCols.map((col) => col.name); @@ -87,12 +103,19 @@ const emitSavedConfig = () => { };