verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 61 Releases Wiki Activity

Merge branch 'dev' into 8001-expeditionGrafana
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Robert Ferrús 2024-10-28 08:13:10 +00:00
parent 3ab4574155 0537213a58
commit d16f4f3154
81 changed files with 1828 additions and 2129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/boot/axios.js
View File

@ -39,37 +39,7 @@ const onResponse = (response) => {
const onResponseError = (error) => { const onResponseError = (error) => {
stateQuery.remove(error.config); stateQuery.remove(error.config);
let message = ''; if (session.isLoggedIn() && error.response?.status === 401) {
const response = error.response;
const responseData = response && response.data;
const responseError = responseData && response.data.error;
if (responseError) {
message = responseError.message;
}
switch (response?.status) {
case 422:
if (error.name == 'ValidationError')
message +=
' "' +
responseError.details.context +
'.' +
Object.keys(responseError.details.codes).join(',') +
'"';
break;
case 500:
message = 'errors.statusInternalServerError';
break;
case 502:
message = 'errors.statusBadGateway';
break;
case 504:
message = 'errors.statusGatewayTimeout';
break;
}
if (session.isLoggedIn() && response?.status === 401) {
session.destroy(false); session.destroy(false);
const hash = window.location.hash; const hash = window.location.hash;
const url = hash.slice(1); const url = hash.slice(1);
@ -78,8 +48,6 @@ const onResponseError = (error) => {
return Promise.reject(error); return Promise.reject(error);
} }
notify(message, 'negative');
return Promise.reject(error); return Promise.reject(error);
}; };

38
src/boot/mainShortcutMixin.js
View File

@ -1,38 +0,0 @@
import routes from 'src/router/modules';
import { useRouter } from 'vue-router';
let isNotified = false;
export default {
created: function () {
const router = useRouter();
const keyBindingMap = routes
.filter((route) => route.meta.keyBinding)
.reduce((map, route) => {
map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
return map;
}, {});
const handleKeyDown = (event) => {
const { ctrlKey, altKey, code } = event;
if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
event.preventDefault();
router.push(keyBindingMap[code]);
isNotified = true;
}
};
const handleKeyUp = (event) => {
const { ctrlKey, altKey } = event;
// Resetea la bandera cuando se sueltan las teclas ctrl o alt
if (!ctrlKey || !altKey) {
isNotified = false;
}
};
window.addEventListener('keydown', handleKeyDown);
window.addEventListener('keyup', handleKeyUp);
},
};

45
src/boot/quasar.js
View File

@ -1,16 +1,51 @@
import { boot } from 'quasar/wrappers'; import { boot } from 'quasar/wrappers';
import qFormMixin from './qformMixin'; import qFormMixin from './qformMixin';
import mainShortcutMixin from './mainShortcutMixin';
import keyShortcut from './keyShortcut'; import keyShortcut from './keyShortcut';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import { CanceledError } from 'axios';
const { notify } = useNotify(); const { notify } = useNotify();
export default boot(({ app }) => { export default boot(({ app }) => {
app.mixin(qFormMixin); app.mixin(qFormMixin);
app.mixin(mainShortcutMixin);
app.directive('shortcut', keyShortcut); app.directive('shortcut', keyShortcut);
app.config.errorHandler = function (err) { app.config.errorHandler = (error) => {
console.error(err); let message;
notify('globals.error', 'negative', 'error'); const response = error.response;
const responseData = response?.data;
const responseError = responseData && response.data.error;
if (responseError) {
message = responseError.message;
}
switch (response?.status) {
case 422:
if (error.name == 'ValidationError')
message +=
' "' +
responseError.details.context +
'.' +
Object.keys(responseError.details.codes).join(',') +
'"';
break;
case 500:
message = 'errors.statusInternalServerError';
break;
case 502:
message = 'errors.statusBadGateway';
break;
case 504:
message = 'errors.statusGatewayTimeout';
break;
}
console.error(error);
if (error instanceof CanceledError) {
const env = process.env.NODE_ENV;
if (env && env !== 'development') return;
message = 'Duplicate request';
}
notify(message ?? 'globals.error', 'negative', 'error');
}; };
}); });

16
src/components/CreateNewPostcodeForm.vue
View File

@ -108,11 +108,11 @@ watch(
watch( watch(
() => postcodeFormData.provinceFk, () => postcodeFormData.provinceFk,
async (newProvinceFk) => { async (newProvinceFk, oldValueFk) => {
if (Array.isArray(newProvinceFk)) { if (Array.isArray(newProvinceFk)) {
newProvinceFk = newProvinceFk[0]; newProvinceFk = newProvinceFk[0];
} }
if (newProvinceFk !== postcodeFormData.provinceFk) { if (newProvinceFk !== oldValueFk) {
await townsFetchDataRef.value.fetch({ await townsFetchDataRef.value.fetch({
where: { provinceFk: newProvinceFk }, where: { provinceFk: newProvinceFk },
}); });
@ -147,13 +147,7 @@ async function handleCountries(data) {
auto-load auto-load
url="Towns/location" url="Towns/location"
/> />
<FetchData
@on-fetch="handleCountries"
:sort-by="['name ASC']"
:limit="30"
auto-load
url="Countries"
/>
<FormModelPopup <FormModelPopup
url-create="postcodes" url-create="postcodes"
model="postcode" model="postcode"
@ -219,8 +213,10 @@ async function handleCountries(data) {
@on-province-created="onProvinceCreated" @on-province-created="onProvinceCreated"
/> />
<VnSelect <VnSelect
url="Countries"
:sort-by="['name ASC']"
:label="t('Country')" :label="t('Country')"
:options="countriesOptions" @update:options="handleCountries"
hide-selected hide-selected
option-label="name" option-label="name"
option-value="id" option-value="id"

3
src/components/FormModel.vue
View File

@ -217,9 +217,6 @@ async function save() {
updateAndEmit('onDataSaved', formData.value, response?.data); updateAndEmit('onDataSaved', formData.value, response?.data);
if ($props.reload) await arrayData.fetch({}); if ($props.reload) await arrayData.fetch({});
hasChanges.value = false; hasChanges.value = false;
} catch (err) {
console.error(err);
notify('errors.writeRequest', 'negative');
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }

2
src/components/FormModelPopup.vue
View File

@ -61,6 +61,7 @@ defineExpose({
:loading="isLoading" :loading="isLoading"
@click="emit('onDataCanceled')" @click="emit('onDataCanceled')"
v-close-popup v-close-popup
data-cy="FormModelPopup_cancel"
/> />
<QBtn <QBtn
:label="t('globals.save')" :label="t('globals.save')"
@ -70,6 +71,7 @@ defineExpose({
class="q-ml-sm" class="q-ml-sm"
:disabled="isLoading" :disabled="isLoading"
:loading="isLoading" :loading="isLoading"
data-cy="FormModelPopup_save"
/> />
</div> </div>
</template> </template>

2
src/components/VnTable/VnColumn.vue
View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { markRaw, computed, defineModel } from 'vue'; import { markRaw, computed } from 'vue';
import { QIcon, QCheckbox } from 'quasar'; import { QIcon, QCheckbox } from 'quasar';
import { dashIfEmpty } from 'src/filters'; import { dashIfEmpty } from 'src/filters';

2
src/components/VnTable/VnFilter.vue
View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { markRaw, computed, defineModel } from 'vue'; import { markRaw, computed } from 'vue';
import { QCheckbox } from 'quasar'; import { QCheckbox } from 'quasar';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';

13
src/components/VnTable/VnTable.vue
View File

@ -151,8 +151,8 @@ const tableModes = [
}, },
]; ];
onBeforeMount(() => { onBeforeMount(() => {
setUserParams(route.query[$props.searchUrl]); const urlParams = route.query[$props.searchUrl];
hasParams.value = params.value && Object.keys(params.value).length !== 0; hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
}); });
onMounted(() => { onMounted(() => {
@ -185,7 +185,8 @@ watch(
watch( watch(
() => route.query[$props.searchUrl], () => route.query[$props.searchUrl],
(val) => setUserParams(val) (val) => setUserParams(val),
{ immediate: true, deep: true }
); );
const isTableMode = computed(() => mode.value == TABLE_MODE); const isTableMode = computed(() => mode.value == TABLE_MODE);
@ -457,7 +458,11 @@ function handleScroll() {
/> />
</template> </template>
<template #header-cell="{ col }"> <template #header-cell="{ col }">
<QTh v-if="col.visible ?? true"> <QTh
v-if="col.visible ?? true"
:style="col.headerStyle"
:class="col.headerClass"
>
<div <div
class="column self-start q-ml-xs ellipsis" class="column self-start q-ml-xs ellipsis"
:class="`text-${col?.align ?? 'left'}`" :class="`text-${col?.align ?? 'left'}`"

24
src/components/common/VnProgressModal.vue
View File

@ -9,10 +9,6 @@ const $props = defineProps({
type: Number, //Progress value (1.0 > x > 0.0) type: Number, //Progress value (1.0 > x > 0.0)
required: true, required: true,
}, },
showDialog: {
type: Boolean,
required: true,
},
cancelled: { cancelled: {
type: Boolean, type: Boolean,
required: false, required: false,
@ -24,30 +20,22 @@ const emit = defineEmits(['cancel', 'close']);
const dialogRef = ref(null); const dialogRef = ref(null);
const _showDialog = computed({ const showDialog = defineModel('showDialog', {
get: () => $props.showDialog, type: Boolean,
set: (value) => { default: false,
if (value) dialogRef.value.show();
},
}); });
const _progress = computed(() => $props.progress); const _progress = computed(() => $props.progress);
const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`); const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
const cancel = () => {
dialogRef.value.hide();
emit('cancel');
};
</script> </script>
<template> <template>
<QDialog ref="dialogRef" v-model="_showDialog" @hide="onDialogHide"> <QDialog ref="dialogRef" v-model="showDialog" @hide="emit('close')">
<QCard class="full-width dialog"> <QCard class="full-width dialog">
<QCardSection class="row"> <QCardSection class="row">
<span class="text-h6">{{ t('Progress') }}</span> <span class="text-h6">{{ t('Progress') }}</span>
<QSpace /> <QSpace />
<QBtn icon="close" flat round dense @click="emit('close')" /> <QBtn icon="close" flat round dense v-close-popup />
</QCardSection> </QCardSection>
<QCardSection> <QCardSection>
<div class="column"> <div class="column">
@ -80,7 +68,7 @@ const cancel = () => {
type="button" type="button"
flat flat
class="text-primary" class="text-primary"
@click="cancel()" v-close-popup
> >
{{ t('globals.cancel') }} {{ t('globals.cancel') }}
</QBtn> </QBtn>

1
src/composables/useArrayData.js
View File

@ -247,6 +247,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
} }
function updateStateParams() { function updateStateParams() {
if (!route) return;
const newUrl = { path: route.path, query: { ...(route.query ?? {}) } }; const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter); newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);

86
src/i18n/locale/en.yml
View File

@ -1055,92 +1055,6 @@ travel:
warehouse: Warehouse warehouse: Warehouse
travelFileDescription: 'Travel id { travelId }' travelFileDescription: 'Travel id { travelId }'
file: File file: File
item:
descriptor:
item: Item
buyer: Buyer
color: Color
category: Category
stems: Stems
visible: Visible
available: Available
warehouseText: 'Calculated on the warehouse of { warehouseName }'
itemDiary: Item diary
producer: Producer
list:
id: Identifier
grouping: Grouping
packing: Packing
description: Description
stems: Stems
category: Category
typeName: Type
intrastat: Intrastat
isActive: Active
size: Size
origin: Origin
userName: Buyer
weightByPiece: Weight/Piece
stemMultiplier: Multiplier
producer: Producer
landed: Landed
fixedPrice:
itemFk: Item ID
groupingPrice: Grouping price
packingPrice: Packing price
hasMinPrice: Has min price
minPrice: Min price
started: Started
ended: Ended
warehouse: Warehouse
create:
name: Name
tag: Tag
priority: Priority
type: Type
intrastat: Intrastat
origin: Origin
buyRequest:
ticketId: 'Ticket ID'
shipped: 'Shipped'
requester: 'Requester'
requested: 'Requested'
price: 'Price'
attender: 'Atender'
item: 'Item'
achieved: 'Achieved'
concept: 'Concept'
state: 'State'
summary:
basicData: 'Basic data'
otherData: 'Other data'
description: 'Description'
tax: 'Tax'
tags: 'Tags'
botanical: 'Botanical'
barcode: 'Barcode'
name: 'Nombre'
completeName: 'Nombre completo'
family: 'Familia'
size: 'Medida'
origin: 'Origen'
stems: 'Tallos'
multiplier: 'Multiplicador'
buyer: 'Comprador'
doPhoto: 'Do photo'
intrastatCode: 'Código intrastat'
intrastat: 'Intrastat'
ref: 'Referencia'
relevance: 'Relevancia'
weight: 'Peso (gramos)/tallo'
units: 'Unidades/caja'
expense: 'Gasto'
generic: 'Genérico'
recycledPlastic: 'Plástico reciclado'
nonRecycledPlastic: 'Plástico no reciclado'
minSalesQuantity: 'Cantidad mínima de venta'
genus: 'Genus'
specie: 'Specie'
components: components:
topbar: {} topbar: {}
itemsFilterPanel: itemsFilterPanel:

86
src/i18n/locale/es.yml
View File

@ -1053,92 +1053,6 @@ travel:
warehouse: Almacén warehouse: Almacén
travelFileDescription: 'Id envío { travelId }' travelFileDescription: 'Id envío { travelId }'
file: Fichero file: Fichero
item:
descriptor:
item: Artículo
buyer: Comprador
color: Color
category: Categoría
stems: Tallos
visible: Visible
available: Disponible
warehouseText: 'Calculado sobre el almacén de { warehouseName }'
itemDiary: Registro de compra-venta
producer: Productor
list:
id: Identificador
grouping: Grouping
packing: Packing
description: Descripción
stems: Tallos
category: Reino
typeName: Tipo
intrastat: Intrastat
isActive: Activo
size: Medida
origin: Origen
weightByPiece: Peso (gramos)/tallo
userName: Comprador
stemMultiplier: Multiplicador
producer: Productor
landed: F. entrega
fixedPrice:
itemFk: ID Artículo
groupingPrice: Precio grouping
packingPrice: Precio packing
hasMinPrice: Tiene precio mínimo
minPrice: Precio min
started: Inicio
ended: Fin
warehouse: Almacén
create:
name: Nombre
tag: Etiqueta
priority: Prioridad
type: Tipo
intrastat: Intrastat
origin: Origen
summary:
basicData: 'Datos básicos'
otherData: 'Otros datos'
description: 'Descripción'
tax: 'IVA'
tags: 'Etiquetas'
botanical: 'Botánico'
barcode: 'Código de barras'
name: 'Nombre'
completeName: 'Nombre completo'
family: 'Familia'
size: 'Medida'
origin: 'Origen'
stems: 'Tallos'
multiplier: 'Multiplicador'
buyer: 'Comprador'
doPhoto: 'Hacer foto'
intrastatCode: 'Código intrastat'
intrastat: 'Intrastat'
ref: 'Referencia'
relevance: 'Relevancia'
weight: 'Peso (gramos)/tallo'
units: 'Unidades/caja'
expense: 'Gasto'
generic: 'Genérico'
recycledPlastic: 'Plástico reciclado'
nonRecycledPlastic: 'Plástico no reciclado'
minSalesQuantity: 'Cantidad mínima de venta'
genus: 'Genus'
specie: 'Specie'
buyRequest:
ticketId: 'ID Ticket'
shipped: 'F. envío'
requester: 'Solicitante'
requested: 'Solicitado'
price: 'Precio'
attender: 'Comprador'
item: 'Artículo'
achieved: 'Conseguido'
concept: 'Concepto'
state: 'Estado'
components: components:
topbar: {} topbar: {}
itemsFilterPanel: itemsFilterPanel:

37
src/layouts/MainLayout.vue
View File

@ -1,7 +1,44 @@
<script setup> <script setup>
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import Navbar from 'src/components/NavBar.vue'; import Navbar from 'src/components/NavBar.vue';
import { useRouter } from 'vue-router';
import routes from 'src/router/modules';
import { onMounted } from 'vue';
const quasar = useQuasar(); const quasar = useQuasar();
onMounted(() => {
let isNotified = false;
const router = useRouter();
const keyBindingMap = routes
.filter((route) => route.meta.keyBinding)
.reduce((map, route) => {
map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
return map;
}, {});
const handleKeyDown = (event) => {
const { ctrlKey, altKey, code } = event;
if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
event.preventDefault();
router.push(keyBindingMap[code]);
isNotified = true;
}
};
const handleKeyUp = (event) => {
const { ctrlKey, altKey } = event;
if (!ctrlKey || !altKey) {
isNotified = false;
}
};
window.addEventListener('keydown', handleKeyDown);
window.addEventListener('keyup', handleKeyUp);
});
</script> </script>
<template> <template>

28
src/pages/Account/AccountAcls.vue
View File

@ -9,6 +9,8 @@ import { useQuasar } from 'quasar';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue';
import VnConfirm from 'components/ui/VnConfirm.vue'; import VnConfirm from 'components/ui/VnConfirm.vue';
import FetchData from 'src/components/FetchData.vue';
import { useValidator } from 'src/composables/useValidator';
defineProps({ defineProps({
id: { id: {
@ -23,11 +25,18 @@ const stateStore = useStateStore();
const quasar = useQuasar(); const quasar = useQuasar();
const tableRef = ref(); const tableRef = ref();
const roles = ref();
const validationsStore = useValidator();
const { models } = validationsStore;
const exprBuilder = (param, value) => { const exprBuilder = (param, value) => {
switch (param) { switch (param) {
case 'search': case 'search':
return { model: { like: `%${value}%` } }; return {
or: [
{ model: { like: `%${value}%` } },
{ property: { like: `%${value}%` } },
],
};
default: default:
return { [param]: value }; return { [param]: value };
} }
@ -47,6 +56,13 @@ const columns = computed(() => [
label: t('model'), label: t('model'),
cardVisible: true, cardVisible: true,
create: true, create: true,
columnCreate: {
label: t('model'),
component: 'select',
attrs: {
options: Object.keys(models),
},
},
}, },
{ {
align: 'left', align: 'left',
@ -55,9 +71,10 @@ const columns = computed(() => [
cardVisible: true, cardVisible: true,
component: 'select', component: 'select',
attrs: { attrs: {
url: 'VnRoles', options: roles,
optionLabel: 'name', optionLabel: 'name',
optionValue: 'name', optionValue: 'name',
inputDebounce: 0,
}, },
create: true, create: true,
}, },
@ -130,6 +147,11 @@ const deleteAcl = async ({ 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>
</QDrawer> </QDrawer>
<FetchData
url="VnRoles?fields=['name']"
auto-load
@on-fetch="(data) => (roles = data)"
/>
<VnTable <VnTable
ref="tableRef" ref="tableRef"
data-key="AccountAcls" data-key="AccountAcls"

1
src/pages/Account/AccountFilter.vue
View File

@ -33,6 +33,7 @@ const rolesOptions = ref([]);
:search-button="true" :search-button="true"
:hidden-tags="['search']" :hidden-tags="['search']"
:redirect="false" :redirect="false"
search-url="table"
> >
<template #tags="{ tag, formatFn }"> <template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs"> <div class="q-gutter-x-xs">

2
src/pages/Account/AccountList.vue
View File

@ -74,7 +74,7 @@ const columns = computed(() => [
name: 'tableActions', name: 'tableActions',
actions: [ actions: [
{ {
title: t('View Summary'), title: t('components.smartCard.viewSummary'),
icon: 'preview', icon: 'preview',
action: (row) => viewSummary(row.id, AccountSummary), action: (row) => viewSummary(row.id, AccountSummary),
isPrimary: true, isPrimary: true,

10
src/pages/Account/Alias/Card/AliasUsers.vue
View File

@ -46,13 +46,9 @@ const columns = computed(() => [
]); ]);
const deleteAlias = async (row) => { const deleteAlias = async (row) => {
try { await axios.delete(`${urlPath.value}/${row.id}`);
await axios.delete(`${urlPath.value}/${row.id}`); notify(t('User removed'), 'positive');
notify(t('User removed'), 'positive'); fetchAliases();
fetchAliases();
} catch (error) {
console.error(error);
}
}; };
watch( watch(

20
src/pages/Account/Card/AccountMailAlias.vue
View File

@ -61,23 +61,15 @@ const fetchAccountExistence = async () => {
}; };
const deleteMailAlias = async (row) => { const deleteMailAlias = async (row) => {
try { await axios.delete(`${urlPath}/${row.id}`);
await axios.delete(`${urlPath}/${row.id}`); fetchMailAliases();
fetchMailAliases(); notify(t('Unsubscribed from alias!'), 'positive');
notify(t('Unsubscribed from alias!'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const createMailAlias = async (mailAliasFormData) => { const createMailAlias = async (mailAliasFormData) => {
try { await axios.post(urlPath, mailAliasFormData);
await axios.post(urlPath, mailAliasFormData); notify(t('Subscribed to alias!'), 'positive');
notify(t('Subscribed to alias!'), 'positive'); fetchMailAliases();
fetchMailAliases();
} catch (error) {
console.error(error);
}
}; };
const fetchMailAliases = async () => { const fetchMailAliases = async () => {

2
src/pages/Account/Role/AccountRoles.vue
View File

@ -54,7 +54,7 @@ const columns = computed(() => [
name: 'tableActions', name: 'tableActions',
actions: [ actions: [
{ {
title: t('View Summary'), title: t('components.smartCard.viewSummary'),
icon: 'preview', icon: 'preview',
action: (row) => viewSummary(row.id, RoleSummary), action: (row) => viewSummary(row.id, RoleSummary),
isPrimary: true, isPrimary: true,

26
src/pages/Account/Role/Card/SubRoles.vue
View File

@ -46,29 +46,15 @@ const columns = computed(() => [
]); ]);
const deleteSubRole = async (row) => { const deleteSubRole = async (row) => {
try { await axios.delete(`${urlPath.value}/${row.id}`);
await axios.delete(`${urlPath.value}/${row.id}`); fetchSubRoles();
fetchSubRoles(); notify(t('Role removed. Changes will take a while to fully propagate.'), 'positive');
notify(
t('Role removed. Changes will take a while to fully propagate.'),
'positive'
);
} catch (error) {
console.error(error);
}
}; };
const createSubRole = async (subRoleFormData) => { const createSubRole = async (subRoleFormData) => {
try { await axios.post(urlPath.value, subRoleFormData);
await axios.post(urlPath.value, subRoleFormData); notify(t('Role added! Changes will take a while to fully propagate.'), 'positive');
notify( fetchSubRoles();
t('Role added! Changes will take a while to fully propagate.'),
'positive'
);
fetchSubRoles();
} catch (error) {
console.error(error);
}
}; };
watch( watch(

22
src/pages/Customer/components/CustomerSummaryTable.vue
View File

@ -101,7 +101,7 @@ const columns = computed(() => [
align: 'left', align: 'left',
name: 'itemPackingTypeFk', name: 'itemPackingTypeFk',
label: t('ticketSale.packaging'), label: t('ticketSale.packaging'),
format: (row) => getItemPackagingType(row), format: (row) => getItemPackagingType(row.ticketSales),
}, },
{ {
align: 'right', align: 'right',
@ -151,13 +151,21 @@ const setShippedColor = (date) => {
if (difference < 0) return 'success'; if (difference < 0) return 'success';
}; };
const getItemPackagingType = (row) => { const getItemPackagingType = (ticketSales) => {
const packagingType = row?.ticketSales if (!ticketSales?.length) return '-';
.map((sale) => sale.item?.itemPackingTypeFk || '-')
.filter((value) => value !== '-')
.join(', ');
return dashIfEmpty(packagingType); const packagingTypes = ticketSales.reduce((types, sale) => {
const { itemPackingTypeFk } = sale.item;
if (
!types.includes(itemPackingTypeFk) &&
(itemPackingTypeFk === 'H' || itemPackingTypeFk === 'V')
) {
types.push(itemPackingTypeFk);
}
return types;
}, []);
return dashIfEmpty(packagingTypes.join(', ') || '-');
}; };
</script> </script>

65
src/pages/Entry/EntryLatestBuys.vue
View File

@ -23,7 +23,6 @@ const columns = [
return { return {
id: row.id, id: row.id,
size: '50x50', size: '50x50',
width: '50px',
}; };
}, },
}, },
@ -34,21 +33,37 @@ const columns = [
label: t('entry.latestBuys.tableVisibleColumns.itemFk'), label: t('entry.latestBuys.tableVisibleColumns.itemFk'),
name: 'itemFk', name: 'itemFk',
isTitle: true, isTitle: true,
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.packing'), label: t('entry.latestBuys.tableVisibleColumns.packing'),
name: 'packing', name: 'packing',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.grouping'), label: t('entry.latestBuys.tableVisibleColumns.grouping'),
name: 'grouping', name: 'grouping',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.quantity'), label: t('entry.latestBuys.tableVisibleColumns.quantity'),
name: 'quantity', name: 'quantity',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
@ -59,6 +74,10 @@ const columns = [
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.size'), label: t('entry.latestBuys.tableVisibleColumns.size'),
name: 'size', name: 'size',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
@ -84,6 +103,10 @@ const columns = [
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'), label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
name: 'weightByPiece', name: 'weightByPiece',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
@ -99,26 +122,46 @@ const columns = [
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.entryFk'), label: t('entry.latestBuys.tableVisibleColumns.entryFk'),
name: 'entryFk', name: 'entryFk',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.buyingValue'), label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
name: 'buyingValue', name: 'buyingValue',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.freightValue'), label: t('entry.latestBuys.tableVisibleColumns.freightValue'),
name: 'freightValue', name: 'freightValue',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.comissionValue'), label: t('entry.latestBuys.tableVisibleColumns.comissionValue'),
name: 'comissionValue', name: 'comissionValue',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.packageValue'), label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
name: 'packageValue', name: 'packageValue',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
@ -129,16 +172,28 @@ const columns = [
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.price2'), label: t('entry.latestBuys.tableVisibleColumns.price2'),
name: 'price2', name: 'price2',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.price3'), label: t('entry.latestBuys.tableVisibleColumns.price3'),
name: 'price3', name: 'price3',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.minPrice'), label: t('entry.latestBuys.tableVisibleColumns.minPrice'),
name: 'minPrice', name: 'minPrice',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
@ -149,11 +204,19 @@ const columns = [
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.weight'), label: t('entry.latestBuys.tableVisibleColumns.weight'),
name: 'weight', name: 'weight',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
label: t('entry.latestBuys.tableVisibleColumns.packagingFk'), label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
name: 'packagingFk', name: 'packagingFk',
columnFilter: {
component: 'number',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',

56
src/pages/Item/Card/ItemBasicData.vue
View File

@ -63,7 +63,7 @@ const onIntrastatCreated = (response, formData) => {
<template #form="{ data }"> <template #form="{ data }">
<VnRow> <VnRow>
<VnSelect <VnSelect
:label="t('itemBasicData.type')" :label="t('item.basicData.type')"
v-model="data.typeFk" v-model="data.typeFk"
:options="itemTypesOptions" :options="itemTypesOptions"
option-value="id" option-value="id"
@ -82,17 +82,26 @@ const onIntrastatCreated = (response, formData) => {
</QItem> </QItem>
</template> </template>
</VnSelect> </VnSelect>
<VnInput :label="t('itemBasicData.reference')" v-model="data.comment" /> <VnInput :label="t('item.basicData.reference')" v-model="data.comment" />
<VnInput :label="t('itemBasicData.relevancy')" v-model="data.relevancy" />
</VnRow>
<VnRow>
<VnInput :label="t('itemBasicData.stems')" v-model="data.stems" />
<VnInput <VnInput
:label="t('itemBasicData.multiplier')" :label="t('item.basicData.relevancy')"
type="number"
v-model="data.relevancy"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnInput
:label="t('item.basicData.stems')"
type="number"
v-model="data.stems"
/>
<VnInput
:label="t('item.basicData.multiplier')"
type="number"
v-model="data.stemMultiplier" v-model="data.stemMultiplier"
/> />
<VnSelectDialog <VnSelectDialog
:label="t('itemBasicData.generic')" :label="t('item.basicData.generic')"
v-model="data.genericFk" v-model="data.genericFk"
url="Items/withName" url="Items/withName"
:fields="['id', 'name']" :fields="['id', 'name']"
@ -121,7 +130,7 @@ const onIntrastatCreated = (response, formData) => {
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelectDialog <VnSelectDialog
:label="t('itemBasicData.intrastat')" :label="t('item.basicData.intrastat')"
v-model="data.intrastatFk" v-model="data.intrastatFk"
:options="intrastatsOptions" :options="intrastatsOptions"
option-value="id" option-value="id"
@ -148,7 +157,7 @@ const onIntrastatCreated = (response, formData) => {
</VnSelectDialog> </VnSelectDialog>
<div class="col"> <div class="col">
<VnSelect <VnSelect
:label="t('itemBasicData.expense')" :label="t('item.basicData.expense')"
v-model="data.expenseFk" v-model="data.expenseFk"
:options="expensesOptions" :options="expensesOptions"
option-value="id" option-value="id"
@ -160,64 +169,67 @@ const onIntrastatCreated = (response, formData) => {
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnInput <VnInput
:label="t('itemBasicData.weightByPiece')" :label="t('item.basicData.weightByPiece')"
v-model.number="data.weightByPiece" v-model.number="data.weightByPiece"
:min="0" :min="0"
type="number" type="number"
/> />
<VnInput <VnInput
:label="t('itemBasicData.boxUnits')" :label="t('item.basicData.boxUnits')"
v-model.number="data.packingOut" v-model.number="data.packingOut"
:min="0" :min="0"
type="number" type="number"
/> />
<VnInput <VnInput
:label="t('itemBasicData.recycledPlastic')" :label="t('item.basicData.recycledPlastic')"
v-model.number="data.recycledPlastic" v-model.number="data.recycledPlastic"
:min="0" :min="0"
type="number" type="number"
/> />
<VnInput <VnInput
:label="t('itemBasicData.nonRecycledPlastic')" :label="t('item.basicData.nonRecycledPlastic')"
v-model.number="data.nonRecycledPlastic" v-model.number="data.nonRecycledPlastic"
:min="0" :min="0"
type="number" type="number"
/> />
</VnRow> </VnRow>
<VnRow> <VnRow class="row q-gutter-md q-mb-md">
<QCheckbox v-model="data.isActive" :label="t('itemBasicData.isActive')" /> <QCheckbox
v-model="data.isActive"
:label="t('item.basicData.isActive')"
/>
<QCheckbox <QCheckbox
v-model="data.hasKgPrice" v-model="data.hasKgPrice"
:label="t('itemBasicData.hasKgPrice')" :label="t('item.basicData.hasKgPrice')"
/> />
<div> <div>
<QCheckbox <QCheckbox
v-model="data.isFragile" v-model="data.isFragile"
:label="t('itemBasicData.isFragile')" :label="t('item.basicData.isFragile')"
class="q-mr-sm" class="q-mr-sm"
/> />
<QIcon name="info" class="cursor-pointer" size="xs"> <QIcon name="info" class="cursor-pointer" size="xs">
<QTooltip max-width="300px"> <QTooltip max-width="300px">
{{ t('itemBasicData.isFragileTooltip') }} {{ t('item.basicData.isFragileTooltip') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
</div> </div>
<div> <div>
<QCheckbox <QCheckbox
v-model="data.isPhotoRequested" v-model="data.isPhotoRequested"
:label="t('itemBasicData.isPhotoRequested')" :label="t('item.basicData.isPhotoRequested')"
class="q-mr-sm" class="q-mr-sm"
/> />
<QIcon name="info" class="cursor-pointer" size="xs"> <QIcon name="info" class="cursor-pointer" size="xs">
<QTooltip> <QTooltip>
{{ t('itemBasicData.isPhotoRequestedTooltip') }} {{ t('item.basicData.isPhotoRequestedTooltip') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
</div> </div>
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnInput <VnInput
:label="t('itemBasicData.description')" :label="t('item.basicData.description')"
type="textarea" type="textarea"
v-model="data.description" v-model="data.description"
fill-input fill-input

15
src/pages/Item/Card/ItemBotanical.vue
View File

@ -20,12 +20,6 @@ let itemBotanicalsForm = reactive({ itemFk: null });
const entityId = computed(() => { const entityId = computed(() => {
return route.params.id; return route.params.id;
}); });
onMounted(async () => {
itemBotanicalsForm.itemFk = entityId.value;
itemBotanicals.value = await itemBotanicalsRef.value.fetch();
if (itemBotanicals.value.length > 0)
Object.assign(itemBotanicalsForm, itemBotanicals.value[0]);
});
</script> </script>
<template> <template>
<FetchData <FetchData
@ -37,11 +31,14 @@ onMounted(async () => {
@on-fetch="(data) => (itemBotanicals = data)" @on-fetch="(data) => (itemBotanicals = data)"
/> />
<FormModel <FormModel
url="ItemBotanicals"
url-update="ItemBotanicals" url-update="ItemBotanicals"
model="entry" model="item"
auto-load auto-load
:form-initial-data="itemBotanicalsForm" :filter="{
:clear-store-on-unmount="false" where: { itemFk: entityId },
}"
@on-fetch="(data) => (itemBotanicalsForm = data)"
> >
<template #form="{ data }"> <template #form="{ data }">
<VnRow> <VnRow>

116
src/pages/Item/Card/ItemDescriptor.vue
View File

@ -1,18 +1,18 @@
<script setup> <script setup>
import { computed, ref, onMounted } from 'vue'; import { computed, ref, onMounted } from 'vue';
import { useRoute, useRouter } from 'vue-router'; import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
import CardDescriptor from 'src/components/ui/CardDescriptor.vue'; import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue'; import VnLv from 'src/components/ui/VnLv.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import VnConfirm from 'components/ui/VnConfirm.vue';
import RegularizeStockForm from 'components/RegularizeStockForm.vue'; import RegularizeStockForm from 'components/RegularizeStockForm.vue';
import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue'; import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
import useCardDescription from 'src/composables/useCardDescription'; import useCardDescription from 'src/composables/useCardDescription';
import axios from 'axios'; import axios from 'axios';
import { dashIfEmpty } from 'src/filters'; import { dashIfEmpty } from 'src/filters';
import { useArrayData } from 'src/composables/useArrayData';
import { cloneItem } from 'src/pages/Item/composables/cloneItem';
const $props = defineProps({ const $props = defineProps({
id: { id: {
@ -38,9 +38,8 @@ const $props = defineProps({
}, },
}); });
const quasar = useQuasar(); const { openCloneDialog } = cloneItem();
const route = useRoute(); const route = useRoute();
const router = useRouter();
const { t } = useI18n(); const { t } = useI18n();
const warehouseConfig = ref(null); const warehouseConfig = ref(null);
const entityId = computed(() => { const entityId = computed(() => {
@ -48,84 +47,52 @@ const entityId = computed(() => {
}); });
const regularizeStockFormDialog = ref(null); const regularizeStockFormDialog = ref(null);
const available = ref(null); const mounted = ref();
const visible = ref(null);
const arrayDataStock = useArrayData('descriptorStock', {
url: `Items/${entityId.value}/getVisibleAvailable`,
});
onMounted(async () => { onMounted(async () => {
await getItemConfigs(); await getItemConfigs();
await updateStock(); mounted.value = true;
}); });
const data = ref(useCardDescription()); const data = ref(useCardDescription());
const setData = async (entity) => { const setData = async (entity) => {
try { if (!entity) return;
if (!entity) return; data.value = useCardDescription(entity.name, entity.id);
data.value = useCardDescription(entity.name, entity.id); await updateStock();
await updateStock();
} catch (err) {
console.error('Error item');
}
}; };
const getItemConfigs = async () => { const getItemConfigs = async () => {
try { const { data } = await axios.get('ItemConfigs/findOne');
const { data } = await axios.get('ItemConfigs/findOne'); if (!data) return;
if (!data) return; return (warehouseConfig.value = data.warehouseFk);
return (warehouseConfig.value = data.warehouseFk);
} catch (err) {
console.error('Error item');
}
}; };
const updateStock = async () => { const updateStock = async () => {
try { if (!mounted.value) return;
available.value = null; await getItemConfigs();
visible.value = null;
const params = { const params = {
warehouseFk: $props.warehouseFk, warehouseFk: $props.warehouseFk ?? warehouseConfig.value,
dated: $props.dated, dated: $props.dated,
}; };
await getItemConfigs(); if (!params.warehouseFk) return;
if (!params.warehouseFk) {
params.warehouseFk = warehouseConfig.value; const stock = useArrayData('descriptorStock', {
} url: `Items/${entityId.value}/getVisibleAvailable`,
const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, { userParams: params,
params, });
}); const storeData = stock.store.data;
available.value = data.available; if (storeData?.itemFk == entityId.value) return;
visible.value = data.visible; await stock.fetch({});
} catch (err) {
console.error('Error updating stock');
}
}; };
const openRegularizeStockForm = () => { const openRegularizeStockForm = () => {
regularizeStockFormDialog.value.show(); regularizeStockFormDialog.value.show();
}; };
const cloneItem = async () => {
try {
const { data } = await axios.post(`Items/${entityId.value}/clone`);
router.push({ name: 'ItemTags', params: { id: data.id } });
} catch (err) {
console.error('Error cloning item');
}
};
const openCloneDialog = async () => {
quasar
.dialog({
component: VnConfirm,
componentProps: {
title: t('All its properties will be copied'),
message: t('Do you want to clone this item?'),
},
})
.onOk(async () => {
await cloneItem();
});
};
</script> </script>
<template> <template>
@ -151,7 +118,7 @@ const openCloneDialog = async () => {
</QDialog> </QDialog>
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem v-ripple clickable @click="openCloneDialog()"> <QItem v-ripple clickable @click="openCloneDialog(entityId)">
<QItemSection> <QItemSection>
{{ t('globals.clone') }} {{ t('globals.clone') }}
</QItemSection> </QItemSection>
@ -160,8 +127,8 @@ const openCloneDialog = async () => {
<template #before> <template #before>
<ItemDescriptorImage <ItemDescriptorImage
:entity-id="entityId" :entity-id="entityId"
:visible="visible" :visible="arrayDataStock.store.data?.visible"
:available="available" :available="arrayDataStock.store.data?.available"
/> />
</template> </template>
<template #body="{ entity }"> <template #body="{ entity }">
@ -194,6 +161,18 @@ const openCloneDialog = async () => {
:value="entity.value7" :value="entity.value7"
/> />
</template> </template>
<template #icons="{ entity }">
<QCardActions v-if="entity" class="q-gutter-x-md">
<QIcon
v-if="!entity.isActive"
name="vn:unavailable"
color="primary"
size="xs"
>
<QTooltip>{{ t('Inactive article') }}</QTooltip>
</QIcon>
</QCardActions>
</template>
<template #actions="{}"> <template #actions="{}">
<QCardActions class="row justify-center"> <QCardActions class="row justify-center">
<QBtn <QBtn
@ -216,8 +195,7 @@ const openCloneDialog = async () => {
<i18n> <i18n>
es: es:
Regularize stock: Regularizar stock Regularize stock: Regularizar stock
All its properties will be copied: Todas sus propiedades serán copiadas Inactive article: Artículo inactivo
Do you want to clone this item?: ¿Desea clonar este artículo?
</i18n> </i18n>
<style lang="scss" scoped> <style lang="scss" scoped>

12
src/pages/Item/Card/ItemDescriptorImage.vue
View File

@ -32,6 +32,10 @@ const editPhotoFormDialog = ref(null);
const showEditPhotoForm = ref(false); const showEditPhotoForm = ref(false);
const warehouseName = ref(null); const warehouseName = ref(null);
onMounted(async () => {
getItemConfigs();
});
const toggleEditPictureForm = () => { const toggleEditPictureForm = () => {
showEditPhotoForm.value = !showEditPhotoForm.value; showEditPhotoForm.value = !showEditPhotoForm.value;
}; };
@ -56,10 +60,6 @@ const getWarehouseName = async (warehouseFk) => {
warehouseName.value = data.name; warehouseName.value = data.name;
}; };
onMounted(async () => {
getItemConfigs();
});
const handlePhotoUpdated = (evt = false) => { const handlePhotoUpdated = (evt = false) => {
image.value.reload(evt); image.value.reload(evt);
}; };
@ -134,10 +134,10 @@ es:
Regularize stock: Regularizar stock Regularize stock: Regularizar stock
All it's properties will be copied: Todas sus propiedades serán copiadas All it's properties will be copied: Todas sus propiedades serán copiadas
Do you want to clone this item?: ¿Desea clonar este artículo? Do you want to clone this item?: ¿Desea clonar este artículo?
warehouseText: Calculated on the warehouse of { warehouseName } warehouseText: Calculado sobre el almacén de { warehouseName }
en: en:
warehouseText: Calculado sobre el almacén de { warehouseName } warehouseText: Calculated on the warehouse of { warehouseName }
</i18n> </i18n>
<style lang="scss" scoped> <style lang="scss" scoped>

169
src/pages/Item/Card/ItemDiary.vue
View File

@ -17,6 +17,7 @@ import { toDateFormat } from 'src/filters/date.js';
import { dashIfEmpty } from 'src/filters'; import { dashIfEmpty } from 'src/filters';
import { date } from 'quasar'; import { date } from 'quasar';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
import { useArrayData } from 'src/composables/useArrayData';
import axios from 'axios'; import axios from 'axios';
const { t } = useI18n(); const { t } = useI18n();
@ -37,6 +38,33 @@ const warehouseFk = ref(null);
const _showWhatsBeforeInventory = ref(false); const _showWhatsBeforeInventory = ref(false);
const inventoriedDate = ref(null); const inventoriedDate = ref(null);
const originTypeMap = {
entry: {
descriptor: EntryDescriptorProxy,
icon: 'vn:entry',
color: 'green',
},
ticket: {
descriptor: TicketDescriptorProxy,
icon: 'vn:ticket',
color: 'red',
},
order: {
descriptor: OrderDescriptorProxy,
icon: 'vn:basket',
color: 'yellow',
},
};
const entityTypeMap = {
client: {
descriptor: CustomerDescriptorProxy,
},
supplier: {
descriptor: SupplierDescriptorProxy,
},
};
const columns = computed(() => [ const columns = computed(() => [
{ {
name: 'claim', name: 'claim',
@ -105,6 +133,28 @@ const showWhatsBeforeInventory = computed({
}, },
}); });
onMounted(async () => {
today.value.setHours(0, 0, 0, 0);
if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
else if (user.value) warehouseFk.value = user.value.warehouseFk;
itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
const { data } = await axios.get('Configs/findOne');
inventoriedDate.value = data.inventoried;
await fetchItemBalances();
await scrollToToday();
await updateWarehouse(warehouseFk.value);
});
onUnmounted(() => (stateStore.rightDrawer = false));
watch(
() => router.currentRoute.value.params.id,
(newId) => {
itemsBalanceFilter.where.itemFk = newId;
itemBalancesRef.value.fetch();
}
);
const fetchItemBalances = async () => await itemBalancesRef.value.fetch(); const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
const getBadgeAttrs = (_date) => { const getBadgeAttrs = (_date) => {
@ -131,53 +181,15 @@ const formatDateForAttribute = (dateValue) => {
return dateValue; return dateValue;
}; };
const originTypeMap = { async function updateWarehouse(warehouseFk) {
entry: { const stock = useArrayData('descriptorStock', {
descriptor: EntryDescriptorProxy, userParams: {
icon: 'vn:entry', warehouseFk,
color: 'green', },
}, });
ticket: { await stock.fetch({});
descriptor: TicketDescriptorProxy, stock.store.data.itemFk = route.params.id;
icon: 'vn:ticket', }
color: 'red',
},
order: {
descriptor: OrderDescriptorProxy,
icon: 'vn:basket',
color: 'yellow',
},
};
const entityTypeMap = {
client: {
descriptor: CustomerDescriptorProxy,
},
supplier: {
descriptor: SupplierDescriptorProxy,
},
};
onMounted(async () => {
today.value.setHours(0, 0, 0, 0);
if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
else if (user.value) warehouseFk.value = user.value.warehouseFk;
itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
const { data } = await axios.get('Configs/findOne');
inventoriedDate.value = data.inventoried;
await fetchItemBalances();
await scrollToToday();
});
onUnmounted(() => (stateStore.rightDrawer = false));
watch(
() => router.currentRoute.value.params.id,
(newId) => {
itemsBalanceFilter.where.itemFk = newId;
itemBalancesRef.value.fetch();
}
);
</script> </script>
<template> <template>
@ -193,36 +205,39 @@ watch(
auto-load auto-load
@on-fetch="(data) => (warehousesOptions = data)" @on-fetch="(data) => (warehousesOptions = data)"
/> />
<QToolbar class="justify-end"> <template v-if="stateStore.isHeaderMounted()">
<div id="st-data" class="row"> <Teleport to="#st-data">
<VnSelect <div class="row">
:label="t('itemDiary.warehouse')" <VnSelect
:options="warehousesOptions" :label="t('itemDiary.warehouse')"
hide-selected :options="warehousesOptions"
option-label="name" hide-selected
option-value="id" option-label="name"
dense option-value="id"
v-model="itemsBalanceFilter.where.warehouseFk" dense
@update:model-value="fetchItemBalances" v-model="itemsBalanceFilter.where.warehouseFk"
class="q-mr-lg" @update:model-value="
/> (value) => fetchItemBalances() && updateWarehouse(value)
<QCheckbox "
:label="t('itemDiary.showBefore')" class="q-mr-lg"
v-model="showWhatsBeforeInventory" />
@update:model-value="fetchItemBalances" <QCheckbox
class="q-mr-lg" :label="t('itemDiary.showBefore')"
/> v-model="showWhatsBeforeInventory"
<VnInputDate @update:model-value="fetchItemBalances"
v-if="showWhatsBeforeInventory" class="q-mr-lg"
:label="t('itemDiary.since')" />
dense <VnInputDate
v-model="itemsBalanceFilter.where.date" v-if="showWhatsBeforeInventory"
@update:model-value="fetchItemBalances" :label="t('itemDiary.since')"
/> dense
</div> v-model="itemsBalanceFilter.where.date"
<QSpace /> @update:model-value="fetchItemBalances"
<div id="st-actions"></div> />
</QToolbar> </div>
</Teleport>
<Teleport to="#st-actions"> </Teleport>
</template>
<QPage class="column items-center q-pa-md"> <QPage class="column items-center q-pa-md">
<QTable <QTable
:rows="itemBalances" :rows="itemBalances"

7
src/pages/Item/Card/ItemSummary.vue
View File

@ -119,7 +119,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
<VnLv <VnLv
v-for="(tag, index) in tags" v-for="(tag, index) in tags"
:key="index" :key="index"
:label="`${tag.priority} ${tag.tag.name}`" :label="`${tag.priority} ${tag.tag.name}:`"
:value="tag.value" :value="tag.value"
/> />
</QCard> </QCard>
@ -135,7 +135,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
<VnLv <VnLv
v-for="(tax, index) in item.taxes" v-for="(tax, index) in item.taxes"
:key="index" :key="index"
:label="tax.country.country" :label="tax.country.name"
:value="tax.taxClass.description" :value="tax.taxClass.description"
/> />
</QCard> </QCard>
@ -155,7 +155,8 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
:url="getUrl(entityId, 'barcode')" :url="getUrl(entityId, 'barcode')"
:text="t('item.summary.barcode')" :text="t('item.summary.barcode')"
/> />
<p <div
class="text-bold"
v-for="(barcode, index) in item.itemBarcode" v-for="(barcode, index) in item.itemBarcode"
:key="index" :key="index"
v-text="barcode.code" v-text="barcode.code"

4
src/pages/Item/Card/ItemTax.vue
View File

@ -22,7 +22,7 @@ const taxesFilter = {
{ {
relation: 'country', relation: 'country',
scope: { scope: {
fields: ['country'], fields: ['name'],
}, },
}, },
], ],
@ -73,7 +73,7 @@ const submitTaxes = async (data) => {
> >
<VnInput <VnInput
:label="t('tax.country')" :label="t('tax.country')"
v-model="row.country.country" v-model="row.country.name"
disable disable
/> />
<VnSelect <VnSelect

672
src/pages/Item/ItemList.vue
View File

@ -1,584 +1,360 @@
<script setup> <script setup>
import { onMounted, ref, computed, reactive, onUnmounted } from 'vue'; import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router'; import { useRoute } from 'vue-router';
import FetchData from 'components/FetchData.vue';
import FetchedTags from 'components/ui/FetchedTags.vue';
import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import ItemSummary from '../Item/Card/ItemSummary.vue';
import VnPaginate from 'components/ui/VnPaginate.vue';
import ItemListFilter from './ItemListFilter.vue';
import { useStateStore } from 'stores/useStateStore';
import { toDateFormat } from 'src/filters/date.js';
import { dashIfEmpty } from 'src/filters';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useVnConfirm } from 'composables/useVnConfirm';
import axios from 'axios';
import RightMenu from 'src/components/common/RightMenu.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnImg from 'src/components/ui/VnImg.vue'; import VnImg from 'src/components/ui/VnImg.vue';
import VnTable from 'components/VnTable/VnTable.vue';
import { toDate } from 'src/filters';
import FetchedTags from 'src/components/ui/FetchedTags.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import ItemSummary from '../Item/Card/ItemSummary.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
import { cloneItem } from 'src/pages/Item/composables/cloneItem';
const router = useRouter(); const entityId = computed(() => route.params.id);
const stateStore = useStateStore(); const { openCloneDialog } = cloneItem();
const { t } = useI18n();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
const { openConfirmationModal } = useVnConfirm(); const { t } = useI18n();
const tableRef = ref();
const route = useRoute();
const paginateRef = ref(null); const itemFilter = {
const itemTypesOptions = ref([]); include: [
const originsOptions = ref([]); {
const buyersOptions = ref([]); relation: 'itemType',
const intrastatOptions = ref([]); scope: {
const itemCategoriesOptions = ref([]); fields: ['id', 'name'],
const visibleColumns = ref([]); },
const allColumnNames = ref([]); },
{
const exprBuilder = (param, value) => { relation: 'intrastat',
switch (param) { scope: {
case 'category': fields: ['id', 'description'],
return { 'ic.name': value }; },
case 'buyerFk': },
return { 'it.workerFk': value }; {
case 'grouping': relation: 'origin',
return { 'b.grouping': value }; scope: {
case 'packing': fields: ['id', 'name'],
return { 'b.packing': value }; },
case 'origin': },
return { 'ori.code': value }; ],
case 'typeFk':
return { 'i.typeFk': value };
case 'intrastat':
return { 'intr.description': value };
case 'name':
return { 'i.name': { like: `%${value}%` } };
case 'producer':
return { 'pr.name': { like: `%${value}%` } };
case 'id':
case 'size':
case 'subname':
case 'isActive':
case 'weightByPiece':
case 'stemMultiplier':
case 'stems':
return { [`i.${param}`]: value };
}
}; };
const params = reactive({ isFloramondo: false, isActive: true });
const applyColumnFilter = async (col) => {
try {
const paramKey = col.columnFilter?.filterParamKey || col.field;
params[paramKey] = col.columnFilter.filterValue;
await paginateRef.value.addFilter(null, params);
} catch (err) {
console.error('Error applying column filter', err);
}
};
const getInputEvents = (col) => {
return col.columnFilter.type === 'select'
? { 'update:modelValue': () => applyColumnFilter(col) }
: {
'keyup.enter': () => applyColumnFilter(col),
};
};
const columns = computed(() => [ const columns = computed(() => [
{ {
label: '', label: '',
name: 'picture', name: 'image',
align: 'left', align: 'left',
columnFilter: null, columnField: {
component: VnImg,
attrs: ({ row }) => {
return {
id: row?.id,
zoomResolution: '1600x900',
zoom: true,
class: 'rounded',
};
},
},
columnFilter: false,
cardVisible: true,
}, },
{ {
label: t('item.list.id'), label: t('item.list.id'),
name: 'id', name: 'id',
field: 'id',
align: 'left', align: 'left',
sortable: true, isId: true,
columnFilter: { chip: {
component: VnInput, condition: () => true,
type: 'text',
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
}, },
cardVisible: true,
}, },
{ {
label: t('item.list.grouping'), label: t('item.list.grouping'),
field: 'grouping',
name: 'grouping', name: 'grouping',
align: 'left', align: 'left',
sortable: true,
columnFilter: { columnFilter: {
component: VnInput, component: 'number',
type: 'text', inWhere: true,
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
}, },
format: (val) => dashIfEmpty(val),
}, },
{ {
label: t('item.list.packing'), label: t('item.list.packing'),
field: 'packing',
name: 'packing', name: 'packing',
align: 'left', align: 'left',
sortable: true,
columnFilter: { columnFilter: {
component: VnInput, component: 'number',
type: 'text', inWhere: true,
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
}, },
format: (val) => dashIfEmpty(val),
}, },
{ {
label: t('globals.description'), label: t('globals.description'),
field: 'name',
name: 'description', name: 'description',
align: 'left', align: 'left',
sortable: true, create: true,
columnFilter: { columnFilter: {
component: VnInput, name: 'search',
type: 'text',
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
}, },
cardVisible: true,
}, },
{ {
label: t('item.list.stems'), label: t('item.list.stems'),
field: 'stems',
name: 'stems', name: 'stems',
align: 'left', align: 'left',
sortable: true,
columnFilter: { columnFilter: {
component: VnInput, component: 'number',
type: 'text', inWhere: true,
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
}, },
cardVisible: true,
}, },
{ {
label: t('item.list.size'), label: t('item.list.size'),
field: 'size',
name: 'size', name: 'size',
align: 'left', align: 'left',
sortable: true,
columnFilter: { columnFilter: {
component: VnInput, component: 'number',
type: 'text', inWhere: true,
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
}, },
cardVisible: true,
}, },
{ {
label: t('item.list.typeName'), label: t('item.list.typeName'),
field: 'typeName', name: 'typeFk',
name: 'typeName',
align: 'left', align: 'left',
sortable: true, component: 'select',
attrs: {
url: 'ItemTypes',
fields: ['id', 'name'],
},
columnFilter: { columnFilter: {
component: VnSelect, name: 'typeFk',
filterParamKey: 'typeFk',
type: 'select',
filterValue: null,
event: getInputEvents,
attrs: { attrs: {
options: itemTypesOptions.value, url: 'ItemTypes',
'option-value': 'id', fields: ['id', 'name'],
'option-label': 'name',
dense: true,
}, },
}, },
columnField: {
component: null,
},
create: true,
}, },
{ {
label: t('item.list.category'), label: t('item.list.category'),
field: 'category',
name: 'category', name: 'category',
align: 'left', align: 'left',
sortable: true, component: 'select',
columnFilter: { columnFilter: {
component: VnSelect, name: 'categoryFk',
type: 'select',
filterValue: null,
event: getInputEvents,
attrs: { attrs: {
options: itemCategoriesOptions.value, url: 'ItemCategories',
'option-value': 'name', fields: ['id', 'name'],
'option-label': 'name',
dense: true,
}, },
}, },
columnField: {
component: null,
},
}, },
{ {
label: t('item.list.intrastat'), label: t('item.list.intrastat'),
field: 'intrastat',
name: 'intrastat', name: 'intrastat',
align: 'left', align: 'left',
sortable: true, component: 'select',
columnFilter: { attrs: {
component: VnSelect, url: 'Intrastats',
type: 'select', optionValue: 'description',
filterValue: null, optionLabel: 'description',
event: getInputEvents,
attrs: {
options: intrastatOptions.value,
'option-value': 'description',
'option-label': 'description',
dense: true,
},
}, },
columnFilter: {
name: 'description',
attrs: {
url: 'Intrastats',
optionValue: 'description',
optionLabel: 'description',
},
alias: 'intr',
},
columnField: {
component: null,
},
create: true,
cardVisible: true,
}, },
{ {
label: t('item.list.origin'), label: t('item.list.origin'),
field: 'origin',
name: 'origin', name: 'origin',
align: 'left', align: 'left',
sortable: true, component: 'select',
columnFilter: { attrs: {
component: VnSelect, url: 'Origins',
type: 'select', optionValue: 'id',
filterValue: null, optionLabel: 'code',
event: getInputEvents,
attrs: {
options: originsOptions.value,
'option-value': 'code',
'option-label': 'code',
dense: true,
},
}, },
columnFilter: {
name: 'id',
attrs: {
url: 'Origins',
optionValue: 'id',
optionLabel: 'code',
},
inWhere: true,
alias: 'ori',
},
columnField: {
component: null,
},
create: true,
cardVisible: true,
}, },
{ {
label: t('item.list.userName'), label: t('item.list.userName'),
field: 'userName',
name: 'userName', name: 'userName',
align: 'left', align: 'left',
sortable: true,
columnFilter: { columnFilter: {
component: VnSelect, name: 'workerFk',
filterParamKey: 'buyerFk',
type: 'select',
filterValue: null,
event: getInputEvents,
attrs: { attrs: {
options: buyersOptions.value, url: 'Users',
'option-value': 'id', optionValue: 'id',
'option-label': 'nickname', optionLabel: 'userName',
dense: true,
}, },
}, },
}, },
{ {
label: t('item.list.weightByPiece'), label: t('item.list.weightByPiece'),
field: 'weightByPiece',
name: 'weightByPiece', name: 'weightByPiece',
align: 'left', align: 'left',
sortable: true, component: 'input',
columnFilter: { columnField: {
component: VnInput, component: null,
type: 'text', },
filterValue: null, columnFilter: {
event: getInputEvents, inWhere: true,
attrs: {
dense: true,
},
}, },
format: (val) => dashIfEmpty(val),
}, },
{ {
label: t('item.list.stemMultiplier'), label: t('item.list.stemMultiplier'),
field: 'stemMultiplier',
name: 'stemMultiplier', name: 'stemMultiplier',
align: 'left', align: 'left',
sortable: true, component: 'input',
columnFilter: { columnField: {
component: VnInput, component: null,
type: 'text', },
filterValue: null, columnFilter: {
event: getInputEvents, inWhere: true,
attrs: {
dense: true,
},
}, },
format: (val) => dashIfEmpty(val),
}, },
{ {
label: t('item.list.isActive'), label: t('item.list.isActive'),
field: 'isActive',
name: 'isActive', name: 'isActive',
align: 'left', align: 'center',
sortable: true, component: 'checkbox',
columnFilter: null,
}, },
{ {
label: t('item.list.producer'), label: t('item.list.producer'),
field: 'producer',
name: 'producer', name: 'producer',
align: 'left', align: 'left',
sortable: true, component: 'select',
columnFilter: { attrs: {
component: VnInput, url: 'Producers',
type: 'text', fields: ['id', 'name'],
filterValue: null, },
event: getInputEvents, columnField: {
attrs: { component: null,
dense: true,
},
}, },
format: (val) => dashIfEmpty(val),
}, },
{ {
label: t('item.list.landed'), label: t('item.list.landed'),
field: 'landed',
name: 'landed', name: 'landed',
align: 'left', align: 'left',
sortable: true, component: 'date',
format: (val) => dashIfEmpty(toDateFormat(val)), columnField: {
columnFilter: null, component: null,
},
format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landed)),
}, },
{ {
align: 'right',
label: '', label: '',
name: 'actions', name: 'tableActions',
align: 'left', actions: [
columnFilter: null, {
title: t('globals.clone'),
icon: 'vn:clone',
action: openCloneDialog,
isPrimary: true,
},
{
title: t('components.smartCard.viewSummary'),
icon: 'preview',
action: (row) => viewSummary(row.id, ItemSummary),
isPrimary: true,
},
],
}, },
]); ]);
const redirectToItemCreate = () => {
router.push({ name: 'ItemCreate' });
};
const redirectToItemSummary = (id) => {
router.push({ name: 'ItemSummary', params: { id } });
};
const cloneItem = async (itemFk) => {
try {
const { data } = await axios.post(`Items/${itemFk}/clone`);
if (!data) return;
router.push({ name: 'ItemTags', params: { id: data.id } });
} catch (err) {
console.error('Error cloning item', err);
}
};
onMounted(async () => {
stateStore.rightDrawer = true;
const filteredColumns = columns.value.filter(
(col) => col.name !== 'picture' && col.name !== 'actions'
);
allColumnNames.value = filteredColumns.map((col) => col.name);
});
onUnmounted(() => (stateStore.rightDrawer = false));
</script> </script>
<template> <template>
<FetchData <VnSearchbar
url="ItemTypes" data-key="ItemList"
:filter="{ fields: ['id', 'name'], order: 'name ASC' }" :label="t('item.searchbar.label')"
auto-load :info="t('You can search by id')"
@on-fetch="(data) => (itemTypesOptions = data)"
/> />
<FetchData <VnTable
url="ItemCategories" ref="tableRef"
:filter="{ fields: ['name'], order: 'name ASC' }" data-key="ItemList"
url="Items/filter"
url-create="Items"
:create="{
urlCreate: 'Items',
title: t('Create Item'),
onDataSaved: () => tableRef.redirect(),
formInitialData: {
editorFk: entityId,
},
}"
:order="['isActive DESC', 'name', 'id']"
:columns="columns"
auto-load auto-load
@on-fetch="(data) => (itemCategoriesOptions = data)" redirect="Item"
/> :is-editable="false"
<FetchData :filer="itemFilter"
url="Intrastats" >
:filter="{ fields: ['description'], order: 'description ASC' }" <template #column-id="{ row }">
auto-load <span class="link" @click.stop>
@on-fetch="(data) => (intrastatOptions = data)" {{ row.id }}
/> <ItemDescriptorProxy :id="row.id" />
<FetchData </span>
url="Origins"
:filter="{ fields: ['code'], order: 'code ASC' }"
auto-load
@on-fetch="(data) => (originsOptions = data)"
/>
<FetchData
url="TicketRequests/getItemTypeWorker"
:filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
auto-load
@on-fetch="(data) => (buyersOptions = data)"
/>
<VnSubToolbar>
<template #st-data>
<TableVisibleColumns
:all-columns="allColumnNames"
table-code="itemsIndex"
labels-traductions-path="item.list"
@on-config-saved="visibleColumns = ['picture', ...$event, 'actions']"
/>
</template> </template>
</VnSubToolbar> <template #column-userName="{ row }">
<RightMenu> <span class="link" @click.stop>
<template #right-panel> {{ row.userName }}
<ItemListFilter data-key="ItemList" /> <WorkerDescriptorProxy :id="row.buyerFk" />
</span>
</template> </template>
</RightMenu> <template #column-description="{ row }">
<QPage class="column items-center q-pa-md"> <div class="row column full-width justify-between items-start">
<VnPaginate {{ row?.name }}
ref="paginateRef" <div v-if="row?.subName" class="subName">
data-key="ItemList" {{ row?.subName.toUpperCase() }}
url="Items/filter" </div>
:order="['isActive DESC', 'name', 'id']" </div>
:limit="12" <FetchedTags :item="row" :max-length="6" />
:expr-builder="exprBuilder" </template>
:user-params="params" </VnTable>
:keep-opts="['userParams']"
:offset="50"
auto-load
>
<template #body="{ rows }">
<QTable
:rows="rows"
:columns="columns"
row-key="id"
:pagination="{ rowsPerPage: 0 }"
class="full-width q-mt-md"
:visible-columns="visibleColumns"
:no-data-label="t('globals.noResults')"
@row-click="(_, row) => redirectToItemSummary(row.id)"
>
<template #top-row="{ cols }">
<QTr>
<QTd
v-for="(col, index) in cols"
:key="index"
style="max-width: 100px"
>
<component
:is="col.columnFilter.component"
v-if="col.columnFilter"
v-model="col.columnFilter.filterValue"
v-bind="col.columnFilter.attrs"
v-on="col.columnFilter.event(col)"
dense
/>
</QTd>
</QTr>
</template>
<template #body-cell-picture="{ row }">
<QTd>
<VnImg
size="50x50"
zoom-resolution="1600x900"
:id="row.id"
class="image"
/>
</QTd>
</template>
<template #body-cell-id="{ row }">
<QTd @click.stop>
<QBtn flat color="primary">
{{ row.id }}
</QBtn>
<ItemDescriptorProxy :id="row.id" />
</QTd>
</template>
<template #body-cell-userName="{ row }">
<QTd @click.stop>
<QBtn flat color="primary" dense>
{{ row.userName }}
</QBtn>
<WorkerDescriptorProxy :id="row.buyerFk" />
</QTd>
</template>
<template #body-cell-description="{ row }">
<QTd class="col">
<span>{{ row.name }} {{ row.subName }}</span>
<FetchedTags :item="row" />
</QTd>
</template>
<template #body-cell-isActive="{ row }">
<QTd>
<QCheckbox :model-value="!!row.isActive" disable />
</QTd>
</template>
<template #body-cell-actions="{ row }">
<QTd>
<QIcon
@click.stop="
openConfirmationModal(
t(`All it's properties will be copied`),
t('Do you want to clone this item?'),
() => cloneItem(row.id)
)
"
class="q-ml-sm"
color="primary"
name="vn:clone"
size="sm"
>
<QTooltip>
{{ t('globals.clone') }}
</QTooltip>
</QIcon>
<QIcon
@click.stop="viewSummary(row.id, ItemSummary)"
class="q-ml-md"
color="primary"
name="preview"
size="sm"
>
<QTooltip class="text-no-wrap">
{{ t('Preview') }}
</QTooltip>
</QIcon>
</QTd>
</template>
</QTable>
</template>
</VnPaginate>
<QPageSticky :offset="[20, 20]">
<QBtn
@click="redirectToItemCreate()"
color="primary"
fab
icon="add"
shortcut="+"
/>
<QTooltip class="text-no-wrap">
{{ t('New item') }}
</QTooltip>
</QPageSticky>
</QPage>
</template> </template>
<style lang="scss" scoped>
.subName {
text-transform: uppercase;
color: var(--vn-label-color);
}
</style>
<i18n> <i18n>
es: es:
New item: Nuevo artículo New item: Nuevo artículo
All it's properties will be copied: Todas sus propiedades serán copiadas
Do you want to clone this item?: ¿Desea clonar este artículo?
Preview: Vista previa Preview: Vista previa
Regularize stock: Regularizar stock
</i18n> </i18n>

366
src/pages/Item/ItemRequest.vue
View File

@ -1,23 +1,17 @@
<script setup> <script setup>
import { ref, computed, onMounted, onBeforeMount, watch } from 'vue'; import { ref, computed, onMounted, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue'; import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import VnInput from 'src/components/common/VnInput.vue';
import ItemRequestDenyForm from './ItemRequestDenyForm.vue';
import ItemRequestFilter from './ItemRequestFilter.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import VnSelect from 'components/common/VnSelect.vue';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import { toDateFormat } from 'src/filters/date'; import { dashIfEmpty, toCurrency } from 'filters/index';
import { toCurrency } from 'filters/index';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
import axios from 'axios'; import axios from 'axios';
import RightMenu from 'src/components/common/RightMenu.vue'; import ItemRequestDenyForm from './ItemRequestDenyForm.vue';
import { toDate } from 'src/filters';
import VnTable from 'components/VnTable/VnTable.vue';
import VnInput from 'src/components/common/VnInput.vue';
const { t } = useI18n(); const { t } = useI18n();
const { notify } = useNotify(); const { notify } = useNotify();
const stateStore = useStateStore(); const stateStore = useStateStore();
@ -33,6 +27,12 @@ const arrayData = useArrayData('ItemRequests', {
}); });
const store = arrayData.store; const store = arrayData.store;
const userParams = {
state: 'pending',
daysOnward: 7,
};
const tableRef = ref();
watch( watch(
() => store.data, () => store.data,
(value) => (itemRequestsOptions.value = value) (value) => (itemRequestsOptions.value = value)
@ -41,89 +41,113 @@ watch(
const columns = computed(() => [ const columns = computed(() => [
{ {
label: t('item.buyRequest.ticketId'), label: t('item.buyRequest.ticketId'),
name: 'id', name: 'ticketFk',
field: 'id',
align: 'left', align: 'left',
sortable: true, isId: true,
chip: {
condition: () => true,
},
cardVisible: true,
}, },
{ {
label: t('item.buyRequest.shipped'), label: t('item.buyRequest.shipped'),
field: 'shipped',
name: 'shipped', name: 'shipped',
align: 'left', align: 'left',
sortable: true, component: 'date',
columnField: {
component: null,
},
format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)),
columnClass: 'shrink',
}, },
{ {
label: t('globals.description'), label: t('globals.description'),
field: 'description', field: 'description',
name: 'description', name: 'description',
align: 'left', align: 'left',
sortable: true, columnClass: 'expand',
}, },
{ {
label: t('item.buyRequest.requester'), label: t('item.buyRequest.requester'),
name: 'requester', name: 'requesterName',
align: 'left', columnClass: 'shrink',
sortable: true,
}, },
{ {
label: t('item.buyRequest.requested'), label: t('item.buyRequest.requested'),
field: 'quantity', name: 'quantity',
name: 'requested', columnClass: 'shrink',
align: 'left',
sortable: true,
}, },
{ {
label: t('item.buyRequest.price'), label: t('item.buyRequest.price'),
field: 'price',
name: 'price', name: 'price',
align: 'left', align: 'left',
sortable: true, format: (row) => toCurrency(row.price),
format: (val) => toCurrency(val), columnClass: 'shrink',
}, },
{ {
label: t('item.buyRequest.attender'), label: t('item.buyRequest.attender'),
field: 'attender', name: 'attenderName',
name: 'attender',
align: 'left', align: 'left',
sortable: true, columnClass: 'shrink',
}, },
{ {
label: t('item.buyRequest.item'), label: t('item.buyRequest.item'),
field: 'item',
name: 'item', name: 'item',
align: 'left', align: 'left',
sortable: true, component: 'input',
columnClass: 'expand',
}, },
{ {
label: t('item.buyRequest.achieved'), label: t('item.buyRequest.achieved'),
field: 'achieved',
name: 'achieved', name: 'achieved',
align: 'left', align: 'left',
sortable: true, component: 'input',
columnClass: 'shrink',
}, },
{ {
label: t('item.buyRequest.concept'), label: t('item.buyRequest.concept'),
field: 'concept',
name: 'concept', name: 'concept',
align: 'left', align: 'left',
sortable: true, sortable: true,
component: 'input',
columnClass: 'expand',
}, },
{ {
label: t('item.buyRequest.state'), label: t('item.buyRequest.state'),
field: 'state',
name: 'state', name: 'state',
format: (row) => getState(row.isOk),
align: 'left', align: 'left',
sortable: true,
}, },
{ {
label: '',
name: 'action',
align: 'left', align: 'left',
columnFilter: null, name: 'daysOnward',
label: t('travel.travelList.tableVisibleColumns.daysOnward'),
visible: false,
columnFilter: {
inWhere: false,
},
},
{
align: 'right',
label: '',
name: 'denyOptions',
}, },
]); ]);
const getBadgeColor = (date) => {
const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const orderLanded = new Date(date);
orderLanded.setHours(0, 0, 0, 0);
const difference = today - orderLanded;
if (difference == 0) return 'warning';
if (difference < 0) return 'success';
if (difference > 0) return 'alert';
};
const changeQuantity = async (request) => { const changeQuantity = async (request) => {
try { try {
if (request.saleFk) { if (request.saleFk) {
@ -153,7 +177,6 @@ const confirmRequest = async (request) => {
`TicketRequests/${request.id}/confirm`, `TicketRequests/${request.id}/confirm`,
params params
); );
request.itemDescription = data.concept; request.itemDescription = data.concept;
request.isOk = true; request.isOk = true;
notify(t('globals.dataSaved'), 'positive'); notify(t('globals.dataSaved'), 'positive');
@ -182,172 +205,123 @@ const onDenyAccept = (_, responseData) => {
itemRequestsOptions.value[denyRequestIndex.value].response = responseData.response; itemRequestsOptions.value[denyRequestIndex.value].response = responseData.response;
denyRequestId.value = null; denyRequestId.value = null;
denyRequestIndex.value = null; denyRequestIndex.value = null;
tableRef.value.reload();
}; };
onMounted(async () => { onMounted(async () => {
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false });
stateStore.rightDrawer = true; stateStore.rightDrawer = true;
}); });
onBeforeMount(() => {
const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const nextWeek = Date.vnNew();
nextWeek.setHours(23, 59, 59, 59);
nextWeek.setDate(nextWeek.getDate() + 7);
filterParams.value = {
from: today,
to: nextWeek,
state: 'pending',
};
});
</script> </script>
<template> <template>
<VnSearchbar <VnTable
data-key="ItemRequests" ref="tableRef"
url="TicketRequests/filter" data-key="itemRequest"
:label="t('globals.search')" url="ticketRequests/filter"
:info="t('You can search by Id or alias')" order="shipped ASC, isOk ASC"
:redirect="false" :columns="columns"
/> :user-params="userParams"
<RightMenu> :is-editable="true"
<template #right-panel> auto-load
<ItemRequestFilter data-key="ItemRequests" /> :disable-option="{ card: true }"
chip-locale="item.params"
>
<template #column-ticketFk="{ row }">
<span class="link">
{{ row.ticketFk }}
<TicketDescriptorProxy :id="row.ticketFk" />
</span>
</template>
<template #column-shipped="{ row }">
<QTd>
<QBadge
:color="getBadgeColor(row.shipped)"
text-color="black"
class="q-pa-sm"
style="font-size: 14px"
>
{{ toDate(row.shipped) }}
</QBadge>
</QTd>
</template>
<template #column-attenderName="{ row }">
<span class="link" @click.stop>
{{ row.attenderName }}
<WorkerDescriptorProxy :id="row.attenderFk" />
</span>
</template> </template>
</RightMenu>
<QPage class="column items-center q-pa-md">
<QTable
:rows="itemRequestsOptions"
:columns="columns"
row-key="id"
:pagination="{ rowsPerPage: 0 }"
class="full-width q-mt-md"
:no-data-label="t('globals.noResults')"
>
<template #body-cell-id="{ row }">
<QTd>
<QBtn flat class="link"> {{ row.ticketFk }}</QBtn>
<TicketDescriptorProxy :id="row.ticketFk" />
</QTd>
</template>
<template #body-cell-shipped="{ row }"> <template #column-requesterName="{ row }">
<QTd> <span class="link" @click.stop>
<QBadge {{ row.requesterName }}
v-if="getDateQBadgeColor(row.shipped)" <WorkerDescriptorProxy :id="row.requesterFk" />
:color="getDateQBadgeColor(row.shipped)" </span>
text-color="black" </template>
class="q-ma-none"
dense <template #column-item="{ row }">
style="font-size: 14px" <span>
> <VnInput v-model.number="row.itemFk" dense />
{{ toDateFormat(row.shipped) }} </span>
</QBadge> </template>
<span v-else>{{ toDateFormat(row.shipped) }}</span> <template #column-achieved="{ row }">
</QTd> <span>
</template> <VnInput
<template #body-cell-requester="{ row }"> type="number"
<QTd> v-model.number="row.saleQuantity"
<QBtn flat dense class="link"> {{ row.requesterName }}</QBtn> :disable="!row.itemFk || row.isOk != null"
<WorkerDescriptorProxy :id="row.requesterFk" /> @blur="changeQuantity(row)"
</QTd> @keyup.enter="changeQuantity(row)"
</template> dense
<template #body-cell-attender="{ row }"> />
<QTd> </span>
<VnSelect </template>
url="Workers/search" <template #column-concept="{ row }">
v-model="row.attenderFk" <span @click.stop disabled="row.isOk != null">
:params="{ departmentCodes: ['shopping'] }" {{ row.itemDescription }}
:fields="['id', 'nickname']" </span>
sort-by="nickname ASC" </template>
hide-selected <template #moreFilterPanel="{ params }">
option-label="nickname" <VnInputNumber
option-value="id" :label="t('params.scopeDays')"
dense v-model.number="params.scopeDays"
> @keyup.enter="(evt) => handleScopeDays(evt.target.value)"
<template #option="scope"> @remove="handleScopeDays()"
<QItem v-bind="scope.itemProps"> class="q-px-xs q-pr-lg"
<QItemSection> filled
<QItemLabel>{{ scope.opt?.name }}</QItemLabel> dense
<QItemLabel caption
>{{ scope.opt?.nickname }},
{{ scope.opt?.code }}</QItemLabel
>
</QItemSection>
</QItem>
</template>
</VnSelect>
</QTd>
</template>
<template #body-cell-item="{ row }">
<QTd>
<VnInput
v-model.number="row.itemFk"
type="number"
:disable="row.isOk != null"
dense
/>
</QTd>
</template>
<template #body-cell-achieved="{ row }">
<QTd>
<VnInput
v-model.number="row.saleQuantity"
@blur="changeQuantity(row)"
type="number"
:disable="!row.itemFk || row.isOk != null"
dense
/>
</QTd>
</template>
<template #body-cell-concept="{ row }">
<QTd>
<QBtn flat dense class="link"> {{ row.itemDescription }}</QBtn>
<ItemDescriptorProxy :id="row.itemFk" />
</QTd>
</template>
<template #body-cell-state="{ row }">
<QTd>
<span>{{ getState(row.isOk) }}</span>
</QTd>
</template>
<template #body-cell-action="{ row, rowIndex }">
<QTd>
<QIcon
v-if="row.response?.length"
name="insert_drive_file"
color="primary"
size="sm"
>
<QTooltip>
{{ row.response }}
</QTooltip>
</QIcon>
<QIcon
v-if="row.isOk == null"
name="thumb_down"
color="primary"
size="sm"
class="fill-icon"
@click="showDenyRequestForm(row.id, rowIndex)"
>
<QTooltip>
{{ t('Discard') }}
</QTooltip>
</QIcon>
</QTd>
</template>
</QTable>
<QDialog ref="denyFormRef" transition-show="scale" transition-hide="scale">
<ItemRequestDenyForm
:request-id="denyRequestId"
@on-data-saved="onDenyAccept"
/> />
</QDialog> </template>
</QPage> <template #column-denyOptions="{ row, rowIndex }">
<QTd class="sticky no-padding">
<QIcon
v-if="row.response?.length"
name="insert_drive_file"
color="primary"
size="sm"
>
<QTooltip>
{{ row.response }}
</QTooltip>
</QIcon>
<QIcon
v-if="row.isOk == null"
name="thumb_down"
color="primary"
size="sm"
class="fill-icon"
@click="showDenyRequestForm(row.id, rowIndex)"
>
<QTooltip>
{{ t('Discard') }}
</QTooltip>
</QIcon>
</QTd>
</template>
</VnTable>
<QDialog ref="denyFormRef" transition-show="scale" transition-hide="scale">
<ItemRequestDenyForm :request-id="denyRequestId" @on-data-saved="onDenyAccept" />
</QDialog>
</template> </template>
<i18n> <i18n>

2
src/pages/Item/ItemRequestDenyForm.vue
View File

@ -10,6 +10,7 @@ defineProps({
requestId: { requestId: {
type: Number, type: Number,
default: null, default: null,
required: true,
}, },
}); });
@ -43,6 +44,7 @@ onMounted(async () => {
type="textarea" type="textarea"
v-model="data.observation" v-model="data.observation"
fill-input fill-input
:required="true"
autogrow autogrow
/> />
</div> </div>

212
src/pages/Item/ItemTypeList.vue
View File

@ -1,113 +1,121 @@
<script setup> <script setup>
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router'; import { ref, computed } from 'vue';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import CardList from 'src/components/ui/CardList.vue';
import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue'; import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import VnTable from 'components/VnTable/VnTable.vue';
import RightMenu from 'src/components/common/RightMenu.vue'; import FetchData from 'components/FetchData.vue';
const router = useRouter();
const { t } = useI18n(); const { t } = useI18n();
const { viewSummary } = useSummaryDialog(); const tableRef = ref();
const ItemCategoriesOptions = ref([]);
const redirectToItemTypeSummary = (id) => { const columns = computed(() => [
router.push({ name: 'ItemTypeSummary', params: { id } }); {
}; align: 'left',
name: 'id',
const redirectToCreateView = () => { label: t('id'),
router.push({ name: 'ItemTypeCreate' }); isId: true,
}; cardVisible: true,
},
const exprBuilder = (param, value) => { {
switch (param) { align: 'left',
case 'name': name: 'code',
return { label: t('code'),
name: { like: `%${value}%` }, isTitle: true,
}; cardVisible: true,
case 'code': create: true,
return { },
code: { like: `%${value}%` }, {
}; align: 'left',
case 'search': name: 'name',
if (value) { label: t('name'),
if (!isNaN(value)) { cardVisible: true,
return { id: value }; create: true,
} else { },
return { {
or: [ align: 'left',
{ name: 'workerFk',
name: { label: t('worker'),
like: `%${value}%`, create: true,
}, component: 'select',
}, attrs: {
{ url: 'Workers/search',
code: { optionLabel: 'nickname',
like: `%${value}%`, optionValue: 'id',
}, },
}, cardVisible: true,
], visible: true,
}; },
} {
} align: 'left',
} name: 'categoryFk',
}; label: t('ItemCategory'),
create: true,
component: 'select',
attrs: {
options: ItemCategoriesOptions.value,
fields: ['id', 'name'],
order: 'name ASC',
},
cardVisible: false,
visible: false,
},
{
align: 'left',
name: 'Temperature',
label: t('Temperature'),
create: true,
component: 'select',
attrs: {
url: 'Temperatures',
fields: ['id', 'name'],
},
cardVisible: false,
visible: false,
},
]);
</script> </script>
<template> <template>
<FetchData
url="ItemCategories"
:filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
@on-fetch="(data) => (ItemCategoriesOptions = data)"
auto-load
/>
<ItemTypeSearchbar /> <ItemTypeSearchbar />
<RightMenu> <VnTable
<template #right-panel> ref="tableRef"
<ItemTypeFilter data-key="ItemTypeList" /> data-key="ItemTypeList"
</template> :url="`ItemTypes`"
</RightMenu> :create="{
<QPage class="column items-center q-pa-md"> urlCreate: 'ItemTypes',
<div class="vn-card-list"> title: t('Create ItemTypes'),
<VnPaginate onDataSaved: () => tableRef.reload(),
data-key="ItemTypeList" formInitialData: {},
url="ItemTypes" }"
:order="['name']" order="name ASC"
auto-load :columns="columns"
:expr-builder="exprBuilder" auto-load
> :right-search="false"
<template #body="{ rows }"> :is-editable="false"
<CardList :use-model="true"
v-for="row of rows" />
:key="row.id"
:title="row.code"
@click="redirectToItemTypeSummary(row.id)"
:id="row.id"
>
<template #list-items>
<VnLv :label="t('Name')" :value="row.name" />
</template>
<template #actions>
<QBtn
:label="t('components.smartCard.openSummary')"
@click.stop="viewSummary(row.id, ItemTypeSummary)"
color="primary"
type="submit"
/>
</template>
</CardList>
</template>
</VnPaginate>
</div>
</QPage>
<QPageSticky :offset="[20, 20]">
<QBtn
fab
icon="add"
color="primary"
@click="redirectToCreateView()"
shortcut="+"
/>
<QTooltip>
{{ t('New item type') }}
</QTooltip>
</QPageSticky>
</template> </template>
<i18n>
es:
id: Id
code: Código
name: Nombre
worker: Trabajador
ItemCategory: Reino
Temperature: Temperatura
Create ItemTypes: Crear familia
en:
code: Code
name: Name
worker: Worker
ItemCategory: ItemCategory
Temperature: Temperature
</i18n>

36
src/pages/Item/composables/cloneItem.js Normal file
View File

@ -0,0 +1,36 @@
import axios from 'axios';
import { useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
import VnConfirm from 'components/ui/VnConfirm.vue';
export function cloneItem() {
const { t } = useI18n();
const quasar = useQuasar();
const router = useRouter();
const cloneItem = async (entityId) => {
const { id } = entityId;
try {
const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
router.push({ name: 'ItemTags', params: { id: data.id } });
} catch (err) {
console.error('Error cloning item');
}
};
const openCloneDialog = async (entityId) => {
quasar
.dialog({
component: VnConfirm,
componentProps: {
title: t('item.descriptor.clone.title'),
message: t('item.descriptor.clone.subTitle'),
},
})
.onOk(async () => {
await cloneItem(entityId);
});
};
return { openCloneDialog };
}

124
src/pages/Item/locale/en.yml
View File

@ -88,3 +88,127 @@ itemType:
worker: Worker worker: Worker
category: Category category: Category
temperature: Temperature temperature: Temperature
item:
params:
daysOnward: Days onward
search: General search
ticketFk: Ticket id
attenderFk: Atender
clientFk: Client id
warehouseFk: Warehouse
requesterFk: Salesperson
from: From
to: To
mine: For me
state: State
myTeam: My team
searchbar:
label: Search item
descriptor:
item: Item
buyer: Buyer
color: Color
category: Category
stems: Stems
visible: Visible
available: Available
warehouseText: 'Calculated on the warehouse of { warehouseName }'
itemDiary: Item diary
producer: Producer
clone:
title: All its properties will be copied
subTitle: Do you want to clone this item?
list:
id: Identifier
grouping: Grouping
packing: Packing
description: Description
stems: Stems
category: Category
typeName: Type
intrastat: Intrastat
isActive: Active
size: Size
origin: Origin
userName: Buyer
weightByPiece: Weight/Piece
stemMultiplier: Multiplier
producer: Producer
landed: Landed
basicData:
type: Type
reference: Reference
relevancy: Relevancy
stems: Stems
multiplier: Multiplier
generic: Generic
intrastat: Intrastat
expense: Expense
weightByPiece: Weight/Piece
boxUnits: Units/Box
recycledPlastic: Recycled Plastic
nonRecycledPlastic: Non recycled plastic
isActive: Active
hasKgPrice: Price in kg
isFragile: Fragile
isFragileTooltip: Is shown at website, app that this item cannot travel (wreath, palms, ...)
isPhotoRequested: Do photo
isPhotoRequestedTooltip: This item does need a photo
description: Description
fixedPrice:
itemFk: Item ID
groupingPrice: Grouping price
packingPrice: Packing price
hasMinPrice: Has min price
minPrice: Min price
started: Started
ended: Ended
warehouse: Warehouse
create:
name: Name
tag: Tag
priority: Priority
type: Type
intrastat: Intrastat
origin: Origin
buyRequest:
ticketId: 'Ticket ID'
shipped: 'Shipped'
requester: 'Requester'
requested: 'Requested'
price: 'Price'
attender: 'Attender'
item: 'Item'
achieved: 'Achieved'
concept: 'Concept'
state: 'State'
summary:
basicData: 'Basic data'
otherData: 'Other data'
description: 'Description'
tax: 'Tax'
tags: 'Tags'
botanical: 'Botanical'
barcode: 'Barcode'
name: 'Nombre'
completeName: 'Nombre completo'
family: 'Familia'
size: 'Medida'
origin: 'Origen'
stems: 'Tallos'
multiplier: 'Multiplicador'
buyer: 'Comprador'
doPhoto: 'Do photo'
intrastatCode: 'Código intrastat'
intrastat: 'Intrastat'
ref: 'Referencia'
relevance: 'Relevancia'
weight: 'Peso (gramos)/tallo'
units: 'Unidades/caja'
expense: 'Gasto'
generic: 'Genérico'
recycledPlastic: 'Plástico reciclado'
nonRecycledPlastic: 'Plástico no reciclado'
minSalesQuantity: 'Cantidad mínima de venta'
genus: 'Genus'
specie: 'Specie'

126
src/pages/Item/locale/es.yml
View File

@ -88,3 +88,129 @@ itemType:
worker: Trabajador worker: Trabajador
category: Reino category: Reino
temperature: Temperatura temperature: Temperatura
params:
state: asfsdf
item:
params:
daysOnward: Días adelante
search: Búsqueda general
ticketFk: Id ticket
attenderFk: Comprador
clientFk: Id cliente
warehouseFk: Almacén
requesterFk: Comercial
from: Desde
to: Hasta
mine: Para mi
state: Estado
myTeam: Mi equipo
searchbar:
label: Buscar artículo
descriptor:
item: Artículo
buyer: Comprador
color: Color
category: Categoría
stems: Tallos
visible: Visible
available: Disponible
warehouseText: 'Calculado sobre el almacén de { warehouseName }'
itemDiary: Registro de compra-venta
producer: Productor
clone:
title: Todas sus propiedades serán copiadas
subTitle: ¿Desea clonar este artículo?
list:
id: Identificador
grouping: Grouping
packing: Packing
description: Descripción
stems: Tallos
category: Reino
typeName: Tipo
intrastat: Intrastat
isActive: Activo
size: Medida
origin: Origen
weightByPiece: Peso (gramos)/tallo
userName: Comprador
stemMultiplier: Multiplicador
producer: Productor
landed: F. entrega
basicData:
type: Tipo
reference: Referencia
relevancy: Relevancia
stems: Tallos
multiplier: Multiplicador
generic: Genérico
intrastat: Intrastat
expense: Gasto
weightByPiece: Peso (gramos)/tallo
boxUnits: Unidades/caja
recycledPlastic: Plastico reciclado
nonRecycledPlastic: Plático no reciclado
isActive: Activo
hasKgPrice: Precio en kg
isFragile: Frágil
isFragileTooltip: Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...)
isPhotoRequested: Hacer foto
isPhotoRequestedTooltip: Este artículo necesita una foto
description: Descripción
fixedPrice:
itemFk: ID Artículo
groupingPrice: Precio grouping
packingPrice: Precio packing
hasMinPrice: Tiene precio mínimo
minPrice: Precio min
started: Inicio
ended: Fin
warehouse: Almacén
create:
name: Nombre
tag: Etiqueta
priority: Prioridad
type: Tipo
intrastat: Intrastat
origin: Origen
summary:
basicData: 'Datos básicos'
otherData: 'Otros datos'
description: 'Descripción'
tax: 'IVA'
tags: 'Etiquetas'
botanical: 'Botánico'
barcode: 'Código de barras'
name: 'Nombre'
completeName: 'Nombre completo'
family: 'Familia'
size: 'Medida'
origin: 'Origen'
stems: 'Tallos'
multiplier: 'Multiplicador'
buyer: 'Comprador'
doPhoto: 'Hacer foto'
intrastatCode: 'Código intrastat'
intrastat: 'Intrastat'
ref: 'Referencia'
relevance: 'Relevancia'
weight: 'Peso (gramos)/tallo'
units: 'Unidades/caja'
expense: 'Gasto'
generic: 'Genérico'
recycledPlastic: 'Plástico reciclado'
nonRecycledPlastic: 'Plástico no reciclado'
minSalesQuantity: 'Cantidad mínima de venta'
genus: 'Genus'
specie: 'Specie'
buyRequest:
ticketId: 'ID Ticket'
shipped: 'F. envío'
requester: 'Solicitante'
requested: 'Solicitado'
price: 'Precio'
attender: 'Comprador'
item: 'Artículo'
achieved: 'Conseguido'
concept: 'Concepto'
state: 'Estado'

38
src/pages/ItemType/Card/ItemTypeBasicData.vue
View File

@ -8,12 +8,14 @@ import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue'; import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import VnAvatar from 'src/components/ui/VnAvatar.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const categoriesOptions = ref([]); const categoriesOptions = ref([]);
const temperaturesOptions = ref([]); const temperaturesOptions = ref([]);
const itemPackingTypesOptions = ref([]);
</script> </script>
<template> <template>
<FetchData <FetchData
@ -28,6 +30,16 @@ const temperaturesOptions = ref([]);
:filter="{ order: 'name ASC', fields: ['code', 'name'] }" :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
auto-load auto-load
/> />
<FetchData
url="ItemPackingTypes"
@on-fetch="(data) => (itemPackingTypesOptions = data)"
:filter="{
where: { isActive: true },
order: 'description ASC',
fields: ['code', 'description'],
}"
auto-load
/>
<FormModel <FormModel
:url="`ItemTypes/${route.params.id}`" :url="`ItemTypes/${route.params.id}`"
:url-update="`ItemTypes/${route.params.id}`" :url-update="`ItemTypes/${route.params.id}`"
@ -46,11 +58,18 @@ const temperaturesOptions = ref([]);
:label="t('shared.worker')" :label="t('shared.worker')"
sort-by="nickname ASC" sort-by="nickname ASC"
:fields="['id', 'nickname']" :fields="['id', 'nickname']"
:params="{ departmentCodes: ['shopping'] }"
option-label="nickname" option-label="nickname"
option-value="id" option-value="id"
hide-selected hide-selected
><template #option="scope"> >
<template #prepend>
<VnAvatar
:worker-id="data.workerFk"
color="primary"
:title="title"
/>
</template>
<template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">
<QItemSection> <QItemSection>
<QItemLabel>{{ scope.opt?.name }}</QItemLabel> <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
@ -80,6 +99,21 @@ const temperaturesOptions = ref([]);
option-label="name" option-label="name"
hide-selected hide-selected
/> />
<VnInput v-model="data.life" :label="t('shared.life')" />
</VnRow>
<VnRow>
<VnSelect
v-model="data.itemPackingTypeFk"
:label="t('shared.itemPackingType')"
:options="itemPackingTypesOptions"
option-value="code"
option-label="description"
hide-selected
/>
<VnInput v-model="data.maxRefs" :label="t('shared.maxRefs')" />
</VnRow>
<VnRow>
<QCheckbox v-model="data.isFragile" :label="t('shared.fragile')" />
</VnRow> </VnRow>
</template> </template>
</FormModel> </FormModel>

7
src/pages/ItemType/Card/ItemTypeLog.vue Normal file
View File

@ -0,0 +1,7 @@
<script setup>
import VnLog from 'src/components/common/VnLog.vue';
</script>
<template>
<VnLog model="ItemType" url="/ItemTypeLogs"></VnLog>
</template>

4
src/pages/ItemType/locale/en.yml
View File

@ -4,6 +4,10 @@ shared:
worker: Worker worker: Worker
category: Category category: Category
temperature: Temperature temperature: Temperature
life: Life
itemPackingType: Item packing type
maxRefs: Maximum references
fragile: Fragile
summary: summary:
id: id id: id
life: Life life: Life

4
src/pages/ItemType/locale/es.yml
View File

@ -4,6 +4,10 @@ shared:
worker: Trabajador worker: Trabajador
category: Reino category: Reino
temperature: Temperatura temperature: Temperatura
life: Vida
itemPackingType: Tipo de embalaje
maxRefs: Referencias máximas
fragile: Frágil
summary: summary:
id: id id: id
code: Código code: Código

2
src/pages/Route/RouteAutonomous.vue
View File

@ -126,7 +126,7 @@ const columns = computed(() => [
name: 'tableActions', name: 'tableActions',
actions: [ actions: [
{ {
title: t('Preview'), title: t('components.smartCard.viewSummary'),
icon: 'preview', icon: 'preview',
isPrimary: true, isPrimary: true,
action: (row) => viewSummary(row?.routeFk, RouteSummary), action: (row) => viewSummary(row?.routeFk, RouteSummary),

2
src/pages/Route/RouteExtendedList.vue
View File

@ -204,7 +204,7 @@ const columns = computed(() => [
isPrimary: true, isPrimary: true,
}, },
{ {
title: t('route.components.smartCard.viewSummary'), title: t('components.smartCard.viewSummary'),
icon: 'preview', icon: 'preview',
action: (row) => viewSummary(row?.id, RouteSummary), action: (row) => viewSummary(row?.id, RouteSummary),
isPrimary: true, isPrimary: true,

28
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
View File

@ -112,32 +112,20 @@ const getShipped = async (params) => {
}; };
const onChangeZone = async (zoneId) => { const onChangeZone = async (zoneId) => {
try { formData.value.agencyModeFk = null;
formData.value.agencyModeFk = null; const { data } = await axios.get(`Zones/${zoneId}`);
const { data } = await axios.get(`Zones/${zoneId}`); formData.value.agencyModeFk = data.agencyModeFk;
formData.value.agencyModeFk = data.agencyModeFk;
} catch (error) {
console.error(error);
}
}; };
const onChangeAddress = async (addressId) => { const onChangeAddress = async (addressId) => {
try { formData.value.nickname = null;
formData.value.nickname = null; const { data } = await axios.get(`Addresses/${addressId}`);
const { data } = await axios.get(`Addresses/${addressId}`); formData.value.nickname = data.nickname;
formData.value.nickname = data.nickname;
} catch (error) {
console.error(error);
}
}; };
const getClientDefaultAddress = async (clientId) => { const getClientDefaultAddress = async (clientId) => {
try { const { data } = await axios.get(`Clients/${clientId}`);
const { data } = await axios.get(`Clients/${clientId}`); if (data) addressId.value = data.defaultAddressFk;
if (data) addressId.value = data.defaultAddressFk;
} catch (error) {
console.error(error);
}
}; };
const clientAddressesList = async (value) => { const clientAddressesList = async (value) => {

85
src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
View File

@ -70,60 +70,51 @@ const isFormInvalid = () => {
}; };
const getPriceDifference = async () => { const getPriceDifference = async () => {
try { const params = {
const params = { landed: formData.value.landed,
landed: formData.value.landed, addressId: formData.value.addressFk,
addressId: formData.value.addressFk, agencyModeId: formData.value.agencyModeFk,
agencyModeId: formData.value.agencyModeFk, zoneId: formData.value.zoneFk,
zoneId: formData.value.zoneFk, warehouseId: formData.value.warehouseFk,
warehouseId: formData.value.warehouseFk, shipped: formData.value.shipped,
shipped: formData.value.shipped, };
}; const { data } = await axios.post(
const { data } = await axios.post( `tickets/${formData.value.id}/priceDifference`,
`tickets/${formData.value.id}/priceDifference`, params
params );
); formData.value.sale = data;
formData.value.sale = data;
} catch (error) {
console.error(error);
}
}; };
const submit = async () => { const submit = async () => {
try { if (!formData.value.option) return notify(t('basicData.chooseAnOption'), 'negative');
if (!formData.value.option)
return notify(t('basicData.chooseAnOption'), 'negative');
const params = { const params = {
clientFk: formData.value.clientFk, clientFk: formData.value.clientFk,
nickname: formData.value.nickname, nickname: formData.value.nickname,
agencyModeFk: formData.value.agencyModeFk, agencyModeFk: formData.value.agencyModeFk,
addressFk: formData.value.addressFk, addressFk: formData.value.addressFk,
zoneFk: formData.value.zoneFk, zoneFk: formData.value.zoneFk,
warehouseFk: formData.value.warehouseFk, warehouseFk: formData.value.warehouseFk,
companyFk: formData.value.companyFk, companyFk: formData.value.companyFk,
shipped: formData.value.shipped, shipped: formData.value.shipped,
landed: formData.value.landed, landed: formData.value.landed,
isDeleted: formData.value.isDeleted, isDeleted: formData.value.isDeleted,
option: formData.value.option, option: formData.value.option,
isWithoutNegatives: formData.value.withoutNegatives, isWithoutNegatives: formData.value.withoutNegatives,
withWarningAccept: formData.value.withWarningAccept, withWarningAccept: formData.value.withWarningAccept,
keepPrice: false, keepPrice: false,
}; };
const { data } = await axios.post( const { data } = await axios.post(
`tickets/${formData.value.id}/componentUpdate`, `tickets/${formData.value.id}/componentUpdate`,
params params
); );
if (!data) return; if (!data) return;
const ticketToMove = data.id; const ticketToMove = data.id;
notify(t('basicData.unroutedTicket'), 'positive'); notify(t('basicData.unroutedTicket'), 'positive');
router.push({ name: 'TicketSummary', params: { id: ticketToMove } }); router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
} catch (error) {
console.error(error);
}
}; };
const submitWithNegatives = async () => { const submitWithNegatives = async () => {

32
src/pages/Ticket/Card/ExpeditionNewTicket.vue
View File

@ -34,26 +34,20 @@ const newTicketFormData = reactive({});
const date = new Date(); const date = new Date();
const createTicket = async () => { const createTicket = async () => {
try { const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
const expeditionIds = $props.selectedExpeditions.map( const params = {
(expedition) => expedition.id clientId: $props.ticket.clientFk,
); landed: newTicketFormData.landed,
const params = { warehouseId: $props.ticket.warehouseFk,
clientId: $props.ticket.clientFk, addressId: $props.ticket.addressFk,
landed: newTicketFormData.landed, agencyModeId: $props.ticket.agencyModeFk,
warehouseId: $props.ticket.warehouseFk, routeId: newTicketFormData.routeFk,
addressId: $props.ticket.addressFk, expeditionIds: expeditionIds,
agencyModeId: $props.ticket.agencyModeFk, };
routeId: newTicketFormData.routeFk,
expeditionIds: expeditionIds,
};
const { data } = await axios.post('Expeditions/moveExpeditions', params); const { data } = await axios.post('Expeditions/moveExpeditions', params);
notify(t('globals.dataSaved'), 'positive'); notify(t('globals.dataSaved'), 'positive');
router.push({ name: 'TicketSummary', params: { id: data.id } }); router.push({ name: 'TicketSummary', params: { id: data.id } });
} catch (error) {
console.error(error);
}
}; };
</script> </script>

26
src/pages/Ticket/Card/TicketComponents.vue
View File

@ -150,31 +150,19 @@ const getTotal = computed(() => {
}); });
const getComponentsSum = async () => { const getComponentsSum = async () => {
try { const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`); componentsList.value = data;
componentsList.value = data;
} catch (error) {
console.error(error);
}
}; };
const getTheoricalCost = async () => { const getTheoricalCost = async () => {
try { const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`); theoricalCost.value = data;
theoricalCost.value = data;
} catch (error) {
console.error(error);
}
}; };
const getTicketVolume = async () => { const getTicketVolume = async () => {
try { if (!ticketData.value) return;
if (!ticketData.value) return; const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`); ticketVolume.value = data[0].volume;
ticketVolume.value = data[0].volume;
} catch (error) {
console.error(error);
}
}; };
onMounted(() => { onMounted(() => {

42
src/pages/Ticket/Card/TicketExpedition.vue
View File

@ -169,16 +169,12 @@ const showNewTicketDialog = (withRoute = false) => {
}; };
const deleteExpedition = async () => { const deleteExpedition = async () => {
try { const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
const expeditionIds = selectedRows.value.map((expedition) => expedition.id); const params = { expeditionIds };
const params = { expeditionIds }; await axios.post('Expeditions/deleteExpeditions', params);
await axios.post('Expeditions/deleteExpeditions', params); vnTableRef.value.reload();
vnTableRef.value.reload(); selectedExpeditions.value = [];
selectedExpeditions.value = []; notify(t('expedition.expeditionRemoved'), 'positive');
notify(t('expedition.expeditionRemoved'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const showLog = async (expedition) => { const showLog = async (expedition) => {
@ -187,23 +183,19 @@ const showLog = async (expedition) => {
}; };
const getExpeditionState = async (expedition) => { const getExpeditionState = async (expedition) => {
try { const filter = {
const filter = { where: { expeditionFk: expedition.id },
where: { expeditionFk: expedition.id }, order: ['created DESC'],
order: ['created DESC'], };
};
const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, { const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
params: { filter: JSON.stringify(filter) }, params: { filter: JSON.stringify(filter) },
}); });
expeditionsLogsData.value = expeditionStates.map((state) => ({ expeditionsLogsData.value = expeditionStates.map((state) => ({
...state, ...state,
isScanned: !!state.isScanned, isScanned: !!state.isScanned,
})); }));
} catch (error) {
console.error(error);
}
}; };
const openGrafana = (expeditionFk) => { const openGrafana = (expeditionFk) => {

1
src/pages/Ticket/Card/TicketSale.vue
View File

@ -539,6 +539,7 @@ watch(
:ticket-config="ticketConfig" :ticket-config="ticketConfig"
@get-mana="getMana()" @get-mana="getMana()"
@update-discounts="updateDiscount" @update-discounts="updateDiscount"
@refresh-table="resetChanges"
/> />
<QBtn <QBtn
color="primary" color="primary"

15
src/pages/Ticket/Card/TicketSaleMoreActions.vue
View File

@ -14,7 +14,7 @@ import { toDateFormat } from 'src/filters/date';
import { useRole } from 'src/composables/useRole'; import { useRole } from 'src/composables/useRole';
import { useVnConfirm } from 'composables/useVnConfirm'; import { useVnConfirm } from 'composables/useVnConfirm';
const emit = defineEmits(['updateDiscounts', 'getMana']); const emit = defineEmits(['updateDiscounts', 'getMana', 'refreshTable']);
const props = defineProps({ const props = defineProps({
disable: { disable: {
@ -107,6 +107,7 @@ const calculateSalePrice = async () => {
await axios.post(`Sales/recalculatePrice`, props.sales); await axios.post(`Sales/recalculatePrice`, props.sales);
notify(t('globals.dataSaved'), 'positive'); notify(t('globals.dataSaved'), 'positive');
emit('refreshTable', props.sales);
}; };
const changeMultipleDiscount = () => { const changeMultipleDiscount = () => {
@ -165,14 +166,10 @@ const createRefund = async (withWarehouse) => {
negative: true, negative: true,
}; };
try { const { data } = await axios.post('Tickets/cloneAll', params);
const { data } = await axios.post('Tickets/cloneAll', params); const [refundTicket] = data;
const [refundTicket] = data; notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive'); push({ name: 'TicketSale', params: { id: refundTicket.id } });
push({ name: 'TicketSale', params: { id: refundTicket.id } });
} catch (error) {
console.error(error);
}
}; };
</script> </script>

164
src/pages/Ticket/Card/TicketSaleTracking.vue
View File

@ -150,18 +150,14 @@ const shelvingsTableColumns = computed(() => [
]); ]);
const getSaleTrackings = async (sale) => { const getSaleTrackings = async (sale) => {
try { const filter = {
const filter = { where: { saleFk: sale.saleFk },
where: { saleFk: sale.saleFk }, order: ['itemFk DESC'],
order: ['itemFk DESC'], };
}; const { data } = await axios.get(`SaleTrackings/listSaleTracking`, {
const { data } = await axios.get(`SaleTrackings/listSaleTracking`, { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); saleTrackings.value = data;
saleTrackings.value = data;
} catch (error) {
console.error(error);
}
}; };
const showLog = async (sale) => { const showLog = async (sale) => {
@ -170,17 +166,13 @@ const showLog = async (sale) => {
}; };
const getItemShelvingSales = async (sale) => { const getItemShelvingSales = async (sale) => {
try { const filter = {
const filter = { where: { saleFk: sale.saleFk },
where: { saleFk: sale.saleFk }, };
}; const { data } = await axios.get(`ItemShelvingSales/filter`, {
const { data } = await axios.get(`ItemShelvingSales/filter`, { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); itemShelvingsSales.value = data;
itemShelvingsSales.value = data;
} catch (error) {
console.error(error);
}
}; };
const showShelving = async (sale) => { const showShelving = async (sale) => {
@ -189,36 +181,28 @@ const showShelving = async (sale) => {
}; };
const updateQuantity = async (sale) => { const updateQuantity = async (sale) => {
try { if (oldQuantity.value === sale.quantity) return;
if (oldQuantity.value === sale.quantity) return; const params = {
const params = { quantity: sale.quantity,
quantity: sale.quantity, };
}; await axios.patch(`ItemShelvingSales/${sale.id}`, params);
await axios.patch(`ItemShelvingSales/${sale.id}`, params); oldQuantity.value = null;
oldQuantity.value = null;
} catch (error) {
console.error(error);
}
}; };
const updateParking = async (sale) => { const updateParking = async (sale) => {
try { const filter = {
const filter = { fields: ['id'],
fields: ['id'], where: {
where: { code: sale.shelvingFk,
code: sale.shelvingFk, },
}, };
}; const { data } = await axios.get(`Shelvings/findOne`, {
const { data } = await axios.get(`Shelvings/findOne`, { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); const params = {
const params = { parkingFk: sale.parkingFk,
parkingFk: sale.parkingFk, };
}; await axios.patch(`Shelvings/${data.id}`, params);
await axios.patch(`Shelvings/${data.id}`, params);
} catch (error) {
console.error(error);
}
}; };
const updateShelving = async (sale) => { const updateShelving = async (sale) => {
@ -241,61 +225,41 @@ const updateShelving = async (sale) => {
}; };
const saleTrackingNew = async (sale, stateCode, isChecked) => { const saleTrackingNew = async (sale, stateCode, isChecked) => {
try { const params = {
const params = { saleFk: sale.saleFk,
saleFk: sale.saleFk, isChecked,
isChecked, quantity: sale.quantity,
quantity: sale.quantity, stateCode,
stateCode, };
}; await axios.post(`SaleTrackings/new`, params);
await axios.post(`SaleTrackings/new`, params); notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const saleTrackingDel = async ({ saleFk }, stateCode) => { const saleTrackingDel = async ({ saleFk }, stateCode) => {
try { const params = {
const params = { saleFk,
saleFk, stateCodes: [stateCode],
stateCodes: [stateCode], };
}; await axios.post(`SaleTrackings/delete`, params);
await axios.post(`SaleTrackings/delete`, params); notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const clickSaleGroupDetail = async (sale) => { const clickSaleGroupDetail = async (sale) => {
try { if (!sale.saleGroupDetailFk) return;
if (!sale.saleGroupDetailFk) return;
await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`); await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
sale.hasSaleGroupDetail = false; sale.hasSaleGroupDetail = false;
notify(t('globals.dataSaved'), 'positive'); notify(t('globals.dataSaved'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const clickPreviousSelected = (sale) => { const clickPreviousSelected = (sale) => {
try { qCheckBoxController(sale, 'isPreviousSelected');
qCheckBoxController(sale, 'isPreviousSelected'); if (!sale.isPreviousSelected) sale.isPrevious = false;
if (!sale.isPreviousSelected) sale.isPrevious = false;
} catch (error) {
console.error(error);
}
}; };
const clickPrevious = (sale) => { const clickPrevious = (sale) => {
try { qCheckBoxController(sale, 'isPrevious');
qCheckBoxController(sale, 'isPrevious'); if (sale.isPrevious) sale.isPreviousSelected = true;
if (sale.isPrevious) sale.isPreviousSelected = true;
} catch (error) {
console.error(error);
}
}; };
const qCheckBoxController = (sale, action) => { const qCheckBoxController = (sale, action) => {
@ -306,16 +270,12 @@ const qCheckBoxController = (sale, action) => {
isPreviousSelected: 'PREVIOUS_PREPARATION', isPreviousSelected: 'PREVIOUS_PREPARATION',
}; };
const stateCode = STATE_CODES[action]; const stateCode = STATE_CODES[action];
try { if (!sale[action]) {
if (!sale[action]) { saleTrackingNew(sale, stateCode, true);
saleTrackingNew(sale, stateCode, true); sale[action] = true;
sale[action] = true; } else {
} else { saleTrackingDel(sale, stateCode);
saleTrackingDel(sale, stateCode); sale[action] = false;
sale[action] = false;
}
} catch (error) {
console.error(error);
} }
}; };
</script> </script>

52
src/pages/Ticket/Card/TicketService.vue
View File

@ -46,40 +46,32 @@ watch(
onMounted(async () => await getDefaultTaxClass()); onMounted(async () => await getDefaultTaxClass());
const createRefund = async () => { const createRefund = async () => {
try { if (!selected.value.length) return;
if (!selected.value.length) return;
const params = { const params = {
servicesIds: selected.value.map((s) => +s.id), servicesIds: selected.value.map((s) => +s.id),
withWarehouse: false, withWarehouse: false,
negative: true, negative: true,
}; };
const { data } = await axios.post('Sales/clone', params); const { data } = await axios.post('Sales/clone', params);
const [refundTicket] = data; const [refundTicket] = data;
notify( notify(
t('service.createRefundSuccess', { t('service.createRefundSuccess', {
ticketId: refundTicket.id, ticketId: refundTicket.id,
}), }),
'positive' 'positive'
); );
router.push({ name: 'TicketSale', params: { id: refundTicket.id } }); router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
} catch (error) {
console.error(error);
}
}; };
const getDefaultTaxClass = async () => { const getDefaultTaxClass = async () => {
try { let filter = {
let filter = { where: { code: 'G' },
where: { code: 'G' }, };
}; const { data } = await axios.get('TaxClasses/findOne', {
const { data } = await axios.get('TaxClasses/findOne', { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); defaultTaxClass.value = data;
defaultTaxClass.value = data;
} catch (error) {
console.error(error);
}
}; };
const columns = computed(() => [ const columns = computed(() => [

22
src/pages/Ticket/Card/TicketVolume.vue
View File

@ -75,22 +75,18 @@ const columns = computed(() => [
]); ]);
const applyVolumes = async (salesData) => { const applyVolumes = async (salesData) => {
try { if (!salesData.length) return;
if (!salesData.length) return;
sales.value = salesData; sales.value = salesData;
const ticket = sales.value[0].ticketFk; const ticket = sales.value[0].ticketFk;
const { data } = await axios.get(`Tickets/${ticket}/getVolume`); const { data } = await axios.get(`Tickets/${ticket}/getVolume`);
const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume])); const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume]));
sales.value.forEach((sale) => { sales.value.forEach((sale) => {
sale.saleVolume = volumes.get(sale.id); sale.saleVolume = volumes.get(sale.id);
}); });
packingTypeVolume.value = data.packingTypeVolume; packingTypeVolume.value = data.packingTypeVolume;
} catch (error) {
console.error(error);
}
}; };
onMounted(() => (stateStore.rightDrawer = true)); onMounted(() => (stateStore.rightDrawer = true));

658
src/pages/Ticket/TicketAdvance.vue
View File

@ -1,24 +1,20 @@
<script setup> <script setup>
import { onMounted, ref, computed, reactive } from 'vue'; import { ref, computed, reactive, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue'; import FetchData from 'components/FetchData.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue'; import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import VnProgress from 'src/components/common/VnProgressModal.vue'; import VnProgress from 'src/components/common/VnProgressModal.vue';
import RightMenu from 'src/components/common/RightMenu.vue'; import RightMenu from 'src/components/common/RightMenu.vue';
import TicketAdvanceFilter from './TicketAdvanceFilter.vue'; import TicketAdvanceFilter from './TicketAdvanceFilter.vue';
import { dashIfEmpty, toCurrency } from 'src/filters'; import { dashIfEmpty, toCurrency } from 'src/filters';
import { useVnConfirm } from 'composables/useVnConfirm'; import { useVnConfirm } from 'composables/useVnConfirm';
import { useArrayData } from 'composables/useArrayData';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
import { toDateFormat } from 'src/filters/date.js'; import { toDateFormat } from 'src/filters/date.js';
import axios from 'axios'; import axios from 'axios';
import VnTable from 'src/components/VnTable/VnTable.vue';
const state = useState(); const state = useState();
const { t } = useI18n(); const { t } = useI18n();
@ -29,109 +25,58 @@ const user = state.getUser();
const itemPackingTypesOptions = ref([]); const itemPackingTypesOptions = ref([]);
const zonesOptions = ref([]); const zonesOptions = ref([]);
const selectedTickets = ref([]); const selectedTickets = ref([]);
const vnTableRef = ref({});
const exprBuilder = (param, value) => { const originElRef = ref(null);
switch (param) { const destinationElRef = ref(null);
case 'id': let today = Date.vnNew().toISOString();
case 'futureId': const tomorrow = new Date(today);
case 'liters': tomorrow.setDate(tomorrow.getDate() + 1);
case 'futureLiters': const userParams = reactive({
case 'lines': dateFuture: tomorrow,
case 'futureLines': dateToAdvance: today,
case 'totalWithVat': warehouseFk: user.value.warehouseFk,
case 'futureTotalWithVat': ipt: 'H',
case 'futureZone': futureIpt: 'H',
case 'notMovableLines': isFullMovable: true,
case 'futureZoneFk':
return { [param]: value };
case 'iptColFilter':
return { ipt: { like: `%${value}%` } };
case 'futureIptColFilter':
return { futureIpt: { like: `%${value}%` } };
}
};
const userParams = reactive({});
const arrayData = useArrayData('AdvanceTickets', {
url: 'Tickets/getTicketsAdvance',
userParams: userParams,
exprBuilder: exprBuilder,
limit: 0,
}); });
const { store } = arrayData;
const tickets = computed(() =>
(store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
);
const applyColumnFilter = async (col) => {
try {
const paramKey = col.columnFilter?.filterParamKey || col.field;
userParams[paramKey] = col.columnFilter.filterValue;
await arrayData.addFilter({ params: userParams });
} catch (err) {
console.error('Error applying column filter', err);
}
};
const getInputEvents = (col) => {
return col.columnFilter.type === 'select'
? { 'update:modelValue': () => applyColumnFilter(col) }
: {
'keyup.enter': () => applyColumnFilter(col),
};
};
const ticketColumns = computed(() => [ const ticketColumns = computed(() => [
{ {
label: '', label: '',
name: 'icons', name: 'icons',
align: 'left', hidden: true,
columnFilter: null, headerClass: 'horizontal-separator',
}, },
{ {
label: t('advanceTickets.ticketId'),
name: 'ticketId',
align: 'center', align: 'center',
sortable: true, label: t('advanceTickets.ticketId'),
columnFilter: { name: 'id',
component: VnInput, headerClass: 'horizontal-separator',
type: 'text',
filterValue: null,
filterParamKey: 'id',
event: getInputEvents,
attrs: {
dense: true,
},
},
}, },
{ {
align: 'left',
label: t('advanceTickets.ipt'), label: t('advanceTickets.ipt'),
name: 'ipt', name: 'ipt',
field: 'ipt',
align: 'left',
sortable: true,
columnFilter: { columnFilter: {
component: VnSelect, component: 'select',
filterParamKey: 'iptColFilter',
type: 'select',
filterValue: null,
event: getInputEvents,
attrs: { attrs: {
options: itemPackingTypesOptions.value, url: 'itemPackingTypes',
'option-value': 'code', fields: ['code', 'description'],
'option-label': 'description', where: { isActive: true },
dense: true, optionValue: 'code',
optionLabel: 'description',
inWhere: false,
}, },
}, },
format: (val) => dashIfEmpty(val), format: (row, dashIfEmpty) => dashIfEmpty(row.ipt),
headerClass: 'horizontal-separator',
}, },
{ {
align: 'left',
label: t('advanceTickets.state'), label: t('advanceTickets.state'),
name: 'state', name: 'state',
align: 'left', headerClass: 'horizontal-separator',
sortable: true, hidden: true,
columnFilter: null,
}, },
{ {
label: t('advanceTickets.preparation'), label: t('advanceTickets.preparation'),
@ -139,171 +84,105 @@ const ticketColumns = computed(() => [
field: 'preparation', field: 'preparation',
align: 'left', align: 'left',
sortable: true, sortable: true,
columnFilter: null, headerClass: 'horizontal-separator',
columnFilter: false,
}, },
{ {
label: t('advanceTickets.liters'),
name: 'liters',
field: 'liters',
align: 'left', align: 'left',
sortable: true, label: t('advanceTickets.liters'),
columnFilter: { headerClass: 'horizontal-separator',
component: VnInput, name: 'liters',
type: 'text',
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
},
}, },
{ {
align: 'left',
label: t('advanceTickets.lines'), label: t('advanceTickets.lines'),
name: 'lines', name: 'lines',
field: 'lines', headerClass: 'horizontal-separator',
align: 'left', format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
sortable: true,
columnFilter: {
component: VnInput,
type: 'text',
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
},
format: (val) => dashIfEmpty(val),
}, },
{ {
align: 'left',
label: t('advanceTickets.import'), label: t('advanceTickets.import'),
field: 'import', name: 'totalWithVat',
name: 'import', hidden: true,
align: 'left', headerClass: 'horizontal-separator',
sortable: true, format: (row) => toCurrency(row.totalWithVat),
}, },
{ {
align: 'left',
label: t('advanceTickets.futureId'), label: t('advanceTickets.futureId'),
name: 'futureId', name: 'futureId',
align: 'left', headerClass: 'vertical-separator horizontal-separator',
sortable: true, columnClass: 'vertical-separator',
columnFilter: {
component: VnInput,
type: 'text',
filterValue: null,
filterParamKey: 'futureId',
event: getInputEvents,
attrs: {
dense: true,
},
},
}, },
{ {
align: 'left',
label: t('advanceTickets.futureIpt'), label: t('advanceTickets.futureIpt'),
name: 'futureIpt', name: 'futureIpt',
field: 'futureIpt',
align: 'left',
sortable: true,
columnFilter: { columnFilter: {
component: VnSelect, component: 'select',
filterParamKey: 'futureIptColFilter',
type: 'select',
filterValue: null,
event: getInputEvents,
attrs: { attrs: {
options: itemPackingTypesOptions.value, url: 'itemPackingTypes',
'option-value': 'code', fields: ['code', 'description'],
'option-label': 'description', where: { isActive: true },
dense: true, optionValue: 'code',
optionLabel: 'description',
}, },
}, },
format: (val) => dashIfEmpty(val), headerClass: 'horizontal-separator',
format: (row, dashIfEmpty) => dashIfEmpty(row.futureIpt),
}, },
{ {
align: 'left',
label: t('advanceTickets.futureState'), label: t('advanceTickets.futureState'),
name: 'futureState', name: 'futureState',
align: 'left', headerClass: 'horizontal-separator',
sortable: true, hidden: true,
columnFilter: null,
format: (val) => dashIfEmpty(val),
}, },
{ {
align: 'left',
label: t('advanceTickets.futureLiters'), label: t('advanceTickets.futureLiters'),
headerClass: 'horizontal-separator',
name: 'futureLiters', name: 'futureLiters',
field: 'futureLiters',
align: 'left',
sortable: true,
columnFilter: {
component: VnInput,
type: 'text',
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
},
format: (val) => dashIfEmpty(val),
}, },
{ {
align: 'left',
label: t('advanceTickets.futureZone'), label: t('advanceTickets.futureZone'),
name: 'futureZoneName', name: 'futureZoneFk',
field: 'futureZoneName', columnClass: 'expand',
align: 'left',
sortable: true,
columnFilter: { columnFilter: {
component: VnSelect, component: 'select',
type: 'select', inWhere: true,
filterValue: null,
filterParamKey: 'futureZoneFk',
event: getInputEvents,
attrs: { attrs: {
options: zonesOptions.value, url: 'Zones',
'option-value': 'id', fields: ['id', 'name'],
'option-label': 'name',
dense: true,
}, },
}, },
format: (val) => dashIfEmpty(val), columnField: {
component: null,
},
headerClass: 'horizontal-separator',
format: (row, dashIfEmpty) => dashIfEmpty(row.futureZoneName),
}, },
{ {
align: 'left',
label: t('advanceTickets.notMovableLines'), label: t('advanceTickets.notMovableLines'),
headerClass: 'horizontal-separator',
name: 'notMovableLines', name: 'notMovableLines',
field: 'notMovableLines',
align: 'left',
sortable: true,
columnFilter: {
component: VnInput,
type: 'text',
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
},
format: (val) => dashIfEmpty(val),
}, },
{ {
align: 'left',
label: t('advanceTickets.futureLines'), label: t('advanceTickets.futureLines'),
headerClass: 'horizontal-separator',
name: 'futureLines', name: 'futureLines',
field: 'futureLines',
align: 'left',
sortable: true,
columnFilter: {
component: VnInput,
type: 'text',
filterValue: null,
event: getInputEvents,
attrs: {
dense: true,
},
},
format: (val) => dashIfEmpty(val),
}, },
{ {
label: t('advanceTickets.futureImport'),
name: 'futureImport',
align: 'left', align: 'left',
sortable: true, label: t('advanceTickets.futureImport'),
columnFilter: null, name: 'futureTotalWithVat',
hidden: true,
headerClass: 'horizontal-separator',
format: (row) => toCurrency(row.futureTotalWithVat),
}, },
]); ]);
@ -329,7 +208,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
const query = `tickets/${ticket.futureId}/componentUpdate`; const query = `tickets/${ticket.futureId}/componentUpdate`;
if (!ticket.landed) { if (!ticket.landed) {
const newLanded = await getLanded({ const newLanded = await getLanded({
shipped: userParams.dateToAdvance, shipped: vnTableRef.value.params.dateToAdvance,
addressFk: ticket.futureAddressFk, addressFk: ticket.futureAddressFk,
agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk, agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk,
warehouseFk: ticket.futureWarehouseFk, warehouseFk: ticket.futureWarehouseFk,
@ -352,7 +231,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
zoneFk: ticket.zoneFk ?? ticket.futureZoneFk, zoneFk: ticket.zoneFk ?? ticket.futureZoneFk,
warehouseFk: ticket.futureWarehouseFk, warehouseFk: ticket.futureWarehouseFk,
companyFk: ticket.futureCompanyFk, companyFk: ticket.futureCompanyFk,
shipped: userParams.dateToAdvance, shipped: vnTableRef.value.params.dateToAdvance,
landed: ticket.landed, landed: ticket.landed,
isDeleted: false, isDeleted: false,
isWithoutNegatives, isWithoutNegatives,
@ -364,36 +243,31 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
}; };
const moveTicketsAdvance = async () => { const moveTicketsAdvance = async () => {
try { let ticketsToMove = [];
let ticketsToMove = []; for (const ticket of selectedTickets.value) {
for (const ticket of selectedTickets.value) { if (!ticket.id) {
if (!ticket.id) { try {
try { const { query, params } = await requestComponentUpdate(ticket, false);
const { query, params } = await requestComponentUpdate(ticket, false); axios.post(query, params);
axios.post(query, params); } catch (e) {
} catch (e) { console.error('Error moving ticket', e);
console.error('Error moving ticket', e);
}
continue;
} }
ticketsToMove.push({ continue;
originId: ticket.futureId,
destinationId: ticket.id,
originShipped: ticket.futureShipped,
destinationShipped: ticket.shipped,
workerFk: ticket.workerFk,
});
} }
ticketsToMove.push({
const params = { tickets: ticketsToMove }; originId: ticket.futureId,
await axios.post('Tickets/merge', params); destinationId: ticket.id,
arrayData.fetch({ append: false }); originShipped: ticket.futureShipped,
selectedTickets.value = []; destinationShipped: ticket.shipped,
if (ticketsToMove.length) workerFk: ticket.workerFk,
notify(t('advanceTickets.moveTicketSuccess'), 'positive'); });
} catch (error) {
console.error('Error moving tickets', error);
} }
const params = { tickets: ticketsToMove };
await axios.post('Tickets/merge', params);
vnTableRef.value.reload();
selectedTickets.value = [];
if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive');
}; };
const progressLength = ref(0); const progressLength = ref(0);
@ -434,10 +308,8 @@ const splitTickets = async () => {
progressAdd(ticket.futureId); progressAdd(ticket.futureId);
} }
} }
} catch (error) {
console.error('Error splitting tickets', error);
} finally { } finally {
arrayData.fetch({ append: false }); vnTableRef.value.reload();
} }
}; };
@ -455,22 +327,52 @@ const handleCloseProgressDialog = () => {
const handleCancelProgress = () => (cancelProgress.value = true); const handleCancelProgress = () => (cancelProgress.value = true);
onMounted(async () => { watch(
let today = Date.vnNew(); () => vnTableRef.value.tableRef?.$el,
const tomorrow = new Date(today); ($el) => {
tomorrow.setDate(tomorrow.getDate() + 1); if (!$el) return;
userParams.dateFuture = tomorrow; const head = $el.querySelector('thead');
userParams.dateToAdvance = today; const firstRow = $el.querySelector('thead > tr');
userParams.scopeDays = 1;
userParams.warehouseFk = user.value.warehouseFk;
userParams.ipt = 'H';
userParams.futureIpt = 'H';
userParams.isFullMovable = true;
const filter = { limit: 0 };
await arrayData.addFilter({ filter, userParams });
});
</script>
const newRow = document.createElement('tr');
destinationElRef.value = document.createElement('th');
originElRef.value = document.createElement('th');
newRow.classList.add('bg-header');
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
originElRef.value.classList.add('text-uppercase', 'color-vn-label');
destinationElRef.value.setAttribute('colspan', '7');
originElRef.value.setAttribute('colspan', '9');
destinationElRef.value.textContent = `${t(
'advanceTickets.destination'
)} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
vnTableRef.value.params.dateFuture
)}`;
newRow.append(destinationElRef.value, originElRef.value);
head.insertBefore(newRow, firstRow);
},
{ once: true, inmmediate: true }
);
watch(
() => vnTableRef.value.params,
() => {
if (originElRef.value && destinationElRef.value) {
destinationElRef.value.textContent = `${t(
'advanceTickets.destination'
)} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
vnTableRef.value.params.dateFuture
)}`;
}
},
{ deep: true }
);
</script>
<template> <template>
<FetchData <FetchData
url="itemPackingTypes" url="itemPackingTypes"
@ -491,11 +393,6 @@ onMounted(async () => {
auto-load auto-load
@on-fetch="(data) => (zonesOptions = data)" @on-fetch="(data) => (zonesOptions = data)"
/> />
<VnSearchbar
data-key="WeeklyTickets"
:label="t('weeklyTickets.search')"
:info="t('weeklyTickets.searchInfo')"
/>
<VnSubToolbar> <VnSubToolbar>
<template #st-data> <template #st-data>
<QBtn <QBtn
@ -539,174 +436,109 @@ onMounted(async () => {
</VnSubToolbar> </VnSubToolbar>
<RightMenu> <RightMenu>
<template #right-panel> <template #right-panel>
<TicketAdvanceFilter data-key="AdvanceTickets" /> <TicketAdvanceFilter data-key="advanceTickets" />
</template> </template>
</RightMenu> </RightMenu>
<QPage class="column items-center q-pa-md"> <QPage class="column items-center q-pa-md">
<QTable <VnTable
:rows="tickets" data-key="advanceTickets"
ref="vnTableRef"
url="Tickets/getTicketsAdvance"
search-url="advanceTickets"
:user-params="userParams"
:limit="0"
:columns="ticketColumns" :columns="ticketColumns"
row-key="index" :table="{
selection="multiple" 'row-key': '$index',
selection: 'multiple',
}"
v-model:selected="selectedTickets" v-model:selected="selectedTickets"
:pagination="{ rowsPerPage: 0 }" :pagination="{ rowsPerPage: 0 }"
:no-data-label="t('globals.noResults')" :no-data-label="t('globals.noResults')"
style="max-width: 99%" :right-search="false"
auto-load
:disable-option="{ card: true }"
> >
<template #header="props"> <template #column-icons="{ row }">
{{ userParams.scopeDays }} <QIcon
<QTr :props="props"> v-if="row.futureAgency !== row.agency && row.agency"
<QTh color="primary"
class="horizontal-separator text-uppercase color-vn-label" name="vn:agency-term"
colspan="7" size="xs"
translate >
> <QTooltip class="column">
{{ t('advanceTickets.destination') }} <span>
{{ toDateFormat(userParams.dateToAdvance) }} {{
</QTh> t('advanceTickets.originAgency', {
<QTh agency: row.futureAgency,
class="horizontal-separator text-uppercase color-vn-label" })
colspan="9" }}
translate </span>
> <span>
{{ t('advanceTickets.origin') }} {{
{{ toDateFormat(userParams.dateFuture) }} t('advanceTickets.destinationAgency', {
</QTh> agency: row.agency,
</QTr> })
<QTr> }}
<QTh> </span>
<QCheckbox v-model="props.selected" /> </QTooltip>
</QTh> </QIcon>
<QTh
v-for="(col, index) in ticketColumns"
:key="index"
:class="{ 'vertical-separator': col.name === 'futureId' }"
>
{{ col.label }}
</QTh>
</QTr>
</template> </template>
<template #top-row="{ cols }"> <template #column-id="{ row }">
<QTr> <QBtn flat class="link">
<QTd /> {{ row.id }}
<QTd <TicketDescriptorProxy :id="row.id" />
v-for="(col, index) in cols" </QBtn>
:key="index"
style="max-width: 100px"
>
<component
:is="col.columnFilter.component"
v-if="col.columnFilter"
v-model="col.columnFilter.filterValue"
v-bind="col.columnFilter.attrs"
v-on="col.columnFilter.event(col)"
dense
/>
</QTd>
</QTr>
</template> </template>
<template #header-cell-availableLines="{ col }"> <template #column-state="{ row }">
<QTh class="vertical-separator"> <QBadge
{{ col.label }} v-if="row.state"
</QTh> text-color="black"
:color="row.classColor"
class="q-ma-none"
dense
>
{{ row.state }}
</QBadge>
<span v-else> {{ dashIfEmpty(row.state) }}</span>
</template> </template>
<template #body-cell-icons="{ row }"> <template #column-import="{ row }">
<QTd class="q-gutter-x-xs"> <QBadge
<QIcon :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
v-if="row.futureAgency !== row.agency && row.agency" :color="totalPriceColor(row.totalWithVat)"
color="primary" class="q-ma-none"
name="vn:agency-term" dense
size="xs" >
> {{ toCurrency(row.totalWithVat || 0) }}
<QTooltip class="column"> </QBadge>
<span>
{{
t('advanceTickets.originAgency', {
agency: row.futureAgency,
})
}}
</span>
<span>
{{
t('advanceTickets.destinationAgency', {
agency: row.agency,
})
}}
</span>
</QTooltip>
</QIcon>
</QTd>
</template> </template>
<template #column-futureId="{ row }">
<template #body-cell-ticketId="{ row }"> <QBtn flat class="link" dense>
<QTd> {{ row.futureId }}
<QBtn flat class="link"> <TicketDescriptorProxy :id="row.futureId" />
{{ row.id }} </QBtn>
<TicketDescriptorProxy :id="row.id" />
</QBtn>
</QTd>
</template> </template>
<template #body-cell-state="{ row }"> <template #column-futureState="{ row }">
<QTd> <QBadge
<QBadge text-color="black"
v-if="row.state" :color="row.futureClassColor"
text-color="black" class="q-ma-none"
:color="row.classColor" dense
class="q-ma-none" >
dense {{ row.futureState }}
> </QBadge>
{{ row.state }}
</QBadge>
<span v-else> {{ dashIfEmpty(row.state) }}</span>
</QTd>
</template> </template>
<template #body-cell-import="{ row }"> <template #column-futureImport="{ row }">
<QTd> <QBadge
<QBadge :text-color="isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'"
:text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'" :color="totalPriceColor(row.futureTotalWithVat)"
:color="totalPriceColor(row.totalWithVat)" class="q-ma-none"
class="q-ma-none" dense
dense >
> {{ toCurrency(row.futureTotalWithVat || 0) }}
{{ toCurrency(row.totalWithVat || 0) }} </QBadge>
</QBadge>
</QTd>
</template> </template>
<template #body-cell-futureId="{ row }"> </VnTable>
<QTd class="vertical-separator">
<QBtn flat class="link" dense>
{{ row.futureId }}
<TicketDescriptorProxy :id="row.futureId" />
</QBtn>
</QTd>
</template>
<template #body-cell-futureState="{ row }">
<QTd>
<QBadge
text-color="black"
:color="row.futureClassColor"
class="q-ma-none"
dense
>
{{ row.futureState }}
</QBadge>
</QTd>
</template>
<template #body-cell-futureImport="{ row }">
<QTd>
<QBadge
:text-color="
isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
"
:color="totalPriceColor(row.futureTotalWithVat)"
class="q-ma-none"
dense
>
{{ toCurrency(row.futureTotalWithVat || 0) }}
</QBadge>
</QTd>
</template>
</QTable>
<VnProgress <VnProgress
:progress="progressPercentage" :progress="progressPercentage"
:cancelled="cancelProgress" :cancelled="cancelProgress"
@ -725,11 +557,11 @@ onMounted(async () => {
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
.vertical-separator { :deep(.vertical-separator) {
border-left: 4px solid white !important; border-left: 4px solid white !important;
} }
.horizontal-separator { :deep(.horizontal-separator) {
border-bottom: 4px solid white !important; border-top: 4px solid white !important;
} }
</style> </style>

27
src/pages/Ticket/TicketAdvanceFilter.vue
View File

@ -27,20 +27,16 @@ const warehousesOptions = ref([]);
const itemPackingTypes = ref([]); const itemPackingTypes = ref([]);
const getItemPackingTypes = async () => { const getItemPackingTypes = async () => {
try { const filter = {
const filter = { where: { isActive: true },
where: { isActive: true }, };
}; const { data } = await axios.get('ItemPackingTypes', {
const { data } = await axios.get('ItemPackingTypes', { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); itemPackingTypes.value = data.map((ipt) => ({
itemPackingTypes.value = data.map((ipt) => ({ description: t(ipt.description),
description: t(ipt.description), code: ipt.code,
code: ipt.code, }));
}));
} catch (error) {
console.error(error);
}
}; };
const getLocale = (val) => { const getLocale = (val) => {
@ -58,6 +54,7 @@ onMounted(async () => await getItemPackingTypes());
auto-load auto-load
/> />
<VnFilterPanel <VnFilterPanel
search-url="advanceTickets"
:data-key="props.dataKey" :data-key="props.dataKey"
:search-button="true" :search-button="true"
:hidden-tags="['search']" :hidden-tags="['search']"
@ -101,6 +98,7 @@ onMounted(async () => await getItemPackingTypes());
dense dense
outlined outlined
rounded rounded
:use-like="false"
> >
</VnSelect> </VnSelect>
</QItemSection> </QItemSection>
@ -118,6 +116,7 @@ onMounted(async () => await getItemPackingTypes());
dense dense
outlined outlined
rounded rounded
:use-like="false"
> >
</VnSelect> </VnSelect>
</QItemSection> </QItemSection>

40
src/pages/Ticket/TicketFutureFilter.vue
View File

@ -24,33 +24,25 @@ const itemPackingTypes = ref([]);
const stateOptions = ref([]); const stateOptions = ref([]);
const getItemPackingTypes = async () => { const getItemPackingTypes = async () => {
try { const filter = {
const filter = { where: { isActive: true },
where: { isActive: true }, };
}; const { data } = await axios.get('ItemPackingTypes', {
const { data } = await axios.get('ItemPackingTypes', { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); itemPackingTypes.value = data.map((ipt) => ({
itemPackingTypes.value = data.map((ipt) => ({ description: t(ipt.description),
description: t(ipt.description), code: ipt.code,
code: ipt.code, }));
}));
} catch (error) {
console.error(error);
}
}; };
const getGroupedStates = async () => { const getGroupedStates = async () => {
try { const { data } = await axios.get('AlertLevels');
const { data } = await axios.get('AlertLevels'); stateOptions.value = data.map((state) => ({
stateOptions.value = data.map((state) => ({ id: state.id,
id: state.id, name: t(`futureTickets.${state.code}`),
name: t(`futureTickets.${state.code}`), code: state.code,
code: state.code, }));
}));
} catch (error) {
console.error(error);
}
}; };
onMounted(async () => { onMounted(async () => {

2
src/pages/Ticket/TicketList.vue
View File

@ -204,7 +204,7 @@ const columns = computed(() => [
action: (row) => redirectToLines(row.id), action: (row) => redirectToLines(row.id),
}, },
{ {
title: t('ticketList.summary'), title: t('components.smartCard.viewSummary'),
icon: 'preview', icon: 'preview',
isPrimary: true, isPrimary: true,
action: (row) => viewSummary(row.id, TicketSummary), action: (row) => viewSummary(row.id, TicketSummary),

2
src/pages/Worker/Card/WorkerCard.vue
View File

@ -6,7 +6,7 @@ import WorkerFilter from '../WorkerFilter.vue';
<template> <template>
<VnCard <VnCard
data-key="Worker" data-key="Worker"
base-url="Workers" custom-url="Workers/summary"
:descriptor="WorkerDescriptor" :descriptor="WorkerDescriptor"
:filter-panel="WorkerFilter" :filter-panel="WorkerFilter"
search-data-key="WorkerList" search-data-key="WorkerList"

7
src/pages/Worker/Card/WorkerDescriptor.vue
View File

@ -17,6 +17,11 @@ const $props = defineProps({
required: false, required: false,
default: null, default: null,
}, },
dataKey: {
type: String,
required: false,
default: 'workerData',
},
}); });
const image = ref(null); const image = ref(null);
@ -65,7 +70,7 @@ const handlePhotoUpdated = (evt = false) => {
<CardDescriptor <CardDescriptor
ref="cardDescriptorRef" ref="cardDescriptorRef"
module="Worker" module="Worker"
data-key="workerData" :data-key="dataKey"
url="Workers/descriptor" url="Workers/descriptor"
:filter="{ where: { id: entityId } }" :filter="{ where: { id: entityId } }"
title="user.nickname" title="user.nickname"

7
src/pages/Worker/Card/WorkerDescriptorProxy.vue
View File

@ -12,6 +12,11 @@ const $props = defineProps({
<template> <template>
<QPopupProxy> <QPopupProxy>
<WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" /> <WorkerDescriptor
v-if="$props.id"
:id="$props.id"
:summary="WorkerSummary"
data-key="workerDescriptorProxy"
/>
</QPopupProxy> </QPopupProxy>
</template> </template>

3
src/pages/Worker/Card/WorkerNotificationsManager.vue
View File

@ -44,8 +44,9 @@ async function toggleNotification(notification) {
`worker.notificationsManager.${notification.active ? '' : 'un'}subscribed` `worker.notificationsManager.${notification.active ? '' : 'un'}subscribed`
), ),
}); });
} catch { } catch (e) {
notification.active = !notification.active; notification.active = !notification.active;
throw e;
} }
} }

2
src/pages/Worker/Card/WorkerSummary.vue
View File

@ -45,7 +45,7 @@ onBeforeMount(async () => {
ref="summary" ref="summary"
:url="`Workers/summary`" :url="`Workers/summary`"
:filter="{ where: { id: entityId } }" :filter="{ where: { id: entityId } }"
data-key="WorkerSummary" data-key="Worker"
> >
<template #header="{ entity }"> <template #header="{ entity }">
<div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div> <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>

6
src/pages/Worker/WorkerList.vue
View File

@ -169,7 +169,7 @@ async function autofillBic(worker) {
</script> </script>
<template> <template>
<VnSearchbar <VnSearchbar
data-key="Worker" data-key="WorkerList"
:label="t('Search worker')" :label="t('Search worker')"
:info="t('You can search by worker id or name')" :info="t('You can search by worker id or name')"
/> />
@ -191,13 +191,13 @@ async function autofillBic(worker) {
/> />
<RightMenu> <RightMenu>
<template #right-panel> <template #right-panel>
<WorkerFilter data-key="Worker" /> <WorkerFilter data-key="WorkerList" />
</template> </template>
</RightMenu> </RightMenu>
<VnTable <VnTable
v-if="defaultPayMethod" v-if="defaultPayMethod"
ref="tableRef" ref="tableRef"
data-key="Worker" data-key="WorkerList"
url="Workers/filter" url="Workers/filter"
:create="{ :create="{
urlCreate: 'Workers/new', urlCreate: 'Workers/new',

16
src/pages/Zone/Card/ZoneWarehouses.vue
View File

@ -34,21 +34,13 @@ const columns = computed(() => [
]); ]);
const deleteWarehouse = async (row) => { const deleteWarehouse = async (row) => {
try { await axios.delete(`${urlPath.value}/${row.id}`);
await axios.delete(`${urlPath.value}/${row.id}`); fetchWarehouses();
fetchWarehouses();
} catch (error) {
console.error(error);
}
}; };
const createZoneWarehouse = async (ZoneWarehouseFormData) => { const createZoneWarehouse = async (ZoneWarehouseFormData) => {
try { await axios.post(urlPath.value, ZoneWarehouseFormData);
await axios.post(urlPath.value, ZoneWarehouseFormData); fetchWarehouses();
fetchWarehouses();
} catch (error) {
console.error(error);
}
}; };
watch( watch(

2
src/pages/Zone/ZoneList.vue
View File

@ -103,7 +103,7 @@ const columns = computed(() => [
name: 'tableActions', name: 'tableActions',
actions: [ actions: [
{ {
title: t('list.zoneSummary'), title: t('components.smartCard.viewSummary'),
icon: 'preview', icon: 'preview',
action: (row) => viewSummary(row.id, ZoneSummary), action: (row) => viewSummary(row.id, ZoneSummary),
isPrimary: true, isPrimary: true,

45
src/router/modules/item.js
View File

@ -48,6 +48,28 @@ export default {
}, },
component: () => import('src/pages/Item/ItemList.vue'), component: () => import('src/pages/Item/ItemList.vue'),
}, },
{
path: 'request',
name: 'ItemRequest',
meta: {
title: 'buyRequest',
icon: 'vn:buyrequest',
},
component: () => import('src/pages/Item/ItemRequest.vue'),
},
{
path: 'waste-breakdown',
name: 'WasteBreakdown',
meta: {
title: 'wasteBreakdown',
icon: 'vn:claims',
},
beforeEnter: (to, from, next) => {
next({ name: 'ItemList' });
window.location.href =
'https://grafana.verdnatura.es/d/TTNXQAxVk';
},
},
{ {
path: 'fixed-price', path: 'fixed-price',
name: 'ItemFixedPrice', name: 'ItemFixedPrice',
@ -65,19 +87,7 @@ export default {
}, },
component: () => import('src/pages/Item/ItemCreate.vue'), component: () => import('src/pages/Item/ItemCreate.vue'),
}, },
{
path: 'waste-breakdown',
name: 'WasteBreakdown',
meta: {
title: 'wasteBreakdown',
icon: 'vn:claims',
},
beforeEnter: (to, from, next) => {
next({ name: 'ItemList' });
window.location.href =
'https://grafana.verdnatura.es/d/TTNXQAxVk';
},
},
{ {
path: 'item-type-list', path: 'item-type-list',
name: 'ItemTypeList', name: 'ItemTypeList',
@ -95,15 +105,6 @@ export default {
}, },
component: () => import('src/pages/Item/ItemTypeCreate.vue'), component: () => import('src/pages/Item/ItemTypeCreate.vue'),
}, },
{
path: 'request',
name: 'ItemRequest',
meta: {
title: 'buyRequest',
icon: 'vn:buyrequest',
},
component: () => import('src/pages/Item/ItemRequest.vue'),
},
], ],
}, },
{ {

11
src/router/modules/itemType.js
View File

@ -12,7 +12,7 @@ export default {
redirect: { name: 'ItemTypeList' }, redirect: { name: 'ItemTypeList' },
menus: { menus: {
main: [], main: [],
card: ['ItemTypeBasicData'], card: ['ItemTypeBasicData', 'ItemTypeLog'],
}, },
children: [ children: [
{ {
@ -40,6 +40,15 @@ export default {
component: () => component: () =>
import('src/pages/ItemType/Card/ItemTypeBasicData.vue'), import('src/pages/ItemType/Card/ItemTypeBasicData.vue'),
}, },
{
path: 'log',
name: 'ItemTypeLog',
meta: {
title: 'log',
icon: 'vn:History',
},
component: () => import('src/pages/ItemType/Card/ItemTypeLog.vue'),
},
], ],
}, },
], ],

2
test/cypress/integration/client/clientBalance.spec.js
View File

@ -8,6 +8,6 @@ describe('Client balance', () => {
}); });
}); });
it('Should load layout', () => { it('Should load layout', () => {
cy.get('.q-card').should('be.visible'); cy.get('.q-page').should('be.visible');
}); });
}); });

2
test/cypress/integration/client/clientCredits.spec.js
View File

@ -8,6 +8,6 @@ describe('Client credits', () => {
}); });
}); });
it('Should load layout', () => { it('Should load layout', () => {
cy.get('.q-card').should('be.visible'); cy.get('.q-page').should('be.visible');
}); });
}); });

19
test/cypress/integration/client/clientList.spec.js
View File

@ -28,7 +28,7 @@ describe('Client list', () => {
cy.get('.q-mt-lg > .q-btn--standard').click(); cy.get('.q-mt-lg > .q-btn--standard').click();
cy.checkNotification('created'); cy.checkNotification('Data created');
cy.url().should('include', '/summary'); cy.url().should('include', '/summary');
}); });
it('Client list search client', () => { it('Client list search client', () => {
@ -43,21 +43,4 @@ describe('Client list', () => {
cy.url().should('include', `/customer/${id}/summary`); cy.url().should('include', `/customer/${id}/summary`);
}); });
}); });
it('Client founded create ticket', () => {
const search = 'Jessica Jones';
cy.searchByLabel('Name', search);
cy.clickButtonsDescriptor(2);
cy.waitForElement('#formModel');
cy.waitForElement('.q-form');
cy.checkValueForm(1, search);
});
it('Client founded create order', () => {
const search = 'Jessica Jones';
cy.searchByLabel('Name', search);
cy.clickButtonsDescriptor(4);
cy.waitForElement('#formModel');
cy.waitForElement('.q-form');
cy.checkValueForm(2, search);
});
}); });

2
test/cypress/integration/client/clientRecoveries.spec.js
View File

@ -8,6 +8,6 @@ describe('Client recoveries', () => {
}); });
}); });
it('Should load layout', () => { it('Should load layout', () => {
cy.get('.q-card').should('be.visible'); cy.get('.q-page').should('be.visible');
}); });
}); });

2
test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
View File

@ -8,6 +8,6 @@ describe('Client credit opinion', () => {
}); });
}); });
it('Should load layout', () => { it('Should load layout', () => {
cy.get('.q-card').should('be.visible'); cy.get('.q-page').should('be.visible');
}); });
}); });

