From 4d1c2ff8ee27149ad2f13955c936b02bfd4d6f7a Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 22 Jan 2021 12:56:46 +0100
Subject: [PATCH 1/2] Requested changed

---
 .../extra-community-search-panel/index.html   | 17 ++++----
 .../extra-community-search-panel/index.js     | 42 +++++++++----------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/modules/travel/front/extra-community-search-panel/index.html b/modules/travel/front/extra-community-search-panel/index.html
index 73c158a03..9fecfc192 100644
--- a/modules/travel/front/extra-community-search-panel/index.html
+++ b/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"
-                on-change="$ctrl.shippedFrom = value">
+                ng-model="$ctrl.shippedFrom">
             </vn-date-picker>
             <vn-date-picker
                 vn-one
-                label="Shipped to"
-                ng-model="filter.shippedTo"
-                on-change="$ctrl.shippedTo = value">
+                label="Landed from"
+                ng-model="$ctrl.landedFrom">
             </vn-date-picker>
+            
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
                 vn-one
-                label="Landed from"
-                ng-model="filter.landedFrom"
-                on-change="$ctrl.landedFrom = value">
+                label="Shipped to"
+                ng-model="$ctrl.shippedTo">
             </vn-date-picker>
             <vn-date-picker
                 vn-one
                 label="Landed to"
-                ng-model="filter.landedTo"
-                on-change="$ctrl.landedTo = value">
+                ng-model="$ctrl.landedTo">
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>
diff --git a/modules/travel/front/extra-community-search-panel/index.js b/modules/travel/front/extra-community-search-panel/index.js
index f2e4b66d9..4e50ea787 100644
--- a/modules/travel/front/extra-community-search-panel/index.js
+++ b/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)
-            this.filter.shippedTo = value;
+        if (!this.filter.landedFrom)
+            this.filter.landedFrom = value;
     }
 
     get shippedTo() {
-        return this._shippedTo;
+        return this.filter.shippedTo;
     }
 
     set shippedTo(value) {
-        this._shippedTo = value;
-
-        if (!this.filter.shippedFrom)
-            this.filter.shippedFrom = value;
-    }
-
-    get landedFrom() {
-        return this._landedFrom;
-    }
-
-    set landedFrom(value) {
-        this._landedFrom = value;
+        this.filter.shippedTo = 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)
-            this.filter.landedFrom = value;
+        if (!this.filter.shippedTo)
+            this.filter.shippedTo = value;
     }
 }
 

From 257b61d256a76ccc0213bee93f89fcb81e139f19 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Mon, 25 Jan 2021 07:25:02 +0100
Subject: [PATCH 2/2] Requested changes

---
 .../front/extra-community-search-panel/index.html   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/travel/front/extra-community-search-panel/index.html b/modules/travel/front/extra-community-search-panel/index.html
index 9fecfc192..c1ced4251 100644
--- a/modules/travel/front/extra-community-search-panel/index.html
+++ b/modules/travel/front/extra-community-search-panel/index.html
@@ -42,11 +42,10 @@
                 ng-model="$ctrl.shippedFrom">
             </vn-date-picker>
             <vn-date-picker
-                vn-one
-                label="Landed from"
-                ng-model="$ctrl.landedFrom">
-            </vn-date-picker>
-            
+            vn-one
+            label="Landed to"
+            ng-model="$ctrl.landedTo">
+        </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
@@ -56,8 +55,8 @@
             </vn-date-picker>
             <vn-date-picker
                 vn-one
-                label="Landed to"
-                ng-model="$ctrl.landedTo">
+                label="Landed from"
+                ng-model="$ctrl.landedFrom">
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>