-import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
@@ -7,29 +6,15 @@ import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnInputBic from 'src/components/common/VnInputBic.vue';
+import VnBankDetailsForm from 'src/components/common/VnBankDetailsForm.vue';
const { t } = useI18n();
const route = useRoute();
-
-const bankEntitiesRef = ref(null);
-
-const filter = {
- fields: ['id', 'bic', 'name'],
- order: 'bic ASC',
-};
-
-const getBankEntities = (data, formData) => {
- bankEntitiesRef.value.fetch();
- formData.bankEntityFk = Number(data.id);
-};
-
+
{
/>
-
- (data.bankEntityFk = bankEntityFk)"
+ {
+ if (!iban || !bankEntityFk) return;
+ data.iban = iban;
+ data.bankEntityFk = bankEntityFk;
+ }
+ "
/>
-
-
-
-
-
-
-
- {{ scope.opt.bic }}
- {{ scope.opt.name }}
-
-
-
-
-
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index cbbd6d205..02792182c 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -100,6 +100,9 @@ const columns = computed(() => [
'row-key': 'id',
selection: 'multiple',
}"
+ :multi-check="{
+ expand: true,
+ }"
v-model:selected="selected"
:right-search="true"
:columns="columns"
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
index f637c7e0a..141a02bfc 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -98,7 +98,9 @@ onMounted(async () => {
- {{ t('Campaign consumption') }}
+ {{
+ t('Campaign consumption', { rows: $props.clients.length })
+ }}
{
valentinesDay: Valentine's Day
mothersDay: Mother's Day
allSaints: All Saints' Day
+ Campaign consumption: Campaign consumption ({rows})
es:
params:
valentinesDay: Día de San Valentín
mothersDay: Día de la Madre
allSaints: Día de Todos los Santos
- Campaign consumption: Consumo campaña
+ Campaign consumption: Consumo campaña ({rows})
Campaign: Campaña
From: Desde
To: Hasta
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 2e3acdfb6..d26151994 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -7,12 +7,11 @@ import FetchData from 'components/FetchData.vue';
import CrudModel from 'components/CrudModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import { useQuasar } from 'quasar';
+import VnBankDetailsForm from 'src/components/common/VnBankDetailsForm.vue';
const { t } = useI18n();
const { notify } = useNotify();
@@ -26,11 +25,6 @@ const wireTransferFk = ref(null);
const bankEntitiesOptions = ref([]);
const filteredBankEntitiesOptions = ref([]);
-const onBankEntityCreated = async (dataSaved, rowData) => {
- await bankEntitiesRef.value.fetch();
- rowData.bankEntityFk = dataSaved.id;
-};
-
const onChangesSaved = async () => {
if (supplier.value.payMethodFk !== wireTransferFk.value)
quasar
@@ -56,23 +50,6 @@ const setWireTransfer = async () => {
await axios.patch(`Suppliers/${route.params.id}`, params);
notify('globals.dataSaved', 'positive');
};
-
-function findBankFk(value, row) {
- row.bankEntityFk = null;
- if (!value) return;
-
- const bankEntityFk = bankEntitiesOptions.value.find((b) => b.id == value.slice(4, 8));
- if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
-}
-
-function bankEntityFilter(val) {
- const needle = val.toLowerCase();
- filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
- (bank) =>
- bank.bic.toLowerCase().startsWith(needle) ||
- bank.name.toLowerCase().includes(needle),
- );
-}
- findBankFk(value, row)"
- :required="true"
- >
-
-
- {{ t('components.iban_tooltip') }}
-
-
-
-
-
-
- onBankEntityCreated(requestResponse, row)
- "
- />
-
-
-
-
- {{ scope.opt.bic }}
- {{ scope.opt.name }}
-
-
-
-
+ {
+ row.iban = iban;
+ row.bankEntityFk = bankEntityFk;
+ }
+ "
+ />
{
@@ -125,6 +134,7 @@ const addressId = computed({
formData.value.addressFk = val;
onChangeAddress(val);
getShipped({
+ shipped: formData.value?.shipped,
landed: formData.value?.landed,
addressFk: val,
agencyModeFk: formData.value?.agencyModeFk,
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index a3e25d63e..f2b474156 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -55,73 +55,75 @@ async function handleSave(e) {
auto-load
url="ObservationTypes"
/>
-
-
-
-
-
-
-
-
+
+
+
+
+
-
- {{ t('ticketNotes.removeNote') }}
-
-
-
-
-
-
- {{ t('ticketNotes.addNote') }}
-
-
-
-
-
-
+
+
+
+
+ {{ t('ticketNotes.removeNote') }}
+
+
+
+
+
+
+ {{ t('ticketNotes.addNote') }}
+
+
+
+
+
+
+
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index 5fbf4c800..ff55bf9d4 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -49,88 +49,95 @@ watch(
(listPackagingsOptions = data)"
auto-load
- :filter="{ fields: ['packagingFk', 'name'], order: 'name ASC' }"
url="Packagings/listPackaging"
+ :filter="{
+ fields: ['packagingFk', 'name'],
+ order: ['name ASC'],
+ }"
/>
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
- {{ scope.opt?.name }}
-
-
- #{{ scope.opt?.itemFk }}
-
-
-
-
-
-
-
-
-
- {{ t('package.removePackage') }}
-
-
-
-
-
-
- {{ t('package.addPackage') }}
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.opt?.name }}
+
+
+ #{{ scope.opt?.itemFk }}
+
+
+
+
+
+
+
+
+
+ {{ t('package.removePackage') }}
+
+
+
+
+
+
+ {{ t('package.addPackage') }}
+
+
+
+
+
+
+
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index ea6c76781..c98484ea3 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -385,7 +385,12 @@ watch(
if (!$el) return;
const head = $el.querySelector('thead');
const firstRow = $el.querySelector('thead > tr');
-
+ const headSelectionCol = $el.querySelector(
+ 'thead tr.bg-header th.q-table--col-auto-width',
+ );
+ if (headSelectionCol) {
+ headSelectionCol.classList.add('horizontal-separator');
+ }
const newRow = document.createElement('tr');
destinationElRef.value = document.createElement('th');
originElRef.value = document.createElement('th');
@@ -394,8 +399,8 @@ watch(
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
originElRef.value.classList.add('text-uppercase', 'color-vn-label');
- destinationElRef.value.setAttribute('colspan', '7');
- originElRef.value.setAttribute('colspan', '9');
+ destinationElRef.value.setAttribute('colspan', '10');
+ originElRef.value.setAttribute('colspan', '10');
destinationElRef.value.textContent = `${t(
'advanceTickets.destination',
@@ -490,8 +495,6 @@ watch(
selection: 'multiple',
}"
v-model:selected="selectedTickets"
- :pagination="{ rowsPerPage: 0 }"
- :no-data-label="$t('globals.noResults')"
:right-search="false"
:order="['futureTotalWithVat ASC']"
auto-load
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 613ac2d66..40bdd0e34 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -10,15 +10,13 @@ import VnRadio from 'src/components/common/VnRadio.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInputDate from 'src/components/common/VnInputDate.vue';
import VnLocation from 'src/components/common/VnLocation.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
import FetchData from 'src/components/FetchData.vue';
import WorkerFilter from './WorkerFilter.vue';
import { useState } from 'src/composables/useState';
import axios from 'axios';
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
import VnSection from 'src/components/common/VnSection.vue';
-import VnInputBic from 'src/components/common/VnInputBic.vue';
+import VnBankDetailsForm from 'src/components/common/VnBankDetailsForm.vue';
const { t } = useI18n();
const tableRef = ref();
@@ -122,12 +120,6 @@ onBeforeMount(async () => {
).data?.payMethodFk;
});
-async function handleNewBankEntity(data, resp) {
- await bankEntitiesRef.value.fetch();
- data.bankEntityFk = resp.id;
- bankEntitiesOptions.value.push(resp);
-}
-
function handleLocation(data, location) {
const { town, code, provinceFk, countryFk } = location ?? {};
data.postcode = code;
@@ -323,51 +315,19 @@ function generateCodeUser(worker) {
(val) => !val && delete data.payMethodFk
"
/>
- (data.bankEntityFk = bankEntityFk)
- "
- />
-
-
- handleNewBankEntity(data, resp)
- "
- />
-
-
-
-
- {{ scope.opt.bic }}
- {{ scope.opt.name }}
-
-
-
-
+ {
+ data.iban = iban;
+ data.bankEntityFk = bankEntityFk;
+ }
+ "
+ />
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 355eb900e..c8e2f1646 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -189,16 +189,14 @@ const exprBuilder = (param, value) => {
return {
code: { like: `%${value}%` },
};
+ case 'id':
+ case 'price':
case 'agencyModeFk':
return {
- agencyModeFk: value,
+ [param]: value,
};
case 'search':
return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
- case 'price':
- return {
- price: value,
- };
}
};
diff --git a/test/cypress/integration/item/ItemFixedPrice.spec.js b/test/cypress/integration/item/ItemFixedPrice.spec.js
index 41230f570..2b92c861e 100644
--- a/test/cypress/integration/item/ItemFixedPrice.spec.js
+++ b/test/cypress/integration/item/ItemFixedPrice.spec.js
@@ -54,7 +54,7 @@ describe('Handle Items FixedPrice', () => {
});
it('should edit all items', () => {
- cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+ cy.get('.bg-header > :nth-child(1) [data-cy="vnCheckbox"]').click();
cy.dataCy('FixedPriceToolbarEditBtn').should('not.be.disabled');
cy.dataCy('FixedPriceToolbarEditBtn').click();
cy.dataCy('EditFixedPriceSelectOption').type(grouping);
@@ -65,7 +65,7 @@ describe('Handle Items FixedPrice', () => {
});
it('should remove all items', () => {
- cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+ cy.get('.bg-header > :nth-child(1) [data-cy="vnCheckbox"]').click();
cy.dataCy('crudModelDefaultRemoveBtn').should('not.be.disabled');
cy.dataCy('crudModelDefaultRemoveBtn').click();
cy.dataCy('VnConfirm_confirm').click();