Merge pull request 'Fix_TicketSummary[Address]: Show new field' (!1282) from Fix-TicketSummaryAddress into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1282 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
commit
511f7ea283
|
@ -453,6 +453,7 @@ ticket:
|
||||||
service: Service
|
service: Service
|
||||||
attender: Attender
|
attender: Attender
|
||||||
ok: Ok
|
ok: Ok
|
||||||
|
consigneeStreet: Street
|
||||||
create:
|
create:
|
||||||
address: Address
|
address: Address
|
||||||
invoiceOut:
|
invoiceOut:
|
||||||
|
|
|
@ -448,6 +448,7 @@ ticket:
|
||||||
purchaseRequest: Petición de compra
|
purchaseRequest: Petición de compra
|
||||||
service: Servicio
|
service: Servicio
|
||||||
attender: Consignatario
|
attender: Consignatario
|
||||||
|
consigneeStreet: Dirección
|
||||||
create:
|
create:
|
||||||
address: Dirección
|
address: Dirección
|
||||||
order:
|
order:
|
||||||
|
|
|
@ -46,16 +46,6 @@ onMounted(async () => {
|
||||||
ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
|
ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
|
||||||
});
|
});
|
||||||
|
|
||||||
function formattedAddress() {
|
|
||||||
if (!ticket.value) return '';
|
|
||||||
|
|
||||||
const address = ticket.value.address;
|
|
||||||
const postcode = address.postalCode;
|
|
||||||
const province = address.province ? `(${address.province.name})` : '';
|
|
||||||
|
|
||||||
return `${address.street} - ${postcode} - ${address.city} ${province}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isEditable() {
|
function isEditable() {
|
||||||
try {
|
try {
|
||||||
return !ticket.value.ticketState?.state?.alertLevel;
|
return !ticket.value.ticketState?.state?.alertLevel;
|
||||||
|
@ -243,7 +233,11 @@ onMounted(async () => {
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('ticket.summary.consignee')"
|
:label="t('ticket.summary.consignee')"
|
||||||
:value="formattedAddress()"
|
:value="`${entity.address?.nickname} #${entity.address?.id}`"
|
||||||
|
/>
|
||||||
|
<VnLv
|
||||||
|
:label="t('ticket.summary.consigneeStreet')"
|
||||||
|
:value="entity.address?.street"
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-one" v-if="entity.notes.length">
|
<QCard class="vn-one" v-if="entity.notes.length">
|
||||||
|
|
Loading…
Reference in New Issue