diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html index a64ad4ff72..56f7a49b9b 100644 --- a/modules/route/front/summary/index.html +++ b/modules/route/front/summary/index.html @@ -93,7 +93,14 @@ {{ticket.priority | dashIfEmpty}} {{ticket.street}} - {{ticket.city}} + + {{::ticket.city}} + {{ticket.postalCode}} { + if (!response.data) + throw new UserError(`The route's vehicle doesn't have a delivery point`); + + const address = response.data + '+to:' + ticket.postalCode + ' ' + ticket.city + ' ' + ticket.street; + const url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr='; + window.open(url + encodeURI(address), '_blank'); + }); + } } ngModule.vnComponent('vnRouteSummary', { diff --git a/modules/route/front/summary/index.spec.js b/modules/route/front/summary/index.spec.js index ad300817ac..cfa21aeb92 100644 --- a/modules/route/front/summary/index.spec.js +++ b/modules/route/front/summary/index.spec.js @@ -37,5 +37,29 @@ describe('Route', () => { expect(controller.packagesTotal).toEqual(4); }); }); + + describe('goToBuscaman()', () => { + it('should open buscaman with the given arguments', () => { + jest.spyOn(window, 'open').mockReturnThis(); + const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460%20Av%20Espioca%20100+to:n19%20London%20my%20street'; + controller.route = {vehicleFk: 1}; + const url = `Routes/${controller.route.vehicleFk}/getDeliveryPoint`; + $httpBackend.when('GET', `Routes/1/summary`).respond(); + $httpBackend.expectGET(url).respond('46460 Av Espioca 100'); + + const ticket = { + id: 1, + checked: true, + street: 'my street', + postalCode: 'n19', + city: 'London' + }; + + controller.goToBuscaman(ticket); + $httpBackend.flush(); + + expect(window.open).toHaveBeenCalledWith(expectedUrl, '_blank'); + }); + }); }); }); diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html index 18d6fb1601..32a4a2d7c6 100644 --- a/modules/route/front/tickets/index.html +++ b/modules/route/front/tickets/index.html @@ -93,7 +93,14 @@ {{::ticket.street}} - {{::ticket.city}} + + {{::ticket.city}} + {{::ticket.postalCode}} { - if (!response.data) + this.$http.get(`Routes/${this.route.vehicleFk}/getDeliveryPoint`).then(res => { + if (!res.data) throw new UserError(`The route's vehicle doesn't have a delivery point`); - return response.data; - }).then(address => { - let addresses; - if (address) addresses = address; - let lines = this.getSelectedItems(this.tickets); - - let url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr='; + let addresses = res.data; + const lines = ticket ? [ticket] : this.getSelectedItems(this.tickets); lines.forEach((line, index) => { - const previusLine = lines[index - 1] ? lines[index - 1].street : null; - if (previusLine != line.street) + const previousLine = lines[index - 1] ? lines[index - 1].street : null; + if (previousLine != line.street) addresses = addresses + '+to:' + line.postalCode + ' ' + line.city + ' ' + line.street; }); - window.open(url + addresses, '_blank'); + const url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr='; + window.open(url + encodeURI(addresses), '_blank'); }); } diff --git a/modules/route/front/tickets/index.spec.js b/modules/route/front/tickets/index.spec.js index f4a58154e4..2c73048bd7 100644 --- a/modules/route/front/tickets/index.spec.js +++ b/modules/route/front/tickets/index.spec.js @@ -136,7 +136,7 @@ describe('Route', () => { describe('goToBuscaman()', () => { it('should open buscaman with the given arguments', () => { jest.spyOn(window, 'open').mockReturnThis(); - const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460 Av Espioca 100+to:n19 London my street'; + const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460%20Av%20Espioca%20100+to:n19%20London%20my%20street'; controller.route = {vehicleFk: 1}; const url = `Routes/${controller.route.vehicleFk}/getDeliveryPoint`; $httpBackend.expectGET(url).respond('46460 Av Espioca 100');