Merge branch 'dev' into 8664-refactorCmrList
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Jose Antonio Tubau 2025-03-05 17:54:12 +00:00
commit 34e7c4203f
52 changed files with 535 additions and 349 deletions

10
Jenkinsfile vendored
View File

@ -26,6 +26,7 @@ node {
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
echo "NODE_NAME: ${env.NODE_NAME}" echo "NODE_NAME: ${env.NODE_NAME}"
echo "WORKSPACE: ${env.WORKSPACE}" echo "WORKSPACE: ${env.WORKSPACE}"
echo "CHANGE_TARGET: ${env.CHANGE_TARGET}"
configFileProvider([ configFileProvider([
configFile(fileId: 'salix-front.properties', configFile(fileId: 'salix-front.properties',
@ -107,16 +108,19 @@ pipeline {
} }
stage('E2E') { stage('E2E') {
environment { environment {
CREDENTIALS = credentials('docker-registry') CREDS = credentials('docker-registry')
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}" COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ." COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
} }
steps { steps {
script { script {
sh 'rm junit/e2e-*.xml || true' sh 'rm -f junit/e2e-*.xml'
env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
sh "docker-compose ${env.COMPOSE_PARAMS} up -d" sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") { image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
sh 'cypress run --browser chromium || true' sh 'cypress run --browser chromium || true'
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "salix-front", "name": "salix-front",
"version": "25.10.0", "version": "25.12.0",
"description": "Salix frontend", "description": "Salix frontend",
"productName": "Salix", "productName": "Salix",
"author": "Verdnatura", "author": "Verdnatura",
@ -71,4 +71,4 @@
"vite": "^6.0.11", "vite": "^6.0.11",
"vitest": "^0.31.1" "vitest": "^0.31.1"
} }
} }

View File

@ -124,7 +124,7 @@ const selectTravel = ({ id }) => {
<FetchData <FetchData
url="AgencyModes" url="AgencyModes"
@on-fetch="(data) => (agenciesOptions = data)" @on-fetch="(data) => (agenciesOptions = data)"
:filter="{ fields: ['id', 'name'], order: 'name ASC' }" :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
auto-load auto-load
/> />
<FetchData <FetchData

View File

@ -12,7 +12,7 @@ defineProps({ row: { type: Object, required: true } });
> >
<QIcon name="vn:claims" size="xs"> <QIcon name="vn:claims" size="xs">
<QTooltip> <QTooltip>
{{ t('ticketSale.claim') }}: {{ $t('ticketSale.claim') }}:
{{ row.claim?.claimFk }} {{ row.claim?.claimFk }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
@ -29,14 +29,14 @@ defineProps({ row: { type: Object, required: true } });
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="row?.risk" v-if="row?.hasRisk"
name="vn:risk" name="vn:risk"
:color="row.hasHighRisk ? 'negative' : 'primary'" :color="row.hasHighRisk ? 'negative' : 'primary'"
size="xs" size="xs"
> >
<QTooltip> <QTooltip>
{{ $t('salesTicketsTable.risk') }}: {{ $t('salesTicketsTable.risk') }}:
{{ toCurrency(row.risk - row.credit) }} {{ toCurrency(row.risk - (row.credit ?? 0)) }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon

View File

@ -55,6 +55,10 @@ const $props = defineProps({
type: [Function, Boolean], type: [Function, Boolean],
default: null, default: null,
}, },
rowCtrlClick: {
type: [Function, Boolean],
default: null,
},
redirect: { redirect: {
type: String, type: String,
default: null, default: null,

View File

@ -1,12 +1,9 @@
<script setup> <script setup>
import { nextTick, ref, watch } from 'vue'; import { nextTick, ref } from 'vue';
import { QInput } from 'quasar'; import VnInput from './VnInput.vue';
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
const $props = defineProps({ const $props = defineProps({
modelValue: {
type: String,
default: '',
},
insertable: { insertable: {
type: Boolean, type: Boolean,
default: false, default: false,
@ -14,70 +11,25 @@ const $props = defineProps({
}); });
const emit = defineEmits(['update:modelValue', 'accountShortToStandard']); const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
const model = defineModel({ prop: 'modelValue' });
const inputRef = ref(false);
let internalValue = ref($props.modelValue); function setCursorPosition(pos) {
const input = inputRef.value.vnInputRef.$el.querySelector('input');
watch( input.focus();
() => $props.modelValue, input.setSelectionRange(pos, pos);
(newVal) => {
internalValue.value = newVal;
}
);
watch(
() => internalValue.value,
(newVal) => {
emit('update:modelValue', newVal);
accountShortToStandard();
}
);
const handleKeydown = (e) => {
if (e.key === 'Backspace') return;
if (e.key === '.') {
accountShortToStandard();
// TODO: Fix this setTimeout, with nextTick doesn't work
setTimeout(() => {
setCursorPosition(0, e.target);
}, 1);
return;
}
if ($props.insertable && e.key.match(/[0-9]/)) {
handleInsertMode(e);
}
};
function setCursorPosition(pos, el = vnInputRef.value) {
el.focus();
el.setSelectionRange(pos, pos);
} }
const vnInputRef = ref(false);
const handleInsertMode = (e) => { async function handleUpdateModel(val) {
e.preventDefault(); model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
const input = e.target; await nextTick(() => setCursorPosition(0));
const cursorPos = input.selectionStart;
const { maxlength } = vnInputRef.value;
let currentValue = internalValue.value;
if (!currentValue) currentValue = e.key;
const newValue = e.key;
if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
internalValue.value =
currentValue.substring(0, cursorPos) +
newValue +
currentValue.substring(cursorPos + 1);
}
nextTick(() => {
input.setSelectionRange(cursorPos + 1, cursorPos + 1);
});
};
function accountShortToStandard() {
internalValue.value = internalValue.value?.replace(
'.',
'0'.repeat(11 - internalValue.value.length)
);
} }
</script> </script>
<template> <template>
<QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" /> <VnInput
v-model="model"
ref="inputRef"
:insertable
@update:model-value="handleUpdateModel"
/>
</template> </template>

View File

@ -83,7 +83,7 @@ const mixinRules = [
requiredFieldRule, requiredFieldRule,
...($attrs.rules ?? []), ...($attrs.rules ?? []),
(val) => { (val) => {
const { maxlength } = vnInputRef.value; const maxlength = $props.maxlength;
if (maxlength && +val.length > maxlength) if (maxlength && +val.length > maxlength)
return t(`maxLength`, { value: maxlength }); return t(`maxLength`, { value: maxlength });
const { min, max } = vnInputRef.value.$attrs; const { min, max } = vnInputRef.value.$attrs;
@ -108,7 +108,7 @@ const handleInsertMode = (e) => {
e.preventDefault(); e.preventDefault();
const input = e.target; const input = e.target;
const cursorPos = input.selectionStart; const cursorPos = input.selectionStart;
const { maxlength } = vnInputRef.value; const maxlength = $props.maxlength;
let currentValue = value.value; let currentValue = value.value;
if (!currentValue) currentValue = e.key; if (!currentValue) currentValue = e.key;
const newValue = e.key; const newValue = e.key;
@ -143,7 +143,7 @@ const handleUppercase = () => {
:rules="mixinRules" :rules="mixinRules"
:lazy-rules="true" :lazy-rules="true"
hide-bottom-space hide-bottom-space
:data-cy="$attrs.dataCy ?? $attrs.label + '_input'" :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_input'"
> >
<template #prepend v-if="$slots.prepend"> <template #prepend v-if="$slots.prepend">
<slot name="prepend" /> <slot name="prepend" />

View File

@ -302,6 +302,8 @@ defineExpose({ opts: myOptions, vnSelectRef });
function handleKeyDown(event) { function handleKeyDown(event) {
if (event.key === 'Tab' && !event.shiftKey) { if (event.key === 'Tab' && !event.shiftKey) {
event.preventDefault();
const inputValue = vnSelectRef.value?.inputValue; const inputValue = vnSelectRef.value?.inputValue;
if (inputValue) { if (inputValue) {

View File

@ -132,7 +132,8 @@ const card = toRef(props, 'item');
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 4px; gap: 4px;
white-space: nowrap;
width: 192px;
p { p {
margin-bottom: 0; margin-bottom: 0;
} }

View File

@ -18,12 +18,7 @@ import VnInput from 'components/common/VnInput.vue';
const emit = defineEmits(['onFetch']); const emit = defineEmits(['onFetch']);
const originalAttrs = useAttrs(); const $attrs = useAttrs();
const $attrs = computed(() => {
const { style, ...rest } = originalAttrs;
return rest;
});
const isRequired = computed(() => { const isRequired = computed(() => {
return Object.keys($attrs).includes('required'); return Object.keys($attrs).includes('required');

View File

@ -245,7 +245,7 @@ export function useArrayData(key, userOptions) {
async function loadMore() { async function loadMore() {
if (!store.hasMoreData) return; if (!store.hasMoreData) return;
store.skip = store.limit * store.page; store.skip = (store?.filter?.limit ?? store.limit) * store.page;
store.page += 1; store.page += 1;
await fetch({ append: true }); await fetch({ append: true });

View File

@ -369,6 +369,7 @@ globals:
countryFk: Country countryFk: Country
countryCodeFk: Country countryCodeFk: Country
companyFk: Company companyFk: Company
nickname: Alias
model: Model model: Model
fuel: Fuel fuel: Fuel
active: Active active: Active

View File

@ -370,6 +370,7 @@ globals:
countryFk: País countryFk: País
countryCodeFk: País countryCodeFk: País
companyFk: Empresa companyFk: Empresa
nickname: Alias
errors: errors:
statusUnauthorized: Acceso denegado statusUnauthorized: Acceso denegado
statusInternalServerError: Ha ocurrido un error interno del servidor statusInternalServerError: Ha ocurrido un error interno del servidor

View File

@ -210,6 +210,7 @@ function onDrag() {
class="all-pointer-events absolute delete-button zindex" class="all-pointer-events absolute delete-button zindex"
@click.stop="viewDeleteDms(index)" @click.stop="viewDeleteDms(index)"
round round
:data-cy="`delete-button-${index+1}`"
/> />
<QIcon <QIcon
name="play_circle" name="play_circle"
@ -227,6 +228,7 @@ function onDrag() {
class="rounded-borders cursor-pointer fit" class="rounded-borders cursor-pointer fit"
@click="openDialog(media.dmsFk)" @click="openDialog(media.dmsFk)"
v-if="!media.isVideo" v-if="!media.isVideo"
:data-cy="`file-${index+1}`"
> >
</QImg> </QImg>
<video <video
@ -235,6 +237,7 @@ function onDrag() {
muted="muted" muted="muted"
v-if="media.isVideo" v-if="media.isVideo"
@click="openDialog(media.dmsFk)" @click="openDialog(media.dmsFk)"
:data-cy="`file-${index+1}`"
/> />
</QCard> </QCard>
</div> </div>

View File

@ -118,14 +118,6 @@ const debtWarning = computed(() => {
> >
<QTooltip>{{ t('Allowed substitution') }}</QTooltip> <QTooltip>{{ t('Allowed substitution') }}</QTooltip>
</QIcon> </QIcon>
<QIcon
v-if="customer?.isFreezed"
name="vn:frozen"
size="xs"
color="primary"
>
<QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
</QIcon>
<QIcon <QIcon
v-if="!entity.account?.active" v-if="!entity.account?.active"
color="primary" color="primary"
@ -150,6 +142,14 @@ const debtWarning = computed(() => {
> >
<QTooltip>{{ t('customer.card.notChecked') }}</QTooltip> <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
</QIcon> </QIcon>
<QIcon
v-if="entity?.isFreezed"
name="vn:frozen"
size="xs"
color="primary"
>
<QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
</QIcon>
<QBtn <QBtn
v-if="entity.unpaid" v-if="entity.unpaid"
flat flat
@ -163,13 +163,13 @@ const debtWarning = computed(() => {
<br /> <br />
{{ {{
t('unpaidDated', { t('unpaidDated', {
dated: toDate(customer.unpaid?.dated), dated: toDate(entity.unpaid?.dated),
}) })
}} }}
<br /> <br />
{{ {{
t('unpaidAmount', { t('unpaidAmount', {
amount: toCurrency(customer.unpaid?.amount), amount: toCurrency(entity.unpaid?.amount),
}) })
}} }}
</QTooltip> </QTooltip>

View File

@ -17,7 +17,15 @@ describe('getAddresses', () => {
expect(axios.get).toHaveBeenCalledWith(`Clients/${clientId}/addresses`, { expect(axios.get).toHaveBeenCalledWith(`Clients/${clientId}/addresses`, {
params: { params: {
filter: JSON.stringify({ filter: JSON.stringify({
fields: ['nickname', 'street', 'city', 'id', 'isActive'], include: [
{
relation: 'client',
scope: {
fields: ['defaultAddressFk'],
},
},
],
fields: ['nickname', 'street', 'city', 'id', 'isActive', 'clientFk'],
where: { isActive: true }, where: { isActive: true },
order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'], order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
}), }),

View File

@ -4,7 +4,15 @@ export async function getAddresses(clientId, _filter = {}) {
if (!clientId) return; if (!clientId) return;
const filter = { const filter = {
..._filter, ..._filter,
fields: ['nickname', 'street', 'city', 'id', 'isActive'], include: [
{
relation: 'client',
scope: {
fields: ['defaultAddressFk'],
},
},
],
fields: ['nickname', 'street', 'city', 'id', 'isActive', 'clientFk'],
where: { isActive: true }, where: { isActive: true },
order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'], order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
}; };

View File

@ -145,6 +145,7 @@ const entryFilterPanel = ref();
v-model="params.agencyModeId" v-model="params.agencyModeId"
@update:model-value="searchFn()" @update:model-value="searchFn()"
url="AgencyModes" url="AgencyModes"
sort-by="name ASC"
:fields="['id', 'name']" :fields="['id', 'name']"
hide-selected hide-selected
dense dense

View File

@ -94,6 +94,7 @@ const submit = async (rows) => {
icon="add_circle" icon="add_circle"
v-shortcut="'+'" v-shortcut="'+'"
flat flat
data-cy="addBarcode_input"
> >
<QTooltip> <QTooltip>
{{ t('Add barcode') }} {{ t('Add barcode') }}

View File

@ -226,7 +226,6 @@ const onDenyAccept = (_, responseData) => {
order="shipped ASC, isOk ASC" order="shipped ASC, isOk ASC"
:columns="columns" :columns="columns"
:user-params="userParams" :user-params="userParams"
:is-editable="true"
:right-search="false" :right-search="false"
auto-load auto-load
:disable-option="{ card: true }" :disable-option="{ card: true }"

View File

@ -17,6 +17,7 @@ import MonitorTicketFilter from './MonitorTicketFilter.vue';
import TicketProblems from 'src/components/TicketProblems.vue'; import TicketProblems from 'src/components/TicketProblems.vue';
import VnDateBadge from 'src/components/common/VnDateBadge.vue'; import VnDateBadge from 'src/components/common/VnDateBadge.vue';
import { useStateStore } from 'src/stores/useStateStore'; import { useStateStore } from 'src/stores/useStateStore';
import useOpenURL from 'src/composables/useOpenURL';
const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000; const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000;
const { t } = useI18n(); const { t } = useI18n();
@ -321,8 +322,7 @@ const totalPriceColor = (ticket) => {
if (total > 0 && total < 50) return 'warning'; if (total > 0 && total < 50) return 'warning';
}; };
const openTab = (id) => const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
window.open(`#/ticket/${id}/sale`, '_blank', 'noopener, noreferrer');
</script> </script>
<template> <template>
<FetchData <FetchData
@ -397,6 +397,7 @@ const openTab = (id) =>
default-mode="table" default-mode="table"
auto-load auto-load
:row-click="({ id }) => openTab(id)" :row-click="({ id }) => openTab(id)"
:row-ctrl-click="(_, { id }) => openTab(id)"
:disable-option="{ card: true }" :disable-option="{ card: true }"
:user-params="{ from, to, scopeDays: 0 }" :user-params="{ from, to, scopeDays: 0 }"
> >

View File

@ -22,7 +22,7 @@ salesTicketsTable:
notVisible: Not visible notVisible: Not visible
purchaseRequest: Purchase request purchaseRequest: Purchase request
clientFrozen: Client frozen clientFrozen: Client frozen
risk: Risk risk: Excess risk
componentLack: Component lack componentLack: Component lack
tooLittle: Ticket too little tooLittle: Ticket too little
identifier: Identifier identifier: Identifier

View File

@ -22,7 +22,7 @@ salesTicketsTable:
notVisible: No visible notVisible: No visible
purchaseRequest: Petición de compra purchaseRequest: Petición de compra
clientFrozen: Cliente congelado clientFrozen: Cliente congelado
risk: Riesgo risk: Exceso de riesgo
componentLack: Faltan componentes componentLack: Faltan componentes
tooLittle: Ticket demasiado pequeño tooLittle: Ticket demasiado pequeño
identifier: Identificador identifier: Identificador

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { computed, ref, onMounted } from 'vue'; import { computed, ref, onMounted, watch } from 'vue';
import { dashIfEmpty, toCurrency, toDate } from 'src/filters'; import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
import { toDateTimeFormat } from 'src/filters/date'; import { toDateTimeFormat } from 'src/filters/date';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@ -16,6 +16,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
import VnInputDate from 'src/components/common/VnInputDate.vue'; import VnInputDate from 'src/components/common/VnInputDate.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import VnSection from 'src/components/common/VnSection.vue'; import VnSection from 'src/components/common/VnSection.vue';
import { getAddresses } from '../Customer/composables/getAddresses';
const { t } = useI18n(); const { t } = useI18n();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
@ -24,6 +25,11 @@ const agencyList = ref([]);
const route = useRoute(); const route = useRoute();
const addressOptions = ref([]); const addressOptions = ref([]);
const dataKey = 'OrderList'; const dataKey = 'OrderList';
const formInitialData = ref({
active: true,
addressId: null,
clientFk: null,
});
const columns = computed(() => [ const columns = computed(() => [
{ {
@ -147,32 +153,41 @@ const columns = computed(() => [
], ],
}, },
]); ]);
onMounted(() => { onMounted(async () => {
if (!route.query.createForm) return; if (!route.query) return;
const clientId = route.query.createForm; if (route.query?.createForm) {
const id = JSON.parse(clientId); const query = JSON.parse(route.query?.createForm);
fetchClientAddress(id.clientFk); formInitialData.value = query;
await onClientSelected({ ...formInitialData.value, clientId: query?.clientFk });
} else if (route.query?.table) {
const query = JSON.parse(route.query?.table);
const clientId = query?.clientFk;
if (clientId) await onClientSelected({ clientId });
}
if (tableRef.value) tableRef.value.create.formInitialData = formInitialData.value;
}); });
async function fetchClientAddress(id, formData = {}) { watch(
const { data } = await axios.get(`Clients/${id}/addresses`, { () => route.query.table,
params: { async (newValue) => {
filter: JSON.stringify({ if (newValue) {
include: [ const clientId = +JSON.parse(newValue)?.clientFk;
{ if (clientId) await onClientSelected({ clientId });
relation: 'client', if (tableRef.value)
scope: { tableRef.value.create.formInitialData = formInitialData.value;
fields: ['defaultAddressFk'], }
}, },
}, { immediate: true },
], );
order: ['isActive DESC'],
}), async function onClientSelected({ clientId: id }, formData = {}) {
}, const { data } = await getAddresses(id);
});
addressOptions.value = data; addressOptions.value = data;
formData.addressId = data[0].client.defaultAddressFk; formData.defaultAddressFk = data[0].client.defaultAddressFk;
fetchAgencies(formData); formData.addressId = formData.defaultAddressFk;
formInitialData.value = { addressId: formData.addressId, clientFk: id };
await fetchAgencies(formData);
} }
async function fetchAgencies({ landed, addressId }) { async function fetchAgencies({ landed, addressId }) {
@ -181,7 +196,7 @@ async function fetchAgencies({ landed, addressId }) {
const { data } = await axios.get('Agencies/landsThatDay', { const { data } = await axios.get('Agencies/landsThatDay', {
params: { params: {
filter: JSON.stringify({ filter: JSON.stringify({
order: ['agencyMode DESC', 'agencyModeFk ASC'], order: ['name ASC', 'agencyMode DESC', 'agencyModeFk ASC'],
}), }),
addressFk: addressId, addressFk: addressId,
landed, landed,
@ -224,11 +239,7 @@ const getDateColor = (date) => {
onDataSaved: (url) => { onDataSaved: (url) => {
tableRef.redirect(`${url}/catalog`); tableRef.redirect(`${url}/catalog`);
}, },
formInitialData: { formInitialData,
active: true,
addressId: null,
clientFk: null,
},
}" }"
:user-params="{ showEmpty: false }" :user-params="{ showEmpty: false }"
:columns="columns" :columns="columns"
@ -260,7 +271,7 @@ const getDateColor = (date) => {
:include="{ relation: 'addresses' }" :include="{ relation: 'addresses' }"
v-model="data.clientFk" v-model="data.clientFk"
:label="t('module.customer')" :label="t('module.customer')"
@update:model-value="(id) => fetchClientAddress(id, data)" @update:model-value="(id) => onClientSelected(id, data)"
> >
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">
@ -285,7 +296,22 @@ const getDateColor = (date) => {
@update:model-value="() => fetchAgencies(data)" @update:model-value="() => fetchAgencies(data)"
> >
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem
v-bind="scope.itemProps"
:class="{ disabled: !scope.opt.isActive }"
>
<QItemSection style="min-width: min-content" avatar>
<QIcon
v-if="
scope.opt.isActive &&
data.defaultAddressFk === scope.opt.id
"
size="sm"
color="grey"
name="star"
class="fill-icon"
/>
</QItemSection>
<QItemSection> <QItemSection>
<QItemLabel <QItemLabel
:class="{ :class="{
@ -313,6 +339,7 @@ const getDateColor = (date) => {
<VnInputDate <VnInputDate
v-model="data.landed" v-model="data.landed"
:label="t('module.landed')" :label="t('module.landed')"
data-cy="landedDate"
@update:model-value="() => fetchAgencies(data)" @update:model-value="() => fetchAgencies(data)"
/> />
<VnSelect <VnSelect

View File

@ -44,8 +44,7 @@ const exprBuilder = (param, value) => {
<template> <template>
<FetchData <FetchData
url="AgencyModes" url="AgencyModes"
:filter="{ fields: ['id', 'name'] }" :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
sort-by="name ASC"
@on-fetch="(data) => (agencyList = data)" @on-fetch="(data) => (agencyList = data)"
auto-load auto-load
/> />

View File

@ -1,14 +1,17 @@
<script setup> <script setup>
import VnPaginate from 'components/ui/VnPaginate.vue'; import { computed } from 'vue';
import CardList from 'components/ui/CardList.vue';
import VnLv from 'components/ui/VnLv.vue';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue'; import { useI18n } from 'vue-i18n';
import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import VnSection from 'src/components/common/VnSection.vue'; import VnSection from 'src/components/common/VnSection.vue';
import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
import ShelvingSummary from './Card/ShelvingSummary.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import exprBuilder from './ShelvingExprBuilder.js'; import exprBuilder from './ShelvingExprBuilder.js';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
const { t } = useI18n();
const router = useRouter(); const router = useRouter();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
const dataKey = 'ShelvingList'; const dataKey = 'ShelvingList';
@ -17,9 +20,56 @@ const filter = {
include: [{ relation: 'parking' }], include: [{ relation: 'parking' }],
}; };
function navigate(id) { const columns = computed(() => [
router.push({ path: `/shelving/${id}` }); {
} align: 'left',
name: 'code',
label: t('globals.code'),
isId: true,
isTitle: true,
columnFilter: false,
create: true,
},
{
align: 'left',
name: 'parking',
label: t('shelving.list.parking'),
sortable: true,
format: (val) => val?.code ?? '',
cardVisible: true,
},
{
align: 'left',
name: 'priority',
label: t('shelving.list.priority'),
sortable: true,
cardVisible: true,
create: true,
},
{
align: 'left',
name: 'isRecyclable',
label: t('shelving.summary.recyclable'),
sortable: true,
},
{
align: 'right',
label: '',
name: 'tableActions',
actions: [
{
title: t('components.smartCard.viewSummary'),
icon: 'preview',
action: (row) => viewSummary(row.id, ShelvingSummary),
isPrimary: true,
},
],
},
]);
const onDataSaved = ({ id }) => {
router.push({ name: 'ShelvingBasicData', params: { id } });
};
</script> </script>
<template> <template>
@ -37,48 +87,75 @@ function navigate(id) {
<ShelvingFilter data-key="ShelvingList" /> <ShelvingFilter data-key="ShelvingList" />
</template> </template>
<template #body> <template #body>
<QPage class="column items-center q-pa-md"> <VnTable
<div class="vn-card-list"> :data-key="dataKey"
<VnPaginate :data-key="dataKey"> :columns="columns"
<template #body="{ rows }"> is-editable="false"
<CardList :right-search="false"
v-for="row of rows" :use-model="true"
:key="row.id" :disable-option="{ table: true }"
:id="row.id" redirect="shelving"
:title="row.code" default-mode="card"
@click="navigate(row.id)" :create="{
> urlCreate: 'Shelvings',
<template #list-items> title: t('globals.pageTitles.shelvingCreate'),
<VnLv onDataSaved,
:label="$t('shelving.list.parking')" formInitialData: {
:title-label="$t('shelving.list.parking')" parkingFk: null,
:value="row.parking?.code" priority: null,
/> code: '',
<VnLv isRecyclable: false,
:label="$t('shelving.list.priority')" },
:value="row?.priority" }"
/> >
</template> <template #more-create-dialog="{ data }">
<template #actions> <VnSelect
<QBtn v-model="data.parkingFk"
:label="$t('components.smartCard.openSummary')" url="Parkings"
@click.stop="viewSummary(row.id, ShelvingSummary)" option-value="id"
color="primary" option-label="code"
/> :label="t('shelving.list.parking')"
</template> :filter-options="['id', 'code']"
</CardList> :fields="['id', 'code']"
</template> />
</VnPaginate> <VnCheckbox
</div> v-model="data.isRecyclable"
<QPageSticky :offset="[20, 20]"> :label="t('shelving.summary.recyclable')"
<RouterLink :to="{ name: 'ShelvingCreate' }"> />
<QBtn fab icon="add" color="primary" v-shortcut="'+'" /> </template>
<QTooltip> </VnTable>
{{ $t('shelving.list.newShelving') }}
</QTooltip>
</RouterLink>
</QPageSticky>
</QPage>
</template> </template>
</VnSection> </VnSection>
</template> </template>
<style lang="scss" scoped>
.list {
display: flex;
flex-direction: column;
align-items: center;
width: 55%;
}
.list-container {
display: flex;
justify-content: center;
}
</style>
<i18n>
es:
shelving:
list:
parking: Estacionamiento
priority: Prioridad
summary:
recyclable: Reciclable
en:
shelving:
list:
parking: Parking
priority: Priority
summary:
recyclable: Recyclable
</i18n>

View File

@ -11,6 +11,11 @@ export default {
'isSerious', 'isSerious',
'isTrucker', 'isTrucker',
'account', 'account',
'workerFk',
'note',
'isReal',
'isPayMethodChecked',
'companySize',
], ],
include: [ include: [
{ {

View File

@ -108,7 +108,6 @@ function handleLocation(data, location) {
<VnAccountNumber <VnAccountNumber
v-model="data.account" v-model="data.account"
:label="t('supplier.fiscalData.account')" :label="t('supplier.fiscalData.account')"
clearable
data-cy="supplierFiscalDataAccount" data-cy="supplierFiscalDataAccount"
insertable insertable
:maxlength="10" :maxlength="10"
@ -185,8 +184,8 @@ function handleLocation(data, location) {
/> />
<VnCheckbox <VnCheckbox
v-model="data.isVies" v-model="data.isVies"
:label="t('globals.isVies')" :label="t('globals.isVies')"
:info="t('whenActivatingIt')" :info="t('whenActivatingIt')"
/> />
</div> </div>
</VnRow> </VnRow>

View File

@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import VnSection from 'src/components/common/VnSection.vue'; import VnSection from 'src/components/common/VnSection.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 FetchData from 'src/components/FetchData.vue'; import FetchData from 'src/components/FetchData.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import SupplierSummary from './Card/SupplierSummary.vue'; import SupplierSummary from './Card/SupplierSummary.vue';
@ -53,7 +52,7 @@ const columns = computed(() => [
label: t('globals.alias'), label: t('globals.alias'),
name: 'alias', name: 'alias',
columnFilter: { columnFilter: {
name: 'search', name: 'nickname',
}, },
cardVisible: true, cardVisible: true,
}, },
@ -120,6 +119,21 @@ const columns = computed(() => [
], ],
}, },
]); ]);
const filterColumns = computed(() => {
const copy = [...columns.value];
copy.splice(copy.length - 1, 0, {
align: 'left',
label: t('globals.params.provinceFk'),
name: 'provinceFk',
options: provincesOptions.value,
columnFilter: {
component: 'select',
},
});
return copy;
});
</script> </script>
<template> <template>
<FetchData <FetchData
@ -130,7 +144,7 @@ const columns = computed(() => [
/> />
<VnSection <VnSection
:data-key="dataKey" :data-key="dataKey"
:columns="columns" :columns="filterColumns"
prefix="supplier" prefix="supplier"
:array-data-props="{ :array-data-props="{
url: 'Suppliers/filter', url: 'Suppliers/filter',
@ -165,17 +179,6 @@ const columns = computed(() => [
</template> </template>
</VnTable> </VnTable>
</template> </template>
<template #moreFilterPanel="{ params, searchFn }">
<VnSelect
:label="t('globals.params.provinceFk')"
v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provincesOptions"
filled
dense
class="q-px-sm q-pr-lg"
/>
</template>
</VnSection> </VnSection>
</template> </template>

View File

@ -93,9 +93,9 @@ function ticketFilter(ticket) {
<VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" /> <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
<VnLv :label="t('globals.alias')" :value="entity.nickname" /> <VnLv :label="t('globals.alias')" :value="entity.nickname" />
</template> </template>
<template #icons> <template #icons="{ entity }">
<QCardActions class="q-gutter-x-xs"> <QCardActions class="q-gutter-x-xs">
<TicketProblems :row="problems" /> <TicketProblems :row="{ ...entity?.client, ...problems }" />
</QCardActions> </QCardActions>
</template> </template>
<template #actions="{ entity }"> <template #actions="{ entity }">

View File

@ -37,7 +37,6 @@ const expeditionStateTypes = ref([]);
const expeditionsFilter = computed(() => ({ const expeditionsFilter = computed(() => ({
where: { ticketFk: route.params.id }, where: { ticketFk: route.params.id },
order: ['created DESC'],
})); }));
const ticketArrayData = useArrayData('Ticket'); const ticketArrayData = useArrayData('Ticket');
@ -325,6 +324,7 @@ onMounted(async () => {
" "
:redirect="false" :redirect="false"
order="created DESC" order="created DESC"
:filter="expeditionsFilter"
> >
<template #column-freightItemName="{ row }"> <template #column-freightItemName="{ row }">
<span class="link" @click.stop> <span class="link" @click.stop>

View File

@ -681,6 +681,17 @@ watch(
:disabled-attr="isTicketEditable" :disabled-attr="isTicketEditable"
> >
<template #column-statusIcons="{ row }"> <template #column-statusIcons="{ row }">
<QIcon
v-if="row.saleGroupFk"
name="inventory_2"
size="xs"
color="primary"
class="cursor-pointer"
>
<QTooltip class="no-pointer-events">
{{ `saleGroup: ${row.saleGroupFk}` }}
</QTooltip>
</QIcon>
<TicketProblems :row="row" /> <TicketProblems :row="row" />
</template> </template>
<template #body-cell-picture="{ row }"> <template #body-cell-picture="{ row }">
@ -740,7 +751,7 @@ watch(
{{ row?.item?.subName.toUpperCase() }} {{ row?.item?.subName.toUpperCase() }}
</div> </div>
</div> </div>
<FetchedTags :item="row" :max-length="6" /> <FetchedTags :item="row.item" :max-length="6" />
<QPopupProxy v-if="row.id && isTicketEditable"> <QPopupProxy v-if="row.id && isTicketEditable">
<VnInput <VnInput
v-model="row.concept" v-model="row.concept"

View File

@ -48,7 +48,7 @@ const getGroupedStates = (data) => {
/> />
<FetchData <FetchData
url="AgencyModes" url="AgencyModes"
:sort-by="['name ASC']" :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
@on-fetch="(data) => (agencies = data)" @on-fetch="(data) => (agencies = data)"
auto-load auto-load
/> />
@ -256,8 +256,6 @@ const getGroupedStates = (data) => {
v-model="params.agencyModeFk" v-model="params.agencyModeFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
:options="agencies" :options="agencies"
option-value="id"
option-label="name"
emit-value emit-value
map-options map-options
use-input use-input

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import axios from 'axios'; import axios from 'axios';
import { computed, ref, onBeforeMount, watch } from 'vue'; import { computed, ref, onBeforeMount, watch, onMounted } from 'vue';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
@ -51,10 +51,21 @@ const userParams = {
onBeforeMount(() => { onBeforeMount(() => {
initializeFromQuery(); initializeFromQuery();
stateStore.rightDrawer = true; stateStore.rightDrawer = true;
if (!route.query.createForm) return; });
onClientSelected(JSON.parse(route.query.createForm)); onMounted(async () => {
if (!route.query) return;
if (route.query?.createForm) {
formInitialData.value = JSON.parse(route.query?.createForm);
await onClientSelected(formInitialData.value);
} else if (route.query?.table) {
const query = route.query?.table;
const clientId = +JSON.parse(query)?.clientFk;
if (clientId) await onClientSelected({ clientId });
}
if (tableRef.value) tableRef.value.create.formInitialData = formInitialData.value;
}); });
const initializeFromQuery = () => { const initializeFromQuery = () => {
if (!route) return;
const query = route.query.table ? JSON.parse(route.query.table) : {}; const query = route.query.table ? JSON.parse(route.query.table) : {};
from.value = query.from || from.toISOString(); from.value = query.from || from.toISOString();
to.value = query.to || to.toISOString(); to.value = query.to || to.toISOString();
@ -69,7 +80,6 @@ const companiesOptions = ref([]);
const accountingOptions = ref([]); const accountingOptions = ref([]);
const amountToReturn = ref(); const amountToReturn = ref();
const dataKey = 'TicketList'; const dataKey = 'TicketList';
const filterPanelRef = ref(null);
const formInitialData = ref({}); const formInitialData = ref({});
const columns = computed(() => [ const columns = computed(() => [
@ -251,7 +261,32 @@ const columns = computed(() => [
], ],
}, },
]); ]);
const onClientSelected = async (formData) => {
resetAgenciesSelector(formData);
await fetchAddresses(formData);
};
const fetchAddresses = async (formData) => {
const { data } = await getAddresses(formData.clientId);
formInitialData.value = { clientId: formData.clientId };
if (!data) return;
addressesOptions.value = data;
selectedClient.value = data[0].client;
formData.addressId = selectedClient.value.defaultAddressFk;
formInitialData.value.addressId = formData.addressId;
};
watch(
() => route.query.table,
async (newValue) => {
if (newValue) {
const clientId = +JSON.parse(newValue)?.clientFk;
if (clientId) await onClientSelected({ clientId });
if (tableRef.value)
tableRef.value.create.formInitialData = formInitialData.value;
}
},
{ immediate: true },
);
function resetAgenciesSelector(formData) { function resetAgenciesSelector(formData) {
agenciesOptions.value = []; agenciesOptions.value = [];
if (formData) formData.agencyModeId = null; if (formData) formData.agencyModeId = null;
@ -262,12 +297,6 @@ function redirectToLines(id) {
window.open(url, '_blank'); window.open(url, '_blank');
} }
const onClientSelected = async (formData) => {
resetAgenciesSelector(formData);
await fetchClient(formData);
await fetchAddresses(formData);
};
const fetchAvailableAgencies = async (formData) => { const fetchAvailableAgencies = async (formData) => {
resetAgenciesSelector(formData); resetAgenciesSelector(formData);
const response = await getAgencies(formData, selectedClient.value); const response = await getAgencies(formData, selectedClient.value);
@ -278,22 +307,6 @@ const fetchAvailableAgencies = async (formData) => {
if (agency) formData.agencyModeId = agency.agencyModeFk; if (agency) formData.agencyModeId = agency.agencyModeFk;
}; };
const fetchClient = async (formData) => {
const response = await getClient(formData.clientId);
if (!response) return;
const [client] = response.data;
selectedClient.value = client;
};
const fetchAddresses = async (formData) => {
const response = await getAddresses(formData.clientId);
if (!response) return;
addressesOptions.value = response.data;
const { defaultAddress } = selectedClient.value;
formData.addressId = defaultAddress.id;
};
const getColor = (row) => { const getColor = (row) => {
if (row.alertLevelCode === 'OK') return 'bg-success'; if (row.alertLevelCode === 'OK') return 'bg-success';
else if (row.alertLevelCode === 'FREE') return 'bg-notice'; else if (row.alertLevelCode === 'FREE') return 'bg-notice';
@ -445,22 +458,6 @@ function setReference(data) {
dialogData.value.value.description = newDescription; dialogData.value.value.description = newDescription;
} }
watch(
() => route.query.table,
(newValue) => {
if (newValue) {
const clientId = +JSON.parse(newValue)?.clientFk;
if (!clientId) return;
formInitialData.value = {
clientId,
};
if (tableRef.value) tableRef.value.create.formInitialData = { clientId };
onClientSelected({ clientId });
}
},
{ immediate: true },
);
</script> </script>
<template> <template>

View File

@ -73,6 +73,7 @@ warehouses();
/> />
<FetchData <FetchData
url="AgencyModes" url="AgencyModes"
:filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
@on-fetch="(data) => (agenciesOptions = data)" @on-fetch="(data) => (agenciesOptions = data)"
auto-load auto-load
/> />

View File

@ -39,6 +39,7 @@ const redirectToTravelBasicData = (_, { id }) => {
<template> <template>
<FetchData <FetchData
url="AgencyModes" url="AgencyModes"
:filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
@on-fetch="(data) => (agenciesOptions = data)" @on-fetch="(data) => (agenciesOptions = data)"
auto-load auto-load
/> />

View File

@ -52,9 +52,8 @@ defineExpose({ states });
v-model="params.agencyModeFk" v-model="params.agencyModeFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
url="agencyModes" url="agencyModes"
sort-by="name ASC"
:use-like="false" :use-like="false"
option-value="id"
option-label="name"
option-filter="name" option-filter="name"
dense dense
outlined outlined

View File

@ -343,19 +343,29 @@ const updateData = async () => {
const getMailStates = async (date) => { const getMailStates = async (date) => {
const url = `WorkerTimeControls/${route.params.id}/getMailStates`; const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
const year = date.getFullYear();
const month = date.getMonth() + 1; const month = date.getMonth() + 1;
const prevMonth = month == 1 ? 12 : month - 1;
const params = { const getMonthStates = async (month, year) => {
month, return (await axios.get(url, { params: { month, year } })).data;
year: date.getFullYear(),
}; };
const curMonthStates = (await axios.get(url, { params })).data; const curMonthStates = await getMonthStates(month, year);
const prevMonthStates = (
await axios.get(url, { params: { ...params, month: prevMonth } })
).data;
workerTimeControlMails.value = curMonthStates.concat(prevMonthStates); const prevMonthStates = await getMonthStates(
month === 1 ? 12 : month - 1,
month === 1 ? year - 1 : year,
);
const postMonthStates = await getMonthStates(
month === 12 ? 1 : month + 1,
month === 12 ? year + 1 : year,
);
workerTimeControlMails.value = [
...curMonthStates,
...prevMonthStates,
...postMonthStates,
];
}; };
const showWorkerTimeForm = (propValue, formType) => { const showWorkerTimeForm = (propValue, formType) => {

View File

@ -9,22 +9,22 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
const { t } = useI18n(); const { t } = useI18n();
const validAddresses = ref([]);
const addresses = ref([]); const addresses = ref([]);
const setFilteredAddresses = (data) => { const setFilteredAddresses = (data) => {
const validIds = new Set(validAddresses.value.map((item) => item.addressFk)); addresses.value = data.map(({ address }) => address);
addresses.value = data.filter((address) => validIds.has(address.id));
}; };
</script> </script>
<template> <template>
<FetchData <FetchData
url="RoadmapAddresses" url="RoadmapAddresses"
:filter="{
include: { relation: 'address' },
}"
auto-load auto-load
@on-fetch="(data) => (validAddresses = data)" @on-fetch="setFilteredAddresses"
/> />
<FetchData url="Addresses" auto-load @on-fetch="setFilteredAddresses" />
<FormModel auto-load model="Zone"> <FormModel auto-load model="Zone">
<template #form="{ data, validate }"> <template #form="{ data, validate }">
<VnRow> <VnRow>
@ -120,12 +120,10 @@ const setFilteredAddresses = (data) => {
option-label="nickname" option-label="nickname"
:options="addresses" :options="addresses"
:fields="['id', 'nickname']" :fields="['id', 'nickname']"
sort-by="id" sort-by="nickname ASC"
hide-selected hide-selected
map-options map-options
:rules="validate('data.addressFk')" :rules="validate('data.addressFk')"
:filter-options="['id']"
:where="filterWhere"
/> />
</VnRow> </VnRow>
<VnRow> <VnRow>

View File

@ -5,6 +5,7 @@ import VnInput from 'components/common/VnInput.vue';
import FetchData from 'components/FetchData.vue'; import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelect from 'components/common/VnSelect.vue'; import VnSelect from 'components/common/VnSelect.vue';
import order from 'src/router/modules/order';
const { t } = useI18n(); const { t } = useI18n();
const props = defineProps({ const props = defineProps({
@ -24,7 +25,7 @@ const agencies = ref([]);
<template> <template>
<FetchData <FetchData
url="AgencyModes" url="AgencyModes"
:filter="{ fields: ['id', 'name'] }" :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
@on-fetch="(data) => (agencies = data)" @on-fetch="(data) => (agencies = data)"
auto-load auto-load
/> />

View File

@ -199,9 +199,8 @@ function formatRow(row) {
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<VnSelect <VnSelect
url="AgencyModes" url="AgencyModes"
sort-by="name ASC"
v-model="data.agencyModeFk" v-model="data.agencyModeFk"
option-value="id"
option-label="name"
:label="t('list.agency')" :label="t('list.agency')"
/> />
<VnInput <VnInput

View File

@ -111,15 +111,6 @@ export default {
shelvingCard, shelvingCard,
], ],
}, },
{
path: 'create',
name: 'ShelvingCreate',
meta: {
title: 'shelvingCreate',
icon: 'add',
},
component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
},
{ {
path: 'parking', path: 'parking',
name: 'ParkingMain', name: 'ParkingMain',

View File

@ -1,6 +1,6 @@
/// <reference types="cypress" /> /// <reference types="cypress" />
// redmine.verdnatura.es/issues/8417 describe('ClaimPhoto', () => {
describe.skip('ClaimPhoto', () => { const carrouselClose = '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon';
beforeEach(() => { beforeEach(() => {
const claimId = 1; const claimId = 1;
cy.login('developer'); cy.login('developer');
@ -16,6 +16,7 @@ describe.skip('ClaimPhoto', () => {
}); });
it('should add new file with drag and drop', () => { it('should add new file with drag and drop', () => {
cy.get('.container').should('be.visible').and('exist');
cy.get('.container').selectFile('test/cypress/fixtures/image.jpg', { cy.get('.container').selectFile('test/cypress/fixtures/image.jpg', {
action: 'drag-drop', action: 'drag-drop',
}); });
@ -23,33 +24,23 @@ describe.skip('ClaimPhoto', () => {
}); });
it('should open first image dialog change to second and close', () => { it('should open first image dialog change to second and close', () => {
cy.get(':nth-last-child(1) > .q-card').click(); cy.dataCy('file-1').click();
cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should( cy.get(carrouselClose).click();
'be.visible',
);
cy.get('.q-carousel__control > button').click(); cy.dataCy('file-1').click();
cy.get('.q-carousel__control > button').as('nextButton').click();
cy.get( cy.get('.q-carousel__slide > .q-ma-none').should('be.visible');
'.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon', cy.get(carrouselClose).click();
).click();
cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
'not.be.visible',
);
}); });
it('should remove third and fourth file', () => { it('should remove third and fourth file', () => {
cy.get( cy.dataCy('delete-button-4').click();
'.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
).click();
cy.get( cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block', '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
).click(); ).click();
cy.get('.q-notification__message').should('have.text', 'Data deleted'); cy.get('.q-notification__message').should('have.text', 'Data deleted');
cy.get( cy.dataCy('delete-button-3').click();
'.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
).click();
cy.get( cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block', '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
).click(); ).click();

View File

@ -17,7 +17,6 @@ describe('InvoiceOut summary', () => {
cy.login('developer'); cy.login('developer');
cy.visit(`/#/invoice-out/1/summary`); cy.visit(`/#/invoice-out/1/summary`);
}); });
it('open the descriptors', () => { it('open the descriptors', () => {
cy.get(firstRowDescriptors(1)).click(); cy.get(firstRowDescriptors(1)).click();
cy.get('.descriptor').should('be.visible'); cy.get('.descriptor').should('be.visible');
@ -35,7 +34,6 @@ describe('InvoiceOut summary', () => {
it('should open the ticket list', () => { it('should open the ticket list', () => {
cy.get(toTicketList).click(); cy.get(toTicketList).click();
cy.get('.descriptor').should('be.visible');
cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111'); cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
}); });

View File

@ -3,23 +3,22 @@ describe('ItemBarcodes', () => {
beforeEach(() => { beforeEach(() => {
cy.viewport(1920, 1080); cy.viewport(1920, 1080);
cy.login('developer'); cy.login('developer');
cy.visit(`/#/item/list`); cy.visit(`/#/item/1/barcode`);
cy.typeSearchbar('1{enter}');
}); });
it('should throw an error if the barcode exists', () => { it('should throw an error if the barcode exists', () => {
cy.get('[href="#/item/1/barcode"]').click(); newBarcode('1111111111');
cy.get('.q-card > .q-btn > .q-btn__content > .q-icon').click();
cy.dataCy('Code_input').eq(3).type('1111111111');
cy.dataCy('crudModelDefaultSaveBtn').click();
cy.checkNotification('Codes can not be repeated'); cy.checkNotification('Codes can not be repeated');
}); });
it('should create a new barcode', () => { it('should create a new barcode', () => {
cy.get('[href="#/item/1/barcode"]').click(); newBarcode('1231231231');
cy.get('.q-card > .q-btn > .q-btn__content > .q-icon').click();
cy.dataCy('Code_input').eq(3).type('1231231231');
cy.dataCy('crudModelDefaultSaveBtn').click();
cy.checkNotification('Data saved'); cy.checkNotification('Data saved');
}); });
function newBarcode(text) {
cy.dataCy('addBarcode_input').click();
cy.dataCy('Code_input').eq(3).should('exist').type(text);
cy.dataCy('crudModelDefaultSaveBtn').click();
}
}); });

View File

@ -0,0 +1,31 @@
/// <reference types="cypress" />
describe('OrderList', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit('/#/order/list');
});
it('create order', () => {
/* ==== Generated with Cypress Studio ==== */
cy.get('[data-cy="vnTableCreateBtn"]').click();
cy.get('[data-cy="Client_select"]').type('1101');
cy.get('.q-menu').contains('Bruce Wayne').click();
cy.get('[data-cy="Address_select"]').click();
cy.get(
'.q-menu > div> div.q-item:nth-child(1) >div.q-item__section--avatar > i',
).should('have.text', 'star');
cy.get('.q-menu > div> .q-item:nth-child(1)').click();
cy.dataCy('landedDate').find('input').type('06/01/2001');
cy.get('.q-card [data-cy="Agency_select"]').click();
cy.get('.q-menu > div> .q-item:nth-child(1)').click();
cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
cy.wait('@orderSale');
cy.get('.q-item > .q-item__label.subtitle').then((text) => {
const id = text.text().trim().split('#')[1];
cy.get('.q-item > .q-item__label').should('have.text', ` #${id}`);
});
cy.url().should('include', `/order`);
});
});

View File

@ -1,7 +1,7 @@
/// <reference types="cypress" /> /// <reference types="cypress" />
describe('ParkingList', () => { describe('ParkingList', () => {
const searchbar = '#searchbar input'; const searchbar = '#searchbar input';
const firstCard = ':nth-child(1) > .q-card > .no-margin > .q-py-none'; const firstCard = ':nth-child(1) > .q-card > .no-margin > .q-py-none';
const summaryHeader = '.summaryBody .header'; const summaryHeader = '.summaryBody .header';
beforeEach(() => { beforeEach(() => {

View File

@ -0,0 +1,24 @@
/// <reference types="cypress" />
describe('ShelvingList', () => {
const parking =
'.q-card > :nth-child(1) > .q-select > .q-field__inner > .q-field__control > .q-field__control-container';
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
cy.visit(`/#/shelving/1/basic-data`);
});
it('should give an error if the code aldready exists', () => {
cy.dataCy('Code_input').should('exist').clear().type('AA7');
cy.saveCard();
cy.get('.q-notification__message').should('have.text', 'The code already exists');
});
it('should edit the data and save', () => {
cy.selectOption(parking, 'P-01-1');
cy.dataCy('Code_input').clear().type('AA1');
cy.dataCy('Priority_input').clear().type('10');
cy.get(':nth-child(2) > .q-checkbox > .q-checkbox__inner').click();
cy.saveCard();
cy.get('.q-notification__message').should('have.text', 'Data saved');
});
});

View File

@ -0,0 +1,41 @@
/// <reference types="cypress" />
describe('ShelvingList', () => {
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
cy.visit(`/#/shelving/list`);
});
it('should redirect on clicking a shelving', () => {
cy.typeSearchbar('{enter}');
cy.dataCy('cardBtn').eq(0).click();
cy.get('.summaryHeader > .header > .q-icon').click();
cy.url().should('include', '/shelving/1/summary');
});
it('should redirect from preview to basic-data', () => {
cy.typeSearchbar('{enter}');
cy.dataCy('cardBtn').eq(0).click();
cy.get('.q-card > .header').click();
cy.url().should('include', '/shelving/1/basic-data');
});
it('should filter and redirect if only one result', () => {
cy.selectOption('[data-cy="Parking_select"]', 'P-02-2');
cy.dataCy('Parking_select').type('{enter}');
cy.url().should('match', /\/shelving\/\d+\/summary/);
});
it('should create a new shelving', () => {
cy.dataCy('vnTableCreateBtn').click();
cy.dataCy('code-create-popup').type('Test');
cy.dataCy('Priority_input').type('10');
cy.selectOption(
'.grid-create > .q-select > .q-field__inner > .q-field__control > .q-field__control-container',
'100-01',
);
cy.dataCy('FormModelPopup_save').click();
cy.checkNotification('Data created');
cy.url().should('match', /\/shelving\/\d+\/basic-data/);
});
});

View File

@ -1,5 +1,5 @@
/// <reference types="cypress" /> /// <reference types="cypress" />
describe('TicketList', () => { describe.only('TicketList', () => {
const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)'; const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
beforeEach(() => { beforeEach(() => {
@ -68,7 +68,7 @@ describe('TicketList', () => {
cy.url().should('match', /\/ticket\/\d+\/summary/); cy.url().should('match', /\/ticket\/\d+\/summary/);
}); });
it('should show the corerct problems', () => { it('should show the correct problems', () => {
cy.intercept('GET', '**/api/Tickets/filter*', (req) => { cy.intercept('GET', '**/api/Tickets/filter*', (req) => {
req.headers['cache-control'] = 'no-cache'; req.headers['cache-control'] = 'no-cache';
req.headers['pragma'] = 'no-cache'; req.headers['pragma'] = 'no-cache';

View File

@ -182,14 +182,17 @@ describe('TicketSale', () => {
it('change quantity ', () => { it('change quantity ', () => {
const quantity = Math.floor(Math.random() * 100) + 1; const quantity = Math.floor(Math.random() * 100) + 1;
cy.waitForElement(firstRow); cy.waitForElement(firstRow);
cy.dataCy('ticketSaleQuantityInput').clear(); cy.dataCy('ticketSaleQuantityInput').find('input').clear();
cy.dataCy('ticketSaleQuantityInput').type(quantity).trigger('tab'); cy.dataCy('ticketSaleQuantityInput')
.find('input')
.type(quantity)
.trigger('tab');
cy.get('.q-page > :nth-child(6)').click(); cy.get('.q-page > :nth-child(6)').click();
handleVnConfirm(); handleVnConfirm();
cy.get('[data-cy="ticketSaleQuantityInput"]') cy.get('[data-cy="ticketSaleQuantityInput"]')
.find('[data-cy="undefined_input"]') .find('input')
.should('have.value', `${quantity}`); .should('have.value', `${quantity}`);
}); });
}); });

View File

@ -1,35 +1,37 @@
describe('VnInput Component', () => { describe('VnAccountNumber', () => {
const accountInput = 'input[data-cy="supplierFiscalDataAccount_input"]';
beforeEach(() => { beforeEach(() => {
cy.login('developer'); cy.login('developer');
cy.viewport(1920, 1080); cy.viewport(1920, 1080);
cy.visit('/#/supplier/1/fiscal-data'); cy.visit('/#/supplier/1/fiscal-data');
}); });
it('should replace character at cursor position in insert mode', () => { describe('VnInput handleInsertMode()', () => {
// Simula escribir en el input it('should replace character at cursor position in insert mode', () => {
cy.dataCy('supplierFiscalDataAccount').clear(); cy.get(accountInput).type('{selectall}4100000001');
cy.dataCy('supplierFiscalDataAccount').type('4100000001'); cy.get(accountInput).type('{movetostart}');
// Coloca el cursor en la posición 0 cy.get(accountInput).type('999');
cy.dataCy('supplierFiscalDataAccount').type('{movetostart}'); cy.get(accountInput).should('have.value', '9990000001');
// Escribe un número y verifica que se reemplace correctamente });
cy.dataCy('supplierFiscalDataAccount').type('999');
cy.dataCy('supplierFiscalDataAccount').should('have.value', '9990000001'); it('should replace character at cursor position in insert mode', () => {
cy.get(accountInput).clear();
cy.get(accountInput).type('4100000001');
cy.get(accountInput).type('{movetostart}');
cy.get(accountInput).type('999');
cy.get(accountInput).should('have.value', '9990000001');
});
it('should respect maxlength prop', () => {
cy.get(accountInput).clear();
cy.get(accountInput).type('123456789012345');
cy.get(accountInput).should('have.value', '1234567890');
});
}); });
it('should replace character at cursor position in insert mode', () => { it('should convert short account number to standard format', () => {
// Simula escribir en el input cy.get(accountInput).clear();
cy.dataCy('supplierFiscalDataAccount').clear(); cy.get(accountInput).type('123.');
cy.dataCy('supplierFiscalDataAccount').type('4100000001'); cy.get(accountInput).should('have.value', '1230000000');
// Coloca el cursor en la posición 0
cy.dataCy('supplierFiscalDataAccount').type('{movetostart}');
// Escribe un número y verifica que se reemplace correctamente en la posicion incial
cy.dataCy('supplierFiscalDataAccount').type('999');
cy.dataCy('supplierFiscalDataAccount').should('have.value', '9990000001');
});
it('should respect maxlength prop', () => {
cy.dataCy('supplierFiscalDataAccount').clear();
cy.dataCy('supplierFiscalDataAccount').type('123456789012345');
cy.dataCy('supplierFiscalDataAccount').should('have.value', '1234567890'); // asumiendo que maxlength es 10
}); });
}); });