Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
This commit is contained in:
commit
a689582e89
|
@ -77,10 +77,10 @@ const isDefaultAddress = (address) => {
|
||||||
return client?.value?.defaultAddressFk === address.id ? 1 : 0;
|
return client?.value?.defaultAddressFk === address.id ? 1 : 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
const setDefault = (address) => {
|
const setDefault = async (address) => {
|
||||||
const url = `Clients/${route.params.id}`;
|
const url = `Clients/${route.params.id}`;
|
||||||
const payload = { defaultAddressFk: address.id };
|
const payload = { defaultAddressFk: address.id };
|
||||||
axios.patch(url, payload).then((res) => {
|
await axios.patch(url, payload).then((res) => {
|
||||||
if (res.data) {
|
if (res.data) {
|
||||||
client.value.defaultAddressFk = res.data.defaultAddressFk;
|
client.value.defaultAddressFk = res.data.defaultAddressFk;
|
||||||
sortAddresses();
|
sortAddresses();
|
||||||
|
|
|
@ -414,13 +414,6 @@ async function getZone(options) {
|
||||||
:rules="validate('ticketList.shipped')"
|
:rules="validate('ticketList.shipped')"
|
||||||
@update:model-value="setShipped"
|
@update:model-value="setShipped"
|
||||||
/>
|
/>
|
||||||
<VnInputTime
|
|
||||||
:label="t('basicData.shippedHour')"
|
|
||||||
v-model="formData.shipped"
|
|
||||||
:required="true"
|
|
||||||
:rules="validate('basicData.shippedHour')"
|
|
||||||
@update:model-value="setShipped"
|
|
||||||
/>
|
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
:label="t('basicData.landed')"
|
:label="t('basicData.landed')"
|
||||||
v-model="formData.landed"
|
v-model="formData.landed"
|
||||||
|
|
|
@ -89,7 +89,7 @@ const ticketColumns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('advanceTickets.import'),
|
label: t('advanceTickets.import'),
|
||||||
name: 'import',
|
name: 'totalWithVat',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
headerClass: 'horizontal-separator',
|
headerClass: 'horizontal-separator',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
|
@ -317,7 +317,7 @@ watch(
|
||||||
</QBadge>
|
</QBadge>
|
||||||
<span v-else> {{ dashIfEmpty(row.state) }}</span>
|
<span v-else> {{ dashIfEmpty(row.state) }}</span>
|
||||||
</template>
|
</template>
|
||||||
<template #column-import="{ row }">
|
<template #column-totalWithVat="{ row }">
|
||||||
<QBadge
|
<QBadge
|
||||||
:text-color="
|
:text-color="
|
||||||
totalPriceColor(row.totalWithVat) === 'warning'
|
totalPriceColor(row.totalWithVat) === 'warning'
|
||||||
|
|
Loading…
Reference in New Issue