Merge pull request #2333 from jitendra-webkul/1.0

Issue #2142 fixed

packages/Webkul/Shop/src/Http/Controllers/CartController.php

@@ -16,13 +16,6 @@ use Cart;
  */
 class CartController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * WishlistRepository Repository object
      *
@@ -55,7 +48,7 @@ class CartController extends Controller
 
         $this->productRepository = $productRepository;
 
-        $this->_config = request('_config');
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/CategoryController.php

@@ -12,13 +12,6 @@ use Webkul\Category\Repositories\CategoryRepository;
  */
 class CategoryController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * CategoryRepository object
      *
@@ -36,6 +29,6 @@ class CategoryController extends Controller
     {
         $this->categoryRepository = $categoryRepository;
 
-        $this->_config = request('_config');
+        parent::__construct();
     }
 }

packages/Webkul/Shop/src/Http/Controllers/Controller.php

@@ -9,4 +9,21 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
 class Controller extends BaseController
 {
     use DispatchesJobs, ValidatesRequests;
+
+    /**
+     * Contains route related configuration
+     *
+     * @var array
+     */
+    protected $_config;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->_config = request('_config');
+    }
 }

packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php

@@ -13,13 +13,6 @@ use Webkul\Sales\Repositories\DownloadableLinkPurchasedRepository;
  */
 class DownloadableProductController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * DownloadableLinkPurchasedRepository object
      *
@@ -39,9 +32,9 @@ class DownloadableProductController extends Controller
     {
         $this->middleware('customer');
 
-        $this->_config = request('_config');
-
         $this->downloadableLinkPurchasedRepository = $downloadableLinkPurchasedRepository;
+
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/HomeController.php

@@ -13,8 +13,6 @@ use Webkul\Core\Repositories\SliderRepository;
  */
  class HomeController extends Controller
 {
-    protected $_config;
-
     /**
      * SliderRepository object
      *
@@ -30,9 +28,9 @@ use Webkul\Core\Repositories\SliderRepository;
     */
     public function __construct(SliderRepository $sliderRepository)
     {
-        $this->_config = request('_config');
-
         $this->sliderRepository = $sliderRepository;
+
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/OnepageController.php

@@ -19,13 +19,6 @@ use Webkul\Customer\Repositories\CustomerRepository;
  */
 class OnepageController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * OrderRepository object
      *
@@ -54,7 +47,7 @@ class OnepageController extends Controller
 
         $this->customerRepository = $customerRepository;
 
-        $this->_config = request('_config');
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/OrderController.php

@@ -15,13 +15,6 @@ use PDF;
  */
 class OrderController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * OrderrRepository object
      *
@@ -50,11 +43,11 @@ class OrderController extends Controller
     {
         $this->middleware('customer');
 
-        $this->_config = request('_config');
-
         $this->orderRepository = $orderRepository;
 
         $this->invoiceRepository = $invoiceRepository;
+
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/ProductController.php

@@ -16,14 +16,6 @@ use Webkul\Product\Repositories\ProductDownloadableLinkRepository;
  */
 class ProductController extends Controller
 {
-
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * ProductRepository object
      *
@@ -76,7 +68,7 @@ class ProductController extends Controller
 
         $this->productDownloadableLinkRepository = $productDownloadableLinkRepository;
 
-        $this->_config = request('_config');
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php

@@ -9,13 +9,6 @@ use Webkul\Product\Repositories\ProductRepository;
 
 class ProductsCategoriesProxyController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * CategoryRepository object
      *
@@ -33,17 +26,21 @@ class ProductsCategoriesProxyController extends Controller
     /**
      * Create a new controller instance.
      *
-     * @param CategoryRepository $categoryRepository
-     * @param ProductRepository  $productRepository
+     * @param Webkul\Category\Repositories\CategoryRepository $categoryRepository
+     * @param Webkul\Product\Repositories\ProductRepository   $productRepository
      *
      * @return void
      */
-    public function __construct(CategoryRepository $categoryRepository, ProductRepository $productRepository)
+    public function __construct(
+        CategoryRepository $categoryRepository,
+        ProductRepository $productRepository
+    )
     {
         $this->categoryRepository = $categoryRepository;
+
         $this->productRepository = $productRepository;
 
-        $this->_config = request('_config');
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/ReviewController.php

@@ -13,13 +13,6 @@ use Webkul\Product\Repositories\ProductReviewRepository;
  */
 class ReviewController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * ProductRepository object
      *
@@ -49,7 +42,7 @@ class ReviewController extends Controller
 
         $this->productReviewRepository = $productReviewRepository;
 
-        $this->_config = request('_config');
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/SearchController.php

@@ -12,13 +12,6 @@ use Webkul\Product\Repositories\SearchRepository;
  */
  class SearchController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * SearchRepository object
      *
@@ -34,9 +27,9 @@ use Webkul\Product\Repositories\SearchRepository;
     */
     public function __construct(SearchRepository $searchRepository)
     {
-        $this->_config = request('_config');
-
         $this->searchRepository = $searchRepository;
+
+        parent::__construct();
     }
 
     /**

packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php

@@ -14,13 +14,6 @@ use Webkul\Core\Repositories\SubscribersListRepository;
  */
 class SubscriptionController extends Controller
 {
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
     /**
      * SubscribersListRepository
      *
@@ -38,7 +31,7 @@ class SubscriptionController extends Controller
     {
         $this->subscriptionRepository = $subscriptionRepository;
 
-        $this->_config = request('_config');
+        parent::__construct();
     }
 
     /**