8282-testToMaster #1057

Merged
alexm merged 215 commits from 8282-testToMaster into master 2024-12-10 06:23:36 +00:00
123 changed files with 1923 additions and 1768 deletions
Showing only changes of commit 1974fd4663 - Show all commits

View File

@ -1,4 +1,7 @@
const { defineConfig } = require('cypress'); const { defineConfig } = require('cypress');
// https://docs.cypress.io/app/tooling/reporters
// https://docs.cypress.io/app/references/configuration
// https://www.npmjs.com/package/cypress-mochawesome-reporter
module.exports = defineConfig({ module.exports = defineConfig({
e2e: { e2e: {
@ -16,6 +19,7 @@ module.exports = defineConfig({
reporterOptions: { reporterOptions: {
charts: true, charts: true,
reportPageTitle: 'Cypress Inline Reporter', reportPageTitle: 'Cypress Inline Reporter',
reportFilename: '[status]_[datetime]-report',
embeddedScreenshots: true, embeddedScreenshots: true,
reportDir: 'test/cypress/reports', reportDir: 'test/cypress/reports',
inlineAssets: true, inlineAssets: true,

View File

@ -9,8 +9,6 @@ import VnRow from 'components/ui/VnRow.vue';
import FormModelPopup from './FormModelPopup.vue'; import FormModelPopup from './FormModelPopup.vue';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
defineProps({ showEntityField: { type: Boolean, default: true } });
const emit = defineEmits(['onDataSaved']); const emit = defineEmits(['onDataSaved']);
const { t } = useI18n(); const { t } = useI18n();
const bicInputRef = ref(null); const bicInputRef = ref(null);
@ -18,17 +16,16 @@ const state = useState();
const customer = computed(() => state.get('customer')); const customer = computed(() => state.get('customer'));
const countriesFilter = {
fields: ['id', 'name', 'code'],
};
const bankEntityFormData = reactive({ const bankEntityFormData = reactive({
name: null, name: null,
bic: null, bic: null,
countryFk: customer.value?.countryFk, countryFk: customer.value?.countryFk,
id: null,
}); });
const countriesFilter = {
fields: ['id', 'name', 'code'],
};
const countriesOptions = ref([]); const countriesOptions = ref([]);
const onDataSaved = (...args) => { const onDataSaved = (...args) => {
@ -44,7 +41,6 @@ onMounted(async () => {
<template> <template>
<FetchData <FetchData
url="Countries" url="Countries"
:filter="countriesFilter"
auto-load auto-load
@on-fetch="(data) => (countriesOptions = data)" @on-fetch="(data) => (countriesOptions = data)"
/> />
@ -54,6 +50,7 @@ onMounted(async () => {
:title="t('title')" :title="t('title')"
:subtitle="t('subtitle')" :subtitle="t('subtitle')"
:form-initial-data="bankEntityFormData" :form-initial-data="bankEntityFormData"
:filter="countriesFilter"
@on-data-saved="onDataSaved" @on-data-saved="onDataSaved"
> >
<template #form-inputs="{ data, validate }"> <template #form-inputs="{ data, validate }">
@ -85,7 +82,13 @@ onMounted(async () => {
:rules="validate('bankEntity.countryFk')" :rules="validate('bankEntity.countryFk')"
/> />
</div> </div>
<div v-if="showEntityField" class="col"> <div
v-if="
countriesOptions.find((c) => c.id === data.countryFk)?.code ==
'ES'
"
class="col"
>
<VnInput <VnInput
:label="t('id')" :label="t('id')"
v-model="data.id" v-model="data.id"

View File

@ -17,10 +17,6 @@ const $props = defineProps({
type: Number, type: Number,
default: null, default: null,
}, },
provinces: {
type: Array,
default: () => [],
},
}); });
const { t } = useI18n(); const { t } = useI18n();
@ -56,7 +52,6 @@ const onDataSaved = (...args) => {
:province-selected="$props.provinceSelected" :province-selected="$props.provinceSelected"
:country-fk="$props.countryFk" :country-fk="$props.countryFk"
v-model="data.provinceFk" v-model="data.provinceFk"
:provinces="$props.provinces"
/> />
</VnRow> </VnRow>
</template> </template>

View File

@ -56,10 +56,10 @@ async function onCityCreated(newTown, formData) {
} }
function setTown(newTown, data) { function setTown(newTown, data) {
if (!newTown) return;
town.value = newTown;
data.provinceFk = newTown.provinceFk; data.provinceFk = newTown.provinceFk;
data.countryFk = newTown.province.countryFk; data.countryFk = newTown.province.countryFk;
if (!newTown) return;
town.value = newTown;
} }
async function setProvince(id, data) { async function setProvince(id, data) {
@ -73,7 +73,7 @@ async function onProvinceCreated(data) {
await provincesFetchDataRef.value.fetch({ await provincesFetchDataRef.value.fetch({
where: { countryFk: postcodeFormData.countryFk }, where: { countryFk: postcodeFormData.countryFk },
}); });
postcodeFormData.provinceFk.value = data.id; postcodeFormData.provinceFk = data.id;
} }
watch( watch(
@ -90,22 +90,33 @@ watch(
postcodeFormData.townFk = null; postcodeFormData.townFk = null;
} }
if (oldValueFk !== newCountryFk) { if (oldValueFk !== newCountryFk) {
await provincesFetchDataRef.value.fetch({ await fetchProvinces(newCountryFk);
where: { await fetchTowns(newCountryFk);
countryFk: newCountryFk,
},
});
await townsFetchDataRef.value.fetch({
where: {
provinceFk: {
inq: provincesOptions.value.map(({ id }) => id),
},
},
});
} }
} }
); );
async function fetchTowns(countryFk) {
const townsFilter = countryFk
? {
where: {
provinceFk: {
inq: provincesOptions.value.map(({ id }) => id),
},
},
}
: {};
await townsFetchDataRef.value.fetch(townsFilter);
}
async function fetchProvinces(countryFk) {
const provincesFilter = countryFk
? {
where: {
countryFk: countryFk,
},
}
: {};
await provincesFetchDataRef.value.fetch(provincesFilter);
}
watch( watch(
() => postcodeFormData.provinceFk, () => postcodeFormData.provinceFk,
async (newProvinceFk, oldValueFk) => { async (newProvinceFk, oldValueFk) => {
@ -147,6 +158,13 @@ async function handleCountries(data) {
auto-load auto-load
url="Towns/location" url="Towns/location"
/> />
<FetchData
ref="CountriesFetchDataRef"
:sort-by="['name ASC']"
@on-fetch="handleCountries"
auto-load
url="Countries"
/>
<FormModelPopup <FormModelPopup
url-create="postcodes" url-create="postcodes"
@ -193,7 +211,6 @@ async function handleCountries(data) {
<CreateNewCityForm <CreateNewCityForm
:country-fk="data.countryFk" :country-fk="data.countryFk"
:province-selected="data.provinceFk" :province-selected="data.provinceFk"
:provinces="provincesOptions"
@on-data-saved=" @on-data-saved="
(_, requestResponse) => (_, requestResponse) =>
onCityCreated(requestResponse, data) onCityCreated(requestResponse, data)
@ -209,14 +226,12 @@ async function handleCountries(data) {
@update:model-value="(value) => setProvince(value, data)" @update:model-value="(value) => setProvince(value, data)"
v-model="data.provinceFk" v-model="data.provinceFk"
:clearable="true" :clearable="true"
:provinces="provincesOptions"
@on-province-created="onProvinceCreated" @on-province-created="onProvinceCreated"
/> />
<VnSelect <VnSelect
url="Countries"
:sort-by="['name ASC']"
:label="t('Country')" :label="t('Country')"
@update:options="handleCountries" @update:options="handleCountries"
:options="countriesOptions"
hide-selected hide-selected
option-label="name" option-label="name"
option-value="id" option-value="id"

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { reactive, ref } from 'vue'; import { computed, reactive, ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue'; import FetchData from 'components/FetchData.vue';
@ -34,6 +34,12 @@ const onDataSaved = (dataSaved, requestResponse) => {
); );
emit('onDataSaved', dataSaved, requestResponse); emit('onDataSaved', dataSaved, requestResponse);
}; };
const where = computed(() => {
if (!$props.countryFk) {
return {};
}
return { countryFk: $props.countryFk };
});
</script> </script>
<template> <template>
@ -41,9 +47,7 @@ const onDataSaved = (dataSaved, requestResponse) => {
@on-fetch="(data) => (autonomiesOptions = data)" @on-fetch="(data) => (autonomiesOptions = data)"
auto-load auto-load
:filter="{ :filter="{
where: { where,
countryFk: $props.countryFk,
},
}" }"
url="Autonomies/location" url="Autonomies/location"
:sort-by="['name ASC']" :sort-by="['name ASC']"

View File

@ -394,6 +394,7 @@ watch(formUrl, async () => {
@click="onSubmit" @click="onSubmit"
:disable="!hasChanges" :disable="!hasChanges"
:title="t('globals.save')" :title="t('globals.save')"
data-cy="crudModelDefaultSaveBtn"
/> />
<slot name="moreAfterActions" /> <slot name="moreAfterActions" />
</QBtnGroup> </QBtnGroup>

View File

@ -156,26 +156,22 @@ const rotateRight = () => {
}; };
const onSubmit = () => { const onSubmit = () => {
try { if (!newPhoto.files && !newPhoto.url) {
if (!newPhoto.files && !newPhoto.url) { notify(t('Select an image'), 'negative');
notify(t('Select an image'), 'negative'); return;
return;
}
const options = {
type: 'blob',
};
editor.value
.result(options)
.then((result) => {
const file = new File([result], newPhoto.files?.name || '');
newPhoto.blob = file;
})
.then(() => makeRequest());
} catch (err) {
console.error('Error uploading image');
} }
const options = {
type: 'blob',
};
editor.value
.result(options)
.then((result) => {
const file = new File([result], newPhoto.files?.name || '');
newPhoto.blob = file;
})
.then(() => makeRequest());
}; };
const makeRequest = async () => { const makeRequest = async () => {

View File

@ -51,21 +51,17 @@ const onDataSaved = () => {
}; };
const onSubmit = async () => { const onSubmit = async () => {
try { isLoading.value = true;
isLoading.value = true; const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk })); const payload = {
const payload = { field: selectedField.value.field,
field: selectedField.value.field, newValue: newValue.value,
newValue: newValue.value, lines: rowsToEdit,
lines: rowsToEdit, };
};
await axios.post($props.editUrl, payload); await axios.post($props.editUrl, payload);
onDataSaved(); onDataSaved();
isLoading.value = false; isLoading.value = false;
} catch (err) {
console.error('Error submitting table cell edit');
}
}; };
const closeForm = () => { const closeForm = () => {

View File

@ -84,34 +84,30 @@ const tableColumns = computed(() => [
]); ]);
const onSubmit = async () => { const onSubmit = async () => {
try { let filter = itemFilter;
let filter = itemFilter; const params = itemFilterParams;
const params = itemFilterParams; const where = {};
const where = {}; for (let key in params) {
for (let key in params) { const value = params[key];
const value = params[key]; if (!value) continue;
if (!value) continue;
switch (key) { switch (key) {
case 'name': case 'name':
where[key] = { like: `%${value}%` }; where[key] = { like: `%${value}%` };
break; break;
case 'producerFk': case 'producerFk':
case 'typeFk': case 'typeFk':
case 'size': case 'size':
case 'inkFk': case 'inkFk':
where[key] = value; where[key] = value;
}
} }
filter.where = where;
const { data } = await axios.get(props.url, {
params: { filter: JSON.stringify(filter) },
});
tableRows.value = data;
} catch (err) {
console.error('Error fetching entries items');
} }
filter.where = where;
const { data } = await axios.get(props.url, {
params: { filter: JSON.stringify(filter) },
});
tableRows.value = data;
}; };
const closeForm = () => { const closeForm = () => {

View File

@ -86,32 +86,28 @@ const tableColumns = computed(() => [
]); ]);
const onSubmit = async () => { const onSubmit = async () => {
try { let filter = travelFilter;
let filter = travelFilter; const params = travelFilterParams;
const params = travelFilterParams; const where = {};
const where = {}; for (let key in params) {
for (let key in params) { const value = params[key];
const value = params[key]; if (!value) continue;
if (!value) continue;
switch (key) { switch (key) {
case 'agencyModeFk': case 'agencyModeFk':
case 'warehouseInFk': case 'warehouseInFk':
case 'warehouseOutFk': case 'warehouseOutFk':
case 'shipped': case 'shipped':
case 'landed': case 'landed':
where[key] = value; where[key] = value;
}
} }
filter.where = where;
const { data } = await axios.get('Travels', {
params: { filter: JSON.stringify(filter) },
});
tableRows.value = data;
} catch (err) {
console.error('Error fetching travels');
} }
filter.where = where;
const { data } = await axios.get('Travels', {
params: { filter: JSON.stringify(filter) },
});
tableRows.value = data;
}; };
const closeForm = () => { const closeForm = () => {

View File

@ -91,6 +91,10 @@ const $props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
maxWidth: {
type: [String, Boolean],
default: '800px',
},
}); });
const emit = defineEmits(['onFetch', 'onDataSaved']); const emit = defineEmits(['onFetch', 'onDataSaved']);
const modelValue = computed( const modelValue = computed(
@ -283,6 +287,7 @@ defineExpose({
@submit="save" @submit="save"
@reset="reset" @reset="reset"
class="q-pa-md" class="q-pa-md"
:style="maxWidth ? 'max-width: ' + maxWidth : ''"
id="formModel" id="formModel"
> >
<QCard> <QCard>
@ -371,7 +376,6 @@ defineExpose({
color: black; color: black;
} }
#formModel { #formModel {
max-width: 800px;
width: 100%; width: 100%;
} }

View File

@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
const emit = defineEmits(['onSubmit']); const emit = defineEmits(['onSubmit']);
defineProps({ const $props = defineProps({
title: { title: {
type: String, type: String,
default: '', default: '',
@ -25,16 +25,21 @@ defineProps({
type: String, type: String,
default: '', default: '',
}, },
submitOnEnter: {
type: Boolean,
default: true,
},
}); });
const { t } = useI18n(); const { t } = useI18n();
const closeButton = ref(null); const closeButton = ref(null);
const isLoading = ref(false); const isLoading = ref(false);
const onSubmit = () => { const onSubmit = () => {
emit('onSubmit'); if ($props.submitOnEnter) {
closeForm(); emit('onSubmit');
closeForm();
}
}; };
const closeForm = () => { const closeForm = () => {

View File

@ -88,20 +88,16 @@ const applyTags = (params, search) => {
}; };
const fetchItemTypes = async (id) => { const fetchItemTypes = async (id) => {
try { const filter = {
const filter = { fields: ['id', 'name', 'categoryFk'],
fields: ['id', 'name', 'categoryFk'], where: { categoryFk: id },
where: { categoryFk: id }, include: 'category',
include: 'category', order: 'name ASC',
order: 'name ASC', };
}; const { data } = await axios.get('ItemTypes', {
const { data } = await axios.get('ItemTypes', { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); itemTypesOptions.value = data;
itemTypesOptions.value = data;
} catch (err) {
console.error('Error fetching item types', err);
}
}; };
const getCategoryClass = (category, params) => { const getCategoryClass = (category, params) => {
@ -111,23 +107,19 @@ const getCategoryClass = (category, params) => {
}; };
const getSelectedTagValues = async (tag) => { const getSelectedTagValues = async (tag) => {
try { if (!tag?.selectedTag?.id) return;
if (!tag?.selectedTag?.id) return; tag.value = null;
tag.value = null; const filter = {
const filter = { fields: ['value'],
fields: ['value'], order: 'value ASC',
order: 'value ASC', limit: 30,
limit: 30, };
};
const params = { filter: JSON.stringify(filter) }; const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, { const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
params, params,
}); });
tag.valueOptions = data; tag.valueOptions = data;
} catch (err) {
console.error('Error getting selected tag values');
}
}; };
const removeTag = (index, params, search) => { const removeTag = (index, params, search) => {

View File

@ -39,14 +39,10 @@ const refund = async () => {
invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk, invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
}; };
try { const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params); notify(t('Refunded invoice'), 'positive');
notify(t('Refunded invoice'), 'positive'); const [id] = data?.refundId || [];
const [id] = data?.refundId || []; if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
} catch (err) {
console.error('Error refunding invoice', err);
}
}; };
</script> </script>

View File

@ -49,36 +49,32 @@ const makeInvoice = async () => {
makeInvoice: checked.value, makeInvoice: checked.value,
}; };
try { if (checked.value && hasToInvoiceByAddress) {
if (checked.value && hasToInvoiceByAddress) { const response = await new Promise((resolve) => {
const response = await new Promise((resolve) => { quasar
quasar .dialog({
.dialog({ component: VnConfirm,
component: VnConfirm, componentProps: {
componentProps: { title: t('Bill destination client'),
title: t('Bill destination client'), message: t('transferInvoiceInfo'),
message: t('transferInvoiceInfo'), },
}, })
}) .onOk(() => {
.onOk(() => { resolve(true);
resolve(true); })
}) .onCancel(() => {
.onCancel(() => { resolve(false);
resolve(false); });
}); });
}); if (!response) {
if (!response) { return;
return;
}
} }
const { data } = await axios.post('InvoiceOuts/transfer', params);
notify(t('Transferred invoice'), 'positive');
const id = data?.[0];
if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
} catch (err) {
console.error('Error transfering invoice', err);
} }
const { data } = await axios.post('InvoiceOuts/transfer', params);
notify(t('Transferred invoice'), 'positive');
const id = data?.[0];
if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
}; };
</script> </script>

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref } from 'vue'; import { ref, watch } from 'vue';
import { useValidator } from 'src/composables/useValidator'; import { useValidator } from 'src/composables/useValidator';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
@ -17,20 +17,23 @@ const $props = defineProps({
type: Number, type: Number,
default: null, default: null,
}, },
provinces: {
type: Array,
default: () => [],
},
}); });
const provinceFk = defineModel({ type: Number, default: null }); const provinceFk = defineModel({ type: Number, default: null });
const { validate } = useValidator(); const { validate } = useValidator();
const { t } = useI18n(); const { t } = useI18n();
const filter = ref({
include: { relation: 'country' },
where: {
countryFk: $props.countryFk,
},
});
const provincesOptions = ref($props.provinces); const provincesOptions = ref($props.provinces);
provinceFk.value = $props.provinceSelected;
const provincesFetchDataRef = ref(); const provincesFetchDataRef = ref();
provinceFk.value = $props.provinceSelected;
if (!$props.countryFk) {
filter.value.where = {};
}
async function onProvinceCreated(_, data) { async function onProvinceCreated(_, data) {
await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } }); await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
provinceFk.value = data.id; provinceFk.value = data.id;
@ -39,23 +42,29 @@ async function onProvinceCreated(_, data) {
async function handleProvinces(data) { async function handleProvinces(data) {
provincesOptions.value = data; provincesOptions.value = data;
} }
watch(
() => $props.countryFk,
async () => {
if ($props.countryFk) {
filter.value.where.countryFk = $props.countryFk;
} else filter.value.where = {};
await provincesFetchDataRef.value.fetch({});
}
);
</script> </script>
<template> <template>
<FetchData <FetchData
ref="provincesFetchDataRef" ref="provincesFetchDataRef"
:filter="{ :filter="filter"
include: { relation: 'country' },
where: {
countryFk: $props.countryFk,
},
}"
@on-fetch="handleProvinces" @on-fetch="handleProvinces"
url="Provinces" url="Provinces"
auto-load
/> />
<VnSelectDialog <VnSelectDialog
:label="t('Province')" :label="t('Province')"
:options="$props.provinces" :options="provincesOptions"
:tooltip="t('Create province')" :tooltip="t('Create province')"
hide-selected hide-selected
v-model="provinceFk" v-model="provinceFk"

View File

@ -394,7 +394,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
:name="col.orderBy ?? col.name" :name="col.orderBy ?? col.name"
:data-key="$attrs['data-key']" :data-key="$attrs['data-key']"
:search-url="searchUrl" :search-url="searchUrl"
:vertical="true" :vertical="false"
/> />
</div> </div>
<slot <slot
@ -737,6 +737,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
fab fab
icon="add" icon="add"
shortcut="+" shortcut="+"
data-cy="vnTableCreateBtn"
/> />
<QTooltip self="top right"> <QTooltip self="top right">
{{ createForm?.title }} {{ createForm?.title }}

View File

@ -58,79 +58,71 @@ const getConfig = async (url, filter) => {
}; };
const fetchViewConfigData = async () => { const fetchViewConfigData = async () => {
try { const userConfigFilter = {
const userConfigFilter = { where: { tableCode: $props.tableCode, userFk: user.value.id },
where: { tableCode: $props.tableCode, userFk: user.value.id }, };
}; const userConfig = await getConfig('UserConfigViews', userConfigFilter);
const userConfig = await getConfig('UserConfigViews', userConfigFilter);
if (userConfig) { if (userConfig) {
initialUserConfigViewData.value = userConfig; initialUserConfigViewData.value = userConfig;
setUserConfigViewData(userConfig.configuration); setUserConfigViewData(userConfig.configuration);
return; return;
} }
const defaultConfigFilter = { where: { tableCode: $props.tableCode } }; const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter); const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
if (defaultConfig) { if (defaultConfig) {
// Si el backend devuelve una configuración por defecto la usamos // Si el backend devuelve una configuración por defecto la usamos
setUserConfigViewData(defaultConfig.columns); setUserConfigViewData(defaultConfig.columns);
return; return;
} else { } else {
// Si no hay configuración por defecto mostramos todas las columnas // Si no hay configuración por defecto mostramos todas las columnas
const defaultColumns = {}; const defaultColumns = {};
$props.allColumns.forEach((col) => (defaultColumns[col] = true)); $props.allColumns.forEach((col) => (defaultColumns[col] = true));
setUserConfigViewData(defaultColumns); setUserConfigViewData(defaultColumns);
}
} catch (err) {
console.error('Error fetching config view data', err);
} }
}; };
const saveConfig = async () => { const saveConfig = async () => {
try { const params = {};
const params = {}; const configuration = {};
const configuration = {};
formattedCols.value.forEach((col) => { formattedCols.value.forEach((col) => {
const { name, active } = col; const { name, active } = col;
configuration[name] = active; configuration[name] = active;
}); });
// Si existe una view config del usuario hacemos un update si no la creamos // Si existe una view config del usuario hacemos un update si no la creamos
if (initialUserConfigViewData.value) { if (initialUserConfigViewData.value) {
params.updates = [ params.updates = [
{ {
data: { data: {
configuration: configuration,
},
where: {
id: initialUserConfigViewData.value.id,
},
},
];
} else {
params.creates = [
{
userFk: user.value.id,
tableCode: $props.tableCode,
tableConfig: $props.tableCode,
configuration: configuration, configuration: configuration,
}, },
]; where: {
} id: initialUserConfigViewData.value.id,
},
const response = await axios.post('UserConfigViews/crud', params); },
if (response.data && response.data[0]) { ];
initialUserConfigViewData.value = response.data[0]; } else {
} params.creates = [
emitSavedConfig(); {
notify('globals.dataSaved', 'positive'); userFk: user.value.id,
popupProxyRef.value.hide(); tableCode: $props.tableCode,
} catch (err) { tableConfig: $props.tableCode,
console.error('Error saving user view config', err); configuration: configuration,
},
];
} }
const response = await axios.post('UserConfigViews/crud', params);
if (response.data && response.data[0]) {
initialUserConfigViewData.value = response.data[0];
}
emitSavedConfig();
notify('globals.dataSaved', 'positive');
popupProxyRef.value.hide();
}; };
const emitSavedConfig = () => { const emitSavedConfig = () => {

View File

@ -134,6 +134,7 @@ const handleInsertMode = (e) => {
:rules="mixinRules" :rules="mixinRules"
:lazy-rules="true" :lazy-rules="true"
hide-bottom-space hide-bottom-space
:data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
> >
<template v-if="$slots.prepend" #prepend> <template v-if="$slots.prepend" #prepend>
<slot name="prepend" /> <slot name="prepend" />
@ -142,7 +143,13 @@ const handleInsertMode = (e) => {
<QIcon <QIcon
name="close" name="close"
size="xs" size="xs"
v-if="hover && value && !$attrs.disabled && $props.clearable" v-if="
hover &&
value &&
!$attrs.disabled &&
!$attrs.readonly &&
$props.clearable
"
@click=" @click="
() => { () => {
value = null; value = null;

View File

@ -138,8 +138,6 @@ onMounted(() => {
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300); if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
}); });
defineExpose({ opts: myOptions });
const arrayDataKey = const arrayDataKey =
$props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label); $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
@ -259,6 +257,30 @@ async function onScroll({ to, direction, from, index }) {
isLoading.value = false; isLoading.value = false;
} }
} }
defineExpose({ opts: myOptions });
function handleKeyDown(event) {
if (event.key === 'Tab') {
event.preventDefault();
const inputValue = vnSelectRef.value?.inputValue;
if (inputValue) {
const matchingOption = myOptions.value.find(
(option) =>
option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
);
if (matchingOption) {
emit('update:modelValue', matchingOption[optionValue.value]);
} else {
emit('update:modelValue', inputValue);
}
vnSelectRef.value?.hidePopup();
}
}
}
</script> </script>
<template> <template>
@ -269,6 +291,7 @@ async function onScroll({ to, direction, from, index }) {
:option-value="optionValue" :option-value="optionValue"
v-bind="$attrs" v-bind="$attrs"
@filter="filterHandler" @filter="filterHandler"
@keydown="handleKeyDown"
:emit-value="nullishToTrue($attrs['emit-value'])" :emit-value="nullishToTrue($attrs['emit-value'])"
:map-options="nullishToTrue($attrs['map-options'])" :map-options="nullishToTrue($attrs['map-options'])"
:use-input="nullishToTrue($attrs['use-input'])" :use-input="nullishToTrue($attrs['use-input'])"
@ -283,6 +306,7 @@ async function onScroll({ to, direction, from, index }) {
:input-debounce="useURL ? '300' : '0'" :input-debounce="useURL ? '300' : '0'"
:loading="isLoading" :loading="isLoading"
@virtual-scroll="onScroll" @virtual-scroll="onScroll"
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
> >
<template v-if="isClearable" #append> <template v-if="isClearable" #append>
<QIcon <QIcon

View File

@ -86,7 +86,7 @@ async function send() {
</script> </script>
<template> <template>
<QDialog ref="dialogRef"> <QDialog ref="dialogRef" data-cy="vnSmsDialog">
<QCard class="q-pa-sm"> <QCard class="q-pa-sm">
<QCardSection class="row items-center q-pb-none"> <QCardSection class="row items-center q-pb-none">
<span class="text-h6 text-grey"> <span class="text-h6 text-grey">
@ -161,6 +161,7 @@ async function send() {
:loading="isLoading" :loading="isLoading"
color="primary" color="primary"
unelevated unelevated
data-cy="sendSmsBtn"
/> />
</QCardActions> </QCardActions>
</QCard> </QCard>

View File

@ -74,6 +74,9 @@ const arrayData = useArrayData($props.dataKey, {
const route = useRoute(); const route = useRoute();
const store = arrayData.store; const store = arrayData.store;
const userParams = ref({}); const userParams = ref({});
defineExpose({ search, sanitizer, params: userParams });
onMounted(() => { onMounted(() => {
userParams.value = $props.modelValue ?? {}; userParams.value = $props.modelValue ?? {};
emit('init', { params: userParams.value }); emit('init', { params: userParams.value });
@ -197,7 +200,7 @@ const customTags = computed(() =>
async function remove(key) { async function remove(key) {
userParams.value[key] = undefined; userParams.value[key] = undefined;
search(); await search();
emit('remove', key); emit('remove', key);
emit('update:modelValue', userParams.value); emit('update:modelValue', userParams.value);
} }
@ -223,8 +226,6 @@ function sanitizer(params) {
} }
return params; return params;
} }
defineExpose({ search, sanitizer, userParams });
</script> </script>
<template> <template>

View File

@ -132,10 +132,24 @@ const addFilter = async (filter, params) => {
async function fetch(params) { async function fetch(params) {
useArrayData(props.dataKey, params); useArrayData(props.dataKey, params);
arrayData.reset(['filter.skip', 'skip']); arrayData.reset(['filter.skip', 'skip', 'page']);
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false });
if (!store.hasMoreData) isLoading.value = false; return emitStoreData();
}
async function update(params) {
useArrayData(props.dataKey, params);
const { limit, skip } = store;
store.limit = limit + skip;
store.skip = 0;
await arrayData.fetch({ append: false });
store.limit = limit;
store.skip = skip;
return emitStoreData();
}
function emitStoreData() {
if (!store.hasMoreData) isLoading.value = false;
emit('onFetch', store.data); emit('onFetch', store.data);
return store.data; return store.data;
} }
@ -181,7 +195,7 @@ async function onLoad(index, done) {
done(isDone); done(isDone);
} }
defineExpose({ fetch, addFilter, paginate }); defineExpose({ fetch, update, addFilter, paginate });
</script> </script>
<template> <template>

View File

@ -130,6 +130,7 @@ async function search() {
dense dense
standout standout
autofocus autofocus
data-cy="vnSearchBar"
> >
<template #prepend> <template #prepend>
<QIcon <QIcon

View File

@ -1,6 +1,5 @@
<script setup> <script setup>
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { defineProps } from 'vue';
const props = defineProps({ const props = defineProps({
routeName: { routeName: {

View File

@ -1,11 +1,24 @@
import { useSession } from 'src/composables/useSession'; import { useSession } from 'src/composables/useSession';
import { getUrl } from './getUrl'; import { getUrl } from './getUrl';
import axios from 'axios';
import { exportFile } from 'quasar';
const { getTokenMultimedia } = useSession(); const { getTokenMultimedia } = useSession();
const token = getTokenMultimedia(); const token = getTokenMultimedia();
export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) { export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
let appUrl = await getUrl('', 'lilium'); const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
appUrl = appUrl.replace('/#/', ''); const response = await axios.get(
window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`); url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
{ responseType: 'blob' }
);
const contentDisposition = response.headers['content-disposition'];
const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
const filename =
matches != null && matches[1]
? matches[1].replace(/['"]/g, '')
: 'downloaded-file';
exportFile(filename, response.data);
} }

View File

@ -87,7 +87,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
const params = { filter }; const params = { filter };
Object.assign(params, userParams); Object.assign(params, userParams);
params.filter.skip = store.skip; if (params.filter) params.filter.skip = store.skip;
if (store?.order && typeof store?.order == 'string') store.order = [store.order]; if (store?.order && typeof store?.order == 'string') store.order = [store.order];
if (store.order?.length) params.filter.order = [...store.order]; if (store.order?.length) params.filter.order = [...store.order];
else delete params.filter.order; else delete params.filter.order;

View File

@ -241,7 +241,7 @@ input::-webkit-inner-spin-button {
th, th,
td { td {
padding: 1px 10px 1px 10px; padding: 1px 10px 1px 10px;
max-width: 100px; max-width: 130px;
div span { div span {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;

View File

@ -298,6 +298,7 @@ globals:
clientsActionsMonitor: Clients and actions clientsActionsMonitor: Clients and actions
serial: Serial serial: Serial
medical: Mutual medical: Mutual
pit: IRPF
RouteExtendedList: Router RouteExtendedList: Router
wasteRecalc: Waste recaclulate wasteRecalc: Waste recaclulate
operator: Operator operator: Operator
@ -768,6 +769,7 @@ travel:
hb: HB hb: HB
basicData: basicData:
daysInForward: Days in forward daysInForward: Days in forward
isRaid: Raid
thermographs: thermographs:
temperature: Temperature temperature: Temperature
destination: Destination destination: Destination

View File

@ -303,6 +303,7 @@ globals:
clientsActionsMonitor: Clientes y acciones clientsActionsMonitor: Clientes y acciones
serial: Facturas por serie serial: Facturas por serie
medical: Mutua medical: Mutua
pit: IRPF
wasteRecalc: Recalcular mermas wasteRecalc: Recalcular mermas
operator: Operario operator: Operario
parking: Parking parking: Parking
@ -762,6 +763,7 @@ travel:
hb: HB hb: HB
basicData: basicData:
daysInForward: Días redada daysInForward: Días redada
isRaid: Redada
thermographs: thermographs:
temperature: Temperatura temperature: Temperatura
destination: Destino destination: Destino

View File

@ -11,21 +11,13 @@ const { t } = useI18n();
const { notify } = useNotify(); const { notify } = useNotify();
const onSynchronizeAll = async () => { const onSynchronizeAll = async () => {
try { notify(t('Synchronizing in the background'), 'positive');
notify(t('Synchronizing in the background'), 'positive'); await axios.patch(`Accounts/syncAll`);
await axios.patch(`Accounts/syncAll`);
} catch (error) {
console.error('Error synchronizing all accounts', error);
}
}; };
const onSynchronizeRoles = async () => { const onSynchronizeRoles = async () => {
try { await axios.patch(`RoleInherits/sync`);
await axios.patch(`RoleInherits/sync`); notify(t('Roles synchronized!'), 'positive');
notify(t('Roles synchronized!'), 'positive');
} catch (error) {
console.error('Error synchronizing roles', error);
}
}; };
</script> </script>

View File

@ -111,29 +111,25 @@ const columns = computed(() => [
}, },
]); ]);
const deleteAcl = async ({ id }) => { const deleteAcl = async ({ id }) => {
try { await new Promise((resolve) => {
await new Promise((resolve) => { quasar
quasar .dialog({
.dialog({ component: VnConfirm,
component: VnConfirm, componentProps: {
componentProps: { title: t('Remove ACL'),
title: t('Remove ACL'), message: t('Do you want to remove this ACL?'),
message: t('Do you want to remove this ACL?'), },
}, })
}) .onOk(() => {
.onOk(() => { resolve(true);
resolve(true); })
}) .onCancel(() => {
.onCancel(() => { resolve(false);
resolve(false); });
}); });
}); await axios.delete(`ACLs/${id}`);
await axios.delete(`ACLs/${id}`); tableRef.value.reload();
tableRef.value.reload(); notify('ACL removed', 'positive');
notify('ACL removed', 'positive');
} catch (error) {
console.error('Error deleting Acl: ', error);
}
}; };
</script> </script>

View File

@ -34,13 +34,9 @@ const refresh = () => paginateRef.value.fetch();
const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } }); const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
const killSession = async ({ userId, created }) => { const killSession = async ({ userId, created }) => {
try { await axios.post(`${urlPath}/killSession`, { userId, created });
await axios.post(`${urlPath}/killSession`, { userId, created }); paginateRef.value.fetch();
paginateRef.value.fetch(); notify(t('Session killed'), 'positive');
notify(t('Session killed'), 'positive');
} catch (error) {
console.error('Error killing session', error);
}
}; };
</script> </script>

View File

@ -40,12 +40,8 @@ const formUrlCreate = ref(null);
const formUrlUpdate = ref(null); const formUrlUpdate = ref(null);
const formCustomFn = ref(null); const formCustomFn = ref(null);
const onTestConection = async () => { const onTestConection = async () => {
try { await axios.get(`LdapConfigs/test`);
await axios.get(`LdapConfigs/test`); notify(t('LDAP connection established!'), 'positive');
notify(t('LDAP connection established!'), 'positive');
} catch (error) {
console.error('Error testing connection', error);
}
}; };
const getInitialLdapConfig = async () => { const getInitialLdapConfig = async () => {
try { try {
@ -72,14 +68,10 @@ const getInitialLdapConfig = async () => {
} }
}; };
const deleteMailForward = async () => { const deleteMailForward = async () => {
try { await axios.delete(URL_UPDATE);
await axios.delete(URL_UPDATE); initialData.value = { ...DEFAULT_DATA };
initialData.value = { ...DEFAULT_DATA }; hasData.value = false;
hasData.value = false; notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive');
} catch (err) {
console.error('Error deleting mail forward', err);
}
}; };
onMounted(async () => await getInitialLdapConfig()); onMounted(async () => await getInitialLdapConfig());

View File

@ -46,12 +46,8 @@ const formUrlUpdate = ref(null);
const formCustomFn = ref(null); const formCustomFn = ref(null);
const onTestConection = async () => { const onTestConection = async () => {
try { await axios.get(`SambaConfigs/test`);
await axios.get(`SambaConfigs/test`); notify(t('Samba connection established!'), 'positive');
notify(t('Samba connection established!'), 'positive');
} catch (error) {
console.error('Error testing connection', error);
}
}; };
const getInitialSambaConfig = async () => { const getInitialSambaConfig = async () => {
@ -79,14 +75,10 @@ const getInitialSambaConfig = async () => {
}; };
const deleteMailForward = async () => { const deleteMailForward = async () => {
try { await axios.delete(URL_UPDATE);
await axios.delete(URL_UPDATE); initialData.value = { ...DEFAULT_DATA };
initialData.value = { ...DEFAULT_DATA }; hasData.value = false;
hasData.value = false; notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive');
} catch (err) {
console.error('Error deleting mail forward', err);
}
}; };
onMounted(async () => await getInitialSambaConfig()); onMounted(async () => await getInitialSambaConfig());

View File

@ -44,13 +44,9 @@ const removeAlias = () => {
cancel: true, cancel: true,
}) })
.onOk(async () => { .onOk(async () => {
try { await axios.delete(`MailAliases/${entityId.value}`);
await axios.delete(`MailAliases/${entityId.value}`); notify(t('Alias removed'), 'positive');
notify(t('Alias removed'), 'positive'); router.push({ name: 'AccountAlias' });
router.push({ name: 'AccountAlias' });
} catch (err) {
console.error('Error removing alias');
}
}); });
}; };
</script> </script>

View File

@ -41,35 +41,22 @@ const fetchAccountExistence = async () => {
}; };
const fetchMailForwards = async () => { const fetchMailForwards = async () => {
try { const response = await axios.get(`MailForwards/${route.params.id}`);
const response = await axios.get(`MailForwards/${route.params.id}`); return response.data;
return response.data;
} catch (err) {
console.error('Error fetching mail forwards', err);
return null;
}
}; };
const deleteMailForward = async () => { const deleteMailForward = async () => {
try { await axios.delete(`MailForwards/${route.params.id}`);
await axios.delete(`MailForwards/${route.params.id}`); formData.value.forwardTo = null;
formData.value.forwardTo = null; initialData.value.forwardTo = null;
initialData.value.forwardTo = null; initialData.value.hasData = hasData.value;
initialData.value.hasData = hasData.value; notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive');
} catch (err) {
console.error('Error deleting mail forward', err);
}
}; };
const updateMailForward = async () => { const updateMailForward = async () => {
try { await axios.patch('MailForwards', formData.value);
await axios.patch('MailForwards', formData.value); initialData.value = { ...formData.value };
initialData.value = { ...formData.value }; initialData.value.hasData = hasData.value;
initialData.value.hasData = hasData.value;
} catch (err) {
console.error('Error creating mail forward', err);
}
}; };
const onSubmit = async () => { const onSubmit = async () => {

View File

@ -32,12 +32,8 @@ const filter = {
where: { id: entityId }, where: { id: entityId },
}; };
const removeRole = async () => { const removeRole = async () => {
try { await axios.delete(`VnRoles/${entityId.value}`);
await axios.delete(`VnRoles/${entityId.value}`); notify(t('Role removed'), 'positive');
notify(t('Role removed'), 'positive');
} catch (error) {
console.error('Error deleting role', error);
}
}; };
</script> </script>

View File

@ -100,7 +100,7 @@ async function remove() {
</QMenu> </QMenu>
</QItem> </QItem>
<QSeparator /> <QSeparator />
<QItem @click="confirmRemove()" v-ripple clickable> <QItem @click="confirmRemove()" v-ripple clickable data-cy="deleteClaim">
<QItemSection avatar> <QItemSection avatar>
<QIcon name="delete" /> <QIcon name="delete" />
</QItemSection> </QItemSection>

View File

@ -130,7 +130,7 @@ function cancel() {
<template #body-cell-description="{ row, value }"> <template #body-cell-description="{ row, value }">
<QTd auto-width align="right" class="link"> <QTd auto-width align="right" class="link">
{{ value }} {{ value }}
<ItemDescriptorProxy :id="row.itemFk"></ItemDescriptorProxy> <ItemDescriptorProxy :id="row.itemFk" />
</QTd> </QTd>
</template> </template>
</QTable> </QTable>

View File

@ -25,7 +25,7 @@ const claimFilter = computed(() => {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['id', 'nickname'], fields: ['id', 'nickname', 'name'],
}, },
}, },
}, },

View File

@ -95,6 +95,7 @@ const columns = computed(() => [
optionLabel: 'description', optionLabel: 'description',
}, },
}, },
orderBy: 'priority',
}, },
{ {
align: 'right', align: 'right',

View File

@ -167,7 +167,7 @@ const toCustomerAddressEdit = (addressId) => {
<div>{{ item.street }}</div> <div>{{ item.street }}</div>
<div> <div>
{{ item.postalCode }} - {{ item.city }}, {{ item.postalCode }} - {{ item.city }},
{{ item.province.name }} {{ item.province?.name }}
</div> </div>
<div> <div>
{{ item.phone }} {{ item.phone }}

View File

@ -256,10 +256,10 @@ const showBalancePdf = ({ id }) => {
{{ toCurrency(balances[rowIndex]?.balance) }} {{ toCurrency(balances[rowIndex]?.balance) }}
</template> </template>
<template #column-description="{ row }"> <template #column-description="{ row }">
<div class="link" v-if="row.isInvoice"> <span class="link" v-if="row.isInvoice" @click.stop>
{{ t('bill', { ref: row.description }) }} {{ t('bill', { ref: row.description }) }}
<InvoiceOutDescriptorProxy :id="row.description" /> <InvoiceOutDescriptorProxy :id="row.id" />
</div> </span>
<span v-else class="q-pa-xs dotted rounded-borders" :title="row.description"> <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
{{ row.description }} {{ row.description }}
</span> </span>

View File

@ -106,28 +106,24 @@ const setParams = (params) => {
}; };
const getPreview = async () => { const getPreview = async () => {
try { const params = {
const params = { recipientId: entityId,
recipientId: entityId, };
}; const validationMessage = validateMessage();
const validationMessage = validateMessage(); if (validationMessage) return notify(t(validationMessage), 'negative');
if (validationMessage) return notify(t(validationMessage), 'negative');
setParams(params); setParams(params);
const path = `${sampleType.value.model}/${entityId.value}/${sampleType.value.code}-html`; const path = `${sampleType.value.model}/${entityId.value}/${sampleType.value.code}-html`;
const { data } = await axios.get(path, { params }); const { data } = await axios.get(path, { params });
if (!data) return; if (!data) return;
quasar.dialog({ quasar.dialog({
component: CustomerSamplesPreview, component: CustomerSamplesPreview,
componentProps: { componentProps: {
htmlContent: data, htmlContent: data,
}, },
}); });
} catch (err) {
notify('Errors getting preview', 'negative');
}
}; };
const onSubmit = async () => { const onSubmit = async () => {

View File

@ -42,13 +42,9 @@ const setData = (entity) => {
}; };
const removeDepartment = async () => { const removeDepartment = async () => {
try { await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value); router.push({ name: 'WorkerDepartment' });
router.push({ name: 'WorkerDepartment' }); notify('department.departmentRemoved', 'positive');
notify('department.departmentRemoved', 'positive');
} catch (err) {
console.error('Error removing department');
}
}; };
const { openConfirmationModal } = useVnConfirm(); const { openConfirmationModal } = useVnConfirm();

View File

@ -236,13 +236,9 @@ const copyOriginalRowsData = (rows) => {
}; };
const saveChange = async (field, { rowIndex, row }) => { const saveChange = async (field, { rowIndex, row }) => {
try { if (originalRowDataCopy.value[rowIndex][field] == row[field]) return;
if (originalRowDataCopy.value[rowIndex][field] == row[field]) return; await axios.patch(`Buys/${row.id}`, row);
await axios.patch(`Buys/${row.id}`, row); originalRowDataCopy.value[rowIndex][field] = row[field];
originalRowDataCopy.value[rowIndex][field] = row[field];
} catch (err) {
console.error('Error saving changes', err);
}
}; };
const openRemoveDialog = async () => { const openRemoveDialog = async () => {
@ -260,15 +256,11 @@ const openRemoveDialog = async () => {
}, },
}) })
.onOk(async () => { .onOk(async () => {
try { await deleteBuys();
await deleteBuys(); const notifyMessage = t(
const notifyMessage = t( `Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted`
`Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted` );
); notify(notifyMessage, 'positive');
notify(notifyMessage, 'positive');
} catch (err) {
console.error('Error deleting buys');
}
}); });
}; };
@ -282,17 +274,13 @@ const importBuys = () => {
}; };
const toggleGroupingMode = async (buy, mode) => { const toggleGroupingMode = async (buy, mode) => {
try { const groupingMode = mode === 'grouping' ? mode : 'packing';
const groupingMode = mode === 'grouping' ? mode : 'packing'; const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode; const params = {
const params = { groupingMode: newGroupingMode,
groupingMode: newGroupingMode, };
}; await axios.patch(`Buys/${buy.id}`, params);
await axios.patch(`Buys/${buy.id}`, params); buy.groupingMode = newGroupingMode;
buy.groupingMode = newGroupingMode;
} catch (err) {
console.error('Error toggling grouping mode');
}
}; };
const lockIconType = (groupingMode, mode) => { const lockIconType = (groupingMode, mode) => {

View File

@ -123,36 +123,28 @@ const fillData = async (rawData) => {
}; };
const fetchBuys = async (buys) => { const fetchBuys = async (buys) => {
try { const params = { buys };
const params = { buys }; const { data } = await axios.post(
const { data } = await axios.post( `Entries/${route.params.id}/importBuysPreview`,
`Entries/${route.params.id}/importBuysPreview`, params
params );
); importData.value.buys = data;
importData.value.buys = data;
} catch (err) {
console.error('Error fetching buys');
}
}; };
const onSubmit = async () => { const onSubmit = async () => {
try { const params = importData.value;
const params = importData.value; const hasAnyEmptyRow = params.buys.some((buy) => {
const hasAnyEmptyRow = params.buys.some((buy) => { return buy.itemFk === null;
return buy.itemFk === null; });
});
if (hasAnyEmptyRow) { if (hasAnyEmptyRow) {
notify(t('Some of the imported buys does not have an item'), 'negative'); notify(t('Some of the imported buys does not have an item'), 'negative');
return; return;
}
await axios.post(`Entries/${route.params.id}/importBuys`, params);
notify('globals.dataSaved', 'positive');
redirectToBuysView();
} catch (err) {
console.error('Error importing buys', err);
} }
await axios.post(`Entries/${route.params.id}/importBuys`, params);
notify('globals.dataSaved', 'positive');
redirectToBuysView();
}; };
const redirectToBuysView = () => { const redirectToBuysView = () => {

View File

@ -147,12 +147,9 @@ async function setEntryData(data) {
} }
const fetchEntryBuys = async () => { const fetchEntryBuys = async () => {
try {
const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`); const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
if (data) entryBuys.value = data; if (data) entryBuys.value = data;
} catch (err) {
console.error('Error fetching entry buys');
}
}; };
</script> </script>

View File

@ -221,7 +221,7 @@ onMounted(async () => {
t('entry.list.tableVisibleColumns.isExcludedFromAvailable') t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
}}</QTooltip> }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="!!row.daysInForward" name="vn:net" color="primary"> <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
<QTooltip> <QTooltip>
{{ {{
t('globals.raid', { daysInForward: row.daysInForward }) t('globals.raid', { daysInForward: row.daysInForward })

View File

@ -30,8 +30,6 @@ const recalc = async () => {
isLoading.value = true; isLoading.value = true;
await axios.post('Applications/waste_addSales/execute-proc', params); await axios.post('Applications/waste_addSales/execute-proc', params);
notify('wasteRecalc.recalcOk', 'positive'); notify('wasteRecalc.recalcOk', 'positive');
} catch (err) {
console.error(err);
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }

View File

@ -61,25 +61,18 @@ const showSendInvoiceDialog = (type) => {
}; };
const sendEmailInvoice = async ({ address }) => { const sendEmailInvoice = async ({ address }) => {
try { if (!address) notify(`The email can't be empty`, 'negative');
if (!address) notify(`The email can't be empty`, 'negative');
if (invoiceFormType.value === 'pdf') { if (invoiceFormType.value === 'pdf') {
return sendEmail(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-email`, { return sendEmail(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-email`, {
recipientId: $props.invoiceOutData.client.id, recipientId: $props.invoiceOutData.client.id,
recipient: address, recipient: address,
}); });
} else { } else {
return sendEmail( return sendEmail(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-csv-email`, {
`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-csv-email`, recipientId: $props.invoiceOutData.client.id,
{ recipient: address,
recipientId: $props.invoiceOutData.client.id, });
recipient: address,
}
);
}
} catch (err) {
console.error('Error sending email', err);
} }
}; };
@ -88,46 +81,30 @@ const redirectToInvoiceOutList = () => {
}; };
const deleteInvoice = async () => { const deleteInvoice = async () => {
try { await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/delete`);
await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/delete`); notify(t('InvoiceOut deleted'), 'positive');
notify(t('InvoiceOut deleted'), 'positive');
} catch (err) {
console.error('Error deleting invoice out', err);
}
}; };
const bookInvoice = async () => { const bookInvoice = async () => {
try { await axios.post(`InvoiceOuts/${$props.invoiceOutData.ref}/book`);
await axios.post(`InvoiceOuts/${$props.invoiceOutData.ref}/book`); notify(t('InvoiceOut booked'), 'positive');
notify(t('InvoiceOut booked'), 'positive');
} catch (err) {
console.error('Error booking invoice out', err);
}
}; };
const generateInvoicePdf = async () => { const generateInvoicePdf = async () => {
try { await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/createPdf`);
await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/createPdf`); notify(t('The invoice PDF document has been regenerated'), 'positive');
notify(t('The invoice PDF document has been regenerated'), 'positive');
} catch (err) {
console.error('Error generating invoice out pdf', err);
}
}; };
const refundInvoice = async (withWarehouse) => { const refundInvoice = async (withWarehouse) => {
try { const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse }; const { data } = await axios.post('InvoiceOuts/refund', params);
const { data } = await axios.post('InvoiceOuts/refund', params); location.href = window.origin + `/#/ticket/${data[0].id}/sale`;
location.href = window.origin + `/#/ticket/${data[0].id}/sale`; notify(
notify( t('refundInvoiceSuccessMessage', {
t('refundInvoiceSuccessMessage', { refundTicket: data[0].id,
refundTicket: data[0].id, }),
}), 'positive'
'positive' );
);
} catch (err) {
console.error('Error generating invoice out pdf', err);
}
}; };
const showTransferInvoiceForm = async () => { const showTransferInvoiceForm = async () => {

View File

@ -135,15 +135,10 @@ onMounted(() => (stateStore.rightDrawer = true));
onUnmounted(() => (stateStore.rightDrawer = false)); onUnmounted(() => (stateStore.rightDrawer = false));
function openPdf(id) { function openPdf(id) {
try { openReport(`${MODEL}/${id}/download`);
openReport(`${MODEL}/${id}/download`);
} catch (err) {
console.error('Error opening PDF', err);
}
} }
function downloadPdf() { function downloadPdf() {
try {
if (selectedRows.value.size === 0) return; if (selectedRows.value.size === 0) return;
const selectedCardsArray = Array.from(selectedRows.value.values()); const selectedCardsArray = Array.from(selectedRows.value.values());
@ -162,9 +157,7 @@ function downloadPdf() {
openReport(`${MODEL}/downloadZip`, params); openReport(`${MODEL}/downloadZip`, params);
} }
} catch (err) {
console.error('Error opening PDF');
}
} }
watchEffect(selectedRows); watchEffect(selectedRows);

View File

@ -170,7 +170,7 @@ onMounted(async () => {
from.value = getDate(_from, 'from'); from.value = getDate(_from, 'from');
const _to = Date.vnNew(); const _to = Date.vnNew();
_to.setDate(_to.getDate() + 10); _to.setDate(_to.getDate() + 10);
to.value = getDate(Date.vnNew(), 'to'); to.value = getDate(_to, 'to');
updateFilter(); updateFilter();

View File

@ -45,13 +45,9 @@ const arrayData = useArrayData('ItemShelvings', {
const rows = computed(() => arrayData.store.data || []); const rows = computed(() => arrayData.store.data || []);
const applyColumnFilter = async (col) => { const applyColumnFilter = async (col) => {
try { const paramKey = col.columnFilter?.filterParamKey || col.field;
const paramKey = col.columnFilter?.filterParamKey || col.field; params[paramKey] = col.columnFilter.filterValue;
params[paramKey] = col.columnFilter.filterValue; await arrayData.addFilter({ filter: null, params });
await arrayData.addFilter({ filter: null, params });
} catch (err) {
console.error('Error applying column filter', err);
}
}; };
const getInputEvents = (col) => { const getInputEvents = (col) => {
@ -173,15 +169,11 @@ const totalLabels = computed(() =>
); );
const removeLines = async () => { const removeLines = async () => {
try { const itemShelvingIds = rowsSelected.value.map((row) => row.itemShelvingFk);
const itemShelvingIds = rowsSelected.value.map((row) => row.itemShelvingFk); await axios.post('ItemShelvings/deleteItemShelvings', { itemShelvingIds });
await axios.post('ItemShelvings/deleteItemShelvings', { itemShelvingIds }); rowsSelected.value = [];
rowsSelected.value = []; notify('shelvings.shelvingsRemoved', 'positive');
notify('shelvings.shelvingsRemoved', 'positive'); await arrayData.fetch({ append: false });
await arrayData.fetch({ append: false });
} catch (err) {
console.error('Error removing lines', err);
}
}; };
onMounted(async () => { onMounted(async () => {
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false });

View File

@ -19,22 +19,18 @@ const tagOptions = ref([]);
const valueOptionsMap = ref(new Map()); const valueOptionsMap = ref(new Map());
const getSelectedTagValues = async (tag) => { const getSelectedTagValues = async (tag) => {
try { if (!tag.tagFk && tag.tag.isFree) return;
if (!tag.tagFk && tag.tag.isFree) return; const filter = {
const filter = { fields: ['value'],
fields: ['value'], order: 'value ASC',
order: 'value ASC', limit: 30,
limit: 30, };
};
const params = { filter: JSON.stringify(filter) }; const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(`Tags/${tag.tagFk}/filterValue`, { const { data } = await axios.get(`Tags/${tag.tagFk}/filterValue`, {
params, params,
}); });
valueOptionsMap.value.set(tag.tagFk, data); valueOptionsMap.value.set(tag.tagFk, data);
} catch (err) {
console.error('Error getting selected tag values');
}
}; };
const onItemTagsFetched = async (itemTags) => { const onItemTagsFetched = async (itemTags) => {

View File

@ -32,17 +32,13 @@ const ItemTaxRef = ref(null);
const taxesOptions = ref([]); const taxesOptions = ref([]);
const submitTaxes = async (data) => { const submitTaxes = async (data) => {
try { let payload = data.map((tax) => ({
let payload = data.map((tax) => ({ id: tax.id,
id: tax.id, taxClassFk: tax.taxClassFk,
taxClassFk: tax.taxClassFk, }));
}));
await axios.post(`Items/updateTaxes`, payload); await axios.post(`Items/updateTaxes`, payload);
notify(t('globals.dataSaved'), 'positive'); notify(t('globals.dataSaved'), 'positive');
} catch (err) {
console.error('Error saving taxes', err);
}
}; };
</script> </script>
<template> <template>

View File

@ -221,24 +221,16 @@ const updateMinPrice = async (value, props) => {
}; };
const upsertPrice = async (props, resetMinPrice = false) => { const upsertPrice = async (props, resetMinPrice = false) => {
try { const { row } = props;
const { row } = props; if (tableRef.value.CrudModelRef.getChanges().updates.length > 0) {
if (tableRef.value.CrudModelRef.getChanges().updates.length > 0) { if (resetMinPrice) row.hasMinPrice = 0;
if (resetMinPrice) row.hasMinPrice = 0; await upsertFixedPrice(row);
await upsertFixedPrice(row);
}
} catch (err) {
console.error('Error editing price', err);
} }
}; };
async function upsertFixedPrice(row) { async function upsertFixedPrice(row) {
try { const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row); return data;
return data;
} catch (err) {
console.error('Error editing price', err);
}
} }
async function saveOnRowChange(row) { async function saveOnRowChange(row) {
@ -321,14 +313,10 @@ const onEditCellDataSaved = async () => {
}; };
const removeFuturePrice = async () => { const removeFuturePrice = async () => {
try { rowsSelected.value.forEach(({ id }) => {
rowsSelected.value.forEach(({ id }) => { const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id);
const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id); removePrice(id, rowIndex);
removePrice(id, rowIndex); });
});
} catch (err) {
console.error('Error removing price', err);
}
}; };
function confirmRemove(item, isFuture) { function confirmRemove(item, isFuture) {
@ -345,13 +333,9 @@ function confirmRemove(item, isFuture) {
} }
const removePrice = async (id) => { const removePrice = async (id) => {
try { await axios.delete(`FixedPrices/${id}`);
await axios.delete(`FixedPrices/${id}`); notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive'); tableRef.value.reload({});
tableRef.value.reload({});
} catch (err) {
console.error('Error removing price', err);
}
}; };
const dateStyle = (date) => const dateStyle = (date) =>
date date

View File

@ -55,22 +55,18 @@ const onCategoryChange = async (categoryFk, search) => {
}; };
const getSelectedTagValues = async (tag) => { const getSelectedTagValues = async (tag) => {
try { if (!tag?.selectedTag?.id) return;
if (!tag?.selectedTag?.id) return; tag.value = null;
tag.value = null; const filter = {
const filter = { fields: ['value'],
fields: ['value'], order: 'value ASC',
order: 'value ASC', };
};
const params = { filter: JSON.stringify(filter) }; const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, { const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
params, params,
}); });
tag.valueOptions = data; tag.valueOptions = data;
} catch (err) {
console.error('Error getting selected tag values');
}
}; };
const applyTags = (params, search) => { const applyTags = (params, search) => {

View File

@ -173,40 +173,29 @@ const getBadgeColor = (date) => {
}; };
const changeQuantity = async (request) => { const changeQuantity = async (request) => {
try { if (request.saleFk) {
if (request.saleFk) { const params = {
const params = { quantity: request.saleQuantity,
quantity: request.saleQuantity, };
};
await axios.patch(`Sales/${request.saleFk}`, params); await axios.patch(`Sales/${request.saleFk}`, params);
notify(t('globals.dataSaved'), 'positive'); notify(t('globals.dataSaved'), 'positive');
confirmRequest(request); confirmRequest(request);
} else confirmRequest(request); } else confirmRequest(request);
} catch (error) {
console.error('Error changing quantity:: ', error);
}
}; };
const confirmRequest = async (request) => { const confirmRequest = async (request) => {
try { if (request.itemFk && request.saleQuantity) {
if (request.itemFk && request.saleQuantity) { const params = {
const params = { itemFk: request.itemFk,
itemFk: request.itemFk, quantity: request.saleQuantity,
quantity: request.saleQuantity, attenderFk: request.attenderFk,
attenderFk: request.attenderFk, };
};
const { data } = await axios.post( const { data } = await axios.post(`TicketRequests/${request.id}/confirm`, params);
`TicketRequests/${request.id}/confirm`, request.itemDescription = data.concept;
params request.isOk = true;
); notify(t('globals.dataSaved'), 'positive');
request.itemDescription = data.concept;
request.isOk = true;
notify(t('globals.dataSaved'), 'positive');
}
} catch (error) {
console.error('Error confirming request:: ', error);
} }
}; };

View File

@ -103,15 +103,11 @@ const getBadgeColor = (date) => {
}; };
const removeOrders = async () => { const removeOrders = async () => {
try { const selectedIds = selectedRows.value.map((row) => row.id);
const selectedIds = selectedRows.value.map((row) => row.id); const params = { deletes: selectedIds };
const params = { deletes: selectedIds }; await axios.post('SalesMonitors/deleteOrders', params);
await axios.post('SalesMonitors/deleteOrders', params); selectedRows.value = [];
selectedRows.value = []; await table.value.reload();
await table.value.reload();
} catch (err) {
console.error('Error deleting orders', err);
}
}; };
const openTab = (id) => const openTab = (id) =>

View File

@ -350,7 +350,7 @@ const openTab = (id) =>
class="q-mr-sm" class="q-mr-sm"
dense dense
flat flat
@click="$refs.tableRef.reload()" @click="tableRef.CrudModelRef.vnPaginateRef.update()"
> >
<QTooltip>{{ $t('globals.refresh') }}</QTooltip> <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
</QBtn> </QBtn>

View File

@ -2,7 +2,7 @@
import { ref } from 'vue'; import { ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import axios from 'axios'; import axios from 'axios';
import VnSelect from 'components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
const props = defineProps({ const props = defineProps({
@ -31,47 +31,26 @@ const applyTags = () => {
emit('applyTags', tagInfo); emit('applyTags', tagInfo);
}; };
const removeTagGroupParam = (valIndex = null) => {
if (!valIndex) {
tagValues.value = [{}];
} else {
(tagValues.value || []).splice(valIndex, 1);
}
};
const getSelectedTagValues = async (tag) => { const getSelectedTagValues = async (tag) => {
try { if (!tag?.id) return;
if (!tag?.id) return; const filter = {
const filter = { fields: ['value'],
fields: ['value'], order: 'value ASC',
order: 'value ASC', limit: 30,
limit: 30, };
};
const url = `Tags/${tag?.id}/filterValue`; const url = `Tags/${tag?.id}/filterValue`;
const params = { filter: JSON.stringify(filter) }; const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(url, { const { data } = await axios.get(url, {
params, params,
}); });
tagOptions.value = data; tagOptions.value = data;
} catch (err) {
console.error('Error getting selected tag values');
}
}; };
</script> </script>
<template> <template>
<QForm @submit="applyTags(tagValues)" class="all-pointer-events"> <QForm @submit="applyTags()" class="all-pointer-events">
<QCard class="q-pa-sm column q-pa-lg"> <QCard class="q-pa-sm column q-pa-lg">
<QBtn
round
color="primary"
style="position: absolute; z-index: 1; right: 0; top: 0"
icon="search"
type="submit"
>
</QBtn>
<VnSelect <VnSelect
:label="t('params.tag')" :label="t('params.tag')"
v-model="selectedTag" v-model="selectedTag"
@ -84,17 +63,7 @@ const getSelectedTagValues = async (tag) => {
rounded rounded
:emit-value="false" :emit-value="false"
use-input use-input
@update:model-value="($event) => getSelectedTagValues($event)" @update:model-value="getSelectedTagValues"
/>
<QBtn
icon="add_circle"
shortcut="+"
flat
class="filter-icon q-mb-md"
size="md"
dense
:disabled="!selectedTag || !tagValues[0].value"
@click="tagValues.unshift({})"
/> />
<div <div
v-for="(value, index) in tagValues" v-for="(value, index) in tagValues"
@ -106,7 +75,7 @@ const getSelectedTagValues = async (tag) => {
v-if="!selectedTag?.isFree && tagOptions" v-if="!selectedTag?.isFree && tagOptions"
:label="t('components.itemsFilterPanel.value')" :label="t('components.itemsFilterPanel.value')"
v-model="value.value" v-model="value.value"
:options="tagOptions || []" :options="tagOptions"
option-value="value" option-value="value"
option-label="value" option-label="value"
dense dense
@ -124,7 +93,6 @@ const getSelectedTagValues = async (tag) => {
:label="t('components.itemsFilterPanel.value')" :label="t('components.itemsFilterPanel.value')"
:disable="!value" :disable="!value"
is-outlined is-outlined
:is-clearable="false"
class="col" class="col"
/> />
<QBtn <QBtn
@ -135,11 +103,25 @@ const getSelectedTagValues = async (tag) => {
rounded rounded
flat flat
class="filter-icon col-2" class="filter-icon col-2"
:disabled="!value.value" @click="tagValues.splice(index, 1)"
@click="removeTagGroupParam(index)"
/> />
</div> </div>
</div> </div>
<QBtn
icon="add_circle"
shortcut="+"
flat
class="filter-icon q-mb-md"
size="md"
dense
@click="tagValues.push({})"
/>
<QBtn
color="primary"
icon="search"
type="submit"
:label="$t('globals.search')"
/>
</QCard> </QCard>
</QForm> </QForm>
</template> </template>

View File

@ -22,22 +22,17 @@ const agencyList = ref([]);
const addressList = ref([]); const addressList = ref([]);
const fetchAddressList = async (addressId) => { const fetchAddressList = async (addressId) => {
try { const { data } = await axios.get('addresses', {
const { data } = await axios.get('addresses', { params: {
params: { filter: JSON.stringify({
filter: JSON.stringify({ fields: ['id', 'nickname', 'street', 'city'],
fields: ['id', 'nickname', 'street', 'city'], where: { id: addressId },
where: { id: addressId }, }),
}), },
}, });
}); addressList.value = data;
addressList.value = data; if (addressList.value?.length === 1) {
if (addressList.value?.length === 1) { state.get(ORDER_MODEL).addressFk = addressList.value[0].id;
state.get(ORDER_MODEL).addressFk = addressList.value[0].id;
}
} catch (err) {
console.error(`Error fetching addresses`, err);
return err.response;
} }
}; };
@ -45,18 +40,13 @@ const fetchAgencyList = async (landed, addressFk) => {
if (!landed || !addressFk) { if (!landed || !addressFk) {
return; return;
} }
try { const { data } = await axios.get('Agencies/landsThatDay', {
const { data } = await axios.get('Agencies/landsThatDay', { params: {
params: { addressFk,
addressFk, landed: new Date(landed).toISOString(),
landed: new Date(landed).toISOString(), },
}, });
}); agencyList.value = data;
agencyList.value = data;
} catch (err) {
console.error(`Error fetching agencies`, err);
return err.response;
}
}; };
const fetchOrderDetails = (order) => { const fetchOrderDetails = (order) => {
@ -92,12 +82,8 @@ const orderFilter = {
}; };
const onClientChange = async (clientId) => { const onClientChange = async (clientId) => {
try { const { data } = await axios.get(`Clients/${clientId}`);
const { data } = await axios.get(`Clients/${clientId}`); await fetchAddressList(data.defaultAddressFk);
await fetchAddressList(data.defaultAddressFk);
} catch (error) {
console.error('Error al cambiar el cliente:', error);
}
}; };
</script> </script>

View File

@ -1,23 +1,22 @@
<script setup> <script setup>
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue'; import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
import axios from 'axios'; import axios from 'axios';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnPaginate from 'components/ui/VnPaginate.vue'; import VnPaginate from 'src/components/ui/VnPaginate.vue';
import CatalogItem from 'components/ui/CatalogItem.vue'; import CatalogItem from 'src/components/ui/CatalogItem.vue';
import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue'; import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import getParamWhere from 'src/filters/getParamWhere'; import { useArrayData } from 'src/composables/useArrayData';
import { useArrayData } from 'composables/useArrayData';
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const stateStore = useStateStore(); const stateStore = useStateStore();
const { t } = useI18n(); const { t } = useI18n();
const arrayData = useArrayData('OrderCatalogList'); const dataKey = 'OrderCatalogList';
const arrayData = useArrayData(dataKey);
const store = arrayData.store; const store = arrayData.store;
const showFilter = ref(null);
const tags = ref([]); const tags = ref([]);
let catalogParams = { let catalogParams = {
@ -25,27 +24,6 @@ let catalogParams = {
orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }), orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
}; };
onBeforeMount(() => {
const whereParams = getParamWhere(route);
if (whereParams) {
const formattedWhereParams = {};
if (whereParams.and) {
whereParams.and.forEach((item) => {
Object.assign(formattedWhereParams, item);
});
} else {
Object.assign(formattedWhereParams, whereParams);
}
catalogParams = {
...catalogParams,
...formattedWhereParams,
};
} else {
showFilter.value = true;
}
});
onMounted(() => { onMounted(() => {
stateStore.rightDrawer = true; stateStore.rightDrawer = true;
checkOrderConfirmation(); checkOrderConfirmation();
@ -89,7 +67,7 @@ function extractValueTags(items) {
); );
tagValue.value = resultValueTags; tagValue.value = resultValueTags;
} }
const autoLoad = computed(() => !!catalogParams.categoryFk); const autoLoad = computed(() => !!JSON.parse(route?.query.table ?? '{}')?.categoryFk);
watch( watch(
() => store.data, () => store.data,
@ -102,7 +80,7 @@ watch(
<template> <template>
<VnSearchbar <VnSearchbar
data-key="OrderCatalogList" :data-key="dataKey"
:user-params="catalogParams" :user-params="catalogParams"
:static-params="['orderFk', 'orderBy']" :static-params="['orderFk', 'orderBy']"
:redirect="false" :redirect="false"
@ -111,9 +89,9 @@ watch(
:info="t('You can search items by name or id')" :info="t('You can search items by name or id')"
/> />
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above> <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea v-if="showFilter" class="fit text-grey-8"> <QScrollArea class="fit text-grey-8">
<OrderCatalogFilter <OrderCatalogFilter
data-key="OrderCatalogList" :data-key="dataKey"
:tag-value="tagValue" :tag-value="tagValue"
:tags="tags" :tags="tags"
:initial-catalog-params="catalogParams" :initial-catalog-params="catalogParams"
@ -123,12 +101,10 @@ watch(
<QPage class="column items-center q-pa-md"> <QPage class="column items-center q-pa-md">
<div class="full-width"> <div class="full-width">
<VnPaginate <VnPaginate
data-key="OrderCatalogList" :data-key="dataKey"
url="Orders/CatalogFilter" url="Orders/CatalogFilter"
:limit="50" :limit="50"
:user-params="catalogParams" :user-params="catalogParams"
@on-fetch="showFilter = true"
:update-router="false"
:auto-load="autoLoad" :auto-load="autoLoad"
> >
<template #body="{ rows }"> <template #body="{ rows }">

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { computed, ref, onMounted } from 'vue'; import { ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import axios from 'axios'; import axios from 'axios';
@ -8,7 +8,6 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelect from 'components/common/VnSelect.vue'; import VnSelect from 'components/common/VnSelect.vue';
import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue'; import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import getParamWhere from 'src/filters/getParamWhere';
import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue'; import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
@ -33,10 +32,8 @@ const route = useRoute();
const arrayData = useArrayData(props.dataKey); const arrayData = useArrayData(props.dataKey);
const categoryList = ref(null); const categoryList = ref(null);
const selectedCategoryFk = ref(null);
const typeList = ref([]); const typeList = ref([]);
const selectedTypeFk = ref(null); const searchByTag = ref(null);
const generalSearchParam = ref(null);
const vnFilterPanelRef = ref(); const vnFilterPanelRef = ref();
const orderByList = ref([ const orderByList = ref([
@ -53,45 +50,31 @@ const orderBySelected = ref('relevancy DESC, name');
const orderWaySelected = ref('ASC'); const orderWaySelected = ref('ASC');
const resetCategory = (params, search) => { const resetCategory = (params, search) => {
selectedCategoryFk.value = null;
typeList.value = null; typeList.value = null;
params.categoryFk = null; params.categoryFk = null;
params.typeFk = null; params.typeFk = null;
arrayData.store.userFilter = null; arrayData.store.userFilter = null;
removeTagGroupParam(params, search);
};
const selectCategory = (params, category, search) => {
if (params.categoryFk === category?.id) {
resetCategory(params, search);
params.categoryFk = null;
} else {
selectedCategoryFk.value = category?.id;
params.categoryFk = category?.id;
params.typeFk = null;
selectedTypeFk.value = null;
loadTypes(category?.id);
}
search(); search();
}; };
const loadTypes = async (categoryFk = selectedCategoryFk.value) => { const selectCategory = async (params, category, search) => {
if (vnFilterPanelRef.value.params.categoryFk === category?.id) {
resetCategory(params, search);
return;
}
params.typeFk = null;
params.categoryFk = category.id;
await loadTypes(category?.id);
await search();
};
const loadTypes = async (id) => {
const { data } = await axios.get(`Orders/${route.params.id}/getItemTypeAvailable`, { const { data } = await axios.get(`Orders/${route.params.id}/getItemTypeAvailable`, {
params: { itemCategoryId: categoryFk }, params: { itemCategoryId: id },
}); });
typeList.value = data; typeList.value = data;
}; };
const selectedCategory = computed(() => {
return (categoryList.value || []).find(
(category) => category?.id === selectedCategoryFk.value
);
});
const selectedType = computed(() => {
return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
});
function exprBuilder(param, value) { function exprBuilder(param, value) {
switch (param) { switch (param) {
case 'categoryFk': case 'categoryFk':
@ -115,13 +98,23 @@ const applyTags = (tagInfo, params, search) => {
search(); search();
}; };
const removeTagGroupParam = (params, search, valIndex = null) => { async function onSearchByTag(value) {
if (!valIndex) { if (!value.target.value) return;
if (!vnFilterPanelRef.value.params?.tagGroups) {
vnFilterPanelRef.value.params.tagGroups = [];
}
vnFilterPanelRef.value.params.tagGroups.push({
values: [{ value: value.target.value }],
});
searchByTag.value = null;
}
const removeTagGroupParam = (params, search, valIndex) => {
if (!valIndex && valIndex !== 0) {
params.tagGroups = null; params.tagGroups = null;
search();
} else { } else {
params.tagGroups.splice(valIndex, 1); params.tagGroups.splice(valIndex, 1);
search();
} }
}; };
@ -133,7 +126,8 @@ const setCategoryList = (data) => {
icon: `vn:${(category.icon || '').split('-')[1]}`, icon: `vn:${(category.icon || '').split('-')[1]}`,
})); }));
selectedCategoryFk.value && loadTypes(); vnFilterPanelRef.value.params.categoryFk &&
loadTypes(vnFilterPanelRef.value.params.categoryFk);
}; };
const getCategoryClass = (category, params) => { const getCategoryClass = (category, params) => {
@ -149,35 +143,29 @@ function addOrder(value, field, params) {
params.orderBy = JSON.stringify(orderBy); params.orderBy = JSON.stringify(orderBy);
vnFilterPanelRef.value.search(); vnFilterPanelRef.value.search();
} }
onMounted(() => {
selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
selectedTypeFk.value = getParamWhere(route, 'typeFk');
});
</script> </script>
<template> <template>
<FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" /> <FetchData url="ItemCategories" auto-load @on-fetch="setCategoryList" />
<VnFilterPanel <VnFilterPanel
ref="vnFilterPanelRef" ref="vnFilterPanelRef"
:data-key="props.dataKey" :data-key="props.dataKey"
:hidden-tags="['orderFk', 'orderBy']" :hidden-tags="['filter', 'orderFk', 'orderBy']"
:un-removable-params="['orderFk', 'orderBy']" :unremovable-params="['orderFk', 'orderBy']"
:expr-builder="exprBuilder" :expr-builder="exprBuilder"
:custom-tags="['tagGroups', 'categoryFk']" :custom-tags="['tagGroups', 'categoryFk']"
:redirect="false" :redirect="false"
search-url="params"
> >
<template #tags="{ tag, formatFn }"> <template #tags="{ tag, formatFn }">
<strong v-if="tag.label === 'typeFk'"> <strong v-if="tag.label === 'typeFk' && typeList">
{{ t(selectedType?.name || '') }} {{ t(typeList.find((t) => t.id == tag.value)?.name || '') }}
</strong> </strong>
<div v-else class="q-gutter-x-xs"> <div v-else class="q-gutter-x-xs">
<strong>{{ t(`params.${tag.label}`) }}: </strong> <strong>{{ t(`params.${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span> <span>{{ formatFn(tag.value) }}</span>
</div> </div>
</template> </template>
<template #customTags="{ tags: customTags, params, searchFn }"> <template #customTags="{ params, tags: customTags, searchFn }">
<template v-for="customTag in customTags" :key="customTag.label"> <template v-for="customTag in customTags" :key="customTag.label">
<VnFilterPanelChip <VnFilterPanelChip
v-for="(tag, valIndex) in Array.isArray(customTag.value) v-for="(tag, valIndex) in Array.isArray(customTag.value)
@ -191,8 +179,13 @@ onMounted(() => {
: removeTagGroupParam(params, searchFn, valIndex) : removeTagGroupParam(params, searchFn, valIndex)
" "
> >
<strong v-if="customTag.label === 'categoryFk'"> <strong v-if="customTag.label === 'categoryFk' && categoryList">
{{ t(selectedCategory?.name || '') }} {{
t(
categoryList.find((c) => c.id == customTag.value)?.name ||
''
)
}}
</strong> </strong>
<strong v-if="tag?.tagSelection?.name" class="q-mr-xs"> <strong v-if="tag?.tagSelection?.name" class="q-mr-xs">
{{ tag.tagSelection.name }}: {{ tag.tagSelection.name }}:
@ -239,13 +232,8 @@ onMounted(() => {
emit-value emit-value
use-input use-input
sort-by="name ASC" sort-by="name ASC"
:disable="!selectedCategoryFk" :disable="!params.categoryFk"
@update:model-value=" @update:model-value="searchFn()"
(value) => {
selectedTypeFk = value;
searchFn();
}
"
> >
<template #option="{ itemProps, opt }"> <template #option="{ itemProps, opt }">
<QItem v-bind="itemProps"> <QItem v-bind="itemProps">
@ -288,34 +276,27 @@ onMounted(() => {
</QItemSection> </QItemSection>
</QItem> </QItem>
<QSeparator /> <QSeparator />
<QItem class="q-mt-lg q-pa-none">
<QItem class="q-mt-lg"> <VnInput
<VnSelect
:label="t('components.itemsFilterPanel.value')" :label="t('components.itemsFilterPanel.value')"
:options="props.tagValue"
dense dense
outlined outlined
rounded rounded
:is-clearable="false" :is-clearable="false"
v-model="generalSearchParam" v-model="searchByTag"
@update:model-value=" @keyup.enter="(val) => onSearchByTag(val, params)"
applyTags(
{ values: [{ value: generalSearchParam }] },
params,
searchFn
)
"
> >
<template #prepend> <template #prepend>
<QIcon name="search" /> <QIcon name="search" />
</template> </template>
<template #after> <template #append>
<QBtn <QBtn
icon="add_circle" icon="add_circle"
shortcut="+" shortcut="+"
flat flat
color="primary" color="primary"
size="md" size="md"
dense
/> />
<QPopupProxy> <QPopupProxy>
<CatalogFilterValueDialog <CatalogFilterValueDialog
@ -327,7 +308,7 @@ onMounted(() => {
/> />
</QPopupProxy> </QPopupProxy>
</template> </template>
</VnSelect> </VnInput>
</QItem> </QItem>
<QSeparator /> <QSeparator />
</template> </template>

View File

@ -20,22 +20,17 @@ const addressList = ref([]);
defineEmits(['confirm', ...useDialogPluginComponent.emits]); defineEmits(['confirm', ...useDialogPluginComponent.emits]);
const fetchAddressList = async (addressId) => { const fetchAddressList = async (addressId) => {
try { const { data } = await axios.get('addresses', {
const { data } = await axios.get('addresses', { params: {
params: { filter: JSON.stringify({
filter: JSON.stringify({ fields: ['id', 'nickname', 'street', 'city'],
fields: ['id', 'nickname', 'street', 'city'], where: { id: addressId },
where: { id: addressId }, }),
}), },
}, });
}); addressList.value = data;
addressList.value = data; if (addressList.value?.length === 1) {
if (addressList.value?.length === 1) { state.get(ORDER_MODEL).addressId = addressList.value[0].id;
state.get(ORDER_MODEL).addressId = addressList.value[0].id;
}
} catch (err) {
console.error(`Error fetching addresses`, err);
return err.response;
} }
}; };
@ -43,18 +38,13 @@ const fetchAgencyList = async (landed, addressFk) => {
if (!landed || !addressFk) { if (!landed || !addressFk) {
return; return;
} }
try { const { data } = await axios.get('Agencies/landsThatDay', {
const { data } = await axios.get('Agencies/landsThatDay', { params: {
params: { addressFk,
addressFk, landed: new Date(landed).toISOString(),
landed: new Date(landed).toISOString(), },
}, });
}); agencyList.value = data;
agencyList.value = data;
} catch (err) {
console.error(`Error fetching agencies`, err);
return err.response;
}
}; };
const $props = defineProps({ const $props = defineProps({
@ -70,12 +60,8 @@ const initialFormState = reactive({
}); });
const onClientChange = async (clientId = $props.clientFk) => { const onClientChange = async (clientId = $props.clientFk) => {
try { const { data } = await axios.get(`Clients/${clientId}`);
const { data } = await axios.get(`Clients/${clientId}`); await fetchAddressList(data.defaultAddressFk);
await fetchAddressList(data.defaultAddressFk);
} catch (error) {
console.error('Error al cambiar el cliente:', error);
}
}; };
async function onDataSaved(_, id) { async function onDataSaved(_, id) {

View File

@ -47,17 +47,13 @@ const onChangesSaved = () => {
}; };
const setWireTransfer = async () => { const setWireTransfer = async () => {
try { const params = {
const params = { id: route.params.id,
id: route.params.id, payMethodFk: wireTransferFk.value,
payMethodFk: wireTransferFk.value, };
};
await axios.patch(`Suppliers/${route.params.id}`, params); await axios.patch(`Suppliers/${route.params.id}`, params);
notify('globals.dataSaved', 'positive'); notify('globals.dataSaved', 'positive');
} catch (err) {
console.error('Error setting wire transfer', err);
}
}; };
</script> </script>
<template> <template>
@ -126,7 +122,6 @@ const setWireTransfer = async () => {
(_, requestResponse) => (_, requestResponse) =>
onBankEntityCreated(requestResponse, row) onBankEntityCreated(requestResponse, row)
" "
:show-entity-field="false"
/> />
</template> </template>
<template #option="scope"> <template #option="scope">

View File

@ -33,6 +33,7 @@ const canEditZone = useAcl().hasAny([
const agencyFetchRef = ref(); const agencyFetchRef = ref();
const warehousesOptions = ref([]); const warehousesOptions = ref([]);
const companiesOptions = ref([]); const companiesOptions = ref([]);
const currenciesOptions = ref([]);
const agenciesOptions = ref([]); const agenciesOptions = ref([]);
const zonesOptions = ref([]); const zonesOptions = ref([]);
const addresses = ref([]); const addresses = ref([]);

View File

@ -130,6 +130,7 @@ function ticketFilter(ticket) {
<QBadge <QBadge
text-color="black" text-color="black"
:color="entity.ticketState.state.classColor" :color="entity.ticketState.state.classColor"
data-cy="ticketDescriptorStateBadge"
> >
{{ entity.ticketState.state.name }} {{ entity.ticketState.state.name }}
</QBadge> </QBadge>
@ -174,7 +175,7 @@ function ticketFilter(ticket) {
<QTooltip>{{ t('Client Frozen') }}</QTooltip> <QTooltip>{{ t('Client Frozen') }}</QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="entity.problem.includes('hasRisk')" v-if="entity?.problem?.includes('hasRisk')"
name="vn:risk" name="vn:risk"
size="xs" size="xs"
color="primary" color="primary"

View File

@ -239,7 +239,7 @@ function makeInvoiceDialog() {
} }
async function makeInvoice() { async function makeInvoice() {
const params = { const params = {
ticketsIds: [parseInt(ticketId)], ticketsIds: [parseInt(ticketId.value)],
}; };
await axios.post(`Tickets/invoiceTicketsAndPdf`, params); await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
@ -265,7 +265,7 @@ async function transferClient(client) {
async function addTurn(day) { async function addTurn(day) {
const params = { const params = {
ticketFk: parseInt(ticketId), ticketFk: parseInt(ticketId.value),
weekDay: day, weekDay: day,
agencyModeFk: ticket.value.agencyModeFk, agencyModeFk: ticket.value.agencyModeFk,
}; };
@ -280,7 +280,7 @@ async function addTurn(day) {
async function createRefund(withWarehouse) { async function createRefund(withWarehouse) {
const params = { const params = {
ticketsIds: [parseInt(ticketId)], ticketsIds: [parseInt(ticketId.value)],
withWarehouse: withWarehouse, withWarehouse: withWarehouse,
negative: true, negative: true,
}; };
@ -368,7 +368,7 @@ async function uploadDocuware(force) {
const { data } = await axios.post(`Docuwares/upload`, { const { data } = await axios.post(`Docuwares/upload`, {
fileCabinet: 'deliveryNote', fileCabinet: 'deliveryNote',
ticketIds: [parseInt(ticketId)], ticketIds: [parseInt(ticketId.value)],
}); });
if (data) notify({ message: t('PDF sent!'), type: 'positive' }); if (data) notify({ message: t('PDF sent!'), type: 'positive' });

View File

@ -75,6 +75,7 @@ const cancel = () => {
dense dense
style="width: 50%" style="width: 50%"
@click="save()" @click="save()"
data-cy="saveManaBtn"
> >
{{ t('globals.save') }} {{ t('globals.save') }}
</QBtn> </QBtn>

View File

@ -49,13 +49,7 @@ async function handleSave() {
<template> <template>
<FetchData <FetchData
@on-fetch=" @on-fetch="(data) => (observationTypes = data)"
(data) =>
(observationTypes = data.map((type) => {
type.label = t(`ticketNotes.observationTypes.${type.description}`);
return type;
}))
"
auto-load auto-load
url="ObservationTypes" url="ObservationTypes"
/> />
@ -82,16 +76,18 @@ async function handleSave() {
:label="t('ticketNotes.observationType')" :label="t('ticketNotes.observationType')"
:options="observationTypes" :options="observationTypes"
hide-selected hide-selected
option-label="label" option-label="description"
option-value="id" option-value="id"
v-model="row.observationTypeFk" v-model="row.observationTypeFk"
:disable="!!row.id" :disable="!!row.id"
data-cy="ticketNotesObservationType"
/> />
<VnInput <VnInput
:label="t('basicData.description')" :label="t('basicData.description')"
v-model="row.description" v-model="row.description"
class="col" class="col"
@keyup.enter="handleSave" @keyup.enter="handleSave"
data-cy="ticketNotesDescription"
/> />
<QIcon <QIcon
name="delete" name="delete"
@ -99,6 +95,7 @@ async function handleSave() {
class="cursor-pointer" class="cursor-pointer"
color="primary" color="primary"
@click="handleDelete(row)" @click="handleDelete(row)"
data-cy="ticketNotesRemoveNoteBtn"
> >
<QTooltip> <QTooltip>
{{ t('ticketNotes.removeNote') }} {{ t('ticketNotes.removeNote') }}
@ -113,6 +110,7 @@ async function handleSave() {
class="fill-icon-on-hover q-ml-md" class="fill-icon-on-hover q-ml-md"
color="primary" color="primary"
@click="ticketNotesCrudRef.insert()" @click="ticketNotesCrudRef.insert()"
data-cy="ticketNotesAddNoteBtn"
> >
<QTooltip> <QTooltip>
{{ t('ticketNotes.addNote') }} {{ t('ticketNotes.addNote') }}

View File

@ -172,13 +172,9 @@ const getRequestState = (state) => {
const isEditable = (isOk) => isOk !== null; const isEditable = (isOk) => isOk !== null;
async function removeLine(id) { async function removeLine(id) {
try { await axios.delete(`TicketRequests/${id}`);
await axios.delete(`TicketRequests/${id}`); notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive'); location.reload();
location.reload();
} catch (err) {
console.error('Error ', err);
}
} }
onMounted(() => (stateStore.rightDrawer = false)); onMounted(() => (stateStore.rightDrawer = false));

View File

@ -156,15 +156,11 @@ const columns = computed(() => [
]); ]);
const getConfig = async () => { const getConfig = async () => {
try { let filter = {
let filter = { fields: ['daysForWarningClaim'],
fields: ['daysForWarningClaim'], };
}; const { data } = await axios.get(`TicketConfigs`, { filter });
const { data } = await axios.get(`TicketConfigs`, { filter }); ticketConfig.value = data;
ticketConfig.value = data;
} catch (err) {
console.error('Error getting ticket config', err);
}
}; };
const onSalesFetched = (salesData) => { const onSalesFetched = (salesData) => {
@ -187,41 +183,33 @@ const resetChanges = async () => {
}; };
const updateQuantity = async (sale) => { const updateQuantity = async (sale) => {
try { const payload = { quantity: sale.quantity };
const payload = { quantity: sale.quantity }; await axios.post(`Sales/${sale.id}/updateQuantity`, payload);
await axios.post(`Sales/${sale.id}/updateQuantity`, payload); notify('globals.dataSaved', 'positive');
notify('globals.dataSaved', 'positive');
} catch (err) {
console.error('Error updating quantity', err);
}
}; };
const addSale = async (sale) => { const addSale = async (sale) => {
try { const payload = {
const payload = { barcode: sale.itemFk,
barcode: sale.itemFk, quantity: sale.quantity,
quantity: sale.quantity, };
};
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, payload); const { data } = await axios.post(`tickets/${route.params.id}/addSale`, payload);
if (!data) return; if (!data) return;
const newSale = data; const newSale = data;
sale.id = newSale.id; sale.id = newSale.id;
sale.image = newSale.item.image; sale.image = newSale.item.image;
sale.subName = newSale.item.subName; sale.subName = newSale.item.subName;
sale.concept = newSale.concept; sale.concept = newSale.concept;
sale.quantity = newSale.quantity; sale.quantity = newSale.quantity;
sale.discount = newSale.discount; sale.discount = newSale.discount;
sale.price = newSale.price; sale.price = newSale.price;
sale.item = newSale.item; sale.item = newSale.item;
notify('globals.dataSaved', 'positive'); notify('globals.dataSaved', 'positive');
window.location.reload(); window.location.reload();
} catch (err) {
console.error('Error adding sale', err);
}
}; };
const changeQuantity = async (sale) => { const changeQuantity = async (sale) => {
@ -240,13 +228,9 @@ const changeQuantity = async (sale) => {
const updateConcept = async (sale) => { const updateConcept = async (sale) => {
canProceed.value = await isSalePrepared(sale); canProceed.value = await isSalePrepared(sale);
if (!canProceed.value) return; if (!canProceed.value) return;
try { const data = { newConcept: sale.concept };
const data = { newConcept: sale.concept }; await axios.post(`Sales/${sale.id}/updateConcept`, data);
await axios.post(`Sales/${sale.id}/updateConcept`, data); notify('globals.dataSaved', 'positive');
notify('globals.dataSaved', 'positive');
} catch (err) {
console.error('Error updating concept', err);
}
}; };
const DEFAULT_EDIT = { const DEFAULT_EDIT = {
@ -302,18 +286,15 @@ const onOpenEditDiscountPopover = async (sale) => {
const updatePrice = async (sale) => { const updatePrice = async (sale) => {
canProceed.value = await isSalePrepared(sale); canProceed.value = await isSalePrepared(sale);
if (!canProceed.value) return; if (!canProceed.value) return;
try { const newPrice = edit.value.price;
const newPrice = edit.value.price; if (newPrice != null && newPrice != sale.price) {
if (newPrice != null && newPrice != sale.price) { await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice }); sale.price = newPrice;
sale.price = newPrice; edit.value = { ...DEFAULT_EDIT };
edit.value = { ...DEFAULT_EDIT }; notify('globals.dataSaved', 'positive');
notify('globals.dataSaved', 'positive');
}
await getMana();
} catch (err) {
console.error('Error updating price', err);
} }
await getMana();
}; };
const changeDiscount = async (sale) => { const changeDiscount = async (sale) => {
@ -360,15 +341,11 @@ const getNewPrice = computed(() => {
}); });
const newOrderFromTicket = async () => { const newOrderFromTicket = async () => {
try { const { data } = await axios.post(`Orders/newFromTicket`, {
const { data } = await axios.post(`Orders/newFromTicket`, { ticketFk: Number(route.params.id),
ticketFk: Number(route.params.id), });
}); const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } }); window.open(routeData.href, '_blank');
window.open(routeData.href, '_blank');
} catch (err) {
console.error('Error creating new order', err);
}
}; };
const goToLog = (saleId) => { const goToLog = (saleId) => {
@ -383,15 +360,11 @@ const goToLog = (saleId) => {
}; };
const changeTicketState = async (val) => { const changeTicketState = async (val) => {
try { stateBtnDropdownRef.value.hide();
stateBtnDropdownRef.value.hide(); const params = { ticketFk: route.params.id, code: val };
const params = { ticketFk: route.params.id, code: val }; await axios.post('Tickets/state', params);
await axios.post('Tickets/state', params); notify('globals.dataSaved', 'positive');
notify('globals.dataSaved', 'positive'); await resetChanges();
await resetChanges();
} catch (err) {
console.error('Error changing ticket state', err);
}
}; };
const removeSelectedSales = () => { const removeSelectedSales = () => {
@ -402,47 +375,34 @@ const removeSelectedSales = () => {
}; };
const removeSales = async () => { const removeSales = async () => {
try { const params = {
const params = { sales: selectedRows.value.filter((sale) => sale.id),
sales: selectedRows.value.filter((sale) => sale.id), ticketId: store.data.id,
ticketId: store.data.id, };
}; selectedRows.value
selectedRows.value .filter((sale) => !sale.id)
.filter((sale) => !sale.id) .forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
.forEach((sale) =>
tableRef.value.CrudModelRef.formData.splice(sale.$index, 1)
);
if (params.sales.length == 0) return; if (params.sales.length == 0) return;
await axios.post('Sales/deleteSales', params); await axios.post('Sales/deleteSales', params);
removeSelectedSales(); removeSelectedSales();
notify('globals.dataSaved', 'positive'); notify('globals.dataSaved', 'positive');
window.location.reload(); window.location.reload();
} catch (err) {
console.error('Error deleting sales', err);
}
}; };
const setTransferParams = async () => { const setTransferParams = async () => {
try { selectedSales.value = selectedValidSales.value;
selectedSales.value = selectedValidSales.value; const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
const checkedSales = JSON.parse(JSON.stringify(selectedSales.value)); transfer.value = {
transfer.value = { lastActiveTickets: [],
lastActiveTickets: [], sales: checkedSales,
sales: checkedSales, };
};
const params = { ticketId: store.data.id }; const params = { ticketId: store.data.id };
const { data } = await axios.get( const { data } = await axios.get(`clients/${store.data.clientFk}/lastActiveTickets`, {
`clients/${store.data.clientFk}/lastActiveTickets`, params,
{ });
params, transfer.value.lastActiveTickets = data;
}
);
transfer.value.lastActiveTickets = data;
} catch (err) {
console.error('Error setting transfer params', err);
}
}; };
onMounted(async () => { onMounted(async () => {
@ -584,6 +544,7 @@ watch(
color="primary" color="primary"
:disable="!isTicketEditable || ticketState === 'OK'" :disable="!isTicketEditable || ticketState === 'OK'"
@click="changeTicketState('OK')" @click="changeTicketState('OK')"
data-cy="ticketSaleOkStateBtn"
> >
<QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip> <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
</QBtn> </QBtn>
@ -592,6 +553,7 @@ watch(
color="primary" color="primary"
:label="t('ticketList.state')" :label="t('ticketList.state')"
:disable="!isTicketEditable" :disable="!isTicketEditable"
data-cy="ticketSaleStateDropdown"
> >
<VnSelect <VnSelect
:options="editableStatesOptions" :options="editableStatesOptions"
@ -601,6 +563,7 @@ watch(
hide-dropdown-icon hide-dropdown-icon
focus-on-mount focus-on-mount
@update:model-value="changeTicketState" @update:model-value="changeTicketState"
data-cy="ticketSaleStateSelect"
/> />
</QBtnDropdown> </QBtnDropdown>
<TicketSaleMoreActions <TicketSaleMoreActions
@ -633,6 +596,7 @@ watch(
icon="vn:splitline" icon="vn:splitline"
:disable="!isTicketEditable || !hasSelectedRows" :disable="!isTicketEditable || !hasSelectedRows"
@click="setTransferParams()" @click="setTransferParams()"
data-cy="ticketSaleTransferBtn"
> >
<QTooltip>{{ t('Transfer lines') }}</QTooltip> <QTooltip>{{ t('Transfer lines') }}</QTooltip>
<TicketTransfer <TicketTransfer
@ -712,7 +676,13 @@ watch(
{{ t('ticketSale.visible') }}: {{ row.visible || 0 }} {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs"> <QIcon
v-if="row.reserved"
color="primary"
name="vn:reserva"
size="xs"
data-cy="ticketSaleReservedIcon"
>
<QTooltip> <QTooltip>
{{ t('ticketSale.reserved') }} {{ t('ticketSale.reserved') }}
</QTooltip> </QTooltip>
@ -865,7 +835,14 @@ watch(
</VnTable> </VnTable>
<QPageSticky :offset="[20, 20]" style="z-index: 2"> <QPageSticky :offset="[20, 20]" style="z-index: 2">
<QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" shortcut="+" /> <QBtn
@click="newOrderFromTicket()"
color="primary"
fab
icon="add"
shortcut="+"
data-cy="ticketSaleAddToBasketBtn"
/>
<QTooltip class="text-no-wrap"> <QTooltip class="text-no-wrap">
{{ t('Add item to basket') }} {{ t('Add item to basket') }}
</QTooltip> </QTooltip>

View File

@ -140,13 +140,9 @@ const createClaim = () => {
}; };
const onCreateClaimAccepted = async () => { const onCreateClaimAccepted = async () => {
try { const params = { ticketId: ticket.value.id, sales: props.sales };
const params = { ticketId: ticket.value.id, sales: props.sales }; const { data } = await axios.post(`Claims/createFromSales`, params);
const { data } = await axios.post(`Claims/createFromSales`, params); push({ name: 'ClaimBasicData', params: { id: data.id } });
push({ name: 'ClaimBasicData', params: { id: data.id } });
} catch (error) {
console.error('Error creating claim: ', error);
}
}; };
const setReserved = async (reserved) => { const setReserved = async (reserved) => {
@ -179,6 +175,7 @@ const createRefund = async (withWarehouse) => {
color="primary" color="primary"
:label="t('ticketSale.more')" :label="t('ticketSale.more')"
:disable="disable" :disable="disable"
data-cy="ticketSaleMoreActionsDropdown"
> >
<template #label> <template #label>
<QTooltip>{{ t('Select lines to see the options') }}</QTooltip> <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@ -190,6 +187,7 @@ const createRefund = async (withWarehouse) => {
v-close-popup v-close-popup
v-ripple v-ripple
@click="showSmsDialog('productNotAvailable')" @click="showSmsDialog('productNotAvailable')"
data-cy="sendShortageSMSItem"
> >
<QItemSection> <QItemSection>
<QItemLabel>{{ t('Send shortage SMS') }}</QItemLabel> <QItemLabel>{{ t('Send shortage SMS') }}</QItemLabel>
@ -201,12 +199,18 @@ const createRefund = async (withWarehouse) => {
v-close-popup v-close-popup
v-ripple v-ripple
@click="calculateSalePrice()" @click="calculateSalePrice()"
data-cy="recalculatePriceItem"
> >
<QItemSection> <QItemSection>
<QItemLabel>{{ t('Recalculate price') }}</QItemLabel> <QItemLabel>{{ t('Recalculate price') }}</QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem clickable v-ripple @click="emit('getMana')"> <QItem
clickable
v-ripple
@click="emit('getMana')"
data-cy="updateDiscountItem"
>
<QItemSection> <QItemSection>
<QItemLabel>{{ t('Update discount') }}</QItemLabel> <QItemLabel>{{ t('Update discount') }}</QItemLabel>
</QItemSection> </QItemSection>
@ -215,6 +219,7 @@ const createRefund = async (withWarehouse) => {
v-model.number="newDiscount" v-model.number="newDiscount"
:label="t('ticketSale.discount')" :label="t('ticketSale.discount')"
type="number" type="number"
data-cy="ticketSaleDiscountInput"
/> />
</TicketEditManaProxy> </TicketEditManaProxy>
</QItem> </QItem>
@ -224,6 +229,7 @@ const createRefund = async (withWarehouse) => {
v-close-popup v-close-popup
v-ripple v-ripple
@click="createClaim()" @click="createClaim()"
data-cy="createClaimItem"
> >
<QItemSection> <QItemSection>
<QItemLabel>{{ t('Add claim') }}</QItemLabel> <QItemLabel>{{ t('Add claim') }}</QItemLabel>
@ -235,6 +241,7 @@ const createRefund = async (withWarehouse) => {
v-close-popup v-close-popup
v-ripple v-ripple
@click="setReserved(true)" @click="setReserved(true)"
data-cy="markAsReservedItem"
> >
<QItemSection> <QItemSection>
<QItemLabel>{{ t('Mark as reserved') }}</QItemLabel> <QItemLabel>{{ t('Mark as reserved') }}</QItemLabel>
@ -246,12 +253,13 @@ const createRefund = async (withWarehouse) => {
v-close-popup v-close-popup
v-ripple v-ripple
@click="setReserved(false)" @click="setReserved(false)"
data-cy="unmarkAsReservedItem"
> >
<QItemSection> <QItemSection>
<QItemLabel>{{ t('Unmark as reserved') }}</QItemLabel> <QItemLabel>{{ t('Unmark as reserved') }}</QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem clickable v-ripple> <QItem clickable v-ripple data-cy="ticketSaleRefundItem">
<QItemSection> <QItemSection>
<QItemLabel>{{ t('Refund') }}</QItemLabel> <QItemLabel>{{ t('Refund') }}</QItemLabel>
</QItemSection> </QItemSection>
@ -260,12 +268,22 @@ const createRefund = async (withWarehouse) => {
</QItemSection> </QItemSection>
<QMenu anchor="top end" self="top start" auto-close bordered> <QMenu anchor="top end" self="top start" auto-close bordered>
<QList> <QList>
<QItem v-ripple clickable @click="createRefund(true)"> <QItem
v-ripple
clickable
@click="createRefund(true)"
data-cy="ticketSaleRefundWithWarehouse"
>
<QItemSection> <QItemSection>
{{ t('with warehouse') }} {{ t('with warehouse') }}
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem v-ripple clickable @click="createRefund(false)"> <QItem
v-ripple
clickable
@click="createRefund(false)"
data-cy="ticketSaleRefundWithoutWarehouse"
>
<QItemSection> <QItemSection>
{{ t('without warehouse') }} {{ t('without warehouse') }}
</QItemSection> </QItemSection>

View File

@ -69,19 +69,15 @@ function isEditable() {
} }
async function changeState(value) { async function changeState(value) {
try { stateBtnDropdownRef.value?.hide();
stateBtnDropdownRef.value?.hide(); const formData = {
const formData = { ticketFk: entityId.value,
ticketFk: entityId.value, code: value,
code: value, };
}; await axios.post(`Tickets/state`, formData);
await axios.post(`Tickets/state`, formData); notify('globals.dataSaved', 'positive');
notify('globals.dataSaved', 'positive'); summaryRef.value?.fetch();
summaryRef.value?.fetch(); descriptorData.fetch({});
descriptorData.fetch({});
} catch (err) {
console.error('Error changing ticket state', err);
}
} }
function toTicketUrl(section) { function toTicketUrl(section) {
@ -100,6 +96,7 @@ function toTicketUrl(section) {
ref="summaryRef" ref="summaryRef"
:url="`Tickets/${entityId}/summary`" :url="`Tickets/${entityId}/summary`"
data-key="TicketSummary" data-key="TicketSummary"
data-cy="ticketSummary"
> >
<template #header-left> <template #header-left>
<VnToSummary <VnToSummary
@ -279,13 +276,8 @@ function toTicketUrl(section) {
" "
> >
<span class="label" style="margin-right: 4px"> <span class="label" style="margin-right: 4px">
({{ ({{ item.observationType.description }}):
t(
`ticketNotes.observationTypes.${item.observationType.description}`
)
}}):
</span> </span>
<span>{{ item.description }}</span> <span>{{ item.description }}</span>
</QItem> </QItem>
</QVirtualScroll> </QVirtualScroll>

View File

@ -91,7 +91,7 @@ onMounted(() => (_transfer.value = $props.transfer));
</script> </script>
<template> <template>
<QPopupProxy ref="QPopupProxyRef"> <QPopupProxy ref="QPopupProxyRef" data-cy="ticketTransferPopup">
<QCard class="q-px-md" style="display: flex; width: 80vw"> <QCard class="q-px-md" style="display: flex; width: 80vw">
<QTable <QTable
:rows="transfer.sales" :rows="transfer.sales"

View File

@ -57,6 +57,7 @@ defineExpose({ transferSales });
v-model.number="_transfer.ticketId" v-model.number="_transfer.ticketId"
:label="t('Transfer to ticket')" :label="t('Transfer to ticket')"
:clearable="false" :clearable="false"
data-cy="ticketTransferDestinationTicketInput"
> >
<template #append> <template #append>
<QBtn <QBtn
@ -64,6 +65,7 @@ defineExpose({ transferSales });
color="primary" color="primary"
@click="transferSales(_transfer.ticketId)" @click="transferSales(_transfer.ticketId)"
style="width: 30px" style="width: 30px"
data-cy="ticketTransferTransferBtn"
/> />
</template> </template>
</VnInput> </VnInput>
@ -72,6 +74,7 @@ defineExpose({ transferSales });
color="primary" color="primary"
class="full-width q-my-lg" class="full-width q-my-lg"
@click="transferSales()" @click="transferSales()"
data-cy="ticketTransferNewTicketBtn"
/> />
</QForm> </QForm>
</template> </template>

View File

@ -37,46 +37,37 @@ onBeforeMount(async () => {
}); });
const fetchClient = async (formData) => { const fetchClient = async (formData) => {
try { const filter = {
const filter = { include: {
include: { relation: 'defaultAddress',
relation: 'defaultAddress', scope: {
scope: { fields: ['id', 'agencyModeFk'],
fields: ['id', 'agencyModeFk'],
},
}, },
where: { id: formData.clientId }, },
}; where: { id: formData.clientId },
const params = { filter: JSON.stringify(filter) }; };
const { data } = await axios.get('Clients', { params }); const params = { filter: JSON.stringify(filter) };
const [client] = data; const { data } = await axios.get('Clients', { params });
selectedClient.value = client; const [client] = data;
} catch (err) { selectedClient.value = client;
console.error('Error fetching client');
}
}; };
const fetchAddresses = async (formData) => { const fetchAddresses = async (formData) => {
try { if (!formData.clientId) return;
if (!formData.clientId) return;
const filter = { const filter = {
fields: ['nickname', 'street', 'city', 'id'], fields: ['nickname', 'street', 'city', 'id'],
where: { isActive: true }, where: { isActive: true },
order: 'nickname ASC', order: 'nickname ASC',
}; };
const params = { filter: JSON.stringify(filter) }; const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, { const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
params, params,
}); });
addressesOptions.value = data; addressesOptions.value = data;
const { defaultAddress } = selectedClient.value; const { defaultAddress } = selectedClient.value;
formData.addressId = defaultAddress.id; formData.addressId = defaultAddress.id;
} catch (err) {
console.error(`Error fetching addresses`, err);
return err.response;
}
}; };
const onClientSelected = async (formData) => { const onClientSelected = async (formData) => {

View File

@ -37,46 +37,37 @@ onBeforeMount(async () => {
}); });
const fetchClient = async (formData) => { const fetchClient = async (formData) => {
try { const filter = {
const filter = { include: {
include: { relation: 'defaultAddress',
relation: 'defaultAddress', scope: {
scope: { fields: ['id', 'agencyModeFk'],
fields: ['id', 'agencyModeFk'],
},
}, },
where: { id: formData.clientId }, },
}; where: { id: formData.clientId },
const params = { filter: JSON.stringify(filter) }; };
const { data } = await axios.get('Clients', { params }); const params = { filter: JSON.stringify(filter) };
const [client] = data; const { data } = await axios.get('Clients', { params });
selectedClient.value = client; const [client] = data;
} catch (err) { selectedClient.value = client;
console.error('Error fetching client');
}
}; };
const fetchAddresses = async (formData) => { const fetchAddresses = async (formData) => {
try { if (!formData.clientId) return;
if (!formData.clientId) return;
const filter = { const filter = {
fields: ['nickname', 'street', 'city', 'id'], fields: ['nickname', 'street', 'city', 'id'],
where: { isActive: true }, where: { isActive: true },
order: 'nickname ASC', order: 'nickname ASC',
}; };
const params = { filter: JSON.stringify(filter) }; const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, { const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
params, params,
}); });
addressesOptions.value = data; addressesOptions.value = data;
const { defaultAddress } = selectedClient.value; const { defaultAddress } = selectedClient.value;
formData.addressId = defaultAddress.id; formData.addressId = defaultAddress.id;
} catch (err) {
console.error(`Error fetching addresses`, err);
return err.response;
}
}; };
const onClientSelected = async (formData) => { const onClientSelected = async (formData) => {

View File

@ -68,13 +68,9 @@ const params = reactive({
}); });
const applyColumnFilter = async (col) => { const applyColumnFilter = async (col) => {
try { const paramKey = col.columnFilter?.filterParamKey || col.field;
const paramKey = col.columnFilter?.filterParamKey || col.field; params[paramKey] = col.columnFilter.filterValue;
params[paramKey] = col.columnFilter.filterValue; await arrayData.addFilter({ params });
await arrayData.addFilter({ params });
} catch (err) {
console.error('Error applying column filter', err);
}
}; };
const getInputEvents = (col) => { const getInputEvents = (col) => {
@ -248,23 +244,19 @@ const totalPriceColor = (totalWithVat) =>
isLessThan50(totalWithVat) ? 'warning' : 'transparent'; isLessThan50(totalWithVat) ? 'warning' : 'transparent';
const moveTicketsFuture = async () => { const moveTicketsFuture = async () => {
try { const ticketsToMove = selectedTickets.value.map((ticket) => ({
const ticketsToMove = selectedTickets.value.map((ticket) => ({ originId: ticket.id,
originId: ticket.id, destinationId: ticket.futureId,
destinationId: ticket.futureId, originShipped: ticket.shipped,
originShipped: ticket.shipped, destinationShipped: ticket.futureShipped,
destinationShipped: ticket.futureShipped, workerFk: ticket.workerFk,
workerFk: ticket.workerFk, }));
}));
let params = { tickets: ticketsToMove }; let params = { tickets: ticketsToMove };
await axios.post('Tickets/merge', params); await axios.post('Tickets/merge', params);
notify(t('advanceTickets.moveTicketSuccess'), 'positive'); notify(t('advanceTickets.moveTicketSuccess'), 'positive');
selectedTickets.value = []; selectedTickets.value = [];
arrayData.fetch({ append: false }); arrayData.fetch({ append: false });
} catch (error) {
console.error('Error moving tickets to future', error);
}
}; };
onMounted(async () => { onMounted(async () => {
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false });

View File

@ -254,46 +254,40 @@ const fetchAvailableAgencies = async (formData) => {
}; };
const fetchClient = async (formData) => { const fetchClient = async (formData) => {
try { const filter = {
const filter = { include: {
include: { relation: 'defaultAddress',
relation: 'defaultAddress', scope: {
scope: { fields: ['id', 'agencyModeFk'],
fields: ['id', 'agencyModeFk'],
},
}, },
where: { id: formData.clientId }, },
}; where: { id: formData.clientId },
const params = { filter: JSON.stringify(filter) }; };
const { data } = await axios.get('Clients', { params }); const params = { filter: JSON.stringify(filter) };
const [client] = data; const { data } = await axios.get('Clients', { params });
selectedClient.value = client; const [client] = data;
} catch (err) { selectedClient.value = client;
console.error('Error fetching client');
}
}; };
const fetchAddresses = async (formData) => { const fetchAddresses = async (formData) => {
try { if (!formData.clientId) return;
if (!formData.clientId) return;
const filter = { const filter = {
fields: ['nickname', 'street', 'city', 'id', 'isActive'], fields: ['nickname', 'street', 'city', 'id', 'isActive'],
order: 'nickname ASC', order: 'nickname ASC',
}; };
const params = { filter: JSON.stringify(filter) }; const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, { const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
params, params,
}); });
addressesOptions.value = data; addressesOptions.value = data;
const { defaultAddress } = selectedClient.value; addressesOptions.value = data;
formData.addressId = defaultAddress.id;
} catch (err) { const { defaultAddress } = selectedClient.value;
console.error(`Error fetching addresses`, err); formData.addressId = defaultAddress.id;
return err.response;
}
}; };
const getColor = (row) => { const getColor = (row) => {
if (row.alertLevelCode === 'OK') return 'bg-success'; if (row.alertLevelCode === 'OK') return 'bg-success';
else if (row.alertLevelCode === 'FREE') return 'bg-notice'; else if (row.alertLevelCode === 'FREE') return 'bg-notice';
@ -462,6 +456,7 @@ function setReference(data) {
data-key="TicketList" data-key="TicketList"
:label="t('Search ticket')" :label="t('Search ticket')"
:info="t('You can search by ticket id or alias')" :info="t('You can search by ticket id or alias')"
data-cy="ticketListSearchBar"
/> />
<RightMenu> <RightMenu>
<template #right-panel> <template #right-panel>
@ -489,6 +484,7 @@ function setReference(data) {
'row-key': 'id', 'row-key': 'id',
selection: 'multiple', selection: 'multiple',
}" }"
data-cy="ticketListTable"
> >
<template #column-statusIcons="{ row }"> <template #column-statusIcons="{ row }">
<TicketProblems :row="row" /> <TicketProblems :row="row" />

View File

@ -153,24 +153,16 @@ const columns = computed(() => [
]); ]);
const deleteWeekly = async (ticketFk) => { const deleteWeekly = async (ticketFk) => {
try { await axios.delete(`TicketWeeklies/${ticketFk}`);
await axios.delete(`TicketWeeklies/${ticketFk}`); notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive'); const ticketIndex = store.data.findIndex((e) => e.ticketFk == ticketFk);
const ticketIndex = store.data.findIndex((e) => e.ticketFk == ticketFk); store.data.splice(ticketIndex, 1);
store.data.splice(ticketIndex, 1); location.reload();
location.reload();
} catch (err) {
console.error('Error deleting weekly', err);
}
}; };
const onUpdate = async (ticketFk, field, value) => { const onUpdate = async (ticketFk, field, value) => {
try { const params = { ticketFk, [field]: value };
const params = { ticketFk, [field]: value }; await axios.patch('TicketWeeklies', params);
await axios.patch('TicketWeeklies', params);
} catch (err) {
console.error('Error updating weekly', err);
}
}; };
onMounted(async () => { onMounted(async () => {

View File

@ -10,16 +10,6 @@ ticketNotes:
observationType: Observation type observationType: Observation type
removeNote: Remove note removeNote: Remove note
addNote: Add note addNote: Add note
observationTypes:
ItemPicker: Item picker
Packager: Packager
Delivery: Delivery
SalesPerson: Sales person
Administrative: Administrative
Weight: Weight
InvoiceOut: Invoice Out
DropOff: Drop Off
Sustitución: Sustitution
ticketSale: ticketSale:
visible: Visible visible: Visible
available: Available available: Available

View File

@ -19,18 +19,6 @@ ticketNotes:
observationType: Tipo de observación observationType: Tipo de observación
removeNote: Quitar nota removeNote: Quitar nota
addNote: Añadir nota addNote: Añadir nota
observationTypes:
ItemPicker: Sacador
Packager: Encajador
Delivery: Envío
SalesPerson: Comercial
Administrative: Administrativa
Weight: Peso
InvoiceOut: Facturas
DropOff: Despacho
Sustitución: Sustitución
Accepted: Aceptado
Denied: Denegado
purchaseRequest: purchaseRequest:
requester: Solicitante requester: Solicitante
atender: Comprador atender: Comprador

View File

@ -21,12 +21,7 @@ const agenciesOptions = ref([]);
@on-fetch="(data) => (agenciesOptions = data)" @on-fetch="(data) => (agenciesOptions = data)"
auto-load auto-load
/> />
<FormModel <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
:url="`Travels/${route.params.id}`"
:url-update="`Travels/${route.params.id}`"
model="Travel"
auto-load
>
<template #form="{ data }"> <template #form="{ data }">
<VnRow> <VnRow>
<VnInput v-model="data.ref" :label="t('globals.reference')" /> <VnInput v-model="data.ref" :label="t('globals.reference')" />
@ -78,6 +73,7 @@ const agenciesOptions = ref([]);
</VnInput> </VnInput>
</VnRow> </VnRow>
<VnRow> <VnRow>
<QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
<QCheckbox <QCheckbox
:label="t('travel.summary.delivered')" :label="t('travel.summary.delivered')"
v-model="data.isDelivered" v-model="data.isDelivered"
@ -93,7 +89,7 @@ const agenciesOptions = ref([]);
<i18n> <i18n>
es: es:
raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si se deja vacio, la fecha no cambiará
en: en:
raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If left empty, the date will stay the same.
</i18n> </i18n>

View File

@ -1,34 +1,7 @@
<script setup> <script setup>
import VnCard from 'components/common/VnCard.vue'; import VnCard from 'components/common/VnCard.vue';
import TravelDescriptor from './TravelDescriptor.vue'; import TravelDescriptor from './TravelDescriptor.vue';
import filter from './TravelFilter.js';
const filter = {
fields: [
'id',
'ref',
'shipped',
'landed',
'totalEntries',
'warehouseInFk',
'warehouseOutFk',
'cargoSupplierFk',
'agencyModeFk',
],
include: [
{
relation: 'warehouseIn',
scope: {
fields: ['name'],
},
},
{
relation: 'warehouseOut',
scope: {
fields: ['name'],
},
},
],
};
</script> </script>
<template> <template>
<VnCard <VnCard

View File

@ -7,6 +7,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue'; import VnLv from 'src/components/ui/VnLv.vue';
import useCardDescription from 'src/composables/useCardDescription'; import useCardDescription from 'src/composables/useCardDescription';
import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue'; import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
import filter from './TravelFilter.js';
import { toDate } from 'src/filters'; import { toDate } from 'src/filters';
@ -21,35 +22,6 @@ const $props = defineProps({
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const filter = {
fields: [
'id',
'ref',
'shipped',
'landed',
'totalEntries',
'warehouseInFk',
'warehouseOutFk',
'cargoSupplierFk',
'agencyModeFk',
'daysInForward',
],
include: [
{
relation: 'warehouseIn',
scope: {
fields: ['name'],
},
},
{
relation: 'warehouseOut',
scope: {
fields: ['name'],
},
},
],
};
const entityId = computed(() => { const entityId = computed(() => {
return $props.id || route.params.id; return $props.id || route.params.id;
}); });
@ -65,7 +37,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
:title="data.title" :title="data.title"
:subtitle="data.subtitle" :subtitle="data.subtitle"
:filter="filter" :filter="filter"
data-key="travelData" data-key="Travel"
@on-fetch="setData" @on-fetch="setData"
> >
<template #menu="{ entity }"> <template #menu="{ entity }">
@ -80,12 +52,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
</template> </template>
<template #icons="{ entity }"> <template #icons="{ entity }">
<QCardActions class="q-gutter-x-md"> <QCardActions class="q-gutter-x-md">
<QIcon <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
v-if="entity.daysInForward"
name="vn:net"
color="primary"
size="xs"
>
<QTooltip> <QTooltip>
{{ {{
t('globals.raid', { daysInForward: entity.daysInForward }) t('globals.raid', { daysInForward: entity.daysInForward })

View File

@ -32,16 +32,12 @@ const cloneTravel = () => {
}; };
const cloneTravelWithEntries = async () => { const cloneTravelWithEntries = async () => {
try { const { data } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
const { data } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`); notify('globals.dataSaved', 'positive');
notify('globals.dataSaved', 'positive'); router.push({ name: 'TravelBasicData', params: { id: data.id } });
router.push({ name: 'TravelBasicData', params: { id: data.id } });
} catch (err) {
console.error('Error cloning travel with entries');
}
}; };
const canDelete = computed(() => useAcl().hasAny('Travel','*','WRITE')); const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
const openDeleteEntryDialog = (id) => { const openDeleteEntryDialog = (id) => {
quasar quasar
@ -58,13 +54,9 @@ const openDeleteEntryDialog = (id) => {
}; };
const deleteTravel = async (id) => { const deleteTravel = async (id) => {
try { await axios.delete(`Travels/${id}`);
await axios.delete(`Travels/${id}`); router.push({ name: 'TravelList' });
router.push({ name: 'TravelList' }); notify('globals.dataDeleted', 'positive');
notify('globals.dataDeleted', 'positive');
} catch (err) {
console.error('Error deleting travel');
}
}; };
</script> </script>

View File

@ -0,0 +1,29 @@
export default {
fields: [
'id',
'ref',
'shipped',
'landed',
'totalEntries',
'warehouseInFk',
'warehouseOutFk',
'cargoSupplierFk',
'agencyModeFk',
'isRaid',
'daysInForward',
],
include: [
{
relation: 'warehouseIn',
scope: {
fields: ['name'],
},
},
{
relation: 'warehouseOut',
scope: {
fields: ['name'],
},
},
],
};

View File

@ -193,44 +193,32 @@ const entriesTotalM3 = computed(() =>
); );
const getTravelEntries = async (id) => { const getTravelEntries = async (id) => {
try { const { data } = await axios.get(`Travels/${id}/getEntries`);
const { data } = await axios.get(`Travels/${id}/getEntries`); entries.value = data;
entries.value = data;
} catch (err) {
console.error('Error fetching travel entries');
}
}; };
const getTravelThermographs = async (id) => { const getTravelThermographs = async (id) => {
try { const filter = {
const filter = { include: {
include: { relation: 'warehouse',
relation: 'warehouse', scope: {
scope: { fields: ['id', 'name'],
fields: ['id', 'name'],
},
}, },
where: { travelFk: id }, },
}; where: { travelFk: id },
};
const { data } = await axios.get('TravelThermographs', { const { data } = await axios.get('TravelThermographs', {
params: { filter: JSON.parse(JSON.stringify(filter)) }, params: { filter: JSON.parse(JSON.stringify(filter)) },
}); });
thermographs.value = data; thermographs.value = data;
} catch (err) {
console.error('Error fetching travel thermographs');
}
}; };
async function setTravelData(travelData) { async function setTravelData(travelData) {
try { if (travelData) {
if (travelData) { travel.value = travelData;
travel.value = travelData; await getTravelEntries(travel.value.id);
await getTravelEntries(travel.value.id); await getTravelThermographs(travel.value.id);
await getTravelThermographs(travel.value.id);
}
} catch (err) {
console.error(`Error setting travel data`, err);
} }
} }
@ -268,6 +256,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
:label="t('globals.warehouseOut')" :label="t('globals.warehouseOut')"
:value="travel.warehouseOut?.name" :value="travel.warehouseOut?.name"
/> />
<QCheckbox
:label="t('travel.basicData.isRaid')"
v-model="travel.isRaid"
:disable="true"
/>
<QCheckbox <QCheckbox
:label="t('travel.summary.delivered')" :label="t('travel.summary.delivered')"
v-model="travel.isDelivered" v-model="travel.isDelivered"
@ -286,6 +279,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
:label="t('globals.warehouseIn')" :label="t('globals.warehouseIn')"
:value="travel.warehouseIn?.name" :value="travel.warehouseIn?.name"
/> />
<VnLv
:label="t('travel.basicData.daysInForward')"
:value="travel?.daysInForward"
/>
<QCheckbox <QCheckbox
:label="t('travel.summary.received')" :label="t('travel.summary.received')"
v-model="travel.isReceived" v-model="travel.isReceived"
@ -303,10 +300,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
<VnLv :label="t('globals.reference')" :value="travel.ref" /> <VnLv :label="t('globals.reference')" :value="travel.ref" />
<VnLv label="m³" :value="travel.m3" /> <VnLv label="m³" :value="travel.m3" />
<VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" /> <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
<VnLv
:label="t('travel.basicData.daysInForward')"
:value="travel?.daysInForward"
/>
</QCard> </QCard>
<QCard class="full-width"> <QCard class="full-width">
<VnTitle :text="t('travel.summary.entries')" /> <VnTitle :text="t('travel.summary.entries')" />

View File

@ -122,13 +122,9 @@ const redirectToThermographForm = (action, id) => {
}; };
const removeThermograph = async (id) => { const removeThermograph = async (id) => {
try { await axios.delete(`Travels/deleteThermograph?id=${id}`);
await axios.delete(`Travels/deleteThermograph?id=${id}`); await thermographPaginateRef.value.fetch();
await thermographPaginateRef.value.fetch(); notify(t('Thermograph removed'), 'positive');
notify(t('Thermograph removed'), 'positive');
} catch (err) {
console.error('Error removing termograph');
}
}; };
</script> </script>

View File

@ -56,17 +56,13 @@ onBeforeMount(async () => {
}); });
const fetchDmsTypes = async () => { const fetchDmsTypes = async () => {
try { const params = {
const params = { filter: {
filter: { where: { code: 'thermograph' },
where: { code: 'thermograph' }, },
}, };
}; const { data } = await axios.get('DmsTypes/findOne', { params });
const { data } = await axios.get('DmsTypes/findOne', { params }); return data;
return data;
} catch (err) {
console.error('Error fetching Dms Types');
}
}; };
const setCreateDefaultParams = async () => { const setCreateDefaultParams = async () => {

View File

@ -293,20 +293,16 @@ const openReportPdf = () => {
}; };
const saveFieldValue = async (val, field, index) => { const saveFieldValue = async (val, field, index) => {
try { // Evitar la solicitud de guardado si el valor no ha cambiado
// Evitar la solicitud de guardado si el valor no ha cambiado if (originalRowDataCopy.value[index][field] == val) return;
if (originalRowDataCopy.value[index][field] == val) return;
const id = rows.value[index].id; const id = rows.value[index].id;
const params = { [field]: val }; const params = { [field]: val };
await axios.patch(`Travels/${id}`, params); await axios.patch(`Travels/${id}`, params);
// Actualizar la copia de los datos originales con el nuevo valor // Actualizar la copia de los datos originales con el nuevo valor
originalRowDataCopy.value[index][field] = val; originalRowDataCopy.value[index][field] = val;
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false });
} catch (err) {
console.error('Error updating travel');
}
}; };
const stopEventPropagation = (event, col) => { const stopEventPropagation = (event, col) => {

View File

@ -227,10 +227,12 @@ const columns = computed(() => [
> >
<template #column-status="{ row }"> <template #column-status="{ row }">
<div class="row"> <div class="row">
<QIcon v-if="!!row.daysInForward" name="vn:net" color="primary"> <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
<QTooltip> <QTooltip>
{{ {{
t('globals.raid', { daysInForward: row.daysInForward }) t('globals.raid', {
daysInForward: row.daysInForward,
})
}}</QTooltip }}</QTooltip
> >
</QIcon> </QIcon>

View File

@ -19,16 +19,10 @@ const createTrayFormDialogRef = ref();
const selectedEntityId = ref(); const selectedEntityId = ref();
async function loadTrays() { async function loadTrays() {
try { const res = await axios.get('WagonTypeTrays');
const res = await axios.get('WagonTypeTrays'); const filteredTrays = res.data.filter((tray) => tray.wagonTypeFk === entityId.value);
const filteredTrays = res.data.filter( wagonTrays.value = filteredTrays;
(tray) => tray.wagonTypeFk === entityId.value return;
);
wagonTrays.value = filteredTrays;
return;
} catch (err) {
console.error('Error loading trays:', err);
}
} }
async function addTray(newTray) { async function addTray(newTray) {

View File

@ -60,40 +60,29 @@ const updateSelectedDate = (year) => {
}; };
const createEvent = async (date) => { const createEvent = async (date) => {
try { const params = {
const params = { dated: date,
dated: date, absenceTypeId: props.absenceType.id,
absenceTypeId: props.absenceType.id, businessFk: props.businessFk,
businessFk: props.businessFk, };
};
const { data } = await axios.post( const { data } = await axios.post(`Workers/${route.params.id}/createAbsence`, params);
`Workers/${route.params.id}/createAbsence`,
params
);
if (data) emit('refresh'); if (data) emit('refresh');
} catch (error) {
console.error('error creating event:: ', error);
}
}; };
const editEvent = async (event) => { const editEvent = async (event) => {
try { const absenceType = props.absenceType;
const absenceType = props.absenceType; const params = {
const params = { absenceId: event.absenceId,
absenceId: event.absenceId, absenceTypeId: absenceType.id,
absenceTypeId: absenceType.id, };
}; const { data } = await axios.patch(
const { data } = await axios.patch( `Workers/${route.params.id}/updateAbsence`,
`Workers/${route.params.id}/updateAbsence`, params
params );
);
if (data) emit('refresh'); if (data) emit('refresh');
} catch (error) {
console.error('error editing event:: ', error);
}
}; };
const deleteEvent = async (event, date) => { const deleteEvent = async (event, date) => {

View File

@ -39,15 +39,9 @@ const entityId = computed(() => {
const workerExcluded = ref(false); const workerExcluded = ref(false);
const getIsExcluded = async () => { const getIsExcluded = async () => {
try { const { data } = await axios.get(`WorkerDisableExcludeds/${entityId.value}/exists`);
const { data } = await axios.get( if (!data) return;
`WorkerDisableExcludeds/${entityId.value}/exists` workerExcluded.value = data.exists;
);
if (!data) return;
workerExcluded.value = data.exists;
} catch (err) {
console.error('Error getting worker excluded: ', err);
}
}; };
const handleExcluded = async () => { const handleExcluded = async () => {

View File

@ -15,7 +15,7 @@ const filter = {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['id', 'nickname'], fields: ['id', 'nickname', 'name'],
}, },
}, },
}, },

Some files were not shown because too many files have changed in this diff Show More