From fa83a061e59692f36e0e3216063df1d6ce8d0ec9 Mon Sep 17 00:00:00 2001 From: Gerard Date: Mon, 19 Nov 2018 08:42:29 +0100 Subject: [PATCH 1/2] Bug #826 order.summary desde el index no es un popover --- client/order/src/index/index.html | 7 +++++++ client/order/src/index/index.js | 9 ++++++--- client/order/src/index/style.scss | 7 +++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 client/order/src/index/style.scss diff --git a/client/order/src/index/index.html b/client/order/src/index/index.html index 4a2cf9624..5cd7c300d 100644 --- a/client/order/src/index/index.html +++ b/client/order/src/index/index.html @@ -74,4 +74,11 @@ + + + + + \ No newline at end of file diff --git a/client/order/src/index/index.js b/client/order/src/index/index.js index cb6fe6b66..c3ac7a736 100644 --- a/client/order/src/index/index.js +++ b/client/order/src/index/index.js @@ -1,4 +1,5 @@ import ngModule from '../module'; +import './style.scss'; export default class Controller { constructor($scope) { @@ -48,9 +49,11 @@ export default class Controller { this.$scope.popover.relocate(); } - preview(order) { - this.$scope.orderSummaryDialog.show(); - this.order = order; + preview(event, order) { + event.preventDefault(); + event.stopImmediatePropagation(); + this.selectedOrder = order; + this.$scope.summary.show(); } } diff --git a/client/order/src/index/style.scss b/client/order/src/index/style.scss new file mode 100644 index 000000000..f83e955ed --- /dev/null +++ b/client/order/src/index/style.scss @@ -0,0 +1,7 @@ +vn-order-index { + vn-dialog.summary { + div { + min-width: 900px; + } + } +} \ No newline at end of file From c799c2503c0119774cd0f16f38706450c56cf6a8 Mon Sep 17 00:00:00 2001 From: Gerard Date: Mon, 19 Nov 2018 09:18:18 +0100 Subject: [PATCH 2/2] #788 Order.new no encuentra cliente 1765 por id --- client/order/src/create/card.html | 1 + 1 file changed, 1 insertion(+) diff --git a/client/order/src/create/card.html b/client/order/src/create/card.html index bbd90a27f..30154ce6b 100644 --- a/client/order/src/create/card.html +++ b/client/order/src/create/card.html @@ -4,6 +4,7 @@ vn-id="client" url="/api/Clients" label="Client" + search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}" show-field="name" value-field="id" field="$ctrl.clientFk">