From 594fc60eece8c40a66cd807f63ae87d45aaaa568 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 25 Nov 2024 14:49:10 +0100 Subject: [PATCH 01/14] chore: refs #8231 add changelog --- CHANGELOG.md | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88abb9ae0..03812d252 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,189 @@ +# Version 24.48 - 2024-11-25 + +### Added 🆕 + +- chore: correct checkNotification (fix_customer_issues) by:alexm +- chore: perf (warmFix_order_equalSalix) by:alexm +- chore: refs #6818 add spaces by:jorgep +- chore: refs #6818 drop useless code & comment by:jorgep +- chore: refs #7273 sticky add btn & refactor by:jorgep +- chore: refs #7524 fix test by:jorgep +- chore: refs #8039 not required by:alexm +- chore: refs #8078 fiz tests by:jorgep +- chore: refs #8078 rollback ref by:jorgep +- chore: remove console.log (warmFix_invoiceOut_Global) by:alexm +- chore: typo (fix_itemType-redirection) by:alexm +- feat: #6943 use openURL quasar by:Javier Segarra +- feat: #7782 add cypress report by:Javier Segarra +- feat: #7782 cypress.config watchForFileChanges by:Javier Segarra +- feat: #7782 npm run resetDatabase by:Javier Segarra +- feat: #7782 waitUntil domContentLoad by:Javier Segarra +- feat: added composable to confirm orders by:Jon +- feat: add /reports in gitignore (warmFix_reports_in_gitignore) by:alexm +- feat: apply changes for customerModule by:Javier Segarra +- feat: disabled buttons by:Javier Segarra +- feat: move buttons to DescriptorMenu by:Javier Segarra +- feat: refs #6818 add icon by:jorgep +- feat: refs #6818 fetch url & default channel by:jorgep +- feat: refs #6818 saysimple integration by:jorgep +- feat: refs #6839 module searching (6839-addSearchMenu) by:jorgep +- feat: refs #6839 normalize search by:jorgep +- feat: refs #6919 sync entry data by:jorgep +- feat: refs #7006 itemType basic data new inputs by:guillermo +- feat: refs #7006 itemTypeLog added by:guillermo +- feat: refs #7193 modified parking to use the scope and corrected small errors by:Jon +- feat: refs #7206 added inactive label and corrected minor errors by:Jon +- feat: refs #7308 #7308 remove warnings related to useSession by:Javier Segarra +- feat: refs #7349 usa back con permisos by:jgallego +- feat: refs #7524 add front test by:jorgep +- feat: refs #7874 improve vn-notes ui by:jorgep +- feat: refs #7970 notify changes by:Jon +- feat(): refs #8039 canceledError not notify by:alexm +- feat: refs #8039 notify error unify by:alexm +- feat: refs #8039 show duplicate request in local by:alexm +- feat: refs #8078 add shortcut multi selection by:jorgep +- feat: refs #8078 add tests by:jorgep +- feat: refs#8087 Redadas en travel by:Carlos Andrés +- feat: refs #8087 Traspasar redadas a travels by:Carlos Andrés +- feat: remove comments by:Javier Segarra +- feat(Supplier): add companySize by:alexm +- feat: use composable to unify logic by:Javier Segarra +- feat(VnInput): empty to null by:alexm +- feat(VnSelect): order data equal salix by:alexm +- feat(VnSelect): refs #7136 add scroll (7136-vnSelect_paginate_simplify_2) by:alexm + +### Changed 📦 + +- chore: perf (warmFix_order_equalSalix) by:alexm +- chore: refs #7273 sticky add btn & refactor by:jorgep +- fix: better performance (warmFix_accountAcls) by:alexm +- perf: minor bugs detected by:Javier Segarra +- perf: refs #6943 #6943 merge command by:Javier Segarra +- perf: refs #7283 #7283 declare composable inst4ead code duplicated by:Javier Segarra +- perf: refs #7283 #7283 handle composable i18n by:Javier Segarra +- perf: refs #7283 #7283 handle i18n by:Javier Segarra +- perf: refs #7283 #7283 i18n params by:Javier Segarra +- perf: refs #7308 #7308 remove comments by:Javier Segarra +- perf: remove appendParams by:Javier Segarra +- perf: use const in VnLocation by:Javier Segarra +- perf: use required instead :required="true" by:Javier Segarra +- refactor: apply QPopupProxy by:wbuezas +- refactor: changed confirmOrder directory by:Jon +- refactor: change keyup.enter for update:model-value by:wbuezas +- refactor(InvoiceInBasicData): use VnDms by:alexm +- refactor: modified composable by:Jon +- refactor: refs #6818 change channel source by:jorgep +- refactor: refs #6818 channel logic by:jorgep +- refactor: refs #6919 export filter by:jorgep +- refactor: refs #7132 1st wave of changes in global translations files by:Jon +- refactor: refs #7132 account's module translations by:Jon +- refactor: refs #7132 customer's module translations by:Jon +- refactor: refs #7132 deleted pageTitles repeated by:Jon +- refactor: refs #7132 delete duplicate translations' keys by:Jon +- refactor: refs #7132 deleted useless code by:Jon +- refactor: refs #7132 global translations files changed by:Jon +- refactor: refs #7266 Changed method name by:guillermo +- refactor: refs #7950 Created cmr model by:guillermo +- refactor: refs #7970 added emit by:Jon +- refactor: refs #7970 refactored VnConfirm to emit events by:Jon +- refactor: refs #8185 modified LeftMenu to avoid duplicates by:Jon +- refactor: remove unused variable by:wbuezas +- refactor: revert catalog changes by:Jon +- refactor: small change by:wbuezas +- test: refactor e2e by:alexm +- test: refs #8039 add hasNotify and, refactor: agencyWorkCenter test by:alexm + +### Fixed 🛠️ + +- chore: refs #7524 fix test by:jorgep +- fix: better performance (warmFix_accountAcls) by:alexm +- fix: catalog view category and type filter by:wbuezas +- fix: category and tags filters by:Jon +- fix: changed route.query by:Jon +- fix: change type vnput by:Javier Segarra +- fix(ClaimList): stateCode orderBy priority by:alexm +- fix: entryFilters by:carlossa +- fix: filter panel by:Jon +- fix(InvoiceOutGlobal): parallelism by:alexm +- fix: itemBotanical by:Javier Segarra +- fix: itemType redirection and fix filters by:alexm +- fix: logout spec (warmFix_logout.spec) by:alexm +- fix: merge errors by:alexm +- fix: order catalog by:wbuezas +- fix: order catalog fixes by:wbuezas +- fix: refs #6818 use right icon by:jorgep +- fix: refs #6896 fixed module problems by:Jon +- fix: refs #7193 fixed e2e test by:Jon +- fix: refs #7206 deleted duplicate code by:Jon +- fix: refs #7273 use same filter by:jorgep +- fix: refs #7283 #7283 bugs by:Javier Segarra +- fix: refs #7283 #7283 ItemDiary subToolbar by:Javier Segarra +- fix: refs #7283 #7283 ItemSummary bugs by:Javier Segarra +- fix: refs #7283 Account image resolution by:guillermo +- fix: refs #7283 css by:jorgep +- fix: refs #7283 filter by:carlossa +- fix: refs #7283 fix image by:carlossa +- fix: refs #7283 fix pr by:carlossa +- fix: refs #7283 fix preview by:carlossa +- fix: refs #7283 fix required by:carlossa +- fix: refs #7283 item filters by:carlossa +- fix: refs #7283 itemtype fix by:carlossa +- fix: refs #7283 order translation by:carlossa +- fix: refs #7283 preview by:carlossa +- fix: refs #7283 tooltips !Item by:Javier Segarra +- fix: refs #7306 clean warning by:carlossa +- fix: refs #7310 clean warning by:carlossa +- fix: refs #7323 locale #7396 by:jorgep +- fix: refs #7323 show advanced fields by:jorgep +- fix: refs #7349 dependencia no usada by:jgallego +- fix: refs #7524 e2e & worker module by:jorgep +- fix: refs #7874 add title by:jorgep +- fix: refs #7874 show name by:jorgep +- fix: refs #7943 use correct data-key by:jorgep +- fix: refs #7943 use summary by:jorgep +- fix: refs #8039 bad tests by:alexm +- fix: refs #8039 o not handle unnecessary errors by:alexm +- fix: refs #8078 e2e #7970 by:jorgep +- fix: refs #8078 handleSelection by:jorgep +- fix: refs #8078 improve cy command (8078-enableMultiSelection) by:jorgep +- fix: refs #8078 improve handleSelection by:jorgep +- fix: reset category by:wbuezas +- fix: tag chips by:Jon +- fix: vnSearchbar spec (warmFix_vnSearchBar.spec) by:alexm +- fix(VnSelect): setOptions when applyFilter by:alexm +- fix: worker test e2e by:Jon +- Merge branch 'dev' into fix_customer_issues by:Javier Segarra +- refactor: revert catalog changes by:Jon +- refs #7283 fix conflicts by:carlossa +- refs #7283 fix descriptorproxy by:carlossa +- refs #7283 fixedPrice by:carlossa +- refs #7283 fixedPrices by:carlossa +- refs #7283 fix itemFixed by:carlossa +- refs #7283 fix itemFixedPrice by:carlossa +- refs #7283 fix itemMigration by:carlossa +- refs #7283 fix itemMigration list filters by:carlossa +- refs #7283 fix items by:carlossa +- refs #7283 fix items error get images by:carlossa +- refs #7283 fix items images by:carlossa +- refs #7283 fix request by:carlossa +- refs #7283 fix searchbar by:carlossa +- refs #7283 fix viewSummary by:carlossa +- refs #7283 fix yml list basicData by:carlossa +- refs #7283 itemRequest fix by:carlossa +- refs #7283 itemRequest fix deny by:carlossa +- refs #7283 itemRequest fix reload by:carlossa +- refs #72983 fix filters by:carlossa +- revert: commit by:Javier Segarra +- revert e57a253c6f649382da187d1129449d265fb26d3b by:Javier Segarra +- test: #8162 fix clientList spec by:Javier Segarra +- test: #8162 fix vnLocation spec by:Javier Segarra +- test: fix arrayData by:Javier Segarra +- test: fix e2e by:alexm +- test: fix e2e by:Javier Segarra +- test: refs #8039 fix WorkerNotification e2e by:alexm +- test: refs #8039 fix ZoneWarehouse e2e by:alexm +- warmfix: ItemLastEntries to date (origin/warmfix_itemLastEntriesFilter) by:Javier Segarra + # Version 24.40 - 2024-10-02 ### Added 🆕 From 2ead484026c2ed48fea357c742ca9dcbe745983c Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 25 Nov 2024 14:59:26 +0100 Subject: [PATCH 02/14] test: refs #8231 fix VnLocation --- test/cypress/integration/vnComponent/vnLocation.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js index aeb938c6f..06c23f4ee 100644 --- a/test/cypress/integration/vnComponent/vnLocation.spec.js +++ b/test/cypress/integration/vnComponent/vnLocation.spec.js @@ -103,12 +103,12 @@ describe('VnLocation', () => { const province = 'Valencia'; cy.get(createLocationButton).click(); cy.get('.q-card > h1').should('have.text', 'New postcode'); - cy.get(dialogInputs).eq(0).clear(); - cy.get(dialogInputs).eq(0).type(postCode); cy.selectOption( `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`, province ); + cy.get(dialogInputs).eq(0).clear(); + cy.get(dialogInputs).eq(0).type(postCode); cy.get('.q-mt-lg > .q-btn--standard').click(); cy.get(`${createForm.prefix}`).should('not.exist'); cy.waitForElement('.q-form'); From 1e4cda6c6afe208e42a7e65daf5f11ab212c6636 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 26 Nov 2024 07:39:37 +0100 Subject: [PATCH 03/14] fix(OrderCatalogFilter): remove limit --- src/pages/Order/Card/CatalogFilterValueDialog.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue index 9593e08c4..53bb87f8d 100644 --- a/src/pages/Order/Card/CatalogFilterValueDialog.vue +++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue @@ -36,7 +36,6 @@ const getSelectedTagValues = async (tag) => { const filter = { fields: ['value'], order: 'value ASC', - limit: 30, }; const url = `Tags/${tag?.id}/filterValue`; From 8fbf7fed4385eb59354934afefef2d1fa26d5f28 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 26 Nov 2024 09:05:46 +0100 Subject: [PATCH 04/14] fix(TicketSale): throw error when it should --- src/pages/Ticket/Card/TicketSale.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index 5a87604fe..14f6fe7f0 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -222,7 +222,7 @@ const changeQuantity = async (sale) => { ) return; if (!sale.id) return addSale(sale); - updateQuantity(sale); + await updateQuantity(sale); }; const updateConcept = async (sale) => { From 2076072eeb9693873e1a4789d6c7f44eacce99b5 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 26 Nov 2024 09:21:51 +0100 Subject: [PATCH 05/14] fix(TicketSale): set old quantity when error --- src/components/CrudModel.vue | 1 + src/pages/Ticket/Card/TicketSale.vue | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue index 0de5d3aa2..19e990862 100644 --- a/src/components/CrudModel.vue +++ b/src/components/CrudModel.vue @@ -94,6 +94,7 @@ defineExpose({ saveChanges, getChanges, formData, + originalData, vnPaginateRef, }); diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index 14f6fe7f0..08cdcb9df 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -183,18 +183,25 @@ const resetChanges = async () => { }; const updateQuantity = async (sale) => { - const payload = { quantity: sale.quantity }; - await axios.post(`Sales/${sale.id}/updateQuantity`, payload); + const params = { quantity: sale.quantity }; + try { + await axios.post(`Sales/${sale.id}/updateQuantity`, params); + } catch (e) { + sale.quantity = tableRef.value.CrudModelRef.originalData.find( + (s) => s.id === sale.id + ).quantity; + throw e; + } notify('globals.dataSaved', 'positive'); }; const addSale = async (sale) => { - const payload = { + const params = { barcode: sale.itemFk, quantity: sale.quantity, }; - const { data } = await axios.post(`tickets/${route.params.id}/addSale`, payload); + const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params); if (!data) return; From 7feea110a6fa2de54b530bbf980798cd04734a9d Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 26 Nov 2024 09:29:09 +0100 Subject: [PATCH 06/14] fix(CustomerSummary): fixed CustomerSummaryTable max width --- src/pages/Customer/Card/CustomerSummary.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue index 95a162670..4fa7b9bdc 100644 --- a/src/pages/Customer/Card/CustomerSummary.vue +++ b/src/pages/Customer/Card/CustomerSummary.vue @@ -320,7 +320,7 @@ const sumRisk = ({ clientRisks }) => { :value="entity.recommendedCredit" /> - + From 84adc40c18fff9ab958876311827d5699f2c6183 Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 26 Nov 2024 10:16:53 +0100 Subject: [PATCH 07/14] feat: refs #8232 change default scopeDays --- src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 2 +- src/pages/Monitor/Ticket/MonitorTickets.vue | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue index 57248d580..1ded8a8be 100644 --- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue +++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue @@ -18,7 +18,7 @@ const groupedStates = ref(); const handleScopeDays = (params, days, callback) => { const [from, to] = dateRange(Date.vnNew()); if (!days) { - Object.assign(params, { from, to, scopeDays: 1 }); + Object.assign(params, { from, to, scopeDays: 0 }); } else { params.from = from; to.setDate(to.getDate() + days); diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index 5e17f2235..41d3070b7 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -27,8 +27,7 @@ const visibleColumns = ref([]); const { viewSummary } = useSummaryDialog(); const from = Date.vnNew(); from.setHours(0, 0, 0, 0); -const to = new Date(from.getTime()); -to.setDate(to.getDate() + 1); +const to = Date.vnNew(); to.setHours(23, 59, 59, 999); function exprBuilder(param, value) { @@ -342,7 +341,7 @@ const openTab = (id) => auto-load :row-click="({ id }) => openTab(id)" :disable-option="{ card: true }" - :user-params="{ from, to, scopeDays: 1 }" + :user-params="{ from, to, scopeDays: 0 }" >