diff --git a/client/core/src/components/icon-menu/icon-menu.js b/client/core/src/components/icon-menu/icon-menu.js index efde0cfaa..120898150 100644 --- a/client/core/src/components/icon-menu/icon-menu.js +++ b/client/core/src/components/icon-menu/icon-menu.js @@ -26,6 +26,7 @@ export default class IconMenu extends Input { onClick(event) { event.preventDefault(); + if (this.onOpen) this.onOpen(); this.showDropDown(); } @@ -81,7 +82,8 @@ ngModule.component('vnIconMenu', { multiple: '', onChange: '&?', icon: '@?', - translateFields: '' + translateFields: '', + onOpen: '&?' }, transclude: { tplItem: '?tplItem' diff --git a/client/core/src/components/rest-model/rest-model.js b/client/core/src/components/rest-model/rest-model.js index 3485e3621..f667bc69f 100644 --- a/client/core/src/components/rest-model/rest-model.js +++ b/client/core/src/components/rest-model/rest-model.js @@ -9,6 +9,15 @@ export default class RestModel { this.clear(); } + set staticData(value) { + this._staticData = value; + this.refresh(); + } + + get staticData() { + return this._staticData; + } + get isLoading() { return this.canceler != null; } @@ -48,11 +57,11 @@ export default class RestModel { this.clear(); this.sendRequest(filter); - } else if (this.staticData) { + } else if (this._staticData) { if (search) - this.data = this.$filter('filter')(this.staticData, search); + this.data = this.$filter('filter')(this._staticData, search); else - this.data = this.staticData; + this.data = this._staticData; this.dataChanged(); } } diff --git a/client/ticket/src/sale/index.html b/client/ticket/src/sale/index.html index 74d8e7782..17c951215 100644 --- a/client/ticket/src/sale/index.html +++ b/client/ticket/src/sale/index.html @@ -16,13 +16,13 @@ on-change="$ctrl.onStateChange(value)"> + on-open="$ctrl.onMoreOpen()"> + + {{sale.quantity}} @@ -85,7 +88,7 @@ ng-if="$ctrl.isEditable" ng-click="$ctrl.showEditPricePopover($event, sale)" pointer - vn-tooltip="Edit Price"> + vn-tooltip="Edit price"> {{sale.price | currency:'€':2}} @@ -185,7 +188,6 @@