html changes

modules/order/front/catalog-search-panel/index.html

@@ -1,6 +1,7 @@
+<mg-ajax path="Tags" options="mgIndex as tags"></mg-ajax>
 <div class="vn-pa-lg" style="min-width: 10em">
     <form name="form" ng-submit="$ctrl.onSearch()">
-        <vn-horizontal>
+ <!--        <vn-horizontal>
             <vn-autocomplete
                 vn-one
                 label="Tag"
@@ -20,7 +21,67 @@
                 ng-model="filter.value"
                 required="true">
             </vn-textfield>
+        </vn-horizontal> -->
+
+
+        <vn-horizontal class="vn-pt-sm">
+            <vn-one class="text-subtitle1" translate>
+                Tags
+            </vn-one>
+            <vn-icon-button
+                vn-none
+                vn-bind="+"
+                vn-tooltip="Add tag"
+                icon="add_circle"
+                ng-click="$ctrl.addTag()">
+            </vn-icon-button>
         </vn-horizontal>
+        <vn-horizontal ng-repeat="itemTag in filter.tags">
+            <vn-autocomplete
+                vn-id="tag"
+                vn-one
+                ng-model="itemTag.tagFk"
+                data="tags.model"
+                show-field="name"
+                label="Tag"
+                on-change="itemTag.value = null">
+            </vn-autocomplete>
+            <vn-textfield
+                vn-one
+                ng-show="tag.selection.isFree !== false"
+                vn-id="text"
+                label="Value"
+                ng-model="itemTag.value">
+            </vn-textfield>
+            <vn-autocomplete
+                vn-one
+                ng-show="tag.selection.isFree === false"
+                url="{{$ctrl.getSourceTable(tag.selection)}}"
+                label="Value"
+                ng-model="itemTag.value"
+                show-field="name"
+                value-field="name">
+            </vn-autocomplete>
+            <vn-icon-button
+                vn-none
+                vn-tooltip="Remove tag"
+                icon="delete"
+                ng-click="filter.tags.splice($index, 1)"
+                tabindex="-1">
+            </vn-icon-button>
+        </vn-horizontal>
+
+
+
+
+
+
+
+
+
+
+
+
         <vn-horizontal class="vn-mt-lg">
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>

modules/order/front/catalog-search-panel/index.js

@@ -1,10 +1,49 @@
 import ngModule from '../module';
 import SearchPanel from 'core/components/searchbar/search-panel';
 
+class Controller extends SearchPanel {
+    constructor($element, $) {
+        super($element, $);
+
+        this.filter = {};
+    }
+
+    get filter() {
+        return this.$.filter;
+    }
+
+    set filter(value) {
+        if (!value)
+            value = {};
+        if (!value.tags)
+            value.tags = [{}];
+
+        this.$.filter = value;
+    }
+
+    getSourceTable(selection) {
+        if (!selection || selection.isFree === true)
+            return null;
+
+        if (selection.sourceTable) {
+            return ''
+                + selection.sourceTable.charAt(0).toUpperCase()
+                + selection.sourceTable.substring(1) + 's';
+        } else if (selection.sourceTable == null)
+            return `ItemTags/filterItemTags/${selection.id}`;
+    }
+
+    addTag() {
+        this.filter.tags.push({});
+        this.popover.relocate();
+    }
+}
+
 ngModule.vnComponent('vnOrderCatalogSearchPanel', {
     template: require('./index.html'),
-    controller: SearchPanel,
+    controller: Controller,
     bindings: {
-        onSubmit: '&?'
+        onSubmit: '&?',
+        popover: '<?'
     }
 });

modules/order/front/catalog/index.html

@@ -106,8 +106,8 @@
         vn-id="popover"
         on-close="$ctrl.onPopoverClose()">
         <vn-order-catalog-search-panel
-            filter="panelFilter"
+            on-submit="$ctrl.onPanelSubmit($filter)"
-            on-submit="$ctrl.onPanelSubmit($filter)">
+            popover="popover">
         </vn-order-catalog-search-panel>
     </vn-popover>
     <div class="chips">

modules/order/front/catalog/index.js

@@ -243,10 +243,11 @@ class Controller extends Section {
     }
 
     onPanelSubmit(filter) {
-        this.$.popover.hide();
+        console.log(filter);
+        /* this.$.popover.hide();
         this.tags.push(filter);
         this.updateStateParams();
-        this.applyFilters();
+        this.applyFilters(); */
     }
 
     /**