Merge branch 'dev' of https://git.verdnatura.es/salix into dev
This commit is contained in:
commit
bc4b6826fe
|
@ -56,7 +56,7 @@ vn-table {
|
|||
display: table-footer-group
|
||||
}
|
||||
|
||||
vn-tr {
|
||||
vn-tr, a.vn-tr {
|
||||
display: table-row
|
||||
}
|
||||
|
||||
|
@ -67,10 +67,8 @@ vn-table {
|
|||
padding: 10px
|
||||
}
|
||||
|
||||
vn-thead,
|
||||
vn-tbody,
|
||||
vn-tfoot {
|
||||
vn-tr {
|
||||
vn-thead, vn-tbody, vn-tfoot {
|
||||
vn-tr, a.vn-tr {
|
||||
display: table-row;
|
||||
|
||||
vn-th {
|
||||
|
@ -101,7 +99,7 @@ vn-table {
|
|||
vn-thead, vn-tbody, vn-empty-rows {
|
||||
border-bottom: 3px solid $lines;
|
||||
}
|
||||
vn-tbody > vn-tr {
|
||||
vn-tbody > vn-tr, vn-tbody > a.vn-tr {
|
||||
border-bottom: 1px solid $lines;
|
||||
transition: background-color 200ms ease-in-out;
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ class Controller {
|
|||
};
|
||||
this.$http.post(`order/api/Orders/new`, params).then(res => {
|
||||
this.vnApp.showSuccess(this.translate.instant('Data saved!'));
|
||||
this.$state.go("order.card.catalogue", {id: res.data});
|
||||
this.$state.go("order.card.catalog", {id: res.data});
|
||||
}).catch(e => {
|
||||
this.vnApp.showError(this.translate.instant(e.data.error.message));
|
||||
});
|
||||
|
|
|
@ -37,8 +37,9 @@
|
|||
</vn-tr>
|
||||
</vn-thead>
|
||||
<vn-tbody>
|
||||
<vn-tr ng-repeat="ticket in tickets"
|
||||
class="{{::$ctrl.compareDate(ticket.shipped)}} clickable"
|
||||
<a
|
||||
ng-repeat="ticket in tickets"
|
||||
class="{{::$ctrl.compareDate(ticket.shipped)}} clickable vn-tr"
|
||||
ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
|
||||
<vn-td>
|
||||
<vn-icon ng-show="ticket.problem" class="bright"
|
||||
|
@ -71,7 +72,7 @@
|
|||
icon="desktop_windows">
|
||||
</vn-icon-button>
|
||||
</vn-td>
|
||||
</vn-tr>
|
||||
</a>
|
||||
</vn-tbody>
|
||||
</vn-table>
|
||||
</vn-card>
|
||||
|
|
|
@ -274,7 +274,7 @@ export default {
|
|||
},
|
||||
ticketsIndex: {
|
||||
createTicketButton: `vn-ticket-index ${components.vnFloatButton}`,
|
||||
searchResult: `vn-ticket-index vn-card > div > vn-table > div > vn-tbody > vn-tr`,
|
||||
searchResult: `vn-ticket-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr`,
|
||||
searchTicketInput: `vn-ticket-index ${components.vnTextfield}`,
|
||||
searchButton: `vn-ticket-index vn-searchbar vn-icon-button[icon="search"]`
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue