-
+
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 3728a18c0..01937a87a 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -1,5 +1,5 @@
@@ -126,7 +120,7 @@ onMounted(async () => {
size="md"
icon="assignment"
color="primary"
- :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
+ :to="{ name: 'TicketSaleTracking', params: { id: entity.ticketFk } }"
>
{{ t('claim.saleTracking') }}
@@ -134,7 +128,7 @@ onMounted(async () => {
size="md"
icon="visibility"
color="primary"
- :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
+ :to="{ name: 'TicketTracking', params: { id: entity.ticketFk } }"
>
{{ t('claim.ticketTracking') }}
diff --git a/src/pages/Claim/Card/ClaimDescriptorProxy.vue b/src/pages/Claim/Card/ClaimDescriptorProxy.vue
index 78e686745..f4eff0843 100644
--- a/src/pages/Claim/Card/ClaimDescriptorProxy.vue
+++ b/src/pages/Claim/Card/ClaimDescriptorProxy.vue
@@ -4,11 +4,6 @@ import ClaimSummary from './ClaimSummary.vue';
-
+
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index e4b6f8365..fdcbf75d4 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -1,5 +1,4 @@
-
+
{
/>
-
- (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/Shelving/Parking/Card/ParkingDescriptorProxy.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
index e78a2b238..cff1f75c2 100644
--- a/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
+++ b/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
@@ -4,11 +4,6 @@ import ParkingSummary from './ParkingSummary.vue';
-
+
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 +132,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,
@@ -417,6 +425,14 @@ async function getZone(options) {
:rules="validate('ticketList.shipped')"
@update:model-value="setShipped"
/>
+
-import { reactive } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
@@ -30,31 +29,29 @@ const { t } = useI18n();
const router = useRouter();
const { notify } = useNotify();
-const newTicketFormData = reactive({});
const date = new Date();
-const createTicket = async () => {
+async function createTicket(formData) {
const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
const params = {
clientId: $props.ticket.clientFk,
- landed: newTicketFormData.landed,
+ landed: formData.landed,
warehouseId: $props.ticket.warehouseFk,
addressId: $props.ticket.addressFk,
agencyModeId: $props.ticket.agencyModeFk,
- routeId: newTicketFormData.routeFk,
+ routeId: formData.routeFk,
expeditionIds: expeditionIds,
};
-
const { data } = await axios.post('Expeditions/moveExpeditions', params);
notify(t('globals.dataSaved'), 'positive');
router.push({ name: 'TicketSummary', params: { id: data.id } });
-};
+}
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/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index f2a16b7e1..cb5ead5e3 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -1,6 +1,5 @@
{
ref="form"
:url-update="`Workers/${$route.params.id}`"
auto-load
- model="Worker"
+ :model
+ @on-fetch="(data, res, old, formData) => addAdvancedData(formData)"
>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 591dadcd2..b1bde6d75 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -4,9 +4,11 @@ import VnCard from 'src/components/common/VnCard.vue';
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 9576e7e84..db0c7c096 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -2,7 +2,6 @@
import { computed, ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
-import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
@@ -11,6 +10,8 @@ import VnImg from 'src/components/ui/VnImg.vue';
import EditPictureForm from 'components/EditPictureForm.vue';
import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import WorkerCard from './WorkerCard.vue';
const $props = defineProps({
id: {
@@ -52,14 +53,17 @@ const handlePhotoUpdated = (evt = false) => {
};
-
{
-
+
- (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();