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

Fix_TicketSummary[Address]: Show new field #1282

Merged
jon merged 3 commits from Fix-TicketSummaryAddress into dev 2025-01-28 07:18:53 +00:00
Conversation 2 Commits 3 Files Changed 3 +9 -13
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d4d03c160b - Show all commits

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

@ -1,7 +1,7 @@
globals: globals:
lang: lang:
es: Spanish es: Spanish
en: English en: English
language: Language language: Language
quantity: Quantity quantity: Quantity
entity: Entity entity: Entity
@ -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:

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

@ -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
jsegarra commented 2025-01-27 22:13:04 +00:00
Review
Copy Link

street o address?

street o address?
jon commented 2025-01-28 06:14:27 +00:00
Review
Copy Link

Entiendo que el consignatario es Address, y la dirección del consignatario(Calle) es la Street

Entiendo que el consignatario es Address, y la dirección del consignatario(Calle) es la Street
create: create:
address: Dirección address: Dirección
order: order:

18
src/pages/Ticket/Card/TicketSummary.vue
View File

@ -48,16 +48,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;
@ -244,7 +234,11 @@ function toTicketUrl(section) {
</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">
@ -454,7 +448,7 @@ function toTicketUrl(section) {
toCurrency( toCurrency(
props.row.quantity * props.row.quantity *
props.row.price * props.row.price *
((100 - props.row.discount) / 100) ((100 - props.row.discount) / 100),
) )
}} }}
</QTd> </QTd>