From cfd9e6a5784250a2ba2a9be645fe8ce40fadc59e Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Fri, 14 Aug 2020 20:05:52 +0530
Subject: [PATCH 01/12] Translation View Fixed

---
 packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php   | 2 +-
 .../src/Resources/views/admin/content/edit.blade.php         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
index 295a43429..43b0bf65e 100644
--- a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
+++ b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
@@ -17,7 +17,7 @@ class ContentDataGrid extends DataGrid
             ->select('con.id as content_id', 'con_trans.title', 'con.position', 'con.content_type', 'con.status')
             ->leftJoin('velocity_contents_translations as con_trans', function($leftJoin) {
                 $leftJoin->on('con.id', '=', 'con_trans.content_id')
-                         ->where('con_trans.locale', app()->getLocale());
+                         ->where('con_trans.locale', 'en');
             })
             ->groupBy('con.id');
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
index 048d5fcb5..3dc1f7a86 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
@@ -7,7 +7,8 @@
 @section('content')
     <div class="content">
         @php
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = request()->get('locale') ?: 'en';
+            $translations = $content->translations->where('locale', $locale)->first();
         @endphp
 
         <form
@@ -61,7 +62,7 @@
                                 {{ __('velocity::app.admin.contents.page.title') }}
                                 <span class="locale">[{{ $locale }}]</span>
                             </label>
-                            <input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?? '' }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
+                            <input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?? $translations->title }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
 
                             <span class="control-error" v-if="errors.has('{{$locale}}[title]')">@{{ errors.first('{!!$locale!!}[title]') }}</span>
                         </div>

From 6b6e13b832f6afc69c8fc379cf5b10a703603699 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Fri, 14 Aug 2020 20:50:19 +0530
Subject: [PATCH 02/12] Case Handled

---
 .../Velocity/src/Resources/views/admin/content/edit.blade.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
index 3dc1f7a86..4bb893d8b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
@@ -62,7 +62,7 @@
                                 {{ __('velocity::app.admin.contents.page.title') }}
                                 <span class="locale">[{{ $locale }}]</span>
                             </label>
-                            <input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?? $translations->title }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
+                            <input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?? isset($translations->title) ? $translations->title : '' }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
 
                             <span class="control-error" v-if="errors.has('{{$locale}}[title]')">@{{ errors.first('{!!$locale!!}[title]') }}</span>
                         </div>

From 8e52fd9db552ed0440b441881c312a33918385b7 Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Mon, 17 Aug 2020 13:35:46 +0530
Subject: [PATCH 03/12] filter in search page (mobile view) issue fixed #3767

---
 .../src/Resources/views/shop/search/search.blade.php     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
index a93db75ba..d51a54a9b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
@@ -26,6 +26,15 @@
             .main-content-wrapper .vc-header {
                 box-shadow: unset;
             }
+
+             .toolbar-wrapper .col-4:last-child {
+                left: 175px;
+            }
+
+            .toolbar-wrapper .sorter {
+                left: 35px;
+                position: relative;
+            }
         }
     </style>
 @endpush

From de9f7859c3caa64d2e0a8ef1a604e0975ca07c78 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 17 Aug 2020 14:03:58 +0530
Subject: [PATCH 04/12] Locale Function Dynamic

---
 packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php      | 2 +-
 .../Velocity/src/Resources/views/admin/content/edit.blade.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
index 43b0bf65e..295a43429 100644
--- a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
+++ b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
@@ -17,7 +17,7 @@ class ContentDataGrid extends DataGrid
             ->select('con.id as content_id', 'con_trans.title', 'con.position', 'con.content_type', 'con.status')
             ->leftJoin('velocity_contents_translations as con_trans', function($leftJoin) {
                 $leftJoin->on('con.id', '=', 'con_trans.content_id')
-                         ->where('con_trans.locale', 'en');
+                         ->where('con_trans.locale', app()->getLocale());
             })
             ->groupBy('con.id');
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
index 4bb893d8b..3f3ad8077 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
@@ -7,7 +7,7 @@
 @section('content')
     <div class="content">
         @php
