From 52e50ddc246cc36a911146c3818ceddc11dc68cd Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 11 Feb 2025 12:20:27 +0100 Subject: [PATCH 01/41] feat: refs #8555 added new filter field and translations --- src/pages/Travel/ExtraCommunity.vue | 62 ++++++++++------------- src/pages/Travel/ExtraCommunityFilter.vue | 61 +++++++++------------- src/pages/Travel/locale/en.yml | 22 ++++++++ src/pages/Travel/locale/es.yml | 23 +++++++++ 4 files changed, 95 insertions(+), 73 deletions(-) create mode 100644 src/pages/Travel/locale/en.yml create mode 100644 src/pages/Travel/locale/es.yml diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue index dee9d923a..ac46caa44 100644 --- a/src/pages/Travel/ExtraCommunity.vue +++ b/src/pages/Travel/ExtraCommunity.vue @@ -2,6 +2,7 @@ import { onMounted, ref, computed, watch } from 'vue'; import { QBtn } from 'quasar'; import { useI18n } from 'vue-i18n'; +import { useRoute } from 'vue-router'; import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue'; import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue'; @@ -22,6 +23,8 @@ import VnPopup from 'src/components/common/VnPopup.vue'; const stateStore = useStateStore(); const { t } = useI18n(); const { openReport } = usePrintService(); +const route = useRoute(); +const tableParams = ref(); const shippedFrom = ref(Date.vnNew()); const landedTo = ref(Date.vnNew()); @@ -143,7 +146,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('globals.pageTitles.supplier'), + label: t('extraCommunity.cargoShip'), field: 'cargoSupplierNickname', name: 'cargoSupplierNickname', align: 'left', @@ -171,7 +174,7 @@ const columns = computed(() => [ ? value.reduce((sum, entry) => { return sum + (entry.invoiceAmount || 0); }, 0) - : 0 + : 0, ), }, { @@ -200,7 +203,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('kg'), + label: t('extraCommunity.kg'), field: 'kg', name: 'kg', align: 'left', @@ -208,7 +211,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('physicKg'), + label: t('extraCommunity.physicKg'), field: 'loadedKg', name: 'loadedKg', align: 'left', @@ -232,7 +235,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('shipped'), + label: t('extraCommunity.shipped'), field: 'shipped', name: 'shipped', align: 'left', @@ -249,7 +252,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('landed'), + label: t('extraCommunity.landed'), field: 'landed', name: 'landed', align: 'left', @@ -258,7 +261,7 @@ const columns = computed(() => [ format: (value) => toDate(value), }, { - label: t('notes'), + label: t('extraCommunity.notes'), field: '', name: 'notes', align: 'center', @@ -284,7 +287,7 @@ watch( if (!arrayData.store.data) return; onStoreDataChange(); }, - { deep: true, immediate: true } + { deep: true, immediate: true }, ); const openReportPdf = () => { @@ -451,13 +454,24 @@ const getColor = (percentage) => { for (const { value, className } of travelKgPercentages.value) if (percentage > value) return className; }; + +const filteredEntries = (entries) => { + if (!tableParams?.value?.entrySupplierFk) return entries; + return entries?.filter( + (entry) => entry.supplierFk === tableParams?.value?.entrySupplierFk, + ); +}; + +watch(route, () => { + tableParams.value = JSON.parse(route.query.table); +}); @@ -246,3 +253,20 @@ es: Search zone: Buscar zona You can search zones by id or name: Puedes buscar zonas por id o nombre + + From 6bb758b88ce42d932c888eff78d551ab0ddf2bce Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 18 Feb 2025 00:40:13 +0100 Subject: [PATCH 04/41] fix: reload table when apply discount --- src/pages/Ticket/Card/TicketSale.vue | 40 +++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index b849b3b35..fa3c146ce 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -57,7 +57,7 @@ const canProceed = ref(); watch( () => route.params.id, - () => tableRef.value.reload() + () => tableRef.value.reload(), ); const columns = computed(() => [ @@ -133,7 +133,7 @@ const columns = computed(() => [ align: 'left', label: t('globals.amount'), name: 'amount', - format: (row) => parseInt(row.amount * row.quantity), + format: (row) => toCurrency(getSaleTotal(row)), }, { align: 'left', @@ -200,7 +200,7 @@ const changeQuantity = async (sale) => { await updateQuantity(sale); } catch (e) { const { quantity } = tableRef.value.CrudModelRef.originalData.find( - (s) => s.id === sale.id + (s) => s.id === sale.id, ); sale.quantity = quantity; throw e; @@ -331,8 +331,7 @@ const updateDiscount = async (sales, newDiscount = null) => { }; await axios.post(`Tickets/${route.params.id}/updateDiscount`, params); notify('globals.dataSaved', 'positive'); - for (let sale of sales) sale.discount = _newDiscount; - edit.value = { ...DEFAULT_EDIT }; + tableRef.value.reload(); }; const getNewPrice = computed(() => { @@ -505,7 +504,7 @@ async function isSalePrepared(item) { componentProps: { title: t('Item prepared'), message: t( - 'This item is already prepared. Do you want to continue?' + 'This item is already prepared. Do you want to continue?', ), data: item, }, @@ -527,7 +526,7 @@ watch( if (newItemFk) { updateItem(newRow.value); } - } + }, ); @@ -597,7 +596,7 @@ watch( openConfirmationModal( t('Continue anyway?'), t('You are going to delete lines of the ticket'), - removeSales + removeSales, ) " > @@ -826,21 +825,24 @@ watch( :mana-code="manaCode" @save="changeDiscount(row)" > - -
- -
+ {{ toPercentage(row.discount / 100) }} - From 93401dfcdca0100113b9003e3664c4ca7c78ce6c Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 18 Feb 2025 00:40:39 +0100 Subject: [PATCH 05/41] fix: use mana in ticketSale.discount --- src/components/ui/VnUsesMana.vue | 5 +++++ src/pages/Ticket/Card/TicketEditMana.vue | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/ui/VnUsesMana.vue b/src/components/ui/VnUsesMana.vue index 891de5f63..ee2888e44 100644 --- a/src/components/ui/VnUsesMana.vue +++ b/src/components/ui/VnUsesMana.vue @@ -53,3 +53,8 @@ const manaCode = ref(props.manaCode); /> + + es: + Promotion mana: Maná promoción + Claim mana: Maná reclamación + diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue index 693875712..a55658a07 100644 --- a/src/pages/Ticket/Card/TicketEditMana.vue +++ b/src/pages/Ticket/Card/TicketEditMana.vue @@ -47,7 +47,10 @@ const cancel = () => {
Mana: {{ toCurrency(mana) }}
- + +
+ +
{{ t('New price') }} @@ -56,9 +59,6 @@ const cancel = () => {
-
- -
Date: Tue, 18 Feb 2025 07:32:54 +0100 Subject: [PATCH 06/41] fix: add data-cy attribute to card button for improved testing --- src/components/VnTable/VnTable.vue | 1 + test/cypress/integration/entry/myEntry.spec.js | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 2559452e4..33bcb533a 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -861,6 +861,7 @@ function cardClick(_, row) { :key="index" :title="btn.title" :icon="btn.icon" + data-cy="cardBtn" class="q-pa-xs" flat :class=" diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js index 49d75cf39..ed469d9e2 100644 --- a/test/cypress/integration/entry/myEntry.spec.js +++ b/test/cypress/integration/entry/myEntry.spec.js @@ -8,11 +8,9 @@ describe('EntryMy when is supplier', () => { }, }); }); - + it('should open buyLabel when is supplier', () => { - cy.get( - '[to="/null/3"] > .q-card > :nth-child(2) > .q-btn > .q-btn__content > .q-icon' - ).click(); + cy.dataCy('cardBtn').eq(2).click(); cy.dataCy('printLabelsBtn').click(); cy.window().its('open').should('be.called'); }); From 5ce7c7f597d56b078319b673013100e0b6e1c293 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 18 Feb 2025 09:05:38 +0100 Subject: [PATCH 07/41] fix: refs #8606 fixed list e2e test --- src/pages/Zone/ZoneFilterPanel.vue | 8 +++++++- test/cypress/integration/zone/zoneList.spec.js | 11 ++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue index 3a35527ab..bbe12189a 100644 --- a/src/pages/Zone/ZoneFilterPanel.vue +++ b/src/pages/Zone/ZoneFilterPanel.vue @@ -38,7 +38,12 @@ const agencies = ref([]);