verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 60 Releases Wiki Activity

2957-ticket_summary_postcode + fetched tags css #649

Merged
joan merged 4 commits from 2957-ticket_summary_postcode into dev 2021-06-14 10:00:27 +00:00
Conversation 0 Commits 4 Files Changed 5 +7 -5
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 48f80fad8f - Show all commits

2
modules/ticket/back/methods/ticket/summary.js
View File

@ -63,7 +63,7 @@ module.exports = Self => {
}, { }, {
relation: 'address', relation: 'address',
scope: { scope: {
fields: ['street', 'city', 'provinceFk', 'phone', 'mobile'], fields: ['street', 'city', 'provinceFk', 'phone', 'mobile', 'postalCode'],
include: { include: {
relation: 'province', relation: 'province',
scope: { scope: {

1
modules/ticket/front/basic-data/step-one/locale/es.yml
View File

@ -3,3 +3,4 @@ No delivery zone available for this shipping date: No hay una zona de reparto di
No delivery zone available for this parameters: No hay una zona de reparto disponible con estos parámetros No delivery zone available for this parameters: No hay una zona de reparto disponible con estos parámetros
Deleted: Eliminado Deleted: Eliminado
Zone: Zona Zone: Zona
Edit address: Editar dirección

7
modules/ticket/front/summary/index.js
View File

@ -16,10 +16,11 @@ class Controller extends Summary {
get formattedAddress() { get formattedAddress() {
if (!this.summary) return ''; if (!this.summary) return '';
let address = this.summary.address; const address = this.summary.address;
let province = address.province ? `(${address.province.name})` : ''; const postcode = address.postalCode;
const province = address.province ? `(${address.province.name})` : '';
return `${address.street} - ${address.city} ${province}`; return `${address.street} - ${postcode} - ${address.city} ${province}`;
} }
loadData() { loadData() {