2
test/cypress/integration/client/others/clientConsumption.spec.js
View File

@ -8,6 +8,6 @@ describe('Client consumption', () => {
}); });
}); });
it('Should load layout', () => { it('Should load layout', () => {
cy.get('.q-card').should('be.visible'); cy.get('.q-page').should('be.visible');
}); });
}); });

2
test/cypress/integration/client/others/clientMandates.spec.js
View File

@ -8,6 +8,6 @@ describe('Client mandates', () => {
}); });
}); });
it('Should load layout', () => { it('Should load layout', () => {
cy.get('.q-card').should('be.visible'); cy.get('.q-page').should('be.visible');
}); });
}); });

2
test/cypress/integration/client/others/clientSamples.spec.js
View File

@ -8,6 +8,6 @@ describe('Client samples', () => {
}); });
}); });
it('Should load layout', () => { it('Should load layout', () => {
cy.get('.q-card').should('be.visible'); cy.get('.q-page').should('be.visible');
}); });
}); });

4
test/cypress/integration/client/others/clientWebPayments.spec.js
View File

@ -3,11 +3,11 @@ describe('Client web payments', () => {
beforeEach(() => { beforeEach(() => {
cy.viewport(1280, 720); cy.viewport(1280, 720);
cy.login('developer'); cy.login('developer');
cy.visit('#/customer/1101/others/web-payments', { cy.visit('#/customer/1101/others/web-payment', {
timeout: 5000, timeout: 5000,
}); });
}); });
it('Should load layout', () => { it('Should load layout', () => {
cy.get('.q-card').should('be.visible'); cy.get('.q-page').should('be.visible');
}); });
}); });

