From 94278e2f53ee6ebbaf999004d53875da7b655dcf Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 18 Dec 2023 15:36:56 +0100 Subject: [PATCH 01/15] refactor: refs #5835 --- src/components/ui/VnLv.vue | 2 +- src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 2 +- src/pages/InvoiceIn/InvoiceInList.vue | 55 ++++++++----------- 3 files changed, 26 insertions(+), 33 deletions(-) diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue index 9a17fca05..e99ec4b05 100644 --- a/src/components/ui/VnLv.vue +++ b/src/components/ui/VnLv.vue @@ -5,7 +5,7 @@ import { dashIfEmpty } from 'src/filters'; const $props = defineProps({ label: { type: String, default: null }, value: { - type: [String, Boolean], + type: [String, Boolean, Number], default: null, }, info: { type: String, default: null }, diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index d7039fe3d..6dd8a7ae9 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -265,7 +265,7 @@ function getLink(param) { From c84aeed202ceedf2b164f796276a686a8b99e579 Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 18 Dec 2023 15:39:26 +0100 Subject: [PATCH 02/15] fix test refs #5835 --- test/cypress/integration/invoiceIn/invoiceInList.spec.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js index bd722edab..60d8c5be1 100644 --- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js +++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js @@ -1,8 +1,8 @@ /// describe('InvoiceInList', () => { const firstCard = '.q-card:nth-child(1)'; - const firstId = - '.q-card:nth-child(1) .list-items > .vn-label-value:first-child > .value > span'; + const firstChipId = + ':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content'; const firstDetailBtn = '.q-card:nth-child(1) .q-btn:nth-child(2)'; const summaryHeaders = '.summaryBody .header'; @@ -12,9 +12,10 @@ describe('InvoiceInList', () => { }); it('should redirect on clicking a invoice', () => { - cy.get(firstId) + cy.get(firstChipId) .invoke('text') - .then((id) => { + .then((content) => { + const id = content.substring(4); cy.get(firstCard).click(); cy.url().should('include', `/invoice-in/${id}/summary`); }); From 5b79c2ace91690b666cf68ef85cd8c5aec8ae00b Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 19 Dec 2023 14:03:58 +0100 Subject: [PATCH 03/15] fix margin: refs #5835 --- src/pages/InvoiceIn/InvoiceInList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue index c3ef866cd..3efaec7fc 100644 --- a/src/pages/InvoiceIn/InvoiceInList.vue +++ b/src/pages/InvoiceIn/InvoiceInList.vue @@ -131,11 +131,11 @@ function viewSummary(id) { @click.stop="viewSummary(row.id)" color="primary" type="submit" - style="margin-top: 15px" + class="q-mt-sm" /> Date: Wed, 20 Dec 2023 09:11:16 +0100 Subject: [PATCH 04/15] refs #6584 hotfix await --- src/pages/Claim/Card/ClaimAction.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue index 44575f1d6..812517231 100644 --- a/src/pages/Claim/Card/ClaimAction.vue +++ b/src/pages/Claim/Card/ClaimAction.vue @@ -142,12 +142,17 @@ async function regularizeClaim() { }) .onOk(async () => await onUpdateGreugeAccept()); } else { + await claimRef.value.fetch(); quasar.notify({ message: t('globals.dataSaved'), type: 'positive', }); } await arrayData.fetch({ append: false }); + quasar.notify({ + message: t('globals.dataSaved'), + type: 'positive', + }); } async function updateGreuge(greuges) { From da5b78c2fc62d83963aa81d2ca9f4c8879b34271 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 20 Dec 2023 09:12:11 +0100 Subject: [PATCH 05/15] refs #6363: style: fix darkMode for LoginMain --- src/css/app.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/css/app.scss b/src/css/app.scss index 02d4f8946..5b5f53314 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -17,9 +17,9 @@ a { // Removes chrome autofill background input:-webkit-autofill, select:-webkit-autofill { - color: $input-text-color !important; + color: var(--vn-text) !important; font-family: $typography-font-family; - -webkit-text-fill-color: $input-text-color !important; + -webkit-text-fill-color: var(--vn-text) !important; -webkit-background-clip: text !important; background-clip: text !important; } From bce4551847df3080d6f2c190ee6ef9157d3ac781 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 20 Dec 2023 09:51:57 +0100 Subject: [PATCH 06/15] refs #6098 feat: copy userToken to clipboard --- src/components/UserPanel.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index a7504705a..aee12d105 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -81,6 +81,10 @@ function logout() { session.destroy(); router.push('/login'); } + +function copyUserToken(){ + navigator.clipboard.writeText(session.getToken()); +}