Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable
Details
gitea/salix-front/pipeline/pr-dev This commit is unstable
Details
This commit is contained in:
commit
e65ad67bd8
|
@ -126,7 +126,7 @@ pipeline {
|
|||
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
||||
|
||||
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
||||
sh 'sh test/cypress/cypressParallel.sh 1'
|
||||
sh 'sh test/cypress/cypressParallel.sh 2'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,11 +26,7 @@ const route = useRoute();
|
|||
const stateStore = useStateStore();
|
||||
const router = useRouter();
|
||||
const entityId = computed(() => props.id || route?.params?.id);
|
||||
const arrayData = useArrayData(props.dataKey, {
|
||||
url: props.url,
|
||||
userFilter: props.filter,
|
||||
oneRecord: true,
|
||||
});
|
||||
let arrayData = getArrayData(entityId.value, props.url);
|
||||
|
||||
onBeforeRouteLeave(() => {
|
||||
stateStore.cardDescriptorChangeValue(null);
|
||||
|
@ -61,16 +57,31 @@ onBeforeRouteUpdate(async (to, from) => {
|
|||
});
|
||||
|
||||
async function fetch(id, append = false) {
|
||||
const regex = /\/(\d+)/;
|
||||
if (props.idInWhere) arrayData.store.filter.where = { id };
|
||||
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
|
||||
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
||||
else {
|
||||
arrayData = getArrayData(id);
|
||||
}
|
||||
await arrayData.fetch({ append, updateRouter: false });
|
||||
emit('onFetch', arrayData.store.data);
|
||||
}
|
||||
function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||
return Object.values(params).includes(valueToCheck);
|
||||
}
|
||||
|
||||
function formatUrl(id) {
|
||||
const newId = id || entityId.value;
|
||||
const regex = /\/(\d+)/;
|
||||
if (!regex.test(props.url)) return `${props.url}/${newId}`;
|
||||
return props.url.replace(regex, `/${newId}`);
|
||||
}
|
||||
|
||||
function getArrayData(id, url) {
|
||||
return useArrayData(props.dataKey, {
|
||||
url: url ?? formatUrl(id),
|
||||
userFilter: props.filter,
|
||||
oneRecord: true,
|
||||
});
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<template v-if="visual">
|
||||
|
|
|
@ -40,10 +40,6 @@ const $props = defineProps({
|
|||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
keepData: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
|
||||
const route = useRoute();
|
||||
|
@ -61,7 +57,6 @@ onBeforeMount(() => {
|
|||
if ($props.dataKey)
|
||||
arrayData = useArrayData($props.dataKey, {
|
||||
searchUrl: 'table',
|
||||
keepData: $props.keepData,
|
||||
...$props.arrayDataProps,
|
||||
navigate: $props.redirect,
|
||||
});
|
||||
|
|
|
@ -159,6 +159,7 @@ async function fetch() {
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
margin-top: 2px;
|
||||
align-items: start;
|
||||
.label {
|
||||
color: var(--vn-label-color);
|
||||
width: 9em;
|
||||
|
@ -169,6 +170,10 @@ async function fetch() {
|
|||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
&.ellipsis > .value {
|
||||
text-overflow: ellipsis;
|
||||
white-space: pre;
|
||||
}
|
||||
.value {
|
||||
color: var(--vn-text-color);
|
||||
overflow: hidden;
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
<script setup>
|
||||
import { dashIfEmpty } from 'src/filters';
|
||||
|
||||
defineProps({ email: { type: [String], default: null } });
|
||||
</script>
|
||||
<template>
|
||||
<QBtn
|
||||
class="q-pr-xs"
|
||||
v-if="email"
|
||||
flat
|
||||
round
|
||||
|
@ -13,4 +16,5 @@ defineProps({ email: { type: [String], default: null } });
|
|||
:href="`mailto:${email}`"
|
||||
@click.stop
|
||||
/>
|
||||
<span>{{ dashIfEmpty(email) }}</span>
|
||||
</template>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<script setup>
|
||||
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
||||
import axios from 'axios';
|
||||
import { parsePhone } from 'src/filters';
|
||||
import { dashIfEmpty, parsePhone } from 'src/filters';
|
||||
import useOpenURL from 'src/composables/useOpenURL';
|
||||
|
||||
const props = defineProps({
|
||||
|
@ -12,50 +12,65 @@ const props = defineProps({
|
|||
|
||||
const phone = ref(props.phoneNumber);
|
||||
const config = reactive({
|
||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||
'say-simple': {
|
||||
icon: 'vn:saysimple',
|
||||
url: null,
|
||||
channel: props.channel,
|
||||
},
|
||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||
});
|
||||
const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
|
||||
|
||||
const attrs = useAttrs();
|
||||
const types = Object.keys(config)
|
||||
.filter((key) => key in attrs)
|
||||
.sort();
|
||||
const activeTypes = types.length ? types : ['sip'];
|
||||
|
||||
onBeforeMount(async () => {
|
||||
if (!phone.value) return;
|
||||
let { channel } = config[type];
|
||||
|
||||
if (type === 'say-simple') {
|
||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||
.data;
|
||||
if (!channel) channel = defaultChannel;
|
||||
for (const type of activeTypes) {
|
||||
if (type === 'say-simple') {
|
||||
let { channel } = config[type];
|
||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||
.data;
|
||||
if (!channel) channel = defaultChannel;
|
||||
|
||||
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
|
||||
config[
|
||||
type
|
||||
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||
phone.value = await parsePhone(
|
||||
props.phoneNumber,
|
||||
props.country?.toLowerCase(),
|
||||
);
|
||||
config[type].url =
|
||||
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
function handleClick() {
|
||||
function handleClick(type) {
|
||||
if (config[type].url) useOpenURL(config[type].url);
|
||||
else if (config[type].href) window.location.href = config[type].href;
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QBtn
|
||||
v-if="phone"
|
||||
flat
|
||||
round
|
||||
:icon="config[type].icon"
|
||||
size="sm"
|
||||
color="primary"
|
||||
padding="none"
|
||||
@click.stop="handleClick"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ capitalize(type).replace('-', '') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
{{ phoneNumber }}
|
||||
<div class="flex items-center gap-2">
|
||||
<template v-for="type in activeTypes">
|
||||
<QBtn
|
||||
:key="type"
|
||||
v-if="phone"
|
||||
flat
|
||||
round
|
||||
:icon="config[type].icon"
|
||||
size="sm"
|
||||
color="primary"
|
||||
padding="none"
|
||||
@click.stop="() => handleClick(type)"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ capitalize(type).replace('-', '') }}
|
||||
</QTooltip>
|
||||
</QBtn></template
|
||||
>
|
||||
<span>{{ dashIfEmpty(phone) }}</span>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
@ -115,7 +115,7 @@ onMounted(async () => {
|
|||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
if (!store.keepData) arrayData.reset(['data']);
|
||||
arrayData.reset(['data']);
|
||||
arrayData.resetPagination();
|
||||
});
|
||||
|
||||
|
|
|
@ -56,7 +56,6 @@ export function useArrayData(key, userOptions) {
|
|||
'searchUrl',
|
||||
'navigate',
|
||||
'mapKey',
|
||||
'keepData',
|
||||
'oneRecord',
|
||||
];
|
||||
if (typeof userOptions === 'object') {
|
||||
|
@ -108,7 +107,7 @@ export function useArrayData(key, userOptions) {
|
|||
store.hasMoreData = limit && response.data.length >= limit;
|
||||
|
||||
if (!append && !isDialogOpened() && updateRouter) {
|
||||
if (updateStateParams(response.data)?.redirect && !store.keepData) return;
|
||||
if (updateStateParams(response.data)?.redirect) return;
|
||||
}
|
||||
store.isLoading = false;
|
||||
canceller = null;
|
||||
|
|
|
@ -84,28 +84,27 @@ const sumRisk = ({ clientRisks }) => {
|
|||
<VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
|
||||
<VnLv :label="t('globals.name')" :value="entity.name" />
|
||||
<VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
|
||||
<VnLv :value="entity.phone">
|
||||
<template #label>
|
||||
{{ t('customer.extendedList.tableVisibleColumns.phone') }}
|
||||
<VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="entity.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="entity.mobile">
|
||||
<template #label>
|
||||
{{ t('customer.summary.mobile') }}
|
||||
<VnLinkPhone :phone-number="entity.mobile" />
|
||||
<VnLv :label="t('customer.summary.mobile')">
|
||||
<template #value>
|
||||
<VnLinkPhone
|
||||
sip
|
||||
say-simple
|
||||
:phone-number="entity.mobile"
|
||||
:channel="entity.country?.saySimpleCountry?.channel"
|
||||
class="q-ml-xs"
|
||||
/>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="entity.email" copy
|
||||
><template #label>
|
||||
{{ t('globals.params.email') }}
|
||||
<VnLinkMail email="entity.email"></VnLinkMail> </template
|
||||
<VnLv
|
||||
:label="t('globals.params.email')"
|
||||
:value="entity.email"
|
||||
class="ellipsis"
|
||||
copy
|
||||
><template #value> <VnLinkMail :email="entity.email" /> </template
|
||||
></VnLv>
|
||||
<VnLv :label="t('globals.department')">
|
||||
<template #value>
|
||||
|
|
|
@ -72,6 +72,7 @@ const exprBuilder = (param, value) => {
|
|||
option-value="id"
|
||||
option-label="name"
|
||||
url="Departments"
|
||||
no-one="true"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
@ -154,9 +155,9 @@ en:
|
|||
city: City
|
||||
phone: Phone
|
||||
email: Email
|
||||
departmentFk: Department
|
||||
isToBeMailed: Mailed
|
||||
isEqualizated: Equailized
|
||||
departmentFk: Department
|
||||
businessTypeFk: Business type
|
||||
sageTaxTypeFk: Sage Tax Type
|
||||
sageTransactionTypeFk: Sage Tax Type
|
||||
|
|
|
@ -127,6 +127,7 @@ es:
|
|||
Identifier: Identificador
|
||||
Social name: Razón social
|
||||
Phone: Teléfono
|
||||
Postcode: Código postal
|
||||
City: Población
|
||||
Email: Email
|
||||
Campaign consumption: Consumo campaña
|
||||
|
|
|
@ -93,10 +93,26 @@ const updateAddressTicket = async () => {
|
|||
};
|
||||
|
||||
const updateObservations = async (payload) => {
|
||||
await axios.post('AddressObservations/crud', payload);
|
||||
await axios.post('AddressObservations/crud', cleanPayload(payload));
|
||||
notes.value = [];
|
||||
deletes.value = [];
|
||||
};
|
||||
|
||||
function cleanPayload(payload) {
|
||||
['creates', 'deletes', 'updates'].forEach((prop) => {
|
||||
if (prop === 'creates' || prop === 'updates') {
|
||||
payload[prop] = payload[prop].filter(
|
||||
(item) => item.description !== '' && item.observationTypeFk !== '',
|
||||
);
|
||||
} else {
|
||||
payload[prop] = payload[prop].filter(
|
||||
(item) => item !== null && item !== undefined,
|
||||
);
|
||||
}
|
||||
});
|
||||
return payload;
|
||||
}
|
||||
|
||||
async function updateAll({ data, payload }) {
|
||||
await updateObservations(payload);
|
||||
await updateAddress(data);
|
||||
|
|
|
@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
|
|||
:without-header="true"
|
||||
auto-load
|
||||
:row-click="rowClick"
|
||||
order="shipped DESC, id"
|
||||
order="shipped DESC, id DESC"
|
||||
:disable-option="{ card: true, table: true }"
|
||||
class="full-width"
|
||||
:disable-infinite-scroll="true"
|
||||
|
|
|
@ -112,12 +112,9 @@ const filter = {
|
|||
:label="t('Trailer Plate')"
|
||||
:value="dashIfEmpty(entity?.trailerPlate)"
|
||||
/>
|
||||
<VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
|
||||
<VnLv :label="t('Phone')">
|
||||
<template #value>
|
||||
<span>
|
||||
{{ dashIfEmpty(entity?.phone) }}
|
||||
<VnLinkPhone :phone-number="entity?.phone" />
|
||||
</span>
|
||||
<VnLinkPhone :phone-number="entity?.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
|
|
|
@ -106,7 +106,7 @@ const getEntryQueryParams = (supplier) => {
|
|||
<QBtn
|
||||
:to="{
|
||||
name: 'EntryList',
|
||||
query: { params: JSON.stringify(getEntryQueryParams(entity)) },
|
||||
query: { table: JSON.stringify(getEntryQueryParams(entity)) },
|
||||
}"
|
||||
size="md"
|
||||
icon="vn:entry"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { onMounted, ref, computed, watch } from 'vue';
|
||||
import { onMounted, ref, computed, watch, inject } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRouter, useRoute } from 'vue-router';
|
||||
import { useQuasar } from 'quasar';
|
||||
|
@ -25,7 +25,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
|
|||
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
||||
import TicketProblems from 'src/components/TicketProblems.vue';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
|
||||
const app = inject('app');
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
|
@ -196,13 +196,17 @@ const changeQuantity = async (sale) => {
|
|||
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
||||
return;
|
||||
else sale.originalQuantity = sale.quantity;
|
||||
if (!sale.id) return addSale(sale);
|
||||
try {
|
||||
if (!sale.id) await addSale(sale);
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
return;
|
||||
}
|
||||
|
||||
if (await isSalePrepared(sale)) {
|
||||
await confirmUpdate(() => updateQuantity(sale));
|
||||
} else await updateQuantity(sale);
|
||||
};
|
||||
|
||||
const updateQuantity = async (sale) => {
|
||||
try {
|
||||
let { quantity, id } = sale;
|
||||
|
@ -215,7 +219,7 @@ const updateQuantity = async (sale) => {
|
|||
(s) => s.id === sale.id,
|
||||
);
|
||||
sale.quantity = quantity;
|
||||
throw e;
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -224,24 +228,27 @@ const addSale = async (sale) => {
|
|||
barcode: sale.itemFk,
|
||||
quantity: sale.quantity,
|
||||
};
|
||||
try {
|
||||
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
||||
|
||||
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
||||
if (!data) return;
|
||||
|
||||
if (!data) return;
|
||||
const newSale = data;
|
||||
sale.id = newSale.id;
|
||||
sale.image = newSale.item.image;
|
||||
sale.subName = newSale.item.subName;
|
||||
sale.concept = newSale.concept;
|
||||
sale.quantity = newSale.quantity;
|
||||
sale.discount = newSale.discount;
|
||||
sale.price = newSale.price;
|
||||
sale.item = newSale.item;
|
||||
|
||||
const newSale = data;
|
||||
sale.id = newSale.id;
|
||||
sale.image = newSale.item.image;
|
||||
sale.subName = newSale.item.subName;
|
||||
sale.concept = newSale.concept;
|
||||
sale.quantity = newSale.quantity;
|
||||
sale.discount = newSale.discount;
|
||||
sale.price = newSale.price;
|
||||
sale.item = newSale.item;
|
||||
|
||||
notify('globals.dataSaved', 'positive');
|
||||
sale.isNew = false;
|
||||
resetChanges();
|
||||
notify('globals.dataSaved', 'positive');
|
||||
sale.isNew = false;
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
const changeConcept = async (sale) => {
|
||||
if (await isSalePrepared(sale)) {
|
||||
|
@ -250,10 +257,14 @@ const changeConcept = async (sale) => {
|
|||
};
|
||||
|
||||
const updateConcept = async (sale) => {
|
||||
const data = { newConcept: sale.concept };
|
||||
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
try {
|
||||
const data = { newConcept: sale.concept };
|
||||
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const DEFAULT_EDIT = {
|
||||
|
@ -264,18 +275,6 @@ const DEFAULT_EDIT = {
|
|||
oldQuantity: null,
|
||||
};
|
||||
const edit = ref({ ...DEFAULT_EDIT });
|
||||
const usesMana = ref(null);
|
||||
|
||||
const getUsesMana = async () => {
|
||||
const { data } = await axios.get('Sales/usesMana');
|
||||
usesMana.value = data;
|
||||
};
|
||||
|
||||
const getMana = async () => {
|
||||
const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
|
||||
mana.value = data;
|
||||
await getUsesMana();
|
||||
};
|
||||
|
||||
const selectedValidSales = computed(() => {
|
||||
if (!sales.value) return;
|
||||
|
@ -312,11 +311,15 @@ const changePrice = async (sale) => {
|
|||
}
|
||||
};
|
||||
const updatePrice = async (sale, newPrice) => {
|
||||
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
||||
sale.price = newPrice;
|
||||
edit.value = { ...DEFAULT_EDIT };
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
try {
|
||||
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
||||
sale.price = newPrice;
|
||||
edit.value = { ...DEFAULT_EDIT };
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const changeDiscount = async (sale) => {
|
||||
|
@ -339,15 +342,20 @@ const updateDiscounts = async (sales, newDiscount) => {
|
|||
};
|
||||
|
||||
const updateDiscount = async (sales, newDiscount = 0) => {
|
||||
const salesIds = sales.map(({ id }) => id);
|
||||
const params = {
|
||||
salesIds,
|
||||
newDiscount,
|
||||
manaCode: manaCode.value,
|
||||
};
|
||||
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
try {
|
||||
const salesIds = sales.map(({ id }) => id);
|
||||
const params = {
|
||||
salesIds,
|
||||
newDiscount,
|
||||
manaCode: manaCode.value,
|
||||
};
|
||||
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const getNewPrice = computed(() => {
|
||||
|
@ -369,11 +377,15 @@ const getNewPrice = computed(() => {
|
|||
});
|
||||
|
||||
const newOrderFromTicket = async () => {
|
||||
const { data } = await axios.post(`Orders/newFromTicket`, {
|
||||
ticketFk: Number(route.params.id),
|
||||
});
|
||||
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
||||
window.open(routeData.href, '_blank');
|
||||
try {
|
||||
const { data } = await axios.post(`Orders/newFromTicket`, {
|
||||
ticketFk: Number(route.params.id),
|
||||
});
|
||||
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
||||
window.open(routeData.href, '_blank');
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const goToLog = (saleId) => {
|
||||
|
@ -390,11 +402,15 @@ const goToLog = (saleId) => {
|
|||
};
|
||||
|
||||
const changeTicketState = async (val) => {
|
||||
stateBtnDropdownRef.value.hide();
|
||||
const params = { ticketFk: route.params.id, code: val };
|
||||
await axios.post('Tickets/state', params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
try {
|
||||
stateBtnDropdownRef.value.hide();
|
||||
const params = { ticketFk: route.params.id, code: val };
|
||||
await axios.post('Tickets/state', params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const removeSelectedSales = () => {
|
||||
|
@ -414,10 +430,14 @@ const removeSales = async () => {
|
|||
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
||||
|
||||
if (params.sales.length == 0) return;
|
||||
await axios.post('Sales/deleteSales', params);
|
||||
removeSelectedSales();
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
try {
|
||||
await axios.post('Sales/deleteSales', params);
|
||||
removeSelectedSales();
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const setTransferParams = async () => {
|
||||
|
|
|
@ -66,7 +66,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
|
|||
:to="{
|
||||
name: 'TravelList',
|
||||
query: {
|
||||
params: JSON.stringify({
|
||||
table: JSON.stringify({
|
||||
agencyModeFk: entity.agencyModeFk,
|
||||
}),
|
||||
},
|
||||
|
|
|
@ -505,7 +505,6 @@ watch(route, () => {
|
|||
:props="props"
|
||||
@click="stopEventPropagation($event, col)"
|
||||
:style="col.style"
|
||||
style="padding-left: 5px"
|
||||
>
|
||||
<component
|
||||
:is="tableColumnComponents[col.name].component"
|
||||
|
@ -581,19 +580,20 @@ watch(route, () => {
|
|||
<QBtn dense flat class="link">{{ entry.id }} </QBtn>
|
||||
<EntryDescriptorProxy :id="entry.id" />
|
||||
</QTd>
|
||||
<QTd>
|
||||
<QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn>
|
||||
<SupplierDescriptorProxy :id="entry.supplierFk" />
|
||||
</QTd>
|
||||
<QTd class="text-center">
|
||||
<QIcon
|
||||
v-if="entry.isCustomInspectionRequired"
|
||||
name="warning"
|
||||
color="negative"
|
||||
size="md"
|
||||
:title="t('extraCommunity.requiresInspection')"
|
||||
>
|
||||
</QIcon>
|
||||
<QTd :colspan="2">
|
||||
<div style="display: flex">
|
||||
<span class="link">
|
||||
{{ entry.supplierName }}
|
||||
<SupplierDescriptorProxy :id="entry.supplierFk" />
|
||||
</span>
|
||||
<QIcon
|
||||
v-if="entry.isCustomInspectionRequired"
|
||||
name="warning"
|
||||
color="negative"
|
||||
size="md"
|
||||
:title="t('extraCommunity.requiresInspection')"
|
||||
/>
|
||||
</div>
|
||||
</QTd>
|
||||
<QTd class="text-right">
|
||||
<span>{{ toCurrency(entry.invoiceAmount) }}</span>
|
||||
|
@ -639,9 +639,7 @@ watch(route, () => {
|
|||
&:nth-child(1) {
|
||||
max-width: 65px;
|
||||
}
|
||||
&:nth-child(4) {
|
||||
padding: 0;
|
||||
}
|
||||
padding: 0 5px 0;
|
||||
}
|
||||
thead > tr > th {
|
||||
padding: 3px;
|
||||
|
|
|
@ -128,15 +128,13 @@ const handlePhotoUpdated = (evt = false) => {
|
|||
</template>
|
||||
</VnLv>
|
||||
|
||||
<VnLv :value="entity.phone">
|
||||
<template #label>
|
||||
{{ t('globals.phone') }}
|
||||
<VnLv :label="t('globals.phone')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="entity.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="entity?.sip?.extension">
|
||||
<template #label>
|
||||
{{ t('worker.summary.sipExtension') }}
|
||||
<VnLv :label="t('worker.summary.sipExtension')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="entity?.sip?.extension" />
|
||||
</template>
|
||||
</VnLv>
|
||||
|
|
|
@ -73,21 +73,18 @@ onBeforeMount(async () => {
|
|||
/>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="worker.mobileExtension">
|
||||
<template #label>
|
||||
{{ t('worker.summary.phoneExtension') }}
|
||||
<VnLv :label="t('worker.summary.phoneExtension')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="worker.mobileExtension" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="worker.phone">
|
||||
<template #label>
|
||||
{{ t('worker.summary.entPhone') }}
|
||||
<VnLv :label="t('worker.summary.entPhone')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="worker.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="advancedSummary?.client?.phone">
|
||||
<template #label>
|
||||
{{ t('worker.summary.personalPhone') }}
|
||||
<VnLv :label="t('worker.summary.personalPhone')">
|
||||
<template #value>
|
||||
<VnLinkPhone
|
||||
:phone-number="advancedSummary?.client?.phone"
|
||||
/>
|
||||
|
@ -147,9 +144,8 @@ onBeforeMount(async () => {
|
|||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="worker?.sip?.extension">
|
||||
<template #label>
|
||||
{{ t('worker.summary.sipExtension') }}
|
||||
<VnLv :label="t('worker.summary.sipExtension')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="worker?.sip?.extension" />
|
||||
</template>
|
||||
</VnLv>
|
||||
|
|
|
@ -18,7 +18,6 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
|
|||
navigate: null,
|
||||
page: 1,
|
||||
mapKey: 'id',
|
||||
keepData: false,
|
||||
oneRecord: false,
|
||||
};
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/// <reference types="cypress" />
|
||||
|
||||
describe('VnShortcuts', () => {
|
||||
// https://redmine.verdnatura.es/issues/8848
|
||||
describe.skip('VnShortcuts', () => {
|
||||
const modules = {
|
||||
item: 'a',
|
||||
customer: 'c',
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
describe('WorkerList', () => {
|
||||
// https://redmine.verdnatura.es/issues/8848
|
||||
describe.skip('WorkerList', () => {
|
||||
const inputName = '.q-drawer .q-form input[aria-label="First Name"]';
|
||||
const searchBtn = '.q-drawer button:nth-child(3)';
|
||||
const descriptorTitle = '.descriptor .title span';
|
||||
|
@ -13,7 +14,7 @@ describe('WorkerList', () => {
|
|||
cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
|
||||
cy.get(searchBtn).click();
|
||||
cy.wait('@worker').then(() =>
|
||||
cy.get(descriptorTitle).should('include.text', 'Jessica')
|
||||
cy.get(descriptorTitle).should('include.text', 'Jessica'),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue