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
commit cdbab4d7bf
5 changed files with 11 additions and 8 deletions

View File

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

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: {

View File

@ -2,4 +2,5 @@ No delivery zone available for this landing date: No hay una zona de reparto dis
No delivery zone available for this shipping date: No hay una zona de reparto disponible para la fecha de preparación seleccionada No delivery zone available for this shipping date: No hay una zona de reparto disponible para la fecha de preparación seleccionada
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

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() {

View File

@ -27,18 +27,19 @@ describe('Ticket', () => {
}); });
describe('formattedAddress()', () => { 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 = { controller.summary = {
address: { address: {
province: { province: {
name: 'Gotham' name: 'Gotham'
}, },
street: '1007 Mountain Drive', street: '1007 Mountain Drive',
postalCode: 46060,
city: 'Gotham' city: 'Gotham'
} }
}; };
expect(controller.formattedAddress).toEqual('1007 Mountain Drive - Gotham (Gotham)'); expect(controller.formattedAddress).toEqual('1007 Mountain Drive - 46060 - Gotham (Gotham)');
}); });
}); });
}); });