-            $locale = request()->get('locale') ?: 'en';
+            $locale = request()->get('locale') ?: app()->getLocale();
             $translations = $content->translations->where('locale', $locale)->first();
         @endphp
 

From 40382c83bc69aa891dd268560dbc4cb45f022952 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 17 Aug 2020 15:16:29 +0530
Subject: [PATCH 05/12] Variable Name Changed

---
 .../Velocity/src/Resources/views/admin/content/edit.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
index 3f3ad8077..91e7abc9a 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
@@ -8,7 +8,7 @@
     <div class="content">
         @php
             $locale = request()->get('locale') ?: app()->getLocale();
-            $translations = $content->translations->where('locale', $locale)->first();
+            $translation = $content->translations->where('locale', $locale)->first();
         @endphp
 
         <form
@@ -62,7 +62,7 @@
                                 {{ __('velocity::app.admin.contents.page.title') }}
                                 <span class="locale">[{{ $locale }}]</span>
                             </label>
-                            <input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?? isset($translations->title) ? $translations->title : '' }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
+                            <input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?? isset($translation->title) ? $translation->title : '' }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
 
                             <span class="control-error" v-if="errors.has('{{$locale}}[title]')">@{{ errors.first('{!!$locale!!}[title]') }}</span>
                         </div>

From a08d9d7065e92a53cc05a06e6bd9c04fad4fef61 Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Mon, 17 Aug 2020 16:04:51 +0530
Subject: [PATCH 06/12] remove quick view button from search page

---
 .../src/Resources/views/shop/products/list/card.blade.php    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
index 2bd57698a..0f382091b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
@@ -58,8 +58,6 @@
                     <img
                         src="{{ $productBaseImage['medium_image_url'] }}"
                         :onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
-
-                    <product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
                 </a>
             </div>
 
@@ -110,9 +108,6 @@
                     alt="{{ $product->name }}"
                     src="{{ $productBaseImage['large_image_url'] }}"
                     :onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
-
-                    {{-- <product-quick-view-btn :quick-view-details="product"></product-quick-view-btn> --}}
-                    <product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
             </a>
             
             @if ($product->new)

From e93378917e09ae0db69c5f7516aba411b075041e Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Mon, 17 Aug 2020 16:35:42 +0530
Subject: [PATCH 07/12] remove quick icon for mobile view

---
 .../src/Resources/views/shop/products/list/card.blade.php | 5 +++++
 .../src/Resources/views/shop/search/search.blade.php      | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
index 0f382091b..2bd57698a 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
@@ -58,6 +58,8 @@
                     <img
                         src="{{ $productBaseImage['medium_image_url'] }}"
                         :onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
+
+                    <product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
                 </a>
             </div>
 
@@ -108,6 +110,9 @@
                     alt="{{ $product->name }}"
                     src="{{ $productBaseImage['large_image_url'] }}"
                     :onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
+
+                    {{-- <product-quick-view-btn :quick-view-details="product"></product-quick-view-btn> --}}
+                    <product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
             </a>
             
             @if ($product->new)
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
index d51a54a9b..65c55234d 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
@@ -35,6 +35,14 @@
                 left: 35px;
                 position: relative;
             }
+
+            .quick-view-btn-container {
+                display: none;
+            }
+
+            .rango-zoom-plus {
+                display: none;
+            }
         }
     </style>
 @endpush

From 301eef2f441285cdc836f3010adbc293fc2b83ef Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Mon, 17 Aug 2020 17:00:56 +0530
Subject: [PATCH 08/12] final commit

---
 .../src/Resources/views/shop/products/list/card.blade.php    | 5 +++--
 .../src/Resources/views/shop/search/search.blade.php         | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