7
test/cypress/integration/outLogin/logout.spec.js
View File

@ -13,7 +13,7 @@ describe('Logout', () => {
}); });
describe('not user', () => { describe('not user', () => {
beforeEach(() => { beforeEach(() => {
cy.intercept('GET', '**/VnUsers/acl', { cy.intercept('GET', '**DefaultViewConfigs**', {
statusCode: 401, statusCode: 401,
body: { body: {
error: { error: {
@ -24,10 +24,11 @@ describe('Logout', () => {
}, },
}, },
statusMessage: 'AUTHORIZATION_REQUIRED', statusMessage: 'AUTHORIZATION_REQUIRED',
}).as('someRoute'); });
}); });
it('when token not exists', () => { it('when token not exists', () => {
cy.reload(); cy.get('.q-list > [href="#/item"]').click();
cy.get('.q-notification__message').should( cy.get('.q-notification__message').should(
'have.text', 'have.text',
'Authorization Required' 'Authorization Required'

33
test/cypress/integration/route/agency/agencyWorkCenter.spec.js
View File

@ -7,31 +7,20 @@ describe('AgencyWorkCenter', () => {
const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon'; const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
const workCenterCombobox = 'input[role="combobox"]'; const workCenterCombobox = 'input[role="combobox"]';
it('assign workCenter', () => { it('check workCenter crud', () => {
// create
cy.get(createButton).click(); cy.get(createButton).click();
cy.get(workCenterCombobox).type('workCenterOne{enter}'); cy.get(workCenterCombobox).type('workCenterOne{enter}');
cy.get('.q-notification__message').should('have.text', 'Data created'); cy.checkNotification('Data created');
});
it('delete workCenter', () => { // expect error when duplicate
cy.get(createButton).click();
cy.get('[data-cy="FormModelPopup_save"]').click();
cy.checkNotification('This workCenter is already assigned to this agency');
cy.get('[data-cy="FormModelPopup_cancel"]').click();
// delete
cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click(); cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
cy.get('.q-notification__message').should( cy.checkNotification('WorkCenter removed successfully');
'have.text',
'WorkCenter removed successfully'
);
});
it('error on duplicate workCenter', () => {
cy.get(createButton).click();
cy.get(workCenterCombobox).type('workCenterOne{enter}');
cy.get('.q-notification__message').should('have.text', 'Data created');
cy.get(createButton).click();
cy.get(
'.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
).type('workCenterOne{enter}');
cy.get(
':nth-child(2) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
).should('have.text', 'This workCenter is already assigned to this agency');
}); });
}); });

3
test/cypress/integration/worker/workerNotificationsManager.spec.js
View File

@ -17,8 +17,7 @@ describe('WorkerNotificationsManager', () => {
cy.login('developer'); cy.login('developer');
cy.visit(`/#/worker/${salesPersonId}/notifications`); cy.visit(`/#/worker/${salesPersonId}/notifications`);
cy.get(firstAvailableNotification).click(); cy.get(firstAvailableNotification).click();
cy.notificationHas( cy.checkNotification(
'.q-notification__message',
'The notification subscription of this worker cant be modified' 'The notification subscription of this worker cant be modified'
); );
}); });

25
test/cypress/support/commands.js
View File

@ -253,6 +253,13 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
cy.get(selector).should('have.text', expectedValue); cy.get(selector).should('have.text', expectedValue);
}); });
Cypress.Commands.add('openActionDescriptor', (opt) => {
cy.openActionsDescriptor();
const listItem = '[role="menu"] .q-list .q-item';
cy.contains(listItem, opt).click();
1;
});
Cypress.Commands.add('openActionsDescriptor', () => { Cypress.Commands.add('openActionsDescriptor', () => {
cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click(); cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
}); });
@ -262,3 +269,21 @@ Cypress.Commands.add('openUserPanel', () => {
'.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image' '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
).click(); ).click();
}); });
Cypress.Commands.add('openActions', (row) => {
cy.get('tbody > tr').eq(row).find('.actions > .q-btn').click();
});
Cypress.Commands.add('checkNotification', (text) => {
cy.get('.q-notification')
.should('be.visible')
.last()
.then(($lastNotification) => {
if (!Cypress.$($lastNotification).text().includes(text))
throw new Error(`Notification not found: "${text}"`);
});
});
Cypress.Commands.add('searchByLabel', (label, value) => {
cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
});

