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

Merge branch 'dev' into 8422-createVehicleDms

This commit is contained in:
Jose Antonio Tubau 2025-04-16 15:26:31 +02:00
parent 005693550e a6d2ee8ab2
commit 7bc53b131a
116 changed files with 1157 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@ -2,6 +2,7 @@
import { onMounted } from 'vue';
import { useQuasar, Dark } from 'quasar';
import { useI18n } from 'vue-i18n';
import VnScroll from './components/common/VnScroll.vue';
const quasar = useQuasar();
const { availableLocales, locale, fallbackLocale } = useI18n();
@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
<template>
<RouterView />
<VnScroll/>
</template>
<style lang="scss">

4
src/boot/__tests__/axios.spec.js
View File

@ -67,7 +67,7 @@ describe('Axios boot', () => {
};
const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error));
await expect(result).rejects.toEqual(expect.objectContaining(error));
});
it('should call to the Notify plugin with a message from the response property', async () => {
@ -83,7 +83,7 @@ describe('Axios boot', () => {
};
const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error));
await expect(result).rejects.toEqual(expect.objectContaining(error));
});
});
});

32
src/boot/vnDate.js
View File

@ -1,4 +1,6 @@
import { boot } from 'quasar/wrappers';
import { date as quasarDate } from 'quasar';
const { formatDate } = quasarDate;
export default boot(() => {
Date.vnUTC = () => {
@ -25,4 +27,34 @@ export default boot(() => {
const date = new Date(Date.vnUTC());
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
};
Date.getCurrentDateTimeFormatted = (
options = {
startOfDay: false,
endOfDay: true,
iso: true,
mask: 'DD-MM-YYYY HH:mm',
},
) => {
const date = Date.vnUTC();
if (options.startOfDay) {
date.setHours(0, 0, 0);
}
if (options.endOfDay) {
date.setHours(23, 59, 0);
}
if (options.iso) {
return date.toISOString();
}
return formatDate(date, options.mask);
};
Date.convertToISODateTime = (dateTimeStr) => {
const [datePart, timePart] = dateTimeStr.split(' ');
const [day, month, year] = datePart.split('-');
const [hours, minutes] = timePart.split(':');
const isoDate = new Date(year, month - 1, day, hours, minutes);
return isoDate.toISOString();
};
});

18
src/components/CreateNewPostcodeForm.vue
View File

@ -20,7 +20,6 @@ const postcodeFormData = reactive({
provinceFk: null,
townFk: null,
});
const townFilter = ref({});
const countriesRef = ref(false);
const provincesOptions = ref([]);
@ -33,11 +32,11 @@ function onDataSaved(formData) {
newPostcode.town = town.value.name;
newPostcode.townFk = town.value.id;
const provinceObject = provincesOptions.value.find(
({ id }) => id === formData.provinceFk
({ id }) => id === formData.provinceFk,
);
newPostcode.province = provinceObject?.name;
const countryObject = countriesRef.value.opts.find(
({ id }) => id === formData.countryFk
({ id }) => id === formData.countryFk,
);
newPostcode.country = countryObject?.name;
emit('onDataSaved', newPostcode);
@ -67,21 +66,11 @@ function setTown(newTown, data) {
}
async function onCityCreated(newTown, formData) {
newTown.province = provincesOptions.value.find(
(province) => province.id === newTown.provinceFk
(province) => province.id === newTown.provinceFk,
);
formData.townFk = newTown;
setTown(newTown, formData);
}
async function filterTowns(name) {
if (name !== '') {
townFilter.value.where = {
name: {
like: `%${name}%`,
},
};
}
}
</script>
<template>
@ -107,7 +96,6 @@ async function filterTowns(name) {
<VnSelectDialog
:label="t('City')"
@update:model-value="(value) => setTown(value, data)"
@filter="filterTowns"
:tooltip="t('Create city')"
v-model="data.townFk"
url="Towns/location"

2
src/components/CrudModel.vue
View File

@ -65,7 +65,7 @@ const $props = defineProps({
default: null,
},
beforeSaveFn: {
type: Function,
type: [String, Function],
default: null,
},
goTo: {

15
src/components/EditPictureForm.vue
View File

@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
img.onerror = () => {
notify(
t("This photo provider doesn't allow remote downloads"),
'negative'
'negative',
);
};
}
@ -219,11 +219,7 @@ const makeRequest = async () => {
color="primary"
class="cursor-pointer"
@click="rotateLeft()"
>
<!-- <QTooltip class="no-pointer-events">
{{ t('Rotate left') }}
</QTooltip> -->
</QIcon>
/>
<div>
<div ref="photoContainerRef" />
</div>
@ -233,11 +229,7 @@ const makeRequest = async () => {
color="primary"
class="cursor-pointer"
@click="rotateRight()"
>
<!-- <QTooltip class="no-pointer-events">
{{ t('Rotate right') }}
</QTooltip> -->
</QIcon>
/>
</div>
<div class="column">
@ -265,7 +257,6 @@ const makeRequest = async () => {
class="cursor-pointer q-mr-sm"
@click="openInputFile()"
>
<!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
</QIcon>
<QIcon name="info" class="cursor-pointer">
<QTooltip>{{

11
src/components/FormModel.vue
View File

@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
const { notify } = useNotify();
const route = useRoute();
const myForm = ref(null);
const attrs = useAttrs();
const $props = defineProps({
url: {
type: String,
@ -99,8 +98,12 @@ const $props = defineProps({
type: Function,
default: () => {},
},
preventSubmit: {
type: Boolean,
default: true,
},
});
const emit = defineEmits(['onFetch', 'onDataSaved']);
const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
const modelValue = computed(
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
).value;
@ -301,7 +304,7 @@ function onBeforeSave(formData, originalData) {
);
}
async function onKeyup(evt) {
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
if (evt.key === 'Enter' && !$props.preventSubmit) {
const input = evt.target;
if (input.type == 'textarea' && evt.shiftKey) {
let { selectionStart, selectionEnd } = input;
@ -330,6 +333,7 @@ defineExpose({
<template>
<div class="column items-center full-width">
<QForm
v-on="$attrs"
ref="myForm"
v-if="formData"
@submit.prevent="save"
@ -406,6 +410,7 @@ defineExpose({
</QBtnDropdown>
<QBtn
v-else
data-cy="saveDefaultBtn"
:label="tMobile('globals.save')"
color="primary"
icon="save"

4
src/components/LeftMenu.vue
View File

@ -181,7 +181,7 @@ const searchModule = () => {
<template>
<QList padding class="column-max-width">
<template v-if="$props.source === 'main'">
<template v-if="$route?.matched[1]?.name === 'Dashboard'">
<template v-if="route?.matched[1]?.name === 'Dashboard'">
<QItem class="q-pb-md">
<VnInput
v-model="search"
@ -262,7 +262,7 @@ const searchModule = () => {
</template>
<template v-for="item in items" :key="item.name">
<template v-if="item.name === $route?.matched[1]?.name">
<template v-if="item.name === route?.matched[1]?.name">
<QItem class="header">
<QItemSection avatar v-if="item.icon">
<QIcon :name="item.icon" />

2
src/components/NavBar.vue
View File

@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
'no-visible': !stateQuery.isLoading().value,
}"
size="sm"
data-cy="loading-spinner"
data-cy="navBar-spinner"
/>
<QSpace />
<div id="searchbar" class="searchbar"></div>

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

@ -16,7 +16,7 @@ const $props = defineProps({
required: true,
},
searchUrl: {
type: String,
type: [String, Boolean],
default: 'table',
},
vertical: {

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

@ -33,6 +33,7 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
import VnTableFilter from './VnTableFilter.vue';
import { getColAlign } from 'src/composables/getColAlign';
import RightMenu from '../common/RightMenu.vue';
import VnScroll from '../common/VnScroll.vue'
const arrayData = useArrayData(useAttrs()['data-key']);
const $props = defineProps({
@ -65,7 +66,7 @@ const $props = defineProps({
default: null,
},
create: {
type: Object,
type: [Boolean, Object],
default: null,
},
createAsDialog: {
@ -168,6 +169,7 @@ const params = ref(useFilterParams($attrs['data-key']).params);
const orders = ref(useFilterParams($attrs['data-key']).orders);
const app = inject('app');
const tableHeight = useTableHeight();
const vnScrollRef = ref(null);
const editingRow = ref(null);
const editingField = ref(null);
@ -189,6 +191,17 @@ const tableModes = [
},
];
const onVirtualScroll = ({ to }) => {
handleScroll();
const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
if (virtualScrollContainer) {
virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
if (vnScrollRef.value) {
vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
}
}
};
onBeforeMount(() => {
const urlParams = route.query[$props.searchUrl];
hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@ -327,16 +340,13 @@ function handleOnDataSaved(_) {
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
else $props.create.onDataSaved(_);
}
function handleScroll() {
if ($props.crudModel.disableInfiniteScroll) return;
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
if ($props.crudModel.disableInfiniteScroll) return;
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
}
function handleSelection({ evt, added, rows: selectedRows }, rows) {
if (evt?.shiftKey && added) {
const rowIndex = selectedRows[0].$index;
@ -669,9 +679,9 @@ const rowCtrlClickFunction = computed(() => {
ref="tableRef"
v-bind="table"
:class="[
'vnTable',
table ? 'selection-cell' : '',
$props.footer ? 'last-row-sticky' : '',
'vnTable',
table ? 'selection-cell' : '',
$props.footer ? 'last-row-sticky' : '',
]"
wrap-cells
:columns="splittedColumns.columns"
@ -683,7 +693,7 @@ const rowCtrlClickFunction = computed(() => {
flat
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
:virtual-scroll="isTableMode"
@virtual-scroll="handleScroll"
@virtual-scroll="onVirtualScroll"
@row-click="(event, row) => handleRowClick(event, row)"
@update:selected="emit('update:selected', $event)"
@selection="(details) => handleSelection(details, rows)"
@ -741,6 +751,7 @@ const rowCtrlClickFunction = computed(() => {
withFilters
"
:column="col"
:data-cy="`column-filter-${col.name}`"
:show-title="true"
:data-key="$attrs['data-key']"
v-model="params[columnName(col)]"
@ -1087,6 +1098,11 @@ const rowCtrlClickFunction = computed(() => {
</template>
</FormModelPopup>
</QDialog>
<VnScroll
ref="vnScrollRef"
v-if="isTableMode"
:scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
/>
</template>
<i18n>
en:

1
src/components/VnTable/VnTableFilter.vue
View File

@ -30,6 +30,7 @@ function columnName(col) {
v-bind="$attrs"
:search-button="true"
:disable-submit-event="true"
:data-key="$attrs['data-key']"
:search-url
>
<template #body="{ params, orders, searchFn }">

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

@ -58,7 +58,7 @@ async function getConfig(url, filter) {
const response = await axios.get(url, {
params: { filter: filter },
});
return response.data && response.data.length > 0 ? response.data[0] : null;
return response?.data && response?.data?.length > 0 ? response.data[0] : null;
}
async function fetchViewConfigData() {

3
src/components/VnTable/__tests__/VnTable.spec.js
View File

@ -11,6 +11,9 @@ describe('VnTable', () => {
propsData: {
columns: [],
},
attrs: {
'data-key': 'test',
},
});
vm = wrapper.vm;

12
src/components/__tests__/CrudModel.spec.js
View File

@ -11,13 +11,7 @@ describe('CrudModel', () => {
beforeAll(() => {
wrapper = createWrapper(CrudModel, {
global: {
stubs: [
'vnPaginate',
'useState',
'arrayData',
'useStateStore',
'vue-i18n',
],
stubs: ['vnPaginate', 'vue-i18n'],
mocks: {
validate: vi.fn(),
},
@ -29,7 +23,7 @@ describe('CrudModel', () => {
dataKey: 'crudModelKey',
model: 'crudModel',
url: 'crudModelUrl',
saveFn: '',
saveFn: vi.fn(),
},
});
wrapper = wrapper.wrapper;
@ -231,7 +225,7 @@ describe('CrudModel', () => {
expect(vm.isLoading).toBe(false);
expect(vm.hasChanges).toBe(false);
await wrapper.setProps({ saveFn: '' });
await wrapper.setProps({ saveFn: null });
});
it("should use default url if there's not saveFn", async () => {

3
src/components/__tests__/Leftmenu.spec.js
View File

@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
vm = mount('card').vm;
});
it('should get routes for card source', async () => {
it('should get routes for card source', () => {
vm.getRoutes();
});
});
@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
});
it('should get routes for main source', () => {
vm.props.source = 'main';
vm.getRoutes();
expect(navigation.getModules).toHaveBeenCalled();
});

3
src/components/common/VnAccountNumber.vue
View File

@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
<VnInput
v-model="model"
ref="inputRef"
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
@keydown.tab="$refs.inputRef.vnInputRef.blur()"
@blur="model = useAccountShortToStandard(model) ?? model"
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
/>
</template>

2
src/components/common/VnDate.vue
View File

@ -1,5 +1,5 @@
<script setup>
const model = defineModel({ type: [String, Number], required: true });
const model = defineModel({ type: [String, Number], default: '' });
</script>
<template>
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />

7
src/components/common/VnDms.vue
View File

@ -63,8 +63,11 @@ function onFileChange(files) {
function mapperDms(data) {
const formData = new FormData();
const { files } = data;
if (files) formData.append(files?.name, files);
let files = data.files;
if (files) {
files = Array.isArray(files) ? files : [files];
files.forEach((file) => formData.append(file?.name, file));
}
const dms = {
hasFile: !!data.hasFile,

79
src/components/common/VnInputDateTime.vue Normal file
View File

@ -0,0 +1,79 @@
<script setup>
import { computed, useAttrs } from 'vue';
import { date } from 'quasar';
import VnDate from './VnDate.vue';
import VnTime from './VnTime.vue';
const $attrs = useAttrs();
const model = defineModel({ type: [Date, String] });
const $props = defineProps({
isOutlined: {
type: Boolean,
default: false,
},
showEvent: {
type: Boolean,
default: true,
},
});
const styleAttrs = computed(() => {
return $props.isOutlined
? {
dense: true,
outlined: true,
rounded: true,
}
: {};
});
const mask = 'DD-MM-YYYY HH:mm';
const selectedDate = computed({
get() {
if (!model.value) return JSON.stringify(new Date(model.value));
return date.formatDate(new Date(model.value), mask);
},
set(value) {
model.value = Date.convertToISODateTime(value);
},
});
const manageDate = (date) => {
selectedDate.value = date;
};
</script>
<template>
<div @mouseover="hover = true" @mouseleave="hover = false">
<QInput
ref="vnInputDateRef"
v-model="selectedDate"
class="vn-input-date"
placeholder="dd/mm/aaaa HH:mm"
v-bind="{ ...$attrs, ...styleAttrs }"
:clearable="false"
@click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
hide-bottom-space
@update:model-value="manageDate"
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
>
<template #prepend>
<QIcon name="today" size="xs">
<QPopupProxy cover transition-show="scale" transition-hide="scale">
<VnDate :mask="mask" v-model="selectedDate" />
</QPopupProxy>
</QIcon>
</template>
<template #append>
<QIcon name="access_time" size="xs">
<QPopupProxy cover transition-show="scale" transition-hide="scale">
<VnTime format24h :mask="mask" v-model="selectedDate" />
</QPopupProxy>
</QIcon>
</template>
</QInput>
</div>
</template>
<i18n>
es:
Open date: Abrir fecha
</i18n>

100
src/components/common/VnScroll.vue Normal file
View File

@ -0,0 +1,100 @@
<script setup>
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
const props = defineProps({
scrollTarget: { type: [String, Object], default: 'window' }
});
const scrollPosition = ref(0);
const showButton = ref(false);
let scrollContainer = null;
const onScroll = () => {
if (!scrollContainer) return;
scrollPosition.value =
typeof props.scrollTarget === 'object'
? scrollContainer.scrollTop
: window.scrollY;
};
watch(scrollPosition, (newValue) => {
showButton.value = newValue > 0;
});
const scrollToTop = () => {
if (scrollContainer) {
scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
}
};
const updateScrollContainer = (container) => {
if (container) {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
}
scrollContainer = container;
scrollContainer.addEventListener('scroll', onScroll);
onScroll();
}
};
defineExpose({
updateScrollContainer
});
const initScrollContainer = async () => {
await nextTick();
if (typeof props.scrollTarget === 'object') {
scrollContainer = props.scrollTarget;
} else {
scrollContainer = window;
}
if (!scrollContainer) return
scrollContainer.addEventListener('scroll', onScroll);
};
onMounted(() => {
initScrollContainer();
});
onUnmounted(() => {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
scrollContainer = null;
}
});
</script>
<template>
<QIcon
v-if="showButton"
color="primary"
name="keyboard_arrow_up"
class="scroll-to-top"
@click="scrollToTop"
>
<QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
</QIcon>
</template>
<style scoped>
.scroll-to-top {
position: fixed;
top: 70px;
font-size: 65px;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
transition: transform 0.2s ease-in-out;
}
.scroll-to-top:hover {
transform: translateX(-50%) scale(1.2);
cursor: pointer;
filter: brightness(0.8);
}
</style>

88
src/components/common/VnSelect.vue
View File

@ -54,6 +54,10 @@ const $props = defineProps({
type: [Array],
default: () => [],
},
filterFn: {
type: Function,
default: null,
},
exprBuilder: {
type: Function,
default: null,
@ -62,16 +66,12 @@ const $props = defineProps({
type: Boolean,
default: true,
},
defaultFilter: {
type: Boolean,
default: true,
},
fields: {
type: Array,
default: null,
},
include: {
type: [Object, Array],
type: [Object, Array, String],
default: null,
},
where: {
@ -79,7 +79,7 @@ const $props = defineProps({
default: null,
},
sortBy: {
type: String,
type: [String, Array],
default: null,
},
limit: {
@ -152,10 +152,22 @@ const value = computed({
},
});
const arrayDataKey =
$props.dataKey ??
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
const arrayData = useArrayData(arrayDataKey, {
url: $props.url,
searchUrl: false,
mapKey: $attrs['map-key'],
});
const computedSortBy = computed(() => {
return $props.sortBy || $props.optionLabel + ' ASC';
});
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
watch(options, (newValue) => {
setOptions(newValue);
});
@ -174,16 +186,6 @@ onMounted(() => {
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
});
const arrayDataKey =
$props.dataKey ??
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
const arrayData = useArrayData(arrayDataKey, {
url: $props.url,
searchUrl: false,
mapKey: $attrs['map-key'],
});
function findKeyInOptions() {
if (!$props.options) return;
return filter($props.modelValue, $props.options)?.length;
@ -252,43 +254,41 @@ async function fetchFilter(val) {
}
async function filterHandler(val, update) {
if (isLoading.value) return update();
if (!val && lastVal.value === val) {
lastVal.value = val;
return update();
}
lastVal.value = val;
let newOptions;
if (!$props.defaultFilter) return update();
if (
$props.url &&
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
) {
newOptions = await fetchFilter(val);
} else newOptions = filter(val, myOptionsOriginal.value);
update(
() => {
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
newOptions.unshift(noOneOpt.value);
if ($props.filterFn) update($props.filterFn(val));
else if (!val && lastVal.value === val) update();
else {
const makeRequest =
($props.url && $props.limit) ||
(!$props.limit && Object.keys(myOptions.value).length === 0);
newOptions = makeRequest
? await fetchFilter(val)
: filter(val, myOptionsOriginal.value);
myOptions.value = newOptions;
},
(ref) => {
if (val !== '' && ref.options.length > 0) {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
},
);
update(
() => {
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
newOptions.unshift(noOneOpt.value);
myOptions.value = newOptions;
},
(ref) => {
if (val !== '' && ref.options.length > 0) {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
},
);
}
lastVal.value = val;
}
function nullishToTrue(value) {
return value ?? true;
}
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
async function onScroll({ to, direction, from, index }) {
const lastIndex = myOptions.value.length - 1;

2
src/components/common/VnSmsDialog.vue
View File

@ -232,7 +232,7 @@ fr:
pt: Portugais
pt:
Send SMS: Enviar SMS
CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
Language: Linguagem
Phone: Móvel
Subject: Assunto

10
src/components/common/__tests__/VnDiscount.spec.js
View File

@ -4,7 +4,7 @@ import VnDiscount from 'components/common/vnDiscount.vue';
describe('VnDiscount', () => {
let vm;
beforeAll(() => {
vm = createWrapper(VnDiscount, {
props: {
@ -12,7 +12,9 @@ describe('VnDiscount', () => {
price: 100,
quantity: 2,
discount: 10,
}
mana: 10,
promise: vi.fn(),
},
}).vm;
});
@ -21,8 +23,8 @@ describe('VnDiscount', () => {
});
describe('total', () => {
it('should calculate total correctly', () => {
it('should calculate total correctly', () => {
expect(vm.total).toBe(180);
});
});
});
});

12
src/components/common/__tests__/VnDms.spec.js
View File

@ -41,10 +41,12 @@ describe('VnDms', () => {
companyFk: 2,
dmsTypeFk: 3,
description: 'This is a test description',
files: {
name: 'example.txt',
content: new Blob(['file content'], { type: 'text/plain' }),
},
files: [
{
name: 'example.txt',
content: new Blob(['file content'], { type: 'text/plain' }),
},
],
};
const expectedBody = {
@ -83,7 +85,7 @@ describe('VnDms', () => {
it('should map DMS data correctly and add file to FormData', () => {
const [formData, params] = vm.mapperDms(data);
expect(formData.get('example.txt')).toBe(data.files);
expect([formData.get('example.txt')]).toStrictEqual(data.files);
expect(expectedBody).toEqual(params.params);
});

32
src/components/common/__tests__/VnInput.spec.js
View File

@ -2,7 +2,6 @@ import { createWrapper } from 'app/test/vitest/helper';
import { vi, describe, expect, it } from 'vitest';
import VnInput from 'src/components/common/VnInput.vue';
describe('VnInput', () => {
let vm;
let wrapper;
@ -11,26 +10,28 @@ describe('VnInput', () => {
function generateWrapper(value, isOutlined, emptyToNull, insertable) {
wrapper = createWrapper(VnInput, {
props: {
modelValue: value,
isOutlined, emptyToNull, insertable,
maxlength: 101
modelValue: value,
isOutlined,
emptyToNull,
insertable,
maxlength: 101,
},
attrs: {
label: 'test',
required: true,
maxlength: 101,
maxLength: 10,
'max-length':20
'max-length': 20,
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
input = wrapper.find('[data-cy="test_input"]');
};
}
describe('value', () => {
it('should emit update:modelValue when value changes', async () => {
generateWrapper('12345', false, false, true)
generateWrapper('12345', false, false, true);
await input.setValue('123');
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
@ -46,37 +47,36 @@ describe('VnInput', () => {
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('123', false, false, false);
expect(vm.styleAttrs).toEqual({});
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('123', true, false, false);
expect(vm.styleAttrs.outlined).toBe(true);
});
});
describe('handleKeydown', () => {
describe('handleKeydown', () => {
it('should do nothing when "Backspace" key is pressed', async () => {
generateWrapper('12345', false, false, true);
await input.trigger('keydown', { key: 'Backspace' });
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
expect(spyhandler).not.toHaveBeenCalled();
});
/*
TODO: #8399 REDMINE
*/
it.skip('handleKeydown respects insertable behavior', async () => {
const expectedValue = '12345';
generateWrapper('1234', false, false, true);
vm.focus()
vm.focus();
await input.trigger('keydown', { key: '5' });
await vm.$nextTick();
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
expect(vm.value).toBe( expectedValue);
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
expect(vm.value).toBe(expectedValue);
});
});
@ -86,6 +86,6 @@ describe('VnInput', () => {
const focusSpy = vi.spyOn(input.element, 'focus');
vm.focus();
expect(focusSpy).toHaveBeenCalled();
});
});
});
});

81
src/components/common/__tests__/VnInputDateTime.spec.js Normal file
View File

@ -0,0 +1,81 @@
import { createWrapper } from 'app/test/vitest/helper.js';
import { describe, it, expect, beforeAll } from 'vitest';
import VnInputDateTime from 'components/common/VnInputDateTime.vue';
import vnDateBoot from 'src/boot/vnDate';
let vm;
let wrapper;
beforeAll(() => {
// Initialize the vnDate boot
vnDateBoot();
});
function generateWrapper(date, outlined, showEvent) {
wrapper = createWrapper(VnInputDateTime, {
props: {
modelValue: date,
isOutlined: outlined,
showEvent: showEvent,
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
}
describe('VnInputDateTime', () => {
describe('selectedDate', () => {
it('formats a valid datetime correctly', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
expect(vm.selectedDate).toBe('25-12-2023 10:30');
});
it('handles null date value', async () => {
generateWrapper(null, false, true);
await vm.$nextTick();
expect(vm.selectedDate).not.toBe(null);
});
it('updates the model value when a new datetime is set', async () => {
vm.selectedDate = '31-12-2023 15:45';
await vm.$nextTick();
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
});
});
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('2023-12-25T10:30:00', true, true);
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({
dense: true,
outlined: true,
rounded: true,
});
});
});
describe('component rendering', () => {
it('should render date and time icons', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
const icons = wrapper.findAllComponents({ name: 'QIcon' });
expect(icons.length).toBe(2);
expect(icons[0].props('name')).toBe('today');
expect(icons[1].props('name')).toBe('access_time');
});
it('should render popup proxies for date and time', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
expect(popups.length).toBe(2);
});
});
});

6
src/components/common/__tests__/VnLog.spec.js
View File

@ -90,8 +90,10 @@ describe('VnLog', () => {
vm = createWrapper(VnLog, {
global: {
stubs: [],
mocks: {},
stubs: ['FetchData', 'vue-i18n'],
mocks: {
fetch: vi.fn(),
},
},
propsData: {
model: 'Claim',

2
src/components/common/__tests__/VnNotes.spec.js
View File

@ -26,7 +26,7 @@ describe('VnNotes', () => {
) {
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
wrapper = createWrapper(VnNotes, {
propsData: options,
propsData: { ...defaultOptions, ...options },
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;

6
src/components/ui/EntityDescriptor.vue
View File

@ -44,7 +44,8 @@ onBeforeMount(async () => {
});
// It enables to load data only once if the module is the same as the dataKey
if (!isSameDataKey.value || !route.params.id) await getData();
if (!isSameDataKey.value || !route.params.id || $props.id !== route.params.id)
await getData();
watch(
() => [$props.url, $props.filter],
async () => {
@ -58,7 +59,8 @@ async function getData() {
store.filter = $props.filter ?? {};
isLoading.value = true;
try {
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
await arrayData.fetch({ append: false, updateRouter: false });
const { data } = store;
state.set($props.dataKey, data);
emit('onFetch', data);
} finally {

3
src/components/ui/VnFilterPanel.vue
View File

@ -212,6 +212,7 @@ const getLocale = (label) => {
color="primary"
style="position: fixed; z-index: 1; right: 0; bottom: 0"
icon="search"
data-cy="vnFilterPanel_search"
@click="search()"
>
<QTooltip bottom anchor="bottom right">
@ -229,6 +230,7 @@ const getLocale = (label) => {
<QItemSection top side>
<QBtn
@click="clearFilters"
data-cy="clearFilters"
color="primary"
dense
flat
@ -292,6 +294,7 @@ const getLocale = (label) => {
</QList>
</QForm>
<QInnerLoading
data-cy="filterPanel-spinner"
:label="t('globals.pleaseWait')"
:showing="isLoading"
color="primary"

8
src/components/ui/VnPaginate.vue
View File

@ -2,7 +2,9 @@
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import { useArrayData } from 'composables/useArrayData';
import { useAttrs } from 'vue';
const attrs = useAttrs();
const { t } = useI18n();
const props = defineProps({
@ -67,7 +69,7 @@ const props = defineProps({
default: null,
},
searchUrl: {
type: String,
type: [String, Boolean],
default: null,
},
disableInfiniteScroll: {
@ -75,7 +77,7 @@ const props = defineProps({
default: false,
},
mapKey: {
type: String,
type: [String, Boolean],
default: '',
},
keyData: {
@ -220,7 +222,7 @@ defineExpose({
</script>
<template>
<div class="full-width">
<div class="full-width" v-bind="attrs">
<div
v-if="!store.data && !store.data?.length && !isLoading"
class="info-row q-pa-md text-center"

2
src/components/ui/VnSearchbar.vue
View File

@ -46,7 +46,7 @@ const props = defineProps({
default: null,
},
order: {
type: String,
type: [String, Array],
default: '',
},
limit: {

9
src/components/ui/__tests__/CardSummary.spec.js
View File

@ -23,10 +23,15 @@ describe('CardSummary', () => {
beforeEach(() => {
wrapper = createWrapper(CardSummary, {
global: {
mocks: {
validate: vi.fn(),
},
},
propsData: {
dataKey: 'cardSummaryKey',
url: 'cardSummaryUrl',
filter: 'cardFilter',
filter: { key: 'cardFilter' },
},
});
vm = wrapper.vm;
@ -50,7 +55,7 @@ describe('CardSummary', () => {
it('should set correct props to the store', () => {
expect(vm.store.url).toEqual('cardSummaryUrl');
expect(vm.store.filter).toEqual('cardFilter');
expect(vm.store.filter).toEqual({ key: 'cardFilter' });
});
it('should respond to prop changes and refetch data', async () => {

15
src/components/ui/__tests__/VnSearchbar.spec.js
View File

@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
let wrapper;
let applyFilterSpy;
const searchText = 'Bolas de madera';
const userParams = {staticKey: 'staticValue'};
const userParams = { staticKey: 'staticValue' };
beforeEach(async () => {
wrapper = createWrapper(VnSearchbar, {
@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
vm.searchText = searchText;
vm.arrayData.store.userParams = userParams;
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
applyFilterSpy = vi
.spyOn(vm.arrayData, 'applyFilter')
.mockImplementation(() => {});
});
afterEach(() => {
@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
});
it('search resets pagination and applies filter', async () => {
const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
const resetPaginationSpy = vi
.spyOn(vm.arrayData, 'resetPagination')
.mockImplementation(() => {});
await vm.search();
expect(resetPaginationSpy).toHaveBeenCalled();
@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
expect(applyFilterSpy).toHaveBeenCalledWith({
params: { staticKey: 'staticValue', search: searchText },
filter: {skip: 0},
filter: { skip: 0 },
});
});
@ -68,4 +71,4 @@ describe('VnSearchbar', () => {
});
expect(vm.to.query.searchParam).toBe(expectedQuery);
});
});
});

4
src/components/ui/__tests__/VnSms.spec.js
View File

@ -1,5 +1,4 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import VnSms from 'src/components/ui/VnSms.vue';
@ -12,6 +11,9 @@ describe('VnSms', () => {
stubs: ['VnPaginate'],
mocks: {},
},
propsData: {
url: 'SmsUrl',
},
}).vm;
});

22
src/composables/__tests__/useArrayData.spec.js
View File

@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
import { useRouter } from 'vue-router';
import * as vueRouter from 'vue-router';
import { setActivePinia, createPinia } from 'pinia';
import { defineComponent, h } from 'vue';
import { mount } from '@vue/test-utils';
describe('useArrayData', () => {
const filter = '{"limit":20,"skip":0}';
@ -43,7 +45,7 @@ describe('useArrayData', () => {
it('should fetch and replace url with new params', async () => {
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
const arrayData = useArrayData('ArrayData', {
const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
searchUrl: 'params',
});
@ -72,7 +74,7 @@ describe('useArrayData', () => {
data: [{ id: 1 }],
});
const arrayData = useArrayData('ArrayData', {
const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
navigate: {},
});
@ -94,7 +96,7 @@ describe('useArrayData', () => {
],
});
const arrayData = useArrayData('ArrayData', {
const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl',
oneRecord: true,
});
@ -107,3 +109,17 @@ describe('useArrayData', () => {
});
});
});
function mountArrayData(...args) {
let arrayData;
const TestComponent = defineComponent({
setup() {
arrayData = useArrayData(...args);
return () => h('div');
},
});
const asd = mount(TestComponent);
return arrayData;
}

134
src/composables/__tests__/useSession.spec.js
View File

@ -64,88 +64,84 @@ describe('session', () => {
});
});
describe(
'login',
() => {
const expectedUser = {
id: 999,
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
userConfig: {
darkMode: false,
describe('login', () => {
const expectedUser = {
id: 999,
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
userConfig: {
darkMode: false,
},
worker: { department: { departmentFk: 155 } },
};
const rolesData = [
{
role: {
name: 'salesPerson',
},
worker: { department: { departmentFk: 155 } },
};
const rolesData = [
{
role: {
name: 'salesPerson',
},
},
{
role: {
name: 'admin',
},
{
role: {
name: 'admin',
},
},
];
beforeEach(() => {
vi.spyOn(axios, 'get').mockImplementation((url) => {
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
return Promise.resolve({
data: { roles: rolesData, user: expectedUser },
});
},
];
beforeEach(() => {
vi.spyOn(axios, 'get').mockImplementation((url) => {
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
return Promise.resolve({
data: { roles: rolesData, user: expectedUser },
});
});
});
it('should fetch the user roles and then set token in the sessionStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'mySessionToken';
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
const keepLogin = false;
it('should fetch the user roles and then set token in the sessionStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'mySessionToken';
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
const keepLogin = false;
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toBeNull();
expect(sessionToken).toEqual(expectedToken);
await session.destroy(); // this clears token and user for any other test
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
it('should fetch the user roles and then set token in the localStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'myLocalToken';
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
const keepLogin = true;
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toBeNull();
expect(sessionToken).toEqual(expectedToken);
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
await session.destroy(); // this clears token and user for any other test
});
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toEqual(expectedToken);
expect(sessionToken).toBeNull();
it('should fetch the user roles and then set token in the localStorage', async () => {
const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'myLocalToken';
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
const keepLogin = true;
await session.destroy(); // this clears token and user for any other test
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
},
{},
);
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toEqual(expectedToken);
expect(sessionToken).toBeNull();
await session.destroy(); // this clears token and user for any other test
});
});
describe('RenewToken', () => {
const expectedToken = 'myToken';

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

@ -6,6 +6,7 @@ globals:
quantity: Quantity
entity: Entity
preview: Preview
scrollToTop: Go up
user: User
details: Details
collapseMenu: Collapse lateral menu
@ -19,6 +20,7 @@ globals:
logOut: Log out
date: Date
dataSaved: Data saved
openDetail: Open detail
dataDeleted: Data deleted
delete: Delete
search: Search

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

@ -6,6 +6,7 @@ globals:
quantity: Cantidad
entity: Entidad
preview: Vista previa
scrollToTop: Ir arriba
user: Usuario
details: Detalles
collapseMenu: Contraer menú lateral
@ -20,10 +21,11 @@ globals:
date: Fecha
dataSaved: Datos guardados
dataDeleted: Datos eliminados
dataCreated: Datos creados
openDetail: Ver detalle
delete: Eliminar
search: Buscar
changes: Cambios
dataCreated: Datos creados
add: Añadir
create: Crear
edit: Modificar

5
src/pages/Claim/Card/ClaimPhoto.vue
View File

@ -23,7 +23,7 @@ const claimDms = ref([
]);
const client = ref({});
const inputFile = ref();
const files = ref({});
const files = ref([]);
const spinnerRef = ref();
const claimDmsRef = ref();
const dmsType = ref({});
@ -255,9 +255,8 @@ function onDrag() {
icon="add"
color="primary"
>
<QInput
<QFile
ref="inputFile"
type="file"
style="display: none"
multiple
v-model="files"

4
src/pages/Claim/Card/__tests__/ClaimLines.spec.js
View File

@ -52,7 +52,7 @@ describe('ClaimLines', () => {
expectedData,
{
signal: canceller.signal,
}
},
);
});
});
@ -69,7 +69,7 @@ describe('ClaimLines', () => {
expect.objectContaining({
message: 'Discount updated',
type: 'positive',
})
}),
);
});
});

5
src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
View File

@ -14,6 +14,9 @@ describe('ClaimLinesImport', () => {
fetch: vi.fn(),
},
},
propsData: {
ticketId: 1,
},
}).vm;
});
@ -40,7 +43,7 @@ describe('ClaimLinesImport', () => {
expect.objectContaining({
message: 'Lines added to claim',
type: 'positive',
})
}),
);
expect(vm.canceller).toEqual(null);
});

10
src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
View File

@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
await vm.deleteDms({ index: 0 });
expect(axios.post).toHaveBeenCalledWith(
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
);
expect(vm.quasar.notify).toHaveBeenCalledWith(
expect.objectContaining({ type: 'positive' })
expect.objectContaining({ type: 'positive' }),
);
});
});
@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
data: { index: 1 },
promise: vm.deleteDms,
},
})
}),
);
});
});
@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
new FormData(),
expect.objectContaining({
params: expect.objectContaining({ hasFile: false }),
})
}),
);
expect(vm.quasar.notify).toHaveBeenCalledWith(
expect.objectContaining({ type: 'positive' })
expect.objectContaining({ type: 'positive' }),
);
expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();

2
src/pages/Customer/Card/CustomerDescriptor.vue
View File

@ -39,7 +39,7 @@ const route = useRoute();
const { t } = useI18n();
const entityId = computed(() => {
return $props.id || route.params.id;
return Number($props.id || route.params.id);
});
const data = ref(useCardDescription());

2
src/pages/Customer/Card/CustomerDescriptorProxy.vue
View File

@ -11,7 +11,7 @@ const $props = defineProps({
</script>
<template>
<QPopupProxy>
<QPopupProxy data-cy="CustomerDescriptor">
<CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
</QPopupProxy>
</template>

2
src/pages/Customer/Card/CustomerFiscalData.vue
View File

@ -86,7 +86,7 @@ async function acceptPropagate({ isEqualizated }) {
:required="true"
:rules="validate('client.socialName')"
clearable
uppercase="true"
:uppercase="true"
v-model="data.socialName"
>
<template #append>

6
src/pages/Customer/Card/CustomerSamples.vue
View File

@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { QBtn, useQuasar } from 'quasar';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import { toDateTimeFormat } from 'src/filters/date';
import VnTable from 'src/components/VnTable/VnTable.vue';
@ -74,12 +73,11 @@ const tableRef = ref();
<template>
<VnTable
ref="tableRef"
data-key="ClientSamples"
data-key="CustomerSamples"
auto-load
:filter="filter"
:user-filter="filter"
url="ClientSamples"
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
:disable-option="{ card: true }"
:right-search="false"
:rows="rows"

2
src/pages/Customer/Card/CustomerSummary.vue
View File

@ -25,7 +25,7 @@ const $props = defineProps({
},
});
const entityId = computed(() => $props.id || route.params.id);
const entityId = computed(() => Number($props.id || route.params.id));
const customer = computed(() => summary.value.entity);
const summary = ref();
const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);

2
src/pages/Customer/CustomerFilter.vue
View File

@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
option-value="id"
option-label="name"
url="Departments"
no-one="true"
:no-one="true"
/>
</QItemSection>
</QItem>

2
src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
View File

@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
expect.objectContaining({
message: 'Payment confirmed',
type: 'positive',
})
}),
);
});
});

9
src/pages/Customer/components/CustomerSamplesCreate.vue
View File

@ -41,7 +41,6 @@ const sampleType = ref({ hasPreview: false });
const initialData = reactive({});
const entityId = computed(() => route.params.id);
const customer = computed(() => useArrayData('Customer').store?.data);
const filterEmailUsers = { where: { userFk: user.value.id } };
const filterClientsAddresses = {
include: [
{ relation: 'province', scope: { fields: ['name'] } },
@ -73,7 +72,7 @@ onBeforeMount(async () => {
const setEmailUser = (data) => {
optionsEmailUsers.value = data;
initialData.replyTo = data[0]?.email;
initialData.replyTo = data[0]?.notificationEmail;
};
const setClientsAddresses = (data) => {
@ -182,10 +181,12 @@ const toCustomerSamples = () => {
<template>
<FetchData
:filter="filterEmailUsers"
:filter="{
where: { id: customer.departmentFk },
}"
@on-fetch="setEmailUser"
auto-load
url="EmailUsers"
url="Departments"
/>
<FetchData
:filter="filterClientsAddresses"

2
src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
View File

@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
const $props = defineProps({
id: {
type: Number,
required: true,
default: null,
},
});
</script>

24
src/pages/Item/components/ItemProposal.vue
View File

@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
import VnTable from 'src/components/VnTable/VnTable.vue';
import axios from 'axios';
import notifyResults from 'src/utils/notifyResults';
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
import FetchData from 'components/FetchData.vue';
import { useState } from 'src/composables/useState';
const MATCH = 'match';
const { notifyResults } = displayResults();
const { t } = useI18n();
const $props = defineProps({
@ -18,14 +20,20 @@ const $props = defineProps({
required: true,
default: () => {},
},
filter: {
type: Object,
required: true,
default: () => {},
},
replaceAction: {
type: Boolean,
required: false,
required: true,
default: false,
},
sales: {
type: Array,
required: false,
required: true,
default: () => [],
},
});
@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
const sale = computed(() => $props.sales[0]);
const saleFk = computed(() => sale.value.saleFk);
const filter = computed(() => ({
where: $props.filter,
itemFk: $props.itemLack.itemFk,
sales: saleFk.value,
}));
@ -228,11 +238,15 @@ async function handleTicketConfig(data) {
url="TicketConfigs"
:filter="{ fields: ['lackAlertPrice'] }"
@on-fetch="handleTicketConfig"
auto-load
></FetchData>
<QInnerLoading
:showing="isLoading"
:label="t && t('globals.pleaseWait')"
color="primary"
/>
<VnTable
v-if="ticketConfig"
v-if="!isLoading"
auto-load
data-cy="proposalTable"
ref="proposalTableRef"

8
src/pages/Item/components/ItemProposalProxy.vue
View File

@ -1,13 +1,17 @@
<script setup>
import ItemProposal from './ItemProposal.vue';
import { useDialogPluginComponent } from 'quasar';
const $props = defineProps({
itemLack: {
type: Object,
required: true,
default: () => {},
},
filter: {
type: Object,
required: true,
default: () => {},
},
replaceAction: {
type: Boolean,
required: false,
@ -31,7 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
<QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
<QCard class="dialog-width">
<QCardSection class="row items-center q-pb-none">
<span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
<span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
<QSpace />
<QBtn icon="close" flat round dense v-close-popup />
</QCardSection>

4
src/pages/Monitor/MonitorClientsActions.vue
View File

@ -8,14 +8,14 @@ import VnRow from 'src/components/ui/VnRow.vue';
class="q-pa-md"
:style="{ 'flex-direction': $q.screen.lt.lg ? 'column' : 'row', gap: '0px' }"
>
<div style="flex: 0.3">
<div style="flex: 0.3" data-cy="clientsOnWebsite">
<span
class="q-ml-md text-body1"
v-text="$t('salesMonitor.clientsOnWebsite')"
/>
<SalesClientTable />
</div>
<div style="flex: 0.7">
<div style="flex: 0.7" data-cy="recentOrderActions">
<span
class="q-ml-md text-body1"
v-text="$t('salesMonitor.recentOrderActions')"

12
src/pages/Monitor/MonitorOrders.vue
View File

@ -9,6 +9,7 @@ import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
import { toCurrency } from 'src/filters';
import { useVnConfirm } from 'composables/useVnConfirm';
import axios from 'axios';
import VnDateBadge from 'src/components/common/VnDateBadge.vue';
import useOpenURL from 'src/composables/useOpenURL';
const { t } = useI18n();
@ -165,16 +166,7 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
</div>
</template>
<template #column-dateSend="{ row }">
<QTd>
<QBadge
:color="getBadgeColor(row.date_send)"
text-color="black"
class="q-pa-sm"
style="font-size: 14px"
>
{{ toDateFormat(row.date_send) }}
</QBadge>
</QTd>
<VnDateBadge :date="row.date_send" />
</template>
<template #column-clientFk="{ row }">

7
src/pages/Monitor/Ticket/MonitorTicketFilter.vue
View File

@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
import FetchData from 'src/components/FetchData.vue';
import { dateRange } from 'src/filters';
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
defineProps({ dataKey: { type: String, required: true } });
const { t, te } = useI18n();
@ -209,7 +210,7 @@ const getLocale = (label) => {
</QItem>
<QItem>
<QItemSection>
<QCheckbox
<VnCheckbox
:label="t('params.myTeam')"
v-model="params.myTeam"
toggle-indeterminate
@ -218,7 +219,7 @@ const getLocale = (label) => {
</QItem>
<QItem>
<QItemSection>
<QCheckbox
<VnCheckbox
:label="t('params.problems')"
v-model="params.problems"
toggle-indeterminate
@ -227,7 +228,7 @@ const getLocale = (label) => {
</QItem>
<QItem>
<QItemSection>
<QCheckbox
<VnCheckbox
:label="t('params.pending')"
v-model="params.pending"
toggle-indeterminate

100
src/pages/Monitor/Ticket/MonitorTickets.vue
View File

@ -1,7 +1,6 @@
<script setup>
import { ref, computed, onMounted } from 'vue';
import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
@ -168,9 +167,11 @@ const columns = computed(() => [
component: 'select',
name: 'provinceFk',
attrs: {
options: provinceOpts.value,
'option-value': 'id',
'option-label': 'name',
url: 'Provinces',
fields: ['id', 'name'],
sortBy: ['name ASC'],
optionValue: 'id',
optionLabel: 'name',
dense: true,
},
},
@ -183,9 +184,11 @@ const columns = computed(() => [
component: 'select',
name: 'stateFk',
attrs: {
options: stateOpts.value,
'option-value': 'id',
'option-label': 'name',
sortBy: ['name ASC'],
url: 'States',
fields: ['id', 'name'],
optionValue: 'id',
optionLabel: 'name',
dense: true,
},
},
@ -212,9 +215,12 @@ const columns = computed(() => [
component: 'select',
name: 'zoneFk',
attrs: {
options: zoneOpts.value,
'option-value': 'id',
'option-label': 'name',
url: 'Zones',
fields: ['id', 'name'],
sortBy: ['name ASC'],
optionValue: 'id',
optionLabel: 'name',
dense: true,
},
},
@ -225,11 +231,12 @@ const columns = computed(() => [
align: 'left',
columnFilter: {
component: 'select',
url: 'PayMethods',
attrs: {
options: PayMethodOpts.value,
optionValue: 'id',
url: 'PayMethods',
fields: ['id', 'name'],
sortBy: ['id ASC'],
optionLabel: 'name',
optionValue: 'id',
dense: true,
},
},
@ -254,7 +261,9 @@ const columns = computed(() => [
columnFilter: {
component: 'select',
attrs: {
options: DepartmentOpts.value,
url: 'Departments',
fields: ['id', 'name'],
sortBy: ['id ASC'],
dense: true,
},
},
@ -265,11 +274,12 @@ const columns = computed(() => [
align: 'left',
columnFilter: {
component: 'select',
url: 'ItemPackingTypes',
attrs: {
options: ItemPackingTypeOpts.value,
'option-value': 'code',
'option-label': 'code',
url: 'ItemPackingTypes',
fields: ['code'],
sortBy: ['code ASC'],
optionValue: 'code',
optionCode: 'code',
dense: true,
},
},
@ -324,60 +334,6 @@ const totalPriceColor = (ticket) => {
const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
</script>
<template>
<FetchData
url="Provinces"
:filter="{
fields: ['id', 'name'],
order: 'name ASC',
}"
auto-load
@on-fetch="(data) => (provinceOpts = data)"
/>
<FetchData
url="States"
:filter="{
fields: ['id', 'name'],
order: 'name ASC',
}"
auto-load
@on-fetch="(data) => (stateOpts = data)"
/>
<FetchData
url="Zones"
:filter="{
fields: ['id', 'name'],
order: 'name ASC',
}"
auto-load
@on-fetch="(data) => (zoneOpts = data)"
/>
<FetchData
url="ItemPackingTypes"
:filter="{
fields: ['code'],
order: 'code ASC',
}"
auto-load
@on-fetch="(data) => (ItemPackingTypeOpts = data)"
/>
<FetchData
url="Departments"
:filter="{
fields: ['id', 'name'],
order: 'id ASC',
}"
auto-load
@on-fetch="(data) => (DepartmentOpts = data)"
/>
<FetchData
url="PayMethods"
:filter="{
fields: ['id', 'name'],
order: 'id ASC',
}"
auto-load
@on-fetch="(data) => (PayMethodOpts = data)"
/>
<MonitorTicketSearchbar />
<RightMenu>
<template #right-panel>

1
src/pages/Order/Card/OrderCatalog.vue
View File

@ -120,7 +120,6 @@ watch(
:data-key="dataKey"
:tag-value="tagValue"
:tags="tags"
:initial-catalog-params="catalogParams"
:arrayData
/>
</template>

2
src/pages/Order/Card/OrderDescriptor.vue
View File

@ -27,7 +27,7 @@ const getTotalRef = ref();
const total = ref(0);
const entityId = computed(() => {
return $props.id || route.params.id;
return Number($props.id || route.params.id);
});
const orderTotal = computed(() => state.get('orderTotal') ?? 0);

6
src/pages/Route/Card/RouteSummary.vue
View File

@ -233,10 +233,10 @@ const ticketColumns = ref([
</span>
</QTd>
</template>
<template #body-cell-client="{ value, row }">
<QTd auto-width>
<template #body-cell-client="{ row }">
<QTd>
<span class="link">
{{ value }}
{{ row.clientFk }}
<CustomerDescriptorProxy :id="row?.clientFk" />
</span>
</QTd>

2
src/pages/Shelving/Parking/ParkingList.vue
View File

@ -80,7 +80,7 @@ const columns = computed(() => [
<VnTable
:data-key="dataKey"
:columns="columns"
is-editable="false"
:is-editable="false"
:right-search="false"
:use-model="true"
:disable-option="{ table: true }"

2
src/pages/Shelving/ShelvingList.vue
View File

@ -90,7 +90,7 @@ const onDataSaved = ({ id }) => {
<VnTable
:data-key="dataKey"
:columns="columns"
is-editable="false"
:is-editable="false"
:right-search="false"
:use-model="true"
:disable-option="{ table: true }"

23
src/pages/Supplier/Card/SupplierAccounts.vue
View File

@ -65,15 +65,13 @@ function findBankFk(value, row) {
if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
}
function bankEntityFilter(val, update) {
update(() => {
const needle = val.toLowerCase();
filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
(bank) =>
bank.bic.toLowerCase().startsWith(needle) ||
bank.name.toLowerCase().includes(needle),
);
});
function bankEntityFilter(val) {
const needle = val.toLowerCase();
filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
(bank) =>
bank.bic.toLowerCase().startsWith(needle) ||
bank.name.toLowerCase().includes(needle),
);
}
</script>
<template>
@ -82,7 +80,8 @@ function bankEntityFilter(val, update) {
url="BankEntities"
@on-fetch="
(data) => {
(bankEntitiesOptions = data), (filteredBankEntitiesOptions = data);
bankEntitiesOptions = data;
filteredBankEntitiesOptions = data;
}
"
auto-load
@ -135,10 +134,8 @@ function bankEntityFilter(val, update) {
:label="t('worker.create.bankEntity')"
v-model="row.bankEntityFk"
:options="filteredBankEntitiesOptions"
:default-filter="false"
@filter="(val, update) => bankEntityFilter(val, update)"
:filter-fn="bankEntityFilter"
option-label="bic"
option-value="id"
hide-selected
:required="true"
:roles-allowed-to-create="['financial']"

2
src/pages/Supplier/Card/SupplierDescriptorProxy.vue
View File

@ -5,7 +5,7 @@ import SupplierSummary from './SupplierSummary.vue';
const $props = defineProps({
id: {
type: Number,
required: true,
default: null,
},
});
</script>

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

@ -101,7 +101,7 @@ const onNextStep = async () => {
t('basicData.negativesConfirmMessage'),
submitWithNegatives,
);
else submit();
else await submit();
}
};
</script>

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

@ -28,6 +28,7 @@ const props = defineProps({
onMounted(() => {
restoreTicket();
hasDocuware();
});
watch(

3
src/pages/Ticket/Card/TicketDescriptorProxy.vue
View File

@ -1,7 +1,6 @@
<script setup>
import TicketDescriptor from './TicketDescriptor.vue';
import TicketSummary from './TicketSummary.vue';
const $props = defineProps({
id: {
type: Number,
@ -10,7 +9,7 @@ const $props = defineProps({
});
</script>
<template>
<QPopupProxy>
<QPopupProxy data-cy="TicketDescriptor">
<TicketDescriptor v-if="$props.id" :id="$props.id" :summary="TicketSummary" />
</QPopupProxy>
</template>

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

@ -773,6 +773,7 @@ watch(
v-model="row.itemFk"
:use-like="false"
@update:model-value="changeItem(row)"
autofocus
>
<template #option="scope">
<QItem v-bind="scope.itemProps">

17
src/pages/Ticket/Card/TicketSplit.vue
View File

@ -3,7 +3,9 @@ import { ref } from 'vue';
import VnInputDate from 'src/components/common/VnInputDate.vue';
import split from './components/split';
const emit = defineEmits(['ticketTransfered']);
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
const { notifyResults } = displayResults();
const emit = defineEmits(['ticketTransferred']);
const $props = defineProps({
ticket: {
@ -16,13 +18,20 @@ const splitDate = ref(Date.vnNew());
const splitSelectedRows = async () => {
const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
await split(tickets, splitDate.value);
emit('ticketTransfered', tickets);
const results = await split(tickets, splitDate.value);
notifyResults(results, 'ticketFk');
emit('ticketTransferred', tickets);
};
</script>
<template>
<VnInputDate class="q-mr-sm" :label="$t('New date')" v-model="splitDate" clearable />
<VnInputDate
class="q-mr-sm"
:label="$t('New date')"
v-model="splitDate"
clearable
autofocus
/>
<QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
</template>
<style lang="scss">

2
src/pages/Ticket/Card/TicketTransfer.vue
View File

@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import TicketTransferForm from './TicketTransferForm.vue';
import { toDateFormat } from 'src/filters/date.js';
const emit = defineEmits(['ticketTransfered']);
const emit = defineEmits(['ticketTransferred']);
const $props = defineProps({
mana: {

6
src/pages/Ticket/Card/TicketTransferProxy.vue
View File

@ -1,8 +1,8 @@
<script setup>
import { ref } from 'vue';
import TicketTransfer from './TicketTransfer.vue';
import Split from './TicketSplit.vue';
const emit = defineEmits(['ticketTransfered']);
import TicketSplit from './TicketSplit.vue';
const emit = defineEmits(['ticketTransferred']);
const $props = defineProps({
mana: {
@ -35,7 +35,7 @@ const transferRef = ref(null);
<template>
<QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
<div class="flex row items-center q-ma-lg" v-if="$props.split">
<Split
<TicketSplit
ref="splitRef"
@splitSelectedRows="splitSelectedRows"
:ticket="$props.ticket"

6
src/pages/Ticket/Card/components/split.js
View File

@ -1,13 +1,11 @@
import axios from 'axios';
import notifyResults from 'src/utils/notifyResults';
export default async function (data, date) {
const reducedData = data.reduce((acc, item) => {
const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
if (existing) {
existing.sales.push(item.saleFk);
} else {
acc.push({ ticketFk: item.id, sales: [item.saleFk], date });
acc.push({ ticketFk: item.ticketFk, sales: [item.saleFk], date });
}
return acc;
}, []);
@ -16,7 +14,5 @@ export default async function (data, date) {
const results = await Promise.allSettled(promises);
notifyResults(results, 'ticketFk');
return results;
}

20
src/pages/Ticket/Negative/TicketLackDetail.vue
View File

@ -23,7 +23,6 @@ const tableRef = ref();
const changeItemDialogRef = ref(null);
const changeStateDialogRef = ref(null);
const changeQuantityDialogRef = ref(null);
const showProposalDialog = ref(false);
const showChangeQuantityDialog = ref(false);
const selectedRows = ref([]);
const route = useRoute();
@ -63,6 +62,7 @@ const showItemProposal = () => {
.dialog({
component: ItemProposalProxy,
componentProps: {
filter: filter.value,
itemLack: tableRef.value.itemLack,
replaceAction: true,
sales: selectedRows.value,
@ -117,21 +117,17 @@ const showItemProposal = () => {
sales: selectedRows,
lastActiveTickets: selectedRows.map((row) => row.id),
}"
@ticket-transfered="reload"
@ticket-transferred="reload"
></TicketTransferProxy>
</template>
</QBtn>
<QBtn
color="primary"
@click="showProposalDialog = true"
:disable="selectedRows.length < 1"
@click="showItemProposal"
:disable="!(selectedRows.length === 1)"
data-cy="itemProposal"
>
<QIcon
name="import_export"
class="rotate-90"
@click="showItemProposal"
></QIcon>
<QIcon name="import_export" class="rotate-90" />
<QTooltip bottom anchor="bottom right">
{{ t('itemProposal') }}
</QTooltip>
@ -139,7 +135,7 @@ const showItemProposal = () => {
<VnPopupProxy
data-cy="changeItem"
icon="sync"
:disable="selectedRows.length < 1"
:disable="!(selectedRows.length === 1)"
:tooltip="t('negative.detail.modal.changeItem.title')"
>
<template #extraIcon> <QIcon name="vn:item" /> </template>
@ -153,7 +149,7 @@ const showItemProposal = () => {
<VnPopupProxy
data-cy="changeState"
icon="sync"
:disable="selectedRows.length < 1"
:disable="!(selectedRows.length === 1)"
:tooltip="t('negative.detail.modal.changeState.title')"
>
<template #extraIcon> <QIcon name="vn:eye" /> </template>
@ -167,7 +163,7 @@ const showItemProposal = () => {
<VnPopupProxy
data-cy="changeQuantity"
icon="sync"
:disable="selectedRows.length < 1"
:disable="!(selectedRows.length === 1)"
:tooltip="t('negative.detail.modal.changeQuantity.title')"
@click="showChangeQuantityDialog = true"
>

9
src/pages/Ticket/Negative/TicketLackFilter.vue
View File

@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInputDateTime from 'src/components/common/VnInputDateTime.vue';
const { t } = useI18n();
const props = defineProps({
dataKey: {
@ -66,6 +67,7 @@ const setUserParams = (params) => {
:data-key="props.dataKey"
:search-button="true"
@set-user-params="setUserParams"
:unremovable-params="['warehouseFk']"
>
<template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs">
@ -77,12 +79,11 @@ const setUserParams = (params) => {
<QList dense class="q-gutter-y-sm q-mt-sm">
<QItem>
<QItemSection>
<VnInput
v-model="params.days"
:label="t('negative.days')"
<VnInputDateTime
v-model="params.availabled"
:label="t('negative.availabled')"
dense
filled
type="number"
@update:model-value="
(value) => {
setUserParams(params);

19
src/pages/Ticket/Negative/TicketLackList.vue
View File

@ -21,14 +21,13 @@ const selectedRows = ref([]);
const tableRef = ref();
const filterParams = ref({});
const negativeParams = reactive({
days: useRole().likeAny('buyer') ? 2 : 0,
warehouseFk: useState().getUser().value.warehouseFk,
availabled: Date.getCurrentDateTimeFormatted(),
});
const redirectToCreateView = ({ itemFk }) => {
router.push({
name: 'NegativeDetail',
params: { id: itemFk },
query: { days: filterParams.value.days ?? negativeParams.days },
});
};
const columns = computed(() => [
@ -65,15 +64,19 @@ const columns = computed(() => [
columnFilter: {
component: 'input',
type: 'number',
columnClass: 'shrink',
inWhere: false,
},
},
{
name: 'longName',
align: 'center',
align: 'left',
label: t('negative.longName'),
field: ({ longName }) => longName,
columnFilter: {
component: 'input',
inWhere: false,
useLike: true,
},
sortable: true,
headerStyle: 'width: 350px',
cardVisible: true,
@ -94,6 +97,11 @@ const columns = computed(() => [
field: ({ inkFk }) => inkFk,
sortable: true,
cardVisible: true,
columnFilter: {
component: 'input',
columnClass: 'shrink',
inWhere: false,
},
},
{
name: 'size',
@ -155,7 +163,6 @@ const setUserParams = (params) => {
<TicketLackFilter data-key="NegativeList" @set-user-params="setUserParams" />
</template>
</RightMenu>
{{ filterRef }}
<VnTable
ref="tableRef"
data-key="NegativeList"

44
src/pages/Ticket/Negative/TicketLackTable.vue
View File

@ -5,7 +5,7 @@ import { computed, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import axios from 'axios';
import FetchData from 'src/components/FetchData.vue';
import { toDate, toHour } from 'src/filters';
import { toDate } from 'src/filters';
import useNotify from 'src/composables/useNotify.js';
import ZoneDescriptorProxy from 'pages/Zone/Card/ZoneDescriptorProxy.vue';
import { useRoute } from 'vue-router';
@ -22,14 +22,6 @@ const $props = defineProps({
},
});
watch(
() => $props.filter,
(v) => {
filterLack.value.where = v;
tableRef.value.reload(filterLack);
},
);
const filterLack = ref({
include: [
{
@ -90,6 +82,7 @@ const columns = computed(() => [
},
{
name: 'alertLevelCode',
field: 'alertLevelCode',
label: t('negative.detail.state'),
columnFilter: {
name: 'alertLevelCode',
@ -158,7 +151,6 @@ const saveChange = async (field, { row }) => {
fetchItemLack.value.fetch();
} catch (err) {
console.error('Error saving changes', err);
f;
}
};
@ -171,7 +163,11 @@ function onBuysFetched(data) {
<FetchData
ref="fetchItemLack"
:url="`Tickets/itemLack`"
:params="{ id: entityId }"
:params="{
itemFk: entityId,
warehouseFk: $props.filter.warehouseFk,
availabled: Date.getCurrentDateTimeFormatted(),
}"
@on-fetch="(data) => (itemLack = data[0])"
auto-load
/>
@ -207,6 +203,7 @@ function onBuysFetched(data) {
dense
:is-editable="true"
:row-click="false"
:search-url="false"
:right-search="false"
:right-search-icon="false"
v-model:selected="selectedRows"
@ -214,7 +211,6 @@ function onBuysFetched(data) {
>
<template #top-left>
<div style="display: flex; align-items: center" v-if="itemLack">
<!-- <VnImg :id="itemLack.itemFk" class="rounded image-wrapper"></VnImg> -->
<div class="flex column" style="align-items: center">
<QBadge
ref="badgeLackRef"
@ -239,7 +235,7 @@ function onBuysFetched(data) {
<template #column-status="{ row }">
<QTd style="min-width: 150px">
<div class="icon-container">
<div class="flex items-start q-ma-sm">
<QIcon
v-if="row.isBasket"
name="vn:basket"
@ -266,9 +262,10 @@ function onBuysFetched(data) {
size="xs"
>
<QTooltip>{{
t('negative.detail.hasObservation')
}}</QTooltip> </QIcon
><QIcon
row?.note || t('negative.detail.hasObservation')
}}</QTooltip>
</QIcon>
<QIcon
v-if="row.isRookie"
name="vn:Person"
size="xs"
@ -305,9 +302,9 @@ function onBuysFetched(data) {
</span>
</template>
<template #column-ticketFk="{ row }">
<span class="q-pa-sm link">
{{ row.id }}
<TicketDescriptorProxy :id="row.id" />
<span class="link" @click.stop>
{{ row.ticketFk }}
<TicketDescriptorProxy :id="row.ticketFk" />
</span>
</template>
<template #column-alertLevelCode="props">
@ -335,15 +332,6 @@ function onBuysFetched(data) {
</VnTable>
</template>
<style lang="scss" scoped>
.icon-container {
display: grid;
grid-template-columns: repeat(3, 0.2fr);
row-gap: 5px; /* Ajusta el espacio entre los iconos según sea necesario */
}
.icon-container > * {
width: 100%;
height: auto;
}
.list-enter-active,
.list-leave-active {
transition: all 1s ease;

6
src/pages/Ticket/Negative/components/ChangeItemDialog.vue
View File

@ -2,7 +2,9 @@
import { ref } from 'vue';
import axios from 'axios';
import VnSelect from 'src/components/common/VnSelect.vue';
import notifyResults from 'src/utils/notifyResults';
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
const { notifyResults } = displayResults();
const emit = defineEmits(['update-item']);
const showChangeItemDialog = ref(false);
@ -37,7 +39,6 @@ const updateItem = async () => {
<template>
<QCard class="q-pa-sm">
<QCardSection class="row items-center justify-center column items-stretch">
{{ showChangeItemDialog }}
<span>{{ $t('negative.detail.modal.changeItem.title') }}</span>
<VnSelect
url="Items/WithName"
@ -47,6 +48,7 @@ const updateItem = async () => {
option-label="name"
option-value="id"
v-model="newItem"
autofocus
>
</VnSelect>
</QCardSection>

9
src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
View File

@ -2,8 +2,9 @@
import { ref } from 'vue';
import axios from 'axios';
import VnInput from 'src/components/common/VnInput.vue';
import notifyResults from 'src/utils/notifyResults';
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
const { notifyResults } = displayResults();
const showChangeQuantityDialog = ref(false);
const newQuantity = ref(null);
const $props = defineProps({
@ -16,15 +17,16 @@ const emit = defineEmits(['update-quantity']);
const updateQuantity = async () => {
try {
showChangeQuantityDialog.value = true;
const rowsToUpdate = $props.selectedRows.map(({ saleFk }) =>
const rowsToUpdate = $props.selectedRows.map(({ saleFk, ticketFk }) =>
axios.post(`Sales/${saleFk}/updateQuantity`, {
saleFk,
ticketFk,
quantity: +newQuantity.value,
}),
);
const result = await Promise.allSettled(rowsToUpdate);
notifyResults(result, 'saleFk');
notifyResults(result, 'ticketFk');
emit('update-quantity', newQuantity.value);
} catch (err) {
@ -42,6 +44,7 @@ const updateQuantity = async () => {
:min="0"
:label="$t('negative.detail.modal.changeQuantity.placeholder')"
v-model="newQuantity"
autofocus
/>
</QCardSection>
<QCardActions align="right">

4
src/pages/Ticket/Negative/components/ChangeStateDialog.vue
View File

@ -3,8 +3,9 @@ import { ref } from 'vue';
import axios from 'axios';
import VnSelect from 'src/components/common/VnSelect.vue';
import FetchData from 'components/FetchData.vue';
import notifyResults from 'src/utils/notifyResults';
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
const { notifyResults } = displayResults();
const emit = defineEmits(['update-state']);
const editableStates = ref([]);
const showChangeStateDialog = ref(false);
@ -49,6 +50,7 @@ const updateState = async () => {
:options="editableStates"
option-label="name"
option-value="code"
autofocus
/>
</QCardSection>
<QCardActions align="right">

56
src/pages/Ticket/Negative/composables/notifyResults.js Normal file
View File

@ -0,0 +1,56 @@
import { Notify } from 'quasar';
import useOpenURL from 'src/composables/useOpenURL';
import { useI18n } from 'vue-i18n';
export function displayResults() {
const { t } = useI18n();
const createSuccessNotification = (id, path) => {
Notify.create({
type: 'positive',
message: t('globals.dataSaved'),
actions: [
{
label: t('globals.openDetail'),
color: 'white',
handler: () => useOpenURL(`#/ticket/${id}/${path}`),
},
],
});
};
const handleResult = (result, key, path) => {
if (result.status !== 'fulfilled') {
const data = JSON.parse(result.reason.config.data);
const error =
result.reason.response?.data?.error?.message ?? result.reason.message;
Notify.create({
type: 'negative',
message: `Ticket ${data[key]}: ${error}`,
});
return;
}
const data = JSON.parse(result.value.config.data);
let id = data[key];
if (result.value.data.status === 'noSplit') {
Notify.create({
type: 'warning',
message: `Ticket ${id}: ${t('negative.split.noSplit')}`,
});
return;
}
if (result.value.data.status === 'split') {
id = result.value.data.newTicket;
}
createSuccessNotification(id, path);
};
const notifyResults = (results, key, path = 'sale') =>
results.forEach((result) => handleResult(result, key, path));
return { notifyResults };
}

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

@ -236,6 +236,7 @@ negative:
minTimed: minTimed
negativeAction: Negative
totalNegative: Total negatives
availabled: Availabled
days: Days
buttonsUpdate:
item: Item
@ -265,7 +266,7 @@ negative:
isRookie: Is rookie
turno: Turn line
isBasket: Basket
hasObservation: Has substitution
hasObservation: Has substitution note
hasToIgnore: VIP
modal:
changeItem:
@ -288,3 +289,4 @@ negative:
newTicket: New ticket
status: Result
message: Message
noSplit: No split

9
src/pages/Ticket/locale/es.yml
View File

@ -216,7 +216,8 @@ ticketList:
negative:
hour: Hora
id: Id Articulo
longName: Articulo
longName: Artículo
itemFk: Artículo
supplier: Productor
colour: Color
size: Medida
@ -232,6 +233,7 @@ negative:
inkFk: Color
timed: Hora
date: Fecha
availabled: Disponible
minTimed: Hora
type: Tipo
negativeAction: Negativo
@ -265,7 +267,7 @@ negative:
isRookie: Cliente nuevo
turno: Linea turno
isBasket: Cesta
hasObservation: Tiene sustitución
hasObservation: Tiene nota de sustitución
hasToIgnore: VIP
modal:
changeItem:
@ -284,10 +286,11 @@ negative:
title: Gestionar tickets spliteados
subTitle: Confir fecha y agencia
split:
ticket: Ticket viejo
ticket: Ticket origen
newTicket: Ticket nuevo
status: Estado
message: Mensaje
noSplit: No se puede splitar
rounding: Redondeo
noVerifiedData: Sin datos comprobados
purchaseRequest: Petición de compra

2
src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
View File

@ -11,7 +11,7 @@ const $props = defineProps({
</script>
<template>
<QPopupProxy>
<QPopupProxy data-cy="DepartmentDescriptor">
<DepartmentDescriptor
v-if="$props.id"
:id="$props.id"

2
src/pages/Zone/Card/ZoneDescriptor.vue
View File

@ -27,7 +27,7 @@ const entityId = computed(() => {
<template>
<EntityDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
<template #menu="{ entity }">
<ZoneDescriptorMenuItems :zone="entity" />
<ZoneDescriptorMenuItems />
</template>
<template #body="{ entity }">
<VnLv :label="$t('list.agency')" :value="entity.agencyMode?.name" />

19
src/pages/Zone/Card/ZoneEventExclusionForm.vue
View File

@ -130,8 +130,21 @@ const onSubmit = async () => {
const deleteEvent = async () => {
if (!props.event) return;
const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
if (!props.event.created) {
const filter = {
where: {
dated: dated.value,
},
};
const params = { filter: JSON.stringify(filter) };
const { data: res } = await axios.get(`Zones/${route.params.id}/exclusions`, {
params,
});
if (res) await axios.delete(`Zones/${route.params.id}/exclusions/${res[0].id}`);
} else {
const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
}
await refetchEvents();
};
@ -143,7 +156,7 @@ const refetchEvents = async () => {
};
onMounted(() => {
if (props.event) {
if (props.event && props.event.dated) {
dated.value = props.event?.dated;
excludeType.value =
props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';

36
src/pages/Zone/Card/ZoneEventInclusionForm.vue
View File

@ -56,6 +56,7 @@ const isNew = computed(() => props.isNewMode);
const eventInclusionFormData = ref({ wdays: [] });
const dated = ref(props.date || Date.vnNew());
const _inclusionType = ref('indefinitely');
const hasDeletedEvent = ref(false);
const inclusionType = computed({
get: () => _inclusionType.value,
set: (val) => {
@ -84,7 +85,7 @@ const createEvent = async () => {
}
const zoneIds = props.zoneIds?.length ? props.zoneIds : [route.params.id];
for (const id of zoneIds) {
for (const zoneId of zoneIds) {
let today = eventInclusionFormData.value.dated
? moment(eventInclusionFormData.value.dated)
: moment(dated.value);
@ -92,7 +93,7 @@ const createEvent = async () => {
const { data } = await axios.get(`Zones/getEventsFiltered`, {
params: {
zoneFk: id,
zoneFk: zoneId,
started: today,
ended: lastDay,
},
@ -106,28 +107,19 @@ const createEvent = async () => {
await axios.delete(
`Zones/${existsExclusion?.zoneFk}/exclusions/${existsExclusion?.id}`,
);
await refetchEvents();
hasDeletedEvent.value = true;
}
const {
dated: formDated,
started,
ended,
type,
weekDays,
wdays,
} = eventInclusionFormData.value;
const payload = {
dated: formDated,
started,
ended,
type,
weekDays,
wdays,
};
if (isNew.value || props.eventType === 'exclusion')
await axios.post(`Zones/${id}/events`, payload);
else await axios.put(`Zones/${id}/events/${props.event?.id}`, payload);
delete eventInclusionFormData.value.id;
if (isNew.value || hasDeletedEvent.value)
await axios.post(`Zones/${zoneId}/events`, eventInclusionFormData.value);
else
await axios.put(
`Zones/${zoneId}/events/${props.event?.id}`,
eventInclusionFormData.value,
);
hasDeletedEvent.value = false;
}
quasar.notify({
message: t('globals.dataSaved'),

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

@ -93,6 +93,7 @@ const columns = computed(() => [
optionLabel: 'name',
optionValue: 'id',
},
columnClass: 'expand',
},
{
align: 'left',
@ -247,74 +248,70 @@ const closeEventForm = () => {
</QBtnGroup>
</template>
</VnSubToolbar>
<div class="table-container">
<div class="column items-center">
<VnTable
ref="tableRef"
:data-key="dataKey"
:columns="columns"
redirect="Zone"
:create="{
urlCreate: 'Zones',
title: t('list.createZone'),
onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
formInitialData: {},
}"
table-height="85vh"
v-model:selected="selectedRows"
:table="{
'row-key': 'id',
selection: 'multiple',
}"
>
<template #column-addressFk="{ row }">
{{ dashIfEmpty(formatRow(row)) }}
</template>
<template #more-create-dialog="{ data }">
<VnSelect
url="AgencyModes"
v-model="data.agencyModeFk"
option-value="id"
option-label="name"
:label="t('list.agency')"
/>
<VnInput
v-model="data.price"
:label="t('list.price')"
min="0"
type="number"
required="true"
/>
<VnInput
v-model="data.bonus"
:label="t('zone.bonus')"
min="0"
type="number"
/>
<VnInput
v-model="data.travelingDays"
:label="t('zone.travelingDays')"
type="number"
min="0"
/>
<VnInputTime v-model="data.hour" :label="t('list.close')" />
<VnSelect
url="Warehouses"
v-model="data.warehouseFK"
option-value="id"
option-label="name"
:label="t('list.warehouse')"
:options="warehouseOptions"
/>
<QCheckbox
v-model="data.isVolumetric"
:label="t('list.isVolumetric')"
:toggle-indeterminate="false"
/>
</template>
</VnTable>
</div>
</div>
<VnTable
ref="tableRef"
:data-key="dataKey"
:columns="columns"
redirect="Zone"
:create="{
urlCreate: 'Zones',
title: t('list.createZone'),
onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
formInitialData: {},
}"
table-height="85vh"
v-model:selected="selectedRows"
:table="{
'row-key': 'id',
selection: 'multiple',
}"
>
<template #column-addressFk="{ row }">
{{ dashIfEmpty(formatRow(row)) }}
</template>
<template #more-create-dialog="{ data }">
<VnSelect
url="AgencyModes"
v-model="data.agencyModeFk"
option-value="id"
option-label="name"
:label="t('list.agency')"
/>
<VnInput
v-model="data.price"
:label="t('list.price')"
min="0"
type="number"
required="true"
/>
<VnInput
v-model="data.bonus"
:label="t('zone.bonus')"
min="0"
type="number"
/>
<VnInput
v-model="data.travelingDays"
:label="t('zone.travelingDays')"
type="number"
min="0"
/>
<VnInputTime v-model="data.hour" :label="t('list.close')" />
<VnSelect
url="Warehouses"
v-model="data.warehouseFK"
option-value="id"
option-label="name"
:label="t('list.warehouse')"
:options="warehouseOptions"
/>
<QCheckbox
v-model="data.isVolumetric"
:label="t('list.isVolumetric')"
:toggle-indeterminate="false"
/>
</template>
</VnTable>
</template>
</VnSection>
<QDialog v-model="showZoneEventForm" @hide="closeEventForm()">
@ -333,24 +330,6 @@ const closeEventForm = () => {
/>
</QDialog>
</template>
<style lang="scss" scoped>
.table-container {
display: flex;
justify-content: center;
}
.column {
display: flex;
flex-direction: column;
align-items: center;
min-width: 70%;
}
:deep(.shrink-column) {
width: 8%;
}
</style>
<i18n>
es:
Search zone: Buscar zona

15
src/stores/__tests__/useStateQueryStore.spec.js
View File

@ -1,22 +1,23 @@
import { describe, expect, it, beforeEach, beforeAll } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import { setActivePinia, createPinia } from 'pinia';
import { useStateQueryStore } from 'src/stores/useStateQueryStore';
describe('useStateQueryStore', () => {
beforeAll(() => {
createWrapper({}, {});
});
const stateQueryStore = useStateQueryStore();
const { add, isLoading, remove, reset } = useStateQueryStore();
let stateQueryStore;
let add, isLoading, remove, reset;
const firstQuery = { url: 'myQuery' };
function getQueries() {
return stateQueryStore.queries;
}
beforeAll(() => {
setActivePinia(createPinia());
});
beforeEach(() => {
stateQueryStore = useStateQueryStore();
({ add, isLoading, remove, reset } = useStateQueryStore());
reset();
expect(getQueries().size).toBeFalsy();
});

19
src/utils/notifyResults.js
View File

@ -1,19 +0,0 @@
import { Notify } from 'quasar';
export default function (results, key) {
results.forEach((result, index) => {
if (result.status === 'fulfilled') {
const data = JSON.parse(result.value.config.data);
Notify.create({
type: 'positive',
message: `Operación (${index + 1}) ${data[key]} completada con éxito.`,
});
} else {
const data = JSON.parse(result.reason.config.data);
Notify.create({
type: 'negative',
message: `Operación (${index + 1}) ${data[key]} fallida: ${result.reason.message}`,
});
}
});
}

8
test/cypress/integration/claim/claimAction.spec.js
View File

@ -1,5 +1,5 @@
/// <reference types="cypress" />
describe.skip('ClaimAction', () => {
describe('ClaimAction', () => {
const claimId = 1;
const firstRow = 'tbody > :nth-child(1)';
@ -15,13 +15,13 @@ describe.skip('ClaimAction', () => {
});
// https://redmine.verdnatura.es/issues/8756
xit('should change destination', () => {
it.skip('should change destination', () => {
const rowData = [true, null, null, 'Bueno'];
cy.fillRow(firstRow, rowData);
});
// https://redmine.verdnatura.es/issues/8756
xit('should change destination from other button', () => {
it.skip('should change destination from other button', () => {
const rowData = [true];
cy.fillRow(firstRow, rowData);
@ -35,7 +35,7 @@ describe.skip('ClaimAction', () => {
});
// https://redmine.verdnatura.es/issues/8756
xit('should remove the line', () => {
it.skip('should remove the line', () => {
cy.fillRow(firstRow, [true]);
cy.removeCard();
cy.clickConfirm();

2
test/cypress/integration/claim/claimDevelopment.spec.js
View File

@ -1,5 +1,5 @@
/// <reference types="cypress" />
describe.skip('ClaimDevelopment', () => {
describe('ClaimDevelopment', () => {
const claimId = 1;
const firstLineReason = 'tbody > :nth-child(1) > :nth-child(2)';
const thirdRow = 'tbody > :nth-child(3)';

2
test/cypress/integration/customer/clientList.spec.js
View File

@ -1,5 +1,5 @@
/// <reference types="cypress" />
describe.skip('Client list', () => {
describe('Client list', () => {
beforeEach(() => {
cy.login('developer');
cy.visit('/#/customer/list', {

2
test/cypress/integration/entry/commands.js
View File

@ -7,7 +7,7 @@ Cypress.Commands.add('selectTravel', (warehouse = '1') => {
});
Cypress.Commands.add('deleteEntry', () => {
cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
cy.dataCy('descriptor-more-opts').should('be.visible').click();
cy.waitForElement('div[data-cy="delete-entry"]').click();
});

2
test/cypress/integration/entry/entryCard/entryBasicData.spec.js
View File

@ -1,6 +1,6 @@
import '../commands.js';
describe('EntryBasicData', () => {
describe.skip('EntryBasicData', () => {
beforeEach(() => {
cy.login('buyer');
cy.visit(`/#/entry/list`);

2
test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
View File

@ -53,7 +53,7 @@ describe('invoiceInCorrective', () => {
it('should show/hide the section if it is a corrective invoice', () => {
cy.visit('/#/invoice-in/1/summary');
cy.get('[data-cy="InvoiceInCorrective-menu-item"]').should('not.exist');
cy.clicDescriptorAction(4);
cy.clickDescriptorAction(4);
cy.get('[data-cy="InvoiceInCorrective-menu-item"]').should('exist');
});
});

12
test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
View File

@ -64,17 +64,17 @@ describe('InvoiceInDescriptor', () => {
beforeEach(() => cy.visit('/#/invoice-in/1/summary'));
it('should navigate to the supplier summary', () => {
cy.clicDescriptorAction(1);
cy.clickDescriptorAction(1);
cy.url().should('to.match', /supplier\/\d+\/summary/);
});
it('should navigate to the entry summary', () => {
cy.clicDescriptorAction(2);
cy.clickDescriptorAction(2);
cy.url().should('to.match', /entry\/\d+\/summary/);
});
it('should navigate to the invoiceIn list', () => {
cy.clicDescriptorAction(3);
cy.clickDescriptorAction(3);
cy.url().should('to.match', /invoice-in\/list\?table=\{.*supplierFk.+\}/);
});
});
@ -84,7 +84,7 @@ describe('InvoiceInDescriptor', () => {
beforeEach(() => cy.visit(`/#/invoice-in/${originalId}/summary`));
it('should create a correcting invoice and redirect to original invoice', () => {
it.skip('should create a correcting invoice and redirect to original invoice', () => {
createCorrective();
redirect(originalId);
});
@ -93,7 +93,7 @@ describe('InvoiceInDescriptor', () => {
createCorrective();
redirect(originalId);
cy.clicDescriptorAction(4);
cy.clickDescriptorAction(4);
cy.validateVnTableRows({
cols: [
{
@ -141,7 +141,7 @@ function createCorrective() {
function redirect(subtitle) {
const regex = new RegExp(`InvoiceIns/${subtitle}\\?filter=.*`);
cy.intercept('GET', regex).as('getOriginal');
cy.clicDescriptorAction(4);
cy.clickDescriptorAction(4);
cy.wait('@getOriginal');
cy.validateDescriptor({ subtitle });
}

2
test/cypress/integration/invoiceOut/invoiceOutList.spec.js
View File

@ -31,7 +31,7 @@ describe('InvoiceOut list', () => {
it.skip('should open the invoice descriptor from table icon', () => {
cy.get(firstSummaryIcon).click();
cy.get('.cardSummary').should('be.visible');
cy.get('.summaryHeader > div').should('include.text', 'A1111111');
cy.get('.summaryHeader > div').should('include.text', 'V10100001');
});
it('should open the client descriptor', () => {

2
test/cypress/integration/item/itemList.spec.js
View File

@ -1,6 +1,6 @@
/// <reference types="cypress" />
describe.skip('Item list', () => {
describe('Item list', () => {
beforeEach(() => {
cy.login('developer');
cy.visit(`/#/item/list`);

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