fix: refs #7356 remove bad code

This commit is contained in:
Javier Segarra 2025-03-27 23:29:11 +01:00
parent 39fcfb83a6
commit 9492c71128
7 changed files with 31 additions and 18 deletions

View File

@ -52,7 +52,12 @@ function onBeforeSave(formData, originalData) {
@on-fetch="(data) => (businessTypes = data)"
auto-load
/>
<FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
<FormModel
:url-update="`Clients/${route.params.id}`"
auto-load
:mapper="onBeforeSave"
model="Customer"
>
<template #form="{ data, validate }">
<VnRow>
<VnInput

View File

@ -31,6 +31,12 @@ function handleLocation(data, location) {
data.provinceFk = provinceFk;
data.countryFk = countryFk;
}
function onBeforeSave(formData, originalData) {
return getUpdatedValues(
Object.keys(getDifferences(formData, originalData)),
formData,
);
}
async function checkEtChanges(data, _, originalData) {
const equalizatedHasChanged = originalData.isEqualizated != data.isEqualizated;
@ -69,6 +75,7 @@ async function acceptPropagate({ isEqualizated }) {
:url-update="`Clients/${route.params.id}/updateFiscalData`"
auto-load
model="Customer"
:mapper="onBeforeSave"
observe-form-changes
@on-data-saved="checkEtChanges"
>

View File

@ -103,6 +103,17 @@ const calculateFromDeliveredAmount = (event) => {
initialData.amountToReturn = parseFloat(event) - initialData.amountPaid;
};
function onBeforeSave(data) {
const exceededAmount = data.amountPaid > maxAmount.value;
if (isCash.value && exceededAmount)
return notify(t('Amount exceeded', { maxAmount: maxAmount.value }), 'negative');
if (isCash.value && shouldSendEmail.value && !data.email)
return notify(t('There is no assigned email for this client'), 'negative');
return data;
}
async function onDataSaved(formData, { id }) {
try {
if (shouldSendEmail.value && isCash.value)
@ -171,6 +182,7 @@ async function getAmountPaid() {
ref="formModelRef"
:form-initial-data="initialData"
:url-create="urlCreate"
:mapper="onBeforeSave"
@on-data-saved="onDataSaved"
:prevent-submit="true"
>

View File

@ -1,7 +1,7 @@
<script setup>
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter, useRoute } from 'vue-router';
import { useRouter } from 'vue-router';
import TicketBasicData from './TicketBasicData.vue';
import TicketBasicDataForm from './TicketBasicDataForm.vue';
@ -13,7 +13,6 @@ import { useArrayData } from 'src/composables/useArrayData';
const { notify } = useNotify();
const router = useRouter();
const route = useRoute();
const { t } = useI18n();
const stepperRef = ref(null);
const { openConfirmationModal } = useVnConfirm();
@ -22,7 +21,6 @@ const step = ref(1);
const haveNegatives = ref(true);
const ticket = computed(() => useArrayData('Ticket').store?.data);
const entityId = computed(() => +route?.params?.id);
const isFormInvalid = () => {
return (

View File

@ -1,5 +1,5 @@
<script setup>
import { ref, reactive } from 'vue';
import { ref, reactive, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
@ -17,14 +17,6 @@ const user = state.getUser();
const route = useRoute();
const { t } = useI18n();
const tableRef = ref(null);
// watch(
// () => route.params.id,
// async (val) => {
// paginateFilter.where.ticketFk = val;
// paginateRef.value.fetch();
// },
// );
const onStateFkChange = (formData) => (formData.userFk = user.value.id);
const paginateFilter = reactive({
include: [
@ -54,7 +46,7 @@ const paginateFilter = reactive({
},
});
const columns = [
const columns = computed(() => [
{
label: t('ticketList.state'),
name: 'state',
@ -73,9 +65,9 @@ const columns = [
name: 'created',
field: 'created',
align: 'left',
format: (row) => toDateTimeFormat(row.created),
format: ({ created }) => toDateTimeFormat(created),
},
];
]);
</script>
<template>

View File

@ -260,7 +260,6 @@ const closeEventForm = () => {
onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
formInitialData: {},
}"
table-height="85vh"
v-model:selected="selectedRows"
:table="{
'row-key': 'id',

View File

@ -22,7 +22,7 @@ describe.skip('RouteAutonomous', () => {
};
const data = {
reference: '1234',
reference: 'Test invoice',
total: '€206.40',
supplier: 'PLANTS SL',
route: 'first route',