Requested changed

modules/travel/front/extra-community-search-panel/index.html

@@ -39,28 +39,25 @@
             <vn-date-picker
                 vn-one
                 label="Shipped from"
-                ng-model="filter.shippedFrom"
+                ng-model="$ctrl.shippedFrom">
-                on-change="$ctrl.shippedFrom = value">
             </vn-date-picker>
             <vn-date-picker
                 vn-one
-                label="Shipped to"
+                label="Landed from"
-                ng-model="filter.shippedTo"
+                ng-model="$ctrl.landedFrom">
-                on-change="$ctrl.shippedTo = value">
             </vn-date-picker>
+            
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
                 vn-one
-                label="Landed from"
+                label="Shipped to"
-                ng-model="filter.landedFrom"
+                ng-model="$ctrl.shippedTo">
-                on-change="$ctrl.landedFrom = value">
             </vn-date-picker>
             <vn-date-picker
                 vn-one
                 label="Landed to"
-                ng-model="filter.landedTo"
+                ng-model="$ctrl.landedTo">
-                on-change="$ctrl.landedTo = value">
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>

modules/travel/front/extra-community-search-panel/index.js

@@ -9,47 +9,47 @@ class Controller extends SearchPanel {
     }
 
     get shippedFrom() {
-        return this._shippedFrom;
+        return this.filter.shippedFrom;
     }
 
     set shippedFrom(value) {
-        this._shippedFrom = value;
+        this.filter.shippedFrom = value;
 
-        if (!this.filter.shippedTo)
+        if (!this.filter.landedFrom)
-            this.filter.shippedTo = value;
+            this.filter.landedFrom = value;
     }
 
     get shippedTo() {
-        return this._shippedTo;
+        return this.filter.shippedTo;
     }
 
     set shippedTo(value) {
-        this._shippedTo = value;
+        this.filter.shippedTo = value;
-
-        if (!this.filter.shippedFrom)
-            this.filter.shippedFrom = value;
-    }
-
-    get landedFrom() {
-        return this._landedFrom;
-    }
-
-    set landedFrom(value) {
-        this._landedFrom = value;
 
         if (!this.filter.landedTo)
             this.filter.landedTo = value;
     }
 
+    get landedFrom() {
+        return this.filter.landedFrom;
+    }
+
+    set landedFrom(value) {
+        this.filter.landedFrom = value;
+
+        if (!this.filter.shippedFrom)
+            this.filter.shippedFrom = value;
+    }
+
     get landedTo() {
-        return this._landedTo;
+        return this.filter.landedTo;
     }
 
     set landedTo(value) {
-        this._landedTo = value;
+        this.filter.landedTo = value;
 
-        if (!this.filter.landedFrom)
+        if (!this.filter.shippedTo)
-            this.filter.landedFrom = value;
+            this.filter.shippedTo = value;
     }
 }