From c84786e0534bf1b4172ee6f67cbc98a94b982f0d Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Mon, 26 Aug 2024 11:41:35 +0200 Subject: [PATCH 01/11] refs #7355 fix accountPrivileges --- src/pages/Account/Card/AccountPrivileges.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue index 1300f5018..04ae702ad 100644 --- a/src/pages/Account/Card/AccountPrivileges.vue +++ b/src/pages/Account/Card/AccountPrivileges.vue @@ -1,5 +1,5 @@ <script setup> -import { ref } from 'vue'; +import { ref, watch } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; @@ -9,21 +9,28 @@ import VnSelect from 'src/components/common/VnSelect.vue'; const { t } = useI18n(); const route = useRoute(); +const loading = ref(false); const rolesOptions = ref([]); const formModelRef = ref(); +watch( + () => route.params.id, + () => formModelRef.value.reset() +); </script> <template> <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" /> + + <QSpinner v-if="loading" color="primary" size="md" /> <FormModel ref="formModelRef" model="AccountPrivileges" - :url="`VnUsers/${route.params.id}/privileges`" - :url-create="`VnUsers/${route.params.id}/privileges`" + url="VnUsers/preview" auto-load @on-data-saved="formModelRef.fetch()" > <template #form="{ data }"> + {{ data }} <div class="q-gutter-y-sm"> <QCheckbox v-model="data.hasGrant" From 8568d36ee579189fac38bec19ce5673e03341853 Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Mon, 26 Aug 2024 12:40:01 +0200 Subject: [PATCH 02/11] refs #7355 fix privileges --- src/pages/Account/Card/AccountPrivileges.vue | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue index 04ae702ad..ac2ce4007 100644 --- a/src/pages/Account/Card/AccountPrivileges.vue +++ b/src/pages/Account/Card/AccountPrivileges.vue @@ -9,7 +9,6 @@ import VnSelect from 'src/components/common/VnSelect.vue'; const { t } = useI18n(); const route = useRoute(); -const loading = ref(false); const rolesOptions = ref([]); const formModelRef = ref(); @@ -17,18 +16,11 @@ watch( () => route.params.id, () => formModelRef.value.reset() ); +console.log('formModelRef', formModelRef.value); </script> <template> <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" /> - - <QSpinner v-if="loading" color="primary" size="md" /> - <FormModel - ref="formModelRef" - model="AccountPrivileges" - url="VnUsers/preview" - auto-load - @on-data-saved="formModelRef.fetch()" - > + <FormModel ref="formModelRef" model="AccountPrivileges" url="VnUsers" auto-load> <template #form="{ data }"> {{ data }} <div class="q-gutter-y-sm"> From c4fc644a35a54c13105efd74b47e45c03d4de0c2 Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Mon, 26 Aug 2024 13:08:47 +0200 Subject: [PATCH 03/11] refs #7355 remove data --- src/pages/Account/Card/AccountPrivileges.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue index ac2ce4007..5700f9f88 100644 --- a/src/pages/Account/Card/AccountPrivileges.vue +++ b/src/pages/Account/Card/AccountPrivileges.vue @@ -22,7 +22,6 @@ console.log('formModelRef', formModelRef.value); <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" /> <FormModel ref="formModelRef" model="AccountPrivileges" url="VnUsers" auto-load> <template #form="{ data }"> - {{ data }} <div class="q-gutter-y-sm"> <QCheckbox v-model="data.hasGrant" From 64e776d3116c227ae8a6d07939bc9f1ecce10e4d Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Tue, 27 Aug 2024 10:02:59 +0200 Subject: [PATCH 04/11] refs #6899 fix invoiceFix --- src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 12 +++++++++++- src/pages/InvoiceOut/InvoiceOutList.vue | 14 +++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue index 2070ef09c..32018cdd6 100644 --- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue +++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue @@ -101,7 +101,17 @@ onMounted(async () => { dense outlined rounded - /> + > + <template #option="scope"> + <QItem v-bind="scope.itemProps"> + <QItemSection> + <QItemLabel> + {{ scope.opt?.name }} #{{ scope.opt?.id }} + </QItemLabel> + </QItemSection> + </QItem> + </template> + </VnSelect> <VnSelect :label="t('invoiceOutSerialType')" v-model="formData.serialType" diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index b08e12b3e..c2fcd049e 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -226,10 +226,18 @@ watchEffect(selectedRows); url="Tickets" v-model="data.ticketFk" :label="t('invoiceOutList.tableVisibleColumns.ticket')" - :options="ticketsOptions" - option-label="nickname" + option-label="id" option-value="id" - /> + > + <template #option="scope"> + <QItem v-bind="scope.itemProps"> + <QItemSection> + <QItemLabel> #{{ scope.opt?.id }} </QItemLabel> + <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel> + </QItemSection> + </QItem> + </template> + </VnSelect> <span class="q-ml-md">O</span> </div> <VnSelect From 39656ee3f56c97a921bff335fd01ad6d136fa8c0 Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Tue, 27 Aug 2024 10:11:38 +0200 Subject: [PATCH 05/11] refs #7355 remove privileges --- src/pages/Account/Card/AccountPrivileges.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue index 5700f9f88..0574e08d2 100644 --- a/src/pages/Account/Card/AccountPrivileges.vue +++ b/src/pages/Account/Card/AccountPrivileges.vue @@ -16,7 +16,6 @@ watch( () => route.params.id, () => formModelRef.value.reset() ); -console.log('formModelRef', formModelRef.value); </script> <template> <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" /> From 72e4f102879816793bf27362b43b5e1bec54fe5c Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Tue, 27 Aug 2024 10:17:06 +0200 Subject: [PATCH 06/11] refs #6899 fix order --- src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue index 32018cdd6..334933447 100644 --- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue +++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue @@ -106,7 +106,7 @@ onMounted(async () => { <QItem v-bind="scope.itemProps"> <QItemSection> <QItemLabel> - {{ scope.opt?.name }} #{{ scope.opt?.id }} + #{{ scope.opt?.id }} {{ scope.opt?.name }} </QItemLabel> </QItemSection> </QItem> From 4a815988837815dd835650c654af639a23ffedb4 Mon Sep 17 00:00:00 2001 From: Javier Segarra <jsegarra@verdnatura.es> Date: Tue, 27 Aug 2024 10:27:43 +0200 Subject: [PATCH 07/11] fix: ticketDescriptorMenu --- src/pages/Ticket/Card/TicketDescriptorMenu.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue index c7784bc2a..d5a578ca7 100644 --- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue +++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue @@ -30,10 +30,13 @@ const actions = { let clonedTicketId; try { - const { data } = await axios.post(`Tickets/${ticketId}/clone`, { + const { data } = await axios.post(`Tickets/cloneAll`, { shipped: ticket.value.shipped, + ticketsIds: [ticket.value.id], + withWarehouse: true, + negative: false, }); - clonedTicketId = data; + clonedTicketId = data[0].id; } catch (e) { opts.message = t('It was not able to clone the ticket'); opts.type = 'negative'; From ceec78da17b6ceec640e6fb6d37d37c49d8d43b3 Mon Sep 17 00:00:00 2001 From: Javier Segarra <jsegarra@verdnatura.es> Date: Tue, 27 Aug 2024 10:27:51 +0200 Subject: [PATCH 08/11] test: ticketDescriptorMenu --- test/cypress/integration/ticket/ticketDescriptor.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js index fc920f346..882aab157 100644 --- a/test/cypress/integration/ticket/ticketDescriptor.spec.js +++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js @@ -16,7 +16,7 @@ describe('Ticket descriptor', () => { cy.openActionsDescriptor(); cy.get(toCloneOpt).click(); cy.clickConfirm(); - cy.get(warehouseValue).contains('-'); + cy.get(warehouseValue).contains('Warehouse One'); cy.get(summaryHeader) .invoke('text') .then((text) => { From 137ed40f333440d41dab07462f83e926191491d8 Mon Sep 17 00:00:00 2001 From: Javier Segarra <jsegarra@verdnatura.es> Date: Tue, 27 Aug 2024 13:53:45 +0200 Subject: [PATCH 09/11] feat: update version and changelog --- CHANGELOG.md | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86ffce3fd..3868ceddd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,99 @@ +# Version 24.36 - 2024-08-27 + +### Added 🆕 + +### Changed 📦 + +### Fixed 🛠️ + +# Version 24.34 - 2024-08-20 + +### Added 🆕 + +- chore: #6900 order params by:jorgep +- chore: refs #6900 drop console log by:jorgep +- chore: refs #6900 drop vnCurrency by:jorgep +- chore: refs #6900 fix e2e tests by:jorgep +- chore: refs #6900 mv rectificative logic by:jorgep +- chore: refs #6900 responsive code by:jorgep +- chore: refs #7283 drop array types by:jorgep +- chore: refs #7283 drop import by:jorgep +- chore: refs #7283 fix e2e logout by:jorgep +- chore: refs #7283 update VnAvatar title handling by:jorgep +- chore: refs #7323 fix test by:jorgep +- chore: refs #7323 remove unused import by:jorgep +- chore: refs #7323drop commented code by:jorgep +- feat(VnCard): use props searchbar by:alexm +- feat(customer): improve basicData to balance by:alexm +- feat(customer_balance): refs #6943 add functionality from salix by:alexm +- feat(customer_balance): refs #6943 translations by:alexm +- feat: refs #6130 husky commitLint config by:pablone +- feat: refs #6130 husky hooks by:pablone +- feat: refs #6900 add InvoiceInSerial by:jorgep +- feat: refs #6900 add locale by:jorgep +- feat: refs #6900 use VnTable & sort filter fields by:jorgep +- feat: refs #7323 add flex-wrap by:jorgep +- feat: refs #7323 add my account" btn & fix models log selectable by:jorgep +- feat: refs #7323 improve test by:jorgep + +### Changed 📦 + +- refactor(customer_log: use VnLog by:alexm +- refactor(customer_recovery): to vnTable by:alexm +- refactor(customer_webAccess): FormModel by:alexm +- refactor: refs #7283 update avatar size and color by:jorgep + +### Fixed 🛠️ + +- chore: refs #6900 fix e2e tests by:jorgep +- chore: refs #7283 fix e2e logout by:jorgep +- chore: refs #7323 fix test by:jorgep +- feat: refs #7323 add my account" btn & fix models log selectable by:jorgep +- fix #7355 fix acls list by:carlossa +- fix(VnFilterPanel): emit userParams better by:alexm +- fix(claim_summary): url links (HEAD -> 7864_testToMaster_2434, origin/test, origin/7864_testToMaster_2434, test) by:alexm +- fix(customer_sms: fix reload by:alexm +- fix(twoFactor): unify code login and twoFactor by:alexm +- fix: VnCard VnSearchbar props by:alexm +- fix: accountMailAlias by:alexm +- fix: refs #6130 add commit lint modules by:pablone +- fix: refs #6130 pnpm-lock.yml by:pablone +- fix: refs #6900 improve loading by:jorgep +- fix: refs #6900 improve logic (origin/6900-addSerial) by:jorgep +- fix: refs #6900 improve logic by:jorgep +- fix: refs #6900 rectificative btn reactivity by:jorgep +- fix: refs #6900 use type number by:jorgep +- fix: refs #6900 vat & dueday by:jorgep +- fix: refs #6900 vat, dueday & intrastat by:jorgep +- fix: refs #6989 show entity name & default time from config table by:jorgep +- fix: refs #7283 basicData locale by:jorgep +- fix: refs #7283 itemLastEntries filter by:jorgep +- fix: refs #7283 itemTags & VnImg by:jorgep +- fix: refs #7283 locale by:jorgep +- fix: refs #7283 min-width vnImg by:jorgep +- fix: refs #7283 use vnAvatar & add optional zoom by:jorgep +- fix: refs #7283 userPanel pic by:jorgep +- fix: refs #7323 add department popup by:jorgep +- fix: refs #7323 add locale by:jorgep +- fix: refs #7323 css righ menu by:jorgep +- fix: refs #7323 data-key & add select by:jorgep +- fix: refs #7323 load all opts by:jorgep +- fix: refs #7323 righ menu bug by:jorgep +- fix: refs #7323 use global locale by:jorgep +- fix: refs #7323 use workerFilter (origin/7323-warmfix-fixErrors) by:jorgep +- fix: refs #7323 vnsubtoolbar css by:jorgep +- fix: refs #7323 wrong css by:jorgep +- refs #7355 fix Rol, alias by:carlossa +- refs #7355 fix accountAlias by:carlossa +- refs #7355 fix alias summary by:carlossa +- refs #7355 fix conflicts by:carlossa +- refs #7355 fix create Rol by:carlossa +- refs #7355 fix list by:carlossa +- refs #7355 fix lists redirects summary by:carlossa +- refs #7355 fix roles by:carlossa +- refs #7355 fix search exprBuilder by:carlossa +- refs #7355 fix vnTable by:carlossa + # Version 24.32 - 2024-08-06 ### Added 🆕 diff --git a/package.json b/package.json index 72bada823..f25e570a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "24.34.0", + "version": "24.36.0", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", From 636861234b9e31665e4326776f5e81f5e822bae4 Mon Sep 17 00:00:00 2001 From: Javier Segarra <jsegarra@verdnatura.es> Date: Tue, 27 Aug 2024 14:00:21 +0200 Subject: [PATCH 10/11] fix: remove property --- src/pages/Ticket/Card/TicketDescriptorMenu.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue index d5a578ca7..9a50288a0 100644 --- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue +++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue @@ -31,7 +31,6 @@ const actions = { try { const { data } = await axios.post(`Tickets/cloneAll`, { - shipped: ticket.value.shipped, ticketsIds: [ticket.value.id], withWarehouse: true, negative: false, From f88dc4a59deb0d95c8d5851df74ba225abf7b946 Mon Sep 17 00:00:00 2001 From: Javier Segarra <jsegarra@verdnatura.es> Date: Tue, 27 Aug 2024 14:01:48 +0200 Subject: [PATCH 11/11] feat: update changelog --- CHANGELOG.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3868ceddd..8e1d4c433 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,52 @@ ### Added 🆕 +- feat(FormModel): trim data by default by:alexm +- feat(orderBasicData): add notes by:alexm +- feat(orderList): correct create order by:alexm +- feat(orderList): use orderFilter and fixed this by:alexm +- feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra +- feat: add recover password and reset password by:alexm +- feat: refs #7346 add seriaType option by:jgallego +- feat: refs #7346 elimino === by:jgallego +- feat: refs #7346 formdata uses serialType by:jgallego +- feat: refs #7346 refactor by:jgallego +- feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego +- feat: refs #7710 uses cloneAll by:jgallego +- fix: refs #7717 fix OrderList table filters' and summary table style by:Jon + ### Changed 📦 +- feat: refs #7346 refactor by:jgallego +- perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra +- perf: refs #7717 right menu filter by:Jon +- perf: use ref at component start by:Javier Segarra +- refactor: refs #7717 delete useless function and import by:Jon +- refactor: refs #7717 deleted useless code by:Jon + ### Fixed 🛠️ +- feat(orderList): use orderFilter and fixed this by:alexm +- fix(VnTable): orderBy v-model by:alexm +- fix(account_card): redirection by:carlossa +- fix(orderLines): reload when delete and redirect when confirm by:alexm +- fix: #6336 ClaimListStates by:Javier Segarra +- fix: account subsections cards by:carlossa +- fix: duplicate key by:Jon +- fix: order description to vnTable by:alexm +- fix: orderCatalogFilter order by:alexm +- fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra +- fix: refs #7717 fix OrderList table filters' and summary table style by:Jon +- fix: refs #7717 fix basic data form & minor errors by:Jon +- fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon +- fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon +- fix: refs #7717 fix order sections by:Jon +- fix: refs #7717 fix volume and lines redirect by:Jon +- fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon +- fix: test by:alexm +- fix: ticketDescriptorMenu by:Javier Segarra +- refs #7355 account fixes by:carlossa + # Version 24.34 - 2024-08-20 ### Added 🆕