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

Merge branch 'test' into dev

This commit is contained in:
Gerard 2019-02-07 09:40:28 +01:00
parent 6a2e4a4b70 8bef242a54
commit 3610ce88d7
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ticket/front/index/index.html
View File

@ -76,8 +76,8 @@
<vn-td number>{{::ticket.total | currency: 'EUR': 2}}</vn-td> <vn-td number>{{::ticket.total | currency: 'EUR': 2}}</vn-td>
<vn-td number> <vn-td number>
<vn-icon-button <vn-icon-button
ng-click="$ctrl.goToLines(ticket.id)" ng-click="$ctrl.goToLines($event, ticket.id)"
vn-tooltip="Preview" vn-tooltip="Go to lines"
icon="icon-lines"> icon="icon-lines">
</vn-icon-button> </vn-icon-button>
<vn-icon-button <vn-icon-button

6
modules/ticket/front/index/index.js
View File

@ -44,8 +44,10 @@ export default class Controller {
this.$.model.clear(); this.$.model.clear();
} }
goToLines(ticketFk) { goToLines(event, ticketFk) {
this.$state.go('ticket.card.lines', {id: ticketFk}); event.preventDefault();
event.stopImmediatePropagation();
this.$state.go('ticket.card.sale', {id: ticketFk});
} }
goToTurns() { goToTurns() {

1
modules/ticket/front/index/locale/es.yml
View File

@ -1 +1,2 @@
Turns: Turnos Turns: Turnos
Go to lines: Ir a lineas