diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 1032d4024..07992f616 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -314,7 +314,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) { show-if-above > - + + diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue index e69e586b5..76856ef94 100644 --- a/src/components/common/VnSection.vue +++ b/src/components/common/VnSection.vue @@ -8,7 +8,7 @@ import { useArrayData } from 'src/composables/useArrayData'; const $props = defineProps({ section: { type: String, - required: true, + default: null, }, dataKey: { type: String, diff --git a/src/css/app.scss b/src/css/app.scss index 01479105a..9060d2fa7 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -3,20 +3,21 @@ @import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass'; body.body--light { - --font-color: black; --vn-header-color: #cecece; --vn-page-color: #ffffff; --vn-section-color: #e0e0e0; --vn-section-hover-color: #b9b9b9; - --vn-text-color: var(--font-color); + --vn-text-color: black; --vn-label-color: #5f5f5f; --vn-accent-color: #e7e3e3; --vn-empty-tag: #acacac; + --vn-black-text-color: black; + --vn-text-color-contrast: white; background-color: var(--vn-page-color); .q-header .q-toolbar { - color: var(--font-color); + color: var(--vn-text-color); } } body.body--dark { @@ -28,6 +29,8 @@ body.body--dark { --vn-label-color: #a8a8a8; --vn-accent-color: #424242; --vn-empty-tag: #2d2d2d; + --vn-black-text-color: black; + --vn-text-color-contrast: black; background-color: var(--vn-page-color); } @@ -86,6 +89,10 @@ select:-webkit-autofill { background-color: var(--vn-section-hover-color); } +.bg-vn-page { + background-color: var(--vn-page-color); +} + .color-vn-label { color: var(--vn-label-color); } @@ -189,7 +196,7 @@ select:-webkit-autofill { .q-tooltip { background-color: var(--vn-page-color); - color: var(--font-color); + color: var(--vn-text-color); font-size: medium; } diff --git a/src/pages/Customer/Card/CustomerMandates.vue b/src/pages/Customer/Card/CustomerMandates.vue index 248515b4a..66cb44bc2 100644 --- a/src/pages/Customer/Card/CustomerMandates.vue +++ b/src/pages/Customer/Card/CustomerMandates.vue @@ -63,9 +63,10 @@ const columns = computed(() => [ - + { switch (param) { @@ -49,10 +40,6 @@ const where = { itemFk: route.params.id, }; -if (hideInventory.value) { - where.supplierFk = { neq: inventorySupplierFk }; -} - const arrayData = useArrayData('ItemLastEntries', { url: 'Items/lastEntriesFilter', order: ['landed DESC', 'buyFk DESC'], @@ -110,7 +97,7 @@ const columns = computed(() => [ format: (val) => dashIfEmpty(val), }, { - label: t('shelvings.packing'), + label: 'Packing', name: 'packing', field: 'packing', align: 'center', @@ -182,15 +169,11 @@ const updateFilter = async () => { const userFilter = arrayData.store.userFilter.where; userFilter.landed = filter; - if (hideInventory.value) userFilter.supplierFk = { neq: inventorySupplierFk }; - else delete userFilter.supplierFk; await fetchItemLastEntries(); }; onMounted(async () => { - await getInventorySupplier(); - const _from = Date.vnNew(); _from.setDate(_from.getDate() - 75); from.value = getDate(_from, 'from'); @@ -200,12 +183,16 @@ onMounted(async () => { updateFilter(); - watch([from, to, hideInventory], ([nFrom, nTo], [oFrom, oTo]) => { + watch([from, to], ([nFrom, nTo], [oFrom, oTo]) => { if (nFrom && nFrom != oFrom) nFrom = getDate(new Date(nFrom), 'from'); if (nTo && nTo != oTo) nTo = getDate(new Date(nTo), 'to'); updateFilter(); }); }); + +function getBadgeClass(groupingMode, expectedGrouping) { + return groupingMode === expectedGrouping ? 'accent-badge' : 'simple-badge'; +} @@ -249,6 +229,11 @@ onMounted(async () => { /> + + + - @@ -349,4 +342,13 @@ onMounted(async () => { background-color: red; } } +.accent-badge { + background-color: var(--vn-label-color); + color: var(--vn-text-color-contrast); +} +.simple-badge { + background-color: transparent; + color: var(--vn-text-color); + font-size: 14px; +} diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue index 74403d471..422adf55b 100644 --- a/src/pages/Item/ItemFixedPrice.vue +++ b/src/pages/Item/ItemFixedPrice.vue @@ -53,7 +53,6 @@ const columns = computed(() => [ name: 'itemFk', ...defaultColumnAttrs, isId: true, - cardVisible: true, columnField: { component: 'input', type: 'number', @@ -65,14 +64,12 @@ const columns = computed(() => [ name: 'name', ...defaultColumnAttrs, create: true, - cardVisible: true, }, { label: t('item.fixedPrice.groupingPrice'), field: 'rate2', name: 'rate2', ...defaultColumnAttrs, - cardVisible: true, component: 'input', type: 'number', }, @@ -81,7 +78,6 @@ const columns = computed(() => [ field: 'rate3', name: 'rate3', ...defaultColumnAttrs, - cardVisible: true, component: 'input', type: 'number', }, @@ -91,7 +87,6 @@ const columns = computed(() => [ field: 'minPrice', name: 'minPrice', ...defaultColumnAttrs, - cardVisible: true, component: 'input', type: 'number', }, @@ -100,7 +95,6 @@ const columns = computed(() => [ field: 'started', name: 'started', format: ({ started }) => toDate(started), - cardVisible: true, ...defaultColumnAttrs, columnField: { component: 'date', @@ -116,7 +110,6 @@ const columns = computed(() => [ field: 'ended', name: 'ended', ...defaultColumnAttrs, - cardVisible: true, columnField: { component: 'date', class: 'shrink', @@ -251,11 +244,14 @@ const upsertPrice = async (props, resetMinPrice = false) => { } if (!changes.updates && !changes.creates) return; const data = await upsertFixedPrice(row); - tableRef.value.CrudModelRef.formData[props.rowIndex] = data; + Object.assign(tableRef.value.CrudModelRef.formData[props.rowIndex], data); + notify(t('globals.dataSaved'), 'positive'); + tableRef.value.reload(); }; async function upsertFixedPrice(row) { const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row); + data.hasMinPrice = data.hasMinPrice ? 1 : 0; return data; } @@ -395,18 +391,11 @@ function handleOnDataSave({ CrudModelRef }) { diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue index 0882036c1..4b6aa52bd 100644 --- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue +++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue @@ -59,7 +59,7 @@ const arrayData = useArrayData('ZoneEvents'); const exclusionGeoCreate = async () => { const params = { zoneFk: parseInt(route.params.id), - date: dated.value, + date: dated, geoIds: tickedNodes.value, }; await axios.post('Zones/exclusionGeo', params); diff --git a/test/cypress/integration/item/itemLastEntries.spec.js b/test/cypress/integration/item/itemLastEntries.spec.js deleted file mode 100644 index c94cfa480..000000000 --- a/test/cypress/integration/item/itemLastEntries.spec.js +++ /dev/null @@ -1,20 +0,0 @@ -describe('ItemLastEntries', () => { - beforeEach(() => { - cy.viewport(1280, 720); - cy.login('buyer'); - cy.visit('/#/item/1/last-entries'); - cy.intercept('GET', /.*lastEntriesFilter/).as('item'); - cy.waitForElement('tbody'); - }); - - it('should filter by agency', () => { - cy.get('tbody > tr') - .its('length') - .then((rowCount) => { - cy.get('[data-cy="hideInventory"]').click(); - cy.wait('@item'); - cy.waitForElement('tbody'); - cy.get('tbody > tr').should('have.length.greaterThan', rowCount); - }); - }); -});