index 2bd57698a..245cf7b16 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
@@ -58,8 +58,9 @@
                     <img
                         src="{{ $productBaseImage['medium_image_url'] }}"
                         :onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
-
-                    <product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
+                    <div class="quick-view-in-list">
+                        <product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
+                    </div>
                 </a>
             </div>
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
index 65c55234d..fd07388aa 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
@@ -43,6 +43,10 @@
             .rango-zoom-plus {
                 display: none;
             }
+
+            .quick-view-in-list {
+                display: none;
+            }
         }
     </style>
 @endpush

From 86d7ae31451c4d6787a7f2087882f4357bdc496e Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Mon, 17 Aug 2020 17:40:31 +0530
Subject: [PATCH 09/12] changed in search file css

---
 .../src/Resources/views/shop/search/search.blade.php  | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
index fd07388aa..810b0db96 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
@@ -36,17 +36,10 @@
                 position: relative;
             }
 
-            .quick-view-btn-container {
-                display: none;
-            }
-
-            .rango-zoom-plus {
-                display: none;
-            }
-
-            .quick-view-in-list {
+            .quick-view-btn-container, .rango-zoom-plus , .quick-view-in-list {
                 display: none;
             }
+            
         }
     </style>
 @endpush

From 192c9049503bdc8388c97b2ab02769ea1aeb29c2 Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Mon, 17 Aug 2020 17:46:57 +0530
Subject: [PATCH 10/12] changed in search file css 1

---
 .../Velocity/src/Resources/views/shop/search/search.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
index 810b0db96..a0957ccba 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
@@ -36,7 +36,9 @@
                 position: relative;
             }
 
-            .quick-view-btn-container, .rango-zoom-plus , .quick-view-in-list {
+            .quick-view-btn-container,
+            .rango-zoom-plus, 
+            .quick-view-in-list {
                 display: none;
             }
             

From 597e3f0d7a9bfe81fd9bfe5ccaf21ed718c9ca40 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 17 Aug 2020 17:52:00 +0530
Subject: [PATCH 11/12] Static Value Removed

---
 .../views/admin/meta-info/meta-data.blade.php      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
index 95aaaf2a2..f809714b8 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
@@ -5,8 +5,8 @@
 @stop
 
 @php
-    $locale = request()->get('locale') ?: 'en';
-    $channel = request()->get('channel') ?: 'default';
+    $locale = request()->get('locale') ?: app()->getLocale();
+    $channel = request()->get('channel') ?: core()->getCurrentChannelCode();
 @endphp
 
 @section('content')
@@ -128,7 +128,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.home-page-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
                         </label>
 
                         <textarea
@@ -142,7 +142,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.product-policy') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
                         </label>
 
                         <textarea
@@ -261,7 +261,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.subscription-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
                         </label>
 
                         <textarea
@@ -275,7 +275,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.footer-left-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
                         </label>
 
                         <textarea
@@ -289,7 +289,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.footer-middle-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
                         </label>
 
                         <textarea

From b091788fa46303824be019f7478c2aeaed606bdd Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Mon, 17 Aug 2020 18:38:55 +0530
Subject: [PATCH 12/12] removed unnecessary data from chnagelog

---
 CHANGELOG for v1.x.x.md | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md
index c970bba99..6fdad2fb1 100644
--- a/CHANGELOG for v1.x.x.md	
+++ b/CHANGELOG for v1.x.x.md	
@@ -30,9 +30,6 @@
 
 * [feature] - Store configuration added for product listing
 
-
-
-
 * #343 [fixed] - Translation strings are missing from awful amount of controllers when returning responses with flash. And optimise translation strings for faster static translations.
 
 * #824 [fixed] - Framework is not supporting I.E 11 browser.
@@ -661,36 +658,6 @@
 
 * #3757 [fixed] - broken image on guest wishlist
 
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-* #3727 [fixed] - 
-
-
-
 ## **v1.1.2 (24th of March 2020)** - *Release*
 
 * [feature] - Now customer can cancel order.