18
test/vitest/__tests__/boot/axios.spec.js
View File

@ -36,8 +36,6 @@ describe('Axios boot', () => {
describe('onResponseError()', async () => { describe('onResponseError()', async () => {
it('should call to the Notify plugin with a message error for an status code "500"', async () => { it('should call to the Notify plugin with a message error for an status code "500"', async () => {
Notify.create = vi.fn();
const error = { const error = {
response: { response: {
status: 500, status: 500,
@ -45,19 +43,10 @@ describe('Axios boot', () => {
}; };
const result = onResponseError(error); const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error)); expect(result).rejects.toEqual(expect.objectContaining(error));
expect(Notify.create).toHaveBeenCalledWith(
expect.objectContaining({
message: 'An internal server error has ocurred',
type: 'negative',
})
);
}); });
it('should call to the Notify plugin with a message from the response property', async () => { it('should call to the Notify plugin with a message from the response property', async () => {
Notify.create = vi.fn();
const error = { const error = {
response: { response: {
status: 401, status: 401,
@ -70,14 +59,7 @@ describe('Axios boot', () => {
}; };
const result = onResponseError(error); const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error)); expect(result).rejects.toEqual(expect.objectContaining(error));
expect(Notify.create).toHaveBeenCalledWith(
expect.objectContaining({
message: 'Invalid user or password',
type: 'negative',
})
);
}); });
}); });
}); });