Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-11-19 09:27:25 +01:00
commit 24451999a9
4 changed files with 21 additions and 3 deletions

View File

@ -4,6 +4,7 @@
vn-id="client" vn-id="client"
url="/api/Clients" url="/api/Clients"
label="Client" label="Client"
search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}"
show-field="name" show-field="name"
value-field="id" value-field="id"
field="$ctrl.clientFk"> field="$ctrl.clientFk">

View File

@ -75,3 +75,10 @@
<vn-order-summary order="$ctrl.order"></vn-order-summary> <vn-order-summary order="$ctrl.order"></vn-order-summary>
</tpl-body> </tpl-body>
</vn-dialog> </vn-dialog>
<vn-dialog
vn-id="summary"
class="dialog-summary summary">
<tpl-body>
<vn-order-summary order="$ctrl.selectedOrder"></vn-order-summary>
</tpl-body>
</vn-dialog>

View File

@ -1,4 +1,5 @@
import ngModule from '../module'; import ngModule from '../module';
import './style.scss';
export default class Controller { export default class Controller {
constructor($scope) { constructor($scope) {
@ -48,9 +49,11 @@ export default class Controller {
this.$scope.popover.relocate(); this.$scope.popover.relocate();
} }
preview(order) { preview(event, order) {
this.$scope.orderSummaryDialog.show(); event.preventDefault();
this.order = order; event.stopImmediatePropagation();
this.selectedOrder = order;
this.$scope.summary.show();
} }
} }

View File

@ -0,0 +1,7 @@
vn-order-index {
vn-dialog.summary {
div {
min-width: 900px;
}
}
}