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

Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-06-14 10:00:47 +00:00
parent c09d25ba48 82627d7e76
commit cdbab4d7bf
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/core/components/table/style.scss
View File

@ -102,7 +102,7 @@ vn-table {
& > vn-one {
overflow: hidden;
text-overflow: ellipsis;
font-size: 0.75rem;
font-size: 1rem;
}
& > vn-one:nth-child(2) h3 {

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

@ -63,7 +63,7 @@ module.exports = Self => {
}, {
relation: 'address',
scope: {
fields: ['street', 'city', 'provinceFk', 'phone', 'mobile'],
fields: ['street', 'city', 'provinceFk', 'phone', 'mobile', 'postalCode'],
include: {
relation: 'province',
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
Deleted: Eliminado
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() {
if (!this.summary) return '';
let address = this.summary.address;
let province = address.province ? `(${address.province.name})` : '';
const address = this.summary.address;
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() {

5
modules/ticket/front/summary/index.spec.js
View File

@ -27,18 +27,19 @@ describe('Ticket', () => {
});
describe('formattedAddress()', () => {
it('should return a full fromatted address with city and province', () => {
it('should return the full fromatted address with city and province', () => {
controller.summary = {
address: {
province: {
name: 'Gotham'
},
street: '1007 Mountain Drive',
postalCode: 46060,
city: 'Gotham'
}
};
expect(controller.formattedAddress).toEqual('1007 Mountain Drive - Gotham (Gotham)');
expect(controller.formattedAddress).toEqual('1007 Mountain Drive - 46060 - Gotham (Gotham)');
});
});
});