+
+
+
+
+
{
-
-
-
- {{ t('Add note') }}
-
-
-
+
+
+ {{ t('Add note') }}
+
+
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 7ac25a777..1887adf74 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -39,30 +39,47 @@ onMounted(async () => {
const tableColumnComponents = {
quantity: {
component: () => 'span',
+ props: () => {},
},
stickers: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
packagingFk: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
weight: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
packing: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
grouping: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
buyingValue: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
amount: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
pvp: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
};
@@ -152,129 +169,85 @@ const fetchEntryBuys = async () => {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ entry.travel.ref }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ entry.travel.ref }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index d8e742706..8915a96ec 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -9,6 +9,7 @@ import { toCurrency } from 'src/filters';
import FetchData from 'src/components/FetchData.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
import CrudModel from 'src/components/CrudModel.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
const route = useRoute();
const { t } = useI18n();
@@ -225,7 +226,7 @@ async function addExpense() {
-
-
-
-
-
+ />
@@ -328,7 +325,7 @@ async function addExpense() {
-
-
-
-
-
+ />
-
-
-
-
-
+
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index f8a430b51..985bfb085 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
const { t } = useI18n();
const props = defineProps({
@@ -57,7 +58,11 @@ function setWorkers(data) {
-
+
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 3adfa1d13..66b9257a0 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
const { t } = useI18n();
const props = defineProps({
@@ -84,7 +85,7 @@ const props = defineProps({
- {
updateAddressForm(addressData);
}
});
+function handleLocation(data, location) {
+ const { town, code, provinceFk, countryFk } = location ?? {};
+ data.postalCode = code;
+ data.city = town;
+ data.provinceFk = provinceFk;
+ data.countryFk = countryFk;
+}
- (postcodesOptions = data)"
- auto-load
- />
- (provincesOptions = data)"
- auto-load
- url="Provinces"
- />
- (townsLocationOptions = data)"
- auto-load
- url="Towns/location"
- />
{
-
-
-
-
-
-
-
- {{ scope.opt.code }}
- {{ scope.opt.code }} -
- {{ scope.opt.town.name }} ({{
- scope.opt.town.province.name
- }},
- {{
- scope.opt.town.province.country.country
- }})
-
-
-
-
-
-
-
-
-
-
+ v-model="data.location"
+ @update:model-value="
+ (location) => handleLocation(data, location)
+ "
+ >
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 806dac0fe..e633334c9 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -21,7 +21,7 @@ const postcodesOptions = ref([]);
function handleLocation(data, location) {
const { town, code, provinceFk, countryFk } = location ?? {};
- data.postcode = code;
+ data.postCode = code;
data.city = town;
data.provinceFk = provinceFk;
data.countryFk = countryFk;
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 176d9adf4..8867c4289 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -78,7 +78,7 @@ const filter = {
@@ -102,10 +102,10 @@ const filter = {
-
+
{{ t('worker.summary.personalPhone') }}
-
+
diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index a7d59883c..ce79dc976 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -5,11 +5,12 @@ describe('InvoiceInList', () => {
':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';
+ const screen = '.q-page-container > .q-drawer-container > .fullscreen';
beforeEach(() => {
- cy.viewport(1920, 1080);
cy.login('developer');
cy.visit(`/#/invoice-in/list`);
+ cy.get(screen).click();
});
it('should redirect on clicking a invoice', () => {