From b8c1985beb8b9a3bf173279755050270371263e7 Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Tue, 9 Jun 2020 19:22:41 +0530
Subject: [PATCH 1/4] #3197

---
 .../Velocity/src/Resources/views/shop/products/view.blade.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
index e8806a5a8..c7e860fad 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
@@ -23,7 +23,7 @@
 @stop
 
 @section('seo')
-    <meta name="description" content="{{ trim($product->meta_description) != "" ? $product->meta_description : str_limit(strip_tags($product->description), 120, '') }}"/>
+    <meta name="description" content="{{ trim($product->meta_description) != "" ? $product->meta_description : \Illuminate\Support\Str::limit(strip_tags($product->description), 120, '') }}"/>
 
     <meta name="keywords" content="{{ $product->meta_keywords }}"/>
 

From 7c5133e59f9c2ace510fe8e05d16a9609a27010d Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Wed, 10 Jun 2020 19:02:05 +0530
Subject: [PATCH 2/4] #3214 resolved

---
 .../src/Http/Controllers/ForgotPasswordController.php         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php
index aff8673f8..3155aae16 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/ForgotPasswordController.php
@@ -2,14 +2,10 @@
 
 namespace Webkul\Customer\Http\Controllers;
 
-use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Support\Facades\Password;
 
 class ForgotPasswordController extends Controller
 {
-
-    use SendsPasswordResetEmails;
-
     /**
      * Contains route related configuration
      *

From 65cef43a0b807f09a9a5ae35d4b4d3c8e1c5c8ef Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Wed, 10 Jun 2020 20:07:50 +0530
Subject: [PATCH 3/4] #3068 resolved

---
 .../src/Resources/views/settings/channels/create.blade.php    | 2 +-
 .../src/Resources/views/settings/channels/edit.blade.php      | 2 +-
 .../Webkul/Product/src/Http/Controllers/ProductController.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
index d432a5b0f..c1f48d6ff 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
@@ -53,7 +53,7 @@
                             <div class="control-group" :class="[errors.has('inventory_sources[]') ? 'has-error' : '']">
                                 <label for="inventory_sources" class="required">{{ __('admin::app.settings.channels.inventory_sources') }}</label>
                                 <select v-validate="'required'" class="control" id="inventory_sources" name="inventory_sources[]" data-vv-as="&quot;{{ __('admin::app.settings.channels.inventory_sources') }}&quot;" multiple>
-                                    @foreach (app('Webkul\Inventory\Repositories\InventorySourceRepository')->all() as $inventorySource)
+                                    @foreach (app('Webkul\Inventory\Repositories\InventorySourceRepository')->FindWhere(['status' => 1]) as $inventorySource)
                                         <option value="{{ $inventorySource->id }}" {{ old('inventory_sources') && in_array($inventorySource->id, old('inventory_sources')) ? 'selected' : '' }}>
                                             {{ $inventorySource->name }}
                                         </option>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
index b2b66356f..dbc478afb 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@@ -56,7 +56,7 @@
                                 <label for="inventory_sources" class="required">{{ __('admin::app.settings.channels.inventory_sources') }}</label>
                                 <?php $selectedOptionIds = old('inventory_sources') ?: $channel->inventory_sources->pluck('id')->toArray() ?>
                                 <select v-validate="'required'" class="control" id="inventory_sources" name="inventory_sources[]" data-vv-as="&quot;{{ __('admin::app.settings.channels.inventory_sources') }}&quot;" multiple>
-                                    @foreach (app('Webkul\Inventory\Repositories\InventorySourceRepository')->all() as $inventorySource)
+                                    @foreach (app('Webkul\Inventory\Repositories\InventorySourceRepository')->FindWhere(['status' => 1]) as $inventorySource)
                                         <option value="{{ $inventorySource->id }}" {{ in_array($inventorySource->id, $selectedOptionIds) ? 'selected' : '' }}>
                                             {{ $inventorySource->name }}
                                         </option>
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
index d3b1c2d23..8370910d3 100755
--- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
@@ -175,7 +175,7 @@ class ProductController extends Controller
 
         $categories = $this->categoryRepository->getCategoryTree();
 
-        $inventorySources = $this->inventorySourceRepository->all();
+        $inventorySources = $this->inventorySourceRepository->FindWhere(['status' => 1]);
 
         return view($this->_config['view'], compact('product', 'categories', 'inventorySources'));
     }
@@ -303,7 +303,7 @@ class ProductController extends Controller
 
     /**
      * To be manually invoked when data is seeded into products
-     * 
+     *
      * @return \Illuminate\Http\Response
      */
     public function sync()

From 94fb0c3d246433671397bf15c07b3fc1e3af0b7e Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Thu, 11 Jun 2020 11:36:32 +0530
Subject: [PATCH 4/4] #3068 resolved & code updated

---
 .../src/Resources/views/settings/channels/create.blade.php      | 2 +-
 .../Admin/src/Resources/views/settings/channels/edit.blade.php  | 2 +-
 .../Webkul/Product/src/Http/Controllers/ProductController.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
index c1f48d6ff..eeb6a6727 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
@@ -53,7 +53,7 @@
                             <div class="control-group" :class="[errors.has('inventory_sources[]') ? 'has-error' : '']">
                                 <label for="inventory_sources" class="required">{{ __('admin::app.settings.channels.inventory_sources') }}</label>
                                 <select v-validate="'required'" class="control" id="inventory_sources" name="inventory_sources[]" data-vv-as="&quot;{{ __('admin::app.settings.channels.inventory_sources') }}&quot;" multiple>
-                                    @foreach (app('Webkul\Inventory\Repositories\InventorySourceRepository')->FindWhere(['status' => 1]) as $inventorySource)
+                                    @foreach (app('Webkul\Inventory\Repositories\InventorySourceRepository')->findWhere(['status' => 1]) as $inventorySource)
                                         <option value="{{ $inventorySource->id }}" {{ old('inventory_sources') && in_array($inventorySource->id, old('inventory_sources')) ? 'selected' : '' }}>
                                             {{ $inventorySource->name }}
                                         </option>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
index dbc478afb..e9ba4c5e4 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@@ -56,7 +56,7 @@
                                 <label for="inventory_sources" class="required">{{ __('admin::app.settings.channels.inventory_sources') }}</label>
                                 <?php $selectedOptionIds = old('inventory_sources') ?: $channel->inventory_sources->pluck('id')->toArray() ?>
                                 <select v-validate="'required'" class="control" id="inventory_sources" name="inventory_sources[]" data-vv-as="&quot;{{ __('admin::app.settings.channels.inventory_sources') }}&quot;" multiple>
-                                    @foreach (app('Webkul\Inventory\Repositories\InventorySourceRepository')->FindWhere(['status' => 1]) as $inventorySource)
+                                    @foreach (app('Webkul\Inventory\Repositories\InventorySourceRepository')->findWhere(['status' => 1]) as $inventorySource)
                                         <option value="{{ $inventorySource->id }}" {{ in_array($inventorySource->id, $selectedOptionIds) ? 'selected' : '' }}>
                                             {{ $inventorySource->name }}
                                         </option>
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
index 8370910d3..8c18891e1 100755
--- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
@@ -175,7 +175,7 @@ class ProductController extends Controller
 
         $categories = $this->categoryRepository->getCategoryTree();
 
-        $inventorySources = $this->inventorySourceRepository->FindWhere(['status' => 1]);
+        $inventorySources = $this->inventorySourceRepository->findWhere(['status' => 1]);
 
         return view($this->_config['view'], compact('product', 'categories', 'inventorySources'));
     }