diff --git a/CHANGELOG for v0.1.x.md b/CHANGELOG for v0.1.x.md
index 1359bdd27..be4c3b3c1 100755
--- a/CHANGELOG for v0.1.x.md	
+++ b/CHANGELOG for v0.1.x.md	
@@ -2,6 +2,70 @@
 
 #### This changelog consists the bug & security fixes and new features being included in the releases listed below.
 
+## **v0.1.9 (20th of December, 2019)** - *Release*
+
+* #1875 [fixed] - Discount gets applied on cart if condition is "Visible Individually" is set to yes and product added in cart is not visible individually.
+
+* #1868 [fixed] - Getting exception on checkout if action Buy X Get Y free is selected in cart rule. 
+
+* #1838 [fixed] - Cart rule not working for condition sku(children only) and sku(parent only).
+
+* #1835 [fixed] - Getting exception if condition value remains blank.
+
+* #1831 [fixed] - Negative sign is not required in discount amount.
+
+* #1830 [fixed] - If Coupon type is selected as "No Coupon" then coupon code should not generate for that particular cart rule.
+
+* #1904 [fixed] - Existing tax should display as list on creating catalog rule if in condition "Tax Category" is selected.
+
+* #1903 [fixed] - UI issue in condition field
+
+* #1895 [fixed] - Translation issue Action Type field while creating catalog rule.
+
+* #1883 [fixed] - Free shipping not applied on cart, if from action "Free Shipping" is selected and discount amount is given as zero.
+
+* #1882 [fixed] - If from Action "Apply on shipping " is selected as yes then the discounted amount is applying on both product and shipping charge.
+
+* #1861 [fixed] - Getting exception on checkout if applying invalid coupon code and proceed for checkout.
+
+* #1857 [fixed] - Getting exception when creating cart rule with condition URL KEY(children only).
+
+* #1856 [fixed] - Getting exception on creating cart rule with condition Name(children only).
+
+* #1847 [fixed] - If cart rule condition does not match the cart then on applying coupon it should display message "Coupon cannot be applied".
+
+* #1839 [fixed] - Getting exception on filtering cart rule through id.
+
+* #1836 [fixed] - Back button on Edit cart rule page doesn't work.
+
+* #1834 [fixed] - On editing any cart rule, its priority updates to 1.
+
+* #1833 [fixed] - Discount not applied if "Payment Method", "Shipping Method", "Shipping State" or "Shipping Country" is selected in condition.
+
+* #1832 [fixed] - Able to use coupon irrespective of the number given in "Uses per coupon" field.
+
+* #1828 [fixed] - Updated changes are not saved on editing cart rule.
+
+* #1825 [fixed] - Not able to generate coupon code while creating cart rule.
+
+* #1823 [fixed] - Getting exception after clicking on developement.
+
+* #1929 [fixed] - Actual product amount and discounted amount both should display on product page for configurable product
+
+* #1928 [fixed] - Catalog rule should not apply if any of the condition doesn't match, if condition type"All Condition are true"
+
+* #1931 [fixed] - Catalog rule not applying if in condition type"Any Condition is true" is selected, and some of the condition doesn't match the product.
+
+* #1935 [fixed] - Categories are not displaying if in condition Categories(children only) or Categories(Parent Only) is selected.
+
+* #1938 [fixed] - multiple cart rules are getting applied by using only single coupon.
+
+* #1939 [fixed] - Invalid coupon gets applied, if clicking on apply coupon multiple time, although there is no discount amount but its displaying message that coupon code applied successfully.
+
+* #1942 [fixed] - When editing the cart rule, selected category is not checked.
+
+
+
 ## **v0.1.8 (4th of October, 2019)** - *Release*
 
 * [feature] - Refund is added for orders.
diff --git a/CHANGELOG for v0.2.x.md b/CHANGELOG for v0.2.x.md
new file mode 100644
index 000000000..bf693debb
--- /dev/null
+++ b/CHANGELOG for v0.2.x.md	
@@ -0,0 +1,17 @@
+# CHANGELOG for v0.2.x
+
+#### This changelog consists the bug & security fixes and new features being included in the releases listed below.
+
+## **v0.2.0 (23th of December, 2019)** - *Release*
+
+* #1955 [fixed] - Message need to be changed on mouse hover on cross symbol next to applied coupon.
+
+* #1959 [fixed] - if admin has set the same condition twice, then catalog rule is not getting apply
+
+* #1958 [fixed] - getting exception on front end, if action type is Buy x get y free in non couponable cart rule.
+
+* #1957 [fixed] - if action type is Fixed Amount to Whole Cart, then apply to shipping option should get hide.
+
+* #1954 [fixed] - If any different tax category has been assigned to variants in configurable product, then while using tax category condition in cart rule, rule is not working properly.
+
+* #1950 [fixed] - multiple catalog rule should not get get applied, if 1st one has been created as End Other Rules = yes
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 48d7ac945..78fb15c50 100755
--- a/composer.json
+++ b/composer.json
@@ -93,7 +93,9 @@
                 "Webkul\\Sales\\": "packages/Webkul/Sales/src",
                 "Webkul\\Tax\\": "packages/Webkul/Tax/src",
                 "Webkul\\API\\": "packages/Webkul/API",
-                "Webkul\\Discount\\": "packages/Webkul/Discount/src",
+                "Webkul\\CatalogRule\\": "packages/Webkul/CatalogRule/src",
+                "Webkul\\CartRule\\": "packages/Webkul/CartRule/src",
+                "Webkul\\Rule\\": "packages/Webkul/Rule/src",
                 "Webkul\\CMS\\": "packages/Webkul/CMS/src",
                 "Webkul\\Velocity\\": "packages/Webkul/Velocity/src"
         }
@@ -132,7 +134,8 @@
             "set -e",
             "@php artisan migrate:fresh --env=testing",
             "vendor/bin/codecept run unit",
-            "vendor/bin/codecept run functional"
+            "vendor/bin/codecept run functional",
+            "vendor/bin/codecept run trigger"
         ]
     },
     "config": {
diff --git a/config/app.php b/config/app.php
index 3763cd6d3..d3384a7f9 100755
--- a/config/app.php
+++ b/config/app.php
@@ -246,7 +246,9 @@ return [
         Webkul\Sales\Providers\SalesServiceProvider::class,
         Webkul\Tax\Providers\TaxServiceProvider::class,
         Webkul\API\Providers\APIServiceProvider::class,
-        Webkul\Discount\Providers\DiscountServiceProvider::class,
+        Webkul\CatalogRule\Providers\CatalogRuleServiceProvider::class,
+        Webkul\CartRule\Providers\CartRuleServiceProvider::class,
+        Webkul\Rule\Providers\RuleServiceProvider::class,
         Webkul\CMS\Providers\CMSServiceProvider::class
     ],
 
diff --git a/config/concord.php b/config/concord.php
index 311ede347..24c40b47a 100755
--- a/config/concord.php
+++ b/config/concord.php
@@ -19,7 +19,8 @@ return [
         \Webkul\Sales\Providers\ModuleServiceProvider::class,
         \Webkul\Tax\Providers\ModuleServiceProvider::class,
         \Webkul\User\Providers\ModuleServiceProvider::class,
-        \Webkul\Discount\Providers\ModuleServiceProvider::class,
+        \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
+        \Webkul\CartRule\Providers\ModuleServiceProvider::class,
         \Webkul\CMS\Providers\ModuleServiceProvider::class
     ]
 ];
\ No newline at end of file
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 76e33f47d..4b94fd2d1 100755
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Database\Seeder;
+use Webkul\Velocity\Database\Seeders\VelocityMetaDataSeeder;
 use Webkul\Admin\Database\Seeders\DatabaseSeeder as BagistoDatabaseSeeder;
 
 class DatabaseSeeder extends Seeder
@@ -13,5 +14,6 @@ class DatabaseSeeder extends Seeder
     public function run()
     {
         $this->call(BagistoDatabaseSeeder::class);
+        $this->call(VelocityMetaDataSeeder::class);
     }
 }
diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php
index db7edbff7..8b28872db 100755
--- a/packages/Webkul/Admin/src/Config/acl.php
+++ b/packages/Webkul/Admin/src/Config/acl.php
@@ -394,27 +394,27 @@ return [
     ], [
         'key' => 'promotions',
         'name' => 'admin::app.acl.promotions',
-        'route' => 'admin.cart-rule.index',
+        'route' => 'admin.cart-rules.index',
         'sort' => 7
     ], [
-        'key' => 'promotions.cart-rule',
+        'key' => 'promotions.cart-rules',
         'name' => 'admin::app.acl.cart-rules',
-        'route' => 'admin.cart-rule.index',
+        'route' => 'admin.cart-rules.index',
         'sort' => 1
     ], [
-        'key' => 'promotions.cart-rule.create',
+        'key' => 'promotions.cart-rules.create',
         'name' => 'admin::app.acl.create',
-        'route' => 'admin.cart-rule.create',
+        'route' => 'admin.cart-rules.create',
         'sort' => 1
     ], [
-        'key' => 'promotions.cart-rule.edit',
+        'key' => 'promotions.cart-rules.edit',
         'name' => 'admin::app.acl.edit',
-        'route' => 'admin.cart-rule.edit',
+        'route' => 'admin.cart-rules.edit',
         'sort' => 2
     ], [
-        'key' => 'promotions.cart-rule.delete',
+        'key' => 'promotions.cart-rules.delete',
         'name' => 'admin::app.acl.delete',
-        'route' => 'admin.cart-rule.delete',
+        'route' => 'admin.cart-rules.delete',
         'sort' => 3
     ],
 ];
diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php
index cfa9d6877..a1420eb85 100755
--- a/packages/Webkul/Admin/src/Config/menu.php
+++ b/packages/Webkul/Admin/src/Config/menu.php
@@ -189,22 +189,22 @@ return [
         'icon-class' => ''
     ],[
         'key' => 'promotions',
-        'name' => 'admin::app.layouts.promotion',
-        'route' => 'admin.cart-rule.index',
+        'name' => 'admin::app.layouts.promotions',
+        'route' => 'admin.catalog-rules.index',
         'sort' => 5,
         'icon-class' => 'promotion-icon'
     ], [
-        'key' => 'promotions.cart-rule',
-        'name' => 'admin::app.promotion.cart-rule',
-        'route' => 'admin.cart-rule.index',
+        'key' => 'promotions.catalog-rules',
+        'name' => 'admin::app.promotions.catalog-rules.title',
+        'route' => 'admin.catalog-rules.index',
         'sort' => 1,
         'icon-class' => ''
     ], [
-        'key' => 'promotions.catalog-rule',
-        'name' => 'admin::app.promotion.catalog-rule',
-        'route' => 'admin.catalog-rule.index',
-        'sort' => 1,
-        'icon-class' => '',
+        'key' => 'promotions.cart-rules',
+        'name' => 'admin::app.promotions.cart-rules.title',
+        'route' => 'admin.cart-rules.index',
+        'sort' => 2,
+        'icon-class' => ''
     ], [
         'key' => 'cms',
         'name' => 'admin::app.layouts.cms',
diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleCouponDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponDataGrid.php
new file mode 100644
index 000000000..ccf8c6375
--- /dev/null
+++ b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponDataGrid.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Webkul\Admin\DataGrids;
+
+use Webkul\Ui\DataGrid\DataGrid;
+use DB;
+
+/**
+ * CartRuleCouponDataGrid class
+ *
+ * @author  Jitendra Singh <jitendra@webkul.com>
+ * @copyright  2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CartRuleCouponDataGrid extends DataGrid
+{
+    protected $index = 'id';
+
+    protected $sortOrder = 'desc';
+
+    public function prepareQueryBuilder()
+    {
+        $queryBuilder = DB::table('cart_rule_coupons')
+                ->addSelect('id', 'code', 'created_at', 'expired_at', 'times_used')
+                ->where('cart_rule_coupons.cart_rule_id', request('id'));
+
+        $this->setQueryBuilder($queryBuilder);
+    }
+
+    public function addColumns()
+    {
+        $this->addColumn([
+            'index' => 'id',
+            'label' => trans('admin::app.datagrid.id'),
+            'type' => 'number',
+            'searchable' => false,
+            'sortable' => true,
+            'filterable' => true
+        ]);
+
+        $this->addColumn([
+            'index' => 'code',
+            'label' => trans('admin::app.datagrid.coupon-code'),
+            'type' => 'string',
+            'searchable' => true,
+            'sortable' => true,
+            'filterable' => true
+        ]);
+
+        $this->addColumn([
+            'index' => 'created_at',
+            'label' => trans('admin::app.datagrid.created-date'),
+            'type' => 'datetime',
+            'sortable' => true,
+            'searchable' => false,
+            'filterable' => true
+        ]);
+
+        $this->addColumn([
+            'index' => 'expired_at',
+            'label' => trans('admin::app.datagrid.expiration-date'),
+            'type' => 'datetime',
+            'sortable' => true,
+            'searchable' => false,
+            'filterable' => true
+        ]);
+
+        $this->addColumn([
+            'index' => 'times_used',
+            'label' => trans('admin::app.datagrid.times-used'),
+            'type' => 'number',
+            'searchable' => true,
+            'sortable' => true,
+            'filterable' => true
+        ]);
+    }
+
+    public function prepareMassActions()
+    {
+        $this->addMassAction([
+            'type' => 'delete',
+            'action' => route('admin.cart-rule-coupons.mass-delete'),
+            'label' => trans('admin::app.datagrid.delete'),
+            'method' => 'DELETE'
+        ]);
+    }
+}
diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
index 7eb57ffd7..c6efb9517 100644
--- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
@@ -8,20 +8,27 @@ use DB;
 /**
  * Cart Rule DataGrid class
  *
- * @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
+ * @author Jitendra Singh <jitendra@webkul.com>
  * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
  */
 class CartRuleDataGrid extends DataGrid
 {
-    protected $index = 'id'; //the column that needs to be treated as index column
+    protected $index = 'id';
 
-    protected $sortOrder = 'desc'; //asc or desc
+    protected $sortOrder = 'desc';
 
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('cart_rules')
-                ->select('id')
-                ->addSelect('id', 'name', 'status', 'end_other_rules', 'action_type', 'disc_amount', 'use_coupon');
+                ->leftJoin('cart_rule_coupons', function($leftJoin) {
+                    $leftJoin->on('cart_rule_coupons.cart_rule_id', '=', 'cart_rules.id')
+                        ->where('cart_rule_coupons.is_primary', 1);
+                })
+                ->addSelect('cart_rules.id', 'name', 'cart_rule_coupons.code as coupon_code', 'status', 'starts_from', 'ends_till', 'sort_order');
+
+        $this->addFilter('id', 'cart_rules.id');
+
+        $this->addFilter('coupon_code', 'cart_rule_coupons.code');
 
         $this->setQueryBuilder($queryBuilder);
     }
@@ -30,7 +37,7 @@ class CartRuleDataGrid extends DataGrid
     {
         $this->addColumn([
             'index' => 'id',
-            'label' => trans('admin::app.id'),
+            'label' => trans('admin::app.datagrid.id'),
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
@@ -39,13 +46,40 @@ class CartRuleDataGrid extends DataGrid
 
         $this->addColumn([
             'index' => 'name',
-            'label' => trans('admin::app.name'),
+            'label' => trans('admin::app.datagrid.name'),
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
             'filterable' => true
         ]);
 
+        $this->addColumn([
+            'index' => 'coupon_code',
+            'label' => trans('admin::app.datagrid.coupon-code'),
+            'type' => 'string',
+            'searchable' => true,
+            'sortable' => true,
+            'filterable' => true
+        ]);
+
+        $this->addColumn([
+            'index' => 'starts_from',
+            'label' => trans('admin::app.datagrid.start'),
+            'type' => 'datetime',
+            'sortable' => true,
+            'searchable' => false,
+            'filterable' => true
+        ]);
+
+        $this->addColumn([
+            'index' => 'ends_till',
+            'label' => trans('admin::app.datagrid.end'),
+            'type' => 'datetime',
+            'sortable' => true,
+            'searchable' => false,
+            'filterable' => true
+        ]);
+
         $this->addColumn([
             'index' => 'status',
             'label' => trans('admin::app.status'),
@@ -55,89 +89,36 @@ class CartRuleDataGrid extends DataGrid
             'filterable' => true,
             'wrapper' => function($value) {
                 if ($value->status == 1)
-                    return 'Active';
+                    return trans('admin::app.datagrid.active');
                 else
-                    return 'In Active';
+                    return trans('admin::app.datagrid.inactive');
             }
         ]);
 
         $this->addColumn([
-            'index' => 'end_other_rules',
-            'label' => 'End Other Rules',
-            'type' => 'boolean',
-            'searchable' => false,
-            'sortable' => true,
-            'filterable' => true,
-            'wrapper' => function($value) {
-                if ($value->end_other_rules == 1)
-                    return 'True';
-                else
-                    return 'False';
-            }
-        ]);
-
-        $this->addColumn([
-            'index' => 'action_type',
-            'label' => 'Action Type',
-            'type' => 'string',
-            'searchable' => true,
-            'sortable' => true,
-            'filterable' => true,
-            'wrapper' => function($value) {
-                return config('pricerules.cart.actions')[$value->action_type];
-            }
-        ]);
-
-        $this->addColumn([
-            'index' => 'disc_amount',
-            'label' => 'Discount Amount',
+            'index' => 'sort_order',
+            'label' => trans('admin::app.datagrid.priority'),
             'type' => 'number',
-            'searchable' => false,
+            'searchable' => true,
             'sortable' => true,
             'filterable' => true
         ]);
-
-        $this->addColumn([
-            'index' => 'use_coupon',
-            'label' => 'Use Coupon',
-            'type' => 'boolean',
-            'searchable' => true,
-            'sortable' => true,
-            'filterable' => true,
-            'wrapper' => function($value) {
-                if ($value->use_coupon == 1) {
-                    return 'True';
-                } else {
-                    return 'False';
-                }
-            }
-        ]);
     }
 
     public function prepareActions()
     {
         $this->addAction([
-            'title' => 'Edit CartRule',
-            'method' => 'GET', //use post only for redirects only
-            'route' => 'admin.cart-rule.edit',
+            'title' => 'Edit Cart Rule',
+            'method' => 'GET',
+            'route' => 'admin.cart-rules.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
-            'title' => 'Delete CartRule',
-            'method' => 'POST', //use post only for requests other than redirects
-            'route' => 'admin.cart-rule.delete',
+            'title' => 'Delete Cart Rule',
+            'method' => 'POST',
+            'route' => 'admin.cart-rules.delete',
             'icon' => 'icon trash-icon'
         ]);
     }
-
-    public function prepareMassActions()
-    {
-        // $this->addMassAction([
-        //     'type' => 'delete',
-        //     'action' => route('admin.catalog.attributes.massdelete'),
-        //     'label' => 'Delete',
-        //     'method' => 'DELETE'
-        // ]);
-    }
 }
diff --git a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php
index 506af12eb..e57e977a1 100644
--- a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php
@@ -8,20 +8,19 @@ use DB;
 /**
  * Catalog Rule DataGrid class
  *
- * @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
+ * @author Jitendra Singh <jitendra@webkul.com>
  * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
  */
 class CatalogRuleDataGrid extends DataGrid
 {
-    protected $index = 'id'; //the column that needs to be treated as index column
+    protected $index = 'id';
 
-    protected $sortOrder = 'desc'; //asc or desc
+    protected $sortOrder = 'desc';
 
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('catalog_rules')
-                ->select('id')
-                ->addSelect('id', 'name', 'starts_from', 'ends_till', 'status', 'end_other_rules', 'action_code');
+                ->addSelect('catalog_rules.id', 'name', 'status', 'starts_from', 'ends_till', 'sort_order');
 
         $this->setQueryBuilder($queryBuilder);
     }
@@ -48,56 +47,41 @@ class CatalogRuleDataGrid extends DataGrid
 
         $this->addColumn([
             'index' => 'starts_from',
-            'label' => trans('admin::app.datagrid.starts-from'),
+            'label' => trans('admin::app.datagrid.start'),
             'type' => 'datetime',
-            'searchable' => false,
             'sortable' => true,
+            'searchable' => false,
             'filterable' => true
         ]);
 
         $this->addColumn([
             'index' => 'ends_till',
-            'label' => trans('admin::app.datagrid.ends-till'),
+            'label' => trans('admin::app.datagrid.end'),
             'type' => 'datetime',
-            'searchable' => false,
             'sortable' => true,
+            'searchable' => false,
             'filterable' => true
         ]);
 
         $this->addColumn([
             'index' => 'status',
-            'label' => trans('admin::app.datagrid.status'),
+            'label' => trans('admin::app.status'),
             'type' => 'boolean',
-            'searchable' => false,
+            'searchable' => true,
             'sortable' => true,
             'filterable' => true,
-            'wrapper' => function ($value) {
+            'wrapper' => function($value) {
                 if ($value->status == 1)
-                    return 'True';
+                    return trans('admin::app.datagrid.active');
                 else
-                    return 'False';
+                    return trans('admin::app.datagrid.inactive');
             }
         ]);
 
         $this->addColumn([
-            'index' => 'end_other_rules',
-            'label' => 'End Other Rules',
-            'type' => 'boolean',
-            'searchable' => false,
-            'sortable' => true,
-            'filterable' => true,
-            'wrapper' => function ($value) {
-                if ($value->end_other_rules == 1)
-                    return 'True';
-                else
-                    return 'False';
-            }
-        ]);
-
-        $this->addColumn([
-            'index' => 'action_code',
-            'label' => 'Action Type',
-            'type' => 'string',
+            'index' => 'sort_order',
+            'label' => trans('admin::app.datagrid.priority'),
+            'type' => 'number',
             'searchable' => true,
             'sortable' => true,
             'filterable' => true
@@ -107,27 +91,17 @@ class CatalogRuleDataGrid extends DataGrid
     public function prepareActions()
     {
         $this->addAction([
-            'title' => 'Edit CatalogRule',
-            'method' => 'GET', //use post only for redirects only
-            'route' => 'admin.catalog-rule.edit',
+            'title' => 'Edit Catalog Rule',
+            'method' => 'GET',
+            'route' => 'admin.catalog-rules.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
-            'title' => 'Delete CatalogRule',
-            'method' => 'POST', //use post only for requests other than redirects
-            'route' => 'admin.catalog-rule.delete',
+            'title' => 'Delete Catalog Rule',
+            'method' => 'POST',
+            'route' => 'admin.catalog-rules.delete',
             'icon' => 'icon trash-icon'
         ]);
     }
-
-    public function prepareMassActions()
-    {
-        // $this->addMassAction([
-        //     'type' => 'delete',
-        //     'action' => route('admin.catalog.attributes.massdelete'),
-        //     'label' => 'Delete',
-        //     'method' => 'DELETE'
-        // ]);
-    }
 }
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index 50c6557bd..6da6f2068 100755
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -669,60 +669,56 @@ Route::group(['middleware' => ['web']], function () {
             //DataGrid Export
             Route::post('admin/export', 'Webkul\Admin\Http\Controllers\ExportController@export')->name('admin.datagrid.export');
 
-            Route::prefix('promotion')->group(function () {
-                Route::get('/catalog-rules', 'Webkul\Discount\Http\Controllers\CatalogRuleController@index')->defaults('_config', [
-                    'view' => 'admin::promotions.catalog-rule.index'
-                ])->name('admin.catalog-rule.index');
+            Route::prefix('promotions')->group(function () {
+                Route::get('cart-rules', 'Webkul\CartRule\Http\Controllers\CartRuleController@index')->defaults('_config', [
+                    'view' => 'admin::promotions.cart-rules.index'
+                ])->name('admin.cart-rules.index');
 
-                Route::get('/catalog-rules/create', 'Webkul\Discount\Http\Controllers\CatalogRuleController@create')->defaults('_config', [
-                    'view' => 'admin::promotions.catalog-rule.create'
-                ])->name('admin.catalog-rule.create');
+                Route::get('cart-rules/create', 'Webkul\CartRule\Http\Controllers\CartRuleController@create')->defaults('_config', [
+                    'view' => 'admin::promotions.cart-rules.create'
+                ])->name('admin.cart-rules.create');
 
-                Route::post('/catalog-rules/create', 'Webkul\Discount\Http\Controllers\CatalogRuleController@store')->defaults('_config', [
-                    'redirect' => 'admin.catalog-rule.index'
-                ])->name('admin.catalog-rule.store');
+                Route::post('cart-rules/create', 'Webkul\CartRule\Http\Controllers\CartRuleController@store')->defaults('_config', [
+                    'redirect' => 'admin.cart-rules.index'
+                ])->name('admin.cart-rules.store');
 
-                Route::get('/catalog-rules/edit/{id}', 'Webkul\Discount\Http\Controllers\CatalogRuleController@edit')->defaults('_config', [
-                    'view' => 'admin::promotions.catalog-rule.edit'
-                ])->name('admin.catalog-rule.edit');
+                Route::get('cart-rules/edit/{id}', 'Webkul\CartRule\Http\Controllers\CartRuleController@edit')->defaults('_config', [
+                    'view' => 'admin::promotions.cart-rules.edit'
+                ])->name('admin.cart-rules.edit');
 
-                Route::post('/catalog-rules/edit/{id}', 'Webkul\Discount\Http\Controllers\CatalogRuleController@update')->defaults('_config', [
-                    'redirect' => 'admin.catalog-rule.index'
-                ])->name('admin.catalog-rule.update');
+                Route::post('cart-rules/edit/{id}', 'Webkul\CartRule\Http\Controllers\CartRuleController@update')->defaults('_config', [
+                    'redirect' => 'admin.cart-rules.index'
+                ])->name('admin.cart-rules.update');
 
-                Route::get('/catalog-rules/apply', 'Webkul\Discount\Http\Controllers\CatalogRuleController@applyRules')->defaults('_config', [
-                    'view' => 'admin::promotions.catalog-rule.index'
-                ])->name('admin.catalog-rule.apply');
+                Route::post('cart-rules/delete/{id}', 'Webkul\CartRule\Http\Controllers\CartRuleController@destroy')->name('admin.cart-rules.delete');
 
-                Route::post('/catalog-rules/delete/{id}', 'Webkul\Discount\Http\Controllers\CatalogRuleController@destroy')->name('admin.catalog-rule.delete');
+                Route::post('cart-rules/generate-coupons/{id?}', 'Webkul\CartRule\Http\Controllers\CartRuleController@generateCoupons')->name('admin.cart-rules.generate-coupons');
 
-                Route::get('/catalog-rules/declutter', 'Webkul\Discount\Http\Controllers\CatalogRuleController@deClutter')->defaults('_config', [
-                    'redirect' => 'admin.catalog-rule.index'
-                ])->name('admin.catalog-rule.declut');
+                Route::post('/massdelete', 'Webkul\CartRule\Http\Controllers\CartRuleCouponController@massDelete')->name('admin.cart-rule-coupons.mass-delete');
 
-                Route::post('fetch/options', 'Webkul\Discount\Http\Controllers\CatalogRuleController@fetchAttributeOptions')->name('admin.catalog-rule.options');
 
-                Route::get('cart-rules', 'Webkul\Discount\Http\Controllers\CartRuleController@index')->defaults('_config', [
-                    'view' => 'admin::promotions.cart-rule.index'
-                ])->name('admin.cart-rule.index');
+                //Catalog rules
+                Route::get('catalog-rules', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@index')->defaults('_config', [
+                    'view' => 'admin::promotions.catalog-rules.index'
+                ])->name('admin.catalog-rules.index');
 
-                Route::get('cart-rules/create', 'Webkul\Discount\Http\Controllers\CartRuleController@create')->defaults('_config', [
-                    'view' => 'admin::promotions.cart-rule.create'
-                ])->name('admin.cart-rule.create');
+                Route::get('catalog-rules/create', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@create')->defaults('_config', [
+                    'view' => 'admin::promotions.catalog-rules.create'
+                ])->name('admin.catalog-rules.create');
 
-                Route::post('cart-rules/store', 'Webkul\Discount\Http\Controllers\CartRuleController@store')->defaults('_config', [
-                    'redirect' => 'admin.cart-rule.index'
-                ])->name('admin.cart-rule.store');
+                Route::post('catalog-rules/create', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@store')->defaults('_config', [
+                    'redirect' => 'admin.catalog-rules.index'
+                ])->name('admin.catalog-rules.store');
 
-                Route::get('cart-rules/edit/{id}', 'Webkul\Discount\Http\Controllers\CartRuleController@edit')->defaults('_config', [
-                    'view' => 'admin::promotions.cart-rule.edit'
-                ])->name('admin.cart-rule.edit');
+                Route::get('catalog-rules/edit/{id}', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@edit')->defaults('_config', [
+                    'view' => 'admin::promotions.catalog-rules.edit'
+                ])->name('admin.catalog-rules.edit');
 
-                Route::post('cart-rules/update/{id}', 'Webkul\Discount\Http\Controllers\CartRuleController@update')->defaults('_config', [
-                    'redirect' => 'admin.cart-rule.index'
-                ])->name('admin.cart-rule.update');
+                Route::post('catalog-rules/edit/{id}', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@update')->defaults('_config', [
+                    'redirect' => 'admin.catalog-rules.index'
+                ])->name('admin.catalog-rules.update');
 
-                Route::post('cart-rules/delete/{id}', 'Webkul\Discount\Http\Controllers\CartRuleController@destroy')->name('admin.cart-rule.delete');
+                Route::post('catalog-rules/delete/{id}', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@destroy')->name('admin.catalog-rules.delete');
             });
 
             Route::prefix('cms')->group(function () {
diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_configuration.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_configuration.scss
index 2e2b3258d..c66e1bda9 100644
--- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_configuration.scss
+++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_configuration.scss
@@ -48,4 +48,29 @@
         border-bottom: 1px solid #e8e8e8;
         cursor: pointer;
     }
+}
+
+.cart-rule-conditions,
+.catalog-rule-conditions {
+    table {
+        td {
+            &.attribute {
+                width: 250px;
+                padding-left: 0;
+            }
+            
+            &.operator,
+            &.value {
+                width: 260px;
+            }
+
+            &.actions {
+                width: 44px;
+
+                .icon {
+                    margin-top: 6px;
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 12f184e84..2f7acfa1d 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -852,7 +852,7 @@ return [
     ],
 
     'footer' => [
-        'copy-right' => '© Copyright 2018 Webkul Software, All rights reserved.'
+        'copy-right' => ' مدعوم من <a href="https://bagisto.com/" target="_blank"> Bagisto </a> ، مشروع مجتمع بواسطة <a href="https://webkul.com/" target="_blank">Webkul</a>'
     ],
 
     'admin' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 6ddbe5966..5d0b7d911 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -73,7 +73,7 @@ return [
         'taxes' => 'Taxes',
         'tax-categories' => 'Tax Categories',
         'tax-rates' => 'Tax Rates',
-        'promotion' => 'Promotions',
+        'promotions' => 'Promotions',
         'discount' => 'Discount',
         'cms' => 'CMS'
     ],
@@ -110,7 +110,8 @@ return [
         'create' => 'Add',
         'delete' => 'Delete',
         'promotions' => 'Promotions',
-        'cart-rules' => 'Cart Rules'
+        'cart-rules' => 'Cart Rules',
+        'catalog-rules' => 'Catalog Rules',
     ],
 
     'dashboard' => [
@@ -203,7 +204,16 @@ return [
         'for-guest' => 'For Guest',
         'order_number' => 'Order Number',
         'refund-date' => 'Refund Date',
-        'refunded' => 'Refunded'
+        'refunded' => 'Refunded',
+        'start' => 'Start',
+        'end' => 'End',
+        'active' => 'Active',
+        'inactive' => 'Inactive',
+        'coupon-code' => 'Coupon Code',
+        'times-used' => 'Times Used',
+        'created-date' => 'Created Date',
+        'expiration-date' => 'Expiration Date',
+        'delete' => 'Delete'
     ],
 
     'account' => [
@@ -944,125 +954,138 @@ return [
         ]
     ],
 
-    'promotion' => [
-        'information' => 'Information',
-        'conditions' => 'Conditions',
-        'actions' => 'Actions',
-        'coupons' => 'Coupons',
-        'zero-unlimited' => 'Zero denotes unlimited usage here',
-        'catalog-rule' => 'Catalog Rules',
-        'cart-rule' => 'Cart Rules',
-        'add-catalog-rule' => 'Add Rule',
-        'add-cart-rule' => 'Add Cart Rule',
-        'edit-cart-rule' => 'Edit Cart Rule',
-        'edit-catalog-rule' => 'Edit Catalog Rule',
-        'create-catalog-rule' => 'Create Catalog Rule',
-        'create-cart-rule' => 'Create Cart Rule',
-        'save-btn-title' => 'Create',
-        'edit-btn-title' => 'Save',
-        'save' => 'Save',
-        'select-cart-attr' => 'Select Cart Attribute',
-        'select-products' => 'How to choose products ?',
-        'select-category' => 'Select by Categories',
-        'select-attribute' => 'Select by Attributes',
-        'cannot-activate-catalog-rule' => 'Cannot activate catalog rule',
-        'catalog-rule-already-activated' => 'Catalog rule is already activated',
-        'catalog-rule-activated' => 'Catalog rule is activated',
-        'select-attribute' => 'Select :attribute',
-        'enter-attribute' => 'Enter :attribute',
-        'add-condition' => 'Add Condition',
-        'cart-properties' => 'Cart Properties',
-        'yes' => 'Yes',
-        'no' => 'No',
-        'note' => 'Note',
-        'apply' => 'Apply',
-        'rule-name' => 'Enter Rule Name',
-        'rule-desc' => 'Enter Rule Description',
-        'convert-x-note' => 'If this section is left empty, then rule will get applied to all the products in the cart.',
-        'declut' => 'Declutter',
-        'processing-done' => 'Rules processing done',
-        'declut-success' => 'Catalog rules decluttering successful',
-        'declut-failure' => 'Catalog rules decluttering failed',
-        'add-attr-condition' => 'Add Attribute Condition',
-        'general-info' => [
-            'sku-like' => 'SKU Like',
-            'on-shipping' => 'If applied on shipping',
-            'discount' => 'Discount',
-            'shipping-apply-info' => 'It signifies how rule behaves when it is used for shipping',
-            'general-info' => 'General Info',
-            'options' => 'Options',
-            'name' => 'Rule Name',
-            'description' => 'Description',
-            'starts-from' => 'Start',
-            'ends-till' => 'End',
-            'channels' => 'Channels',
-            'channels-req' => 'Channels',
-            'cust-groups' => 'Customer Groups',
-            'priority' => 'Priority',
-            'add-condition' => 'Add Conditions',
-            'disc_amt' => 'Discount Amount',
-            'disc_percent' => 'Discount Percentage',
-            'is-coupon' => 'Use Coupon',
-            'is-coupon-yes' => 'Yes',
-            'is-coupon-no' => 'No',
-            'uses-per-cust' => 'Uses per customer',
-            'all' => 'All',
-            'any' => 'Any',
-            'end-other-rules' => 'End other rules',
-            'status' => 'Is Active',
-            'all-conditions-true' => 'Assuming all conditions are true',
-            'assuming' => 'Assuming',
-            'any' => 'Any',
-            'all' => 'All',
-            'conditions' => 'Conditions',
-            'apply' => 'Apply',
-            'are' => 'are',
-            'true' => 'true',
-            'false' => 'false',
-            'limit' => 'Usage Limit',
-            'specific-coupon' => 'Specific Coupon(Check) / Auto Generated(Unheck)',
-            'free-shipping' => 'Free Shipping',
-            'is-guest' => 'For Guests',
-            'disc_qty' => 'Max. Quantity Allowed To Be Discounted',
-            'test-mode' => 'Choose how to test conditions',
-            'labels' => 'Labels',
-            'prefix' => 'Prefix',
-            'suffix' => 'Suffix',
-            'code' => 'Code',
-            'global-label' => 'Global Label',
-            'label' => 'Label'
-        ],
-
-        'status' => [
-            'success' => 'Success! rule created',
-            'success-coupon' => 'Success! rule created along with coupon',
-            'failed' => 'Error! failed to create rule',
-            'update-success' => 'Success! rule updated',
-            'update-coupon-success' => 'Success! rule updated along with coupon',
-            'update-failed' => 'Error! cannot update',
-            'delete-success' => 'Success! rule deleted',
-            'delete-failed' => 'Error! cannot delete',
-            'coupon-applied' => 'Coupon used',
-            'coupon-failed' => 'Coupon failed to apply',
-            'no-coupon' => '* Coupon not applicable',
-            'coupon-removed' => 'Coupon removed successfully',
-            'coupon-remove-failed' => 'Coupon removal failed',
-            'duplicate-coupon' => 'Coupon already exists, please try again with a different coupon'
-        ],
-
-        'catalog' => [
+    'promotions' => [
+        'cart-rules' => [
+            'title' => 'Cart Rules',
+            'add-title' => 'Add Cart Rule',
+            'edit-title' => 'Edit Cart Rule',
+            'save-btn-title' => 'Save Cart Rule',
+            'rule-information' => 'Rule Information',
             'name' => 'Name',
             'description' => 'Description',
-            'apply-percent' => 'Apply as percentage',
-            'apply-fixed' => 'Apply as fixed amount',
-            'adjust-to-percent' => 'Adjust to percentage',
-            'adjust-to-value' => 'Adjust to discount value',
-            'condition-missing' => 'Please check conditons, some values might be missing'
+            'status' => 'Status',
+            'is-active' => 'Cart Rule is Active',
+            'channels' => 'Channels',
+            'customer-groups' => 'Customer Groups',
+            'coupon-type' => 'Coupon Type',
+            'no-coupon' => 'No Coupon',
+            'specific-coupon' => 'Specific Coupon',
+            'auto-generate-coupon' => 'Auto Generate Coupon',
+            'no' => 'No',
+            'yes' => 'Yes',
+            'coupon-code' => 'Coupon Code',
+            'uses-per-coupon' => 'Uses Per Coupon',
+            'uses-per-customer' => 'Uses Per Customer',
+            'uses-per-customer-control-info' => 'Will be used for logged in customers only.',
+            'from' => 'From',
+            'to' => 'To',
+            'priority' => 'Priority',
+            'conditions' => 'Conditions',
+            'condition-type' => 'Condition Type',
+            'all-conditions-true' => 'All Conditions are True',
+            'any-condition-true' => 'Any Condition is True',
+            'add-condition' => 'Add Condition',
+            'choose-condition-to-add' => 'Choose a condition to add',
+            'cart-attribute' => 'Cart Attribute',
+            'subtotal' => 'Subtotal',
+            'total-items-qty' => 'Total Items Qty',
+            'total-weight' => 'Total Weight',
+            'payment-method' => 'Payment Method',
+            'shipping-method' => 'Shipping Method',
+            'shipping-postcode' => 'Shipping Zip/Postcode',
+            'shipping-state' => 'Shipping State',
+            'shipping-country' => 'Shipping Country',
+            'cart-item-attribute' => 'Cart Item Attribute',
+            'price-in-cart' => 'Price in Cart',
+            'qty-in-cart' => 'Qty in Cart',
+            'product-attribute' => 'Product Attribute',
+            'attribute-name-children-only' => ':attribute_name (Children Only)',
+            'attribute-name-parent-only' => ':attribute_name (Parent Only)',
+            'is-equal-to' => 'Is equal to',
+            'is-not-equal-to' => 'Is not equal to',
+            'equals-or-greater-than' => 'Equals or greater than',
+            'equals-or-less-than' => 'Equals or less than',
+            'greater-than' => 'Greater than',
+            'less-than' => 'Less than',
+            'contain' => 'Contain',
+            'contains' => 'Contains',
+            'does-not-contain' => 'Does not contain',
+            'actions' => 'Actions',
+            'action-type' => 'Action Type',
+            'percentage-product-price' => 'Percentage of Product Price',
+            'fixed-amount' => 'Fixed Amount',
+            'fixed-amount-whole-cart' => 'Fixed Amount to Whole Cart',
+            'buy-x-get-y-free' => 'Buy X Get Y Free',
+            'discount-amount' => 'Discount Amount',
+            'discount-quantity' => 'Maximum Quantity Allowed to be Discounted',
+            'discount-step' => 'Buy X Quantity',
+            'free-shipping' => 'Free Shipping',
+            'apply-to-shipping' => 'Apply to Shipping',
+            'coupon-codes' => 'Coupon Codes',
+            'coupon-qty' => 'Coupon Qty',
+            'code-length' => 'Code Length',
+            'code-format' => 'Code Format',
+            'alphanumeric' => 'Alphanumeric',
+            'alphabetical' => 'Alphabetical',
+            'numeric' => 'Numeric',
+            'code-prefix' => 'Code Prefix',
+            'code-suffix' => 'Code Suffix',
+            'generate' => 'Generate',
+            'cart-rule-not-defind-error' => 'Cart rule is not defined',
+            'mass-delete-success' => 'All the selected index of coupons have been deleted successfully.',
+            'end-other-rules' => 'End Other Rules',
+            'children-categories' => 'Categories (Children Only)',
+            'parent-categories' => 'Categories (Parent Only)',
+            'categories' => 'Categories',
+            'attribute_family' => 'Attribute Family'
         ],
 
-        'cart' => [
-            'buy-atleast' => 'Buy Atleast',
-            'apply-to-shipping' => 'Apply to shipping'
+        'catalog-rules' => [
+            'title' => 'Catalog Rules',
+            'add-title' => 'Add Catalog Rule',
+            'edit-title' => 'Edit Catalog Rule',
+            'save-btn-title' => 'Save Catalog Rule',
+            'rule-information' => 'Rule Information',
+            'name' => 'Name',
+            'description' => 'Description',
+            'status' => 'Status',
+            'is-active' => 'Catalog Rule is Active',
+            'channels' => 'Channels',
+            'customer-groups' => 'Customer Groups',
+            'no' => 'No',
+            'yes' => 'Yes',
+            'from' => 'From',
+            'to' => 'To',
+            'priority' => 'Priority',
+            'conditions' => 'Conditions',
+            'condition-type' => 'Condition Type',
+            'all-conditions-true' => 'All Conditions are True',
+            'any-condition-true' => 'Any Condition is True',
+            'add-condition' => 'Add Condition',
+            'choose-condition-to-add' => 'Choose a condition to add',
+            'product-attribute' => 'Product Attribute',
+            'attribute-name-children-only' => ':attribute_name (Children Only)',
+            'attribute-name-parent-only' => ':attribute_name (Parent Only)',
+            'is-equal-to' => 'Is equal to',
+            'is-not-equal-to' => 'Is not equal to',
+            'equals-or-greater-than' => 'Equals or greater than',
+            'equals-or-less-than' => 'Equals or less than',
+            'greater-than' => 'Greater than',
+            'less-than' => 'Less than',
+            'contain' => 'Contain',
+            'contains' => 'Contains',
+            'does-not-contain' => 'Does not contain',
+            'actions' => 'Actions',
+            'action-type' => 'Action Type',
+            'percentage-product-price' => 'Percentage of Product Price',
+            'fixed-amount' => 'Fixed Amount',
+            'fixed-amount-whole-cart' => 'Fixed Amount to Whole Catalog',
+            'buy-x-get-y-free' => 'Buy X Get Y Free',
+            'discount-amount' => 'Discount Amount',
+            'mass-delete-success' => 'All the selected index of coupons have been deleted successfully.',
+            'end-other-rules' => 'End Other Rules',
+            'categories' => 'Categories',
+            'attribute_family' => 'Attribute Family'
         ]
     ],
 
@@ -1172,7 +1195,7 @@ return [
     ],
 
     'footer' => [
-        'copy-right' => '© Copyright 2018 Webkul Software, All rights reserved.'
+        'copy-right' => 'Powered by <a href="https://bagisto.com/" target="_blank">Bagisto</a>, A Community Project by <a href="https://webkul.com/" target="_blank">Webkul</a>',
     ],
 
     'admin' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index ad5d4ca54..7c8d247f6 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -998,7 +998,7 @@ return [
     ],
 
     'footer' => [
-        'copy-right' => '© کپی رایت 2019 کلیه حقوق محفوظ است.'
+        'copy-right' => 'طراحی شده توسط <a href="https://bagisto.com/" target="_blank">Bagisto</a> ، یک پروژه عمومی توسط <a href="https://webkul.com/" target="_blank">Webkul</a>'
     ],
 
     'admin' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index 3aeb94034..1c8a5d7d2 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -976,7 +976,7 @@ return [
     ],
 
     'footer' => [
-        'copy-right' => '© Copyright '.date('Y').' Webkul Software, Todos os direitos reservados.'
+        'copy-right' => 'Desenvolvido por <a href="https://bagisto.com/" target="_blank">Bagisto</a>, um projeto comunitário da <a href="https://webkul.com/" target="_blank">Webkul</a>'
     ],
 
     'admin' => [
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
index 1dcca7d44..0357d8f43 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
@@ -96,7 +96,7 @@
                                 @if (core()->getConfigData('general.content.footer.footer_content'))
                                     {{ core()->getConfigData('general.content.footer.footer_content') }}
                                 @else
-                                    {{ trans('admin::app.footer.copy-right') }}
+                                    {!! trans('admin::app.footer.copy-right') !!}
                                 @endif
                             </p>
                         </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
deleted file mode 100644
index 857b36306..000000000
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
+++ /dev/null
@@ -1,630 +0,0 @@
-@extends('admin::layouts.content')
-
-@section('page_title')
-    {{ __('admin::app.promotion.add-cart-rule') }}
-@stop
-
-@section('content')
-
-    <div class="content">
-        <cart-rule></cart-rule>
-    </div>
-
-    @push('scripts')
-        <script type="text/x-template" id="cart-rule-form-template">
-            <form method="POST" action="{{ route('admin.cart-rule.store') }}" @submit.prevent="onSubmit" autocomplete="off">
-                @csrf
-
-                <div class="page-header">
-                    <div class="page-title">
-                        <h1>
-                            <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
-
-                            {{ __('admin::app.promotion.add-cart-rule') }}
-                        </h1>
-                    </div>
-
-                    <div class="page-action">
-                        <button type="submit" class="btn btn-lg btn-primary">
-                            {{ __('admin::app.promotion.save-btn-title') }}
-                        </button>
-                    </div>
-                </div>
-
-                <div class="page-content">
-                    <div class="form-container">
-                        <div>
-                            @csrf()
-
-                            <accordian :active="true" title="{{ __('admin::app.promotion.information') }}">
-                                <div slot="body">
-                                    <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
-                                        <label for="name" class="required">{{ __('admin::app.promotion.general-info.name') }}</label>
-
-                                        <input type="text" class="control" name="name" v-model="name" v-validate="'required'" value="{{ old('name') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.name') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
-                                        <label for="description">{{ __('admin::app.promotion.general-info.description') }}</label>
-
-                                        <textarea class="control" name="description" v-model="description" value="{{ old('description') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.description') }}&quot;"></textarea>
-
-                                        <span class="control-error" v-if="errors.has('description')">@{{ errors.first('description') }}</span>
-                                    </div>
-
-                                    <datetime :name="starts_from">
-                                        <div class="control-group" :class="[errors.has('starts_from') ? 'has-error' : '']">
-                                            <label for="starts_from">{{ __('admin::app.promotion.general-info.starts-from') }}</label>
-
-                                            <input type="text" class="control" v-model="starts_from" name="starts_from" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.starts-from') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('starts_from')">@{{ errors.first('starts_from') }}</span>
-                                        </div>
-                                    </datetime>
-
-                                    <datetime :name="starts_from">
-                                        <div class="control-group" :class="[errors.has('ends_till') ? 'has-error' : '']">
-                                            <label for="ends_till">{{ __('admin::app.promotion.general-info.ends-till') }}</label>
-
-                                            <input type="text" class="control" v-model="ends_till" name="ends_till" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.ends-till') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('ends_till')">@{{ errors.first('ends_till') }}</span>
-                                        </div>
-                                    </datetime>
-
-                                    <div class="control-group" :class="[errors.has('customer_groups[]') ? 'has-error' : '']">
-                                        <label for="customer_groups" class="required">{{ __('admin::app.promotion.general-info.cust-groups') }}</label>
-
-                                        <select type="text" class="control" name="customer_groups[]" v-model="customer_groups" v-validate="'required'" value="{{ old('customer_groups[]') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.cust-groups') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Customer Group']) }}</option>
-                                            @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $channel)
-                                                <option value="{{ $channel->id }}">{{ $channel->name }}</option>
-                                            @endforeach
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
-                                        <label for="channels" class="required">{{ __('admin::app.promotion.general-info.channels') }}</label>
-
-                                        <select type="text" class="control" name="channels[]" v-model="channels" v-validate="'required'" value="{{ old('channels[]') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.channels-req') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Channels']) }}</option>
-                                            @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
-                                                <option value="{{ $channel->id }}">{{ $channel->name }}</option>
-                                            @endforeach
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.first('channels[]')">@{{ errors.first('channels[]') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('status') ? 'has-error' : '']">
-                                        <label for="status" class="required">{{ __('admin::app.promotion.general-info.status') }}</label>
-
-                                        <select type="text" class="control" name="status" v-model="status" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.status') }}&quot;">
-                                            <option value="1">Yes</option>
-                                            <option value="0">No</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('status')">@{{ errors.first('status') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('use_coupon') ? 'has-error' :
-                                    '']">
-                                        <label for="customer_groups" class="required">{{ __('admin::app.promotion.general-info.is-coupon') }}</label>
-
-                                        <select type="text" class="control" name="use_coupon" v-model="use_coupon" v-validate="'required'" value="{{ old('use_coupon')}}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.is-coupon') }}&quot;">
-                                            <option value="1" :selected="use_coupon == 1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
-                                            <option value="0" :selected="use_coupon == 0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('use_coupon')">@{{ errors.first('use_coupon') }}</span>
-                                    </div>
-
-                                    {{-- <div class="control-group" :class="[errors.has('auto_generation') ? 'has-error' : '']" v-if="use_coupon == 1">
-                                        <label for="auto_generation" class="required">{{ __('admin::app.promotion.general-info.specific-coupon') }}</label>
-
-                                        <input type="checkbox" class="control" name="auto_generation" v-model="auto_generation" value="{{ old('auto_generation') }}" data-vv-as="&quot;Specific Coupon&quot;" v-on:change="checkAutogen">
-
-                                        <span class="control-error" v-if="errors.has('auto_generation')">@{{ errors.first('auto_generation') }}</span>
-                                    </div> --}}
-
-                                    {{-- <input type="hidden" name="auto_generation" v-model="auto_generation"> --}}
-
-                                    {{-- <div class="control-group" :class="[errors.has('per_customer') ? 'has-error' : '']">
-                                        <label for="per_customer" class="required">{{ __('admin::app.promotion.general-info.uses-per-cust') }}</label>
-
-                                        <input type="number" step="1" class="control" name="per_customer" v-model="per_customer" v-validate="'required|numeric|min_value:0'" value="{{ old('per_customer') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.uses-per-cust') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('per_customer')">@{{ errors.first('per_customer') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('usage_limit') ? 'has-error' : '']">
-                                        <label for="usage_limit" class="required">{{ __('admin::app.promotion.general-info.limit') }}</label>
-
-                                        <input type="number" step="1" class="control" name="usage_limit" v-model="usage_limit" v-validate="'required|numeric|min_value:0'" value="{{ old('usage_limit') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.uses-per-cust') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('usage_limit')">@{{ errors.first('usage_limit') }}</span>
-                                    </div> --}}
-
-                                    <div class="control-group" :class="[errors.has('priority') ? 'has-error' : '']">
-                                        <label for="priority" class="required">{{ __('admin::app.promotion.general-info.priority') }}</label>
-
-                                        <input type="number" class="control" step="1" name="priority" v-model="priority" v-validate="'required|numeric|min_value:1'" value="{{ old('priority') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.priority') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('priority')">@{{ errors.first('priority') }}</span>
-                                    </div>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.conditions') }}">
-                                <div slot="body">
-                                    <input type="hidden" name="all_conditions" v-model="all_conditions">
-
-                                    {{-- <div class="add-condition">
-                                        <div class="control-group">
-                                            <label for="criteria" class="required">{{ __('admin::app.promotion.general-info.add-condition') }}</label>
-
-                                            <select type="text" class="control" v-model="criteria">
-                                                <option value="cart">{{ __('admin::app.promotion.cart-properties') }}</option>
-                                            </select>
-                                        </div>
-                                    </div> --}}
-
-                                    <div class="control-group">
-                                        {{ __('admin::app.promotion.general-info.test-mode') }}
-                                        <select class="control" v-model="match_criteria" style="margin-right: 15px;">
-                                            {{ $i = 0 }}
-                                            @foreach(config('pricerules.test_mode') as $key => $value)
-                                                <option value="{{ $key }}">{{ $value }}</option>
-                                                {{ $i++ }}
-                                            @endforeach
-                                        </select>
-                                    </div>
-
-                                    <div class="condition-set">
-                                        <!-- Cart Attributes -->
-                                        <div class="control-container mt-20" v-for="(condition, index) in conditions_list" :key="index">
-                                            <select class="control" name="cart_attributes[]" v-model="conditions_list[index].attribute" title="You Can Make Multiple Selections Here" style="margin-right: 15px; width: 30%;" v-on:change="enableCondition($event, index)">
-                                                <option disabled="disabled">{{ __('admin::app.select-option') }}</option>
-                                                <option v-for="(cart_ip, index1) in cart_input" :value="cart_ip.code" :key="index1">@{{ cart_ip.name }}</option>
-                                            </select>
-
-                                            <div v-if='conditions_list[index].type == "string"' style="display: flex">
-                                                <select class="control" name="cart_attributes[]" v-model="conditions_list[index].condition" style="margin-right: 15px;">
-                                                    <option v-for="(condition, index) in conditions.string" :value="index" :key="index">@{{ condition }}</option>
-                                                </select>
-
-                                                <div v-if='conditions_list[index].attribute == "shipping_state"'>
-                                                    <select class="control" v-model="conditions_list[index].value">
-                                                        <option disabled="disabled">{{ __('admin::app.select-option') }}</option>
-                                                        <optgroup v-for='(state, code) in country_and_states.states' :label="code">
-                                                            <option v-for="(stateObj, index) in state" :value="stateObj.code">@{{ stateObj.default_name }}</option>
-                                                        </optgroup>
-                                                    </select>
-                                                </div>
-
-                                                <div v-if='conditions_list[index].attribute == "shipping_country"'>
-                                                    <select class="control" v-model="conditions_list[index].value">
-                                                        <option disabled="disabled">{{ __('admin::app.select-option') }}</option>
-                                                        <option v-for="(country, index) in country_and_states.countries" :value="country.code">@{{ country.name }}</option>
-                                                    </select>
-                                                </div>
-
-                                                <input class="control" type="text" name="cart_attributes[]" v-model="conditions_list[index].value" placeholder="Enter Value" v-if='conditions_list[index].attribute != "shipping_state" && conditions_list[index].attribute != "shipping_country"'>
-                                            </div>
-
-                                            <div v-if='conditions_list[index].type == "numeric"' style="display: flex">
-                                                <select class="control" name="attributes[]" v-model="conditions_list[index].condition" style="margin-right: 15px;">
-                                                    <option v-for="(condition, index) in conditions.numeric" :value="index" :key="index">@{{ condition }}</option>
-                                                </select>
-
-                                                <input class="control" type="number" step="0.1000" name="cart_attributes[]" v-model="conditions_list[index].value" placeholder="Enter Value">
-                                            </div>
-
-                                            <span class="icon trash-icon" v-on:click="removeCartAttr(index)"></span>
-                                        </div>
-                                    </div>
-
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addCondition">{{ __('admin::app.promotion.add-condition') }}</span>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.actions') }}">
-                                <div slot="body">
-                                    <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
-                                        <label for="action_type" class="required">{{ __('admin::app.action') }}</label>
-
-                                        <select class="control" name="action_type" v-model="action_type" v-validate="'required'" value="{{ old('action_type') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.apply') }}&quot;" v-on:change="detectApply">
-                                            <option v-for="(action, index) in actions" :value="index">@{{ action }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('action_type')">@{{ errors.first('action_type') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('disc_amount') ? 'has-error' : '']">
-                                        <label for="disc_amount" class="required">{{ __('admin::app.promotion.general-info.disc_amt') }}</label>
-
-                                        <input type="number" step="0.0001" class="control" name="disc_amount" v-model="disc_amount" v-validate="'required|min_value:0.0001'" value="{{ old('disc_amount') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.disc_amt') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('disc_amount')">@{{ errors.first('disc_amount') }}</span>
-                                    </div>
-
-                                    {{-- <div class="control-group" :class="[errors.has('disc_threshold') ? 'has-error' : '']">
-                                        <label for="disc_threshold" class="required">{{ __('admin::app.promotion.cart.buy-atleast') }}</label>
-
-                                        <input type="number" step="1" class="control" name="disc_threshold" v-model="disc_threshold" v-validate="'required|numeric|min_value:1'" value="{{ old('disc_threshold') }}" data-vv-as="&quot;{{ __('admin::app.promotion.cart.buy-atleast') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('disc_threshold')">@{{ errors.first('disc_threshold') }}</span>
-                                    </div> --}}
-
-                                    <div class="control-group" :class="[errors.has('disc_quantity') ? 'has-error' : '']">
-                                        <label for="disc_quantity" class="required">{{ __('admin::app.promotion.general-info.disc_qty') }}</label>
-
-                                        <input type="number" step="1" class="control" name="disc_quantity" v-model="disc_quantity" v-validate="'required|decimal|min_value:1'" value="{{ old('disc_quantity') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.disc_qty') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('disc_quantity')">@{{ errors.first('disc_quantity') }}</span>
-                                    </div>
-
-                                    <div class="boolean-control-container">
-                                        <div class="control-group" :class="[errors.has('free_shipping') ? 'has-error' : '']">
-                                            <label for="free_shipping" class="required">{{ __('admin::app.promotion.general-info.free-shipping') }}</label>
-
-                                            <select type="text" class="control" name="free_shipping" v-model="free_shipping" v-validate="'required'" value="{{ old('free_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.free-shipping') }}&quot;">
-                                                <option value="1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
-
-                                                <option value="0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
-                                            </select>
-
-                                            <span class="control-error" v-if="errors.has('free_shipping')">@{{ errors.first('free_shipping') }}</span>
-                                        </div>
-
-                                        <div class="control-group" :class="[errors.has('apply_to_shipping') ? 'has-error' : '']">
-                                            <label for="customer_groups" class="required">{{ __('admin::app.promotion.cart.apply-to-shipping') }}</label>
-
-                                            <select type="text" class="control" name="apply_to_shipping" v-model="apply_to_shipping" v-validate="'required'" value="{{ old('apply_to_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.cart.apply-to-shipping') }}&quot;">
-                                                <option value="1" :selected="apply_to_shipping == 0">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
-
-                                                <option value="0" :selected="apply_to_shipping == 1">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
-                                            </select>
-
-                                            <span class="control-error" v-if="errors.has('apply_to_shipping')">@{{ errors.first('apply_to_shipping') }}</span>
-                                        </div>
-
-                                        <div class="control-group" :class="[errors.has('end_other_rules') ? 'has-error' : '']">
-                                            <label for="end_other_rules" class="required">{{ __('admin::app.promotion.general-info.end-other-rules') }}</label>
-
-                                            <select type="text" class="control" name="end_other_rules" v-model="end_other_rules" v-validate="'required'" value="{{ old('end_other_rules')}}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.end-other-rules') }}&quot;">
-                                                <option value="1" :selected="end_other_rules == 1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
-                                                <option value="0" :selected="end_other_rules == 0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
-                                            </select>
-
-                                            <span class="control-error" v-if="errors.has('end_other_rules')">@{{ errors.first('end_other_rules') }}</span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.coupons') }}" v-if="use_coupon == 1">
-                                <div slot="body">
-
-                                    {{-- <div v-if="!auto_generation">
-                                        <div class="control-group" :class="[errors.has('prefix') ? 'has-error' : '']">
-                                            <label for="prefix" class="required">{{ __('admin::app.promotion.general-info.prefix') }}</label>
-
-                                            <input type="text" class="control" name="prefix" v-model="prefix" v-validate="'alpha'" value="{{ old('prefix') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.prefix') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('prefix')">@{{ errors.first('prefix') }}</span>
-                                        </div>
-
-                                        <div class="control-group" :class="[errors.has('suffix') ? 'has-error' : '']"">
-                                            <label for="suffix" class="required">{{ __('admin::app.promotion.general-info.suffix') }}</label>
-
-                                            <input type="text" class="control" name="suffix" v-model="suffix" v-validate="'alpha'" value="{{ old('suffix') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.suffix') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('suffix')">@{{ errors.first('suffix') }}</span>
-                                        </div>
-                                    </div> --}}
-
-                                    <div>
-                                        <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
-                                            <label for="code" class="required">{{ __('admin::app.promotion.general-info.code') }}</label>
-
-                                            <input type="text" class="control" name="code" v-model="code" v-validate="'required'" value="{{ old('code') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.code') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="true" title="{{ __('admin::app.promotion.select-products') }}">
-                                <div slot="body">
-                                    <input type="hidden" name="all_attributes" v-model="all_attributes">
-
-                                    <div class="control-group" :class="[errors.has('category_values') ? 'has-error' : '']">
-                                        <label class="mb-10" for="categories">{{ __('admin::app.promotion.select-category') }}</label>
-
-                                        <multiselect v-model="category_values" :close-on-select="false" :options="category_options" :searchable="false" :custom-label="categoryLabel" :show-labels="true" placeholder="Select Categories" track-by="slug" :multiple="true"></multiselect>
-                                    </div>
-
-                                    <label class="mb-10" for="attributes">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Attribute']) }}</label>
-
-                                    <br/>
-
-                                    <div class="control-container mt-20" v-for="(condition, index) in attribute_values" :key="index">
-                                        <select class="control" v-model="attribute_values[index].attribute" title="You Can Make Multiple Selections Here" style="margin-right: 15px; width: 30%;" v-on:change="enableAttributeCondition($event, index)">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-
-                                            <option v-for="(attr_ip, index1) in attribute_input" :value="attr_ip.code" :key="index1">@{{ attr_ip.name }}</option>
-                                        </select>
-
-                                        <select class="control" v-model="attribute_values[index].condition" style="margin-right: 15px;">
-                                            <option v-for="(condition, index) in conditions.string" :value="index" :key="index">@{{ condition }}</option>
-                                        </select>
-
-                                        <div v-show='attribute_values[index].type == "select" || attribute_values[index].type == "multiselect"' style="display: flex;">
-                                            <select class="control" v-model="attribute_values[index].value" style="margin-right: 15px; height: 100px" :multiple="true">
-                                                <option :disabled="true">
-                                                    {{ __('ui::form.select-attribute', ['attribute' => 'Values']) }}
-                                                </option>
-
-                                                <option v-for="(label, index2) in attribute_values[index].options" :value="label.id" :key="index2">@{{ label.admin_name }}</option>
-                                            </select>
-
-                                            {{-- <multiselect v-model="attribute_values[index].value" :close-on-select="false" :options="attribute_values[index].options" :searchable="false" :track-by="admin_name" :custom-label="attributeListLabel" :multiple="true" ></multiselect> --}}
-                                        </div>
-
-                                        <div v-show='attribute_values[index].type == "text" || attribute_values[index].type == "textarea" || attribute_values[index].type == "price" || attribute_values[index].type == "textarea"' style="display: flex">
-                                            <input class="control" v-model="attribute_values[index].value" type="text" placeholder="{{ __('ui::form.enter-attribute', ['attribute' => 'Text']) }}">
-                                        </div>
-
-                                        <span class="icon trash-icon" v-on:click="removeAttr(index)"></span>
-                                    </div>
-
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addAttributeCondition">{{ __('admin::app.promotion.add-attr-condition') }}</span>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" :title="'{{ __('admin::app.promotion.general-info.labels') }}'">
-                                <div slot="body">
-                                    <div class="control-group" :class="[errors.has('label') ? 'has-error' : '']" v-if="dedicated_label">
-                                        <label for="label">{{ __('admin::app.promotion.general-info.global-label') }}</label>
-
-                                        <input type="text" class="control" name="label[global]" v-model="label.global" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.label') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('label')">@{{ errors.first('label') }}</span>
-                                    </div>
-
-                                    <div v-if="label.global == null || label.global == ''">
-                                    @foreach(core()->getAllChannels() as $channel)
-                                        @foreach($channel->locales as $locale)
-                                            <div class="control-group" :class="[errors.has('label') ? 'has-error' : '']">
-                                                <label for="code">{{ __('admin::app.label') }}<span class="locale">[{{ $channel->code }} - {{ $locale->code }}]</span></label>
-
-                                                <input type="text" class="control" name="label[{{ $channel->code }}][{{ $locale->code }}]" v-model="label.{{ $channel->code }}.{{ $locale->code }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.label') }}&quot;">
-
-                                                <span class="control-error" v-if="errors.has('label')">@{{ errors.first('label') }}</span>
-                                            </div>
-                                        @endforeach
-                                    @endforeach
-                                    </div>
-                                </div>
-                            </accordian>
-                        </div>
-                    </div>
-                </div>
-            </form>
-        </script>
-
-        <script>
-            Vue.component('cart-rule', {
-                template: '#cart-rule-form-template',
-
-                inject: ['$validator'],
-
-                data () {
-                    return {
-                        name: null,
-                        description: null,
-                        conditions_list: [],
-                        channels: ['{{ core()->getCurrentChannel()->id }}'],
-                        customer_groups: ['{{ app('Webkul\Customer\Repositories\CustomerGroupRepository')->findOneWhere(["code" => "general"])->id }}'],
-                        ends_till: null,
-                        starts_from: null,
-                        priority: 0,
-                        per_customer: 0,
-                        status: 0,
-                        use_coupon: 0,
-                        auto_generation: false,
-                        usage_limit: 0,
-
-                        action_type: null,
-                        apply: null,
-                        apply_to_shipping: 0,
-                        disc_amount: 1,
-                        // disc_threshold: null,
-                        disc_quantity: 1,
-                        end_other_rules: 0,
-                        coupon_type: null,
-                        free_shipping: 0,
-
-                        all_conditions: [],
-                        match_criteria: 'all_are_true',
-
-                        all_attributes: {
-                            'categories' : [],
-                            'attributes' : []
-                        },
-
-                        code: null,
-                        suffix: null,
-                        prefix: null,
-                        dedicated_label: true,
-
-                        label: {
-                            global: null,
-                            @foreach(core()->getAllChannels() as $channel)
-                                @foreach($channel->locales as $locale)
-                                    {{ trim($channel->code) }} : {
-                                        {{ trim($locale->code) }}: ''
-                                    },
-                                @endforeach
-                            @endforeach
-                        },
-
-                        criteria: 'cart',
-                        conditions: @json($cart_rule[0]).conditions,
-                        cart_input: @json($cart_rule[0]).attributes,
-                        actions: @json($cart_rule[0]).actions,
-                        cart_object: {
-                            attribute: [],
-                            condition: [],
-                            value: []
-                        },
-                        country_and_states: @json($cart_rule[2]),
-
-                        category_options: @json($cart_rule[1]),
-                        category_values: [],
-
-                        attribute_values: [],
-                        attr_object: {
-                            attribute: null,
-                            condition: null,
-                            value: [],
-                            options: []
-                        },
-                        attribute_input: @json($cart_rule[3]),
-                    }
-                },
-
-                methods: {
-                    categoryLabel (option) {
-                        return option.name + ' [ ' + option.slug + ' ]';
-                    },
-
-                    attributeListLabel(option) {
-                        return option.label;
-                    },
-
-                    addCondition () {
-                        if (this.criteria == 'product_subselection' || this.criteria == 'cart') {
-                            this.condition_on = this.criteria;
-                        } else {
-                            alert('Please select type of condition');
-
-                            return false;
-                        }
-
-                        if (this.condition_on == 'cart') {
-                            this.conditions_list.push(this.cart_object);
-
-                            this.cart_object = {
-                                attribute: null,
-                                condition: null,
-                                value: []
-                            };
-                        }
-                    },
-
-                    addAttributeCondition() {
-                        this.attribute_values.push(this.attr_object);
-
-                        this.attr_object = {
-                            attribute: null,
-                            condition: null,
-                            value: [],
-                            options: []
-                        };
-                    },
-
-                    checkAutogen() {
-                    },
-
-                    detectApply() {
-                        return;
-                    },
-
-                    enableCondition(event, index) {
-                        selectedIndex = event.target.selectedIndex - 1;
-
-                        for (i in this.cart_input) {
-                            if (i == selectedIndex) {
-                                this.conditions_list[index].type = this.cart_input[i].type;
-                            }
-                        }
-                    },
-
-                    enableAttributeCondition (event, index) {
-                        selectedIndex = event.target.selectedIndex - 1;
-
-                        for(i in this.attribute_input) {
-                            if (i == selectedIndex) {
-                                if (this.attribute_input[i].has_options == true) {
-                                    this.attribute_values[index].options = this.attribute_input[i].options;
-                                }
-
-                                this.attribute_values[index].type = this.attribute_input[i].type;
-                            }
-                        }
-                    },
-
-                    // useCoupon() {
-                    //     if (this.use_coupon == 0) {
-                    //         this.auto_generation = null;
-                    //     } else {
-                    //         this.auto_generation = true;
-                    //     }
-                    // },
-
-                    removeCartAttr(index) {
-                        this.conditions_list.splice(index, 1);
-                    },
-
-                    removeAttr(index) {
-                        this.attribute_values.splice(index, 1);
-                    },
-
-                    onSubmit: function (e) {
-                        if (this.attribute_values.length != 0 || this.category_values.length != 0) {
-                            for (i in this.attribute_values) {
-                                delete this.attribute_values[i].options;
-                            }
-
-                            this.all_attributes.categories = this.category_values;
-
-                            this.all_attributes.attributes = this.attribute_values;
-
-                        }
-
-                        this.all_attributes = JSON.stringify(this.all_attributes);
-
-                        if (this.conditions_list != null && this.conditions_list.length != 0) {
-                            this.conditions_list.push({'criteria': this.match_criteria});
-
-                            this.all_conditions = JSON.stringify(this.conditions_list);
-
-                            this.conditions_list.pop();
-                        }
-
-                        this.$validator.validateAll().then(result => {
-                            if (result) {
-                                e.target.submit();
-                            }
-                        });
-                    },
-
-                    addFlashMessages() {
-                        const flashes = this.$refs.flashes;
-
-                        flashMessages.forEach(function(flash) {
-                            flashes.addFlash(flash);
-                        }, this);
-                    }
-                }
-            });
-        </script>
-    @endpush
-@stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
deleted file mode 100644
index 27312c327..000000000
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
+++ /dev/null
@@ -1,740 +0,0 @@
-@extends('admin::layouts.content')
-
-@section('page_title')
-    {{ __('admin::app.promotion.edit-cart-rule') }}
-@stop
-
-@section('content')
-
-    <div class="content">
-        <cart-rule></cart-rule>
-    </div>
-
-    @push('scripts')
-        <script type="text/x-template" id="cart-rule-form-template">
-            <form method="POST" action="{{ route('admin.cart-rule.update', $cart_rule[3]->id) }}" @submit.prevent="onSubmit">
-                @csrf
-
-                <div class="page-header">
-                    <div class="page-title">
-                        <h1>
-                            <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
-
-                            {{ __('admin::app.promotion.edit-cart-rule') }}
-                        </h1>
-                    </div>
-
-                    <div class="page-action">
-                        <button type="submit" class="btn btn-lg btn-primary">
-                            {{ __('admin::app.promotion.save') }}
-                        </button>
-                    </div>
-                </div>
-
-                <div class="page-content">
-                    <div class="form-container">
-                        <div>
-                            @csrf()
-
-                            <accordian :active="true" title="{{ __('admin::app.promotion.information') }}">
-                                <div slot="body">
-                                    <input type="hidden" name="all_conditions" v-model="all_conditions">
-
-                                    <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
-                                        <label for="name" class="required">{{ __('admin::app.promotion.general-info.name') }}</label>
-
-                                        <input type="text" class="control" name="name" v-model="name" v-validate="'required'" value="{{ old('name') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.name') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
-                                        <label for="description">{{ __('admin::app.promotion.general-info.description') }}</label>
-
-                                        <textarea class="control" name="description" v-model="description" value="{{ old('description') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.description') }}&quot;"></textarea>
-
-                                        <span class="control-error" v-if="errors.has('description')">@{{ errors.first('description') }}</span>
-                                    </div>
-
-                                    <datetime :name="starts_from">
-                                        <div class="control-group" :class="[errors.has('starts_from') ? 'has-error' : '']">
-                                            <label for="starts_from">{{ __('admin::app.promotion.general-info.starts-from') }}</label>
-
-                                            <input type="text" class="control" v-model="starts_from" name="starts_from" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.starts-from') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('starts_from')">@{{ errors.first('starts_from') }}</span>
-                                        </div>
-                                    </datetime>
-
-                                    <datetime :name="starts_from">
-                                        <div class="control-group" :class="[errors.has('ends_till') ? 'has-error' : '']">
-                                            <label for="ends_till">{{ __('admin::app.promotion.general-info.ends-till') }}</label>
-
-                                            <input type="text" class="control" v-model="ends_till" name="ends_till" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.ends-till') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('ends_till')">@{{ errors.first('ends_till') }}</span>
-                                        </div>
-                                    </datetime>
-
-                                    <div class="control-group" :class="[errors.has('customer_groups[]') ? 'has-error' : '']">
-                                        <label for="customer_groups" class="required">{{ __('admin::app.promotion.general-info.cust-groups') }}</label>
-
-                                        <select type="text" class="control" name="customer_groups[]" v-model="customer_groups" v-validate="'required'" value="{{ old('customer_groups[]') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.cust-groups') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Customer Group']) }}</option>
-                                            @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $customerGroup)
-                                                <option value="{{ $customerGroup->id }}">{{ $customerGroup->name }}</option>
-                                            @endforeach
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
-                                        <label for="channels" class="required">{{ __('admin::app.promotion.general-info.channels') }}</label>
-
-                                        <select type="text" class="control" name="channels[]" v-model="channels" v-validate="'required'" value="{{ old('channels[]') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.channels-req') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Channels']) }}</option>
-                                            @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
-                                                <option value="{{ $channel->id }}">{{ $channel->name }}</option>
-                                            @endforeach
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.first('channels[]')">@{{ errors.first('channels[]') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('status') ? 'has-error' : '']">
-                                        <label for="status" class="required">{{ __('admin::app.promotion.general-info.status') }}</label>
-
-                                        <select type="text" class="control" name="status" v-model="status" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.status') }}&quot;">
-                                            {{-- <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Status']) }}</option> --}}
-                                            <option value="1">{{ __('admin::app.promotion.yes') }}</option>
-                                            <option value="0">{{ __('admin::app.promotion.no') }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('status')">@{{ errors.first('status') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('use_coupon') ? 'has-error' :
-                                    '']">
-                                        <label for="customer_groups" class="required">{{ __('admin::app.promotion.general-info.is-coupon') }}</label>
-
-                                        <select type="text" class="control" name="use_coupon" v-model="use_coupon" v-validate="'required'" value="{{ old('use_coupon')}}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.is-coupon') }}&quot;" v-on:change="useCoupon">
-                                            <option value="1" :selected="use_coupon == 1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
-                                            <option value="0" :selected="use_coupon == 0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('use_coupon')">@{{ errors.first('use_coupon') }}</span>
-                                    </div>
-
-                                    {{-- <div class="control-group" :class="[errors.has('auto_generation') ? 'has-error' : '']" v-if="use_coupon == 1">
-                                        <label for="auto_generation" class="required">{{ __('admin::app.promotion.general-info.specific-coupon') }}</label>
-
-                                        <input type="checkbox" class="control" name="auto_generation" v-model="auto_generation" value="{{ old('auto_generation') }}" data-vv-as="&quot;Specific Coupon&quot;" v-on:change="checkAutogen">
-
-                                        <span class="control-error" v-if="errors.has('auto_generation')">@{{ errors.first('auto_generation') }}</span>
-                                    </div> --}}
-
-                                    {{-- <input type="hidden" name="auto_generation" v-model="auto_generation"> --}}
-
-                                    {{-- <div class="control-group" :class="[errors.has('per_customer') ? 'has-error' : '']">
-                                        <label for="per_customer" class="required">{{ __('admin::app.promotion.general-info.uses-per-cust') }}</label>
-
-                                        <input type="number" step="1" class="control" name="per_customer" v-model="per_customer" v-validate="'required|numeric|min_value:0'" value="{{ old('per_customer') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.uses-per-cust') }}&quot;">
-
-                                        <figcaption class="required">* {{ __('admin::app.promotion.zero-unlimited') }}</figcaption>
-
-                                        <span class="control-error" v-if="errors.has('per_customer')">@{{ errors.first('per_customer') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('usage_limit') ? 'has-error' : '']">
-                                        <label for="usage_limit" class="required">{{ __('admin::app.promotion.general-info.limit') }}</label>
-
-                                        <input type="number" step="1" class="control" name="usage_limit" v-model="usage_limit" v-validate="'required|numeric|min_value:0'" value="{{ old('usage_limit') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.uses-per-cust') }}&quot;">
-
-                                        <figcaption class="required">* {{ __('admin::app.promotion.zero-unlimited') }}</figcaption>
-
-                                        <span class="control-error" v-if="errors.has('usage_limit')">@{{ errors.first('usage_limit') }}</span>
-                                    </div> --}}
-
-                                    <div class="control-group" :class="[errors.has('priority') ? 'has-error' : '']">
-                                        <label for="priority" class="required">{{ __('admin::app.promotion.general-info.priority') }}</label>
-
-                                        <input type="number" class="control" step="1" name="priority" v-model="priority" v-validate="'required|numeric|min_value:1'" value="{{ old('priority') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.priority') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('priority')">@{{ errors.first('priority') }}</span>
-                                    </div>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.conditions') }}">
-                                <div slot="body">
-                                    <input type="hidden" name="all_conditions" v-model="all_conditions">
-
-                                    {{-- <div class="add-condition">
-                                        <div class="control-group">
-                                            <label for="criteria" class="required">{{ __('admin::app.promotion.general-info.add-condition') }}</label>
-
-                                            <select type="text" class="control" v-model="criteria">
-                                                <option value="cart">Cart Properties</option>
-                                            </select>
-                                        </div>
-                                    </div> --}}
-
-                                    <div class="control-group">
-                                        {{ __('admin::app.promotion.general-info.test-mode') }}
-                                        <select class="control" v-model="match_criteria" style="margin-right: 15px;">
-                                            {{ $i = 0 }}
-                                            @foreach(config('pricerules.test_mode') as $key => $value)
-                                                <option value="{{ $key }}">{{ $value }}</option>
-                                                {{ $i++ }}
-                                            @endforeach
-                                        </select>
-                                    </div>
-
-                                    <div class="condition-set">
-                                        <!-- Cart Attributes -->
-                                        <div class="control-container mt-20" v-for="(condition, index) in conditions_list" :key="index">
-                                            <select class="control" name="cart_attributes[]" v-model="conditions_list[index].attribute" title="You Can Make Multiple Selections Here" style="margin-right: 15px; width: 30%;" v-on:change="enableCondition($event, index)">
-                                                <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-                                                <option v-for="(cart_ip, index1) in cart_input" :value="cart_ip.code" :key="index1">@{{ cart_ip.name }}</option>
-                                            </select>
-
-                                            <div v-if='conditions_list[index].type == "string"' style="display: flex">
-                                                <select class="control" name="cart_attributes[]" v-model="conditions_list[index].condition" style="margin-right: 15px;">
-                                                    <option v-for="(condition, index) in conditions.string" :value="index" :key="index">@{{ condition }}</option>
-                                                </select>
-
-                                                <div v-if='conditions_list[index].attribute == "shipping_state"'>
-                                                    <select class="control" v-model="conditions_list[index].value">
-                                                        <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'State']) }}</option>
-                                                        <optgroup v-for='(state, code) in country_and_states.states' :label="code">
-                                                            <option v-for="(stateObj, index) in state" :value="stateObj.code">@{{ stateObj.default_name }}</option>
-                                                        </optgroup>
-                                                    </select>
-                                                </div>
-
-                                                <div v-if='conditions_list[index].attribute == "shipping_country"'>
-                                                    <select class="control" v-model="conditions_list[index].value">
-                                                        <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Country']) }}</option>
-                                                        <option v-for="(country, index) in country_and_states.countries" :value="country.code">@{{ country.name }}</option>
-                                                    </select>
-                                                </div>
-
-                                                <input class="control" type="text" name="cart_attributes[]" v-model="conditions_list[index].value" placeholder="{{ __('admin::app.promotion.enter-attribtue', ['attrbibute' => 'Value']) }}" v-if='conditions_list[index].attribute != "shipping_state" && conditions_list[index].attribute != "shipping_country"'>
-                                            </div>
-
-                                            <div v-if='conditions_list[index].type == "numeric"' style="display: flex">
-                                                <select class="control" name="attributes[]" v-model="conditions_list[index].condition" style="margin-right: 15px;">
-                                                    <option v-for="(condition, index) in conditions.numeric" :value="index" :key="index">@{{ condition }}</option>
-                                                </select>
-
-                                                <input class="control" type="number" step="0.1000" name="cart_attributes[]" v-model="conditions_list[index].value">
-                                            </div>
-
-                                            <span class="icon trash-icon" v-on:click="removeCartAttr(index)"></span>
-                                        </div>
-                                    </div>
-
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addCondition">{{ __('admin::app.promotion.add-condition') }}</span>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.actions') }}">
-                                <div slot="body">
-                                    <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
-                                        <label for="action_type" class="required">{{ __('admin::app.action') }}</label>
-
-                                        <select class="control" name="action_type" v-model="action_type" v-validate="'required'" value="{{ old('action_type') }}" data-vv-as="&quot;Apply As&quot;" v-on:change="detectApply">
-                                            <option v-for="(action, index) in actions" :value="index">@{{ action }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('action_type')">@{{ errors.first('action_type') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('disc_amount') ? 'has-error' : '']">
-                                        <label for="disc_amount" class="required">{{ __('admin::app.promotion.general-info.disc_amt') }}</label>
-
-                                        <input type="number" step="0.0001" class="control" name="disc_amount" v-model="disc_amount" v-validate="'required|decimal|min_value:0.0001'" value="{{ old('disc_amount') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.disc_amt') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('disc_amount')">@{{ errors.first('disc_amount') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('disc_quantity') ? 'has-error' : '']">
-                                        <label for="disc_quantity" class="required">{{ __('admin::app.promotion.general-info.disc_qty') }}</label>
-
-                                        <input type="number" step="1" class="control" name="disc_quantity" v-model="disc_quantity" v-validate="'required|decimal|min_value:1'" value="{{ old('disc_quantity') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.disc_qty') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('disc_quantity')">@{{ errors.first('disc_quantity') }}</span>
-                                    </div>
-
-                                    <div class="boolean-control-container">
-                                        <div class="control-group" :class="[errors.has('free_shipping') ? 'has-error' : '']">
-                                            <label for="free_shipping" class="required">{{ __('admin::app.promotion.general-info.free-shipping') }}</label>
-
-                                            <select type="text" class="control" name="free_shipping" v-model="free_shipping" v-validate="'required'" value="{{ old('free_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.free-shipping') }}&quot;">
-                                                <option value="1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
-
-                                                <option value="0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
-                                            </select>
-
-                                            <span class="control-error" v-if="errors.has('free_shipping')">@{{ errors.first('free_shipping') }}</span>
-                                        </div>
-
-                                        <div class="control-group" :class="[errors.has('apply_to_shipping') ? 'has-error' : '']">
-                                            <label for="apply_to_shipping" class="required">{{ __('admin::app.promotion.cart.apply-to-shipping') }}</label>
-
-                                            <select type="text" class="control" name="apply_to_shipping" v-model="apply_to_shipping" v-validate="'required'" value="{{ old('apply_to_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.cart.apply-to-shipping') }}&quot;">
-                                                <option value="1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
-
-                                                <option value="0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
-                                            </select>
-
-                                            <span class="control-error" v-if="errors.has('apply_to_shipping')">@{{ errors.first('apply_to_shipping') }}</span>
-                                        </div>
-
-                                        <div class="control-group" :class="[errors.has('end_other_rules') ? 'has-error' : '']">
-                                            <label for="end_other_rules" class="required">{{ __('admin::app.promotion.general-info.end-other-rules') }}</label>
-
-                                            <select type="text" class="control" name="end_other_rules" v-model="end_other_rules" v-validate="'required'" value="{{ old('end_other_rules')}}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.end-other-rules') }}&quot;">
-                                                <option value="1" :selected="end_other_rules == 1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
-                                                <option value="0" :selected="end_other_rules == 0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
-                                            </select>
-
-                                            <span class="control-error" v-if="errors.has('end_other_rules')">@{{ errors.first('end_other_rules') }}</span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.coupons') }}" v-if="use_coupon == 1">
-                                <div slot="body">
-                                    {{-- <div v-if="!auto_generation">
-                                        <div class="control-group" :class="[errors.has('prefix') ? 'has-error' : '']">
-                                            <label for="prefix" class="required">{{ __('admin::app.promotion.general-info.prefix') }}</label>
-
-                                        <input type="text" class="control" name="prefix" v-model="prefix" value="{{ old('prefix') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.prefix') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('prefix')">@{{ errors.first('prefix') }}</span>
-                                        </div>
-
-                                        <div class="control-group" :class="[errors.has('suffix') ? 'has-error' : '']"">
-                                            <label for="suffix" class="required">{{ __('admin::app.promotion.general-info.suffix') }}</label>
-
-                                            <input type="text" class="control" name="suffix" v-model="suffix" value="{{ old('suffix') }}" data-vv-as="&quot;suffix&quot;">
-
-                                            <span class="control-error" v-if="errors.has('suffix')">@{{ errors.first('suffix') }}</span>
-                                        </div>
-                                    </div> --}}
-
-                                    {{-- <div v-if="auto_generation != 0"> --}}
-                                    <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
-                                        <label for="code" class="required">{{ __('admin::app.promotion.general-info.code') }}</label>
-
-                                        <input type="text" class="control" name="code" v-model="code" v-validate="'required'" value="{{ old('code') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.code') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
-                                    </div>
-                                    {{-- </div> --}}
-                                </div>
-                            </accordian>
-
-                            <accordian :active="true" title="{{ __('admin::app.promotion.select-products') }}">
-                                <div slot="body">
-                                    <input type="hidden" name="all_attributes" v-model="all_attributes">
-
-                                    <span class="info mb-20" style="display: block;">
-                                        <b>{{ __('admin::app.promotion.note') }}:</b>
-
-                                        {{ __('admin::app.promotion.convert-x-note') }}
-                                    </span>
-
-                                    <div class="control-group" :class="[errors.has('category_values') ? 'has-error' : '']">
-                                        <label class="mb-10" for="categories">{{ __('admin::app.promotion.select-category') }}</label>
-
-                                        <multiselect v-model="category_values" :close-on-select="false" :options="category_options" :searchable="false" :custom-label="categoryLabel" :show-labels="true" placeholder="{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Categories']) }}" track-by="slug" :multiple="true"></multiselect>
-                                    </div>
-
-                                    <label class="mb-10" for="attributes">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</label>
-
-                                    <br/>
-
-                                    <div class="control-container mt-20" v-for="(condition, index) in attribute_values" :key="index">
-                                        <select class="control" v-model="attribute_values[index].attribute" title="You Can Make Multiple Selections Here" style="margin-right: 15px; width: 30%;" v-on:change="enableAttributeCondition($event, index)">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-
-                                            <option v-for="(attr_ip, index1) in attribute_input" :value="attr_ip.code" :key="index1">@{{ attr_ip.name }}</option>
-                                        </select>
-
-                                        <select class="control" v-model="attribute_values[index].condition" style="margin-right: 15px;">
-                                            <option v-for="(condition, index) in conditions.string" :value="index" :key="index">@{{ condition }}</option>
-                                        </select>
-
-                                        <div v-show='attribute_values[index].type == "select" || attribute_values[index].type == "multiselect"' style="display: flex;">
-                                            <select class="control" v-model="attribute_values[index].value" style="margin-right: 15px; height: 100px" :multiple="true">
-                                                <option :disabled="true">
-                                                    {{ __('ui::form.select-attribute', ['attribute' => 'Values']) }}
-                                                </option>
-
-                                                <option v-for="(label, index2) in attribute_values[index].options" :value="label.id" :key="index2">@{{ label.admin_name }}</option>
-                                            </select>
-
-                                            {{-- <multiselect v-model="attribute_values[index].value" :close-on-select="false" :options="attribute_values[index].options" :searchable="false" :track-by="admin_name" :custom-label="attributeListLabel" :multiple="true" ></multiselect> --}}
-                                        </div>
-
-                                        <div v-show='attribute_values[index].type == "text" || attribute_values[index].type == "textarea" || attribute_values[index].type == "price" || attribute_values[index].type == "textarea"' style="display: flex">
-                                            <input class="control" v-model="attribute_values[index].value" type="text" placeholder="{{ __('ui::form.enter-attribute', ['attribute' => 'Text']) }}">
-                                        </div>
-
-                                        <span class="icon trash-icon" v-on:click="removeAttr(index)"></span>
-                                    </div>
-
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addAttributeCondition">{{ __('admin::app.promotion.add-attr-condition') }}</span>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" :title="'{{ __('admin::app.promotion.general-info.labels') }}'">
-                                <div slot="body">
-                                    @foreach($cart_rule[3]->labels as $label)
-                                        <div class="control-group" :class="[errors.has('label') ? 'has-error' : '']">
-                                            <label for="code">{{ __('admin::app.label') }}
-                                                <span class="locale">[{{ $label->channel->code }} - {{ $label->locale->code }}]</span>
-                                            </label>
-
-                                            <input type="text" class="control" name="label[{{ $label->channel->code }}][{{ $label->locale->code }}]" value="{{ $label->label }}" data-vv-as="&quot;Label&quot;">
-
-                                            <span class="control-error" v-if="errors.has('label')">@{{ errors.first('label') }}</span>
-                                        </div>
-                                    @endforeach
-                                </div>
-                            </accordian>
-                        </div>
-                    </div>
-                </div>
-            </form>
-        </script>
-
-        <script>
-            Vue.component('cart-rule', {
-                template: '#cart-rule-form-template',
-
-                inject: ['$validator'],
-
-                data () {
-                    return {
-                        name: '{{ __('admin::app.promotion.rule-name') }}',
-                        description: '{{ __('admin::app.promotion.rule-desc') }}',
-                        channels: [],
-                        customer_groups: [],
-                        ends_till: null,
-                        starts_from: null,
-                        priority: 0,
-                        per_customer: 0,
-                        status: null,
-                        use_coupon: null,
-                        // auto_generation: 0,
-                        usage_limit: 0,
-
-                        action_type: null,
-                        apply: null,
-                        apply_to_shipping: null,
-                        disc_amount: null,
-                        disc_quantity: null,
-                        end_other_rules: null,
-                        coupon_type: null,
-                        free_shipping: null,
-
-                        all_conditions: null,
-                        match_criteria: 'all_are_true',
-
-                        all_attributes: {
-                            'categories' : null,
-                            'attributes' : null
-                        },
-
-                        code: null,
-                        suffix: null,
-                        prefix: null,
-                        dedicated_label: true,
-
-                        global_label: null,
-                        labels: [],
-                        // label: {
-                        //     @foreach(core()->getAllChannels() as $channel)
-                        //         @foreach($channel->locales as $locale)
-                        //             {{ trim($channel->code) }} : null,
-                        //         @endforeach
-                        //     @endforeach
-                        // },
-
-                        criteria: 'cart',
-                        conditions: @json($cart_rule[0]).conditions,
-                        cart_input: @json($cart_rule[0]).attributes,
-                        actions: @json($cart_rule[0]).actions,
-                        conditions_list:[],
-                        cart_object: {
-                            attribute: null,
-                            condition: null,
-                            value: []
-                        },
-                        country_and_states: @json($cart_rule[2]),
-
-                        category_options: @json($cart_rule[1]),
-
-                        category_values: [],
-                        attribute_values: [],
-
-                        attr_object: {
-                            attribute: null,
-                            condition: null,
-                            value: [],
-                            options: []
-                        },
-                        attribute_input: @json($cart_rule[4]),
-                    }
-                },
-
-                mounted () {
-                    data = @json($cart_rule[3]);
-
-                    this.name = data.name;
-
-                    this.description = data.description;
-
-                    this.channels = [];
-
-                    for (i in data.channels) {
-                        this.channels.push(data.channels[i].channel_id);
-                    }
-
-                    this.customer_groups = data.customer_groups;
-
-                    for (i in data.customer_groups) {
-                        this.customer_groups.push(data.customer_groups[i].customer_group_id);
-                    }
-
-                    this.ends_till = data.ends_till;
-
-                    this.starts_from = data.starts_from;
-
-                    this.priority = data.priority;
-
-                    this.per_customer = data.per_customer;
-
-                    this.status = data.status;
-
-                    if (data.use_coupon == 0) {
-                        // this.auto_generation = null;
-                        this.use_coupon = 0;
-                    } else {
-                        this.use_coupon = 1;
-                        // this.auto_generation = data.auto_generation;
-                        this.code = data.coupons.code;
-                        // this.suffix = data.coupons.suffix;
-                        // this.prefix = data.coupons.prefix;
-
-                        // if (data.auto_generation == 0)
-                        //     this.auto_generation = true;
-                        // else
-                        //     this.auto_generation = false;
-                    }
-
-                    this.usage_limit = data.usage_limit;
-
-                    this.is_guest = data.is_guest;
-
-                    this.action_type = data.action_type;
-
-                    this.apply = null;
-
-                    this.apply_to_shipping = data.apply_to_shipping;
-
-                    this.disc_amount = data.disc_amount;
-
-                    // this.disc_threshold = data.disc_threshold;
-
-                    this.disc_quantity = data.disc_quantity;
-
-                    this.end_other_rules = data.end_other_rules;
-
-                    this.coupon_type = data.coupon_type;
-
-                    this.free_shipping = data.free_shipping;
-
-                    this.all_conditions = null;
-
-                    if (data.hasOwnProperty('conditions') && data.conditions != null) {
-                        this.conditions_list = JSON.parse(JSON.parse(data.conditions));
-
-                        this.match_criteria = this.conditions_list.pop().criteria;
-                    }
-
-                    hasSubSelectionConditions = JSON.parse(data.actions).hasOwnProperty('attribute_conditions');
-
-                    if (hasSubSelectionConditions) {
-
-                        if (JSON.parse(data.actions).attribute_conditions.hasOwnProperty('categories')) {
-                            this.category_values = JSON.parse(data.actions).attribute_conditions.categories;
-                        } else {
-                            this.category_values = [];
-                        }
-
-                        if (JSON.parse(data.actions).attribute_conditions.hasOwnProperty('attributes')) {
-                            this.attribute_values = JSON.parse(data.actions).attribute_conditions.attributes;
-                        } else {
-                            this.attribute_values = [];
-                        }
-
-                        // creating options and has option param on the frontend
-                        for (i in this.attribute_values) {
-                            for (j in this.attribute_input) {
-                                if (this.attribute_input[j].code == this.attribute_values[i].attribute) {
-                                    if (this.attribute_input[j].has_options == true) {
-                                        this.attribute_values[i].has_options = true;
-
-                                        this.attribute_values[i].options = this.attribute_input[j].options;
-                                    } else {
-                                        this.attribute_values[i].has_options = false;
-
-                                        this.attribute_values[i].options = null;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    criteria = null;
-                },
-
-                methods: {
-                    categoryLabel (option) {
-                        return option.name + ' [ ' + option.slug + ' ]';
-                    },
-
-                    attributeListLabel(option) {
-                        return option.label;
-                    },
-
-                    addCondition () {
-                        if (this.criteria == 'product_subselection' || this.criteria == 'cart') {
-                            this.condition_on = this.criteria;
-                        } else {
-                            alert('please select type of condition');
-
-                            return false;
-                        }
-
-                        if (this.condition_on == 'cart') {
-                            this.conditions_list.push(this.cart_object);
-
-                            this.cart_object = {
-                                attribute: null,
-                                condition: null,
-                                value: []
-                            };
-                        }
-                    },
-
-                    addAttributeCondition() {
-                        this.attribute_values.push(this.attr_object);
-
-                        this.attr_object = {
-                            attribute: null,
-                            condition: null,
-                            value: [],
-                            options: []
-                        };
-                    },
-
-                    checkAutogen() {
-                    },
-
-                    detectApply() {
-                        return;
-                    },
-
-                    enableCondition(event, index) {
-                        selectedIndex = event.target.selectedIndex - 1;
-
-                        for (i in this.cart_input) {
-                            if (i == selectedIndex) {
-                                this.conditions_list[index].type = this.cart_input[i].type;
-                            }
-                        }
-                    },
-
-                    enableAttributeCondition (event, index) {
-                        selectedIndex = event.target.selectedIndex - 1;
-
-                        for(i in this.attribute_input) {
-                            if (i == selectedIndex) {
-                                if (this.attribute_input[i].has_options == true) {
-                                    this.attribute_values[index].options = this.attribute_input[i].options;
-                                }
-
-                                this.attribute_values[index].type = this.attribute_input[i].type;
-                            }
-                        }
-                    },
-
-                    useCoupon() {
-                        if (this.use_coupon == 0) {
-                            this.auto_generation = null;
-                        } else {
-                            this.auto_generation = true;
-                        }
-                    },
-
-                    removeCartAttr(index) {
-                        this.conditions_list.splice(index, 1);
-                    },
-
-                    removeCat(index) {
-                        this.cats.splice(index, 1);
-                    },
-
-                    removeAttr(index) {
-                        this.attribute_values.splice(index, 1);
-                    },
-
-                    onSubmit: function (e) {
-                        if (this.attribute_values.length != 0 || this.category_values.length != 0) {
-                            for (i in this.attribute_values) {
-                                delete this.attribute_values[i].options;
-                            }
-
-                            this.all_attributes.categories = this.category_values;
-
-                            this.all_attributes.attributes = this.attribute_values;
-
-                            this.all_attributes = JSON.stringify(this.all_attributes);
-                        } else {
-                            this.all_attributes = null;
-                        }
-
-                        if (this.conditions_list.length != 0) {
-                            this.conditions_list.push({'criteria': this.match_criteria});
-
-                            this.all_conditions = JSON.stringify(this.conditions_list);
-
-                            this.conditions_list.pop();
-                        }
-
-                        this.$validator.validateAll().then(result => {
-                            if (result) {
-                                e.target.submit();
-                            }
-                        });
-                    },
-
-                    addFlashMessages() {
-                        const flashes = this.$refs.flashes;
-
-                        flashMessages.forEach(function(flash) {
-                            flashes.addFlash(flash);
-                        }, this);
-                    }
-                }
-            });
-        </script>
-    @endpush
-@stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
new file mode 100644
index 000000000..6ced9889a
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
@@ -0,0 +1,614 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+    {{ __('admin::app.promotions.cart-rules.add-title') }}
+@stop
+
+@section('content')
+    <div class="content">
+
+        <cart-rule></cart-rule>
+
+    </div>
+@stop
+
+@push('scripts')
+    @parent
+
+    <script type="text/x-template" id="cart-rule-template">
+        <div>
+            <form method="POST" action="{{ route('admin.cart-rules.store') }}" @submit.prevent="onSubmit">
+                <div class="page-header">
+                    <div class="page-title">
+                        <h1>
+                            <i class="icon angle-left-icon back-link" @click="redirectBack('{{ url('/admin/dashboard') }}')"></i>
+
+                            {{ __('admin::app.promotions.cart-rules.add-title') }}
+                        </h1>
+                    </div>
+
+                    <div class="page-action">
+                        <button type="submit" class="btn btn-lg btn-primary">
+                            {{ __('admin::app.promotions.cart-rules.save-btn-title') }}
+                        </button>
+                    </div>
+                </div>
+
+                <div class="page-content">
+                    <div class="form-container">
+                        @csrf()
+
+                        {!! view_render_event('bagisto.admin.promotions.cart-rules.create.before') !!}
+
+                        <accordian :title="'{{ __('admin::app.promotions.cart-rules.rule-information') }}'" :active="true">
+                            <div slot="body">
+
+                                <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
+                                    <label for="name" class="required">{{ __('admin::app.promotions.cart-rules.name') }}</label>
+                                    <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.name') }}&quot;" value="{{ old('name') }}"/>
+                                    <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="description">{{ __('admin::app.promotions.cart-rules.description') }}</label>
+                                    <textarea class="control" id="description" name="description">{{ old('description') }}</textarea>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="status">{{ __('admin::app.promotions.cart-rules.status') }}</label>
+                                    <span class="checkbox">
+                                        <input type="checkbox" id="status" name="status" value="1">
+                                        <label class="checkbox-view" for="status"></label>
+                                        {{ __('admin::app.promotions.cart-rules.is-active') }}
+                                    </span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
+                                    <label for="channels" class="required">{{ __('admin::app.promotions.cart-rules.channels') }}</label>
+
+                                    <select class="control" id="channels" name="channels[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.channels') }}&quot;" multiple="multiple">
+
+                                        @foreach(core()->getAllChannels() as $channel)
+                                            <option value="{{ $channel->id }}" {{ old('channels') && in_array($channel->id, old('channels')) ? 'selected' : '' }}>
+                                                {{ $channel->name }}
+                                            </option>
+                                        @endforeach
+
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('channels[]')">@{{ errors.first('channels[]') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('customer_groups[]') ? 'has-error' : '']">
+                                    <label for="customer_groups" class="required">{{ __('admin::app.promotions.cart-rules.customer-groups') }}</label>
+
+                                    <select class="control" id="customer_groups" name="customer_groups[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.customer-groups') }}&quot;" multiple="multiple">
+
+                                        @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $customerGroup)
+                                            <option value="{{ $customerGroup->id }}" {{ old('customer_groups') && in_array($customerGroup->id, old('customer_groups')) ? 'selected' : '' }}>
+                                                {{ $customerGroup->name }}
+                                            </option>
+                                        @endforeach
+
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('coupon_type') ? 'has-error' : '']">
+                                    <label for="coupon_type" class="required">{{ __('admin::app.promotions.cart-rules.coupon-type') }}</label>
+
+                                    <select class="control" id="coupon_type" name="coupon_type" v-model="coupon_type" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.coupon-type') }}&quot;">
+                                        <option value="0" {{ old('coupon_type') == 0 ? 'selected' : '' }}>{{ __('admin::app.promotions.cart-rules.no-coupon') }}</option>
+                                        <option value="1" {{ old('coupon_type') == 1 ? 'selected' : '' }}>{{ __('admin::app.promotions.cart-rules.specific-coupon') }}</option>
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('coupon_type')">@{{ errors.first('coupon_type') }}</span>
+                                </div>
+
+                                <div v-if="parseInt(coupon_type)">
+                                    <div class="control-group" :class="[errors.has('use_auto_generation') ? 'has-error' : '']">
+                                        <label for="use_auto_generation" class="required">{{ __('admin::app.promotions.cart-rules.auto-generate-coupon') }}</label>
+
+                                        <select class="control" id="use_auto_generation" name="use_auto_generation" v-model="use_auto_generation" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.auto-generate-coupon') }}&quot;">
+                                            <option value="0">{{ __('admin::app.promotions.cart-rules.no') }}</option>
+                                            <option value="1">{{ __('admin::app.promotions.cart-rules.yes') }}</option>
+                                        </select>
+
+                                        <span class="control-error" v-if="errors.has('use_auto_generation')">@{{ errors.first('use_auto_generation') }}</span>
+                                    </div>
+
+                                    <div v-if="! parseInt(use_auto_generation)">
+                                        <div class="control-group" :class="[errors.has('coupon_code') ? 'has-error' : '']">
+                                            <label for="coupon_code" class="required">{{ __('admin::app.promotions.cart-rules.coupon-code') }}</label>
+                                            <input v-validate="'required'" class="control" id="coupon_code" name="coupon_code" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.coupon-code') }}&quot;" value="{{ old('coupon_code') }}"/>
+                                            <span class="control-error" v-if="errors.has('coupon_code')">@{{ errors.first('coupon_code') }}</span>
+                                        </div>
+                                    </div>
+
+                                    <div class="control-group">
+                                        <label for="uses_per_coupon">{{ __('admin::app.promotions.cart-rules.uses-per-coupon') }}</label>
+                                        <input class="control" id="uses_per_coupon" name="uses_per_coupon" value="{{ old('uses_per_coupon') }}"/>
+                                    </div>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="usage_per_customer">{{ __('admin::app.promotions.cart-rules.uses-per-customer') }}</label>
+                                    <input class="control" id="usage_per_customer" name="usage_per_customer" value="{{ old('usage_per_customer') }}"/>
+                                    <span class="control-info">{{ __('admin::app.promotions.cart-rules.uses-per-customer-control-info') }}</span>
+                                </div>
+
+                                <div class="control-group date">
+                                    <label for="starts_from">{{ __('admin::app.promotions.cart-rules.from') }}</label>
+                                    <date>
+                                        <input type="text" name="starts_from" class="control" value="{{ old('starts_from') }}"/>
+                                    </date>
+                                </div>
+
+                                <div class="control-group date">
+                                    <label for="ends_till">{{ __('admin::app.promotions.cart-rules.to') }}</label>
+                                    <date>
+                                        <input type="text" name="ends_till" class="control" value="{{ old('ends_till') }}"/>
+                                    </date>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="sort_order">{{ __('admin::app.promotions.cart-rules.priority') }}</label>
+                                    <input type="text" class="control" id="sort_order" name="sort_order" value="{{ old('sort_order') ?? 0 }}"/>
+                                </div>
+
+                            </div>
+                        </accordian>
+
+                        <accordian :title="'{{ __('admin::app.promotions.cart-rules.conditions') }}'" :active="false">
+                            <div slot="body">
+
+                                <div class="control-group">
+                                    <label for="condition_type">{{ __('admin::app.promotions.cart-rules.condition-type') }}</label>
+
+                                    <select class="control" id="condition_type" name="condition_type" v-model="condition_type">
+                                        <option value="1">{{ __('admin::app.promotions.cart-rules.all-conditions-true') }}</option>
+                                        <option value="2">{{ __('admin::app.promotions.cart-rules.any-condition-true') }}</option>
+                                    </select>
+                                </div>
+
+                                <div class="table cart-rule-conditions" style="margin-top: 20px; overflow-x: unset;">
+                                    <table>
+                                        <tbody>
+                                            <cart-rule-condition-item
+                                                v-for='(condition, index) in conditions'
+                                                :condition="condition"
+                                                :key="index"
+                                                :index="index"
+                                                @onRemoveCondition="removeCondition($event)">
+                                            </cart-rule-condition-item>
+                                        </tbody>
+                                    </table>
+                                </div>
+
+                                <button type="button" class="btn btn-lg btn-primary" style="margin-top: 20px;" @click="addCondition">
+                                    {{ __('admin::app.promotions.cart-rules.add-condition') }}
+                                </button>
+
+                            </div>
+                        </accordian>
+
+                        <accordian :title="'{{ __('admin::app.promotions.cart-rules.actions') }}'" :active="false">
+                            <div slot="body">
+
+                                <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
+                                    <label for="action_type" class="required">{{ __('admin::app.promotions.cart-rules.action-type') }}</label>
+
+                                    <select class="control" id="action_type" name="action_type" v-validate="'required'" v-model="action_type" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.action-type') }}&quot;">
+                                        <option value="by_percent" {{ old('action_type') == 'by_percent' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.percentage-product-price') }}
+                                        </option>
+                                        <option value="by_fixed" {{ old('action_type') == 'by_fixed' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.fixed-amount') }}
+                                        </option>
+                                        <option value="cart_fixed" {{ old('action_type') == 'cart_fixed' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.fixed-amount-whole-cart') }}
+                                        </option>
+                                        <option value="buy_x_get_y" {{ old('action_type') == 'buy_x_get_y' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.buy-x-get-y-free') }}
+                                        </option>
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('action_type')">@{{ errors.first('action_type') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('discount_amount') ? 'has-error' : '']">
+                                    <label for="discount_amount" class="required">{{ __('admin::app.promotions.cart-rules.discount-amount') }}</label>
+                                    <input v-validate="'required'" class="control" id="discount_amount" name="discount_amount" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.discount-amount') }}&quot;" value="{{ old('discount_amount') ?? 0 }}"/>
+                                    <span class="control-error" v-if="errors.has('discount_amount')">@{{ errors.first('discount_amount') }}</span>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="discount_quantity">{{ __('admin::app.promotions.cart-rules.discount-quantity') }}</label>
+                                    <input class="control" id="discount_quantity" name="discount_quantity" value="{{ old('discount_quantity') ?? 0 }}"/>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="discount_step">{{ __('admin::app.promotions.cart-rules.discount-step') }}</label>
+                                    <input class="control" id="discount_step" name="discount_step" value="{{ old('discount_step') ?? 0 }}"/>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="apply_to_shipping">{{ __('admin::app.promotions.cart-rules.apply-to-shipping') }}</label>
+
+                                    <select class="control" id="apply_to_shipping" name="apply_to_shipping" :disabled="action_type == 'cart_fixed'">
+                                        <option value="0" {{ ! old('apply_to_shipping') ? 'selected' : '' }}>{{ __('admin::app.promotions.cart-rules.no') }}</option>
+                                        <option value="1" {{ old('apply_to_shipping') ? 'selected' : '' }}>{{ __('admin::app.promotions.cart-rules.yes') }}</option>
+                                    </select>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="free_shipping">{{ __('admin::app.promotions.cart-rules.free-shipping') }}</label>
+
+                                    <select class="control" id="free_shipping" name="free_shipping">
+                                        <option value="0" {{ ! old('free_shipping') ? 'selected' : '' }}>{{ __('admin::app.promotions.cart-rules.no') }}</option>
+                                        <option value="1" {{ old('free_shipping') ? 'selected' : '' }}>{{ __('admin::app.promotions.cart-rules.yes') }}</option>
+                                    </select>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="end_other_rules">{{ __('admin::app.promotions.cart-rules.end-other-rules') }}</label>
+
+                                    <select class="control" id="end_other_rules" name="end_other_rules">
+                                        <option value="0" {{ ! old('end_other_rules') ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.no') }}
+                                        </option>
+
+                                        <option value="1" {{ old('end_other_rules') ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.yes') }}
+                                        </option>
+                                    </select>
+                                </div>
+
+                            </div>
+                        </accordian>
+
+                        {!! view_render_event('bagisto.admin.promotions.cart-rules.create.after') !!}
+                    </div>
+                </div>
+            </form>
+        </div>
+    </script>
+
+    <script type="text/x-template" id="cart-rule-condition-item-template">
+        <tr>
+            <td class="attribute">
+                <div class="control-group">
+                    <select :name="['conditions[' + index + '][attribute]']" class="control" v-model="condition.attribute">
+                        <option value="">{{ __('admin::app.promotions.cart-rules.choose-condition-to-add') }}</option>
+                        <optgroup v-for='(conditionAttribute, index) in condition_attributes' :label="conditionAttribute.label">
+                            <option v-for='(childAttribute, index) in conditionAttribute.children' :value="childAttribute.key">
+                                @{{ childAttribute.label }}
+                            </option>
+                        </optgroup>
+                    </select>
+                </div>
+            </td>
+
+            <td class="operator">
+                <div class="control-group" v-if="matchedAttribute">
+                    <select :name="['conditions[' + index + '][operator]']" class="control" v-model="condition.operator">
+                        <option v-for='operator in condition_operators[matchedAttribute.type]' :value="operator.operator">
+                            @{{ operator.label }}
+                        </option>
+                    </select>
+                </div>
+            </td>
+
+            <td class="value">
+                <div v-if="matchedAttribute">
+                    <input type="hidden" :name="['conditions[' + index + '][attribute_type]']" v-model="matchedAttribute.type">
+
+                    <div v-if="matchedAttribute.key == 'product|category_ids' || matchedAttribute.key == 'product|category_ids' || matchedAttribute.key == 'product|parent::category_ids'">
+                        <tree-view value-field="id" id-field="id" :name-field="'conditions[' + index + '][value]'" input-type="checkbox" :items='matchedAttribute.options' :behavior="'no'"></tree-view>
+                    </div>
+
+                    <div v-else>
+                        <div class="control-group" v-if="matchedAttribute.type == 'text' || matchedAttribute.type == 'price' || matchedAttribute.type == 'decimal' || matchedAttribute.type == 'integer'">
+                            <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                        </div>
+
+                        <div class="control-group date" v-if="matchedAttribute.type == 'date'">
+                            <date>
+                                <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                            </date>
+                        </div>
+
+                        <div class="control-group date" v-if="matchedAttribute.type == 'datetime'">
+                            <datetime>
+                                <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                            </datetime>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'boolean'">
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value">
+                                <option value="1">{{ __('admin::app.promotions.cart-rules.yes') }}</option>
+                                <option value="0">{{ __('admin::app.promotions.cart-rules.no') }}</option>
+                            </select>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'select' || matchedAttribute.type == 'radio'">
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value" v-if="matchedAttribute.key != 'cart|state'">
+                                <option v-for='option in matchedAttribute.options' :value="option.id">
+                                    @{{ option.admin_name }}
+                                </option>
+                            </select>
+
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value" v-else>
+                                <optgroup v-for='option in matchedAttribute.options' :label="option.admin_name">
+                                    <option v-for='state in option.states' :value="state.code">
+                                        @{{ state.admin_name }}
+                                    </option>
+                                </optgroup>
+                            </select>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'multiselect' || matchedAttribute.type == 'checkbox'">
+                            <select :name="['conditions[' + index + '][value][]']" class="control" v-model="condition.value" multiple>
+                                <option v-for='option in matchedAttribute.options' :value="option.id">
+                                    @{{ option.admin_name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </td>
+
+            <td class="actions">
+                <i class="icon trash-icon" @click="removeCondition"></i>
+            </td>
+        </tr>
+    </script>
+
+    <script>
+        Vue.component('cart-rule', {
+
+            template: '#cart-rule-template',
+
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    coupon_type: 0,
+
+                    use_auto_generation: 0,
+
+                    condition_type: 1,
+
+                    conditions: [],
+
+                    action_type: "{{ old('action_type') ?: 'by_percent' }}"
+                }
+            },
+
+            methods: {
+                addCondition: function() {
+                    this.conditions.push({
+                        'attribute': '',
+                        'operator': '==',
+                        'value': '',
+                    });
+                },
+
+                removeCondition: function(condition) {
+                    let index = this.conditions.indexOf(condition)
+
+                    this.conditions.splice(index, 1)
+                },
+
+                onSubmit: function(e) {
+                    this.$root.onSubmit(e)
+                },
+
+                onSubmit: function(e) {
+                    this.$root.onSubmit(e)
+                },
+
+                redirectBack: function(fallbackUrl) {
+                    this.$root.redirectBack(fallbackUrl)
+                }
+            }
+        });
+
+        Vue.component('cart-rule-condition-item', {
+
+            template: '#cart-rule-condition-item-template',
+
+            props: ['index', 'condition'],
+
+            data: function() {
+                return {
+                    condition_attributes: @json(app('\Webkul\CartRule\Repositories\CartRuleRepository')->getConditionAttributes()),
+
+                    attribute_type_indexes: {
+                        'cart': 0,
+                        
+                        'cart_item': 1,
+
+                        'product': 2
+                    }, 
+
+                    condition_operators: {
+                        'price': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'decimal': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'integer': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'text': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.contain') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.does-not-contain') }}'
+                            }],
+                        'boolean': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }],
+                        'date': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'datetime': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'select': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }],
+                        'radio': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }],
+                        'multiselect': [{
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.contains') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.does-not-contain') }}'
+                            }],
+                        'checkbox': [{
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.contains') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.does-not-contain') }}'
+                            }]
+                    }
+                }
+            },
+
+            computed: {
+                matchedAttribute: function () {
+                    if (this.condition.attribute == '')
+                        return;
+
+                    var this_this = this;
+
+                    var attributeIndex = this.attribute_type_indexes[this.condition.attribute.split("|")[0]];
+
+                    matchedAttribute = this.condition_attributes[attributeIndex]['children'].filter(function (attribute) {
+                        return attribute.key == this_this.condition.attribute;
+                    });
+
+                    if (matchedAttribute[0]['type'] == 'multiselect' || matchedAttribute[0]['type'] == 'checkbox') {
+                        this.condition.operator = '{}';
+
+                        this.condition.value = [];
+                    }
+
+                    return matchedAttribute[0];
+                }
+            },
+
+            methods: {
+                removeCondition: function() {
+                    this.$emit('onRemoveCondition', this.condition)
+                }
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
new file mode 100644
index 000000000..cdc051a59
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
@@ -0,0 +1,753 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+    {{ __('admin::app.promotions.cart-rules.edit-title') }}
+@stop
+
+@section('content')
+    <div class="content">
+
+        <cart-rule></cart-rule>
+
+    </div>
+@stop
+
+@push('scripts')
+    @parent
+
+    <script type="text/x-template" id="cart-rule-template">
+        <div>
+            <form method="POST" action="{{ route('admin.cart-rules.update', $cartRule->id) }}" @submit.prevent="onSubmit">
+                <div class="page-header">
+                    <div class="page-title">
+                        <h1>
+                            <i class="icon angle-left-icon back-link" @click="redirectBack('{{ url('/admin/dashboard') }}')"></i>
+
+                            {{ __('admin::app.promotions.cart-rules.edit-title') }}
+                        </h1>
+                    </div>
+
+                    <div class="page-action">
+                        <button type="submit" class="btn btn-lg btn-primary">
+                            {{ __('admin::app.promotions.cart-rules.save-btn-title') }}
+                        </button>
+                    </div>
+                </div>
+
+                <div class="page-content">
+                    <div class="form-container">
+                        @csrf()
+
+                        {!! view_render_event('bagisto.admin.promotions.cart-rules.create.before') !!}
+
+                        <accordian :title="'{{ __('admin::app.promotions.cart-rules.rule-information') }}'" :active="true">
+                            <div slot="body">
+
+                                <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
+                                    <label for="name" class="required">{{ __('admin::app.promotions.cart-rules.name') }}</label>
+                                    <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.name') }}&quot;" value="{{ old('name') ?: $cartRule->name }}"/>
+                                    <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="description">{{ __('admin::app.promotions.cart-rules.description') }}</label>
+                                    <textarea class="control" id="description" name="description">{{ old('description') ?: $cartRule->description }}</textarea>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="status">{{ __('admin::app.promotions.cart-rules.status') }}</label>
+                                    <span class="checkbox">
+                                        <input type="checkbox" id="status" name="status" value="{{ $cartRule->status }}" {{ $cartRule->status ? 'checked' : '' }}>
+                                        <label class="checkbox-view" for="status"></label>
+                                        {{ __('admin::app.promotions.cart-rules.is-active') }}
+                                    </span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
+                                    <label for="channels" class="required">{{ __('admin::app.promotions.cart-rules.channels') }}</label>
+
+                                    <?php $selectedOptionIds = old('channels') ?: $cartRule->channels->pluck('id')->toArray() ?>
+
+                                    <select class="control" id="channels" name="channels[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.channels') }}&quot;" multiple="multiple">
+
+                                        @foreach(core()->getAllChannels() as $channel)
+                                            <option value="{{ $channel->id }}" {{ in_array($channel->id, $selectedOptionIds) ? 'selected' : '' }}>
+                                                {{ $channel->name }}
+                                            </option>
+                                        @endforeach
+
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('channels[]')">@{{ errors.first('channels[]') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('customer_groups[]') ? 'has-error' : '']">
+                                    <label for="customer_groups" class="required">{{ __('admin::app.promotions.cart-rules.customer-groups') }}</label>
+
+                                    <?php $selectedOptionIds = old('customer_groups') ?: $cartRule->customer_groups->pluck('id')->toArray() ?>
+
+                                    <select class="control" id="customer_groups" name="customer_groups[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.customer-groups') }}&quot;" multiple="multiple">
+
+                                        @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $customerGroup)
+                                            <option value="{{ $customerGroup->id }}" {{ in_array($customerGroup->id, $selectedOptionIds) ? 'selected' : '' }}>
+                                                {{ $customerGroup->name }}
+                                            </option>
+                                        @endforeach
+
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('coupon_type') ? 'has-error' : '']">
+                                    <label for="coupon_type" class="required">{{ __('admin::app.promotions.cart-rules.coupon-type') }}</label>
+
+                                    <select class="control" id="coupon_type" name="coupon_type" v-model="coupon_type" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.coupon-type') }}&quot;">
+                                        <option value="0" {{ old('coupon_type') == 0 ? 'selected' : '' }}>{{ __('admin::app.promotions.cart-rules.no-coupon') }}</option>
+                                        <option value="1" {{ old('coupon_type') == 1 ? 'selected' : '' }}>{{ __('admin::app.promotions.cart-rules.specific-coupon') }}</option>
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('coupon_type')">@{{ errors.first('coupon_type') }}</span>
+                                </div>
+
+                                <div v-if="parseInt(coupon_type)">
+                                    <div class="control-group" :class="[errors.has('use_auto_generation') ? 'has-error' : '']">
+                                        <label for="use_auto_generation" class="required">{{ __('admin::app.promotions.cart-rules.auto-generate-coupon') }}</label>
+
+                                        <select class="control" id="use_auto_generation" name="use_auto_generation" v-model="use_auto_generation" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.auto-generate-coupon') }}&quot;">
+                                            <option value="0">{{ __('admin::app.promotions.cart-rules.no') }}</option>
+                                            <option value="1">{{ __('admin::app.promotions.cart-rules.yes') }}</option>
+                                        </select>
+
+                                        <span class="control-error" v-if="errors.has('use_auto_generation')">@{{ errors.first('use_auto_generation') }}</span>
+                                    </div>
+
+                                    <div v-if="! parseInt(use_auto_generation)">
+                                        <div class="control-group" :class="[errors.has('coupon_code') ? 'has-error' : '']">
+                                            <label for="coupon_code" class="required">{{ __('admin::app.promotions.cart-rules.coupon-code') }}</label>
+                                            <input v-validate="'required'" class="control" id="coupon_code" name="coupon_code" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.coupon-code') }}&quot;" value="{{ old('coupon_code') ?: $cartRule->coupon_code }}"/>
+                                            <span class="control-error" v-if="errors.has('coupon_code')">@{{ errors.first('coupon_code') }}</span>
+                                        </div>
+                                    </div>
+
+                                    <div class="control-group">
+                                        <label for="uses_per_coupon">{{ __('admin::app.promotions.cart-rules.uses-per-coupon') }}</label>
+                                        <input class="control" id="uses_per_coupon" name="uses_per_coupon" value="{{ old('uses_per_coupon') ?: $cartRule->uses_per_coupon }}"/>
+                                    </div>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="usage_per_customer">{{ __('admin::app.promotions.cart-rules.uses-per-customer') }}</label>
+                                    <input class="control" id="usage_per_customer" name="usage_per_customer" value="{{ old('usage_per_customer') ?: $cartRule->usage_per_customer }}"/>
+                                    <span class="control-info">{{ __('admin::app.promotions.cart-rules.uses-per-customer-control-info') }}</span>
+                                </div>
+
+                                <div class="control-group date">
+                                    <label for="starts_from">{{ __('admin::app.promotions.cart-rules.from') }}</label>
+                                    <date>
+                                        <input type="text" name="starts_from" class="control" value="{{ old('starts_from') ?: $cartRule->starts_from }}"/>
+                                    </date>
+                                </div>
+
+                                <div class="control-group date">
+                                    <label for="ends_till">{{ __('admin::app.promotions.cart-rules.to') }}</label>
+                                    <date>
+                                        <input type="text" name="ends_till" class="control" value="{{ old('ends_till') ?: $cartRule->ends_till }}"/>
+                                    </date>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="sort_order">{{ __('admin::app.promotions.cart-rules.priority') }}</label>
+                                    <input type="text" class="control" id="sort_order" name="sort_order" value="{{ $cartRule->sort_order }}" {{ $cartRule->sort_order ? 'checked' : '' }}/>
+                                </div>
+
+                            </div>
+                        </accordian>
+
+                        <accordian :title="'{{ __('admin::app.promotions.cart-rules.conditions') }}'" :active="false">
+                            <div slot="body">
+
+                                <div class="control-group">
+                                    <label for="condition_type">{{ __('admin::app.promotions.cart-rules.condition-type') }}</label>
+
+                                    <select class="control" id="condition_type" name="condition_type" v-model="condition_type">
+                                        <option value="1">{{ __('admin::app.promotions.cart-rules.all-conditions-true') }}</option>
+                                        <option value="2">{{ __('admin::app.promotions.cart-rules.any-condition-true') }}</option>
+                                    </select>
+                                </div>
+
+                                <div class="table cart-rule-conditions" style="margin-top: 20px; overflow-x: unset;">
+                                    <table>
+                                        <tbody>
+                                            <cart-rule-condition-item
+                                                v-for='(condition, index) in conditions'
+                                                :condition="condition"
+                                                :key="index"
+                                                :index="index"
+                                                @onRemoveCondition="removeCondition($event)">
+                                            </cart-rule-condition-item>
+                                        </tbody>
+                                    </table>
+                                </div>
+
+                                <button type="button" class="btn btn-lg btn-primary" style="margin-top: 20px;" @click="addCondition">
+                                    {{ __('admin::app.promotions.cart-rules.add-condition') }}
+                                </button>
+
+                            </div>
+                        </accordian>
+
+                        <accordian :title="'{{ __('admin::app.promotions.cart-rules.actions') }}'" :active="false">
+                            <div slot="body">
+
+                                <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
+                                    <label for="action_type" class="required">{{ __('admin::app.promotions.cart-rules.action-type') }}</label>
+
+                                    <?php $selectedOption = old('action_type') ?: $cartRule->action_type ?>
+
+                                    <select class="control" id="action_type" name="action_type" v-validate="'required'" v-model="action_type" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.action-type') }}&quot;">
+                                        <option value="by_percent" {{ $selectedOption == 'by_percent' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.percentage-product-price') }}
+                                        </option>
+                                        <option value="by_fixed" {{ $selectedOption == 'by_fixed' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.fixed-amount') }}
+                                        </option>
+                                        <option value="cart_fixed" {{ $selectedOption == 'cart_fixed' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.fixed-amount-whole-cart') }}
+                                        </option>
+                                        <option value="buy_x_get_y" {{ $selectedOption == 'buy_x_get_y' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.buy-x-get-y-free') }}
+                                        </option>
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('action_type')">@{{ errors.first('action_type') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('discount_amount') ? 'has-error' : '']">
+                                    <label for="discount_amount" class="required">{{ __('admin::app.promotions.cart-rules.discount-amount') }}</label>
+
+                                    <input v-validate="'required'" class="control" id="discount_amount" name="discount_amount" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.discount-amount') }}&quot;" value="{{ old('discount_amount') ?: $cartRule->discount_amount }}"/>
+
+                                    <span class="control-error" v-if="errors.has('discount_amount')">@{{ errors.first('discount_amount') }}</span>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="discount_quantity">{{ __('admin::app.promotions.cart-rules.discount-quantity') }}</label>
+                                    <input class="control" id="discount_quantity" name="discount_quantity" value="{{ old('discount_quantity') ?: $cartRule->discount_quantity }}"/>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="discount_step">{{ __('admin::app.promotions.cart-rules.discount-step') }}</label>
+                                    <input class="control" id="discount_step" name="discount_step" value="{{ old('discount_step') ?: $cartRule->discount_step }}"/>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="apply_to_shipping">{{ __('admin::app.promotions.cart-rules.apply-to-shipping') }}</label>
+                                    
+                                    <?php $selectedOption = old('apply_to_shipping') ?: $cartRule->apply_to_shipping ?>
+
+                                    <select class="control" id="apply_to_shipping" name="apply_to_shipping" :disabled="action_type == 'cart_fixed'">
+                                        <option value="0" {{ ! $selectedOption ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.no') }}
+                                        </option>
+
+                                        <option value="1" {{ $selectedOption ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.yes') }}
+                                        </option>
+                                    </select>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="free_shipping">{{ __('admin::app.promotions.cart-rules.free-shipping') }}</label>
+
+                                    <?php $selectedOption = old('free_shipping') ?: $cartRule->free_shipping ?>
+
+                                    <select class="control" id="free_shipping" name="free_shipping">
+                                        <option value="0" {{ ! $selectedOption ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.no') }}
+                                        </option>
+
+                                        <option value="1" {{ $selectedOption ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.yes') }}
+                                        </option>
+                                    </select>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="end_other_rules">{{ __('admin::app.promotions.cart-rules.end-other-rules') }}</label>
+
+                                    <?php $selectedOption = old('end_other_rules') ?: $cartRule->end_other_rules ?>
+
+                                    <select class="control" id="end_other_rules" name="end_other_rules">
+                                        <option value="0" {{ ! $selectedOption ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.no') }}
+                                        </option>
+
+                                        <option value="1" {{ $selectedOption ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.cart-rules.yes') }}
+                                        </option>
+                                    </select>
+                                </div>
+
+                            </div>
+                        </accordian>
+
+                        {!! view_render_event('bagisto.admin.promotions.cart-rules.create.after') !!}
+                    </div>
+                </div>
+            </form>
+
+            <accordian :title="'{{ __('admin::app.promotions.cart-rules.coupon-codes') }}'" :active="false" v-if="coupon_type && use_auto_generation">
+                <div slot="body">
+
+                    <create-coupon-form></create-coupon-form>
+
+                </div>
+            </accordian>
+        </div>
+    </script>
+
+    <script type="text/x-template" id="cart-rule-condition-item-template">
+        <tr>
+            <td class="attribute">
+                <div class="control-group">
+                    <select :name="['conditions[' + index + '][attribute]']" class="control" v-model="condition.attribute">
+                        <option value="">{{ __('admin::app.promotions.cart-rules.choose-condition-to-add') }}</option>
+                        <optgroup v-for='conditionAttribute in condition_attributes' :label="conditionAttribute.label">
+                            <option v-for='childAttribute in conditionAttribute.children' :value="childAttribute.key">
+                                @{{ childAttribute.label }}
+                            </option>
+                        </optgroup>
+                    </select>
+                </div>
+            </td>
+
+            <td class="operator">
+                <div class="control-group" v-if="matchedAttribute">
+                    <select :name="['conditions[' + index + '][operator]']" class="control" v-model="condition.operator">
+                        <option v-for='operator in condition_operators[matchedAttribute.type]' :value="operator.operator">
+                            @{{ operator.label }}
+                        </option>
+                    </select>
+                </div>
+            </td>
+
+            <td class="value">
+                <div v-if="matchedAttribute">
+                    <input type="hidden" :name="['conditions[' + index + '][attribute_type]']" v-model="matchedAttribute.type">
+
+                    <div v-if="matchedAttribute.key == 'product|children::category_ids' || matchedAttribute.key == 'product|category_ids' || matchedAttribute.key == 'product|parent::category_ids'">
+                        <tree-view value-field="id" id-field="id" :name-field="'conditions[' + index + '][value]'" input-type="checkbox" :items='matchedAttribute.options' :value='condition.value' :behavior="'no'"></tree-view>
+                    </div>
+
+                    <div v-else>
+                        <div class="control-group" v-if="matchedAttribute.type == 'text' || matchedAttribute.type == 'price' || matchedAttribute.type == 'decimal' || matchedAttribute.type == 'integer'">
+                            <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                        </div>
+
+                        <div class="control-group date" v-if="matchedAttribute.type == 'date'">
+                            <date>
+                                <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                            </date>
+                        </div>
+
+                        <div class="control-group date" v-if="matchedAttribute.type == 'datetime'">
+                            <datetime>
+                                <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                            </datetime>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'boolean'">
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value">
+                                <option value="1">{{ __('admin::app.promotions.cart-rules.yes') }}</option>
+                                <option value="0">{{ __('admin::app.promotions.cart-rules.no') }}</option>
+                            </select>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'select' || matchedAttribute.type == 'radio'">
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value" v-if="matchedAttribute.key != 'cart|state'">
+                                <option v-for='option in matchedAttribute.options' :value="option.id">
+                                    @{{ option.admin_name }}
+                                </option>
+                            </select>
+
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value" v-else>
+                                <optgroup v-for='option in matchedAttribute.options' :label="option.admin_name">
+                                    <option v-for='state in option.states' :value="state.code">
+                                        @{{ state.admin_name }}
+                                    </option>
+                                </optgroup>
+                            </select>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'multiselect' || matchedAttribute.type == 'checkbox'">
+                            <select :name="['conditions[' + index + '][value][]']" class="control" v-model="condition.value" multiple>
+                                <option v-for='option in matchedAttribute.options' :value="option.id">
+                                    @{{ option.admin_name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </td>
+
+            <td class="actions">
+                <i class="icon trash-icon" @click="removeCondition"></i>
+            </td>
+        </tr>
+    </script>
+
+    <script type="text/x-template" id="create-coupon-form-template">
+        <div class="">
+            <form method="POST" data-vv-scope="create-coupun-form" @submit.prevent="generateCopuns('create-coupun-form')">
+
+                <div class="control-group" :class="[errors.has('create-coupun-form.coupon_qty') ? 'has-error' : '']">
+                    <label for="coupon_qty" class="required">{{ __('admin::app.promotions.cart-rules.coupon-qty') }}</label>
+                    
+                    <input v-validate="'required|min_value:1'" class="control" id="coupon_qty" name="coupon_qty" v-model="coupon_format.coupon_qty" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.coupon-qty') }}&quot;"/>
+
+                    <span class="control-error" v-if="errors.has('create-coupun-form.coupon_qty')">
+                        @{{ errors.first('create-coupun-form.coupon_qty') }}
+                    </span>
+                </div>
+
+                <div class="control-group" :class="[errors.has('create-coupun-form.code_length') ? 'has-error' : '']">
+                    <label for="code_length" class="required">{{ __('admin::app.promotions.cart-rules.code-length') }}</label>
+
+                    <input v-validate="'required|min_value:10'" class="control" id="code_length" name="code_length" v-model="coupon_format.code_length" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.code-length') }}&quot;"/>
+
+                    <span class="control-error" v-if="errors.has('create-coupun-form.code_length')">
+                        @{{ errors.first('create-coupun-form.code_length') }}
+                    </span>
+                </div>
+
+                <div class="control-group" :class="[errors.has('create-coupun-form.code_format') ? 'has-error' : '']">
+                    <label for="code_format" class="required">{{ __('admin::app.promotions.cart-rules.code-format') }}</label>
+
+                    <select class="control" id="code_format" name="code_format" v-model="coupon_format.code_format" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.cart-rules.code-format') }}&quot;">
+                        <option value="alphanumeric">{{ __('admin::app.promotions.cart-rules.alphanumeric') }}</option>
+                        <option value="alphabetical">{{ __('admin::app.promotions.cart-rules.alphabetical') }}</option>
+                        <option value="numeric">{{ __('admin::app.promotions.cart-rules.numeric') }}</option>
+                    </select>
+
+                    <span class="control-error" v-if="errors.has('create-coupun-form.code_format')">
+                        @{{ errors.first('create-coupun-form.code_format') }}
+                    </span>
+                </div>
+
+                <div class="control-group">
+                    <label for="code_prefix">{{ __('admin::app.promotions.cart-rules.code-prefix') }}</label>
+                    <input class="control" id="code_prefix" name="code_prefix" v-model="coupon_format.code_prefix"/>
+                </div>
+
+                <div class="control-group">
+                    <label for="code_suffix">{{ __('admin::app.promotions.cart-rules.code-suffix') }}</label>
+                    <input class="control" id="code_suffix" name="code_suffix" v-model="coupon_format.code_suffix"/>
+                </div>
+
+                <div class="button-group">
+                    <button class="btn btn-xl btn-primary">{{ __('admin::app.promotions.cart-rules.generate') }}</button>
+                </div>
+
+            </form>
+
+            @inject('cartRuleCouponGrid','Webkul\Admin\DataGrids\CartRuleCouponDataGrid')
+
+            {!! $cartRuleCouponGrid->render() !!}
+        </div>
+    </script>
+
+    <script>
+        Vue.component('cart-rule', {
+
+            template: '#cart-rule-template',
+
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    coupon_type: {{ old('coupon_type') ?: $cartRule->coupon_type }},
+
+                    use_auto_generation: {{ old('use_auto_generation') ?: $cartRule->use_auto_generation }},
+
+                    condition_type: {{ old('condition_type') ?: $cartRule->condition_type }},
+
+                    conditions: @json($cartRule->conditions ?: []),
+
+                    action_type: "{{ old('action_type') ?: $cartRule->action_type }}"
+                }
+            },
+
+            methods: {
+                addCondition: function() {
+                    this.conditions.push({
+                        'attribute': '',
+                        'operator': '==',
+                        'value': '',
+                    });
+                },
+
+                removeCondition: function(condition) {
+                    let index = this.conditions.indexOf(condition)
+
+                    this.conditions.splice(index, 1)
+                },
+
+                onSubmit: function(e) {
+                    this.$root.onSubmit(e)
+                },
+
+                redirectBack: function(fallbackUrl) {
+                    this.$root.redirectBack(fallbackUrl)
+                }
+            }
+        });
+
+        Vue.component('cart-rule-condition-item', {
+
+            template: '#cart-rule-condition-item-template',
+
+            props: ['index', 'condition'],
+
+            data: function() {
+                return {
+                    condition_attributes: @json(app('\Webkul\CartRule\Repositories\CartRuleRepository')->getConditionAttributes()),
+
+                    attribute_type_indexes: {
+                        'cart': 0,
+                        
+                        'cart_item': 1,
+
+                        'product': 2
+                    }, 
+
+                    condition_operators: {
+                        'price': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'decimal': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'integer': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'text': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.contain') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.does-not-contain') }}'
+                            }],
+                        'boolean': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }],
+                        'date': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'datetime': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
+                            }],
+                        'select': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }],
+                        'radio': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.cart-rules.is-not-equal-to') }}'
+                            }],
+                        'multiselect': [{
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.contains') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.does-not-contain') }}'
+                            }],
+                        'checkbox': [{
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.contains') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.cart-rules.does-not-contain') }}'
+                            }]
+                    }
+                }
+            },
+
+            computed: {
+                matchedAttribute: function () {
+                    if (this.condition.attribute == '')
+                        return;
+
+                    var this_this = this;
+
+                    var attributeIndex = this.attribute_type_indexes[this.condition.attribute.split("|")[0]];
+
+                    matchedAttribute = this.condition_attributes[attributeIndex]['children'].filter(function (attribute) {
+                        return attribute.key == this_this.condition.attribute;
+                    });
+
+                    if (matchedAttribute[0]['type'] == 'multiselect' || matchedAttribute[0]['type'] == 'checkbox') {
+                        this.condition.operator = '{}';
+
+                        this.condition.value = this.condition.value == '' && this.condition.value != undefined ? [] : this.condition.value;
+                    }
+
+                    return matchedAttribute[0];
+                }
+            },
+
+            methods: {
+                removeCondition: function() {
+                    this.$emit('onRemoveCondition', this.condition)
+                }
+            }
+        });
+
+        Vue.component('create-coupon-form', {
+
+            template: '#create-coupon-form-template',
+
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    coupon_format: {
+                        coupon_qty: '',
+
+                        code_length: 12,
+
+                        code_format: 'alphanumeric',
+
+                        code_prefix: '',
+
+                        code_suffix: ''
+                    }
+                }
+            },
+
+            methods: {
+                generateCopuns: function(formScope) {
+                    var this_this = this;
+
+                    this.$validator.validateAll(formScope).then(function (result) {
+                        if (result) {
+                            this_this.$http.post("{{ route('admin.cart-rules.generate-coupons', $cartRule->id) }}", this_this.coupon_format)
+                                .then(function(response) {
+                                    window.flashMessages = [{
+                                        'type': 'alert-success',
+                                        'message': response.data.message
+                                    }];
+
+                                    this_this.$root.addFlashMessages()
+                                })
+                                .catch(function (error) {
+                                    window.flashMessages = [{
+                                        'type': 'alert-error',
+                                        'message': error.response.data.message
+                                    }];
+
+                                    this_this.$root.addFlashMessages()
+                                })
+                        }
+                    });
+                }
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/index.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/index.blade.php
similarity index 60%
rename from packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/index.blade.php
rename to packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/index.blade.php
index cf172412a..d07bbfaef 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/index.blade.php
@@ -1,7 +1,7 @@
 @extends('admin::layouts.content')
 
 @section('page_title')
-    {{ __('admin::app.promotion.cart-rule') }}
+    {{ __('admin::app.promotions.cart-rules.title') }}
 @stop
 
 @section('content')
@@ -9,12 +9,12 @@
     <div class="content">
         <div class="page-header">
             <div class="page-title">
-                <h1>{{ __('admin::app.promotion.cart-rule') }}</h1>
+                <h1>{{ __('admin::app.promotions.cart-rules.title') }}</h1>
             </div>
 
             <div class="page-action">
-                <a href="{{ route('admin.cart-rule.create') }}" class="btn btn-lg btn-primary">
-                    {{ __('admin::app.promotion.add-cart-rule') }}
+                <a href="{{ route('admin.cart-rules.create') }}" class="btn btn-lg btn-primary">
+                    {{ __('admin::app.promotions.cart-rules.add-title') }}
                 </a>
             </div>
         </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php
deleted file mode 100644
index ca386c453..000000000
--- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php
+++ /dev/null
@@ -1,415 +0,0 @@
-@extends('admin::layouts.content')
-
-@section('page_title')
-    {{ __('admin::app.promotion.add-catalog-rule') }}
-@stop
-
-@section('content')
-    <div class="content">
-        <catalog-rule></catalog-rule>
-    </div>
-
-    @push('scripts')
-        <script type="text/x-template" id="catalog-rule-form-template">
-            <div>
-                <form method="POST" action="{{ route('admin.catalog-rule.store') }}" @submit.prevent="onSubmit">
-                    @csrf
-
-                    <div class="page-header">
-                        <div class="page-title">
-                            <h1>
-                                <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
-
-                                {{ __('admin::app.promotion.add-catalog-rule') }}
-                            </h1>
-                        </div>
-
-                        <div class="page-action">
-                            <button type="submit" class="btn btn-lg btn-primary">
-                                {{ __('admin::app.promotion.save-btn-title') }}
-                            </button>
-                        </div>
-                    </div>
-
-                    <div class="page-content">
-                        <div class="form-container">
-                            @csrf()
-
-                            <accordian :active="true" title="{{ __('admin::app.promotion.information') }}">
-                                <div slot="body">
-                                    <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
-                                        <label for="name" class="required">{{ __('admin::app.promotion.general-info.name') }}</label>
-
-                                        <input type="text" class="control" name="name" v-model="name" v-validate="'required'" value="{{ old('name') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.name') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
-                                        <label for="description" class="required">{{ __('admin::app.promotion.general-info.description') }}</label>
-
-                                        <textarea class="control" name="description" v-model="description" v-validate="'required'" value="{{ old('description') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.description') }}&quot;"></textarea>
-
-                                        <span class="control-error" v-if="errors.has('description')">@{{ errors.first('description') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('customer_groups[]') ? 'has-error' : '']">
-                                        <label for="customer_groups" class="required">{{ __('admin::app.promotion.general-info.cust-groups') }}</label>
-
-                                        <select type="text" class="control" name="customer_groups[]" v-model="customer_groups" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.cust-groups') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">Select Customer Groups</option>
-                                            @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $channel)
-                                                <option value="{{ $channel->id }}">{{ $channel->name }}</option>
-                                            @endforeach
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
-                                        <label for="channels" class="required">{{ __('admin::app.promotion.general-info.channels') }}</label>
-
-                                        <select type="text" class="control" name="channels[]" v-model="channels" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.channels') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">Select Channels</option>
-                                            @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
-                                                <option value="{{ $channel->id }}">{{ $channel->name }}</option>
-                                            @endforeach
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('channels[]')">@{{ errors.first('status') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('status') ? 'has-error' : '']">
-                                        <label for="status" class="required">{{ __('admin::app.promotion.general-info.status') }}</label>
-
-                                        <select type="text" class="control" name="status" v-model="status" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.status') }}&quot;">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-                                            <option value="1">{{ __('admin::app.promotion.yes') }}</option>
-                                            <option value="0">{{ __('admin::app.promotion.no') }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('status')">@{{ errors.first('status') }}</span>
-                                    </div>
-
-                                    <datetime :name="starts_from">
-                                        <div class="control-group" :class="[errors.has('starts_from') ? 'has-error' : '']">
-                                            <label for="starts_from">{{ __('admin::app.promotion.general-info.starts-from') }}</label>
-
-                                            <input type="text" class="control" v-model="starts_from" name="starts_from" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.starts-from') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('starts_from')">@{{ errors.first('starts_from') }}</span>
-                                        </div>
-                                    </datetime>
-
-                                    <datetime :name="starts_from">
-                                        <div class="control-group" :class="[errors.has('ends_till') ? 'has-error' : '']">
-                                            <label for="ends_till">{{ __('admin::app.promotion.general-info.ends-till') }}</label>
-
-                                            <input type="text" class="control" v-model="ends_till" name="ends_till" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.ends-till') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('ends_till')">@{{ errors.first('ends_till') }}</span>
-                                        </div>
-                                    </datetime>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.conditions') }}">
-                                <div slot="body">
-                                    <input type="hidden" name="all_conditions" v-model="all_conditions">
-
-                                    <!--    Categories selection input block     -->
-                                    <div class="control-group" :class="[errors.has('category_values') ? 'has-error' : '']">
-                                        <label class="mb-10" for="categories">{{ __('admin::app.promotion.select-category') }}</label>
-
-                                        <multiselect v-model="category_values" :close-on-select="false" :options="category_options" :searchable="false" :custom-label="categoryLabel" :show-labels="true" placeholder="Select Categories" track-by="slug" :multiple="true"></multiselect>
-                                    </div>
-
-                                    <label class="mb-10" for="attributes">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Attribute']) }}</label>
-
-                                    <br/>
-
-                                    <!--    Product attributes conditions block     -->
-                                    <div class="control-container mt-20" v-for="(condition, index) in attribute_values" :key="index">
-                                        <select class="control" v-model="attribute_values[index].attribute" style="margin-right: 15px; width: 30%;" v-on:change="enableAttributeCondition($event, index)">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-
-                                            <option v-for="(attr_ip, index1) in attribute_input" :value="attr_ip.code" :key="index1">@{{ attr_ip.name }}</option>
-                                        </select>
-
-                                        <select v-show='attribute_values[index].type == "select" || attribute_values[index].type == "multiselect"' class="control" v-model="attribute_values[index].condition" style="margin-right: 15px;">
-                                            <option v-for="(condition, index) in conditions.select" :value="index" :key="index">@{{ condition }}</option>
-                                        </select>
-
-                                        <select v-show='attribute_values[index].type == "text" || attribute_values[index].type == "textarea" || attribute_values[index].type == "price"' class="control" v-model="attribute_values[index].condition" style="margin-right: 15px;">
-                                            <option v-for="(condition, index) in conditions.string" :value="index" :key="index">@{{ condition }}</option>
-                                        </select>
-
-                                        <div v-show='attribute_values[index].type == "select" || attribute_values[index].type == "multiselect"' style="display: flex;">
-                                            <select class="control" v-model="attribute_values[index].value" style="margin-right: 15px; height: 100px" :multiple="true">
-                                                <option :disabled="true">
-                                                    {{ __('ui::form.select-attribute', ['attribute' => 'Values']) }}
-                                                </option>
-
-                                                <option v-for="(label, index2) in attribute_values[index].options" :value="index2" :key="index2">@{{ label.admin_name }}</option>
-                                            </select>
-
-                                            {{-- <multiselect v-model="attribute_values[index].value" :close-on-select="false" :options="attribute_values[index].options" :searchable="false" :track-by="admin_name" :custom-label="attributeListLabel" :multiple="true" ></multiselect> --}}
-                                        </div>
-
-                                        <div v-show='attribute_values[index].type == "text" || attribute_values[index].type == "textarea" || attribute_values[index].type == "price" || attribute_values[index].type == "textarea"' style="display: flex">
-                                            <input class="control" v-model="attribute_values[index].value" type="text" placeholder="{{ __('ui::form.enter-attribute', ['attribute' => 'Text']) }}">
-                                        </div>
-
-                                        <span class="icon trash-icon" v-on:click="removeAttr(index)"></span>
-                                    </div>
-
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addAttributeCondition">{{ __('admin::app.promotion.add-attr-condition') }}</span>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.actions') }}">
-                                <div slot="body">
-                                    <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
-                                        <label for="action_type" class="required">{{ __('admin::app.promotion.general-info.apply') }}</label>
-
-                                        <select class="control" name="action_type" v-model="action_type" v-validate="'required'" value="{{ old('action_type') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.apply') }}&quot;" v-on:change="detectApply">
-                                            <option v-for="(action, index) in actions" :value="index">@{{ action }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('action_type')">@{{ errors.first('action_type') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('disc_amount') ? 'has-error' : '']">
-                                        <label for="disc_amount" class="required">{{ __('admin::app.promotion.general-info.disc_amt') }}</label>
-
-                                        <input type="number" step="0.5000" class="control" name="disc_amount" v-model="disc_amount" v-validate="'required|min_value:0.0001'" value="{{ old('disc_amount') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.disc_amt') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('disc_amount')">@{{ errors.first('disc_amount') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('end_other_rules') ? 'has-error' : '']">
-                                        <label for="end_other_rules" class="required">{{ __('admin::app.promotion.general-info.end-other-rules') }}</label>
-
-                                        <select type="text" class="control" name="end_other_rules" v-model="end_other_rules" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.end-other-rules') }}&quot;">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-                                            <option value="1">{{ __('admin::app.promotion.yes') }}</option>
-                                            <option value="0">{{ __('admin::app.promotion.no') }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('end_other_rules')">@{{ errors.first('end_other_rules') }}</span>
-                                    </div>
-                                </div>
-                            </accordian>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </script>
-
-        <script>
-            Vue.component('catalog-rule', {
-                template: '#catalog-rule-form-template',
-
-                inject: ['$validator'],
-
-                data () {
-                    return {
-                        name: null,
-                        description: null,
-                        conditions_list: [],
-                        channels: [],
-                        customer_groups: [],
-                        ends_till: null,
-                        starts_from: null,
-                        per_customer: 0,
-                        status: 1,
-
-                        action_type: null,
-                        apply: null,
-                        apply_amt: false,
-                        disc_amount: null,
-                        end_other_rules: 0,
-
-                        all_conditions: [],
-
-                        all_attributes: {
-                            'categories' : [],
-                            'attributes' : []
-                        },
-
-                        criteria: 'cart',
-                        actions: @json($catalog_rule[0]).actions,
-
-                        category_options: @json($catalog_rule[1]),
-                        category_values: [],
-                        conditions: @json($catalog_rule[0]).conditions,
-                        attribute_values: [],
-                        attr_object: {
-                            attribute: null,
-                            condition: null,
-                            value: [],
-                            options: []
-                        },
-                        attribute_input: @json($catalog_rule[3])
-                    }
-                },
-
-                mounted () {
-                },
-
-                methods: {
-                    categoryLabel (option) {
-                        return option.name + ' [ ' + option.slug + ' ]';
-                    },
-
-                    attributeListLabel(option) {
-                        return option.label;
-                    },
-
-                    addCondition () {
-                        if (this.criteria == 'attribute' || this.criteria == 'attribute_family' || this.criteria == 'category') {
-                            this.condition_on = this.criteria;
-                        } else {
-                            alert('please try again');
-
-                            return false;
-                        }
-
-                        if (this.condition_on == 'attribute') {
-                            this.conditions_list.push(this.attr_object);
-
-                            this.attr_object = {
-                                criteria: this.condition_on,
-                                attribute: null,
-                                condition: null,
-                                value: null,
-                                type: null,
-                                options: null
-                            };
-                        } else if (this.condition_on == 'category') {
-                            this.conditions_list.push(this.cat_object);
-
-                            this.cat_object = {
-                                criteria: this.condition_on,
-                                category: 'category',
-                                condition: null,
-                                value: []
-                            };
-                        } else if (this.condition_on == 'attribute_family') {
-                            this.conditions_list.push(this.fam_object);
-
-                            this.fam_object = {
-                                criteria: this.condition_on,
-                                family: 'attribute_family',
-                                condition: null,
-                                value: null
-                            };
-                        }
-                    },
-
-                    addAttributeCondition() {
-                        this.attribute_values.push(this.attr_object);
-
-                        this.attr_object = {
-                            attribute: null,
-                            condition: null,
-                            value: [],
-                            options: []
-                        };
-                    },
-
-                    enableCondition(event, index) {
-                        this.conditions_list[index].type = this.attrs_input[event.target.selectedIndex - 1].type;
-                        var this_this = this;
-
-                        if (this.attrs_input[event.target.selectedIndex - 1].type == 'select' || this.attrs_input[event.target.selectedIndex - 1].type == 'multiselect') {
-
-                            this.conditions_list[index].options = this.attrs_options[this.attrs_input[event.target.selectedIndex - 1].code];
-                            this.conditions_list[index].value = [];
-                        }
-                    },
-
-                    enableAttributeCondition (event, index) {
-                        selectedIndex = event.target.selectedIndex - 1;
-
-                        for(i in this.attribute_input) {
-                            if (i == selectedIndex) {
-                                if (this.attribute_input[i].has_options == true) {
-                                    this.selectedIndex
-                                    this.attribute_values[index].options = this.attribute_input[i].options;
-                                }
-
-                                this.attribute_values[index].type = this.attribute_input[i].type;
-                            }
-                        }
-                    },
-
-                    detectApply() {
-                        if (this.apply == 0 || this.apply == 2) {
-                            this.apply_prct = true;
-                            this.apply_amt = false;
-                        } else if (this.apply == 1 || this.apply == 3) {
-                            this.apply_prct = false;
-                            this.apply_amt = true;
-                        }
-                    },
-
-                    removeAttr(index) {
-                        this.attribute_values.splice(index, 1);
-                    },
-
-                    removeCat(index) {
-                        this.cats.splice(index, 1);
-                    },
-
-                    onSubmit: function (e) {
-                        if (this.attribute_values.length > 0 || this.category_values.length > 0) {
-                            for (i in this.attribute_values) {
-                                delete this.attribute_values[i].options;
-                            }
-
-                            if (this.category_values.length > 0) {
-                                this.all_attributes.categories = this.category_values;
-                            }
-
-                            if (this.attribute_values.length > 0) {
-                                this.all_attributes.attributes = this.attribute_values;
-                            }
-
-                        }
-
-                        this.all_conditions = JSON.stringify(this.all_attributes);
-
-                        // this.all_conditions = JSON.stringify(this.conditions_list);
-
-                        // if (this.conditions_list.length != 0) {
-                        //     this.conditions_list.push({'criteria': this.match_criteria});
-
-                        //     this.all_conditions = JSON.stringify(this.conditions_list);
-                        // }
-
-                        // return false;
-
-                        this.$validator.validateAll().then(result => {
-                            if (result) {
-                                e.target.submit();
-                            }
-                        });
-                    },
-
-                    genericGroupCondition() {
-                        this.generic_condition = false;
-                    },
-
-                    addFlashMessages() {
-                        const flashes = this.$refs.flashes;
-
-                        flashMessages.forEach(function(flash) {
-                            flashes.addFlash(flash);
-                        }, this);
-                    }
-                }
-            });
-        </script>
-    @endpush
-@stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php
deleted file mode 100644
index f7b68da7b..000000000
--- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php
+++ /dev/null
@@ -1,414 +0,0 @@
-@extends('admin::layouts.content')
-
-@section('page_title')
-    {{ __('admin::app.promotion.edit-catalog-rule') }}
-@stop
-
-@section('content')
-    <div class="content">
-        <catalog-rule></catalog-rule>
-    </div>
-
-    @push('scripts')
-        <script type="text/x-template" id="catalog-rule-form-template">
-            <div>
-                <form method="POST" action="{{ route('admin.catalog-rule.update', $catalog_rule[5]->id) }}" @submit.prevent="onSubmit">
-                    @csrf
-
-                    <div class="page-header">
-                        <div class="page-title">
-                            <h1>
-                                <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
-
-                                {{ __('admin::app.promotion.edit-catalog-rule') }}
-                            </h1>
-                        </div>
-
-                        <div class="page-action">
-                            <button type="submit" class="btn btn-lg btn-primary">
-                                {{ __('admin::app.promotion.edit-btn-title') }}
-                            </button>
-                        </div>
-                    </div>
-
-                    <div class="page-content">
-                        <div class="form-container">
-                            @csrf()
-
-                            <accordian :active="true" title="{{ __('admin::app.promotion.information') }}">
-                                <div slot="body">
-                                    <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
-                                        <label for="name" class="required">{{ __('admin::app.promotion.general-info.name') }}</label>
-
-                                        <input type="text" class="control" name="name" v-model="name" v-validate="'required'" value="{{ old('name') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.name') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
-                                        <label for="description" class="required">{{ __('admin::app.promotion.general-info.description') }}</label>
-
-                                        <textarea class="control" name="description" v-model="description" v-validate="'required'" value="{{ old('description') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.description') }}&quot;"></textarea>
-
-                                        <span class="control-error" v-if="errors.has('description')">@{{ errors.first('description') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('customer_groups[]') ? 'has-error' : '']">
-                                        <label for="customer_groups" class="required">{{ __('admin::app.promotion.general-info.cust-groups') }}</label>
-
-                                        <select type="text" class="control" name="customer_groups[]" v-model="customer_groups" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.cust-groups') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">Select Customer Groups</option>
-                                            @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $channel)
-                                                <option value="{{ $channel->id }}">{{ $channel->name }}</option>
-                                            @endforeach
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
-                                        <label for="channels" class="required">{{ __('admin::app.promotion.general-info.channels') }}</label>
-
-                                        <select type="text" class="control" name="channels[]" v-model="channels" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.channels') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">Select Channels</option>
-                                            @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
-                                                <option value="{{ $channel->id }}">{{ $channel->name }}</option>
-                                            @endforeach
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('channels[]')">@{{ errors.first('status') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('status') ? 'has-error' : '']">
-                                        <label for="status" class="required">{{ __('admin::app.promotion.general-info.status') }}</label>
-
-                                        <select type="text" class="control" name="status" v-model="status" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.status') }}&quot;">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-                                            <option value="1">{{ __('admin::app.promotion.yes') }}</option>
-                                            <option value="0">{{ __('admin::app.promotion.no') }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('status')">@{{ errors.first('status') }}</span>
-                                    </div>
-
-                                    @php
-                                        $now = new \Carbon\Carbon();
-                                    @endphp
-
-                                    <date :name="starts_from">
-                                        <div class="control-group" :class="[errors.has('starts_from') ? 'has-error' : '']">
-                                            <label for="starts_from">{{ __('admin::app.promotion.general-info.starts-from') }}</label>
-
-                                            <input type="text" class="control" v-model="starts_from" name="starts_from" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.starts-from') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('starts_from')">@{{ errors.first('starts_from') }}</span>
-                                        </div>
-                                    </date>
-
-                                    <date :name="starts_from">
-                                        <div class="control-group" :class="[errors.has('ends_till') ? 'has-error' : '']">
-                                            <label for="ends_till">{{ __('admin::app.promotion.general-info.ends-till') }}</label>
-
-                                            <input type="text" class="control" v-model="ends_till" name="ends_till" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.ends-till') }}&quot;">
-
-                                            <span class="control-error" v-if="errors.has('ends_till')">@{{ errors.first('ends_till') }}</span>
-                                        </div>
-                                    </date>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.conditions') }}">
-                                <div slot="body">
-                                    <input type="hidden" name="all_conditions" v-model="all_conditions">
-
-                                    <!--    Categories selection input block     -->
-                                    <div class="control-group" :class="[errors.has('category_values') ? 'has-error' : '']">
-                                        <label class="mb-10" for="categories">{{ __('admin::app.promotion.select-category') }}</label>
-
-                                        <multiselect v-model="category_values" :close-on-select="false" :options="category_options" :searchable="false" :custom-label="categoryLabel" :show-labels="true" placeholder="Select Categories" track-by="slug" :multiple="true"></multiselect>
-                                    </div>
-
-                                    <label class="mb-10" for="attributes">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Attribute']) }}</label>
-
-                                    <br/>
-
-                                    <!--    Product attributes conditions block     -->
-                                    <div class="control-container mt-20" v-for="(condition, index) in attribute_values" :key="index">
-                                        <select class="control" v-model="attribute_values[index].attribute" style="margin-right: 15px; width: 30%;" v-on:change="enableAttributeCondition($event, index)">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-
-                                            <option v-for="(attr_ip, index1) in attribute_input" :value="attr_ip.code" :key="index1">@{{ attr_ip.name }}</option>
-                                        </select>
-
-                                        <select v-show='attribute_values[index].type == "select" || attribute_values[index].type == "multiselect"' class="control" v-model="attribute_values[index].condition" style="margin-right: 15px;">
-                                            <option v-for="(condition, index) in conditions.select" :value="index" :key="index">@{{ condition }}</option>
-                                        </select>
-
-                                        <select v-show='attribute_values[index].type == "text" || attribute_values[index].type == "textarea" || attribute_values[index].type == "price"' class="control" v-model="attribute_values[index].condition" style="margin-right: 15px;">
-                                            <option v-for="(condition, index) in conditions.string" :value="index" :key="index">@{{ condition }}</option>
-                                        </select>
-
-                                        <div v-show='attribute_values[index].type == "select" || attribute_values[index].type == "multiselect"' style="display: flex;">
-                                            <select class="control" v-model="attribute_values[index].value" style="margin-right: 15px; height: 100px" :multiple="true">
-                                                <option :disabled="true">
-                                                    {{ __('ui::form.select-attribute', ['attribute' => 'Values']) }}
-                                                </option>
-
-                                                <option v-for="(label, index2) in attribute_values[index].options" :value="index2" :key="index2">@{{ label.admin_name }}</option>
-                                            </select>
-
-                                            {{-- <multiselect v-model="attribute_values[index].value" :close-on-select="false" :options="attribute_values[index].options" :searchable="false" :track-by="admin_name" :custom-label="attributeListLabel" :multiple="true" ></multiselect> --}}
-                                        </div>
-
-                                        <div v-show='attribute_values[index].type == "text" || attribute_values[index].type == "textarea" || attribute_values[index].type == "price" || attribute_values[index].type == "textarea"' style="display: flex">
-                                            <input class="control" v-model="attribute_values[index].value" type="text" placeholder="{{ __('ui::form.enter-attribute', ['attribute' => 'Text']) }}">
-                                        </div>
-
-                                        <span class="icon trash-icon" v-on:click="removeAttr(index)"></span>
-                                    </div>
-
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addAttributeCondition">{{ __('admin::app.promotion.add-attr-condition') }}</span>
-                                </div>
-                            </accordian>
-
-                            <accordian :active="false" title="{{ __('admin::app.promotion.actions') }}">
-                                <div slot="body">
-                                    <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
-                                        <label for="action_type" class="required">{{ __('admin::app.promotion.general-info.apply') }}</label>
-
-                                        <select class="control" name="action_type" v-model="action_type" v-validate="'required'" value="{{ old('action_type') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.apply') }}&quot;" v-on:change="detectApply">
-                                            <option v-for="(action, index) in actions" :value="index">@{{ action }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('action_type')">@{{ errors.first('action_type') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('disc_amount') ? 'has-error' : '']">
-                                        <label for="disc_amount" class="required">{{ __('admin::app.promotion.general-info.disc_amt') }}</label>
-
-                                        <input type="number" step="0.5000" class="control" name="disc_amount" v-model="disc_amount" v-validate="'required|min_value:0.0001'" value="{{ old('disc_amount') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.disc_amt') }}&quot;">
-
-                                        <span class="control-error" v-if="errors.has('disc_amount')">@{{ errors.first('disc_amount') }}</span>
-                                    </div>
-
-                                    <div class="control-group" :class="[errors.has('end_other_rules') ? 'has-error' : '']">
-                                        <label for="end_other_rules" class="required">{{ __('admin::app.promotion.general-info.end-other-rules') }}</label>
-
-                                        <select type="text" class="control" name="end_other_rules" v-model="end_other_rules" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.end-other-rules') }}&quot;">
-                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
-                                            <option value="1">{{ __('admin::app.promotion.yes') }}</option>
-                                            <option value="0">{{ __('admin::app.promotion.no') }}</option>
-                                        </select>
-
-                                        <span class="control-error" v-if="errors.has('end_other_rules')">@{{ errors.first('end_other_rules') }}</span>
-                                    </div>
-                                </div>
-                            </accordian>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </script>
-
-        <script>
-            Vue.component('catalog-rule', {
-                template: '#catalog-rule-form-template',
-
-                inject: ['$validator'],
-
-                data () {
-                    return {
-                        name: '{{ $catalog_rule[5]->name }}',
-                        description: '{{ $catalog_rule[5]->description }}',
-                        conditions_list: [],
-                        channels: [],
-                        customer_groups: [],
-                        ends_till: '{{ $catalog_rule[5]->ends_till }}',
-                        starts_from: '{{ $catalog_rule[5]->starts_from }}',
-                        status: '{{ $catalog_rule[5]->status }}',
-
-                        actions: @json($catalog_rule[3]).actions,
-                        action_type: '{{ $catalog_rule[5]->action_code }}',
-                        disc_amount: null,
-                        end_other_rules: '{{ $catalog_rule[5]->end_other_rules }}',
-
-                        all_conditions: [],
-
-                        all_attributes: {
-                            'categories' : [],
-                            'attributes' : []
-                        },
-
-                        criteria: 'cart',
-
-                        category_options: @json($catalog_rule[1]),
-                        category_values: [],
-                        conditions: @json($catalog_rule[3]).conditions,
-                        attribute_values: [],
-                        attr_object: {
-                            attribute: null,
-                            condition: null,
-                            value: [],
-                            options: []
-                        },
-                        attribute_input: @json($catalog_rule[0])
-                    }
-                },
-
-                mounted () {
-                    catalog_rule = @json($catalog_rule[5]);
-                    channels = @json($catalog_rule[5]->channels);
-
-                    this.channels = [];
-                    for (i in channels) {
-                        this.channels.push(channels[i].channel_id);
-                    }
-
-                    customer_groups = @json($catalog_rule[5]->customer_groups);
-
-                    for (i in customer_groups) {
-                        this.customer_groups.push(customer_groups[i].customer_group_id);
-                    }
-
-                    data = @json($catalog_rule[5]->conditions);
-
-                    if (JSON.parse(JSON.parse(data))) {
-                        this.category_values = JSON.parse(JSON.parse(data)).categories;
-
-                        this.attribute_values = JSON.parse(JSON.parse(data)).attributes;
-
-                        // creating options and has option param on the frontend
-                        for (i in this.attribute_values) {
-                            for (j in this.attribute_input) {
-                                if (this.attribute_input[j].code == this.attribute_values[i].attribute) {
-                                    if (this.attribute_input[j].has_options == true) {
-                                        this.attribute_values[i].has_options = true;
-
-                                        this.attribute_values[i].options = this.attribute_input[j].options;
-                                    } else {
-                                        this.attribute_values[i].has_options = false;
-
-                                        this.attribute_values[i].options = null;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    this.action_type = '{{ $catalog_rule[5]->action_code }}';
-                    this.disc_amount = catalog_rule.discount_amount;
-                    this.end_other_rules = '{{ $catalog_rule[5]->end_other_rules }}';
-                },
-
-                methods: {
-                    created() {
-                        VeeValidate.Validator.extend('is_time', {
-                            getMessage: field => `The format must be HH:MM:SS`,
-                            validate: (value) => new Promise(resolve => {
-                                let regex = new RegExp("([0-1][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])");
-                                resolve({
-                                    valid: value && regex.test(value)
-                                });
-                            })
-                        });
-                    },
-
-                    categoryLabel (option) {
-                        return option.name + ' [ ' + option.slug + ' ]';
-                    },
-
-                    attributeListLabel(option) {
-                        return option.label;
-                    },
-
-                    addAttributeCondition() {
-                        this.attribute_values.push(this.attr_object);
-
-                        this.attr_object = {
-                            attribute: null,
-                            condition: null,
-                            value: [],
-                            options: []
-                        };
-                    },
-
-                    enableAttributeCondition (event, index) {
-                        selectedIndex = event.target.selectedIndex - 1;
-
-                        for(i in this.attribute_input) {
-                            if (i == selectedIndex) {
-                                if (this.attribute_input[i].has_options == true) {
-                                    this.attribute_values[index].options = this.attribute_input[i].options;
-                                }
-
-                                this.attribute_values[index].type = this.attribute_input[i].type;
-                            }
-                        }
-                    },
-
-                    detectApply() {
-                        if (this.apply == 0 || this.apply == 2) {
-                            this.apply_prct = true;
-                            this.apply_amt = false;
-                        } else if (this.apply == 1 || this.apply == 3) {
-                            this.apply_prct = false;
-                            this.apply_amt = true;
-                        }
-                    },
-
-                    removeAttr(index) {
-                        this.attribute_values.splice(index, 1);
-                    },
-
-                    removeCat(index) {
-                        this.cats.splice(index, 1);
-                    },
-
-                    onSubmit: function (e) {
-                        if (this.attribute_values.length > 0 || this.category_values.length > 0) {
-                            for (i in this.attribute_values) {
-                                delete this.attribute_values[i].options;
-                            }
-
-                            if (this.category_values.length > 0) {
-                                this.all_attributes.categories = this.category_values;
-                            }
-
-                            this.all_attributes.attributes = this.attribute_values;
-                        }
-
-                        this.all_conditions = JSON.stringify(this.all_attributes);
-
-                        // this.all_conditions = JSON.stringify(this.conditions_list);
-
-                        // if (this.conditions_list.length != 0) {
-                        //     this.conditions_list.push({'criteria': this.match_criteria});
-
-                        //     this.all_conditions = JSON.stringify(this.conditions_list);
-                        // }
-
-                        // return false;
-
-                        this.$validator.validateAll().then(result => {
-                            if (result) {
-                                e.target.submit();
-                            }
-                        });
-                    },
-
-                    genericGroupCondition() {
-                        this.generic_condition = false;
-                    },
-
-                    addFlashMessages() {
-                        const flashes = this.$refs.flashes;
-
-                        flashMessages.forEach(function(flash) {
-                            flashes.addFlash(flash);
-                        }, this);
-                    }
-                }
-            });
-        </script>
-    @endpush
-@stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php
deleted file mode 100644
index 6790810ea..000000000
--- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/index.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-@extends('admin::layouts.content')
-
-@section('page_title')
-    {{ __('admin::app.promotion.catalog-rule') }}
-@stop
-
-@section('content')
-
-    <div class="content">
-        <div class="page-header">
-            <div class="page-title">
-                <h1>{{ __('admin::app.promotion.catalog-rule') }}</h1>
-            </div>
-
-            <div class="page-action">
-                <a href="{{ route('admin.catalog-rule.create') }}" class="btn btn-lg btn-primary">
-                    {{ __('admin::app.promotion.add-catalog-rule') }}
-                </a>
-
-                <a href="{{ route('admin.catalog-rule.apply') }}" class="btn btn-lg btn-primary">
-                    {{ __('admin::app.promotion.apply') }}
-                </a>
-
-                <a href="{{ route('admin.catalog-rule.declut') }}" class="btn btn-lg btn-primary">
-                    {{ __('admin::app.promotion.declut') }}
-                </a>
-            </div>
-        </div>
-
-        <div class="page-content">
-            @inject('catalogRuleGrid','Webkul\Admin\DataGrids\CatalogRuleDataGrid')
-            {!! $catalogRuleGrid->render() !!}
-        </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php
new file mode 100644
index 000000000..30745564b
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php
@@ -0,0 +1,528 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+    {{ __('admin::app.promotions.catalog-rules.add-title') }}
+@stop
+
+@section('content')
+    <div class="content">
+
+        <catalog-rule></catalog-rule>
+
+    </div>
+@stop
+
+@push('scripts')
+    @parent
+
+    <script type="text/x-template" id="catalog-rule-template">
+        <div>
+            <form method="POST" action="{{ route('admin.catalog-rules.store') }}" @submit.prevent="onSubmit">
+                <div class="page-header">
+                    <div class="page-title">
+                        <h1>
+                            <i class="icon angle-left-icon back-link" @click="redirectBack('{{ url('/admin/dashboard') }}')"></i>
+
+                            {{ __('admin::app.promotions.catalog-rules.add-title') }}
+                        </h1>
+                    </div>
+
+                    <div class="page-action">
+                        <button type="submit" class="btn btn-lg btn-primary">
+                            {{ __('admin::app.promotions.catalog-rules.save-btn-title') }}
+                        </button>
+                    </div>
+                </div>
+
+                <div class="page-content">
+                    <div class="form-container">
+                        @csrf()
+
+                        {!! view_render_event('bagisto.admin.promotions.catalog-rules.create.before') !!}
+
+                        <accordian :title="'{{ __('admin::app.promotions.catalog-rules.rule-information') }}'" :active="true">
+                            <div slot="body">
+
+                                <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
+                                    <label for="name" class="required">{{ __('admin::app.promotions.catalog-rules.name') }}</label>
+                                    <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.name') }}&quot;" value="{{ old('name') }}"/>
+                                    <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="description">{{ __('admin::app.promotions.catalog-rules.description') }}</label>
+                                    <textarea class="control" id="description" name="description">{{ old('description') }}</textarea>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="status">{{ __('admin::app.promotions.catalog-rules.status') }}</label>
+                                    <span class="checkbox">
+                                        <input type="checkbox" id="status" name="status" value="1">
+                                        <label class="checkbox-view" for="status"></label>
+                                        {{ __('admin::app.promotions.catalog-rules.is-active') }}
+                                    </span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
+                                    <label for="channels" class="required">{{ __('admin::app.promotions.catalog-rules.channels') }}</label>
+
+                                    <select class="control" id="channels" name="channels[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.channels') }}&quot;" multiple="multiple">
+
+                                        @foreach(core()->getAllChannels() as $channel)
+                                            <option value="{{ $channel->id }}" {{ old('channels') && in_array($channel->id, old('channels')) ? 'selected' : '' }}>
+                                                {{ $channel->name }}
+                                            </option>
+                                        @endforeach
+
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('channels[]')">@{{ errors.first('channels[]') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('customer_groups[]') ? 'has-error' : '']">
+                                    <label for="customer_groups" class="required">{{ __('admin::app.promotions.catalog-rules.customer-groups') }}</label>
+
+                                    <select class="control" id="customer_groups" name="customer_groups[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.customer-groups') }}&quot;" multiple="multiple">
+
+                                        @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $customerGroup)
+                                            <option value="{{ $customerGroup->id }}" {{ old('customer_groups') && in_array($customerGroup->id, old('customer_groups')) ? 'selected' : '' }}>
+                                                {{ $customerGroup->name }}
+                                            </option>
+                                        @endforeach
+
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
+                                </div>
+
+
+                                <div class="control-group date">
+                                    <label for="starts_from">{{ __('admin::app.promotions.catalog-rules.from') }}</label>
+                                    <date>
+                                        <input type="text" name="starts_from" class="control" value="{{ old('starts_from') }}"/>
+                                    </date>
+                                </div>
+
+                                <div class="control-group date">
+                                    <label for="ends_till">{{ __('admin::app.promotions.catalog-rules.to') }}</label>
+                                    <date>
+                                        <input type="text" name="ends_till" class="control" value="{{ old('ends_till') }}"/>
+                                    </date>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="sort_order">{{ __('admin::app.promotions.catalog-rules.priority') }}</label>
+                                    <input type="text" class="control" id="sort_order" name="sort_order" value="{{ old('sort_order') ?? 0 }}"/>
+                                </div>
+
+                            </div>
+                        </accordian>
+
+                        <accordian :title="'{{ __('admin::app.promotions.catalog-rules.conditions') }}'" :active="false">
+                            <div slot="body">
+
+                                <div class="control-group">
+                                    <label for="condition_type">{{ __('admin::app.promotions.catalog-rules.condition-type') }}</label>
+
+                                    <select class="control" id="condition_type" name="condition_type" v-model="condition_type">
+                                        <option value="1">{{ __('admin::app.promotions.catalog-rules.all-conditions-true') }}</option>
+                                        <option value="2">{{ __('admin::app.promotions.catalog-rules.any-condition-true') }}</option>
+                                    </select>
+                                </div>
+
+                                <div class="table catalog-rule-conditions" style="margin-top: 20px; overflow-x: unset;">
+                                    <table>
+                                        <tbody>
+                                            <catalog-rule-condition-item
+                                                v-for='(condition, index) in conditions'
+                                                :condition="condition"
+                                                :key="index"
+                                                :index="index"
+                                                @onRemoveCondition="removeCondition($event)">
+                                            </catalog-rule-condition-item>
+                                        </tbody>
+                                    </table>
+                                </div>
+
+                                <button type="button" class="btn btn-lg btn-primary" style="margin-top: 20px;" @click="addCondition">
+                                    {{ __('admin::app.promotions.catalog-rules.add-condition') }}
+                                </button>
+
+                            </div>
+                        </accordian>
+
+                        <accordian :title="'{{ __('admin::app.promotions.catalog-rules.actions') }}'" :active="false">
+                            <div slot="body">
+
+                                <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
+                                    <label for="action_type" class="required">{{ __('admin::app.promotions.catalog-rules.action-type') }}</label>
+
+                                    <select class="control" id="action_type" name="action_type" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.action-type') }}&quot;">
+                                        <option value="by_percent" {{ old('action_type') == 'by_percent' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.catalog-rules.percentage-product-price') }}
+                                        </option>
+                                        <option value="by_fixed" {{ old('action_type') == 'by_fixed' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.catalog-rules.fixed-amount') }}
+                                        </option>
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('action_type')">@{{ errors.first('action_type') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('discount_amount') ? 'has-error' : '']">
+                                    <label for="discount_amount" class="required">{{ __('admin::app.promotions.catalog-rules.discount-amount') }}</label>
+                                    <input v-validate="'required'" class="control" id="discount_amount" name="discount_amount" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.discount-amount') }}&quot;" value="{{ old('discount_amount') ?? 0 }}"/>
+                                    <span class="control-error" v-if="errors.has('discount_amount')">@{{ errors.first('discount_amount') }}</span>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="end_other_rules">{{ __('admin::app.promotions.catalog-rules.end-other-rules') }}</label>
+
+                                    <select class="control" id="end_other_rules" name="end_other_rules">
+                                        <option value="0" {{ ! old('end_other_rules') ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.catalog-rules.no') }}
+                                        </option>
+
+                                        <option value="1" {{ old('end_other_rules') ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.catalog-rules.yes') }}
+                                        </option>
+                                    </select>
+                                </div>
+
+                            </div>
+                        </accordian>
+
+                        {!! view_render_event('bagisto.admin.promotions.catalog-rules.create.after') !!}
+                    </div>
+                </div>
+            </form>
+        </div>
+    </script>
+
+    <script type="text/x-template" id="catalog-rule-condition-item-template">
+        <tr>
+            <td class="attribute">
+                <div class="control-group">
+                    <select :name="['conditions[' + index + '][attribute]']" class="control" v-model="condition.attribute">
+                        <option value="">{{ __('admin::app.promotions.catalog-rules.choose-condition-to-add') }}</option>
+                        <optgroup v-for='(conditionAttribute, index) in condition_attributes' :label="conditionAttribute.label">
+                            <option v-for='(childAttribute, index) in conditionAttribute.children' :value="childAttribute.key">
+                                @{{ childAttribute.label }}
+                            </option>
+                        </optgroup>
+                    </select>
+                </div>
+            </td>
+
+            <td class="operator">
+                <div class="control-group" v-if="matchedAttribute">
+                    <select :name="['conditions[' + index + '][operator]']" class="control" v-model="condition.operator">
+                        <option v-for='operator in condition_operators[matchedAttribute.type]' :value="operator.operator">
+                            @{{ operator.label }}
+                        </option>
+                    </select>
+                </div>
+            </td>
+
+            <td class="value">
+                <div v-if="matchedAttribute">
+                    <input type="hidden" :name="['conditions[' + index + '][attribute_type]']" v-model="matchedAttribute.type">
+
+                    <div v-if="matchedAttribute.key == 'product|category_ids'">
+                        <tree-view value-field="id" id-field="id" :name-field="'conditions[' + index + '][value]'" input-type="checkbox" :items='matchedAttribute.options' :behavior="'no'"></tree-view>
+                    </div>
+
+                    <div v-else>
+                        <div class="control-group" v-if="matchedAttribute.type == 'text' || matchedAttribute.type == 'price' || matchedAttribute.type == 'decimal' || matchedAttribute.type == 'integer'">
+                            <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                        </div>
+
+                        <div class="control-group date" v-if="matchedAttribute.type == 'date'">
+                            <date>
+                                <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                            </date>
+                        </div>
+
+                        <div class="control-group date" v-if="matchedAttribute.type == 'datetime'">
+                            <datetime>
+                                <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                            </datetime>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'boolean'">
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value">
+                                <option value="1">{{ __('admin::app.promotions.catalog-rules.yes') }}</option>
+                                <option value="0">{{ __('admin::app.promotions.catalog-rules.no') }}</option>
+                            </select>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'select' || matchedAttribute.type == 'radio'">
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value" v-if="matchedAttribute.key != 'catalog|state'">
+                                <option v-for='option in matchedAttribute.options' :value="option.id">
+                                    @{{ option.admin_name }}
+                                </option>
+                            </select>
+
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value" v-else>
+                                <optgroup v-for='option in matchedAttribute.options' :label="option.admin_name">
+                                    <option v-for='state in option.states' :value="state.code">
+                                        @{{ state.admin_name }}
+                                    </option>
+                                </optgroup>
+                            </select>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'multiselect' || matchedAttribute.type == 'checkbox'">
+                            <select :name="['conditions[' + index + '][value][]']" class="control" v-model="condition.value" multiple>
+                                <option v-for='option in matchedAttribute.options' :value="option.id">
+                                    @{{ option.admin_name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </td>
+
+            <td class="actions">
+                <i class="icon trash-icon" @click="removeCondition"></i>
+            </td>
+        </tr>
+    </script>
+
+    <script>
+        Vue.component('catalog-rule', {
+
+            template: '#catalog-rule-template',
+
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    condition_type: 1,
+
+                    conditions: []
+                }
+            },
+
+            methods: {
+                addCondition: function() {
+                    this.conditions.push({
+                        'attribute': '',
+                        'operator': '==',
+                        'value': '',
+                    });
+                },
+
+                removeCondition: function(condition) {
+                    let index = this.conditions.indexOf(condition)
+
+                    this.conditions.splice(index, 1)
+                },
+
+                onSubmit: function(e) {
+                    this.$root.onSubmit(e)
+                },
+
+                onSubmit: function(e) {
+                    this.$root.onSubmit(e)
+                },
+
+                redirectBack: function(fallbackUrl) {
+                    this.$root.redirectBack(fallbackUrl)
+                }
+            }
+        });
+
+        Vue.component('catalog-rule-condition-item', {
+
+            template: '#catalog-rule-condition-item-template',
+
+            props: ['index', 'condition'],
+
+            data: function() {
+                return {
+                    condition_attributes: @json(app('\Webkul\CatalogRule\Repositories\CatalogRuleRepository')->getConditionAttributes()),
+
+                    attribute_type_indexes: {
+                        'product': 0
+                    }, 
+
+                    condition_operators: {
+                        'price': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'decimal': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'integer': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'text': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.contain') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.does-not-contain') }}'
+                            }],
+                        'boolean': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }],
+                        'date': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'datetime': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'select': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }],
+                        'radio': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }],
+                        'multiselect': [{
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.contains') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.does-not-contain') }}'
+                            }],
+                        'checkbox': [{
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.contains') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.does-not-contain') }}'
+                            }]
+                    }
+                }
+            },
+
+            computed: {
+                matchedAttribute: function () {
+                    if (this.condition.attribute == '')
+                        return;
+
+                    var this_this = this;
+
+                    var attributeIndex = this.attribute_type_indexes[this.condition.attribute.split("|")[0]];
+
+                    matchedAttribute = this.condition_attributes[attributeIndex]['children'].filter(function (attribute) {
+                        return attribute.key == this_this.condition.attribute;
+                    });
+
+                    if (matchedAttribute[0]['type'] == 'multiselect' || matchedAttribute[0]['type'] == 'checkbox') {
+                        this.condition.operator = '{}';
+
+                        this.condition.value = [];
+                    }
+
+                    return matchedAttribute[0];
+                }
+            },
+
+            methods: {
+                removeCondition: function() {
+                    this.$emit('onRemoveCondition', this.condition)
+                }
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php
new file mode 100644
index 000000000..d1a6aed4a
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php
@@ -0,0 +1,533 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+    {{ __('admin::app.promotions.catalog-rules.edit-title') }}
+@stop
+
+@section('content')
+    <div class="content">
+
+        <catalog-rule></catalog-rule>
+
+    </div>
+@stop
+
+@push('scripts')
+    @parent
+
+    <script type="text/x-template" id="catalog-rule-template">
+        <div>
+            <form method="POST" action="{{ route('admin.catalog-rules.update', $catalogRule->id) }}" @submit.prevent="onSubmit">
+                <div class="page-header">
+                    <div class="page-title">
+                        <h1>
+                            <i class="icon angle-left-icon back-link" @click="redirectBack('{{ url('/admin/dashboard') }}')"></i>
+
+                            {{ __('admin::app.promotions.catalog-rules.edit-title') }}
+                        </h1>
+                    </div>
+
+                    <div class="page-action">
+                        <button type="submit" class="btn btn-lg btn-primary">
+                            {{ __('admin::app.promotions.catalog-rules.save-btn-title') }}
+                        </button>
+                    </div>
+                </div>
+
+                <div class="page-content">
+                    <div class="form-container">
+                        @csrf()
+
+                        {!! view_render_event('bagisto.admin.promotions.catalog-rules.create.before') !!}
+
+                        <accordian :title="'{{ __('admin::app.promotions.catalog-rules.rule-information') }}'" :active="true">
+                            <div slot="body">
+
+                                <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
+                                    <label for="name" class="required">{{ __('admin::app.promotions.catalog-rules.name') }}</label>
+                                    <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.name') }}&quot;" value="{{ old('name') ?: $catalogRule->name }}"/>
+                                    <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="description">{{ __('admin::app.promotions.catalog-rules.description') }}</label>
+                                    <textarea class="control" id="description" name="description">{{ old('description') ?: $catalogRule->description }}</textarea>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="status">{{ __('admin::app.promotions.catalog-rules.status') }}</label>
+                                    <span class="checkbox">
+                                        <input type="checkbox" id="status" name="status" value="{{ $catalogRule->status }}" {{ $catalogRule->status ? 'checked' : '' }}>
+                                        <label class="checkbox-view" for="status"></label>
+                                        {{ __('admin::app.promotions.catalog-rules.is-active') }}
+                                    </span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
+                                    <label for="channels" class="required">{{ __('admin::app.promotions.catalog-rules.channels') }}</label>
+
+                                    <?php $selectedOptionIds = old('channels') ?: $catalogRule->channels->pluck('id')->toArray() ?>
+
+                                    <select class="control" id="channels" name="channels[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.channels') }}&quot;" multiple="multiple">
+
+                                        @foreach(core()->getAllChannels() as $channel)
+                                            <option value="{{ $channel->id }}" {{ in_array($channel->id, $selectedOptionIds) ? 'selected' : '' }}>
+                                                {{ $channel->name }}
+                                            </option>
+                                        @endforeach
+
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('channels[]')">@{{ errors.first('channels[]') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('customer_groups[]') ? 'has-error' : '']">
+                                    <label for="customer_groups" class="required">{{ __('admin::app.promotions.catalog-rules.customer-groups') }}</label>
+
+                                    <?php $selectedOptionIds = old('customer_groups') ?: $catalogRule->customer_groups->pluck('id')->toArray() ?>
+
+                                    <select class="control" id="customer_groups" name="customer_groups[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.customer-groups') }}&quot;" multiple="multiple">
+
+                                        @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $customerGroup)
+                                            <option value="{{ $customerGroup->id }}" {{ in_array($customerGroup->id, $selectedOptionIds) ? 'selected' : '' }}>
+                                                {{ $customerGroup->name }}
+                                            </option>
+                                        @endforeach
+
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
+                                </div>
+
+                                <div class="control-group date">
+                                    <label for="starts_from">{{ __('admin::app.promotions.catalog-rules.from') }}</label>
+                                    <date>
+                                        <input type="text" name="starts_from" class="control" value="{{ old('starts_from') ?: $catalogRule->starts_from }}"/>
+                                    </date>
+                                </div>
+
+                                <div class="control-group date">
+                                    <label for="ends_till">{{ __('admin::app.promotions.catalog-rules.to') }}</label>
+                                    <date>
+                                        <input type="text" name="ends_till" class="control" value="{{ old('ends_till') ?: $catalogRule->ends_till }}"/>
+                                    </date>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="sort_order">{{ __('admin::app.promotions.catalog-rules.priority') }}</label>
+                                    <input type="text" class="control" id="sort_order" name="sort_order" value="{{ $catalogRule->sort_order }}" {{ $catalogRule->status ? 'checked' : '' }}/>
+                                </div>
+
+                            </div>
+                        </accordian>
+
+                        <accordian :title="'{{ __('admin::app.promotions.catalog-rules.conditions') }}'" :active="false">
+                            <div slot="body">
+
+                                <div class="control-group">
+                                    <label for="condition_type">{{ __('admin::app.promotions.catalog-rules.condition-type') }}</label>
+
+                                    <select class="control" id="condition_type" name="condition_type" v-model="condition_type">
+                                        <option value="1">{{ __('admin::app.promotions.catalog-rules.all-conditions-true') }}</option>
+                                        <option value="2">{{ __('admin::app.promotions.catalog-rules.any-condition-true') }}</option>
+                                    </select>
+                                </div>
+
+                                <div class="table catalog-rule-conditions" style="margin-top: 20px; overflow-x: unset;">
+                                    <table>
+                                        <tbody>
+                                            <catalog-rule-condition-item
+                                                v-for='(condition, index) in conditions'
+                                                :condition="condition"
+                                                :key="index"
+                                                :index="index"
+                                                @onRemoveCondition="removeCondition($event)">
+                                            </catalog-rule-condition-item>
+                                        </tbody>
+                                    </table>
+                                </div>
+
+                                <button type="button" class="btn btn-lg btn-primary" style="margin-top: 20px;" @click="addCondition">
+                                    {{ __('admin::app.promotions.catalog-rules.add-condition') }}
+                                </button>
+
+                            </div>
+                        </accordian>
+
+                        <accordian :title="'{{ __('admin::app.promotions.catalog-rules.actions') }}'" :active="false">
+                            <div slot="body">
+
+                                <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
+                                    <label for="action_type" class="required">{{ __('admin::app.promotions.catalog-rules.action-type') }}</label>
+
+                                    <?php $selectedOption = old('action_type') ?: $catalogRule->action_type ?>
+
+                                    <select class="control" id="action_type" name="action_type" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.action-type') }}&quot;">
+                                        <option value="by_percent" {{ $selectedOption == 'by_percent' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.catalog-rules.percentage-product-price') }}
+                                        </option>
+                                        <option value="by_fixed" {{ $selectedOption == 'by_fixed' ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.catalog-rules.fixed-amount') }}
+                                        </option>
+                                    </select>
+
+                                    <span class="control-error" v-if="errors.has('action_type')">@{{ errors.first('action_type') }}</span>
+                                </div>
+
+                                <div class="control-group" :class="[errors.has('discount_amount') ? 'has-error' : '']">
+                                    <label for="discount_amount" class="required">{{ __('admin::app.promotions.catalog-rules.discount-amount') }}</label>
+
+                                    <input v-validate="'required'" class="control" id="discount_amount" name="discount_amount" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.discount-amount') }}&quot;" value="{{ old('discount_amount') ?: $catalogRule->discount_amount }}"/>
+
+                                    <span class="control-error" v-if="errors.has('discount_amount')">@{{ errors.first('discount_amount') }}</span>
+                                </div>
+
+                                <div class="control-group">
+                                    <label for="end_other_rules">{{ __('admin::app.promotions.catalog-rules.end-other-rules') }}</label>
+
+                                    <?php $selectedOption = old('end_other_rules') ?: $catalogRule->end_other_rules ?>
+
+                                    <select class="control" id="end_other_rules" name="end_other_rules">
+                                        <option value="0" {{ ! $selectedOption ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.catalog-rules.no') }}
+                                        </option>
+
+                                        <option value="1" {{ $selectedOption ? 'selected' : '' }}>
+                                            {{ __('admin::app.promotions.catalog-rules.yes') }}
+                                        </option>
+                                    </select>
+                                </div>
+
+                            </div>
+                        </accordian>
+
+                        {!! view_render_event('bagisto.admin.promotions.catalog-rules.create.after') !!}
+                    </div>
+                </div>
+            </form>
+        </div>
+    </script>
+
+    <script type="text/x-template" id="catalog-rule-condition-item-template">
+        <tr>
+            <td class="attribute">
+                <div class="control-group">
+                    <select :name="['conditions[' + index + '][attribute]']" class="control" v-model="condition.attribute">
+                        <option value="">{{ __('admin::app.promotions.catalog-rules.choose-condition-to-add') }}</option>
+                        <optgroup v-for='(conditionAttribute, index) in condition_attributes' :label="conditionAttribute.label">
+                            <option v-for='(childAttribute, index) in conditionAttribute.children' :value="childAttribute.key">
+                                @{{ childAttribute.label }}
+                            </option>
+                        </optgroup>
+                    </select>
+                </div>
+            </td>
+
+            <td class="operator">
+                <div class="control-group" v-if="matchedAttribute">
+                    <select :name="['conditions[' + index + '][operator]']" class="control" v-model="condition.operator">
+                        <option v-for='operator in condition_operators[matchedAttribute.type]' :value="operator.operator">
+                            @{{ operator.label }}
+                        </option>
+                    </select>
+                </div>
+            </td>
+
+            <td class="value">
+                <div v-if="matchedAttribute">
+                    <input type="hidden" :name="['conditions[' + index + '][attribute_type]']" v-model="matchedAttribute.type">
+
+                    <div v-if="matchedAttribute.key == 'product|category_ids'">
+                        <tree-view value-field="id" id-field="id" :name-field="'conditions[' + index + '][value]'" input-type="checkbox" :items='matchedAttribute.options' :value='condition.value' :behavior="'no'"></tree-view>
+                    </div>
+
+                    <div v-else>
+                        <div class="control-group" v-if="matchedAttribute.type == 'text' || matchedAttribute.type == 'price' || matchedAttribute.type == 'decimal' || matchedAttribute.type == 'integer'">
+                            <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                        </div>
+
+                        <div class="control-group date" v-if="matchedAttribute.type == 'date'">
+                            <date>
+                                <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                            </date>
+                        </div>
+
+                        <div class="control-group date" v-if="matchedAttribute.type == 'datetime'">
+                            <datetime>
+                                <input class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value"/>
+                            </datetime>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'boolean'">
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value">
+                                <option value="1">{{ __('admin::app.promotions.catalog-rules.yes') }}</option>
+                                <option value="0">{{ __('admin::app.promotions.catalog-rules.no') }}</option>
+                            </select>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'select' || matchedAttribute.type == 'radio'">
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value" v-if="matchedAttribute.key != 'catalog|state'">
+                                <option v-for='option in matchedAttribute.options' :value="option.id">
+                                    @{{ option.admin_name }}
+                                </option>
+                            </select>
+
+                            <select :name="['conditions[' + index + '][value]']" class="control" v-model="condition.value" v-else>
+                                <optgroup v-for='option in matchedAttribute.options' :label="option.admin_name">
+                                    <option v-for='state in option.states' :value="state.code">
+                                        @{{ state.admin_name }}
+                                    </option>
+                                </optgroup>
+                            </select>
+                        </div>
+
+                        <div class="control-group" v-if="matchedAttribute.type == 'multiselect' || matchedAttribute.type == 'checkbox'">
+                            <select :name="['conditions[' + index + '][value][]']" class="control" v-model="condition.value" multiple>
+                                <option v-for='option in matchedAttribute.options' :value="option.id">
+                                    @{{ option.admin_name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </td>
+
+            <td class="actions">
+                <i class="icon trash-icon" @click="removeCondition"></i>
+            </td>
+        </tr>
+    </script>
+
+    <script>
+        Vue.component('catalog-rule', {
+
+            template: '#catalog-rule-template',
+
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    condition_type: {{ old('condition_type') ?: $catalogRule->condition_type }},
+
+                    conditions: @json($catalogRule->conditions ?: [])
+                }
+            },
+
+            methods: {
+                addCondition: function() {
+                    this.conditions.push({
+                        'attribute': '',
+                        'operator': '==',
+                        'value': '',
+                    });
+                },
+
+                removeCondition: function(condition) {
+                    let index = this.conditions.indexOf(condition)
+
+                    this.conditions.splice(index, 1)
+                },
+
+                onSubmit: function(e) {
+                    this.$root.onSubmit(e)
+                },
+
+                redirectBack: function(fallbackUrl) {
+                    this.$root.redirectBack(fallbackUrl)
+                }
+            }
+        });
+
+        Vue.component('catalog-rule-condition-item', {
+
+            template: '#catalog-rule-condition-item-template',
+
+            props: ['index', 'condition'],
+
+            data: function() {
+                return {
+                    condition_attributes: @json(app('\Webkul\CatalogRule\Repositories\CatalogRuleRepository')->getConditionAttributes()),
+
+                    attribute_type_indexes: {
+                        'product': 0
+                    }, 
+
+                    condition_operators: {
+                        'price': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'decimal': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'integer': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'text': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.contain') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.does-not-contain') }}'
+                            }],
+                        'boolean': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }],
+                        'date': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'datetime': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }, {
+                                'operator': '>=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-greater-than') }}'
+                            }, {
+                                'operator': '<=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.equals-or-less-than') }}'
+                            }, {
+                                'operator': '>',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.greater-than') }}'
+                            }, {
+                                'operator': '<',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.less-than') }}'
+                            }],
+                        'select': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }],
+                        'radio': [{
+                                'operator': '==',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-equal-to') }}'
+                            }, {
+                                'operator': '!=',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.is-not-equal-to') }}'
+                            }],
+                        'multiselect': [{
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.contains') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.does-not-contain') }}'
+                            }],
+                        'checkbox': [{
+                                'operator': '{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.contains') }}'
+                            }, {
+                                'operator': '!{}',
+                                'label': '{{ __('admin::app.promotions.catalog-rules.does-not-contain') }}'
+                            }]
+                    }
+                }
+            },
+
+            computed: {
+                matchedAttribute: function () {
+                    if (this.condition.attribute == '')
+                        return;
+
+                    var this_this = this;
+
+                    var attributeIndex = this.attribute_type_indexes[this.condition.attribute.split("|")[0]];
+
+                    matchedAttribute = this.condition_attributes[attributeIndex]['children'].filter(function (attribute) {
+                        return attribute.key == this_this.condition.attribute;
+                    });
+
+                    if (matchedAttribute[0]['type'] == 'multiselect' || matchedAttribute[0]['type'] == 'checkbox') {
+                        this.condition.operator = '{}';
+
+                        this.condition.value = this.condition.value == '' && this.condition.value != undefined ? [] : this.condition.value;
+                    }
+
+                    return matchedAttribute[0];
+                }
+            },
+
+            methods: {
+                removeCondition: function() {
+                    this.$emit('onRemoveCondition', this.condition)
+                }
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/index.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/index.blade.php
new file mode 100644
index 000000000..0139be19f
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/index.blade.php
@@ -0,0 +1,27 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+    {{ __('admin::app.promotions.catalog-rules.title') }}
+@stop
+
+@section('content')
+
+    <div class="content">
+        <div class="page-header">
+            <div class="page-title">
+                <h1>{{ __('admin::app.promotions.catalog-rules.title') }}</h1>
+            </div>
+
+            <div class="page-action">
+                <a href="{{ route('admin.catalog-rules.create') }}" class="btn btn-lg btn-primary">
+                    {{ __('admin::app.promotions.catalog-rules.add-title') }}
+                </a>
+            </div>
+        </div>
+
+        <div class="page-content">
+            @inject('catalogRuleGrid','Webkul\Admin\DataGrids\CatalogRuleDataGrid')
+            {!! $catalogRuleGrid->render() !!}
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index c635af49e..a1b28cbd0 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -332,7 +332,13 @@
 
                                     @if ($order->base_discount_amount > 0)
                                         <tr>
-                                            <td>{{ __('admin::app.sales.orders.discount') }}</td>
+                                            <td>
+                                                {{ __('admin::app.sales.orders.discount') }}
+
+                                                @if ($order->coupon_code)
+                                                    ({{ $order->coupon_code }})
+                                                @endif
+                                            </td>
                                             <td>-</td>
                                             <td>{{ core()->formatBasePrice($order->base_discount_amount) }}</td>
                                         </tr>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
index 4906a56cb..55baebe44 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
@@ -7,7 +7,7 @@
 @section('content')
     <div class="content">
 
-        <form method="POST" action="{{ route('admin.locales.store') }}" @submit.prevent="onSubmit">
+        <form method="POST" action="{{ route('admin.locales.store') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
             <div class="page-header">
                 <div class="page-title">
                     <h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
index 365020c48..0fccaface 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
@@ -7,7 +7,7 @@
 @section('content')
     <div class="content">
 
-        <form method="POST" action="{{ route('admin.locales.update', $locale->id) }}" @submit.prevent="onSubmit">
+        <form method="POST" action="{{ route('admin.locales.update', $locale->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
             <div class="page-header">
                 <div class="page-title">
                     <h1>
diff --git a/packages/Webkul/CartRule/src/Contracts/CartRule.php b/packages/Webkul/CartRule/src/Contracts/CartRule.php
new file mode 100644
index 000000000..bbc60e2e2
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Contracts/CartRule.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\CartRule\Contracts;
+
+interface CartRule
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Contracts/CartRuleCoupon.php b/packages/Webkul/CartRule/src/Contracts/CartRuleCoupon.php
new file mode 100644
index 000000000..7e43bf89d
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Contracts/CartRuleCoupon.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\CartRule\Contracts;
+
+interface CartRuleCoupon
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Contracts/CartRuleCouponUsage.php b/packages/Webkul/CartRule/src/Contracts/CartRuleCouponUsage.php
new file mode 100644
index 000000000..de3c4e4ab
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Contracts/CartRuleCouponUsage.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\CartRule\Contracts;
+
+interface CartRuleCouponUsage
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Contracts/CartRuleCustomer.php b/packages/Webkul/CartRule/src/Contracts/CartRuleCustomer.php
new file mode 100644
index 000000000..9c6af6bba
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Contracts/CartRuleCustomer.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\CartRule\Contracts;
+
+interface CartRuleCustomer
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Contracts/CartRuleTranslation.php b/packages/Webkul/CartRule/src/Contracts/CartRuleTranslation.php
new file mode 100644
index 000000000..0c7394255
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Contracts/CartRuleTranslation.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\CartRule\Contracts;
+
+interface CartRuleTranslation
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024320_remove_tables.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024320_remove_tables.php
new file mode 100644
index 000000000..0ba8a50a7
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024320_remove_tables.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('cart_rule_cart');
+
+        Schema::dropIfExists('cart_rule_labels');
+
+        Schema::dropIfExists('cart_rule_channels');
+
+        Schema::dropIfExists('cart_rule_customer_groups');
+
+        Schema::dropIfExists('cart_rule_customers');
+
+        Schema::dropIfExists('cart_rule_coupons');
+
+        Schema::dropIfExists('cart_rule_coupon_usage');
+
+        Schema::dropIfExists('cart_rule_coupons_usage');
+
+        Schema::dropIfExists('cart_rules');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024321_create_cart_rules_table.php
similarity index 52%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php
rename to packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024321_create_cart_rules_table.php
index 4d9190e65..6912df3c1 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024326_create_cart_rule_table.php
+++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024321_create_cart_rules_table.php
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateCartRuleTable extends Migration
+class CreateCartRulesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,38 +13,29 @@ class CreateCartRuleTable extends Migration
      */
     public function up()
     {
-        Schema::dropIfExists('discount_customer_group');
-        Schema::dropIfExists('discount_channels');
-        Schema::dropIfExists('discount_rules');
-        Schema::dropIfExists('discounts');
-        Schema::dropIfExists('products_grid');
-
         Schema::create('cart_rules', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name')->nullable();
             $table->string('description')->nullable();
-            $table->datetime('starts_from')->nullable();
-            $table->datetime('ends_till')->nullable();
+            $table->date('starts_from')->nullable();
+            $table->date('ends_till')->nullable();
             $table->boolean('status')->default(0);
-            $table->integer('per_customer')->unsigned()->default(0);
-            $table->boolean('is_guest')->default(0);
-            $table->boolean('use_coupon')->default(0);
-            $table->integer('usage_limit')->unsigned()->default(0);
-            $table->json('conditions')->nullable();
-            $table->json('actions')->nullable();
-            $table->boolean('end_other_rules')->default(0);
-            $table->integer('priority')->unsigned()->default(0);
-            $table->boolean('uses_attribute_conditions')->default(0);
-            $table->longtext('product_ids')->nullable();
-            $table->integer('sort_order')->unsigned()->default(0);
-            $table->string('action_type')->nullable();
-            $table->decimal('disc_amount', 12, 4)->default(0);
-            $table->decimal('disc_quantity', 12, 4)->default(1);
-            $table->string('disc_threshold')->default(1);
             $table->integer('coupon_type')->default(1);
-            $table->boolean('auto_generation')->default(0);
+            $table->boolean('use_auto_generation')->default(0);
+            $table->integer('usage_per_customer')->default(0);
+            $table->integer('uses_per_coupon')->default(0);
+            $table->integer('times_used')->unsigned()->default(0);
+            $table->boolean('condition_type')->default(1);
+            $table->json('conditions')->nullable();
+            $table->boolean('end_other_rules')->default(0);
+            $table->boolean('uses_attribute_conditions')->default(0);
+            $table->string('action_type')->nullable();
+            $table->decimal('discount_amount', 12, 4)->default(0);
+            $table->integer('discount_quantity')->default(1);
+            $table->string('discount_step')->default(1);
             $table->boolean('apply_to_shipping')->default(0);
             $table->boolean('free_shipping')->default(0);
+            $table->integer('sort_order')->unsigned()->default(0);
             $table->timestamps();
         });
     }
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024340_create_cart_rule_channels_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024322_create_cart_rule_channels_table.php
similarity index 91%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024340_create_cart_rule_channels_table.php
rename to packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024322_create_cart_rule_channels_table.php
index 3808c6545..067a452fa 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024340_create_cart_rule_channels_table.php
+++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024322_create_cart_rule_channels_table.php
@@ -14,12 +14,13 @@ class CreateCartRuleChannelsTable extends Migration
     public function up()
     {
         Schema::create('cart_rule_channels', function (Blueprint $table) {
-            $table->increments('id');
             $table->integer('cart_rule_id')->unsigned();
-            $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
             $table->integer('channel_id')->unsigned();
+            
+            $table->primary(['cart_rule_id', 'channel_id']);
+
+            $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
             $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
-            $table->timestamps();
         });
     }
 
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024419_create_cart_rule_customer_groups_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024323_create_cart_rule_customer_groups_table.php
similarity index 90%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024419_create_cart_rule_customer_groups_table.php
rename to packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024323_create_cart_rule_customer_groups_table.php
index 4396b999a..312237d98 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_13_024419_create_cart_rule_customer_groups_table.php
+++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024323_create_cart_rule_customer_groups_table.php
@@ -14,12 +14,14 @@ class CreateCartRuleCustomerGroupsTable extends Migration
     public function up()
     {
         Schema::create('cart_rule_customer_groups', function (Blueprint $table) {
-            $table->increments('id');
             $table->integer('cart_rule_id')->unsigned();
-            $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
             $table->integer('customer_group_id')->unsigned();
+
+            
+            $table->primary(['cart_rule_id', 'customer_group_id']);
+            
+            $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
             $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
-            $table->timestamps();
         });
     }
 
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024324_create_cart_rule_translations_table.php
similarity index 54%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php
rename to packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024324_create_cart_rule_translations_table.php
index 82c7505a0..9c71333d7 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_30_141207_create_cart_rule_cart_table.php
+++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024324_create_cart_rule_translations_table.php
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateCartRuleCartTable extends Migration
+class CreateCartRuleTranslationsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,13 +13,13 @@ class CreateCartRuleCartTable extends Migration
      */
     public function up()
     {
-        Schema::create('cart_rule_cart', function (Blueprint $table) {
+        Schema::create('cart_rule_translations', function (Blueprint $table) {
             $table->increments('id');
-            $table->integer('cart_rule_id')->unsigned()->nullable();
+            $table->string('locale');
+            $table->text('label')->nullable();
+            $table->integer('cart_rule_id')->unsigned();
+            $table->unique(['cart_rule_id', 'locale']);
             $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
-            $table->integer('cart_id')->unsigned()->nullable();
-            $table->foreign('cart_id')->references('id')->on('cart')->onDelete('cascade');
-            $table->timestamps();
         });
     }
 
@@ -30,6 +30,6 @@ class CreateCartRuleCartTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('cart_rule_cart');
+        Schema::dropIfExists('cart_rule_translations');
     }
 }
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_175727_create_cart_rule_customers_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024325_create_cart_rule_customers_table.php
similarity index 84%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_05_23_175727_create_cart_rule_customers_table.php
rename to packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024325_create_cart_rule_customers_table.php
index fbe323ab1..a16452c6f 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_175727_create_cart_rule_customers_table.php
+++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024325_create_cart_rule_customers_table.php
@@ -15,12 +15,13 @@ class CreateCartruleCustomersTable extends Migration
     {
         Schema::create('cart_rule_customers', function (Blueprint $table) {
             $table->increments('id');
+            $table->bigInteger('times_used')->unsigned()->default(0);
+
             $table->integer('cart_rule_id')->unsigned();
             $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
+
             $table->integer('customer_id')->unsigned();
             $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade');
-            $table->bigInteger('usage_throttle')->unsigned()->default(0);
-            $table->timestamps();
         });
     }
 
@@ -31,6 +32,6 @@ class CreateCartruleCustomersTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('cart_rule_customers');
+        Schema::dropIfExists('cartrule_customers');
     }
 }
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024326_create_cart_rule_coupons_table.php
similarity index 80%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php
rename to packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024326_create_cart_rule_coupons_table.php
index 67eea0030..89741800e 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_23_180457_create_cart_rule_coupons_table.php
+++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024326_create_cart_rule_coupons_table.php
@@ -15,15 +15,16 @@ class CreateCartruleCouponsTable extends Migration
     {
         Schema::create('cart_rule_coupons', function (Blueprint $table) {
             $table->increments('id');
-            $table->integer('cart_rule_id')->unsigned();
-            $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
-            $table->string('prefix')->nullable();
-            $table->string('suffix')->nullable();
             $table->string('code')->nullable();
             $table->integer('usage_limit')->unsigned()->default(0);
             $table->integer('usage_per_customer')->unsigned()->default(0);
-            $table->integer('usage_throttle')->unsigned()->default(0);
+            $table->integer('times_used')->unsigned()->default(0);
             $table->integer('type')->unsigned()->default(0);
+            $table->boolean('is_primary')->default(0);
+            $table->date('expired_at')->nullable();
+            
+            $table->integer('cart_rule_id')->unsigned();
+            $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
             $table->timestamps();
         });
     }
@@ -35,6 +36,6 @@ class CreateCartruleCouponsTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('cart_rule_coupons');
+        Schema::dropIfExists('cartrule_coupons');
     }
 }
diff --git a/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024327_create_cart_rule_coupon_usage_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024327_create_cart_rule_coupon_usage_table.php
new file mode 100644
index 000000000..ae0339b0a
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024327_create_cart_rule_coupon_usage_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCartRuleCouponUsageTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('cart_rule_coupon_usage', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('times_used')->default(0);
+
+            $table->integer('cart_rule_coupon_id')->unsigned();
+            $table->foreign('cart_rule_coupon_id')->references('id')->on('cart_rule_coupons')->onDelete('cascade');
+
+            $table->integer('customer_id')->unsigned();
+            $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('cart_rule_coupon_usage');
+    }
+}
diff --git a/packages/Webkul/CartRule/src/Helpers/CartRule.php b/packages/Webkul/CartRule/src/Helpers/CartRule.php
new file mode 100644
index 000000000..8ad0c4dac
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Helpers/CartRule.php
@@ -0,0 +1,523 @@
+<?php
+
+namespace Webkul\CartRule\Helpers;
+
+use Carbon\Carbon;
+use Webkul\CartRule\Repositories\CartRuleRepository;
+use Webkul\CartRule\Repositories\CartRuleCouponRepository;
+use Webkul\CartRule\Repositories\CartRuleCouponUsageRepository;
+use Webkul\CartRule\Repositories\CartRuleCustomerRepository;
+use Webkul\Customer\Repositories\CustomerGroupRepository;
+use Webkul\Rule\Helpers\Validator;
+use Webkul\Checkout\Facades\Cart;
+
+class CartRule
+{
+    /**
+     * CartRuleRepository object
+     *
+     * @var CartRuleRepository
+     */
+    protected $cartRuleRepository;
+
+    /**
+     * CartRuleCouponRepository object
+     *
+     * @var CartRuleCouponRepository
+     */
+    protected $cartRuleCouponRepository;
+
+    /**
+     * CartRuleCouponUsageRepository object
+     *
+     * @var CartRuleCouponUsageRepository
+     */
+    protected $cartRuleCouponUsageRepository;
+
+    /**
+     * CartRuleCustomerRepository object
+     *
+     * @var CartRuleCustomerRepository
+     */
+    protected $cartRuleCustomerRepository;
+
+    /**
+     * CustomerGroupRepository object
+     *
+     * @var CustomerGroupRepository
+     */
+    protected $customerGroupRepository;
+
+    /**
+     * Validator object
+     *
+     * @var Validator
+     */
+    protected $validator;
+
+    /**
+     * @var array
+     */
+    protected $itemTotals = [];
+
+    /**
+     * Create a new helper instance.
+     *
+     * @param  Webkul\CartRule\Repositories\CartRuleRepository            $cartRuleRepository
+     * @param  Webkul\CartRule\Repositories\CartRuleCouponRepository      $cartRuleCouponRepository
+     * @param  Webkul\CartRule\Repositories\CartRuleCouponUsageRepository $cartRuleCouponUsageRepository
+     * @param  Webkul\CartRule\Repositories\CartRuleCustomerRepository    $cartRuleCustomerRepository
+     * @param  Webkul\Customer\Repositories\CustomerGroupRepository       $customerGroupRepository
+     * @param  Webkul\Rule\Helpers\Validator                              $validator
+     * @return void
+     */
+    public function __construct(
+        CartRuleRepository $cartRuleRepository,
+        CartRuleCouponRepository $cartRuleCouponRepository,
+        CartRuleCouponUsageRepository $cartRuleCouponUsageRepository,
+        CartRuleCustomerRepository $cartRuleCustomerRepository,
+        CustomerGroupRepository $customerGroupRepository,
+        Validator $validator
+    )
+    {
+        $this->cartRuleRepository = $cartRuleRepository;
+
+        $this->cartRuleCouponRepository = $cartRuleCouponRepository;
+
+        $this->cartRuleCouponUsageRepository = $cartRuleCouponUsageRepository;
+
+        $this->cartRuleCustomerRepository = $cartRuleCustomerRepository;
+
+        $this->customerGroupRepository = $customerGroupRepository;
+
+        $this->validator = $validator;
+    }
+
+    /**
+     * Collect discount on cart
+     *
+     * @return void
+     */
+    public function collect()
+    {
+        $cart = Cart::getCart();
+
+        $this->calculateCartItemTotals($cart->items()->get());
+
+        foreach ($cart->items()->get() as $item) {
+            $this->process($item);
+
+            if ($item->children()->count() && $item->product->getTypeInstance()->isChildrenCalculated())
+                $this->devideDiscount($item);
+        }
+
+        $this->processShippingDiscount($cart);
+
+        $this->processFreeShippingDiscount($cart);
+
+        $this->validateCouponCode();
+    }
+
+    /**
+     * Returns cart rules
+     *
+     * @return Collection
+     */
+    public function getCartRules()
+    {
+        static $cartRules;
+
+        if ($cartRules)
+            return $cartRules;
+
+        $customerGroupId = null;
+
+        if (Cart::getCurrentCustomer()->check()) {
+            $customerGroupId = Cart::getCurrentCustomer()->user()->customer_group_id;
+        } else {
+            if ($customerGuestGroup = $this->customerGroupRepository->findOneByField('code', 'guest'))
+                $customerGroupId = $customerGuestGroup->id;
+        }
+
+        $cartRules = $this->cartRuleRepository->scopeQuery(function($query) use ($customerGroupId) {
+            return $query->leftJoin('cart_rule_customer_groups', 'cart_rules.id', '=', 'cart_rule_customer_groups.cart_rule_id')
+                    ->leftJoin('cart_rule_channels', 'cart_rules.id', '=', 'cart_rule_channels.cart_rule_id')
+                    ->where('cart_rule_customer_groups.customer_group_id', $customerGroupId)
+                    ->where('cart_rule_channels.channel_id', core()->getCurrentChannel()->id)
+                    ->where(function ($query1) {
+                        $query1->where('cart_rules.starts_from', '<=', Carbon::now()->format('Y-m-d'))->orWhereNull('cart_rules.starts_from');
+                    })
+                    ->where(function ($query2) {
+                        $query2->where('cart_rules.ends_till', '>=', Carbon::now()->format('Y-m-d'))->orWhereNull('cart_rules.ends_till');
+                    })
+                    ->orderBy('sort_order', 'asc');
+        })->findWhere(['status' => 1]);
+
+        return $cartRules;
+    }
+
+    /**
+     * Check if cart rule can be applied
+     *
+     * @param CartRule $rule
+     * @return boolean
+     */
+    public function canProcessRule($rule)
+    {
+        $cart = Cart::getCart();
+
+        if ($rule->coupon_type) {
+            if (strlen($cart->coupon_code)) {
+                $coupon = $this->cartRuleCouponRepository->findOneWhere([
+                        'cart_rule_id' => $rule->id,
+                        'code' => $cart->coupon_code,
+                    ]);
+
+                if ($coupon) {
+                    if ($coupon->usage_limit && $coupon->times_used >= $coupon->usage_limit)
+                        return false;
+                    
+                    if ($cart->customer_id && $coupon->usage_per_customer) {
+                        $couponUsage = $this->cartRuleCouponUsageRepository->findOneWhere([
+                                'cart_rule_coupon_id' => $coupon->id,
+                                'customer_id' => $cart->customer_id
+                            ]);
+
+                        if ($couponUsage && $couponUsage->times_used >= $coupon->usage_per_customer)
+                            return false;
+                    }
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+
+        if ($rule->usage_per_customer) {
+            $ruleCustomer = $this->cartRuleCustomerRepository->findOneWhere([
+                    'cart_rule_id' => $rule->id,
+                    'customer_id' => $cart->customer_id,
+                ]);
+
+            if ($ruleCustomer && $ruleCustomer->times_used >= $rule->usage_per_customer)
+                return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Cart item discount calculation process
+     *
+     * @param CartItem $item
+     * @return void
+     */
+    public function process($item)
+    {
+        $item->discount_percent = 0;
+        $item->discount_amount = 0;
+        $item->base_discount_amount = 0;
+
+        $cart = $item->cart;
+
+        $cart->applied_cart_rule_ids = null;
+
+        $appliedRuleIds = [];
+
+        foreach ($this->getCartRules() as $rule) {
+            if (! $this->canProcessRule($rule))
+                continue;
+
+            if (! $this->validator->validate($rule, $item))
+                continue;
+
+            $quantity = $rule->discount_quantity ? min($item->quantity, $rule->discount_quantity) : $item->quantity;
+
+            $discountAmount = $baseDiscountAmount = 0;
+
+            switch ($rule->action_type) {
+                case 'by_percent':
+                    $rulePercent = min(100, $rule->discount_amount);
+
+                    $discountAmount = ($quantity * $item->price - $item->discount_amount) * ($rulePercent / 100);
+
+                    $baseDiscountAmount = ($quantity * $item->base_price - $item->base_discount_amount) * ($rulePercent / 100);
+
+                    if (! $rule->discount_quantity || $rule->discount_quantity > $quantity) {
+                        $discountPercent = min(100, $item->discount_percent + $rulePercent);
+
+                        $item->discount_percent = $discountPercent;
+                    }
+
+                    break;
+
+                case 'by_fixed':
+                    $discountAmount = $quantity * core()->convertPrice($rule->discount_amount);
+
+                    $baseDiscountAmount = $quantity * $rule->discount_amount;
+
+                    break;
+
+                case 'cart_fixed':
+                    if ($this->itemTotals[$rule->id]['total_items'] <= 1) {
+                        $discountAmount = core()->convertPrice($rule->discount_amount);
+
+                        $baseDiscountAmount = min($item->base_price * $quantity, $rule->discount_amount);
+                    } else {
+                        $discountRate = $item->base_price * $quantity / $this->itemTotals[$rule->id]['base_total_price'];
+
+                        $maxDiscount = $rule->discount_amount * $discountRate;
+
+                        $discountAmount = core()->convertPrice($maxDiscount);
+
+                        $baseDiscountAmount = min($item->base_price * $quantity, $maxDiscount);
+                    }
+
+                    $discountAmount = min($item->price * $quantity, $discountAmount);
+
+                    break;
+
+                case 'buy_x_get_y':
+                    if (! $rule->discount_step || $rule->discount_amount > $rule->discount_step)
+                        break;
+
+                    $buyAndDiscountQty = $rule->discount_step + $rule->discount_amount;
+
+                    $qtyPeriod = floor($quantity / $buyAndDiscountQty);
+
+                    $freeQty = $quantity - $qtyPeriod * $buyAndDiscountQty;
+
+                    $discountQty = $qtyPeriod * $rule->discount_amount;
+
+                    if ($freeQty > $rule->discount_step)
+                        $discountQty += $freeQty - $rule->discount_step;
+
+                    $discountAmount = $discountQty * $item->price;
+
+                    $baseDiscountAmount = $discountQty * $item->base_price;
+
+                    break;
+            }
+
+            $item->discount_amount = min($item->discount_amount + $discountAmount, $item->price * $quantity);
+            $item->base_discount_amount = min($item->base_discount_amount + $baseDiscountAmount, $item->base_price * $quantity);
+
+            $appliedRuleIds[$rule->id] = $rule->id;
+
+            if ($rule->end_other_rules)
+                break;
+        }
+
+        $item->applied_cart_rule_ids = join(',', $appliedRuleIds);
+
+        $item->save();
+
+        $cartAppliedCartRuleIds = array_merge(explode(',', $cart->applied_cart_rule_ids), $appliedRuleIds);
+
+        $cartAppliedCartRuleIds = array_filter($cartAppliedCartRuleIds);
+
+        $cartAppliedCartRuleIds = array_unique($cartAppliedCartRuleIds);
+
+        $cart->applied_cart_rule_ids = join(',', $cartAppliedCartRuleIds);
+
+        $cart->save();
+    }
+
+    /**
+     * Cart shipping discount calculation process
+     *
+     * @param Cart $cart
+     * @return void
+     */
+    public function processShippingDiscount($cart)
+    {
+        if (! $selectedShipping = $cart->selected_shipping_rate)
+            return;
+
+        $selectedShipping->discount_amount = 0;
+        $selectedShipping->base_discount_amount = 0;
+
+        $appliedRuleIds = [];
+
+        foreach ($this->getCartRules() as $rule) {
+            if (! $this->canProcessRule($rule))
+                continue;
+
+            if (! $this->validator->validate($rule, $cart))
+                continue;
+
+            if (! $rule || ! $rule->apply_to_shipping)
+                continue;
+
+            $discountAmount = $baseDiscountAmount = 0;
+
+            switch ($rule->action_type) {
+                case 'by_percent':
+                    $rulePercent = min(100, $rule->discount_amount);
+
+                    $discountAmount = ($selectedShipping->price - $selectedShipping->discount_amount) * $rulePercent / 100;
+
+                    $baseDiscountAmount = ($selectedShipping->base_price - $selectedShipping->base_discount_amount) * $rulePercent / 100;
+
+                    break;
+
+                case 'by_fixed':
+                    $discountAmount = core()->convertPrice($rule->discount_amount);
+
+                    $baseDiscountAmount = $rule->discount_amount;
+
+                    break;
+            }
+
+            $selectedShipping->discount_amount = min($selectedShipping->discount_amount + $discountAmount, $selectedShipping->price);
+
+            $selectedShipping->base_discount_amount = min(
+                    $selectedShipping->base_discount_amount + $baseDiscountAmount,
+                    $selectedShipping->base_price
+                );
+
+            $selectedShipping->save();
+
+            $appliedRuleIds[$rule->id] = $rule->id;
+
+            if ($rule->end_other_rules)
+                break;
+        }
+
+        $selectedShipping->save();
+
+        $cartAppliedCartRuleIds = array_merge(explode(',', $cart->applied_cart_rule_ids), $appliedRuleIds);
+
+        $cartAppliedCartRuleIds = array_filter($cartAppliedCartRuleIds);
+
+        $cartAppliedCartRuleIds = array_unique($cartAppliedCartRuleIds);
+
+        $cart->applied_cart_rule_ids = join(',', $cartAppliedCartRuleIds);
+
+        $cart->save();
+
+        return $this;
+    }
+
+    /**
+     * Cart free shipping discount calculation process
+     *
+     * @param Cart $cart
+     * @return void
+     */
+    public function processFreeShippingDiscount($cart)
+    {
+        if (! $selectedShipping = $cart->selected_shipping_rate)
+            return;
+
+        $selectedShipping->discount_amount = 0;
+
+        $selectedShipping->base_discount_amount = 0;
+
+        $appliedRuleIds = [];
+
+        foreach ($this->getCartRules() as $rule) {
+            if (! $this->canProcessRule($rule))
+                continue;
+
+            if (! $this->validator->validate($rule, $cart))
+                continue;
+
+            if (! $rule || ! $rule->free_shipping)
+                continue;
+
+            $selectedShipping->price = 0;
+
+            $selectedShipping->base_price = 0;
+
+            $selectedShipping->save();
+
+            $appliedRuleIds[$rule->id] = $rule->id;
+
+            if ($rule->end_other_rules)
+                break;
+        }
+
+        $cartAppliedCartRuleIds = array_merge(explode(',', $cart->applied_cart_rule_ids), $appliedRuleIds);
+
+        $cartAppliedCartRuleIds = array_filter($cartAppliedCartRuleIds);
+
+        $cartAppliedCartRuleIds = array_unique($cartAppliedCartRuleIds);
+
+        $cart->applied_cart_rule_ids = join(',', $cartAppliedCartRuleIds);
+
+        $cart->save();
+    }
+
+    /**
+     * Calculate cart item totals for each rule
+     *
+     * @param mixed $items
+     * @return Validator
+     */
+    public function calculateCartItemTotals($items)
+    {
+        foreach ($this->getCartRules() as $rule) {
+            if ($rule->action_type == 'cart_fixed') {
+                $totalPrice = $totalBasePrice = $validCount = 0;
+
+                foreach ($items as $item) {
+                    if (! $this->canProcessRule($rule, $item))
+                        continue;
+
+                    $quantity = $rule->discount_quantity ? min($item->quantity, $rule->discount_quantity) : $item->quantity;
+
+                    $totalBasePrice += $item->base_price * $quantity;
+
+                    $validCount++;
+                }
+
+                $this->itemTotals[$rule->id] = [
+                    'base_total_price' => $totalBasePrice,
+                    'total_items' => $validCount,
+                ];
+            }
+        }
+    }
+
+    /**
+     * Check if coupon code is valid or not, if not remove from cart
+     *
+     * @return void
+     */
+    public function validateCouponCode()
+    {
+        $cart = Cart::getCart();
+
+        if (! $cart->coupon_code)
+            return;
+
+        $coupon = $this->cartRuleCouponRepository->findOneByField('code', $cart->coupon_code);
+
+        if (! $coupon || ! in_array($coupon->cart_rule_id, explode(',', $cart->applied_cart_rule_ids)))
+            Cart::removeCouponCode();
+    }
+
+    /**
+     * Devide discount amount to children
+     *
+     * @param CartItem $item
+     * @return void
+     */
+    protected function devideDiscount($item)
+    {
+        foreach ($item->children as $child) {
+            $ratio = $item->base_total != 0 ? $child->base_total / $item->base_total : 0;
+
+            foreach (['discount_amount', 'base_discount_amount'] as $column) {
+                if (! $item->{$column})
+                    continue;
+
+                $child->{$column} = round(($item->{$column} * $ratio), 4);
+
+                $child->save();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php
new file mode 100644
index 000000000..dc90a01b5
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace Webkul\CartRule\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Event;
+use Webkul\CartRule\Repositories\CartRuleRepository;
+use Webkul\CartRule\Repositories\CartRuleCouponRepository;
+
+/**
+ * Cart Rule controller
+ *
+ * @author Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CartRuleController extends Controller
+{
+    /**
+     * Initialize _config, a default request parameter with route
+     * 
+     * @param array
+     */
+    protected $_config;
+
+    /**
+     * To hold Cart repository instance
+     * 
+     * @var CartRuleRepository
+     */
+    protected $cartRuleRepository;
+
+    /**
+     * To hold CartRuleCouponRepository repository instance
+     * 
+     * @var CartRuleCouponRepository
+     */
+    protected $cartRuleCouponRepository;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param  \Webkul\CartRule\Repositories\CartRuleRepository       $cartRuleRepository
+     * @param  \Webkul\CartRule\Repositories\CartRuleCouponRepository $cartRuleCouponRepository
+     * @return void
+     */
+    public function __construct(
+        CartRuleRepository $cartRuleRepository,
+        CartRuleCouponRepository $cartRuleCouponRepository
+    )
+    {
+        $this->_config = request('_config');
+
+        $this->cartRuleRepository = $cartRuleRepository;
+
+        $this->cartRuleCouponRepository = $cartRuleCouponRepository;
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view($this->_config['view']);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return view($this->_config['view']);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function store()
+    {
+        $this->validate(request(), [
+            'name' => 'required',
+            'channels' => 'required|array|min:1',
+            'customer_groups' => 'required|array|min:1',
+            'coupon_type' => 'required',
+            'use_auto_generation' => 'required_if:coupon_type,==,1',
+            'coupon_code' => 'required_if:use_auto_generation,==,0',
+            'starts_from' => 'nullable|date',
+            'ends_till' => 'nullable|date|after_or_equal:starts_from',
+            'action_type' => 'required',
+            'discount_amount' => 'required|numeric'
+        ]);
+
+        $data = request()->all();
+
+        Event::fire('promotions.cart_rule.create.before');
+
+        $cartRule = $this->cartRuleRepository->create($data);
+
+        Event::fire('promotions.cart_rule.create.after', $cartRule);
+
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Cart Rule']));
+
+        return redirect()->route($this->_config['redirect']);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        $cartRule = $this->cartRuleRepository->findOrFail($id);
+
+        return view($this->_config['view'], compact('cartRule'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->validate(request(), [
+            'name' => 'required',
+            'channels' => 'required|array|min:1',
+            'customer_groups' => 'required|array|min:1',
+            'coupon_type' => 'required',
+            'use_auto_generation' => 'required_if:coupon_type,==,1',
+            'coupon_code' => 'required_if:use_auto_generation,==,0',
+            'starts_from' => 'nullable|date',
+            'ends_till' => 'nullable|date|after_or_equal:starts_from',
+            'action_type' => 'required',
+            'discount_amount' => 'required|numeric'
+        ]);
+
+        $cartRule = $this->cartRuleRepository->findOrFail($id);
+
+        Event::fire('promotions.cart_rule.update.before', $cartRule);
+
+        $cartRule = $this->cartRuleRepository->update(request()->all(), $id);
+
+        Event::fire('promotions.cart_rule.update.after', $cartRule);
+
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Cart Rule']));
+
+        return redirect()->route($this->_config['redirect']);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $cartRule = $this->cartRuleRepository->findOrFail($id);
+
+        try {
+            Event::fire('promotions.cart_rule.delete.before', $id);
+
+            $this->cartRuleRepository->delete($id);
+
+            Event::fire('promotions.cart_rule.delete.after', $id);
+
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Cart Rule']));
+
+            return response()->json(['message' => true], 200);
+        } catch(\Exception $e) {
+            session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Cart Rule']));
+        }
+
+        return response()->json(['message' => false], 400);
+    }
+
+    /**
+     * Generate coupon code for cart rule
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function generateCoupons()
+    {
+        $this->validate(request(), [
+            'coupon_qty' => 'required|integer|min:1',
+            'code_length' => 'required|integer|min:10',
+            'code_format' => 'required'
+        ]);
+        
+        if (! request('id'))
+            return response()->json(['message' => trans('admin::app.promotions.cart-rules.cart-rule-not-defind-error')], 400);
+
+        $this->cartRuleCouponRepository->generateCoupons(request()->all(), request('id'));
+
+        return response()->json(['message' => trans('admin::app.response.create-success', ['name' => 'Cart rule coupons'])]);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleCouponController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleCouponController.php
new file mode 100644
index 000000000..7da633cb8
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleCouponController.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Webkul\CartRule\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Webkul\CartRule\Repositories\CartRuleCouponRepository;
+
+/**
+ * Cart Rule Coupon controller
+ *
+ * @author Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CartRuleCouponController extends Controller
+{
+    /**
+     * To hold CartRuleCouponRepository repository instance
+     * 
+     * @var CartRuleCouponRepository
+     */
+    protected $cartRuleCouponRepository;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param  \Webkul\CartRule\Repositories\CartRuleCouponRepository $cartRuleCouponRepository
+     * @return void
+     */
+    public function __construct(CartRuleCouponRepository $cartRuleCouponRepository)
+    {
+        $this->cartRuleCouponRepository = $cartRuleCouponRepository;
+    }
+
+    /**
+     * Mass Delete the coupons
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function massDelete()
+    {
+        $couponIds = explode(',', request()->input('indexes'));
+
+        foreach ($couponIds as $couponId) {
+            $coupon = $this->cartRuleCouponRepository->find($couponId);
+
+            if ($coupon)
+                $this->cartRuleCouponRepository->delete($couponId);
+        }
+
+        session()->flash('success', trans('admin::app.promotions.cart-rules.mass-delete-success'));
+
+        return redirect()->back();
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Http/Controllers/Controller.php b/packages/Webkul/CartRule/src/Http/Controllers/Controller.php
similarity index 87%
rename from packages/Webkul/Discount/src/Http/Controllers/Controller.php
rename to packages/Webkul/CartRule/src/Http/Controllers/Controller.php
index dc4b61e7c..259457d89 100644
--- a/packages/Webkul/Discount/src/Http/Controllers/Controller.php
+++ b/packages/Webkul/CartRule/src/Http/Controllers/Controller.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Webkul\Discount\Http\Controllers;
+namespace Webkul\CartRule\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
diff --git a/packages/Webkul/CartRule/src/Listeners/Cart.php b/packages/Webkul/CartRule/src/Listeners/Cart.php
new file mode 100644
index 000000000..f039059c1
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Listeners/Cart.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Webkul\CartRule\Listeners;
+
+use Webkul\CartRule\Helpers\CartRule;
+
+/**
+ * Cart event handler
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class Cart
+{
+    /**
+     * CartRule object
+     *
+     * @var CartRule
+     */
+    protected $cartRuleHepler;
+
+    /**
+     * Create a new listener instance.
+     *
+     * @param  Webkul\CartRule\Repositories\CartRule $cartRuleHepler
+     * @return void
+     */
+    public function __construct(CartRule $cartRuleHepler)
+    {
+        $this->cartRuleHepler = $cartRuleHepler;
+    }
+
+    /**
+     * Aplly valid cart rules to cart
+     * 
+     * @param Cart $cart
+     * @return void
+     */
+    public function applyCartRules($cart)
+    {
+        $this->cartRuleHepler->collect();
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Listeners/Order.php b/packages/Webkul/CartRule/src/Listeners/Order.php
new file mode 100755
index 000000000..f22fdfa35
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Listeners/Order.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Webkul\CartRule\Listeners;
+
+use Webkul\CartRule\Repositories\CartRuleRepository;
+use Webkul\CartRule\Repositories\CartRuleCustomerRepository;
+use Webkul\CartRule\Repositories\CartRuleCouponRepository;
+use Webkul\CartRule\Repositories\CartRuleCouponUsageRepository;
+
+/**
+ * Order event handler
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class Order
+{
+    /**
+     * CartRuleRepository object
+     *
+     * @var CartRuleRepository
+     */
+    protected $cartRuleRepository;
+
+    /**
+     * CartRuleCustomerRepository object
+     *
+     * @var CartRuleCustomerRepository
+     */
+    protected $cartRuleCustomerRepository;
+
+    /**
+     * CartRuleCouponRepository object
+     *
+     * @var CartRuleCouponRepository
+     */
+    protected $cartRuleCouponRepository;
+
+    /**
+     * CartRuleCouponUsageRepository object
+     *
+     * @var CartRuleCouponUsageRepository
+     */
+    protected $cartRuleCouponUsageRepository;
+
+    /**
+     * Create a new listener instance.
+     *
+     * @param  Webkul\CartRule\Repositories\CartRuleRepository            $cartRuleRepository
+     * @param  Webkul\CartRule\Repositories\CartRuleCustomerRepository    $cartRuleCustomerRepository
+     * @param  Webkul\CartRule\Repositories\CartRuleCouponRepository      $cartRuleCouponRepository
+     * @param  Webkul\CartRule\Repositories\CartRuleCouponUsageRepository $cartRuleCouponUsageRepository
+     * @return void
+     */
+    public function __construct(
+        CartRuleRepository $cartRuleRepository,
+        CartRuleCustomerRepository $cartRuleCustomerRepository,
+        CartRuleCouponRepository $cartRuleCouponRepository,
+        CartRuleCouponUsageRepository $cartRuleCouponUsageRepository
+    )
+    {
+        $this->cartRuleRepository = $cartRuleRepository;
+
+        $this->cartRuleCustomerRepository = $cartRuleCustomerRepository;
+
+        $this->cartRuleCouponRepository = $cartRuleCouponRepository;
+
+        $this->cartRuleCouponUsageRepository = $cartRuleCouponUsageRepository;
+    }
+
+    /**
+     * Save cart rule and cart rule coupon properties after place order
+     * 
+     * @param Order $order
+     * @return void
+     */
+    public function manageCartRule($order)
+    {
+        if (! $order->discount_amount)
+            return;
+
+        $cartRuleIds = explode(',', $order->applied_cart_rule_ids);
+
+        $cartRuleIds = array_unique($cartRuleIds);
+
+        foreach ($cartRuleIds as $ruleId) {
+            $rule = $this->cartRuleRepository->find($ruleId);
+
+            if (! $rule)
+                continue;
+
+            $rule->update(['times_used' => $rule->times_used + 1]);
+
+            if (! $order->customer_id)
+                continue;
+
+            $ruleCustomer = $this->cartRuleCustomerRepository->findOneWhere([
+                    'customer_id' => $order->customer_id,
+                    'cart_rule_id' => $ruleId
+                ]);
+
+            if ($ruleCustomer) {
+                $this->cartRuleCustomerRepository->update(['times_used' => $ruleCustomer->times_used + 1], $ruleCustomer->id);
+            } else {
+                $this->cartRuleCustomerRepository->create([
+                        'customer_id' => $order->customer_id,
+                        'cart_rule_id' => $ruleId,
+                        'times_used' => 1
+                    ]);
+            }
+        }
+
+        if (! $order->coupon_code)
+            return;
+
+        $coupon = $this->cartRuleCouponRepository->findOneByField('code', $order->coupon_code);
+        
+        if ($coupon) {
+            $this->cartRuleCouponRepository->update(['times_used' => $coupon->times_used + 1], $coupon->id);
+
+            if ($order->customer_id) {
+                $couponUsage = $this->cartRuleCouponUsageRepository->findOneWhere([
+                        'customer_id' => $order->customer_id,
+                        'cart_rule_coupon_id' => $coupon->id
+                    ]);
+
+                if ($couponUsage) {
+                    $this->cartRuleCouponUsageRepository->update(['times_used' => $couponUsage->times_used + 1], $couponUsage->id);
+                } else {
+                    $this->cartRuleCouponUsageRepository->create([
+                            'customer_id' => $order->customer_id,
+                            'cart_rule_coupon_id' => $coupon->id,
+                            'times_used' => 1
+                        ]);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Models/CartRule.php b/packages/Webkul/CartRule/src/Models/CartRule.php
new file mode 100644
index 000000000..6392a1c59
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRule.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+// use Webkul\Core\Eloquent\TranslatableModel;
+use Illuminate\Database\Eloquent\Model;
+use Webkul\CartRule\Contracts\CartRule as CartRuleContract;
+use Webkul\Core\Models\ChannelProxy;
+use Webkul\Customer\Models\CustomerGroupProxy;
+
+// class CartRule extends TranslatableModel implements CartRuleContract
+class CartRule extends Model implements CartRuleContract
+{
+    protected $fillable = ['name', 'description', 'starts_from', 'ends_till', 'status', 'coupon_type', 'use_auto_generation', 'usage_per_customer', 'uses_per_coupon', 'times_used', 'condition_type', 'conditions', 'actions', 'end_other_rules', 'uses_attribute_conditions', 'action_type', 'discount_amount', 'discount_quantity', 'discount_step', 'apply_to_shipping', 'free_shipping', 'sort_order'];
+
+    protected $casts = [
+        'conditions' => 'array',
+    ];
+
+    // public $translatedAttributes = ['name'];
+
+    /**
+     * Get the channels that owns the cart rule.
+     */
+    public function channels()
+    {
+        return $this->belongsToMany(ChannelProxy::modelClass(), 'cart_rule_channels');
+    }
+
+    /**
+     * Get the customer groups that owns the cart rule.
+     */
+    public function customer_groups()
+    {
+        return $this->belongsToMany(CustomerGroupProxy::modelClass(), 'cart_rule_customer_groups');
+    }
+
+    /**
+     * Get the coupons that owns the cart rule.
+     */
+    public function coupons()
+    {
+        return $this->hasOne(CartRuleCouponProxy::modelClass());
+    }
+
+    /**
+     * Get primary coupon code for cart rule.
+     */
+    public function coupon_code()
+    {
+        return $this->coupons()->where('is_primary', 1);
+    }
+
+    /**
+     * Get primary coupon code for cart rule.
+     */
+    public function getCouponCodeAttribute()
+    {
+        $coupon = $this->coupon_code()->first();
+
+        if (! $coupon)
+            return;
+
+        return $coupon->code;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Models/CartRuleCoupon.php b/packages/Webkul/CartRule/src/Models/CartRuleCoupon.php
new file mode 100644
index 000000000..045af59a1
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRuleCoupon.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Webkul\CartRule\Contracts\CartRuleCoupon as CartRuleCouponContract;
+
+class CartRuleCoupon extends Model implements CartRuleCouponContract
+{
+    protected $fillable = ['code', 'usage_limit', 'usage_per_customer', 'times_used', 'type', 'cart_rule_id', 'expired_at', 'is_primary'];
+
+    /**
+     * Get the cart rule that owns the cart rule coupon.
+     */
+    public function cart_rule()
+    {
+        return $this->belongsTo(CartRuleProxy::modelClass());
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Models/CartRuleCouponProxy.php b/packages/Webkul/CartRule/src/Models/CartRuleCouponProxy.php
new file mode 100644
index 000000000..4a8f20030
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRuleCouponProxy.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+use Konekt\Concord\Proxies\ModelProxy;
+
+class CartRuleCouponProxy extends ModelProxy
+{
+
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Models/CartRuleCouponUsage.php b/packages/Webkul/CartRule/src/Models/CartRuleCouponUsage.php
new file mode 100644
index 000000000..dd249ed91
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRuleCouponUsage.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Webkul\CartRule\Contracts\CartRuleCouponUsage as CartRuleCouponUsageContract;
+
+class CartRuleCouponUsage extends Model implements CartRuleCouponUsageContract
+{
+    public $timestamps = false;
+    
+    protected $table = 'cart_rule_coupon_usage';
+
+    protected $guarded = ['created_at', 'updated_at'];
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Models/CartRuleCouponUsageProxy.php b/packages/Webkul/CartRule/src/Models/CartRuleCouponUsageProxy.php
new file mode 100644
index 000000000..1742e8613
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRuleCouponUsageProxy.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+use Konekt\Concord\Proxies\ModelProxy;
+
+class CartRuleCouponUsageProxy extends ModelProxy
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Models/CartRuleCustomer.php b/packages/Webkul/CartRule/src/Models/CartRuleCustomer.php
new file mode 100644
index 000000000..b773cf2ea
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRuleCustomer.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Webkul\CartRule\Contracts\CartRuleCustomer as CartRuleCustomerContract;
+
+class CartRuleCustomer extends Model implements CartRuleCustomerContract
+{
+    public $timestamps = false;
+    
+    protected $fillable = ['times_used', 'cart_rule_id', 'customer_id'];
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Models/CartRuleCustomerProxy.php b/packages/Webkul/CartRule/src/Models/CartRuleCustomerProxy.php
new file mode 100644
index 000000000..a9c7cb1c5
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRuleCustomerProxy.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+use Konekt\Concord\Proxies\ModelProxy;
+
+class CartRuleCustomerProxy extends ModelProxy
+{
+
+}
diff --git a/packages/Webkul/Discount/src/Models/CartRuleProxy.php b/packages/Webkul/CartRule/src/Models/CartRuleProxy.php
similarity index 73%
rename from packages/Webkul/Discount/src/Models/CartRuleProxy.php
rename to packages/Webkul/CartRule/src/Models/CartRuleProxy.php
index 4f66578b3..5fe09ae6d 100644
--- a/packages/Webkul/Discount/src/Models/CartRuleProxy.php
+++ b/packages/Webkul/CartRule/src/Models/CartRuleProxy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Discount\Models;
+namespace Webkul\CartRule\Models;
 
 use Konekt\Concord\Proxies\ModelProxy;
 
diff --git a/packages/Webkul/CartRule/src/Models/CartRuleTranslation.php b/packages/Webkul/CartRule/src/Models/CartRuleTranslation.php
new file mode 100644
index 000000000..33b4eb50d
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRuleTranslation.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Webkul\CartRule\Contracts\CartRuleTranslation as CartRuleTranslationContract;
+
+class CartRuleTranslation extends Model implements CartRuleTranslationContract
+{
+    public $timestamps = false;
+
+    protected $fillable = ['label'];
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Models/CartRuleTranslationProxy.php b/packages/Webkul/CartRule/src/Models/CartRuleTranslationProxy.php
new file mode 100644
index 000000000..b23166471
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Models/CartRuleTranslationProxy.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\CartRule\Models;
+
+use Konekt\Concord\Proxies\ModelProxy;
+
+class CartRuleTranslationProxy extends ModelProxy
+{
+
+}
diff --git a/packages/Webkul/CartRule/src/Providers/CartRuleServiceProvider.php b/packages/Webkul/CartRule/src/Providers/CartRuleServiceProvider.php
new file mode 100644
index 000000000..b4fed5b89
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Providers/CartRuleServiceProvider.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Webkul\CartRule\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Routing\Router;
+
+class CartRuleServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot(Router $router)
+    {
+        $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
+
+        $this->app->register(EventServiceProvider::class);
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Providers/EventServiceProvider.php b/packages/Webkul/CartRule/src/Providers/EventServiceProvider.php
new file mode 100755
index 000000000..a5b5d7133
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Providers/EventServiceProvider.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Webkul\CartRule\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Event;
+
+class EventServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Event::listen('checkout.order.save.after', 'Webkul\CartRule\Listeners\Order@manageCartRule');
+
+        Event::listen('checkout.cart.collect.totals.before', 'Webkul\CartRule\Listeners\Cart@applyCartRules');
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Providers/ModuleServiceProvider.php b/packages/Webkul/CartRule/src/Providers/ModuleServiceProvider.php
new file mode 100644
index 000000000..2eeb82477
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Providers/ModuleServiceProvider.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Webkul\CartRule\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+        \Webkul\CartRule\Models\CartRule::class,
+        \Webkul\CartRule\Models\CartRuleTranslation::class,
+        \Webkul\CartRule\Models\CartRuleCustomer::class,
+        \Webkul\CartRule\Models\CartRuleCoupon::class,
+        \Webkul\CartRule\Models\CartRuleCouponUsage::class
+    ];
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Repositories/CartRuleCouponRepository.php b/packages/Webkul/CartRule/src/Repositories/CartRuleCouponRepository.php
new file mode 100755
index 000000000..888e254f7
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Repositories/CartRuleCouponRepository.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Webkul\CartRule\Repositories;
+
+use Webkul\Core\Eloquent\Repository;
+
+/**
+ * CartRuleCoupon Reposotory
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CartRuleCouponRepository extends Repository
+{
+    /**
+     * @var array
+     */
+    protected $charsets = [
+        'alphanumeric' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
+        'alphabetical' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+        'numeric' => '0123456789'
+    ];
+
+    /**
+     * Specify Model class name
+     *
+     * @return mixed
+     */
+    function model()
+    {
+        return 'Webkul\CartRule\Contracts\CartRuleCoupon';
+    }
+
+    /**
+     * Creates coupons for cart rule
+     *
+     * @param array   $data
+     * @param integer $cartRuleId
+     * @return void
+     */
+    public function generateCoupons($data, $cartRuleId)
+    {
+        $cartRule = app('Webkul\CartRule\Repositories\CartRuleRepository')->findOrFail($cartRuleId);
+
+        for ($i = 0; $i < $data['coupon_qty']; $i++) {
+            parent::create([
+                    'cart_rule_id' => $cartRuleId,
+                    'code' => $data['code_prefix'] . $this->getRandomString($data['code_format'], $data['code_length']) . $data['code_suffix'],
+                    'usage_limit' => $cartRule->uses_per_coupon ?? 0,
+                    'usage_per_customer' => $cartRule->usage_per_customer ?? 0,
+                    'is_primary' => 0,
+                    'expired_at' => $cartRule->ends_till ?: null
+                ]);
+        }
+    }
+
+    /**
+     * Creates coupons for cart rule
+     *
+     * @param string  $format
+     * @param integer $length
+     * @return string
+     */
+    public function getRandomString($format, $length)
+    {
+        $couponCode = '';
+
+        for ($i = 0; $i < $length; $i++) {
+            $couponCode .= $this->charsets[$format][rand(0, strlen($this->charsets[$format]) - 1)];
+        }
+
+        return $couponCode;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Repositories/CartRuleCouponUsageRepository.php b/packages/Webkul/CartRule/src/Repositories/CartRuleCouponUsageRepository.php
new file mode 100755
index 000000000..5d6350ba8
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Repositories/CartRuleCouponUsageRepository.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Webkul\CartRule\Repositories;
+
+use Webkul\Core\Eloquent\Repository;
+
+/**
+ * CartRuleCouponUsage Reposotory
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CartRuleCouponUsageRepository extends Repository
+{
+    /**
+     * Specify Model class name
+     *
+     * @return mixed
+     */
+    function model()
+    {
+        return 'Webkul\CartRule\Contracts\CartRuleCouponUsage';
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Repositories/CartRuleCustomerRepository.php b/packages/Webkul/CartRule/src/Repositories/CartRuleCustomerRepository.php
new file mode 100755
index 000000000..e3218eb94
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Repositories/CartRuleCustomerRepository.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Webkul\CartRule\Repositories;
+
+use Webkul\Core\Eloquent\Repository;
+
+/**
+ * CartRuleCustomer Reposotory
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CartRuleCustomerRepository extends Repository
+{
+    /**
+     * Specify Model class name
+     *
+     * @return mixed
+     */
+    function model()
+    {
+        return 'Webkul\CartRule\Contracts\CartRuleCustomer';
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CartRule/src/Repositories/CartRuleRepository.php b/packages/Webkul/CartRule/src/Repositories/CartRuleRepository.php
new file mode 100755
index 000000000..80847ee67
--- /dev/null
+++ b/packages/Webkul/CartRule/src/Repositories/CartRuleRepository.php
@@ -0,0 +1,478 @@
+<?php
+
+namespace Webkul\CartRule\Repositories;
+
+use Illuminate\Container\Container as App;
+use Webkul\Core\Eloquent\Repository;
+use Webkul\Attribute\Repositories\AttributeFamilyRepository;
+use Webkul\Attribute\Repositories\AttributeRepository;
+use Webkul\Category\Repositories\CategoryRepository;
+use Webkul\Tax\Repositories\TaxCategoryRepository;
+use Webkul\Core\Repositories\CountryRepository;
+use Webkul\Core\Repositories\CountryStateRepository;
+
+/**
+ * CartRule Reposotory
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CartRuleRepository extends Repository
+{
+    /**
+     * AttributeFamilyRepository object
+     *
+     * @var AttributeFamilyRepository
+     */
+    protected $attributeFamilyRepository;
+
+    /**
+     * AttributeRepository object
+     *
+     * @var AttributeRepository
+     */
+    protected $attributeRepository;
+
+    /**
+     * CategoryRepository class
+     *
+     * @var CategoryRepository
+     */
+    protected $categoryRepository;
+
+    /**
+     * CartRuleCouponRepository object
+     *
+     * @var CartRuleCouponRepository
+     */
+    protected $cartRuleCouponRepository;
+
+    /**
+     * TaxCategoryRepository class
+     *
+     * @var TaxCategoryRepository
+     */
+    protected $taxCategoryRepository;
+
+    /**
+     * CountryRepository class
+     *
+     * @var CountryRepository
+     */
+    protected $countryRepository;
+
+    /**
+     * CountryStateRepository class
+     *
+     * @var CountryStateRepository
+     */
+    protected $countryStateRepository;
+
+    /**
+     * Create a new repository instance.
+     *
+     * @param  Webkul\Attribute\Repositories\AttributeFamilyRepository $attributeFamilyRepository
+     * @param  Webkul\Attribute\Repositories\AttributeRepository       $attributeRepository
+     * @param  Webkul\Category\Repositories\CategoryRepository         $categoryRepository
+     * @param  Webkul\CartRule\Repositories\CartRuleCouponRepository   $cartRuleCouponRepository
+     * @param  Webkul\Tax\Repositories\TaxCategoryRepository           $taxCategoryRepository
+     * @param  Webkul\Core\Repositories\CountryRepository              $countryRepository
+     * @param  Webkul\Core\Repositories\CountryStateRepository         $countryStateRepository
+     * @param  Illuminate\Container\Container                          $app
+     * @return void
+     */
+    public function __construct(
+        AttributeFamilyRepository $attributeFamilyRepository,
+        AttributeRepository $attributeRepository,
+        CategoryRepository $categoryRepository,
+        CartRuleCouponRepository $cartRuleCouponRepository,
+        TaxCategoryRepository $taxCategoryRepository,
+        CountryRepository $countryRepository,
+        CountryStateRepository $countryStateRepository,
+        App $app
+    )
+    {
+        $this->attributeFamilyRepository = $attributeFamilyRepository;
+
+        $this->attributeRepository = $attributeRepository;
+
+        $this->categoryRepository = $categoryRepository;
+
+        $this->cartRuleCouponRepository = $cartRuleCouponRepository;
+
+        $this->taxCategoryRepository = $taxCategoryRepository;
+
+        $this->countryRepository = $countryRepository;
+
+        $this->countryStateRepository = $countryStateRepository;
+
+        parent::__construct($app);
+    }
+
+    /**
+     * Specify Model class name
+     *
+     * @return mixed
+     */
+    function model()
+    {
+        return 'Webkul\CartRule\Contracts\CartRule';
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function create(array $data)
+    {
+        $data['starts_from'] = $data['starts_from'] ?: null;
+
+        $data['ends_till'] = $data['ends_till'] ?: null;
+
+        $data['status'] = ! isset($data['status']) ? 0 : 1;
+
+        $cartRule = parent::create($data);
+
+        $cartRule->channels()->sync($data['channels']);
+
+        $cartRule->customer_groups()->sync($data['customer_groups']);
+
+        if ($data['coupon_type'] && ! $data['use_auto_generation']) {
+            $this->cartRuleCouponRepository->create([
+                    'cart_rule_id' => $cartRule->id,
+                    'code' => $data['coupon_code'],
+                    'usage_limit' => $data['usage_per_customer'] ?? 0,
+                    'usage_per_customer' => $data['usage_per_customer'] ?? 0,
+                    'is_primary' => 1,
+                    'expired_at' => $data['ends_till'] ?: null
+                ]);
+        }
+
+        return $cartRule;
+    }
+
+    /**
+     * @param array  $data
+     * @param array  $id
+     * @param string $attribute
+     * @return mixed
+     */
+    public function update(array $data, $id, $attribute = "id")
+    {
+        $data['starts_from'] = $data['starts_from'] ?: null;
+
+        $data['ends_till'] = $data['ends_till'] ?: null;
+
+        $data['status'] = ! isset($data['status']) ? 0 : 1;
+
+        $data['conditions'] = $data['conditions'] ?? [];
+
+        $cartRule = $this->find($id);
+
+        parent::update($data, $id, $attribute);
+
+        $cartRule->channels()->sync($data['channels']);
+
+        $cartRule->customer_groups()->sync($data['customer_groups']);
+
+        if ($data['coupon_type']) {
+            if (! $data['use_auto_generation']) {
+                $cartRuleCoupon = $this->cartRuleCouponRepository->findOneWhere(['is_primary' => 1, 'cart_rule_id' => $cartRule->id]);
+
+                if ($cartRuleCoupon) {
+                    $this->cartRuleCouponRepository->update([
+                            'code' => $data['coupon_code'],
+                            'usage_limit' => $data['uses_per_coupon'] ?? 0,
+                            'usage_per_customer' => $data['usage_per_customer'] ?? 0,
+                            'expired_at' => $data['ends_till'] ?: null
+                        ], $cartRuleCoupon->id);
+                } else {
+                    $this->cartRuleCouponRepository->create([
+                            'cart_rule_id' => $cartRule->id,
+                            'code' => $data['coupon_code'],
+                            'usage_limit' => $data['uses_per_coupon'] ?? 0,
+                            'usage_per_customer' => $data['usage_per_customer'] ?? 0,
+                            'is_primary' => 1,
+                            'expired_at' => $data['ends_till'] ?: null
+                        ]);
+                }
+            } else {
+                $this->cartRuleCouponRepository->deleteWhere(['is_primary' => 1, 'cart_rule_id' => $cartRule->id]);
+
+                $this->cartRuleCouponRepository->getModel()->where('cart_rule_id', $cartRule->id)->update([
+                        'usage_limit' => $data['uses_per_coupon'] ?? 0,
+                        'usage_per_customer' => $data['usage_per_customer'] ?? 0,
+                        'expired_at' => $data['ends_till'] ?: null
+                    ]);
+            }
+        } else {
+            $cartRuleCoupon = $this->cartRuleCouponRepository->deleteWhere(['is_primary' => 1, 'cart_rule_id' => $cartRule->id]);
+        }
+
+        return $cartRule;
+    }
+
+    /**
+     * Returns attributes for cart rule conditions
+     *
+     * @return array
+     */
+    public function getConditionAttributes()
+    {
+        $attributes = [
+            [
+                'key' => 'cart',
+                'label' => trans('admin::app.promotions.cart-rules.cart-attribute'),
+                'children' => [
+                    [
+                        'key' => 'cart|base_sub_total',
+                        'type' => 'price',
+                        'label' => trans('admin::app.promotions.cart-rules.subtotal')
+                    ], [
+                        'key' => 'cart|items_qty',
+                        'type' => 'integer',
+                        'label' => trans('admin::app.promotions.cart-rules.total-items-qty')
+                    ], [
+                        'key' => 'cart|payment_method',
+                        'type' => 'select',
+                        'options' => $this->getPaymentMethods(),
+                        'label' => trans('admin::app.promotions.cart-rules.payment-method')
+                    ], [
+                        'key' => 'cart|shipping_method',
+                        'type' => 'select',
+                        'options' => $this->getShippingMethods(),
+                        'label' => trans('admin::app.promotions.cart-rules.shipping-method')
+                    ], [
+                        'key' => 'cart|postcode',
+                        'type' => 'text',
+                        'label' => trans('admin::app.promotions.cart-rules.shipping-postcode')
+                    ], [
+                        'key' => 'cart|state',
+                        'type' => 'select',
+                        'options' => $this->groupedStatesByCountries(),
+                        'label' => trans('admin::app.promotions.cart-rules.shipping-state')
+                    ], [
+                        'key' => 'cart|country',
+                        'type' => 'select',
+                        'options' => $this->getCountries(),
+                        'label' => trans('admin::app.promotions.cart-rules.shipping-country')
+                    ]
+                ]
+            ], [
+                'key' => 'cart_item',
+                'label' => trans('admin::app.promotions.cart-rules.cart-item-attribute'),
+                'children' => [
+                    [
+                        'key' => 'cart_item|base_price',
+                        'type' => 'price',
+                        'label' => trans('admin::app.promotions.cart-rules.price-in-cart')
+                    ], [
+                        'key' => 'cart_item|quantity',
+                        'type' => 'integer',
+                        'label' => trans('admin::app.promotions.cart-rules.qty-in-cart')
+                    ], [
+                        'key' => 'cart_item|base_total_weight',
+                        'type' => 'decimal',
+                        'label' => trans('admin::app.promotions.cart-rules.total-weight')
+                    ], [
+                        'key' => 'cart_item|base_total',
+                        'type' => 'price',
+                        'label' => trans('admin::app.promotions.cart-rules.subtotal')
+                    ]
+                ]
+            ], [
+                'key' => 'product',
+                'label' => trans('admin::app.promotions.cart-rules.product-attribute'),
+                'children' => [
+                    [
+                        'key' => 'product|category_ids',
+                        'type' => 'multiselect',
+                        'label' => trans('admin::app.promotions.cart-rules.categories'),
+                        'options' => $categories = $this->categoryRepository->getCategoryTree()
+                    ], [
+                        'key' => 'product|children::category_ids',
+                        'type' => 'multiselect',
+                        'label' => trans('admin::app.promotions.cart-rules.children-categories'),
+                        'options' => $categories
+                    ], [
+                        'key' => 'product|parent::category_ids',
+                        'type' => 'multiselect',
+                        'label' => trans('admin::app.promotions.cart-rules.parent-categories'),
+                        'options' => $categories
+                    ], [
+                        'key' => 'product|attribute_family_id',
+                        'type' => 'select',
+                        'label' => trans('admin::app.promotions.cart-rules.attribute_family'),
+                        'options' => $this->getAttributeFamilies()
+                    ]
+                ]
+            ]
+        ];
+
+        foreach ($this->attributeRepository->findWhereNotIn('type', ['textarea', 'image', 'file']) as $attribute) {
+            $attributeType = $attribute->type;
+
+            if ($attribute->code == 'tax_category_id') {
+                $options = $this->getTaxCategories();
+            } else {
+                $options = $attribute->options;
+            }
+
+            if ($attribute->validation == 'decimal')
+                $attributeType = 'decimal';
+
+            if ($attribute->validation == 'numeric')
+                $attributeType = 'integer';
+
+            $attributes[2]['children'][] = [
+                'key' => 'product|' . $attribute->code,
+                'type' => $attribute->type,
+                'label' => $attribute->name,
+                'options' => $options
+            ];
+
+            $attributes[2]['children'][] = [
+                'key' => 'product|children::' . $attribute->code,
+                'type' => $attribute->type,
+                'label' => trans('admin::app.promotions.cart-rules.attribute-name-children-only', ['attribute_name' => $attribute->name]),
+                'options' => $options
+            ];
+
+            $attributes[2]['children'][] = [
+                'key' => 'product|parent::' . $attribute->code,
+                'type' => $attribute->type,
+                'label' => trans('admin::app.promotions.cart-rules.attribute-name-parent-only', ['attribute_name' => $attribute->name]),
+                'options' => $options
+            ];
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Returns all payment methods
+     *
+     * @return array
+     */
+    public function getPaymentMethods()
+    {
+        $methods = [];
+
+        foreach (config('paymentmethods') as $paymentMethod) {
+            $object = app($paymentMethod['class']);
+
+            $methods[] = [
+                'id' => $object->getCode(),
+                'admin_name' => $object->getTitle()
+            ];
+        }
+
+        return $methods;
+    }
+
+    /**
+     * Returns all shipping methods
+     *
+     * @return array
+     */
+    public function getShippingMethods()
+    {
+        $methods = [];
+
+        foreach (config('carriers') as $shippingMethod) {
+            $object = app($shippingMethod['class']);
+
+            $methods[] = [
+                'id' => $object->getCode(),
+                'admin_name' => $object->getTitle()
+            ];
+        }
+
+        return $methods;
+    }
+
+    /**
+     * Returns all countries
+     *
+     * @return array
+     */
+    public function getTaxCategories()
+    {
+        $taxCategories = [];
+
+        foreach ($this->taxCategoryRepository->all() as $taxCategory) {
+            $taxCategories[] = [
+                'id' => $taxCategory->id,
+                'admin_name' => $taxCategory->name,
+            ];
+        }
+
+        return $taxCategories;
+    }
+
+    /**
+     * Returns all attribute families
+     *
+     * @return array
+     */
+    public function getAttributeFamilies()
+    {
+        $attributeFamilies = [];
+
+        foreach ($this->attributeFamilyRepository->all() as $attributeFamily) {
+            $attributeFamilies[] = [
+                'id' => $attributeFamily->id,
+                'admin_name' => $attributeFamily->name,
+            ];
+        }
+
+        return $attributeFamilies;
+    }
+
+    /**
+     * Returns all countries
+     *
+     * @return array
+     */
+    public function getCountries()
+    {
+        $countries = [];
+
+        foreach ($this->countryRepository->all() as $country) {
+            $countries[] = [
+                'id' => $country->code,
+                'admin_name' => $country->name,
+            ];
+        }
+
+        return $countries;
+    }
+
+    /**
+     * Retrieve all grouped states by country code
+     *
+     * @return array
+     */
+    public function groupedStatesByCountries()
+    {
+        $collection = [];
+
+        foreach ($this->countryRepository->all() as $country) {
+            $countryStates = $this->countryStateRepository->findWhere(
+                    ['country_id' => $country->id],
+                    ['code', 'default_name as admin_name']
+                )->toArray();
+
+            if (! count($countryStates))
+                continue;
+
+            $collection[] = [
+                'id' => $country->code,
+                'admin_name' => $country->name,
+                'states' => $countryStates
+            ];
+        }
+
+        return $collection;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Console/Commands/PriceRuleIndex.php b/packages/Webkul/CatalogRule/src/Console/Commands/PriceRuleIndex.php
new file mode 100644
index 000000000..4f856c979
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Console/Commands/PriceRuleIndex.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Webkul\CatalogRule\Console\Commands;
+
+use Illuminate\Console\Command;
+use Webkul\CatalogRule\Helpers\CatalogRuleIndex;
+
+class PriceRuleIndex extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'product:price-rule:index';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Automatically updates catalog rule price index information (eg. rule_price)';
+
+    /**
+     * CatalogRuleIndex object
+     *
+     * @var Object
+    */
+    protected $catalogRuleIndexHelper;
+
+    /**
+     * Create a new command instance.
+     *
+     * @param  Webkul\CatalogRuleProduct\Helpers\CatalogRuleIndex $catalogRuleIndexHelper
+     * @return void
+     */
+    public function __construct(CatalogRuleIndex $catalogRuleIndexHelper)
+    {
+        $this->catalogRuleIndexHelper = $catalogRuleIndexHelper;
+
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // $this->catalogRuleIndexHelper->reindexComplete();
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Contracts/CatalogRule.php b/packages/Webkul/CatalogRule/src/Contracts/CatalogRule.php
new file mode 100644
index 000000000..c322bdc78
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Contracts/CatalogRule.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\CatalogRule\Contracts;
+
+interface CatalogRule
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Contracts/CatalogRuleProduct.php b/packages/Webkul/CatalogRule/src/Contracts/CatalogRuleProduct.php
new file mode 100644
index 000000000..caeae64b0
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Contracts/CatalogRuleProduct.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\CatalogRule\Contracts;
+
+interface CatalogRuleProduct
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Contracts/CatalogRuleProductPrice.php b/packages/Webkul/CatalogRule/src/Contracts/CatalogRuleProductPrice.php
new file mode 100644
index 000000000..f0d5d497e
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Contracts/CatalogRuleProductPrice.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\CatalogRule\Contracts;
+
+interface CatalogRuleProductPrice
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_175253_create_remove_catalog_rule_tables.php b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_175253_create_remove_catalog_rule_tables.php
new file mode 100644
index 000000000..cdc5f1b46
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_175253_create_remove_catalog_rule_tables.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateRemoveCatalogRuleTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('catalog_rule_customer_groups');
+
+        Schema::dropIfExists('catalog_rule_channels');
+
+        Schema::dropIfExists('catalog_rule_products');
+
+        Schema::dropIfExists('catalog_rule_products_price');
+
+        Schema::dropIfExists('catalog_rules');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130433_create_catalog_rules_table.php b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184613_create_catalog_rules_table.php
similarity index 62%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130433_create_catalog_rules_table.php
rename to packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184613_create_catalog_rules_table.php
index 69a4a8bcc..049a531ce 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130433_create_catalog_rules_table.php
+++ b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184613_create_catalog_rules_table.php
@@ -15,16 +15,17 @@ class CreateCatalogRulesTable extends Migration
     {
         Schema::create('catalog_rules', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('name');
-            $table->text('description');
-            $table->datetime('starts_from')->nullable();
-            $table->datetime('ends_till')->nullable();
+            $table->string('name')->nullable();
+            $table->string('description')->nullable();
+            $table->date('starts_from')->nullable();
+            $table->date('ends_till')->nullable();
             $table->boolean('status')->default(0);
+            $table->boolean('condition_type')->default(1);
             $table->json('conditions')->nullable();
-            $table->json('actions')->nullable();
             $table->boolean('end_other_rules')->default(0);
-            $table->string('action_code')->nullable();
-            $table->decimal('discount_amount', 20, 4)->default(0.0000);
+            $table->string('action_type')->nullable();
+            $table->decimal('discount_amount', 12, 4)->default(0);
+            $table->integer('sort_order')->unsigned()->default(0);
             $table->timestamps();
         });
     }
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130458_create_catalog_rule_channels_table.php b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184651_create_catalog_rule_channels_table.php
similarity index 91%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130458_create_catalog_rule_channels_table.php
rename to packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184651_create_catalog_rule_channels_table.php
index 32e0ea36e..8f0053237 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130458_create_catalog_rule_channels_table.php
+++ b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184651_create_catalog_rule_channels_table.php
@@ -14,12 +14,13 @@ class CreateCatalogRuleChannelsTable extends Migration
     public function up()
     {
         Schema::create('catalog_rule_channels', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('channel_id')->unsigned();
-            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
             $table->integer('catalog_rule_id')->unsigned();
+            $table->integer('channel_id')->unsigned();
+            
+            $table->primary(['catalog_rule_id', 'channel_id']);
+
             $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
-            $table->timestamps();
+            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
         });
     }
 
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130451_create_catalog_rule_customer_groups_table.php b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184732_create_catalog_rule_customer_groups_table.php
similarity index 86%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130451_create_catalog_rule_customer_groups_table.php
rename to packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184732_create_catalog_rule_customer_groups_table.php
index 7337cef44..5670c6a80 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130451_create_catalog_rule_customer_groups_table.php
+++ b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_03_184732_create_catalog_rule_customer_groups_table.php
@@ -14,12 +14,14 @@ class CreateCatalogRuleCustomerGroupsTable extends Migration
     public function up()
     {
         Schema::create('catalog_rule_customer_groups', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('customer_group_id')->unsigned();
-            $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
             $table->integer('catalog_rule_id')->unsigned();
+            $table->integer('customer_group_id')->unsigned();
+
+            
+            $table->primary(['catalog_rule_id', 'customer_group_id'], 'catalog_rule_id_customer_group_id_primary');
+            
             $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
-            $table->timestamps();
+            $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
         });
     }
 
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130550_create_catalog_rule_products_table.php b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_06_101110_create_catalog_rule_products_table.php
similarity index 80%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130550_create_catalog_rule_products_table.php
rename to packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_06_101110_create_catalog_rule_products_table.php
index 2f456559e..8628050ac 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130550_create_catalog_rule_products_table.php
+++ b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_06_101110_create_catalog_rule_products_table.php
@@ -14,20 +14,25 @@ class CreateCatalogRuleProductsTable extends Migration
     public function up()
     {
         Schema::create('catalog_rule_products', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->integer('catalog_rule_id')->unsigned();
-            $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
+            $table->increments('id');
             $table->datetime('starts_from')->nullable();
             $table->datetime('ends_till')->nullable();
-            $table->integer('customer_group_id')->unsigned();
-            $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
-            $table->integer('channel_id')->unsigned();
-            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
+            $table->boolean('end_other_rules')->default(0);
+            $table->string('action_type')->nullable();
+            $table->decimal('discount_amount', 12, 4)->default(0);
+            $table->integer('sort_order')->unsigned()->default(0);
+            
             $table->integer('product_id')->unsigned();
             $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
-            $table->string('action_code')->nullable();
-            $table->decimal('action_amount', 20, 4)->default(0.0000);
-            $table->timestamps();
+            
+            $table->integer('customer_group_id')->unsigned();
+            $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
+            
+            $table->integer('catalog_rule_id')->unsigned();
+            $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
+
+            $table->integer('channel_id')->unsigned();
+            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
         });
     }
 
@@ -40,4 +45,4 @@ class CreateCatalogRuleProductsTable extends Migration
     {
         Schema::dropIfExists('catalog_rule_products');
     }
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130583_create_catalog_rule_products_price_table.php b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_06_110507_create_catalog_rule_product_prices_table.php
similarity index 76%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130583_create_catalog_rule_products_price_table.php
rename to packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_06_110507_create_catalog_rule_product_prices_table.php
index a5af74b08..dab445de0 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_08_08_130583_create_catalog_rule_products_price_table.php
+++ b/packages/Webkul/CatalogRule/src/Database/Migrations/2019_12_06_110507_create_catalog_rule_product_prices_table.php
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateCatalogRuleProductsPriceTable extends Migration
+class CreateCatalogRuleProductPricesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,20 +13,24 @@ class CreateCatalogRuleProductsPriceTable extends Migration
      */
     public function up()
     {
-        Schema::create('catalog_rule_products_price', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->integer('channel_id')->unsigned();
-            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
-            $table->integer('customer_group_id')->unsigned();
-            $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
-            $table->integer('product_id')->unsigned();
-            $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
-            $table->integer('catalog_rule_id')->unsigned();
-            $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
-            $table->decimal('rule_price', 20, 4)->default(0.0000);
+        Schema::create('catalog_rule_product_prices', function (Blueprint $table) {
+            $table->increments('id');
+            $table->decimal('price', 12, 4)->default(0);
+            $table->date('rule_date');
             $table->datetime('starts_from')->nullable();
             $table->datetime('ends_till')->nullable();
-            $table->timestamps();
+            
+            $table->integer('product_id')->unsigned();
+            $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
+            
+            $table->integer('customer_group_id')->unsigned();
+            $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
+            
+            $table->integer('catalog_rule_id')->unsigned();
+            $table->foreign('catalog_rule_id')->references('id')->on('catalog_rules')->onDelete('cascade');
+
+            $table->integer('channel_id')->unsigned();
+            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
         });
     }
 
@@ -37,6 +41,6 @@ class CreateCatalogRuleProductsPriceTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('catalog_rule_products_price');
+        Schema::dropIfExists('catalog_rule_product_prices');
     }
 }
diff --git a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleIndex.php b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleIndex.php
new file mode 100644
index 000000000..fd9b6cc5f
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleIndex.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Webkul\CatalogRule\Helpers;
+
+use Carbon\Carbon;
+use Webkul\CatalogRule\Repositories\CatalogRuleRepository;
+
+class CatalogRuleIndex
+{
+    /**
+     * CatalogRuleRepository object
+     *
+     * @var Object
+    */
+    protected $catalogRuleRepository;
+
+    /**
+     * CatalogRuleProduct object
+     *
+     * @var Object
+    */
+    protected $catalogRuleHelper;
+
+    /**
+     * CatalogRuleProductPrice object
+     *
+     * @var Object
+    */
+    protected $catalogRuleProductPriceHelper;
+
+    /**
+     * Create a new helper instance.
+     *
+     * @param  Webkul\CatalogRule\Repositories\CatalogRuleRepository     $catalogRuleRepository
+     * @param  Webkul\CatalogRuleProduct\Helpers\CatalogRuleProduct      $catalogRuleProductHelper
+     * @param  Webkul\CatalogRuleProduct\Helpers\CatalogRuleProductPrice $catalogRuleProductPriceHelper
+     * @return void
+     */
+    public function __construct(
+        CatalogRuleRepository $catalogRuleRepository,
+        CatalogRuleProduct $catalogRuleProductHelper,
+        CatalogRuleProductPrice $catalogRuleProductPriceHelper
+    )
+    {
+        $this->catalogRuleRepository = $catalogRuleRepository;
+
+        $this->catalogRuleProductHelper = $catalogRuleProductHelper;
+
+        $this->catalogRuleProductPriceHelper = $catalogRuleProductPriceHelper;
+    }
+
+    /**
+     * Full reindex
+     *
+     * @return void
+     */
+    public function reindexComplete()
+    {
+        try {
+            $this->cleanIndexes();
+
+            foreach ($this->getCatalogRules() as $rule) {
+                $this->catalogRuleProductHelper->insertRuleProduct($rule);
+            }
+
+            $this->catalogRuleProductPriceHelper->indexRuleProductPrice(1000);
+        } catch (\Exception $e) {
+
+        }
+    }
+
+    /**
+     * Full reindex
+     *
+     * @param Product $product
+     * @return void
+     */
+    public function reindexProduct($product)
+    {
+        try {
+            if (! $product->getTypeInstance()->priceRuleCanBeApplied())
+                return;
+                
+            $productIds = $product->getTypeInstance()->isComposite()
+                            ? $product->getTypeInstance()->getChildrenIds()
+                            : [$product->id];
+
+            $this->cleanIndexes($productIds);
+
+            foreach ($this->getCatalogRules() as $rule) {
+                $this->catalogRuleProductHelper->insertRuleProduct($rule, 1000, $product);
+            }
+
+            $this->catalogRuleProductPriceHelper->indexRuleProductPrice(1000, $product);
+        } catch (\Exception $e) {
+
+        }
+    }
+
+    /**
+     * Deletes catalog rule product and catalog rule product price indexes
+     *
+     * @param array $productIds
+     * @return void
+     */
+    public function cleanIndexes($productIds = [])
+    {
+        $this->catalogRuleProductHelper->cleanProductIndex($productIds);
+
+        $this->catalogRuleProductPriceHelper->cleanProductPriceIndex($productIds);
+    }
+
+    /**
+     * Returns catalog rules
+     *
+     * @return Collection
+     */
+    public function getCatalogRules()
+    {
+        static $catalogRules;
+
+        if ($catalogRules)
+            return $catalogRules;
+
+        $catalogRules = $this->catalogRuleRepository->scopeQuery(function($query) {
+            return $query->where(function ($query1) {
+                        $query1->where('catalog_rules.starts_from', '<=', Carbon::now()->format('Y-m-d'))->orWhereNull('catalog_rules.starts_from');
+                    })
+                    ->where(function ($query2) {
+                        $query2->where('catalog_rules.ends_till', '>=', Carbon::now()->format('Y-m-d'))->orWhereNull('catalog_rules.ends_till');
+                    })
+                    ->orderBy('sort_order', 'asc');
+        })->findWhere(['status' => 1]);
+
+        return $catalogRules;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php
new file mode 100644
index 000000000..60e3aa629
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php
@@ -0,0 +1,253 @@
+<?php
+
+namespace Webkul\CatalogRule\Helpers;
+
+use Carbon\Carbon;
+use Webkul\Attribute\Repositories\AttributeRepository;
+use Webkul\Product\Repositories\ProductRepository;
+use Webkul\Product\Models\ProductAttributeValue;
+use Webkul\CatalogRule\Repositories\CatalogRuleProductRepository;
+use Webkul\Rule\Helpers\Validator;
+
+class CatalogRuleProduct
+{
+    /**
+     * AttributeRepository object
+     *
+     * @var AttributeRepository
+     */
+    protected $attributeRepository;
+
+    /**
+     * ProductRepository object
+     *
+     * @var ProductRepository
+     */
+    protected $productRepository;
+
+    /**
+     * CatalogRuleProductRepository object
+     *
+     * @var CatalogRuleProductRepository
+     */
+    protected $catalogRuleProductRepository;
+
+    /**
+     * Validator object
+     *
+     * @var Validator
+     */
+    protected $validator;
+
+    /**
+     * Create a new helper instance.
+     *
+     * @param  Webkul\Attribute\Repositories\AttributeRepository            $attributeRepository
+     * @param  Webkul\Product\Repositories\ProductRepository                $productRepository
+     * @param  Webkul\CatalogRule\Repositories\CatalogRuleProductRepository $catalogRuleProductRepository
+     * @param  Webkul\Rule\Helpers\Validator                                $validator
+     * @return void
+     */
+    public function __construct(
+        AttributeRepository $attributeRepository,
+        ProductRepository $productRepository,
+        CatalogRuleProductRepository $catalogRuleProductRepository,
+        Validator $validator
+    )
+    {
+        $this->attributeRepository = $attributeRepository;
+
+        $this->productRepository = $productRepository;
+
+        $this->catalogRuleProductRepository = $catalogRuleProductRepository;
+
+        $this->validator = $validator;
+    }
+
+    /**
+     * Collect discount on cart
+     *
+     * @param CatalogRule $rule
+     * @param integer     $batchCount
+     * @return void
+     */
+    public function insertRuleProduct($rule, $batchCount = 1000, $product = null)
+    {
+        $productIds = $this->getMatchingProductIds($rule, $product);
+
+        $rows = [];
+
+        $startsFrom = $rule->starts_from ? Carbon::createFromTimeString($rule->starts_from . " 00:00:01") : null;
+
+        $endsTill = $rule->ends_till ? Carbon::createFromTimeString($rule->ends_till . " 23:59:59") : null;
+
+        foreach ($productIds as $productId) {
+            foreach ($rule->channels()->pluck('id') as $channelId) {
+                foreach ($rule->customer_groups()->pluck('id') as $customerGroupId) {
+                    $rows[] = [
+                        'starts_from' => $startsFrom,
+                        'ends_till' => $endsTill,
+                        'catalog_rule_id' => $rule->id,
+                        'channel_id' => $channelId,
+                        'customer_group_id' => $customerGroupId,
+                        'product_id' => $productId,
+                        'discount_amount' => $rule->discount_amount,
+                        'action_type' => $rule->action_type,
+                        'end_other_rules' => $rule->end_other_rules,
+                        'sort_order' => $rule->sort_order,
+                    ];
+
+                    if (count($rows) == $batchCount) {
+                        $this->catalogRuleProductRepository->getModel()->insert($rows);
+
+                        $rows = [];
+                    }
+                }
+            }
+        }
+
+        if (! empty($rows))
+            $this->catalogRuleProductRepository->getModel()->insert($rows);
+    }
+
+    /**
+     * Get array of product ids which are matched by rule
+     *
+     * @param CatalogRule $rule
+     * @param Product     $product
+     * @return array
+     */
+    public function getMatchingProductIds($rule, $product = null)
+    {
+        $qb = $this->productRepository->scopeQuery(function($query) use($rule, $product) {
+            $qb = $query->distinct()
+                    ->addSelect('products.*')
+                    ->leftJoin('product_flat', 'products.id', '=', 'product_flat.product_id')
+                    ->leftJoin('channels', 'product_flat.channel', '=', 'channels.code')
+                    ->whereIn('channels.id', $rule->channels()->pluck('id')->toArray());
+
+            if ($product)
+                $qb->where('products.id', $product->id);
+
+            if (! $rule->conditions)
+                return $qb;
+
+            $appliedAttributes = [];
+
+            foreach ($rule->conditions as $condition) {
+                if (! $condition['attribute']
+                    || ! isset($condition['value'])
+                    || is_null($condition['value'])
+                    || $condition['value'] == ''
+                    || in_array($condition['attribute'], $appliedAttributes))
+                    continue;
+                
+                $appliedAttributes[] = $condition['attribute'];
+
+                $chunks = explode('|', $condition['attribute']);
+
+                $qb = $this->addAttributeToSelect(end($chunks), $qb);
+            }
+
+            return $qb;
+        });
+
+        $validatedProductIds = [];
+
+        foreach ($qb->get() as $product) {
+            if (! $product->getTypeInstance()->priceRuleCanBeApplied())
+                continue;
+
+            if ($this->validator->validate($rule, $product)) {
+                if ($product->getTypeInstance()->isComposite()) {
+                    $validatedProductIds = array_merge($validatedProductIds, $product->getTypeInstance()->getChildrenIds());
+                } else {
+                    $validatedProductIds[] = $product->id;
+                }
+            }
+        }
+
+        return array_unique($validatedProductIds);
+    }
+    
+    /**
+     * Add product attribute condition to query
+     *
+     * @param string       $attributeCode
+     * @param QueryBuilder $query
+     * @return QueryBuilder
+     */
+    public function addAttributeToSelect($attributeCode, $query)
+    {
+        $attribute = $this->attributeRepository->findOneByField('code', $attributeCode);
+
+        if (! $attribute)
+            return $query;
+
+        $query = $query->leftJoin('product_attribute_values as ' . 'pav_' . $attribute->code, function($qb) use($attribute) {
+            $qb = $qb->where('pav_' . $attribute->code . '.channel', $attribute->value_per_channel ? core()->getDefaultChannelCode() : null)
+                    ->where('pav_' . $attribute->code . '.locale', $attribute->value_per_locale ? app()->getLocale() : null);
+            
+            $qb->on('products.id', 'pav_' . $attribute->code . '.product_id')
+                    ->where('pav_' . $attribute->code . '.attribute_id', $attribute->id);
+        });
+
+        $query = $query->addSelect('pav_' . $attribute->code . '.' . ProductAttributeValue::$attributeTypeFields[$attribute->type] . ' as ' . $attribute->code);
+
+        return $query;
+    }
+
+    /**
+     * Returns catalog rule products
+     *
+     * @param Product $product
+     * @return Collection
+     */
+    public function getCatalogRuleProducts($product = null)
+    {
+        $results = $this->catalogRuleProductRepository->scopeQuery(function($query) use($product) {
+            $qb = $query->distinct()
+                    ->select('catalog_rule_products.*')
+                    ->leftJoin('products', 'catalog_rule_products.product_id', '=', 'products.id')
+                    ->orderBy('channel_id', 'asc')
+                    ->orderBy('customer_group_id', 'asc')
+                    ->orderBy('product_id', 'asc')
+                    ->orderBy('sort_order', 'asc')
+                    ->orderBy('catalog_rule_id', 'asc');
+
+            $qb = $this->addAttributeToSelect('price', $qb);
+
+            if ($product) {
+                if (! $product->getTypeInstance()->priceRuleCanBeApplied())
+                    return $qb;
+
+                if ($product->getTypeInstance()->isComposite()) {
+                    $qb->whereIn('catalog_rule_products.product_id', $product->getTypeInstance()->getChildrenIds());
+                } else {
+                    $qb->where('catalog_rule_products.product_id', $product->id);
+                }
+            }
+
+            return $qb;
+        })->get();
+
+        return $results;
+    }
+
+    /**
+     * Returns catalog rules
+     *
+     * @param CatalogRule $rule
+     * @return void
+     */
+    public function cleanProductIndex($productIds = [])
+    {
+        if (count($productIds)) {
+            $this->catalogRuleProductRepository->getModel()->whereIn('product_id', $productIds)->delete();
+        } else {
+            $this->catalogRuleProductRepository->deleteWhere([
+                ['product_id', 'like', '%%']
+            ]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php
new file mode 100644
index 000000000..358b37cd5
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProductPrice.php
@@ -0,0 +1,217 @@
+<?php
+
+namespace Webkul\CatalogRule\Helpers;
+
+use Carbon\Carbon;
+use Webkul\CatalogRule\Repositories\CatalogRuleProductPriceRepository;
+use Webkul\Customer\Repositories\CustomerGroupRepository;
+
+class CatalogRuleProductPrice
+{
+    /**
+     * CatalogRuleProductPriceRepository object
+     *
+     * @var CatalogRuleProductPriceRepository
+     */
+    protected $catalogRuleProductPriceRepository;
+
+    /**
+     * CatalogRuleProduct object
+     *
+     * @var CatalogRuleProduct
+     */
+    protected $catalogRuleProductHelper;
+
+    /**
+     * CustomerGroupRepository object
+     *
+     * @var CustomerGroupRepository
+     */
+    protected $customerGroupRepository;
+
+    /**
+     * Create a new helper instance.
+     *
+     * @param  Webkul\Attribute\Repositories\CatalogRuleProductPriceRepository $catalogRuleProductPriceRepository
+     * @param  Webkul\CatalogRule\Repositories\CatalogRuleProduct              $catalogRuleProductHelper
+     * @param  Webkul\Customer\Repositories\CustomerGroupRepository            $customerGroupRepository
+     * @return void
+     */
+    public function __construct(
+        CatalogRuleProductPriceRepository $catalogRuleProductPriceRepository,
+        CatalogRuleProduct $catalogRuleProductHelper,
+        CustomerGroupRepository $customerGroupRepository
+    )
+    {
+        $this->catalogRuleProductPriceRepository = $catalogRuleProductPriceRepository;
+
+        $this->catalogRuleProductHelper = $catalogRuleProductHelper;
+
+        $this->customerGroupRepository = $customerGroupRepository;
+    }
+
+    /**
+     * Return current logged in customer
+     *
+     * @return Customer | Boolean
+     */
+    public function getCurrentCustomer()
+    {
+        $guard = request()->has('token') ? 'api' : 'customer';
+
+        return auth()->guard($guard);
+    }
+
+    /**
+     * Collect discount on cart
+     *
+     * @param integer $batchCount
+     * @param Product $product
+     * @return void
+     */
+    public function indexRuleProductPrice($batchCount, $product = null)
+    {
+        $dates = [
+            'current' => $currentDate = Carbon::now(),
+            'previous' => (clone $currentDate)->subDays('1')->setTime(23, 59, 59),
+            'next' => (clone $currentDate)->addDays('1')->setTime(0, 0, 0),
+        ];
+
+        $prices = $endRuleFlags = [];
+
+        $previousKey = null;
+
+        $catalogRuleProducts = $this->catalogRuleProductHelper->getCatalogRuleProducts($product);
+
+        foreach ($catalogRuleProducts as $row) {
+            $productKey = $row->product_id . '-' . $row->channel_id . '-' . $row->customer_group_id;
+
+            if ($previousKey && $previousKey != $productKey) {
+                $endRuleFlags = [];
+
+                if (count($prices) > $batchCount) {
+                    $this->catalogRuleProductPriceRepository->getModel()->insert($prices);
+
+                    $prices = [];
+                }
+            }
+
+            foreach ($dates as $key => $date) {
+                if ((! $row->starts_from || $date >= $row->starts_from)
+                    && (! $row->ends_till || $date <= $row->ends_till))
+                {
+                    $priceKey = $date->getTimestamp() . '-' . $productKey;
+
+                    if (isset($endRuleFlags[$priceKey]))
+                        continue;
+
+                    if (! isset($prices[$priceKey])) {
+                        $prices[$priceKey] = [
+                            'rule_date' => $date,
+                            'catalog_rule_id' => $row->catalog_rule_id,
+                            'channel_id' => $row->channel_id,
+                            'customer_group_id' => $row->customer_group_id,
+                            'product_id' => $row->product_id,
+                            'price' => $this->calculate($row),
+                            'starts_from' => $row->starts_from,
+                            'ends_till' => $row->ends_till,
+                        ];
+                    } else {
+                        $prices[$priceKey]['price'] = $this->calculate($row, $prices[$priceKey]);
+
+                        $prices[$priceKey]['starts_from'] = max($prices[$priceKey]['starts_from'], $row->starts_from);
+
+                        $prices[$priceKey]['ends_till'] = min($prices[$priceKey]['ends_till'], $row->ends_till);
+                    }
+
+                    if ($row->end_other_rules)
+                        $endRuleFlags[$priceKey] = true;
+                }
+            }
+
+            $previousKey = $productKey;
+        }
+
+        $this->catalogRuleProductPriceRepository->getModel()->insert($prices);
+    }
+
+    /**
+     * Calculates product price based on rule
+     *
+     * @param array        $rule
+     * @param Product|null $productData
+     * @return float
+     */
+    public function calculate($rule, $productData = null)
+    {
+        $price = $productData && isset($productData['price']) ? $productData['price'] : $rule->price;
+
+        switch ($rule->action_type) {
+            case 'to_fixed':
+                $price = min($rule->discount_amount, $price);
+
+                break;
+
+            case 'to_percent':
+                $price = $price * $rule->discount_amount / 100;
+
+                break;
+
+            case 'by_fixed':
+                $price = max(0, $price - $rule->discount_amount);
+                
+                break;
+
+            case 'by_percent':
+                $price = $price * (1 - $rule->discount_amount / 100);
+
+                break;
+        }
+
+        return $price;
+    }
+
+    /**
+     * Clean product price index
+     *
+     * @param array $productIds
+     * @return void
+     */
+    public function cleanProductPriceIndex($productIds = [])
+    {
+        if (count($productIds)) {
+            $this->catalogRuleProductPriceRepository->getModel()->whereIn('product_id', $productIds)->delete();
+        } else {
+            $this->catalogRuleProductPriceRepository->deleteWhere([
+                ['product_id', 'like', '%%']
+            ]);
+        }
+    }
+
+    /**
+     * Get catalog rules product price for specific date, channel and customer group
+     *
+     * @param Product $product
+     * @return void
+     */
+    public function getRulePrice($product)
+    {
+        if ($this->getCurrentCustomer()->check()) {
+            $customerGroupId = $this->getCurrentCustomer()->user()->customer_group_id;
+        } else {
+            $customerGroup = $this->customerGroupRepository->findOneByField('code', 'guest');
+
+            if (! $customerGroup)
+                return;
+
+            $customerGroupId = $customerGroup->id;
+        }
+
+        return $this->catalogRuleProductPriceRepository->findOneWhere([
+                'product_id' => $product->id,
+                'channel_id' => core()->getCurrentChannel()->id,
+                'customer_group_id' => $customerGroupId,
+                'rule_date' => Carbon::now()->format('Y-m-d'),
+            ]);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php
new file mode 100644
index 000000000..3bcceb50f
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php
@@ -0,0 +1,183 @@
+<?php
+
+namespace Webkul\CatalogRule\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Event;
+use Webkul\CatalogRule\Repositories\CatalogRuleRepository;
+use Webkul\CatalogRule\Helpers\CatalogRuleIndex;
+
+/**
+ * Catalog Rule controller
+ *
+ * @author Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CatalogRuleController extends Controller
+{
+    /**
+     * Initialize _config, a default request parameter with route
+     * 
+     * @param array
+     */
+    protected $_config;
+
+    /**
+     * To hold Catalog repository instance
+     * 
+     * @var CatalogRuleRepository
+     */
+    protected $catalogRuleRepository;
+
+    /**
+     * CatalogRuleIndex
+     * 
+     * @var CatalogRuleIndex
+     */
+    protected $catalogRuleIndexHelper;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param  \Webkul\CatalogRule\Repositories\CatalogRuleRepository $catalogRuleRepository
+     * @param  \Webkul\CatalogRule\Helpers\CatalogRuleIndex           $catalogRuleIndexHelper
+     * @return void
+     */
+    public function __construct(
+        CatalogRuleRepository $catalogRuleRepository,
+        CatalogRuleIndex $catalogRuleIndexHelper
+    )
+    {
+        $this->_config = request('_config');
+
+        $this->catalogRuleRepository = $catalogRuleRepository;
+
+        $this->catalogRuleIndexHelper = $catalogRuleIndexHelper;
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view($this->_config['view']);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return view($this->_config['view']);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function store()
+    {
+        $this->validate(request(), [
+            'name' => 'required',
+            'channels' => 'required|array|min:1',
+            'customer_groups' => 'required|array|min:1',
+            'starts_from' => 'nullable|date',
+            'ends_till' => 'nullable|date|after_or_equal:starts_from',
+            'action_type' => 'required',
+            'discount_amount' => 'required|numeric'
+        ]);
+
+        $data = request()->all();
+
+        Event::fire('promotions.catalog_rule.create.before');
+
+        $catalogRule = $this->catalogRuleRepository->create($data);
+
+        Event::fire('promotions.catalog_rule.create.after', $catalogRule);
+
+        $this->catalogRuleIndexHelper->reindexComplete();
+
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Catalog Rule']));
+
+        return redirect()->route($this->_config['redirect']);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        $catalogRule = $this->catalogRuleRepository->findOrFail($id);
+
+        return view($this->_config['view'], compact('catalogRule'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->validate(request(), [
+            'name' => 'required',
+            'channels' => 'required|array|min:1',
+            'customer_groups' => 'required|array|min:1',
+            'starts_from' => 'nullable|date',
+            'ends_till' => 'nullable|date|after_or_equal:starts_from',
+            'action_type' => 'required',
+            'discount_amount' => 'required|numeric'
+        ]);
+
+        $catalogRule = $this->catalogRuleRepository->findOrFail($id);
+
+        Event::fire('promotions.catalog_rule.update.before', $catalogRule);
+
+        $catalogRule = $this->catalogRuleRepository->update(request()->all(), $id);
+
+        Event::fire('promotions.catalog_rule.update.after', $catalogRule);
+
+        $this->catalogRuleIndexHelper->reindexComplete();
+
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Catalog Rule']));
+
+        return redirect()->route($this->_config['redirect']);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $catalogRule = $this->catalogRuleRepository->findOrFail($id);
+
+        try {
+            Event::fire('promotions.catalog_rule.delete.before', $id);
+
+            $this->catalogRuleRepository->delete($id);
+
+            Event::fire('promotions.catalog_rule.delete.after', $id);
+
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Catalog Rule']));
+
+            return response()->json(['message' => true], 200);
+        } catch(\Exception $e) {
+            session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Catalog Rule']));
+        }
+
+        return response()->json(['message' => false], 400);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Http/Controllers/Controller.php b/packages/Webkul/CatalogRule/src/Http/Controllers/Controller.php
new file mode 100644
index 000000000..78181ceb7
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Http/Controllers/Controller.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Webkul\CatalogRule\Http\Controllers;
+
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
+class Controller extends BaseController
+{
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Listeners/Product.php b/packages/Webkul/CatalogRule/src/Listeners/Product.php
new file mode 100755
index 000000000..ef5dc2b51
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Listeners/Product.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Webkul\CatalogRule\Listeners;
+
+use Webkul\CatalogRule\Helpers\CatalogRuleIndex;
+
+/**
+ * Products Event handler
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class Product
+{
+    /**
+     * Product Repository Object
+     * 
+     * @var Object
+     */
+    protected $catalogRuleIndexHelper;
+
+    /**
+     * Create a new listener instance.
+     * 
+     * @param  Webkul\CatalogRule\Helpers\CatalogRuleIndex $catalogRuleIndexHelper
+     * @return void
+     */
+    public function __construct(CatalogRuleIndex $catalogRuleIndexHelper)
+    {
+        $this->catalogRuleIndexHelper = $catalogRuleIndexHelper;
+    }
+
+    /**
+     * @param Product $product
+     * @return void
+     */
+    public function createProductRuleIndex($product)
+    {
+        $this->catalogRuleIndexHelper->reindexProduct($product);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Models/CatalogRule.php b/packages/Webkul/CatalogRule/src/Models/CatalogRule.php
new file mode 100644
index 000000000..00e991506
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Models/CatalogRule.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Webkul\CatalogRule\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Webkul\CatalogRule\Contracts\CatalogRule as CatalogRuleContract;
+use Webkul\Core\Models\ChannelProxy;
+use Webkul\Customer\Models\CustomerGroupProxy;
+
+class CatalogRule extends Model implements CatalogRuleContract
+{
+    protected $fillable = ['name', 'description', 'starts_from', 'ends_till', 'status', 'condition_type', 'conditions',  'end_other_rules', 'action_type', 'discount_amount', 'sort_order'];
+
+    protected $casts = [
+        'conditions' => 'array'
+    ];
+
+    /**
+     * Get the channels that owns the catalog rule.
+     */
+    public function channels()
+    {
+        return $this->belongsToMany(ChannelProxy::modelClass(), 'catalog_rule_channels');
+    }
+
+    /**
+     * Get the customer groups that owns the catalog rule.
+     */
+    public function customer_groups()
+    {
+        return $this->belongsToMany(CustomerGroupProxy::modelClass(), 'catalog_rule_customer_groups');
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Models/CatalogRuleProduct.php b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProduct.php
new file mode 100644
index 000000000..dfa513113
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProduct.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Webkul\CatalogRule\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Webkul\CatalogRule\Contracts\CatalogRuleProduct as CatalogRuleProductContract;
+
+class CatalogRuleProduct extends Model implements CatalogRuleProductContract
+{
+    public $timestamps = false;
+
+    protected $fillable = ['starts_from', 'ends_till', 'discount_amount', 'action_type', 'end_other_rules', 'sort_order', 'catalog_rule_id', 'channel_id', 'customer_group_id', 'product_id'];
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductPrice.php b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductPrice.php
new file mode 100644
index 000000000..59c1731bd
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductPrice.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Webkul\CatalogRule\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Webkul\CatalogRule\Contracts\CatalogRuleProductPrice as CatalogRuleProductPriceContract;
+
+class CatalogRuleProductPrice extends Model implements CatalogRuleProductPriceContract
+{
+    public $timestamps = false;
+
+    protected $fillable = ['price', 'rule_date', 'starts_from', 'ends_till', 'catalog_rule_id', 'channel_id', 'customer_group_id'];
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductPriceProxy.php b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductPriceProxy.php
new file mode 100644
index 000000000..5aca7c4c0
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductPriceProxy.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\CatalogRule\Models;
+
+use Konekt\Concord\Proxies\ModelProxy;
+
+class CatalogRuleProductPriceProxy extends ModelProxy
+{
+
+}
diff --git a/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductProxy.php b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductProxy.php
new file mode 100644
index 000000000..3c7cd5f27
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProductProxy.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\CatalogRule\Models;
+
+use Konekt\Concord\Proxies\ModelProxy;
+
+class CatalogRuleProductProxy extends ModelProxy
+{
+
+}
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleProxy.php b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProxy.php
similarity index 70%
rename from packages/Webkul/Discount/src/Models/CatalogRuleProxy.php
rename to packages/Webkul/CatalogRule/src/Models/CatalogRuleProxy.php
index 153f71dce..000c078a9 100644
--- a/packages/Webkul/Discount/src/Models/CatalogRuleProxy.php
+++ b/packages/Webkul/CatalogRule/src/Models/CatalogRuleProxy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Webkul\Discount\Models;
+namespace Webkul\CatalogRule\Models;
 
 use Konekt\Concord\Proxies\ModelProxy;
 
 class CatalogRuleProxy extends ModelProxy
 {
 
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/CatalogRule/src/Providers/CatalogRuleServiceProvider.php b/packages/Webkul/CatalogRule/src/Providers/CatalogRuleServiceProvider.php
new file mode 100644
index 000000000..a058ff7e7
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Providers/CatalogRuleServiceProvider.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Webkul\CatalogRule\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Routing\Router;
+use Illuminate\Support\Facades\Event;
+use Webkul\CatalogRule\Console\Commands\PriceRuleIndex;
+
+class CatalogRuleServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot(Router $router)
+    {
+        $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
+
+        Event::listen('catalog.product.update.after', 'Webkul\CatalogRule\Listeners\Product@createProductRuleIndex');
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->registerCommands();
+    }
+
+    /**
+     * Register the console commands of this package
+     */
+    protected function registerCommands()
+    {
+        if ($this->app->runningInConsole())
+            $this->commands([PriceRuleIndex::class]);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Providers/ModuleServiceProvider.php b/packages/Webkul/CatalogRule/src/Providers/ModuleServiceProvider.php
new file mode 100644
index 000000000..778b8a1d9
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Providers/ModuleServiceProvider.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Webkul\CatalogRule\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+        \Webkul\CatalogRule\Models\CatalogRule::class,
+        \Webkul\CatalogRule\Models\CatalogRuleProduct::class,
+        \Webkul\CatalogRule\Models\CatalogRuleProductPrice::class
+    ];
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductPriceRepository.php b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductPriceRepository.php
new file mode 100644
index 000000000..75f174c0f
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductPriceRepository.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Webkul\CatalogRule\Repositories;
+
+use Webkul\Core\Eloquent\Repository;
+
+/**
+ * CatalogRuleProductPrice Repository
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CatalogRuleProductPriceRepository extends Repository
+{
+    /**
+     * Specify Model class name
+     *
+     * @return mixed
+     */
+    function model()
+    {
+        return 'Webkul\CatalogRule\Contracts\CatalogRuleProductPrice';
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductRepository.php b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductRepository.php
new file mode 100644
index 000000000..565781c29
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleProductRepository.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Webkul\CatalogRule\Repositories;
+
+use Webkul\Core\Eloquent\Repository;
+
+/**
+ * CatalogRuleProductPrice Repository
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CatalogRuleProductRepository extends Repository
+{
+    /**
+     * Specify Model class name
+     *
+     * @return mixed
+     */
+    function model()
+    {
+        return 'Webkul\CatalogRule\Contracts\CatalogRuleProduct';
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php
new file mode 100644
index 000000000..16a59b5ee
--- /dev/null
+++ b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php
@@ -0,0 +1,225 @@
+<?php
+
+namespace Webkul\CatalogRule\Repositories;
+
+use Illuminate\Container\Container as App;
+use Webkul\Core\Eloquent\Repository;
+use Webkul\Attribute\Repositories\AttributeFamilyRepository;
+use Webkul\Attribute\Repositories\AttributeRepository;
+use Webkul\Category\Repositories\CategoryRepository;
+use Webkul\Tax\Repositories\TaxCategoryRepository;
+
+/**
+ * CatalogRule Reposotory
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class CatalogRuleRepository extends Repository
+{
+    /**
+     * AttributeFamilyRepository object
+     *
+     * @var AttributeFamilyRepository
+     */
+    protected $attributeFamilyRepository;
+
+    /**
+     * AttributeRepository object
+     *
+     * @var AttributeRepository
+     */
+    protected $attributeRepository;
+
+    /**
+     * CategoryRepository class
+     *
+     * @var CategoryRepository
+     */
+    protected $categoryRepository;
+
+    /**
+     * TaxCategoryRepository class
+     *
+     * @var TaxCategoryRepository
+     */
+    protected $taxCategoryRepository;
+
+    /**
+     * Create a new repository instance.
+     *
+     * @param  Webkul\Attribute\Repositories\AttributeFamilyRepository $attributeFamilyRepository
+     * @param  Webkul\Attribute\Repositories\AttributeRepository       $attributeRepository
+     * @param  Webkul\Category\Repositories\CategoryRepository         $categoryRepository
+     * @param  Webkul\Tax\Repositories\TaxCategoryRepository           $taxCategoryRepository
+     * @param  Illuminate\Container\Container                          $app
+     * @return void
+     */
+    public function __construct(
+        AttributeFamilyRepository $attributeFamilyRepository,
+        AttributeRepository $attributeRepository,
+        CategoryRepository $categoryRepository,
+        TaxCategoryRepository $taxCategoryRepository,
+        App $app
+    )
+    {
+        $this->attributeFamilyRepository = $attributeFamilyRepository;
+
+        $this->attributeRepository = $attributeRepository;
+
+        $this->categoryRepository = $categoryRepository;
+
+        $this->taxCategoryRepository = $taxCategoryRepository;
+
+        parent::__construct($app);
+    }
+
+    /**
+     * Specify Model class name
+     *
+     * @return mixed
+     */
+    function model()
+    {
+        return 'Webkul\CatalogRule\Contracts\CatalogRule';
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function create(array $data)
+    {
+        $data['starts_from'] = $data['starts_from'] ?: null;
+
+        $data['ends_till'] = $data['ends_till'] ?: null;
+
+        $data['status'] = ! isset($data['status']) ? 0 : 1;
+
+        $catalogRule = parent::create($data);
+
+        $catalogRule->channels()->sync($data['channels']);
+
+        $catalogRule->customer_groups()->sync($data['customer_groups']);
+
+        return $catalogRule;
+    }
+
+    /**
+     * @param array  $data
+     * @param array  $id
+     * @param string $attribute
+     * @return mixed
+     */
+    public function update(array $data, $id, $attribute = "id")
+    {
+        $data['starts_from'] = $data['starts_from'] ?: null;
+
+        $data['ends_till'] = $data['ends_till'] ?: null;
+
+        $data['status'] = ! isset($data['status']) ? 0 : 1;
+
+        $data['conditions'] = $data['conditions'] ?? [];
+
+        $catalogRule = $this->find($id);
+
+        parent::update($data, $id, $attribute);
+
+        $catalogRule->channels()->sync($data['channels']);
+
+        $catalogRule->customer_groups()->sync($data['customer_groups']);
+
+        return $catalogRule;
+    }
+
+    /**
+     * Returns attributes for catalog rule conditions
+     *
+     * @return array
+     */
+    public function getConditionAttributes()
+    {
+        $attributes = [
+            [
+                'key' => 'product',
+                'label' => trans('admin::app.promotions.catalog-rules.product-attribute'),
+                'children' => [
+                    [
+                        'key' => 'product|category_ids',
+                        'type' => 'multiselect',
+                        'label' => trans('admin::app.promotions.catalog-rules.categories'),
+                        'options' => $this->categoryRepository->getCategoryTree()
+                    ], [
+                        'key' => 'product|attribute_family_id',
+                        'type' => 'select',
+                        'label' => trans('admin::app.promotions.catalog-rules.attribute_family'),
+                        'options' => $this->getAttributeFamilies()
+                    ]
+                ]
+            ]
+        ];
+
+        foreach ($this->attributeRepository->findWhereNotIn('type', ['textarea', 'image', 'file']) as $attribute) {
+            $attributeType = $attribute->type;
+
+            if ($attribute->code == 'tax_category_id') {
+                $options = $this->getTaxCategories();
+            } else {
+                $options = $attribute->options;
+            }
+
+            if ($attribute->validation == 'decimal')
+                $attributeType = 'decimal';
+
+            if ($attribute->validation == 'numeric')
+                $attributeType = 'integer';
+
+            $attributes[0]['children'][] = [
+                'key' => 'product|' . $attribute->code,
+                'type' => $attribute->type,
+                'label' => $attribute->name,
+                'options' => $options
+            ];
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Returns all tax categories
+     *
+     * @return array
+     */
+    public function getTaxCategories()
+    {
+        $taxCategories = [];
+
+        foreach ($this->taxCategoryRepository->all() as $taxCategory) {
+            $taxCategories[] = [
+                'id' => $taxCategory->id,
+                'admin_name' => $taxCategory->name,
+            ];
+        }
+
+        return $taxCategories;
+    }
+
+    /**
+     * Returns all attribute families
+     *
+     * @return array
+     */
+    public function getAttributeFamilies()
+    {
+        $attributeFamilies = [];
+
+        foreach ($this->attributeFamilyRepository->all() as $attributeFamily) {
+            $attributeFamilies[] = [
+                'id' => $attributeFamily->id,
+                'admin_name' => $attributeFamily->name,
+            ];
+        }
+
+        return $attributeFamilies;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index c640a30d0..8d772a56c 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -614,6 +614,8 @@ class Cart {
         if (! $cart = $this->getCart())
             return false;
 
+        Event::fire('checkout.cart.collect.totals.before', $cart);
+
         $this->calculateItemsTax();
 
         $cart->grand_total = $cart->base_grand_total = 0;
@@ -636,11 +638,15 @@ class Cart {
         }
 
         if ($shipping = $cart->selected_shipping_rate) {
-            $cart->grand_total = (float) $cart->grand_total + $shipping->price;
-            $cart->base_grand_total = (float) $cart->base_grand_total + $shipping->base_price;
+            $cart->grand_total = (float) $cart->grand_total + $shipping->price - $shipping->discount_amount;
+            $cart->base_grand_total = (float) $cart->base_grand_total + $shipping->base_price - $shipping->base_discount_amount;
+
+            $cart->discount_amount += $shipping->discount_amount;
+            $cart->base_discount_amount += $shipping->base_discount_amount;
         }
 
         $quantities = 0;
+        
         foreach ($cart->items as $item) {
             $quantities = $quantities + $item->quantity;
         }
@@ -650,6 +656,8 @@ class Cart {
         $cart->items_qty = $quantities;
 
         $cart->save();
+
+        Event::fire('checkout.cart.collect.totals.after', $cart);
     }
 
     /**
@@ -835,6 +843,8 @@ class Cart {
             'base_sub_total' => $data['base_sub_total'],
             'tax_amount' => $data['tax_total'],
             'base_tax_amount' => $data['base_tax_total'],
+            'coupon_code' => $data['coupon_code'],
+            'applied_cart_rule_ids' => $data['applied_cart_rule_ids'],
             'discount_amount' => $data['discount_amount'],
             'base_discount_amount' => $data['base_discount_amount'],
             'billing_address' => array_except($data['billing_address'], ['id', 'cart_id']),
@@ -972,4 +982,37 @@ class Cart {
 
         return true;
     }
+
+    /**
+     * Set coupon code to the cart
+     *
+     * @param string $code
+     * @return Cart
+     */
+    public function setCouponCode($code)
+    {
+        $cart = $this->getCart();
+
+        $cart->coupon_code = $code;
+
+        $cart->save();
+
+        return $this;
+    }
+
+    /**
+     * Remove coupon code from cart
+     *
+     * @return Cart
+     */
+    public function removeCouponCode()
+    {
+        $cart = $this->getCart();
+
+        $cart->coupon_code = null;
+
+        $cart->save();
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2019_11_25_171136_add_applied_cart_rule_ids_column_in_cart_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2019_11_25_171136_add_applied_cart_rule_ids_column_in_cart_table.php
new file mode 100644
index 000000000..b6423d3be
--- /dev/null
+++ b/packages/Webkul/Checkout/src/Database/Migrations/2019_11_25_171136_add_applied_cart_rule_ids_column_in_cart_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAppliedCartRuleIdsColumnInCartTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('cart', function (Blueprint $table) {
+            $table->string('applied_cart_rule_ids')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('cart', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_06_25_110122_remove_is_guest_from_cart_rules_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2019_11_25_171208_add_applied_cart_rule_ids_column_in_cart_items_table.php
similarity index 57%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_06_25_110122_remove_is_guest_from_cart_rules_table.php
rename to packages/Webkul/Checkout/src/Database/Migrations/2019_11_25_171208_add_applied_cart_rule_ids_column_in_cart_items_table.php
index a34fe12d9..cb22375bf 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_06_25_110122_remove_is_guest_from_cart_rules_table.php
+++ b/packages/Webkul/Checkout/src/Database/Migrations/2019_11_25_171208_add_applied_cart_rule_ids_column_in_cart_items_table.php
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class RemoveIsGuestFromCartRulesTable extends Migration
+class AddAppliedCartRuleIdsColumnInCartItemsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,8 +13,8 @@ class RemoveIsGuestFromCartRulesTable extends Migration
      */
     public function up()
     {
-        Schema::table('cart_rules', function (Blueprint $table) {
-            $table->dropColumn('is_guest');
+        Schema::table('cart_items', function (Blueprint $table) {
+            $table->string('applied_cart_rule_ids')->nullable();
         });
     }
 
@@ -25,8 +25,8 @@ class RemoveIsGuestFromCartRulesTable extends Migration
      */
     public function down()
     {
-        Schema::table('cart_rules', function (Blueprint $table) {
-            $table->boolean('is_guest')->default(0);
+        Schema::table('cart_items', function (Blueprint $table) {
+            //
         });
     }
 }
diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2019_11_30_165644_add_discount_columns_in_cart_shipping_rates_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2019_11_30_165644_add_discount_columns_in_cart_shipping_rates_table.php
new file mode 100644
index 000000000..8c7b48e44
--- /dev/null
+++ b/packages/Webkul/Checkout/src/Database/Migrations/2019_11_30_165644_add_discount_columns_in_cart_shipping_rates_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDiscountColumnsInCartShippingRatesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('cart_shipping_rates', function (Blueprint $table) {
+            $table->decimal('discount_amount', 12, 4)->default(0);
+            $table->decimal('base_discount_amount', 12, 4)->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('cart_shipping_rates', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/packages/Webkul/Checkout/src/Models/Cart.php b/packages/Webkul/Checkout/src/Models/Cart.php
index 01cddea2b..9088531fa 100755
--- a/packages/Webkul/Checkout/src/Models/Cart.php
+++ b/packages/Webkul/Checkout/src/Models/Cart.php
@@ -12,8 +12,6 @@ class Cart extends Model implements CartContract
 
     protected $guarded = ['id', 'created_at', 'updated_at'];
 
-    protected $hidden = ['coupon_code'];
-
     protected $with = ['items', 'items.children'];
 
     /**
diff --git a/packages/Webkul/Checkout/src/Models/CartShippingRate.php b/packages/Webkul/Checkout/src/Models/CartShippingRate.php
index 6ecf168cb..7c4447e33 100755
--- a/packages/Webkul/Checkout/src/Models/CartShippingRate.php
+++ b/packages/Webkul/Checkout/src/Models/CartShippingRate.php
@@ -7,7 +7,7 @@ use Webkul\Checkout\Contracts\CartShippingRate as CartShippingRateContract;
 
 class CartShippingRate extends Model implements CartShippingRateContract
 {
-    protected $fillable = ['carrier', 'carrier_title', 'method', 'method_title', 'method_description', 'price', 'base_price'];
+    protected $fillable = ['carrier', 'carrier_title', 'method', 'method_title', 'method_description', 'price', 'base_price', 'discount_amount', 'base_discount_amount'];
 
     /**
      * Get the post that owns the comment.
diff --git a/packages/Webkul/Core/src/Config/concord.php b/packages/Webkul/Core/src/Config/concord.php
index 311ede347..24c40b47a 100644
--- a/packages/Webkul/Core/src/Config/concord.php
+++ b/packages/Webkul/Core/src/Config/concord.php
@@ -19,7 +19,8 @@ return [
         \Webkul\Sales\Providers\ModuleServiceProvider::class,
         \Webkul\Tax\Providers\ModuleServiceProvider::class,
         \Webkul\User\Providers\ModuleServiceProvider::class,
-        \Webkul\Discount\Providers\ModuleServiceProvider::class,
+        \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
+        \Webkul\CartRule\Providers\ModuleServiceProvider::class,
         \Webkul\CMS\Providers\ModuleServiceProvider::class
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Discount/composer.json b/packages/Webkul/Discount/composer.json
deleted file mode 100644
index 78ac3d63e..000000000
--- a/packages/Webkul/Discount/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "bagisto/laravel-discount",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Prashant Singh",
-            "email": "prashant.singh852@webkul.com"
-        }
-    ],
-    "require": {
-        "propaganistas/laravel-intl": "^2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Webkul\\Discount\\": "src/"
-        }
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Webkul\\Discount\\DiscountServiceProvider"
-            ],
-            "aliases": {}
-        }
-    },
-    "minimum-stability": "dev"
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/Action.php b/packages/Webkul/Discount/src/Actions/Cart/Action.php
deleted file mode 100644
index cabe673a4..000000000
--- a/packages/Webkul/Discount/src/Actions/Cart/Action.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Cart;
-
-abstract class Action
-{
-    /**
-     * To hold the current rule
-     */
-    protected $rule;
-
-    abstract public function calculate($rule);
-
-    /**
-     * To find the eligble items for the current rule,
-     *
-     * @param CartRule $rule
-     * @return Collection $eligibleItems
-     */
-    public function getEligibleItems()
-    {
-        $rule = $this->rule;
-
-        $cart = \Cart::getCart();
-
-        $items = $cart->items()->get();
-
-        $eligibleItems = collect();
-
-        if ($this->rule->action_type == 'whole_cart_to_percent' || $this->rule->action_type == 'whole_cart_to_fixed_amount')
-            $this->eligibleItems = $items;
-
-        if (! $rule->uses_attribute_conditions) {
-            return $items;
-        } else {
-            $productIDs = explode(',', $rule->product_ids);
-
-            foreach ($items as $item) {
-                foreach ($productIDs as $productID) {
-                    $childrens = $item->children;
-
-                    foreach ($childrens as $children) {
-                        if ($children->product_id == $productID)
-                            $eligibleItems->push($item);
-                    }
-
-                    if ($item->product_id == $productID)
-                        $eligibleItems->push($item);
-                }
-            }
-
-            return $eligibleItems;
-        }
-    }
-
-    /**
-     * To check the items applicability
-     */
-    public function checkApplicability()
-    {
-        $rule = $this->rule;
-
-        $eligibleItems = $this->getEligibleItems($rule);
-
-        $apply = function () use($rule, $eligibleItems) {
-            if ($rule->action_type == 'percent_of_product') {
-                return true;
-            } else {
-                if ($rule->action_type == 'whole_cart_to_percent' && $rule->uses_attribute_condition) {
-                    $matchingIds = explode(',', $rule->product_ids);
-
-                    foreach ($matchingIds as $matchingId) {
-                        foreach ($eligibleItems as $item) {
-                            if (($item->child ? $item->child->product_id : $item->product_id) == $matchingId)
-                                return true;
-                        }
-                    }
-
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        };
-
-        return $apply();
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php b/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php
deleted file mode 100644
index 12f86396c..000000000
--- a/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Cart;
-
-use Webkul\Discount\Actions\Cart\Action;
-
-class FixedAmount extends Action
-{
-    public function __construct($rule)
-    {
-        $this->rule = $rule;
-    }
-
-    public function calculate($rule)
-    {
-        $impact = collect();
-
-        $totalDiscount = 0;
-
-        if ($this->checkApplicability()) {
-            $eligibleItems = $this->getEligibleItems();
-
-            foreach ($eligibleItems as $item) {
-                $report = array();
-
-                $report['item_id'] = $item->id;
-                $report['child_items'] = collect();
-
-                $perItemDiscount = $rule->disc_amount / $eligibleItems->count();
-
-                $itemPrice = $item->base_price;
-
-                $itemQuantity = $item->quantity;
-
-                $discQuantity = $rule->disc_quantity;
-                $discQuantity = $itemQuantity <= $discQuantity ? $itemQuantity : $discQuantity;
-
-                if ($item->product->getTypeInstance()->isComposite()) {
-                    $isQtyZero = true;
-
-                    foreach ($item->children as $children) {
-                        if ($children->quantity > 0)
-                            $isQtyZero = false;
-                    }
-
-                    if ($isQtyZero) {
-                        // case for configurable products
-                        $report['product_id'] = $item->children->first()->product_id;
-                    } else {
-                        // composites other than configurable
-                        $report['product_id'] = $item->product_id;
-
-                        foreach ($item->children as $children) {
-                            $childBaseTotal = $children->base_total;
-
-                            $itemDiscount = $childBaseTotal / ($item->base_total / 100);
-
-                            $children->discount = ($itemDiscount / 100) * $perItemDiscount;
-
-                            $children->discount = $children->base_total > $children->discount ? $children->discount : $children->base_total;
-
-                            $report['child_items']->push($children);
-                        }
-                    }
-                } else {
-                    $report['product_id'] = $item->product_id;
-                }
-
-                $discount = round($perItemDiscount, 4) * $discQuantity;
-                $discount = $discount <= $itemPrice * $discQuantity ? $discount : $itemPrice * $discQuantity;
-
-                $report['discount'] = $discount;
-                $report['formatted_discount'] = core()->currency($discount);
-
-                $impact->push($report);
-
-                $totalDiscount = $totalDiscount + $discount;
-
-                unset($report);
-            }
-        }
-
-        $impact->discount = $totalDiscount;
-        $impact->formatted_discount = core()->currency($impact->discount);
-
-        return $impact;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
deleted file mode 100644
index 2f372a1e8..000000000
--- a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Cart;
-
-use Webkul\Discount\Actions\Cart\Action;
-
-class PercentOfProduct extends Action
-{
-    public function __construct($rule)
-    {
-        /**
-         * Setting the rule getting applied
-         */
-        $this->rule = $rule;
-    }
-
-    /**
-     * To calculate impact of cart rule's action of current items of cart instance
-     *
-     * @param CartRule $rule
-     *
-     * @return boolean
-     */
-    public function calculate($rule)
-    {
-        $impact = collect();
-
-        $totalDiscount = 0;
-
-        $applicability = $this->checkApplicability();
-
-        if ($applicability) {
-            $eligibleItems = $this->getEligibleItems();
-
-            $applicableDiscount = function () use ($eligibleItems) {
-                $total = 0;
-
-                foreach ($eligibleItems as $item) {
-                    $total = $total + $item->base_total;
-                }
-
-                return $total;
-            };
-
-            foreach ($eligibleItems as $item) {
-                $report = array();
-
-                $report['item_id'] = $item->id;
-                $report['child_items'] = collect();
-
-                $perItemDiscount = $applicableDiscount()  * ($rule->disc_amount / 100) / $eligibleItems->count();
-
-                $itemPrice = $item->base_price;
-
-                $itemQuantity = $item->quantity;
-
-                $discQuantity = $rule->disc_quantity;
-                $discQuantity = $itemQuantity <= $discQuantity ? $itemQuantity : $discQuantity;
-
-                if ($item->product->getTypeInstance()->isComposite()) {
-                    $isQtyZero = true;
-
-                    foreach ($item->children as $children) {
-                        if ($children->quantity > 0)
-                            $isQtyZero = false;
-                    }
-
-                    if ($isQtyZero) {
-                        // case for configurable products
-                        $report['product_id'] = $item->children->first()->product_id;
-                    } else {
-                        // composites other than configurable
-                        $report['product_id'] = $item->product_id;
-
-                        foreach ($item->children as $children) {
-                            $childBaseTotal = $children->base_total;
-
-                            $itemDiscount = $childBaseTotal / ($item->base_total / 100);
-
-                            $children->discount = ($itemDiscount / 100) * $perItemDiscount;
-
-                            $children->discount = $children->base_total > $children->discount ? $children->discount : $children->base_total;
-
-                            $report['child_items']->push($children);
-                        }
-                    }
-                } else {
-                    $report['product_id'] = $item->product_id;
-                }
-
-                $discount = round($perItemDiscount, 4) * $discQuantity;
-                $discount = $discount <= $itemPrice * $discQuantity ? $discount : $itemPrice * $discQuantity;
-
-                $report['discount'] = $discount;
-                $report['formatted_discount'] = core()->currency($discount);
-
-                $impact->push($report);
-
-                $totalDiscount = $totalDiscount + $discount;
-
-                unset($report);
-            }
-
-            $impact->discount = $totalDiscount;
-            $impact->formatted_discount = core()->currency($impact->discount);
-
-            return $impact;
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php
deleted file mode 100644
index 7fbc39cd4..000000000
--- a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Cart;
-
-use Webkul\Discount\Actions\Cart\FixedAmount;
-
-class WholeCartToFixed
-{
-    /**
-     * To calculate impact of cart rule's action of current items of cart instance
-     *
-     * @param CartRule $rule
-     *
-     * @return boolean
-     */
-    public function calculate($rule)
-    {
-        $actualInstance = new FixedAmount($rule);
-
-        $result = $actualInstance->calculate($rule);
-
-        return $result;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php
deleted file mode 100644
index ffd334370..000000000
--- a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Cart;
-
-use Webkul\Discount\Actions\Cart\PercentOfProduct;
-
-class WholeCartToPercent
-{
-    /**
-     * To calculate impact of cart rule's action of current items of cart instance
-     *
-     * @param CartRule $rule
-     *
-     * @return boolean
-     */
-    public function calculate($rule)
-    {
-        $actualInstance = new PercentOfProduct($rule);
-
-        $result = $actualInstance->calculate($rule);
-
-        return $result;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/Action.php b/packages/Webkul/Discount/src/Actions/Catalog/Action.php
deleted file mode 100644
index ddd2ddc56..000000000
--- a/packages/Webkul/Discount/src/Actions/Catalog/Action.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Catalog;
-
-abstract class Action
-{
-    abstract public function calculate($rule, $price);
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/AdjustToDiscountValue.php b/packages/Webkul/Discount/src/Actions/Catalog/AdjustToDiscountValue.php
deleted file mode 100644
index 269f1ac60..000000000
--- a/packages/Webkul/Discount/src/Actions/Catalog/AdjustToDiscountValue.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Catalog;
-
-use Webkul\Discount\Actions\Catalog\Action;
-
-class AdjustToDiscountValue extends Action
-{
-    public function calculate($rule, $product)
-    {
-        $discountAmount = $rule->discount_amount;
-        $price = $product->price;
-
-        if ($discountAmount <= $price) {
-            $discount = $price - $discountAmount;
-
-            return $discount;
-        } else {
-            return $price;
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/AdjustToPercent.php b/packages/Webkul/Discount/src/Actions/Catalog/AdjustToPercent.php
deleted file mode 100644
index 6c085a63a..000000000
--- a/packages/Webkul/Discount/src/Actions/Catalog/AdjustToPercent.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Catalog;
-
-use Webkul\Discount\Actions\Catalog\Action;
-
-class AdjustToPerenct extends Action
-{
-    public function calculate($rule, $product)
-    {
-        $discountAmount = $rule->discount_amount;
-
-        $price = $product->price;
-
-        $discount = ($discountAmount / 100) * $price;
-
-        return $discount;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/FixedAmount.php b/packages/Webkul/Discount/src/Actions/Catalog/FixedAmount.php
deleted file mode 100644
index d37f65df9..000000000
--- a/packages/Webkul/Discount/src/Actions/Catalog/FixedAmount.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Catalog;
-
-use Webkul\Discount\Actions\Catalog\Action;
-
-class FixedAmount extends Action
-{
-    public function calculate($rule, $product)
-    {
-        $discountAmount = $rule->discount_amount;
-        $price = $product->price;
-
-        if ($discountAmount <= $price) {
-            return $discountAmount;
-        } else {
-            return $price;
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Actions/Catalog/PercentOfOriginal.php b/packages/Webkul/Discount/src/Actions/Catalog/PercentOfOriginal.php
deleted file mode 100644
index 4fc7c0408..000000000
--- a/packages/Webkul/Discount/src/Actions/Catalog/PercentOfOriginal.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Actions\Catalog;
-
-use Webkul\Discount\Actions\Catalog\Action;
-
-class PercentOfOriginal extends Action
-{
-    public function calculate($rule, $product)
-    {
-        $discountAmount = $rule->discount_amount;
-
-        $price = $product->price;
-
-        $discount = ($discountAmount / 100) * $price;
-
-        return $discount;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Config/discount-rules.php b/packages/Webkul/Discount/src/Config/discount-rules.php
deleted file mode 100644
index 7f33b90e5..000000000
--- a/packages/Webkul/Discount/src/Config/discount-rules.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-
-    'cart' => [
-        'fixed_amount' => 'Webkul\Discount\Actions\Cart\FixedAmount',
-        'percent_of_product' => 'Webkul\Discount\Actions\Cart\PercentOfProduct',
-        'whole_cart_to_fixed' => 'Webkul\Discount\Actions\Cart\WholeCartToFixed',
-        'whole_cart_to_percent' => 'Webkul\Discount\Actions\Cart\WholeCartToPercent'
-    ],
-
-    'catalog' => [
-        'fixed_amount' => 'Webkul\Discount\Actions\Catalog\FixedAmount',
-        'final_price_to_percent' => 'Webkul\Discount\Actions\Catalog\AdjustToPercent',
-        'percent_of_original' => 'Webkul\Discount\Actions\Catalog\PercentOfOriginal',
-        'to_discount_value' => 'Webkul\Discount\Actions\Catalog\AdjustToDiscountValue'
-    ]
-];
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Config/rule-conditions.php b/packages/Webkul/Discount/src/Config/rule-conditions.php
deleted file mode 100644
index f12629492..000000000
--- a/packages/Webkul/Discount/src/Config/rule-conditions.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-return [
-    'test_mode' => [
-        'all_are_true' => 'All conditions are true',
-        'any_is_true' => 'Any condition is true',
-    ],
-
-    'cart' => [
-        'actions' => [
-            'fixed_amount' => 'Apply as fixed amount',
-            'percent_of_product' => 'Percentage of product',
-            'whole_cart_to_fixed' => 'Adjust whole cart to fixed amount',
-            'whole_cart_to_percent' => 'Adjust whole cart to percent'
-        ],
-
-        'validation' => [
-            0 => 'percent_of_product',
-            1 => 'fixed_amount',
-            2 => 'whole_cart_to_percent',
-            3 => 'whole_cart_to_fixed'
-        ],
-
-        'conditions' => [
-            'numeric' => [
-                '=' => 'Equals',
-                '>=' => 'Greater or equals',
-                '<=' => 'Lesser or equals',
-                '>' => 'Greater than',
-                '<' => 'Lesser than'
-            ],
-
-            'string' => [
-                '=' => 'Equals',
-                // '>=' => 'Greater or equals',
-                // '<=' => 'Lesser or equals',
-                // '>' => 'Greater than',
-                // '<' => 'Lesser than',
-                '{}' => 'Contains',
-                '!{}' => 'Does not contains'
-            ],
-
-            'boolean' => [
-                0 => 'True/Yes',
-                1 => 'False/No'
-            ],
-
-            'symbols' => [
-                '=' => 'equals',
-                '>=' => 'greater_or_equals',
-                '<=' => 'lesser_or_equals',
-                '>' => 'greater_than',
-                '<' => 'lesser_than',
-                '{}' => 'contains',
-                '={}' => 'is_one_of',
-                '!={}' => 'is_not_one_of',
-                '!{}' => 'does_not_contains'
-            ]
-        ],
-
-        'attributes' => [
-            0 => [
-                'code' => 'sub_total',
-                'name' => 'Sub Total',
-                'type' =>  'numeric'
-            ],
-            1 => [
-                'code' => 'total_items',
-                'name' => 'Total Items',
-                'type' => 'numeric'
-            ],
-            2 => [
-                'code' => 'total_weight',
-                'name' => 'Total Weight',
-                'type' => 'numeric'
-            ],
-            3 => [
-                'code' => 'shipping_method',
-                'name' => 'Shipping Method',
-                'type' => 'string'
-            ],
-            4 => [
-                'code' => 'payment_method',
-                'name' => 'Payment Method',
-                'type' => 'string'
-            ],
-            5 => [
-                'code' => 'shipping_postcode',
-                'name' => 'Shipping Postcode',
-                'type' => 'string'
-            ],
-            6 => [
-                'code' => 'shipping_state',
-                'name' => 'Shipping State',
-                'type' => 'string'
-            ],
-            7 => [
-                'code' => 'shipping_country',
-                'name' => 'Shipping Country',
-                'type' => 'string'
-            ],
-            8 => [
-                'code' => 'shipping_city',
-                'name' => 'Shipping City',
-                'type' => 'string'
-            ]
-        ]
-    ],
-
-    'catalog' => [
-        'actions' => [
-            'percent_of_original' => 'Percentage of product',
-            'fixed_amount' => 'Apply as fixed amount',
-            'final_price_to_percent' => 'Adjust price to percentage',
-            'to_discount_value' => 'Adjust price to given amount'
-        ],
-
-        'validation' => [
-            0 => 'percent_of_product',
-            1 => 'fixed_amount',
-            2 => 'buy_a_get_b',
-            3 => 'fixed_amount_cart'
-        ],
-
-        'conditions' => [
-            'numeric' => [
-                '=' => 'Equals',
-                '>=' => 'Greater or equals',
-                '<=' => 'Lesser or equals',
-                '>' => 'Greater than',
-                '<' => 'Lesser than',
-            ],
-
-            'string' => [
-                '=' => 'Equals',
-                '>=' => 'Greater or equals',
-                '<=' => 'Lesser or equals',
-                '>' => 'Greater than',
-                '<' => 'Lesser than',
-                '{}' => 'Contains',
-                '!{}' => 'Does not contains'
-            ],
-
-            'select' => [
-                '=' => 'Equals',
-                '{}' => 'Contains',
-                '!{}' => 'Does not contains'
-            ],
-
-            'multiselect' => [
-                '=' => 'Equals',
-                '{}' => 'Contains',
-                '!{}' => 'Does not contains'
-            ],
-
-            'boolean' => [
-                0 => 'True/Yes',
-                1 => 'False/No'
-            ],
-
-            'symbols' => [
-                '=' => 'equals',
-                '>=' => 'greater_or_equals',
-                '<=' => 'lesser_or_equals',
-                '>' => 'greater_than',
-                '<' => 'lesser_than',
-                '{}' => 'contains',
-                '={}' => 'is_one_of',
-                '!={}' => 'is_not_one_of',
-                '!{}' => 'does_not_contains'
-            ]
-        ]
-    ]
-];
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CartRule.php b/packages/Webkul/Discount/src/Contracts/CartRule.php
deleted file mode 100644
index c6da453eb..000000000
--- a/packages/Webkul/Discount/src/Contracts/CartRule.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CartRule
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CartRuleCart.php b/packages/Webkul/Discount/src/Contracts/CartRuleCart.php
deleted file mode 100644
index d3c3107f1..000000000
--- a/packages/Webkul/Discount/src/Contracts/CartRuleCart.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CartRuleCart
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CartRuleChannels.php b/packages/Webkul/Discount/src/Contracts/CartRuleChannels.php
deleted file mode 100644
index a9fa030cb..000000000
--- a/packages/Webkul/Discount/src/Contracts/CartRuleChannels.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CartRuleChannels
-{ }
diff --git a/packages/Webkul/Discount/src/Contracts/CartRuleCoupons.php b/packages/Webkul/Discount/src/Contracts/CartRuleCoupons.php
deleted file mode 100644
index 7fc099e69..000000000
--- a/packages/Webkul/Discount/src/Contracts/CartRuleCoupons.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CartRuleCoupons
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CartRuleCouponsUsage.php b/packages/Webkul/Discount/src/Contracts/CartRuleCouponsUsage.php
deleted file mode 100644
index da40587d7..000000000
--- a/packages/Webkul/Discount/src/Contracts/CartRuleCouponsUsage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CartRuleCouponsUsage
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CartRuleCustomerGroups.php b/packages/Webkul/Discount/src/Contracts/CartRuleCustomerGroups.php
deleted file mode 100644
index 4be6625f2..000000000
--- a/packages/Webkul/Discount/src/Contracts/CartRuleCustomerGroups.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CartRuleCustomerGroups
-{
-
-}
diff --git a/packages/Webkul/Discount/src/Contracts/CartRuleCustomers.php b/packages/Webkul/Discount/src/Contracts/CartRuleCustomers.php
deleted file mode 100644
index f6519b5df..000000000
--- a/packages/Webkul/Discount/src/Contracts/CartRuleCustomers.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CartRuleCustomers
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CartRuleLabels.php b/packages/Webkul/Discount/src/Contracts/CartRuleLabels.php
deleted file mode 100644
index 5ba25c2a4..000000000
--- a/packages/Webkul/Discount/src/Contracts/CartRuleLabels.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CartRuleLabels
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CatalogRule.php b/packages/Webkul/Discount/src/Contracts/CatalogRule.php
deleted file mode 100644
index 8892652c4..000000000
--- a/packages/Webkul/Discount/src/Contracts/CatalogRule.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CatalogRule
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CatalogRuleChannels.php b/packages/Webkul/Discount/src/Contracts/CatalogRuleChannels.php
deleted file mode 100644
index af4c6d690..000000000
--- a/packages/Webkul/Discount/src/Contracts/CatalogRuleChannels.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CatalogRuleChannels
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CatalogRuleCustomerGroups.php b/packages/Webkul/Discount/src/Contracts/CatalogRuleCustomerGroups.php
deleted file mode 100644
index 6b354bbda..000000000
--- a/packages/Webkul/Discount/src/Contracts/CatalogRuleCustomerGroups.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CatalogRuleCustomerGroups
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Contracts/CatalogRuleProducts.php b/packages/Webkul/Discount/src/Contracts/CatalogRuleProducts.php
deleted file mode 100644
index a84d4b783..000000000
--- a/packages/Webkul/Discount/src/Contracts/CatalogRuleProducts.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CatalogRuleProducts
-{
-
-}
diff --git a/packages/Webkul/Discount/src/Contracts/CatalogRuleProductsPrice.php b/packages/Webkul/Discount/src/Contracts/CatalogRuleProductsPrice.php
deleted file mode 100644
index e82cb0428..000000000
--- a/packages/Webkul/Discount/src/Contracts/CatalogRuleProductsPrice.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Contracts;
-
-interface CatalogRuleProductsPrice
-{
-
-}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_16_094238_create_cart_rule_labels_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_16_094238_create_cart_rule_labels_table.php
deleted file mode 100644
index de1b43599..000000000
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_16_094238_create_cart_rule_labels_table.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateCartRuleLabelsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('cart_rule_labels', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('channel_id')->unsigned()->nullable();
-            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
-            $table->integer('locale_id')->unsigned()->nullable();
-            $table->foreign('locale_id')->references('id')->on('locales')->onDelete('cascade');
-            $table->integer('cart_rule_id')->unsigned()->nullable();
-            $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
-            $table->text('label')->nullable();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('cart_rule_labels');
-    }
-}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php
deleted file mode 100644
index 60f23900e..000000000
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_05_24_113949_create_cart_rule_coupons_usage_table.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateCartRuleCouponsUsageTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('cart_rule_coupons_usage', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('coupon_id')->unsigned();
-            $table->foreign('coupon_id')->references('id')->on('cart_rules')->onDelete('cascade');
-            $table->integer('channel_id')->unsigned();
-            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
-            $table->integer('customer_id')->unsigned();
-            $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade');
-            $table->bigInteger('usage')->unsigned()->default(0);
-            $table->date('expired_on');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('cart_rule_coupons_usage');
-    }
-}
diff --git a/packages/Webkul/Discount/src/Helpers/Cart/ConvertXToProductId.php b/packages/Webkul/Discount/src/Helpers/Cart/ConvertXToProductId.php
deleted file mode 100644
index 9c49d609b..000000000
--- a/packages/Webkul/Discount/src/Helpers/Cart/ConvertXToProductId.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Helpers\Cart;
-
-use Webkul\Discount\Repositories\CartRuleRepository as CartRule;
-use Webkul\Attribute\Repositories\AttributeRepository;
-use Webkul\Attribute\Repositories\AttributeOptionRepository;
-use Webkul\Category\Repositories\CategoryRepository as Category;
-use Webkul\Product\Repositories\ProductRepository as Product;
-use Webkul\Product\Models\ProductAttributeValue;
-
-class ConvertXToProductId
-{
-    /**
-     * CategoryRepository instance
-     */
-    protected $category;
-
-    /**
-     * AttributeRepository instance
-     */
-    protected $attribute;
-
-    /**
-     * ProductRepository instance
-     */
-    protected $product;
-
-     /**
-      * AttributeOptionRepository instance
-      */
-    protected $attributeOptionRepository;
-
-    /**
-     * CartRuleRepository instance
-     */
-    protected $cartRule;
-
-    /**
-     * ProductAttributeValueRepository instance
-     */
-    protected $pav;
-
-    /**
-     * Condition symbols for matching the criteria with attributes selected
-     */
-    protected $symbols;
-
-    public function __construct(
-        Category $category,
-        AttributeRepository $attributeRepository,
-        Product $product,
-        AttributeOptionRepository $attributeOptionRepository,
-        CartRule $cartRule,
-        ProductAttributeValue $pav
-    )
-    {
-        $this->category = $category;
-
-        $this->attribute = $attributeRepository;
-
-        $this->product = $product;
-
-        $this->attributeOptionRepository = $attributeOptionRepository;
-
-        $this->cartRule = $cartRule;
-
-        $this->pav = $pav;
-
-        $this->conditionSymbols = config('pricerules.cart.conditions.symbols');
-    }
-
-    /**
-     * Collects the attribute and category conditions
-     *
-     * @param Integer $ruleId
-     *
-     * @param Object $attrribute_conditions
-     */
-    public function convertX($ruleId, $attribute_conditions)
-    {
-        $attributeConditions = $attribute_conditions;
-
-        $categoryValues = $attributeConditions->categories ?? null;
-
-        $attributeValues = $attributeConditions->attributes ?? null;
-
-        if (! isset($categoryValues) && ! isset($attributeValues))
-            return false;
-
-        $categoryResult = collect();
-
-        if (isset($categoryValues) && count($categoryValues))
-            $categoryResult = $this->convertFromCategories($categoryValues);
-
-        $attributeResult = collect();
-
-        if (isset($attributeValues) && count($attributeValues))
-            $attributeResult = $this->convertFromAttributes($attributeValues);
-
-        // now call the function that will find all the unique product ids
-        $productIDs = $this->findAllUniqueIds($attributeResult, $categoryResult);
-
-        // save the product ids against the cart rules
-        return $this->saveIDs($ruleId, $productIDs) ? true : false;
-    }
-
-    /**
-     * This method will return product id from the attribute and attribute option params
-     *
-     * @return array
-     */
-    public function convertFromAttributes($attributeOptions)
-    {
-        $products = collect();
-
-        foreach ($attributeOptions as $attributeOption) {
-            $selectedOptions = $attributeOption->value;
-
-            if ($attributeOption->type == 'select' || $attributeOption->type == 'multiselect') {
-                $attribute = $this->attribute->findWhere(['code' => $attributeOption->attribute]);
-
-                $attributeOptions = $attribute->first()->options;
-
-                $selectedAttributeOptions = collect();
-
-                foreach ($attributeOptions as $attributeOption) {
-                    foreach ($selectedOptions as $key => $value) {
-                        if ($attributeOption->id == $value)
-                            $selectedAttributeOptions->push($attributeOption);
-                    }
-                }
-
-                foreach($selectedAttributeOptions as $selectedAttributeOption) {
-                    $typeColumn = $this->pav::$attributeTypeFields[$attribute->first()->type];
-
-                    $pavResults = $this->pav->where(
-                        "{$typeColumn}", $selectedAttributeOption->id
-                    )->get();
-
-                    foreach ($pavResults as $pavResult) {
-                        if ($pavResult->product->type == 'simple')
-                            $products->push($pavResult->product);
-                    }
-                }
-            } else {
-                $attribute = $this->attribute->findWhere([
-                    'code' => $attributeOption->attribute
-                ]);
-
-                $pavValues = $attribute->first();
-
-                $selectedAttributeValues = collect();
-
-                $foundProducts = collect();
-
-                if ($attributeOption->attribute == 'sku') {
-                    $testValue = $attributeOption->value;
-                    $testCondition = $attributeOption->condition;
-
-                    if ($testCondition == '{}') {
-                        $foundProducts = $this->product->findWhere([
-                            ['sku', 'like', '%'.$testValue.'%'],
-                        ])->flatten()->all();
-                    } else if ($testCondition == '!{}') {
-                        $foundProducts = $this->product->findWhere([
-                            ['sku', 'not like', '%'.$testValue.'%'],
-                        ])->flatten()->all();
-                    } else if ($testCondition == '=') {
-                        $foundProducts = $this->product->findWhere([
-                            ['sku', '=', $testValue],
-                        ])->flatten()->all();
-                    }
-                }
-
-                foreach($foundProducts as $foundProduct) {
-                    $products->push($foundProduct);
-                }
-            }
-        }
-
-        return $products;
-    }
-
-    /**
-     * This method will return product id from the attribute and attribute option params
-     *
-     * @param Collection $categories
-     *
-     * @return array
-     */
-    public function convertFromCategories($categories)
-    {
-        $products = collect();
-
-        foreach ($categories as $category) {
-            $data = $this->getAll($category->id);
-
-            if ($data->count()) {
-                $products->push($data);
-
-                unset($data);
-            }
-        }
-
-        return $products->flatten()->all();
-    }
-
-    /**
-     * This method will remove the duplicates from the array and merge all the items into single array
-     *
-     * @param array
-     *
-     * @return array
-     */
-    public function findAllUniqueIds(...$data)
-    {
-        $attributeResult = $data[0] ?? collect();
-        $categoryResult = $data[1] ?? collect();
-
-        // find matched attribute options product ids
-        $mergedCollection = $attributeResult->merge($categoryResult);
-
-        $productIDs = collect();
-
-        foreach ($mergedCollection as $merged) {
-            $productIDs->push($merged->id);
-        }
-
-        // find all the unique product ids
-        return $productIDs->unique()->flatten()->all();
-    }
-
-    /**
-     * This method will save the product ids in the datastore
-     *
-     * @param integer $ruleId
-     *
-     * @param array $productIDs
-     *
-     * @return boolean
-     */
-    public function saveIDs($ruleId, $productIDs)
-    {
-        $cartRule = $this->cartRule->find($ruleId);
-
-        $productIDs = implode(',', $productIDs);
-
-        return $cartRule->update(['product_ids' => $productIDs]);
-    }
-
-    /**
-     * To get all product ids lying in the criteria
-     *
-     * @param integer $categoryId
-     *
-     * @return Collection
-     */
-    public function getAll($categoryId = null)
-    {
-        return app('Webkul\Product\Repositories\ProductFlatRepository')->scopeQuery(function($query) use($categoryId) {
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
-
-            $locale = request()->get('locale') ?: app()->getLocale();
-
-            $qb = $query->distinct()
-                    ->addSelect('product_flat.*')
-                    ->leftJoin('products', 'product_flat.product_id', '=', 'products.id')
-                    ->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id')
-                    ->where('product_flat.channel', $channel)
-                    ->where('product_flat.locale', $locale)
-                    ->whereNotNull('product_flat.url_key');
-
-            if ($categoryId)
-                $qb->where('product_categories.category_id', $categoryId);
-
-                $qb->where('product_flat.status', 1);
-
-                $qb->where('product_flat.visible_individually', 1);
-
-            $queryBuilder = $qb->leftJoin('product_flat as flat_variants', function($qb) use($channel, $locale) {
-                $qb->on('product_flat.id', '=', 'flat_variants.parent_id')
-                    ->where('flat_variants.channel', $channel)
-                    ->where('flat_variants.locale', $locale);
-            });
-
-            $qb = $qb->leftJoin('products as variants', 'products.id', '=', 'variants.parent_id');
-
-            return $qb->groupBy('product_flat.id');
-        })->get();
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php
deleted file mode 100644
index 892bcd14e..000000000
--- a/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Helpers\Cart;
-
-use Webkul\Discount\Helpers\Cart\Discount;
-use Cart;
-
-class CouponAbleRule extends Discount
-{
-    /**
-     * Applies the non couponable rule on the current cart instance
-     *
-     * @param String $code
-     *
-     * @return mixed
-     */
-    public function apply($code)
-    {
-        $this->validateIfAlreadyApplied();
-
-        $rules = $this->getApplicableRules($code);
-
-        if ($rules->count() == 1) {
-            $rule = $rules->first();
-
-            $canApply = $this->canApply($rule);
-
-            if ($canApply) {
-                $this->save($rule);
-
-                $this->updateCartItemAndCart($rule);
-
-                return true;
-            }
-        } else {
-            return false;
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes the already applied coupon on the current cart instance
-     *
-     * @return boolean
-     */
-    public function remove()
-    {
-        $cart = Cart::getCart();
-
-        $existingRule = $this->cartRuleCart->findWhere(['cart_id' => $cart->id]);
-
-        $this->clearDiscount();
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Cart/Discount.php b/packages/Webkul/Discount/src/Helpers/Cart/Discount.php
deleted file mode 100644
index 415a6b657..000000000
--- a/packages/Webkul/Discount/src/Helpers/Cart/Discount.php
+++ /dev/null
@@ -1,994 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Helpers\Cart;
-
-use Webkul\Discount\Repositories\CartRuleRepository as CartRule;
-use Webkul\Checkout\Repositories\CartItemRepository as CartItem;
-use Webkul\Discount\Repositories\CartRuleCartRepository as CartRuleCart;
-use Carbon\Carbon;
-use Cart;
-
-abstract class Discount
-{
-    /**
-     * To hold the cart rule repository instance
-     */
-    protected $cartRule;
-
-    /**
-     * To hold the cart rule cart repository instance
-     */
-    protected $cartRuleCart;
-
-    /**
-     * To hold if end rules are present or not.
-     */
-    protected $endRuleActive = false;
-
-    /**
-     * To hold the rule classes
-     */
-    protected $rules;
-
-    /**
-     * To hold the cartitem repository instance
-     */
-    protected $cartItem;
-
-    /**
-     * To set the percentage columns or not
-     */
-    protected $setPercentages;
-
-    public function __construct(
-        CartRule $cartRule,
-        CartRuleCart $cartRuleCart,
-        CartItem $cartItem
-    )
-    {
-        $this->cartRule = $cartRule;
-
-        $this->cartRuleCart = $cartRuleCart;
-
-        $this->cartItem = $cartItem;
-
-        $this->rules = config('discount-rules');
-    }
-
-    /**
-     * Abstract method apply
-     */
-    abstract public function apply($code);
-
-    /**
-     * To find all the suitable rules that can be applied on the current cart
-     *
-     * @return collection $rules
-     */
-    public function getApplicableRules($code = null)
-    {
-        $rules = collect();
-
-        if ($code != null) {
-            $eligibleRules = $this->cartRule->findWhere(['use_coupon' => 1, 'status' => 1]);
-
-            foreach($eligibleRules as $rule) {
-                if ($rule->coupons->code == $code) {
-                    $rules->push($rule);
-
-                    break;
-                }
-            }
-        } else {
-            $rules = $this->cartRule->findWhere(['use_coupon' => 0, 'status' => 1]);
-        }
-
-        $filteredRules = collect();
-
-        // time based constraints
-        foreach ($rules as $rule) {
-            if ($this->checkApplicability($rule)) {
-                if ($rule->starts_from != null && $rule->ends_till == null) {
-                    if (Carbon::parse($rule->starts_from) < now()) {
-                        $rule->impact = $this->calculateImpact($rule);
-
-                        $filteredRules->push($rule);
-                    }
-                } else if ($rule->starts_from == null && $rule->ends_till != null) {
-                    if (Carbon::parse($rule->ends_till) > now()) {
-                        $rule->impact = $this->calculateImpact($rule);
-
-                        $filteredRules->push($rule);
-                    }
-                } else if ($rule->starts_from != null && $rule->ends_till != null) {
-                    if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till)) {
-                        $rule->impact = $this->calculateImpact($rule);
-
-                        $filteredRules->push($rule);
-                    }
-                } else {
-                    $rule->impact = $this->calculateImpact($rule);
-
-                    $filteredRules->push($rule);
-                }
-            }
-        }
-
-        return $filteredRules;
-    }
-
-    /**
-     * To find that one rule that is going to be applied on the current cart
-     *
-     * @param Collection $rules
-     *
-     * @return CartRule $rule
-     */
-    public function breakTie($rules)
-    {
-        $result = $this->sortByLeastPriority($rules);
-
-        if (count($result) > 1) {
-            // check for max impact criteria
-            if (count($result) > 1) {
-                $result = $this->findMaxImpact($result);
-
-                if (count($result) > 1) {
-                    $result = $this->findOldestRule($result);
-
-                    return $result;
-                } else if (count($result) == 1) {
-                    return $result->first();
-                } else {
-                    return collect();
-                }
-            } else if (count($result) == 1) {
-                return $result->first();
-            } else {
-                return collect();
-            }
-        } else if (count($result) == 1) {
-            return $result->first();
-        } else {
-            return collect();
-        }
-
-        return collect();
-    }
-
-    /**
-     * To find the oldes rule
-     *
-     * @param Collection $rules
-     *
-     * @return CartRule $oldestRule
-     */
-    public function findOldestRule($rules)
-    {
-        $leastID = 999999999999;
-
-        foreach ($rules as $index => $rule) {
-            if ($rule->id < $leastID) {
-                $leastID = $rule->id;
-                $oldestRule = $rule;
-            }
-        }
-
-        return $oldestRule;
-    }
-
-    /**
-     * To sort the rules by the least priority
-     *
-     * @param Collection $rules
-     *
-     * @return Collection $rule
-     */
-    public function sortByLeastPriority($rules)
-    {
-        $sortedRules = collect();
-
-        $minPriority = $rules->min('priority');
-
-        foreach ($rules as $rule) {
-            if ($rule->priority == $minPriority)
-                $sortedRules->push($rule);
-        }
-
-        return $sortedRules;
-    }
-
-    /**
-     * To check where rule ends other rules
-     *
-     * @param CartRule $rule
-     *
-     * @return $rule
-     */
-    public function isEndRule($rule)
-    {
-        if ($rule->end_other_rules) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * To find whether rule can be applied or not
-     *
-     * @param CartRule $rule
-     *
-     * @return boolean
-     */
-    public function canApply($rule)
-    {
-        $cart = \Cart::getCart();
-
-        $alreadyApplied = $this->cartRuleCart->findWhere(['cart_id' => $cart->id]);
-
-        if ($alreadyApplied->count() && $alreadyApplied->first()->cart_rule->id == $rule->id) {
-            if ($this->validateRule($alreadyApplied->first()->cart_rule)) {
-                $this->reassess($alreadyApplied->first()->cart_rule, $cart);
-
-                return false;
-            } else {
-                $this->clearDiscount();
-
-                return true;
-            }
-        } else if ($alreadyApplied->count() && $alreadyApplied->first()->cart_rule->id != $rule->id && ! $alreadyApplied->first()->cart_rule->end_other_rules) {
-            if ($rule->use_coupon) {
-                if ($alreadyApplied->first()->cart_rule->use_coupon) {
-                    $rules = collect();
-
-                    $alreadyAppliedRule = $alreadyApplied->first()->cart_rule;
-                    $alreadyAppliedRule->impact = $this->calculateImpact($alreadyAppliedRule);
-
-                    $rule->impact = $this->calculateImpact($alreadyAppliedRule);
-
-                    $rules->push($alreadyAppliedRule);
-                    $rules->push($rule);
-
-                    $result = $this->breakTie($rules);
-
-                    if ($result->id == $rule->id) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    return true;
-                }
-            } else {
-                // this case will work when non couponable rule is applied and another non couponable rule is created
-                // again break tie
-                $rules = collect();
-
-                $alreadyAppliedRule = $alreadyApplied->first()->cart_rule;
-                $alreadyAppliedRule->impact = $this->calculateImpact($alreadyAppliedRule);
-
-                $rule->impact = $this->calculateImpact($alreadyAppliedRule);
-
-                $rules->push($alreadyAppliedRule);
-                $rules->push($rule);
-
-                $result = $this->breakTie($rules);
-
-                if ($result) {
-                    if ($result->id != $rule->id) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
-            }
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * To reassess the discount in case no. of items gets changed
-     *
-     * @return Void
-     */
-    public function reassess($rule)
-    {
-        $rule->impact = $this->calculateImpact($rule);
-
-        $this->updateCartItemAndCart($rule);
-
-        return $rule;
-    }
-
-    /**
-     * To return cart rule which has the max impact
-     *
-     * @param Collection $rules
-     *
-     * @return Collection $rule
-     */
-    public function findMaxImpact($rules)
-    {
-        $maxImpact = collect();
-
-        $maxDiscount = 0;
-
-        if ($rules->count()) {
-            $maxDiscount = $rules->max('impact.discount');
-
-            foreach ($rules as $rule) {
-                if ($rule->impact->discount == $maxDiscount)
-                    $maxImpact = $maxImpact->push($rule);
-            }
-        } else {
-            return collect();
-        }
-
-        return $maxImpact;
-    }
-
-    /**
-     * To calculate the impact of the rule
-     *
-     * @return collection
-     */
-    public function calculateImpact($rule)
-    {
-        $impact = $this->getActionInstance($rule);
-
-        $outcome = $impact->calculate($rule);
-
-        return $outcome;
-    }
-
-    /**
-     * Return the instance of the related rule's action type
-     *
-     * @param CartRule $rule
-     *
-     * @return Object
-     */
-    public function getActionInstance($rule)
-    {
-        $this->rules = config('discount-rules');
-
-        $actionType = new $this->rules['cart'][$rule->action_type]($rule);
-
-        return $actionType;
-    }
-
-    /**
-     * Checks whether rules is getting applied on current cart instance or not
-     *
-     * @param CartRule $rule
-     *
-     * @return Boolean
-     */
-    public function checkApplicability($rule)
-    {
-        $cart = \Cart::getCart();
-
-        $timeBased = false;
-
-        $channelBased = false;
-
-        // time based constraints
-        if ($rule->starts_from != null && $rule->ends_till == null) {
-            if (Carbon::parse($rule->starts_from) < now())
-                $timeBased = true;
-        } else if ($rule->starts_from == null && $rule->ends_till != null) {
-            if (Carbon::parse($rule->ends_till) > now())
-                $timeBased = true;
-        } else if ($rule->starts_from != null && $rule->ends_till != null) {
-            if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till))
-                $timeBased = true;
-        } else {
-            $timeBased = true;
-        }
-
-        // channel based constraints
-        foreach ($rule->channels as $channel) {
-            if ($channel->channel_id == core()->getCurrentChannel()->id)
-                $channelBased = true;
-        }
-
-        $customerGroupBased = false;
-
-        // customer groups based constraints
-        if (auth()->guard('customer')->check()) {
-            foreach ($rule->customer_groups as $customer_group) {
-                if (auth()->guard('customer')->user()->group->exists()) {
-                    if ($customer_group->customer_group_id == auth()->guard('customer')->user()->group->id)
-                        $customerGroupBased = true;
-                }
-            }
-        } else {
-            foreach ($rule->customer_groups as $customer_group) {
-                if ($customer_group->customer_group->code == 'guest')
-                    $customerGroupBased = true;
-            }
-        }
-
-        $conditionsBased = true;
-
-        //check conditions
-        if ($rule->conditions != null) {
-            $conditions = json_decode(json_decode($rule->conditions));
-
-            $test_mode = array_last($conditions);
-
-            if ($test_mode->criteria == 'any_is_true')
-                $conditionsBased = $this->testIfAnyConditionIsTrue($conditions, $cart);
-
-            if ($test_mode->criteria == 'all_are_true')
-                $conditionsBased = $this->testIfAllConditionAreTrue($conditions, $cart);
-        }
-
-        $partialMatch = 0;
-
-        if ($rule->uses_attribute_conditions) {
-            $productIDs = explode(',', $rule->product_ids);
-
-            foreach ($productIDs as $productID) {
-                foreach ($cart->items as $item) {
-                    if ($item->product_id == $productID)
-                        $partialMatch = 1;
-                }
-
-                $childrens = $item->children;
-
-                foreach ($childrens as $children) {
-                    if ($children->product_id == $productID)
-                        $partialMatch = 1;
-                }
-            }
-        }
-
-        if ($channelBased && $customerGroupBased && $timeBased && $conditionsBased) {
-            if ($rule->uses_attribute_conditions == 1 && $partialMatch) {
-                return true;
-            } else if ($rule->uses_attribute_conditions == 0) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Save the rule in the CartRule for current cart instance
-     *
-     * @param CartRule $rule
-     *
-     * @return Boolean
-     */
-    public function save($rule)
-    {
-        $cart = \Cart::getCart();
-
-        $alreadyApplied = $this->cartRuleCart->findWhere(['cart_id' => $cart->id]);
-
-        if ($alreadyApplied->count()) {
-            $result = $alreadyApplied->first()->update(['cart_rule_id' => $rule->id]);
-        } else {
-            $result = $this->cartRuleCart->create(['cart_id' => $cart->id, 'cart_rule_id' => $rule->id]);
-        }
-
-        return $result ? true : false;
-    }
-
-    /**
-     * Apply on shipping
-     *
-     * @param CartRule $apploedRule
-     *
-     * @param Cart $cart
-     *
-     * @return void
-     */
-    public function applyOnShipping($appliedRule, $cart)
-    {
-        $cart = \Cart::getCart();
-
-        if (isset($cart->selected_shipping_rate)) {
-            if ($appliedRule->free_shipping && $cart->selected_shipping_rate->base_price > 0) {
-                $cart->selected_shipping_rate->update(['price' => 0, 'base_price' => 0]);
-            } else if ($appliedRule->free_shipping == 0 && $appliedRule->apply_to_shipping && $cart->selected_shipping_rate->base_price > 0) {
-                $actionType = config('discount-rules')[$appliedRule->action_type];
-
-                if ($appliedRule->apply_to_shipping) {
-                    $actionInstance = new $actionType;
-
-                    $discountOnShipping = $actionInstance->calculateOnShipping($cart);
-
-                    $discountOnShipping = ($discountOnShipping / 100) * $cart->selected_shipping_rate->base_price;
-
-                    $cart->selected_shipping_rate->update([
-                        'price' => $cart->selected_shipping_rate->price - core()->convertPrice($discountOnShipping, $cart->cart_currency_code),
-                        'base_price' => $cart->selected_shipping_rate->base_price - $discountOnShipping
-                    ]);
-                }
-            }
-        }
-    }
-
-    /**
-     * Resets the shipping for the current items in the cart
-     *
-     * @param Cart $cart
-     *
-     * @return Void
-     */
-    public function resetShipping($cart)
-    {
-        $cart = \Cart::getCart();
-
-        if (isset($cart->selected_shipping_rate->carrier)) {
-            $shippingRate = config('carriers')[$cart->selected_shipping_rate->carrier]['class'];
-
-            $actualShippingRate = new $shippingRate;
-            $actualShippingRate = $actualShippingRate->calculate();
-
-            if (is_array($actualShippingRate)) {
-                foreach($actualShippingRate as $actualRate) {
-                    if ($actualRate->method == $cart->selected_shipping_rate->method) {
-                        $actualShippingRate = $actualRate;
-
-                        break;
-                    }
-                }
-            }
-
-            $actualShippingPrice = $actualShippingRate->price;
-            $actualShippingBasePrice = $actualShippingRate->base_price;
-            $cartShippingRate = $cart->selected_shipping_rate;
-
-            $cartShippingRate->update(['price' => $actualShippingPrice, 'base_price' => $actualShippingBasePrice]);
-        }
-    }
-
-    /**
-     * Update discount for least worth item
-     *
-     * @param CartRule $rule
-     *
-     * @return Boolean
-     */
-    public function updateCartItemAndCart($rule)
-    {
-        $cart = Cart::getCart();
-
-        $itemImpacts = $rule->impact;
-
-        foreach ($itemImpacts as $itemImpact) {
-            $item = $this->cartItem->findOneWhere(['id' => $itemImpact['item_id']]);
-
-            if (isset($itemImpact['child_items']) && $itemImpact['child_items']->count()) {
-                $totalItemDiscount = 0.0000;
-
-                foreach ($itemImpact['child_items'] as $child) {
-                    $discount = $child->discount;
-
-                    $totalItemDiscount = $totalItemDiscount + $discount;
-
-                    unset($child->discount);
-
-                    $child->update([
-                        'discount_amount' => core()->convertPrice($discount, $cart->cart_currency_code),
-                        'base_discount_amount' => $discount
-                    ]);
-
-                    if ($rule->action_type == 'percent_of_product') {
-                        $child->update(['discount_percent' => $rule->discount_amount]);
-                    }
-
-                    if ($rule->use_coupon) {
-                        $coupon = $rule->coupons->code;
-
-                        $child->update(['coupon_code' => $coupon]);
-                    }
-
-                    $this->updateParent($child, $totalItemDiscount, $cartCurrencyCode = $cart->cart_currency_code);
-                }
-            } else {
-                $item->update([
-                    'discount_amount' => core()->convertPrice($itemImpact['discount'], $cart->cart_currency_code),
-                    'base_discount_amount' => $itemImpact['discount']
-                ]);
-
-                if ($rule->action_type == 'percent_of_product') {
-                    $item->update(['discount_percent' => $rule->discount_amount]);
-                }
-
-                if ($rule->use_coupon) {
-                    $coupon = $rule->coupons->code;
-
-                    $item->update(['coupon_code' => $coupon]);
-                }
-            }
-        }
-
-        if ($rule->use_coupon) {
-            $cart->update(['coupon_code' => $rule->coupons->code]);
-        }
-
-        // if ($rule->free_shipping || $rule->apply_on_shipping) {
-        //     $this->applyOnShipping($rule);
-        // }
-
-        Cart::collectTotals();
-
-        return true;
-    }
-
-    /**
-     * To update the discount on parent CartItem
-     */
-    private function updateParent($item, $discount, $currencyCode)
-    {
-        $parentItem = $this->cartItem->findOneWhere(['id' => $item->parent_id]);
-
-        $parentItem->update([
-            'base_discount_amount' => $discount,
-            'discount_amount' => core()->convertPrice($discount, $currencyCode)
-        ]);
-    }
-
-    /**
-     * Removes any cart rule from the current cart instance
-     *
-     * @return Boolean
-     */
-    public function clearDiscount()
-    {
-        $cart = Cart::getCart();
-
-        $cartItems = $cart->items;
-
-        // remove all the discount properties from items
-        foreach ($cartItems as $item) {
-            $item->update([
-                'coupon_code' => NULL,
-                'discount_percent' => 0,
-                'discount_amount' => 0,
-                'base_discount_amount' => 0
-            ]);
-        }
-
-        // remove all the discount properties from cart
-        $cart->update([
-            'coupon_code' => NULL,
-            'discount_amount' => 0,
-            'base_discount_amount' => 0
-        ]);
-
-        // find & remove cart rule from cart rule cart resource
-        $cartRuleCart = $this->cartRuleCart->findWhere(['cart_id' => $cart->id]);
-
-        $cartRuleCart->first()->delete();
-
-        return true;
-    }
-
-    /**
-     * Validate the currently applied cart rule
-     *
-     * @param CartRule $rule
-     *
-     * @return Boolean
-     */
-    public function validateRule($rule)
-    {
-        $applicability = $this->checkApplicability($rule);
-
-        if ($applicability && $rule->status) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Will validate already applied rule
-     *
-     * @return Void
-     */
-    public function validateIfAlreadyApplied()
-    {
-        $cart = \Cart::getCart();
-
-        $alreadyAppliedRule = $this->cartRuleCart->findWhere(['cart_id' => $cart->id]);
-
-        if ($alreadyAppliedRule->count()) {
-            $alreadyAppliedCartRule = $alreadyAppliedRule->first()->cart_rule;
-
-            $result = $this->validateRule($alreadyAppliedCartRule);
-
-            if (! $result) {
-                $this->clearDiscount();
-
-                $alreadyAppliedRule->first()->delete();
-            } else {
-                $this->reassess($alreadyAppliedCartRule);
-            }
-        }
-    }
-
-    /**
-     * Retreives all the payment methods from application config
-     *
-     * @return Array
-     */
-    public function getPaymentMethods()
-    {
-        $paymentMethods = config('paymentmethods');
-
-        return $paymentMethods;
-    }
-
-    /**
-     * Retreives all the shippin methods from the application config
-     *
-     * @return array
-     */
-    public function getShippingMethods()
-    {
-        $shippingMethods = config('carriers');
-
-        return $shippingMethods;
-    }
-
-    /**
-     * Checks the rule against the current cart instance whether rule conditions are applicable
-     * or not
-     *
-     * @param Array $conditions
-     *
-     * @param Cart $cart
-     *
-     * @return Boolean
-     */
-    protected function testIfAllConditionAreTrue($conditions, $cart)
-    {
-        $paymentMethods = $this->getPaymentMethods();
-
-        $shippingMethods = $this->getShippingMethods();
-
-        array_pop($conditions);
-
-        $shipping_address = $cart->getShippingAddressAttribute() ?? null;
-
-        $shipping_method = $cart->selected_shipping_rate->method_title ?? null;
-
-        $shipping_country = $shipping_address->country ?? null;
-
-        $shipping_state = $shipping_address->state ?? null;
-
-        $shipping_postcode = $shipping_address->postcode ?? null;
-
-        $shipping_city = $shipping_address->city ?? null;
-
-        $payment_method = isset($cart->payment) ? $paymentMethods[$cart->payment->method]['title'] : null;
-
-        $sub_total = $cart->base_sub_total;
-
-        $total_items = $cart->items_qty;
-
-        $total_weight = 0;
-
-        foreach ($cart->items as $item) {
-            $total_weight = $total_weight + $item->base_total_weight;
-        }
-
-        $result = true;
-
-        foreach ($conditions as $condition) {
-            $result = true;
-
-            if (! isset($condition->attribute) || ! isset($condition->condition) || ! isset($condition->value) || ! isset($condition->type) || ! $condition->value != []) {
-                $result = false;
-
-                continue;
-            }
-
-            if (isset($condition->attribute)) {
-                $actual_value = ${$condition->attribute};
-            } else {
-                $result = false;
-            }
-
-            if (isset($condition->value)) {
-                $test_value = $condition->value;
-
-            } else {
-                $result = false;
-            }
-
-            if (isset($condition->condition)) {
-                $test_condition = $condition->condition;
-            }
-            else {
-                $result = false;
-            }
-
-            if ($condition->type == 'string') {
-                $actual_value = strtolower($actual_value);
-
-                $test_value = strtolower($test_value);
-            }
-
-            if ($test_condition == '=') {
-                if ($actual_value != $test_value) {
-                    $result = false;
-
-                    break;
-                }
-            } else if ($test_condition == '>=') {
-                if (! ($actual_value >= $test_value)) {
-                    $result = false;
-
-                    break;
-                }
-            } else if ($test_condition == '<=') {
-                if (! ($actual_value <= $test_value)) {
-                    $result = false;
-
-                    break;
-                }
-            } else if ($test_condition == '>') {
-                if (! ($actual_value > $test_value)) {
-                    $result = false;
-
-                    break;
-                }
-            } else if ($test_condition == '<') {
-                if (! ($actual_value < $test_value)) {
-                    $result = false;
-
-                    break;
-                }
-            } else if ($test_condition == '{}') {
-                if (! str_contains($actual_value, $test_value)) {
-                    $result = false;
-
-                    break;
-                }
-            } else if ($test_condition == '!{}') {
-                if (str_contains($actual_value, $test_value)) {
-                    $result = false;
-
-                    break;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Checks the rule against the current cart instance whether rule conditions are applicable
-     * or not
-     *
-     * @param Array $conditions
-     *
-     * @param Cart $cart
-     *
-     * @return Boolean
-     */
-    protected function testIfAnyConditionIsTrue($conditions, $cart)
-    {
-        $paymentMethods = $this->getPaymentMethods();
-
-        $shippingMethods = $this->getShippingMethods();
-
-        array_pop($conditions);
-
-        $result = false;
-
-        $shipping_address = $cart->getShippingAddressAttribute() ?? null;
-
-        $shipping_method = $cart->selected_shipping_rate->method_title ?? null;
-
-        $shipping_country = $shipping_address->country ?? null;
-
-        $shipping_state = $shipping_address->state ?? null;
-
-        $shipping_postcode = $shipping_address->postcode ?? null;
-
-        $shipping_city = $shipping_address->city ?? null;
-
-        $payment_method = isset($cart->payment) ? $paymentMethods[$cart->payment->method]['title'] : null;
-
-        $sub_total = $cart->base_sub_total;
-
-        $total_items = $cart->items_qty;
-
-        $total_weight = 0;
-
-        foreach($cart->items as $item) {
-            $total_weight = $total_weight + $item->base_total_weight;
-        }
-
-        foreach ($conditions as $condition) {
-            if (! isset($condition->attribute) || ! isset($condition->condition) || ! isset($condition->value)) {
-                continue;
-            }
-
-            if (isset($condition->attribute)) {
-                $actual_value = ${$condition->attribute};
-            } else {
-                $result = false;
-            }
-
-            if (isset($condition->value)) {
-                $test_value = $condition->value;
-            } else {
-                $result = false;
-            }
-
-            if (isset($condition->condition)) {
-                $test_condition = $condition->condition;
-            } else {
-                $result = false;
-            }
-
-            if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') {
-                if ($condition->type == 'string') {
-                    $actual_value = strtolower($actual_value);
-
-                    $test_value = strtolower($test_value);
-                }
-
-                if ($test_condition == '=') {
-                    if ($actual_value == $test_value) {
-                        $result = true;
-
-                        break;
-                    }
-                } else if ($test_condition == '>=') {
-                    if ($actual_value >= $test_value) {
-                        $result = true;
-
-                        break;
-                    }
-                } else if ($test_condition == '<=') {
-                    if ($actual_value <= $test_value) {
-                        $result = true;
-
-                        break;
-                    }
-                } else if ($test_condition == '>') {
-                    if ($actual_value > $test_value) {
-                        $result = true;
-
-                        break;
-                    }
-                } else if ($test_condition == '<') {
-                    if ($actual_value < $test_value) {
-                        $result = true;
-
-                        break;
-                    }
-                } else if ($test_condition == '{}') {
-                    if (str_contains($actual_value, $test_value)) {
-                        $result = true;
-
-                        break;
-                    }
-                } else if ($test_condition == '!{}') {
-                    if (! str_contains($actual_value, $test_value)) {
-                        $result = true;
-
-                        break;
-                    }
-                }
-            }
-        }
-
-        return $result;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php
deleted file mode 100644
index 713cce2d4..000000000
--- a/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Helpers\Cart;
-
-use Webkul\Discount\Helpers\Cart\Discount;
-
-class NonCouponAbleRule extends Discount
-{
-    /**
-     * Applies the non couponable rule on the current cart instance
-     *
-     * @param String $code
-     *
-     * @return mixed
-     */
-    public function apply($code = null)
-    {
-        $this->validateIfAlreadyApplied();
-
-        $rules = $this->getApplicableRules();
-
-        if ($rules->count() == 1) {
-            $rule = $rules->first();
-
-            $canApply = $this->canApply($rule);
-
-            if ($canApply && isset($rule->impact)) {
-                $result = $this->save($rule);
-
-                $this->updateCartItemAndCart($rule);
-            }
-        } else if ($rules->count() > 1) {
-            $rule = $this->breakTie($rules);
-
-            $canApply = $this->canApply($rule);
-
-            if ($canApply) {
-                $this->save($rule);
-
-                $this->updateCartItemAndCart($rule);
-            }
-        } else {
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php b/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php
deleted file mode 100644
index f6b0b68c3..000000000
--- a/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Helpers\Cart;
-
-use Webkul\Discount\Helpers\Cart\Discount;
-use Webkul\Discount\Repositories\CartRuleCartRepository as CartRuleCart;
-
-class ValidatesDiscount extends Discount
-{
-    public function apply($code)
-    {
-        return null;
-    }
-
-    /**
-     * Validates the currently applied cart rule on the current cart
-     *
-     * @param $cart instance
-     *
-     * @return mixed
-     */
-    public function validate()
-    {
-        $this->validateIfAlreadyApplied();
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Catalog/Apply.php b/packages/Webkul/Discount/src/Helpers/Catalog/Apply.php
deleted file mode 100644
index 95c8f22e0..000000000
--- a/packages/Webkul/Discount/src/Helpers/Catalog/Apply.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Helpers\Catalog;
-
-use Webkul\Discount\Repositories\CatalogRuleRepository as CatalogRule;
-use Webkul\Discount\Repositories\CatalogRuleProductsRepository as CatalogRuleProducts;
-use Webkul\Discount\Repositories\CatalogRuleProductsPriceRepository as CatalogRuleProductsPrice;
-use Webkul\Discount\Helpers\Catalog\ConvertXToProductId as ConvertX;
-use Webkul\Product\Helpers\ProductType;
-use Webkul\Product\Repositories\ProductRepository as Product;
-use Webkul\Discount\Helpers\Catalog\Sale;
-
-/**
- * Apply - Applies catalog rule to products intended in the rules
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright  2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class Apply extends Sale
-{
-    /**
-     * To hold the catalog rule repository instance
-     */
-    protected $catalogRule;
-
-    /**
-     * To maintain the list of deceased rules and remove their records if present
-     */
-    protected $activeRules;
-
-    /**
-     * To maintain the list of deceased rules and remove their records if present
-     */
-    protected $deceased;
-
-    /**
-     * Holds convertXToProductId instance
-     */
-    protected $convertX;
-
-    /**
-     * Hold catalog rule products repository instance
-     */
-    protected $catalogRuleProduct;
-
-    /**
-     * Hold catalog rule products price repository instance
-     */
-    protected $catalogRuleProductPrice;
-
-    /**
-     * Hold ProductRepository instance
-     */
-    protected $product;
-
-    /**
-     * To hold the rule classes
-     */
-    protected $rules;
-
-    /**
-     * @param CatalogRule $catalogRule
-     */
-    public function __construct(
-        CatalogRule $catalogRule,
-        ConvertX $convertX,
-        CatalogRuleProducts $catalogRuleProduct,
-        CatalogRuleProductsPrice $catalogRuleProductPrice,
-        Product $product
-    ) {
-        $this->catalogRule = $catalogRule;
-
-        $this->convertX = $convertX;
-
-        $this->catalogRuleProduct = $catalogRuleProduct;
-
-        $this->catalogRuleProductPrice = $catalogRuleProductPrice;
-
-        $this->product = $product;
-
-        $this->active = collect();
-
-        $this->activeRules = collect();
-
-        $this->deceased = collect();
-
-        $this->rules = config('discount-rules.catalog');
-    }
-
-    /**
-     * To apply the new catalog rules and sync previous rules changes,
-     */
-    public function apply()
-    {
-        $rules = $this->catalogRule->all();
-
-        foreach ($rules as $rule) {
-            $validated = $this->checkApplicability($rule);
-
-            if ($validated) {
-                $this->active->push($rule->id);
-
-                $this->activeRules->push($rule);
-            } else {
-                $this->deceased->push($rule->id);
-            }
-        }
-
-        if ($this->active->count()) {
-            $productIDs = array();
-
-            foreach ($this->activeRules as $rule) {
-                $productIDs = $this->getProductIds($rule);
-
-                if ($productIDs) {
-                    $productIDs = $this->expandProducts($productIDs);
-
-                    $this->setSale($rule, $productIDs);
-                }
-            }
-        } else {
-            // handle the deceased rules here or call the declutter handler over here
-            // dd($this->deceased);
-        }
-    }
-
-    /**
-     * To set the sale price for products falling catalog rule criteria
-     *
-     * @param CatalogRule $catalogRule
-     *
-     * @return Void
-     */
-    public function setSale($rule, $productIDs)
-    {
-        if (is_array($productIDs)) {
-            // apply on selected products
-            foreach ($productIDs as $productID) {
-                // catalog rule product resource is updated here
-                $this->createOrUpdateCatalogRuleProduct($rule, $productID);
-
-                // catalog rule product price resource is updated here
-                $this->createOrUpdateCatalogRuleProductPrice($rule, $productID);
-            }
-        } else if ($productIDs == '*') {
-            $this->catalogRuleProduct->createOrUpdateCatalogRuleProduct($rule, $productIDs);
-
-            $this->catalogRuleProductPrice->createOrUpdateCatalogRuleProductPrice($rule, $productIDs);
-        }
-    }
-
-    /**
-     * Create or update catalog rule product resource
-     *
-     * @param CatalogRule $rule
-     * @param Integer $productID
-     *
-     * @return Void
-     */
-    public function createOrUpdateCatalogRuleProduct($rule, $productID)
-    {
-        $channels = $rule->channels;
-        $customerGroups = $rule->customer_groups;
-
-        $channelsGroupsCross = $channels->crossJoin($customerGroups);
-
-        if ($productID == '*') {
-            $products = $this->product->all('id');
-
-            foreach ($channelsGroupsCross as $channelGroup) {
-                $channelId = $channelGroup[0]->channel_id;
-                $groupId = $channelGroup[1]->customer_group_id;
-
-                foreach ($products as $product) {
-                    $productID = $product->id;
-
-                    $catalogRuleProduct = $this->catalogRuleProduct->findWhere([
-                        'channel_id' => $channelId,
-                        'customer_group_id' => $groupId,
-                        'product_id' => $productID
-                    ]);
-
-                    if ($catalogRuleProduct->count()) {
-                        // check for tie breaker rules and then update
-                        $product = $this->product->find($productID);
-
-                        $productPrice = $product->price;
-
-                        // check for tie breaker rules and then update
-                        $previousRuleID = $catalogRuleProduct->first()->catalog_rule_id;
-
-                        $newRuleID = $rule->id;
-
-                        $winnerRuleId = $this->breakTie($previousRuleID, $newRuleID, $product);
-
-                        $discountAmount = $this->getDiscountAmount($product, $rule);
-
-                        $data = [
-                            'catalog_rule_id' => $rule->id,
-                            'starts_from' => $rule->starts_from,
-                            'ends_till' => $rule->ends_till,
-                            'customer_group_id' => $groupId,
-                            'channel_id' => $channelId,
-                            'product_id' => $productID,
-                            'action_code' => $rule->action_code,
-                            'action_amount' => $discountAmount
-                        ];
-
-                        if ($rule->id == $winnerRuleId) {
-                            $this->catalogRuleProduct->create($data);
-                        } else {
-                            $this->catalogRuleProduct->update($data, $catalogRuleProduct->first()->id);
-                        }
-                    } else {
-                        $data = [
-                            'catalog_rule_id' => $rule->id,
-                            'starts_from' => $rule->starts_from,
-                            'ends_till' => $rule->ends_till,
-                            'customer_group_id' => $groupId,
-                            'channel_id' => $channelId,
-                            'product_id' => $productID,
-                            'action_code' => $rule->action_code,
-                            'action_amount' => $rule->discount_amount
-                        ];
-
-                        $this->catalogRuleProduct->create($data);
-                    }
-                }
-            }
-        } else {
-            foreach ($channelsGroupsCross as $channelGroup) {
-                $channelId = $channelGroup[0]->channel_id;
-                $groupId = $channelGroup[1]->customer_group_id;
-
-                $catalogRuleProduct = $this->catalogRuleProduct->findWhere([
-                    'channel_id' => $channelId,
-                    'customer_group_id' => $groupId,
-                    'product_id' => $productID
-                ]);
-
-                if ($catalogRuleProduct->count()) {
-                    $product = $this->product->find($productID);
-                    $productPrice = $product->price;
-
-                    // check for tie breaker rules and then update
-                    $previousRuleID = $catalogRuleProduct->first()->catalog_rule_id;
-
-                    $newRuleID = $rule->id;
-
-                    $winnerRuleId = $this->breakTie($previousRuleID, $newRuleID, $product);
-
-                    // update
-                    if ($winnerRuleId != $rule->id) {
-                        $discountAmount = $this->getDiscountAmount($product, $rule);
-
-                        $catalogRuleProduct->first()->update([
-                            'catalog_rule_id' => $rule->id,
-                            'starts_from' => $rule->starts_from,
-                            'ends_till' => $rule->ends_till,
-                            'customer_group_id' => $groupId,
-                            'channel_id' => $channelId,
-                            'product_id' => $productID,
-                            'action_code' => $rule->action_code,
-                            'action_amount' => $discountAmount
-                        ]);
-                    } else {
-                        //do reassessment
-                    }
-                } else if ($catalogRuleProduct->count() == 0) {
-                    $product = $this->product->find($productID);
-
-                    $discountAmount = $this->getDiscountAmount($product, $rule);
-
-                    $data = [
-                        'catalog_rule_id' => $rule->id,
-                        'starts_from' => $rule->starts_from,
-                        'ends_till' => $rule->ends_till,
-                        'customer_group_id' => $groupId,
-                        'channel_id' => $channelId,
-                        'product_id' => $productID,
-                        'action_code' => $rule->action_code,
-                        'action_amount' => $discountAmount
-                    ];
-
-                    $this->catalogRuleProduct->create($data);
-                } else {
-                    // do the reassessment updation if the cart rule action changes the new action and its amount needs to be updated
-                }
-            }
-        }
-    }
-
-     /**
-     * Create or update catalog rule product resource
-     *
-     * @param CatalogRule $rule
-     * @param Integer $productID
-     *
-     * @return Void
-     */
-    public function createOrUpdateCatalogRuleProductPrice($rule, $productID)
-    {
-        $channels = $rule->channels;
-        $customerGroups = $rule->customer_groups;
-
-        $channelsGroupsCross = $channels->crossJoin($customerGroups);
-
-        if ($productID == '*') {
-            $products = $this->product->all('id');
-
-            foreach ($channelsGroupsCross as $channelGroup) {
-                $channelId = $channelGroup[0]->channel_id;
-                $groupId = $channelGroup[1]->customer_group_id;
-
-                foreach ($products as $product) {
-                    $productID = $product->id;
-
-                    $catalogRuleProductPrice = $this->catalogRuleProductPrice->findWhere([
-                        'channel_id' => $channelId,
-                        'customer_group_id' => $groupId,
-                        'product_id' => $productID
-                    ]);
-
-                    if ($catalogRuleProductPrice->count()) {
-                        // check for tie breaker rules and then update
-                        $data = [
-                            'catalog_rule_id' => $rule->id,
-                            'starts_from' => $rule->starts_from,
-                            'ends_till' => $rule->ends_till,
-                            'customer_group_id' => $groupId,
-                            'channel_id' => $channelId,
-                            'product_id' => $productID,
-                            'action_code' => $rule->action_code,
-                            'action_amount' => $rule->discount_amount
-                        ];
-
-                        $this->catalogRuleProductPrice->update($data, $catalogRuleProductPrice->first()->id);
-                    } else {
-                        $data = [
-                            'catalog_rule_id' => $rule->id,
-                            'starts_from' => $rule->starts_from,
-                            'ends_till' => $rule->ends_till,
-                            'customer_group_id' => $groupId,
-                            'channel_id' => $channelId,
-                            'product_id' => $productID,
-                            'action_code' => $rule->action_code,
-                            'action_amount' => $rule->discount_amount
-                        ];
-
-                        $this->catalogRuleProductPrice->create($data);
-                    }
-                }
-            }
-        } else {
-            foreach ($channelsGroupsCross as $channelGroup) {
-                $channelId = $channelGroup[0]->channel_id;
-                $groupId = $channelGroup[1]->customer_group_id;
-
-                $catalogRuleProduct = $this->catalogRuleProduct->findWhere([
-                    'channel_id' => $channelId,
-                    'customer_group_id' => $groupId,
-                    'product_id' => $productID
-                ]);
-
-                $catalogRuleProductPrice = $this->catalogRuleProductPrice->findWhere([
-                    'channel_id' => $channelId,
-                    'customer_group_id' => $groupId,
-                    'product_id' => $productID
-                ]);
-
-                if ($catalogRuleProductPrice->count()) {
-                    $catalogRuleProduct = $catalogRuleProduct->first();
-
-                    $product = $this->product->find($productID);
-
-                    $productPrice = $product->price - $catalogRuleProduct->action_amount;
-
-                    $winnerRuleId = $this->breakTie($catalogRuleProduct->catalog_rule_id, $rule->id, $product);
-
-                    if ($winnerRuleId != $rule->id) {
-                        $data = [
-                            'catalog_rule_id' => $rule->id,
-                            'starts_from' => $rule->starts_from,
-                            'ends_till' => $rule->ends_till,
-                            'customer_group_id' => $groupId,
-                            'channel_id' => $channelId,
-                            'product_id' => $productID,
-                            'rule_price' => $productPrice
-                        ];
-
-                        $catalogRuleProductPrice->first()->update($data);
-                    } else {
-                        // do reassement
-                    }
-                } else if ($catalogRuleProductPrice->count() == 0) {
-                    $catalogRuleProduct = $catalogRuleProduct->first();
-
-                    $discountAmount = $catalogRuleProduct->action_amount;
-
-                    $product = $this->product->find($productID);
-
-                    $productPrice = $product->price - $discountAmount;
-
-                    $data = [
-                        'catalog_rule_id' => $rule->id,
-                        'starts_from' => $rule->starts_from,
-                        'ends_till' => $rule->ends_till,
-                        'customer_group_id' => $groupId,
-                        'channel_id' => $channelId,
-                        'product_id' => $productID,
-                        'rule_price' => $productPrice
-                    ];
-
-                    $this->catalogRuleProductPrice->create($data);
-                } else {
-                    // do the reassessment updation if the cart rule action changes the new action and its amount needs to be updated
-                }
-            }
-        }
-    }
-
-    /**
-     *  Get discount amount for the rule and product
-     *
-     * @return Decimal $discountAmount
-     */
-    public function getDiscountAmount($product, $rule)
-    {
-
-        $actionClass = config('discount-rules.catalog')[$rule->action_code];
-
-        $actionInstance = new $actionClass();
-
-        $discountAmount = $actionInstance->calculate($rule, $product);
-
-        return $discountAmount;
-    }
-
-    /**
-     * To expand the productIDs of configurable products
-     *
-     * @param Array $productIDs
-     *
-     * @return Array
-     */
-    protected function expandProducts($productIDs)
-    {
-        $products = app('Webkul\Product\Repositories\ProductRepository');
-
-        $newProductIDs = collect();
-
-        foreach ($productIDs as $productID) {
-            $product = $products->find($productID);
-
-            if (ProductType::hasVariants($product->type)) {
-                $variants = $product->variants;
-
-                foreach($variants as $variant) {
-                    $newProductIDs->push($variant->id);
-                }
-            } else {
-                $newProductIDs->push($productID);
-            }
-        }
-
-        if ($newProductIDs->count()) {
-            return $newProductIDs->toArray();
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * To break tie between two rules
-     *
-     * @param Integer $previousRuleID
-     * @param Integer $newRuleID
-     *
-     * @return String $id
-     */
-    public function breakTie($previousRuleID, $newRuleID, $product)
-    {
-        $oldRule = $this->catalogRule->find($previousRuleID);
-
-        $newRule = $this->catalogRule->find($newRuleID);
-
-        if ($oldRule->ends_other_rules) {
-            return $oldRule->id;
-        } else {
-            $oldRuleDiscount = $this->getDiscountAmount($product, $oldRule);
-
-            $newRuleDiscount = $this->getDiscountAmount($product, $newRule);
-
-            if ($newRuleDiscount > $oldRuleDiscount) {
-                return $newRule->id;
-            } else {
-                return $oldRule->id;
-            }
-        }
-    }
-
-    /**
-     * To declutter the catalog rules that are either inactive or deleted
-     *
-     * @return Boolean
-     */
-    public function deClutter()
-    {
-        $rules = $this->catalogRule->all();
-
-        foreach ($rules as $rule) {
-            $validated = $this->checkApplicability($rule);
-
-            if (! $validated) {
-                $this->deceased->push($rule->id);
-            }
-        }
-
-        if (count($this->deceased)) {
-            $count = 0;
-
-            foreach ($this->deceased as $deceased)  {
-                $cartRuleProducts = $this->catalogRuleProduct->findWhere(['catalog_rule_id' => $deceased]);
-
-                $cartRuleProductsPrice = $this->catalogRuleProductPrice->findWhere(['catalog_rule_id' => $deceased]);
-
-                // obvious logic for removing entries as entries in both storage needs to be exactly equal for a product
-                foreach ($cartRuleProducts as $cartRuleProduct) {
-                    // deletes cartRuleProducts resource
-                    $cartRuleProduct->delete();
-
-                    // deletes cartRuleProductsPrice resource
-                    $cartRuleProductsPrice->delete();
-                }
-            }
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Helpers/Catalog/ConvertXToProductId.php b/packages/Webkul/Discount/src/Helpers/Catalog/ConvertXToProductId.php
deleted file mode 100644
index b44eaea8b..000000000
--- a/packages/Webkul/Discount/src/Helpers/Catalog/ConvertXToProductId.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Helpers\Catalog;
-
-use Webkul\Discount\Repositories\CatalogRuleRepository as CatalogRule;
-use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
-use Webkul\Attribute\Repositories\AttributeOptionRepository as AttributeOption;
-use Webkul\Category\Repositories\CategoryRepository as Category;
-use Webkul\Product\Helpers\ProductType;
-use Webkul\Product\Repositories\ProductRepository as Product;
-use Webkul\Product\Models\ProductAttributeValue as ProductAttributeValue;
-
-/**
- * ConvertXToProductID
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class ConvertXToProductId
-{
-    /**
-     * CategoryRepository instance
-     */
-    protected $category;
-
-    /**
-     * AttributeRepository instance
-     */
-    protected $attribute;
-
-    /**
-     * ProductRepository instance
-     */
-    protected $product;
-
-    /**
-     * AttributeOptionRepository instance
-     */
-    protected $attributeOption;
-
-    /**
-     * CatalogRuleRepository instance
-     */
-    protected $catalogRule;
-
-    /**
-     * ProductAttributeValueRepository instance
-     */
-    protected $pav;
-
-    /**
-     * Condition symbols for matching the criteria with attributes selected
-     */
-    protected $symbols;
-
-    public function __construct(
-        Category $category,
-        Attribute $attribute,
-        Product $product,
-        AttributeOption $attributeOption,
-        CatalogRule $catalogRule,
-        ProductAttributeValue $pav
-    ) {
-        $this->category = $category;
-
-        $this->attribute = $attribute;
-
-        $this->product = $product;
-
-        $this->attributeOption = $attributeOption;
-
-        $this->catalogRule = $catalogRule;
-
-        $this->pav = $pav;
-
-        $this->conditionSymbols = config('pricerules.cart.conditions.symbols');
-    }
-
-    public function convertX($attributeConditions)
-    {
-        $categoryValues = $attributeConditions->categories;
-
-        $attributeValues = $attributeConditions->attributes;
-
-        if (! isset($categoryValues) && ! isset($attributeValues))
-            return false;
-
-        $categoryResult = collect();
-
-        if (isset($categoryValues) && count($categoryValues))
-            $categoryResult = $this->convertFromCategories($categoryValues);
-
-        $attributeResult = collect();
-
-        if (isset($attributeValues) && count($attributeValues))
-            $attributeResult = $this->convertFromAttributes($attributeValues);
-
-        // now call the function that will find all the unique product ids
-        $productIDs = $this->findAllUniqueIds($attributeResult, $categoryResult);
-
-        return $productIDs;
-    }
-
-    /**
-     * This method will return product id from the attribute and attribute option params
-     *
-     * @return array
-     */
-    public function convertFromAttributes($attributeOptions)
-    {
-        $products = collect();
-
-        foreach ($attributeOptions as $attributeOption) {
-            if (isset($attributeOption->type) && $attributeOption->attribute != null && $attributeOption->condition != null && $attributeOption->value != [] && $attributeOption->type != null) {
-                $selectedOptions = $attributeOption->value;
-
-                if ($attributeOption->type == 'select' || $attributeOption->type == 'multiselect') {
-                    $attribute = $this->attribute->findWhere(['code' => $attributeOption->attribute]);
-
-                    $attributeOptions = $attribute->first()->options;
-
-                    $selectedAttributeOptions = collect();
-
-                    foreach ($attributeOptions as $attributeOption) {
-                        foreach ($selectedOptions as $key => $value) {
-                            if ($attributeOption->id == $value)
-                                $selectedAttributeOptions->push($attributeOption);
-                        }
-                    }
-
-                    foreach ($selectedAttributeOptions as $selectedAttributeOption) {
-                        $typeColumn = $this->pav::$attributeTypeFields[$attribute->first()->type];
-
-                        $pavResults = $this->pav->where(
-                            "{$typeColumn}",
-                            $selectedAttributeOption->id
-                        )->get();
-
-                        foreach ($pavResults as $pavResult) {
-                            if ($pavResult->product->type == 'simple')
-                                $products->push($pavResult->product);
-                        }
-                    }
-                } else {
-                    $attribute = $this->attribute->findWhere(['code' => $attributeOption->attribute]);
-
-                    $pavValues = $attribute->first();
-
-                    $selectedAttributeValues = collect();
-
-                    if ($attributeOption->attribute == 'sku') {
-                        $testValue = $attributeOption->value;
-                        $testCondition = $attributeOption->condition;
-
-                        if ($testCondition == '{}') {
-                            $foundProducts = $this->product->findWhere([
-                                ['sku', 'like', '%' . $testValue . '%'],
-                                ['type', 'NOT IN', ProductType::getAllTypesHavingVariants()]
-                                ])->flatten()->all();
-                        } else if ($testCondition == '!{}') {
-                            $foundProducts = $this->product->findWhere([
-                                ['sku', 'not like', '%' . $testValue . '%'],
-                                ['type', 'NOT IN', ProductType::getAllTypesHavingVariants()]
-                            ])->flatten()->all();
-                        } else if ($testCondition == '=') {
-                            $foundProducts = $this->product->findWhere([
-                                ['sku', '=', $testValue],
-                                ['type', 'NOT IN', ProductType::getAllTypesHavingVariants()]
-                            ])->flatten()->all();
-                        }
-                    }
-
-                    foreach ($foundProducts as $foundProduct) {
-                        $products->push($foundProduct);
-                    }
-                }
-            }
-        }
-
-        return $products;
-    }
-
-    /**
-     * This method will return product id from the attribute and attribute option params
-     *
-     * @param Collection $categories
-     *
-     * @return array
-     */
-    public function convertFromCategories($categories)
-    {
-        $products = collect();
-
-        foreach ($categories as $category) {
-            $data = $this->getAll($category->id);
-
-            if ($data->count()) {
-                $products->push($data);
-
-                unset($data);
-            }
-        }
-
-        return $products->flatten()->all();
-    }
-
-    /**
-     * This method will remove the duplicates from the array and merge all the items into single array
-     *
-     * @param array
-     *
-     * @return array
-     */
-    public function findAllUniqueIds(...$data)
-    {
-        $attributeResult = $data[0] ?? collect();
-        $categoryResult = $data[1] ?? collect();
-
-        // find matched attribute options product ids
-        $mergedCollection = $attributeResult->merge($categoryResult);
-
-        $productIDs = collect();
-
-        foreach ($mergedCollection as $merged) {
-            $productIDs->push($merged->id);
-        }
-
-        // find all the unique product ids
-        $productIDs = $productIDs->unique();
-
-        return $productIDs->flatten()->all();
-    }
-
-    /**
-     * To get all product ids lying in the criteria
-     *
-     * @param integer $categoryId
-     *
-     * @return Collection
-     */
-    public function getAll($categoryId = null)
-    {
-        $results = app('Webkul\Product\Repositories\ProductFlatRepository')->scopeQuery(function ($query) use ($categoryId) {
-
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
-
-            $locale = request()->get('locale') ?: app()->getLocale();
-
-            $qb = $query->distinct()
-                ->select('products.id')
-                ->leftJoin('products', 'product_flat.product_id', '=', 'products.id')
-                ->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id')
-                ->whereNotNull('product_flat.url_key');
-
-            if ($categoryId) {
-                $qb->where('product_categories.category_id', $categoryId);
-            }
-
-            $qb->where('product_flat.status', 1);
-
-            $qb->where('product_flat.visible_individually', 1);
-
-            $queryBuilder = $qb->leftJoin('product_flat as flat_variants', function ($qb) use ($channel, $locale) {
-                $qb->on('product_flat.id', '=', 'flat_variants.parent_id');
-            });
-
-            return $qb->groupBy('product_flat.id');
-        })->get();
-
-        return $results;
-    }
-}
diff --git a/packages/Webkul/Discount/src/Helpers/Catalog/Sale.php b/packages/Webkul/Discount/src/Helpers/Catalog/Sale.php
deleted file mode 100644
index 294e61ef2..000000000
--- a/packages/Webkul/Discount/src/Helpers/Catalog/Sale.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Helpers\Catalog;
-
-use Webkul\Discount\Repositories\CatalogRepository as CatalogRule;
-use Carbon\Carbon;
-
-/**
- * Sale - Abstract class designed to initiate the application of Catalog Rules
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-abstract class Sale
-{
-    abstract function apply();
-
-    /**
-     * To validate rule
-     *
-     * @param CatalogRule $rule
-     *
-     * @return Boolean
-     */
-    public function checkApplicability($rule)
-    {
-        $cart = \Cart::getCart();
-
-        $timeBased = false;
-
-        $status = false;
-
-        // time based constraints
-        if ($rule->starts_from != null && $rule->ends_till == null) {
-            if (Carbon::parse($rule->starts_from) < now())
-                $timeBased = true;
-        } else if ($rule->starts_from == null && $rule->ends_till != null) {
-            if (Carbon::parse($rule->ends_till) > now())
-                $timeBased = true;
-        } else if ($rule->starts_from != null && $rule->ends_till != null) {
-            if (Carbon::parse($rule->starts_from) < now() && now() < Carbon::parse($rule->ends_till))
-                $timeBased = true;
-        } else {
-            $timeBased = true;
-        }
-
-        if ($rule->status)
-            $status = true;
-
-        if ($timeBased && $status) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Function to maintain products and catalog rule
-     *
-     * @param CatalogRule $rule
-     *
-     * @return String|NULL
-     */
-    public function getProductIds($rule)
-    {
-        if ($rule->conditions) {
-            $conditions = $rule->conditions;
-
-            while(gettype($conditions) == 'string') {
-                $conditions = json_decode($conditions);
-            }
-
-            $productIDs = $this->convertX->convertX($conditions);
-        } else {
-            $productIDs = '*';
-        }
-
-        return $productIDs;
-    }
-
-     /**
-      * Function to maintain products, catalog rule, price
-      */
-
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
deleted file mode 100644
index cd85e7638..000000000
--- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
+++ /dev/null
@@ -1,573 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Http\Controllers;
-
-use Webkul\Discount\Repositories\CartRuleRepository as CartRule;
-use Webkul\Category\Repositories\CategoryRepository as Category;
-use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
-use Webkul\Discount\Helpers\Cart\ConvertXToProductId as ConvertX;
-use Webkul\Discount\Repositories\CartRuleLabelsRepository as CartRuleLabels;
-use Webkul\Discount\Repositories\CartRuleCouponsRepository as CartRuleCoupons;
-
-/**
- * Cart Rule controller
- *
- * @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CartRuleController extends Controller
-{
-    /**
-     * Initialize _config, a default request parameter with route
-     */
-    protected $_config;
-
-    /**
-     * Property for Cart rule application
-     */
-    protected $appliedConfig;
-
-    /**
-     * To hold Cart repository instance
-     */
-    protected $cartRule;
-
-    /**
-     * To hold Rule Label repository instance
-     */
-    protected $cartRuleLabel;
-
-    /**
-     * To hold Coupons Repository instance
-     */
-    protected $cartRuleCoupon;
-
-    /**
-     * To hold category repository instance
-     */
-    protected $category;
-
-    /**
-     * To hold attribute repository instance
-     */
-    protected $attribute;
-
-    /**
-     * To hold the cart repository instance
-     */
-    protected $cart;
-
-    /**
-     * Convert X To Product ID.
-     *
-     */
-    protected $convertX;
-
-    public function __construct(
-        CartRule $cartRule,
-        CartRuleCoupons $cartRuleCoupon,
-        CartRuleLabels $cartRuleLabel,
-        Attribute $attribute,
-        Category $category,
-        ConvertX $convertX
-    )
-    {
-        $this->_config = request('_config');
-
-        $this->cartRule = $cartRule;
-
-        $this->cartRuleCoupon = $cartRuleCoupon;
-
-        $this->cartRuleLabel = $cartRuleLabel;
-
-        $this->attribute = $attribute;
-
-        $this->category = $category;
-
-        $this->convertX = $convertX;
-
-        $this->appliedConfig = config('pricerules.cart');
-    }
-
-    /**
-     * @return \Illuminate\View\View
-     */
-    public function index()
-    {
-        return view($this->_config['view']);
-    }
-
-    /**
-     * @return \Illuminate\View\View
-     */
-    public function create()
-    {
-        return view($this->_config['view'])->with('cart_rule', [$this->appliedConfig, $this->category->getPartial(), $this->getStatesAndCountries(), $this->attribute->getPartial()]);
-    }
-
-    /**
-     * Stores the response from cart rule store page to datastore
-     *
-     * @return redirect
-     */
-    public function store()
-    {
-        $this->validate(request(), [
-            'name' => 'required|string|unique:cart_rules,name',
-            'description' => 'string',
-            'starts_from' => 'nullable|date',
-            'ends_till' => 'nullable|date|after_or_equal:starts_from',
-            'customer_groups' => 'required|array',
-            'channels' => 'required|array',
-            'status' => 'required|boolean',
-            'use_coupon' => 'boolean|required',
-            // 'usage_limit' => 'numeric|min:0',
-            // 'per_customer' => 'numeric|min:0',
-            'action_type' => 'required|string',
-            'disc_amount' => 'required|numeric',
-            'disc_quantity' => 'numeric',
-            // 'disc_threshold' => 'numeric',
-            'free_shipping' => 'required|boolean',
-            'apply_to_shipping' => 'required|boolean',
-            'code' => 'string|required_if:auto_generation,0',
-            'all_conditions' => 'sometimes|nullable',
-            'label' => 'array|nullable'
-        ]);
-
-        $data = request()->all();
-
-        $attribute_conditions = $data['all_attributes'];
-        unset($data['all_attributes']);
-
-        // unset token
-        unset($data['_token']);
-
-        // check if starts_from is null
-        if ($data['starts_from'] == "") {
-            $data['starts_from'] = null;
-        }
-
-        // check if end_till is null
-        if ($data['ends_till'] == "") {
-            $data['ends_till'] = null;
-        }
-
-        // customer groups
-        $customer_groups = $data['customer_groups'];
-
-        // unset customer groups
-        unset($data['customer_groups']);
-
-        // unset criteria
-        unset($data['criteria']);
-
-        // channels
-        $channels = $data['channels'];
-
-        // unset channels
-        unset($data['channels']);
-
-        // make labels
-        $labels = $data['label'];
-
-        // unset labels
-        unset($data['label']);
-
-        while (gettype($attribute_conditions) == 'string') {
-            $attribute_conditions = json_decode($attribute_conditions);
-        }
-
-        if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) || count($attribute_conditions->attributes))) {
-            $data['uses_attribute_conditions'] = 0;
-
-            $data['actions'] = [
-                'action_type' => $data['action_type'],
-                'disc_amount' => $data['disc_amount'],
-                'disc_quantity' => $data['disc_quantity']
-            ];
-        } else {
-            $data['uses_attribute_conditions'] = 1;
-
-            $data['actions'] = [
-                'action_type' => $data['action_type'],
-                'disc_amount' => $data['disc_amount'],
-                'disc_quantity' => $data['disc_quantity'],
-                'attribute_conditions' => $attribute_conditions
-            ];
-        }
-
-        // prepare json object from conditions
-        $data['actions'] = json_encode($data['actions']);
-
-        // check if all
-        if (! isset($data['all_conditions']) || $data['all_conditions'] == "[]" || $data['all_conditions'] == "") {
-            $data['conditions'] = null;
-        } else {
-            $data['conditions'] = json_encode($data['all_conditions']);
-        }
-
-        // unset cart_attributes from conditions
-        unset($data['cart_attributes']);
-
-        // unset attributes from conditions
-        unset($data['attributes']);
-
-        // unset all_conditions from conditions
-        unset($data['all_conditions']);
-
-        // prepare coupons if coupons are used
-        if ($data['use_coupon']) {
-            // if (isset($data['auto_generation']) && $data['auto_generation']) {
-            // auto generation is off for now
-            $data['auto_generation'] = 0;
-
-            // save the coupon used in coupon section
-            $coupons['code'] = $data['code'];
-
-            $couponExists = $this->cartRuleCoupon->findWhere([
-                'code' => $coupons['code']
-            ]);
-
-            if ($couponExists->count()) {
-                session()->flash('warning', trans('admin::app.promotion.status.duplicate-coupon'));
-
-                return redirect()->back();
-            }
-
-            // set coupon usage per customer same as per_customer limit which is disabled for now
-            // $coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage
-            // unset coupon code from coupon section
-            unset($data['code']);
-            // } else {
-            //     $data['auto_generation'] = 1;
-            // }
-
-            // if (isset($data['prefix'])) {
-            //     $coupons['prefix'] = $data['prefix'];
-            //     unset($data['prefix']);
-            // }
-
-            // if (isset($data['suffix'])) {
-            //     $coupons['suffix'] = $data['suffix'];
-            //     unset($data['suffix']);
-            // }
-
-            // $coupons['limit'] = 0;
-        }
-
-        // per coupon usage limit
-        // if(isset($data['usage_limit'])) {
-        //     $coupons['limit'] = $data['usage_limit'];
-        // }
-
-        // create a cart rule
-        $ruleCreated = $this->cartRule->create($data);
-
-        // can execute convertX here after when the rule is updated
-        if (isset($attribute_conditions) && $data['uses_attribute_conditions']) {
-            $this->convertX->convertX($ruleCreated->id, $attribute_conditions);
-        }
-
-        // create customer groups for cart rule
-        $ruleGroupCreated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleCreated);
-
-        // create customer groups for channels
-        $ruleChannelCreated = $this->cartRule->ChannelSync($channels, $ruleCreated);
-
-        // prepare labels
-        if (isset($labels['global'])) {
-            foreach (core()->getAllChannels() as $channel) {
-                $label1['channel_id'] = $channel->id;
-
-                foreach($channel->locales as $locale) {
-                    $label1['locale_id'] = $locale->id;
-                    $label1['label'] = $labels['global'];
-                    $label1['cart_rule_id'] = $ruleCreated->id;
-
-                    $ruleLabelCreated = $this->cartRuleLabel->create($label1);
-                }
-            }
-        } else {
-            $label2['label'] = $labels['global'];
-            $label2['cart_rule_id'] = $ruleCreated->id;
-
-            $ruleLabelCreated = $this->cartRuleLabel->create($label2);
-        }
-
-        // create coupon if present
-        if (isset($coupons)) {
-            $coupons['cart_rule_id'] = $ruleCreated->id;
-            $couponCreated = $this->cartRuleCoupon->create($coupons);
-        }
-
-        if ($ruleCreated && $ruleChannelCreated && $ruleGroupCreated) {
-            if (isset($couponCreated) && $couponCreated) {
-                session()->flash('success', trans('admin::app.promotion.status.success-coupon'));
-            }
-
-            session()->flash('success', trans('admin::app.promotion.status.success'));
-        } else {
-            session()->flash('success', trans('admin::app.promotion.status.success'));
-
-            return redirect()->back();
-        }
-
-        return redirect()->route($this->_config['redirect']);
-    }
-
-    /**
-     * @return \Illuminate\View\View
-     */
-    public function edit($id)
-    {
-        $cart_rule = $this->cartRule->find($id);
-
-        return view($this->_config['view'])->with('cart_rule', [
-            $this->appliedConfig,
-            $this->category->getPartial(),
-            $this->getStatesAndCountries(),
-            $cart_rule,
-            $this->attribute->getPartial()
-        ]);
-    }
-
-    /**
-     * Collects the response from cart rule update page and update datastore
-     *
-     * @return redirect
-     */
-    public function update($id)
-    {
-        $this->validate(request(), [
-            'name' => 'required|string|unique:cart_rules,name,'.$id,
-            'description' => 'string',
-            'starts_from' => 'nullable|date',
-            'ends_till' => 'nullable|date|after_or_equal:starts_from',
-            'customer_groups' => 'required|array',
-            'channels' => 'required|array',
-            'status' => 'required|boolean',
-            'use_coupon' => 'boolean|required',
-            // 'usage_limit' => 'numeric|min:0',
-            // 'per_customer' => 'numeric|min:0',
-            'action_type' => 'required|string',
-            'disc_amount' => 'required|numeric',
-            'disc_quantity' => 'required|numeric',
-            // 'disc_threshold' => 'required|numeric',
-            'free_shipping' => 'required|boolean',
-            'apply_to_shipping' => 'required|boolean',
-            'code' => 'string|required_if:user_coupon,1',
-            'all_conditions' => 'present',
-            'label' => 'array|nullable'
-        ]);
-
-        // collecting request in $data
-        $data = request()->all();
-
-        $attribute_conditions = $data['all_attributes'];
-        unset($data['all_attributes']);
-
-        // unset request token from $data
-        unset($data['_token']);
-
-        // check if starts_from is null
-        if ($data['starts_from'] == "") {
-            $data['starts_from'] = null;
-        }
-
-        // check if end_till is null
-        if ($data['ends_till'] == "") {
-            $data['ends_till'] = null;
-        }
-
-        // set channels
-        $channels = $data['channels'];
-
-        // unset the channels from $data
-        unset($data['channels']);
-
-        // set customer_groups
-        $customer_groups = $data['customer_groups'];
-
-        // unset customer groups
-        unset($data['customer_groups']);
-
-        // set labels and unset them from $data
-        if (isset($data['label'])) {
-            $labels = $data['label'];
-
-            unset($data['label']);
-        }
-
-        // unset cart_attributes and attributes from $data
-        unset($data['cart_attributes']);
-        unset($data['attributes']);
-
-        // prepare actions from data for json action
-        $attribute_conditions = json_decode($attribute_conditions);
-
-        while (gettype($attribute_conditions) == 'string') {
-            $attribute_conditions = json_decode($attribute_conditions);
-        }
-
-        if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) || count($attribute_conditions->attributes))) {
-            $data['uses_attribute_conditions'] = 0;
-
-            $data['actions'] = [
-                'action_type' => $data['action_type'],
-                'disc_amount' => $data['disc_amount'],
-                'disc_quantity' => $data['disc_quantity']
-            ];
-        } else {
-            $data['uses_attribute_conditions'] = 1;
-
-            $data['actions'] = [
-                'action_type' => $data['action_type'],
-                'disc_amount' => $data['disc_amount'],
-                'disc_quantity' => $data['disc_quantity'],
-                'attribute_conditions' => $attribute_conditions
-            ];
-        }
-
-        // encode php array to json for actions
-        $data['actions'] = json_encode($data['actions']);
-
-        // Prepares conditions from all conditions
-        if (! isset($data['all_conditions']) || $data['all_conditions'] == "[]" || $data['all_conditions'] == "") {
-            $data['conditions'] = null;
-        } else {
-            $data['conditions'] = json_encode($data['all_conditions']);
-        }
-
-        unset($data['match_criteria']);
-
-        // unset all_conditions from conditions
-        unset($data['all_conditions']);
-
-        // set coupons from $data
-        if ($data['use_coupon']) {
-            // if (isset($data['auto_generation']) && $data['auto_generation']) {
-            $data['auto_generation'] = 0;
-
-            $coupons['code'] = $data['code'];
-
-            $couponExists = $this->cartRuleCoupon->findWhere([
-                'code' => $coupons['code']
-            ]);
-
-            if ($couponExists->count()) {
-                if ($couponExists->first()->cart_rule_id != $id) {
-                    session()->flash('warning', trans('admin::app.promotion.status.duplicate-coupon'));
-
-                    return redirect()->back();
-                }
-            }
-
-            unset($data['code']);
-            // } else {
-            //     $data['auto_generation'] = 1;
-            // }
-
-            // if (isset($data['prefix'])) {
-            //     $coupons['prefix'] = $data['prefix'];
-            //     unset($data['prefix']);
-            // }
-
-            // if (isset($data['suffix'])) {
-            //     $coupons['suffix'] = $data['suffix'];
-            //     unset($data['suffix']);
-            // }
-            // $coupons['limit'] = 0;
-        }
-
-        // if (isset($data['usage_limit'])) {
-        //     $coupons['limit'] = $data['usage_limit'];
-        // }
-
-        // update cart rule
-        $ruleUpdated = $this->cartRule->update($data, $id);
-
-        if (isset($attribute_conditions) && $data['uses_attribute_conditions']) {
-            // can execute convert X here after when the rule is updated
-            $this->convertX->convertX($ruleUpdated->id, $attribute_conditions);
-        } else {
-            $ruleUpdated->update([
-                'product_ids' => null
-            ]);
-        }
-
-        // update customer groups for cart rule
-        $ruleGroupUpdated = $this->cartRule->CustomerGroupSync($customer_groups, $ruleUpdated);
-
-        // update customer groups for cart rule
-        $ruleChannelUpdated = $this->cartRule->ChannelSync($channels, $ruleUpdated);
-
-        // update labels
-        $labelsUpdated = $this->cartRule->LabelSync($labels, $ruleUpdated);
-
-        // check coupons set conditions
-        if (isset($coupons)) {
-            // $coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage
-            $coupons['cart_rule_id'] = $ruleUpdated->id;
-
-            if ($ruleUpdated->coupons == null) {
-                $couponCreatedOrUpdated = $this->cartRuleCoupon->create($coupons);
-            } else {
-                $couponCreatedOrUpdated = $ruleUpdated->coupons->update($coupons);
-            }
-        } else {
-            if ($ruleUpdated->coupons != null) {
-                $ruleUpdated->coupons->delete();
-            }
-        }
-
-        if ($ruleUpdated && $ruleGroupUpdated && $ruleChannelUpdated) {
-            if (isset($couponCreatedOrUpdated) && $couponCreatedOrUpdated) {
-                session()->flash('success', trans('admin::app.promotion.status.success-coupon'));
-            }
-
-            session()->flash('success', trans('admin::app.promotion.status.update-success'));
-        } else {
-            session()->flash('success', trans('admin::app.promotion.status.update-success'));
-
-            return redirect()->back();
-        }
-
-        return redirect()->route($this->_config['redirect']);
-    }
-
-    /**
-     * Deletes the cart rule
-     *
-     * @return JSON
-     */
-    public function destroy($id)
-    {
-        $cartRule = $this->cartRule->findOrFail($id);
-
-        if ($cartRule->delete()) {
-            session()->flash('success', trans('admin::app.promotion.status.delete-success'));
-
-            return response()->json(['message' => true], 200);
-        } else {
-            session()->flash('error', trans('admin::app.promotion.status.delete-failed'));
-
-            return response()->json(['message' => false], 400);
-        }
-    }
-
-    /**
-     * Get Countries and states list from core helpers
-     *
-     * @return Array
-     */
-    public function getStatesAndCountries()
-    {
-        $countries = core()->countries()->toArray();
-        $states = core()->groupedStatesByCountries();
-
-        return [
-            'countries' => $countries,
-            'states' => $states
-        ];
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php
deleted file mode 100644
index 9bb650a8f..000000000
--- a/packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Http\Controllers;
-
-use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
-use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily;
-use Webkul\Category\Repositories\CategoryRepository as Category;
-use Webkul\Product\Repositories\ProductFlatRepository as Product;
-use Webkul\Discount\Repositories\CatalogRuleRepository as CatalogRule;
-use Webkul\Discount\Repositories\CatalogRuleChannelsRepository as CatalogRuleChannels;
-use Webkul\Discount\Repositories\CatalogRuleCustomerGroupsRepository as CatalogRuleCustomerGroups;
-use Webkul\Discount\Helpers\Catalog\Apply;
-
-/**
- * CatalogRule controller
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright  2018 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CatalogRuleController extends Controller
-{
-    /**
-     * Initialize _config, a default request parameter with route
-     */
-    protected $_config;
-
-    /**
-     * Attribute $attribute
-     */
-    protected $attribute;
-
-    /**
-     * AttributeFamily $attributeFamily
-     */
-    protected $attributeFamily;
-
-    /**
-     * Category $category
-     */
-    protected $category;
-
-    /**
-     * Product $product
-     */
-    protected $product;
-
-    /**
-     * Property for catalog rule application
-     */
-    protected $appliedConfig;
-
-    /**
-     * Property for catalog rule application
-     */
-    protected $appliedConditions;
-
-    /**
-     * Property to hold Catalog Rule Channels Repository
-     */
-    protected $catalogRuleChannels;
-
-    /**
-     * Property to hold Catalog Rule Customer Groups Repository
-     */
-    protected $catalogRuleCustomerGroups;
-
-    /**
-     * To hold catalog repository instance
-     */
-    protected $catalogRule;
-
-    /**
-     * To hold Sale instance
-     */
-    protected $apply;
-
-    public function __construct(
-        Attribute $attribute,
-        AttributeFamily $attributeFamily,
-        Category $category, Product $product,
-        CatalogRule $catalogRule,
-        CatalogRuleChannels $catalogRuleChannels,
-        CatalogRuleCustomerGroups $catalogRuleCustomerGroups,
-        Apply $sale
-    ) {
-        $this->_config = request('_config');
-        $this->attribute = $attribute;
-        $this->attributeFamily = $attributeFamily;
-        $this->category = $category;
-        $this->product = $product;
-        $this->sale = $sale;
-        $this->catalogRule = $catalogRule;
-        $this->catalogRuleChannels = $catalogRuleChannels;
-        $this->catalogRuleCustomerGroups = $catalogRuleCustomerGroups;
-        $this->appliedConfig = config('pricerules.catalog');
-        $this->appliedConditions = config('pricerules.conditions');
-    }
-
-    public function index()
-    {
-        return view($this->_config['view']);
-    }
-
-    /**
-     * To load create form for catalog rule
-     *
-     * @return View
-     */
-    public function create()
-    {
-        return view($this->_config['view'])->with('catalog_rule', [$this->appliedConfig, $this->category->getPartial(), $this->getStatesAndCountries(), $this->attribute->getPartial()]);
-    }
-
-    /**
-     * To store newly created catalog rule and store it
-     *
-     * @return Redirect
-     */
-    public function store()
-    {
-        $this->validate(request(), [
-            'name' => 'required|string|unique:catalog_rules,name',
-            'description' => 'string',
-            'starts_from' => 'nullable|date',
-            'ends_till' => 'nullable|date|after_or_equal:starts_from',
-            'starts_from' => 'present|nullable|date',
-            'ends_till' => 'present|nullable|date',
-            'customer_groups' => 'required',
-            'channels' => 'required',
-            'status' => 'required|boolean',
-            'end_other_rules' => 'required|boolean',
-            'all_conditions' => 'present',
-            'disc_amount' => 'sometimes',
-            'disc_percent' => 'sometimes',
-        ]);
-
-        $catalog_rule = request()->all();
-
-        $catalog_rule_channels = array();
-        $catalog_rule_customer_groups = array();
-
-        // check if starts_from is null
-        if ($catalog_rule['starts_from'] == "") {
-            $catalog_rule['starts_from'] = null;
-        }
-
-        // check if end_till is null
-        if ($catalog_rule['ends_till'] == "") {
-            $catalog_rule['ends_till'] = null;
-        }
-
-        $catalog_rule_channels = $catalog_rule['channels'];
-        $catalog_rule_customer_groups = $catalog_rule['customer_groups'];
-        unset($catalog_rule['channels']); unset($catalog_rule['customer_groups']);
-
-        unset($catalog_rule['criteria']);
-
-        $catalog_rule['conditions'] = $catalog_rule['all_conditions'];
-
-        unset($catalog_rule['all_conditions']);
-
-        $catalog_rule['conditions'] = json_encode($catalog_rule['conditions']);
-
-        if (isset($catalog_rule['disc_amount'])) {
-            $catalog_rule['actions'] = [
-                'action_code' => $catalog_rule['action_type'],
-                'disc_amount' => $catalog_rule['disc_amount']
-            ];
-        } else if (isset($catalog_rule['disc_percent'])) {
-            $catalog_rule['actions'] = [
-                'action_code' => $catalog_rule['action_type'],
-                'disc_percent' => $catalog_rule['disc_percent'],
-            ];
-        }
-
-        $catalog_rule['discount_amount'] = $catalog_rule['disc_amount'];
-
-        $catalog_rule['action_code'] = $catalog_rule['action_type'];
-
-        unset($catalog_rule['disc_amount']);
-        unset($catalog_rule['apply']);
-        unset($catalog_rule['attributes']);
-        unset($catalog_rule['_token']);
-        unset($catalog_rule['all_actions']);
-
-        $catalog_rule['actions'] = json_encode($catalog_rule['actions']);
-
-        $catalogRule = $this->catalogRule->create($catalog_rule);
-
-        foreach($catalog_rule_channels as $catalog_rule_channel) {
-            $data['catalog_rule_id'] = $catalogRule->id;
-            $data['channel_id'] = $catalog_rule_channel;
-
-            $catalogRuleChannels = $this->catalogRuleChannels->create($data);
-        }
-
-        unset($data);
-        foreach ($catalog_rule_customer_groups as $catalog_rule_customer_group) {
-            $data['catalog_rule_id'] = $catalogRule->id;
-            $data['customer_group_id'] = $catalog_rule_customer_group;
-
-            $catalogRuleCustomerGroups = $this->catalogRuleCustomerGroups->create($data);
-        }
-
-        if($catalogRule && $catalogRuleChannels && $catalogRuleCustomerGroups) {
-            session()->flash('success', trans('admin::app.promotion.status.success'));
-
-            return redirect()->route('admin.catalog-rule.index');
-        } else {
-            session()->flash('error', trans('admin::app.promotion.status.failed'));
-
-            return redirect()->back();
-        }
-    }
-
-    /**
-     * To load edit for previously created catalog rule
-     *
-     * @param $id
-     *
-     * @return View
-     */
-    public function edit($id)
-    {
-        $catalog_rule = $this->catalogRule->find($id);
-
-        $catalog_rule_channels = $this->catalogRuleChannels->findByField('catalog_rule_id', $id);
-
-        $catalog_rule_customer_groups = $this->catalogRuleCustomerGroups->findByField('catalog_rule_id', $id);
-
-        return view($this->_config['view'])->with('catalog_rule', [
-                $this->attribute->getPartial(),
-                $this->category->getPartial(),
-                $this->fetchOptionableAttributes(),
-                $this->appliedConfig,
-                $this->appliedConditions,
-                $catalog_rule,
-                $catalog_rule_channels,
-                $catalog_rule_customer_groups,
-                $this->attributeFamily->getPartial()
-            ]);
-    }
-
-    /**
-     * To update previously created catalog rule
-     *
-     * @param $id
-     *
-     * @return Redirect
-     */
-    public function update($id)
-    {
-        $data = request()->input();
-
-        // $validated = \Validator::make($data, [
-        //     'name' => 'required|string|unique:catalog_rules,name,' . $id,
-        //     'starts_from' => 'present|nullable|date',
-        //     'ends_till' => 'present|nullable|date',
-        //     'description' => 'string',
-        //     'customer_groups' => 'required',
-        //     'channels' => 'required',
-        //     'status' => 'required|boolean',
-        //     'end_other_rules' => 'required|boolean',
-        //     'all_conditions' => 'present',
-        //     'disc_amount' => 'sometimes',
-        //     'disc_percent' => 'sometimes'
-        // ]);
-
-        // if ($validated->fails()) {
-        //     dd($validated->errors());
-        // } else {
-        //     dd('passed');
-        // }
-
-        $this->validate(request(), [
-            'name' => 'required|string|unique:catalog_rules,name,'.$id,
-            // 'name' => 'required|string',
-            'starts_from' => 'nullable|date',
-            'ends_till' => 'nullable|date|after_or_equal:starts_from',
-            'description' => 'string',
-            'customer_groups' => 'required',
-            'channels' => 'required',
-            'status' => 'required|boolean',
-            'end_other_rules' => 'required|boolean',
-            'all_conditions' => 'present',
-            'disc_amount' => 'sometimes',
-            'disc_percent' => 'sometimes'
-        ]);
-
-        $catalog_rule = request()->all();
-
-        $catalog_rule_channels = array();
-        $catalog_rule_customer_groups = array();
-
-        // check if starts_from is null
-        if ($catalog_rule['starts_from'] == "") {
-            $catalog_rule['starts_from'] = null;
-        }
-
-        // check if end_till is null
-        if ($catalog_rule['ends_till'] == "") {
-            $catalog_rule['ends_till'] = null;
-        }
-
-        $catalog_rule_channels = $catalog_rule['channels'];
-        $catalog_rule_customer_groups = $catalog_rule['customer_groups'];
-        unset($catalog_rule['channels']); unset($catalog_rule['customer_groups']);
-
-        unset($catalog_rule['criteria']);
-
-        $catalog_rule['conditions'] = $catalog_rule['all_conditions'];
-        unset($catalog_rule['all_conditions']);
-
-        if (isset($catalog_rule['disc_amount'])) {
-            $catalog_rule['action_code'] = $catalog_rule['action_type'];
-            $catalog_rule['actions'] = [
-                'action_code' => $catalog_rule['action_type'],
-                'disc_amount' => $catalog_rule['disc_amount']
-            ];
-        } else if (isset($catalog_rule['disc_percent'])) {
-            $catalog_rule['action_code'] = $catalog_rule['action_type'];
-            $catalog_rule['actions'] = [
-                'action_code' => $catalog_rule['action'],
-                'disc_percent' => $catalog_rule['disc_percent'],
-            ];
-        }
-
-        $catalog_rule['discount_amount'] = $catalog_rule['disc_amount'];
-
-        unset($catalog_rule['disc_amount']);
-        unset($catalog_rule['apply']);
-        unset($catalog_rule['attributes']);
-        unset($catalog_rule['_token']);
-        unset($catalog_rule['all_actions']);
-
-        $catalog_rule['actions'] = json_encode($catalog_rule['actions']);
-        $catalog_rule['conditions'] = json_encode($catalog_rule['conditions']);
-
-        $catalogRule = $this->catalogRule->update($catalog_rule, $id);
-
-        $catalogRuleChannels = $this->catalogRule->ChannelSync($catalog_rule_channels, $catalogRule);
-        $catalogRuleCustomerGroups = $this->catalogRule->CustomerGroupSync($catalog_rule_customer_groups, $catalogRule);
-
-        if($catalogRule && $catalogRuleChannels && $catalogRuleCustomerGroups) {
-            session()->flash('success', trans('admin::app.promotion.status.update-success'));
-
-            return redirect()->route($this->_config['redirect']);
-        } else {
-            session()->flash('error', trans('admin::app.promotion.status.update-failed'));
-
-            return redirect()->back();
-        }
-    }
-
-    /**
-     * To apply the catalog rules
-     *
-     * @return Redirect
-     */
-    public function applyRules()
-    {
-        $this->sale->apply();
-
-        session()->flash('success', trans('admin::app.promotion.processing-done'));
-
-        return redirect()->route('admin.catalog-rule.index');
-    }
-
-    /**
-     * Initiates decluttering of rules and even reindexes the table if empty
-     *
-     * @return Response redirect
-     */
-    public function deClutter()
-    {
-        $result = $this->sale->deClutter();
-
-        if ($result) {
-            session()->flash('success', trans('admin::app.promotion.declut-success'));
-        } else {
-            session()->flash('warning', trans('admin::app.promotion.declut-failure'));
-        }
-
-        return redirect()->route($this->_config['redirect']);
-    }
-
-    public function fetchOptionableAttributes()
-    {
-        $attributesWithOptions = array();
-
-        foreach($this->attribute->all() as $attribute) {
-            if (($attribute->type == 'select' || $attribute->type == 'multiselect')  && $attribute->code != 'tax_category_id') {
-                $attributesWithOptions[$attribute->code] = $attribute->options->toArray();
-            }
-        }
-
-        return $attributesWithOptions;
-    }
-
-    /**
-     * To delete existing catalog rule
-     *
-     * @param Integer $id
-     *
-     * @return Redirect
-     */
-    public function destroy($id)
-    {
-        $catalogRule = $this->catalogRule->findOrFail($id);
-
-        if ($catalogRule->delete()) {
-            session()->flash('success', trans('admin::app.promotion.status.delete-success'));
-
-            return response()->json(['message' => true], 200);
-        } else {
-            session()->flash('error', trans('admin::app.promotion.status.delete-failed'));
-
-            return response()->json(['message' => false], 400);
-        }
-    }
-
-    /**
-     * Get Countries and states list from core helpers
-     *
-     * @return Array
-     */
-    public function getStatesAndCountries()
-    {
-        $countries = core()->countries()->toArray();
-        $states = core()->groupedStatesByCountries();
-
-        return [
-            'countries' => $countries,
-            'states' => $states
-        ];
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRule.php b/packages/Webkul/Discount/src/Models/CartRule.php
deleted file mode 100644
index 6ea8b664d..000000000
--- a/packages/Webkul/Discount/src/Models/CartRule.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CartRule as CartRuleContract;
-use Webkul\Discount\Models\CartRuleChannelsProxy as CartRuleChannels;
-use Webkul\Discount\Models\CartRuleCustomerGroupsProxy as CartRuleCustomerGroups;
-use Webkul\Discount\Models\CartRuleCouponsProxy as CartRuleCoupons;
-use Webkul\Discount\Models\CartRuleLabelsProxy as CartRuleLabels;
-
-class CartRule extends Model implements CartRuleContract
-{
-    protected $table = 'cart_rules';
-
-    protected $guarded = ['created_at', 'updated_at'];
-
-    protected $with = ['channels', 'customer_groups', 'coupons', 'labels'];
-
-    public function channels()
-    {
-        return $this->hasMany(CartRuleChannels::modelClass());
-    }
-
-    public function customer_groups()
-    {
-        return $this->hasMany(CartRuleCustomerGroups::modelClass());
-    }
-
-    public function coupons()
-    {
-        return $this->hasOne(CartRuleCoupons::modelClass());
-    }
-
-    public function labels()
-    {
-        return $this->hasMany(CartRuleLabels::modelClass());
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCart.php b/packages/Webkul/Discount/src/Models/CartRuleCart.php
deleted file mode 100644
index 66d2b503c..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCart.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Models\CartRuleProxy as CartRule;
-use Webkul\Discount\Contracts\CartRuleCart as CartRuleCartContract;
-
-
-class CartRuleCart extends Model implements CartRuleCartContract
-{
-    protected $table = 'cart_rule_cart';
-
-    protected $guarded = ['created_at', 'updated_at'];
-
-    protected $with = ['cart_rule'];
-
-    public function cart_rule()
-    {
-        return $this->hasOne(CartRule::modelClass(), 'id', 'cart_rule_id');
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCartProxy.php b/packages/Webkul/Discount/src/Models/CartRuleCartProxy.php
deleted file mode 100644
index 98245e4d8..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCartProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CartRuleCartProxy extends ModelProxy
-{
-
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRuleChannels.php b/packages/Webkul/Discount/src/Models/CartRuleChannels.php
deleted file mode 100644
index 610b0b00e..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleChannels.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CartRuleChannels as CartRuleChannelsContract;
-
-class CartRuleChannels extends Model implements CartRuleChannelsContract
-{
-    protected $table = 'cart_rule_channels';
-
-    protected $guarded = ['created_at', 'updated_at'];
-}
diff --git a/packages/Webkul/Discount/src/Models/CartRuleChannelsProxy.php b/packages/Webkul/Discount/src/Models/CartRuleChannelsProxy.php
deleted file mode 100644
index b22928e60..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleChannelsProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CartRuleChannelsProxy extends ModelProxy
-{
-
-}
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCoupons.php b/packages/Webkul/Discount/src/Models/CartRuleCoupons.php
deleted file mode 100644
index 6fcec9915..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCoupons.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CartRuleCoupons as CartRuleCouponsContract;
-use Webkul\Discount\Models\CartRuleProxy as CartRule;
-
-class CartRuleCoupons extends Model implements CartRuleCouponsContract
-{
-    protected $table = 'cart_rule_coupons';
-
-    protected $guarded = ['created_at', 'updated_at'];
-
-    public function cart_rule()
-    {
-        return $this->belongsTo(CartRule::modelClass(), 'cart_rule_id');
-    }
-
-    public function coupons_usage()
-    {
-        return $this->hasOne(CartRuleCouponsUsage::modelClass());
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCouponsProxy.php b/packages/Webkul/Discount/src/Models/CartRuleCouponsProxy.php
deleted file mode 100644
index 8f2fb7f23..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCouponsProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CartRuleCouponsProxy extends ModelProxy
-{
-
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCouponsUsage.php b/packages/Webkul/Discount/src/Models/CartRuleCouponsUsage.php
deleted file mode 100644
index 429df5218..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCouponsUsage.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CartRuleCouponsUsage as CartRuleCouponsUsageContract;
-use Webkul\Discount\Models\CartRuleProxy as CartRule;
-
-class CartRuleCouponsUsage extends Model implements CartRuleCouponsUsageContract
-{
-    protected $table = 'cart_rule_coupons_usage';
-
-    protected $guarded = ['created_at', 'updated_at'];
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCouponsUsageProxy.php b/packages/Webkul/Discount/src/Models/CartRuleCouponsUsageProxy.php
deleted file mode 100644
index 38c2cd996..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCouponsUsageProxy.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CartRuleCouponsUsageProxy extends ModelProxy
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php b/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php
deleted file mode 100644
index 951b844ff..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Customer\Models\CustomerGroupProxy;
-use Webkul\Discount\Contracts\CartRuleCustomerGroups as CartRuleCustomerGroupContract;
-
-class CartRuleCustomerGroups extends Model implements CartRuleCustomerGroupContract
-{
-    protected $table = 'cart_rule_customer_groups';
-
-    protected $guarded = ['created_at', 'updated_at'];
-
-    public function customer_group()
-    {
-        return $this->hasOne(CustomerGroupProxy::modelClass(), 'id', 'customer_group_id');
-    }
-}
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCustomerGroupsProxy.php b/packages/Webkul/Discount/src/Models/CartRuleCustomerGroupsProxy.php
deleted file mode 100644
index e402be089..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCustomerGroupsProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CartRuleCustomerGroupsProxy extends ModelProxy
-{
-
-}
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCustomers.php b/packages/Webkul/Discount/src/Models/CartRuleCustomers.php
deleted file mode 100644
index 52b22034a..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCustomers.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CartRuleCustomers as CartRuleCustomersContract;
-use Webkul\Discount\Models\CartRuleProxy as CartRule;
-
-class CartRuleCustomers extends Model implements CartRuleCustomersContract
-{
-    protected $table = 'cart_rule_customers';
-
-    protected $guarded = ['created_at', 'updated_at'];
-
-    public function cart_rule()
-    {
-        return $this->belongsTo(CartRule::modelClass(), 'cart_rule_id');
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCustomersProxy.php b/packages/Webkul/Discount/src/Models/CartRuleCustomersProxy.php
deleted file mode 100644
index fed8df2c8..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleCustomersProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CartRuleCustomersProxy extends ModelProxy
-{
-
-}
diff --git a/packages/Webkul/Discount/src/Models/CartRuleLabelProxy.php b/packages/Webkul/Discount/src/Models/CartRuleLabelProxy.php
deleted file mode 100644
index f60303b63..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleLabelProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CartRuleLabelsProxy extends ModelProxy
-{
-
-}
diff --git a/packages/Webkul/Discount/src/Models/CartRuleLabels.php b/packages/Webkul/Discount/src/Models/CartRuleLabels.php
deleted file mode 100644
index 0f2570e5b..000000000
--- a/packages/Webkul/Discount/src/Models/CartRuleLabels.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CartRuleLabels as CartRuleLabelsContract;
-use Webkul\Discount\Models\CartRuleProxy as CartRule;
-use Webkul\Core\Models\LocaleProxy as Locale;
-use Webkul\Core\Models\ChannelProxy as Channel;
-
-class CartRuleLabels extends Model implements CartRuleLabelsContract
-{
-    protected $table = 'cart_rule_labels';
-
-    protected $guarded = ['created_at', 'updated_at'];
-
-    protected $with = ['locale', 'channel'];
-
-    public function cart_rule()
-    {
-        return $this->belongsTo(CartRule::modelClass(), 'cart_rule_id');
-    }
-
-    public function locale()
-    {
-        return $this->hasOne(Locale::modelClass(), 'id', 'locale_id');
-    }
-
-    public function channel()
-    {
-        return $this->hasOne(Channel::modelClass(), 'id', 'channel_id');
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRule.php b/packages/Webkul/Discount/src/Models/CatalogRule.php
deleted file mode 100644
index 1c29bc299..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRule.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CatalogRule as CatalogRuleContract;
-use Webkul\Discount\Models\CatalogRuleChannelsProxy as CatalogRuleChannels;
-use Webkul\Discount\Models\CatalogRuleCustomerGroupsProxy as CatalogRuleCustomerGroups;
-
-class CatalogRule extends Model implements CatalogRuleContract
-{
-    protected $table = 'catalog_rules';
-
-    protected $fillable = ['name', 'description', 'starts_from', 'ends_till', 'status', 'conditions', 'actions', 'end_other_rules', 'action_code', 'discount_amount'];
-
-    public function channels()
-    {
-        return $this->hasMany(CatalogRuleChannels::modelClass());
-    }
-
-    public function customer_groups()
-    {
-        return $this->hasMany(CatalogRuleCustomerGroups::modelClass());
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleChannels.php b/packages/Webkul/Discount/src/Models/CatalogRuleChannels.php
deleted file mode 100644
index d31ebf9de..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRuleChannels.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CatalogRuleChannels as CatalogRuleChannelsContract;
-use Webkul\Discount\Models\CatalogRuleProxy as CatalogRule;
-
-class CatalogRuleChannels extends Model implements CatalogRuleChannelsContract
-{
-    protected $table = 'catalog_rule_channels';
-
-    protected $guarded = ['created_at', 'updated_at'];
-
-    public function catalog_rule()
-    {
-        return $this->belongsTo(CatalogRule::modelClass(), 'catalog_rule_id');
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleChannelsProxy.php b/packages/Webkul/Discount/src/Models/CatalogRuleChannelsProxy.php
deleted file mode 100644
index c723f5482..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRuleChannelsProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CatalogRuleChannelsProxy extends ModelProxy
-{
-
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroups.php b/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroups.php
deleted file mode 100644
index d34e4541f..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroups.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Customer\Models\CustomerGroupProxy;
-use Webkul\Discount\Contracts\CatalogRuleCustomerGroups as CatalogRuleCustomerGroupsContract;
-
-class CatalogRuleCustomerGroups extends Model implements CatalogRuleCustomerGroupsContract
-{
-    protected $table = 'catalog_rule_customer_groups';
-
-    protected $guarded = ['created_at', 'updated_at'];
-
-    public function customer_group()
-    {
-        return $this->hasOne(CustomerGroupProxy::modelClass(), 'id', 'customer_group_id');
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroupsProxy.php b/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroupsProxy.php
deleted file mode 100644
index 12de4951a..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRuleCustomerGroupsProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CatalogRuleCustomerGroupsProxy extends ModelProxy
-{
-
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleProducts.php b/packages/Webkul/Discount/src/Models/CatalogRuleProducts.php
deleted file mode 100644
index ba8e1468f..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRuleProducts.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CatalogRuleProducts as CatalogRuleProductsContract;
-use Webkul\Discount\Models\CatalogRuleChannelsProxy as CatalogRuleChannels;
-use Webkul\Discount\Models\CatalogRuleCustomerGroupsProxy as CatalogRuleCustomerGroups;
-
-class CatalogRuleProducts extends Model implements CatalogRuleProductsContract
-{
-    protected $table = 'catalog_rule_products';
-
-    protected $fillable = ['catalog_rule_id', 'starts_from', 'ends_till', 'customer_group_id', 'channel_id', 'product_id', 'action_code', 'action_amount'];
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleProductsPrice.php b/packages/Webkul/Discount/src/Models/CatalogRuleProductsPrice.php
deleted file mode 100644
index f9597a0a4..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRuleProductsPrice.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Webkul\Discount\Contracts\CatalogRuleProductsPrice as CatalogRuleProductsPriceContract;
-
-class CatalogRuleProductsPrice extends Model implements CatalogRuleProductsPriceContract
-{
-    protected $table = 'catalog_rule_products_price';
-
-    protected $fillable = ['catalog_rule_id', 'starts_from', 'ends_till', 'customer_group_id', 'channel_id', 'product_id', 'rule_price'];
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleProductsPriceProxy.php b/packages/Webkul/Discount/src/Models/CatalogRuleProductsPriceProxy.php
deleted file mode 100644
index 825d4d448..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRuleProductsPriceProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CatalogRuleProductsPriceProxy extends ModelProxy
-{
-
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Models/CatalogRuleProductsProxy.php b/packages/Webkul/Discount/src/Models/CatalogRuleProductsProxy.php
deleted file mode 100644
index 3ffbf4a62..000000000
--- a/packages/Webkul/Discount/src/Models/CatalogRuleProductsProxy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Models;
-
-use Konekt\Concord\Proxies\ModelProxy;
-
-class CatalogRuleProductsProxy extends ModelProxy
-{
-
-}
diff --git a/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php b/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php
deleted file mode 100644
index 8ac038472..000000000
--- a/packages/Webkul/Discount/src/Providers/DiscountServiceProvider.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Providers;
-
-use Illuminate\Support\ServiceProvider;
-
-class DiscountServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
-    }
-
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->registerConfig();
-    }
-
-    /**
-     * To merge the price rule configuration in price rule configuration
-     */
-    protected function registerConfig()
-    {
-        $this->mergeConfigFrom(
-            dirname(__DIR__) . '/Config/rule-conditions.php', 'pricerules'
-        );
-
-        $this->mergeConfigFrom(
-            dirname(__DIR__) . '/Config/discount-rules.php', 'discount-rules'
-        );
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php
deleted file mode 100644
index 4332e00dc..000000000
--- a/packages/Webkul/Discount/src/Providers/ModuleServiceProvider.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Providers;
-
-use Konekt\Concord\BaseModuleServiceProvider;
-
-class ModuleServiceProvider extends BaseModuleServiceProvider
-{
-    protected $models = [
-        \Webkul\Discount\Models\CatalogRule::class,
-        \Webkul\Discount\Models\CatalogRuleChannels::class,
-        \Webkul\Discount\Models\CatalogRuleCustomerGroups::class,
-        \Webkul\Discount\Models\CatalogRuleProducts::class,
-        \Webkul\Discount\Models\CatalogRuleProductsPrice::class,
-        \Webkul\Discount\Models\CartRule::class,
-        \Webkul\Discount\Models\CartRuleChannels::class,
-        \Webkul\Discount\Models\CartRuleCustomerGroups::class,
-        \Webkul\Discount\Models\CartRuleCoupons::class,
-        \Webkul\Discount\Models\CartRuleLabels::class,
-        \Webkul\Discount\Models\CartRuleCouponsUsage::class,
-        \Webkul\Discount\Models\CartRuleCustomers::class,
-        \Webkul\Discount\Models\CartRuleCart::class
-    ];
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleCartRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleCartRepository.php
deleted file mode 100644
index e891556b0..000000000
--- a/packages/Webkul/Discount/src/Repositories/CartRuleCartRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-
-/**
- * CartRuleCartReposotory
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com>
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CartRuleCartRepository extends Repository
-{
-    /**
-     * Specify Model class name
-     *
-     * @return mixed
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CartRuleCart';
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php
deleted file mode 100644
index 2d6209445..000000000
--- a/packages/Webkul/Discount/src/Repositories/CartRuleChannelsRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-
-/**
- * CartRuleRepository
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CartRuleChannelsRepository extends Repository
-{
-    /**
-     * Specify Model class name
-     *
-     * @return mixed
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CartRuleChannels';
-    }
-}
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php
deleted file mode 100644
index 8b0e53f99..000000000
--- a/packages/Webkul/Discount/src/Repositories/CartRuleCouponsRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-
-/**
- * CartRuleCouponsRepository
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CartRuleCouponsRepository extends Repository
-{
-    /**
-     * Specify Model class name
-     *
-     * @return mixed
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CartRuleCoupons';
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php
deleted file mode 100644
index cfd4dbe75..000000000
--- a/packages/Webkul/Discount/src/Repositories/CartRuleCustomerGroupsRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-
-/**
- * CartRuleCustomerGroupsReposotory
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com>
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CartRuleCustomerGroupsRepository extends Repository
-{
-    /**
-     * Specify Model class name
-     *
-     * @return mixed
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CartRuleCustomerGroups';
-    }
-}
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php
deleted file mode 100644
index 2a4d03be7..000000000
--- a/packages/Webkul/Discount/src/Repositories/CartRuleLabelsRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-
-/**
- * CartRuleLabelsRepository
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com>
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CartRuleLabelsRepository extends Repository
-{
-    /**
-     * Specify Model class name
-     *
-     * @return mixed
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CartRuleLabels';
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php b/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php
deleted file mode 100644
index 6005f8d0f..000000000
--- a/packages/Webkul/Discount/src/Repositories/CartRuleRepository.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-use Webkul\Discount\Repositories\CartRuleChannelsRepository as CartRuleChannels;
-use Webkul\Discount\Repositories\CartRuleCustomerGroupsRepository as CartRuleCustomerGroups;
-use Webkul\Discount\Repositories\CartRuleCouponsRepository as CartRuleCoupons;
-use Webkul\Discount\Repositories\CartRuleLabelsRepository as CartRuleLabels;
-use Illuminate\Container\Container as App;
-
-/**
- * CartRuleReposotory
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com>
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CartRuleRepository extends Repository
-{
-    /**
-     * Will hold cartRuleChannelsRepository instance
-     */
-    protected $cartRuleChannels;
-
-    /**
-     * Will hold cartRuleCustomerGroupsRepository instance
-     */
-    protected $cartRuleCustomerGroups;
-
-    /**
-     * Will hold cartRuleCoupons instance
-     */
-    protected $cartRuleCoupons;
-
-    /**
-     * Will hold cartRuleCustomerGroupsRepository instance
-     */
-    protected $cartRuleLabels;
-
-    /**
-     * @param CartRuleChannels $cartRuleChannels
-     * @param CartRuleCustomerGroups $cartRuleCustomerGroups
-     * @param CartRuleCoupons $cartRuleCoupons
-     * @param
-     */
-    public function __construct(
-        CartRuleChannels $cartRuleChannels,
-        CartRuleCustomerGroups $cartRuleCustomerGroups,
-        CartRuleCoupons $cartRuleCoupons,
-        CartRuleLabels $cartRuleLabels,
-        App $app
-        ) {
-        $this->cartRuleChannels = $cartRuleChannels;
-        $this->cartRuleCustomerGroups = $cartRuleCustomerGroups;
-        $this->cartRuleCoupons = $cartRuleCoupons;
-        $this->cartRuleLabel = $cartRuleLabels;
-
-        parent::__construct($app);
-    }
-
-    /**
-     * Specify Model class name
-     *
-     * @return mixed
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CartRule';
-    }
-
-    /**
-     * To sync the customer groups related records
-     */
-    public function CustomerGroupSync($newCustomerGroups, $cartRule)
-    {
-        $oldCustomerGroups = array();
-        foreach ($cartRule->customer_groups as $oldCustomerGroup) {
-            array_push($oldCustomerGroups, ['id' => $oldCustomerGroup->id, 'customer_group_id' => $oldCustomerGroup->customer_group_id]);
-        }
-
-        foreach ($oldCustomerGroups as $key => $oldCustomerGroup) {
-            $found = 0;
-            foreach ($newCustomerGroups as $newCustomerGroup) {
-                if ($oldCustomerGroup['customer_group_id'] == $newCustomerGroup)
-                    $found = 1;
-            }
-
-            if ($found == 0) {
-                $this->cartRuleCustomerGroups->find($oldCustomerGroup['id'])->delete();
-            } else {
-                $found = 0;
-            }
-        }
-
-        //unset the commons
-        if (count($newCustomerGroups) && count($oldCustomerGroups)) {
-            foreach ($oldCustomerGroups as $oldCustomerGroup) {
-                $found = 0;
-                foreach ($newCustomerGroups as $key => $newCustomerGroup) {
-                    if ($oldCustomerGroup['customer_group_id'] == $newCustomerGroup)
-                        unset($newCustomerGroups[$key]);
-                }
-            }
-        }
-
-        //create the left ones
-        foreach ($newCustomerGroups as $newCustomerGroup) {
-            $data['customer_group_id'] = $newCustomerGroup;
-            $data['cart_rule_id'] = $cartRule->id;
-
-            $this->cartRuleCustomerGroups->create($data);
-        }
-
-        return true;
-    }
-
-    /**
-     * To sync the channels related records
-     */
-    public function ChannelSync($newChannels, $cartRule)
-    {
-        $oldChannels = array();
-
-        foreach ($cartRule->channels as $oldChannel) {
-            array_push($oldChannels, ['id' => $oldChannel->id, 'channel_id' => $oldChannel->channel_id]);
-        }
-
-        foreach ($oldChannels as $key => $oldChannel) {
-            $found = 0;
-            foreach ($newChannels as $newChannel) {
-                if ($oldChannel['channel_id'] == $newChannel)
-                    $found = 1;
-            }
-
-            if ($found == 0) {
-                $this->cartRuleChannels->find($oldChannel['id'])->delete();
-            } else {
-                $found = 0;
-            }
-        }
-
-        //unset the commons
-        if (count($newChannels) && count($oldChannels)) {
-            foreach ($oldChannels as $oldChannel) {
-                $found = 0;
-
-                foreach ($newChannels as $key => $newChannel) {
-                    if ($oldChannel['channel_id'] == $newChannel)
-                        unset($newChannels[$key]);
-                }
-            }
-        }
-
-        //create the left ones
-        foreach ($newChannels as $newChannel) {
-            $data['channel_id'] = $newChannel;
-            $data['cart_rule_id'] = $cartRule->id;
-
-            $this->cartRuleChannels->create($data);
-        }
-
-        return true;
-    }
-
-    /**
-     * To sync the labels associated with the cart rule
-     */
-    public function LabelSync($labels, $cartRule)
-    {
-        foreach ($labels as $channelCode => $value) {
-            $localeCode = array_keys($value)[0];
-            $localeValue = array_values($value)[0];
-
-            $updated = 0;
-            foreach ($cartRule->labels as $label) {
-                if ($label->channel->code == $channelCode && $label->locale->code == $localeCode) {
-                    $label->update(['label' => $localeValue]);
-
-                    $updated = 1;
-                }
-            }
-
-            if ($updated == 0) {
-                foreach (core()->getAllChannels() as $channel) {
-                    if ($channel->code == $channelCode)
-                        $newLabel['channel_id'] = $channel->id;
-
-                    foreach($channel->locales as $locale) {
-                        if ($localeCode == $locale->code) {
-                            $newLabel['locale_id'] = $locale->id;
-                            $newLabel['label'] = $localeValue;
-                            $newLabel['cart_rule_id'] = $cartRule->id;
-
-                            $ruleLabelCreated = $this->CartRuleLabels->create($newLabel);
-                        }
-                    }
-                }
-            }
-
-            $updated = 0;
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php
deleted file mode 100644
index 50ade8dbc..000000000
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleChannelsRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-
-/**
- * CatalogRuleChannelsReposotory
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com>
- * @copyright  2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CatalogRuleChannelsRepository extends Repository
-{
-    /**
-     * Specify Model class name
-     *
-     * @return String
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CatalogRuleChannels';
-    }
-}
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php
deleted file mode 100644
index 2d7184610..000000000
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleCustomerGroupsRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-
-/**
- * CatalogRuleCustomerGroupsReposotory
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com>
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CatalogRuleCustomerGroupsRepository extends Repository
-{
-    /**
-     * Specify Model class name
-     *
-     * @return String
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CatalogRuleCustomerGroups';
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPriceRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPriceRepository.php
deleted file mode 100644
index 5becbb9eb..000000000
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsPriceRepository.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-use Webkul\Product\Repositories\ProductRepository as Product;
-use Webkul\Discount\Repositories\CatalogRuleProductsRepository as CatalogRuleProduct;
-use Illuminate\Container\Container as App;
-
-/**
- * CatalogRuleProductsPriceRepository
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright  2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CatalogRuleProductsPriceRepository extends Repository
-{
-    /**
-     * To hold ProductRepository instance
-     */
-    protected $product;
-
-    /**
-     * To hold CatalogRuleProductRepository instance
-     *
-     */
-    protected $catalogRuleProduct;
-
-    /**
-     * @param Product $product
-     */
-    public function __construct(Product $product, CatalogRuleProduct $catalogRuleProduct,App $app)
-    {
-
-        $this->product = $product;
-
-        $this->catalogRuleProduct = $catalogRuleProduct;
-
-        parent::__construct($app);
-    }
-
-    /**
-     * Specify Model class name
-     *
-     * @return String
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CatalogRuleProductsPrice';
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsRepository.php
deleted file mode 100644
index aedf092fd..000000000
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleProductsRepository.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-use Webkul\Product\Repositories\ProductRepository as Product;
-use Illuminate\Container\Container as App;
-
-/**
- * CatalogRuleProductsRepository
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright  2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CatalogRuleProductsRepository extends Repository
-{
-    /**
-     * CatalogRule Apply instance
-     */
-    protected $apply;
-
-    /**
-     * @param App $app
-     */
-    public function __construct(App $app)
-    {
-        parent::__construct($app);
-    }
-
-    /**
-     * Specify Model class name
-     *
-     * @return String
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CatalogRuleProducts';
-    }
-}
diff --git a/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php b/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php
deleted file mode 100644
index da6b684ae..000000000
--- a/packages/Webkul/Discount/src/Repositories/CatalogRuleRepository.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace Webkul\Discount\Repositories;
-
-use Webkul\Core\Eloquent\Repository;
-use Webkul\Discount\Repositories\CatalogRuleChannelsRepository as CatalogRuleChannels;
-use Webkul\Discount\Repositories\CatalogRuleCustomerGroupsRepository as CatalogRuleCustomerGroups;
-use Illuminate\Container\Container as App;
-
-/**
- * CatalogRuleReposotory
- *
- * @author  Prashant Singh <prashant.singh852@webkul.com>
- * @copyright  2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-class CatalogRuleRepository extends Repository
-{
-    /**
-     * Will hold catalogRuleChannelsRepository instance
-     */
-    protected $catalogRuleChannels;
-
-    /**
-     * Will hold catalogRuleCustomerGroupsRepository instance
-     */
-    protected $catalogRuleCustomerGroups;
-
-    /**
-     * @param CatalogRuleChannels $catalogRuleChannels
-     * @param CatalogRuleCustomerGroups $catalogRuleCustomerGroups
-     * @param App $app
-     */
-    public function __construct(CatalogRuleChannels $catalogRuleChannels, CatalogRuleCustomerGroups $catalogRuleCustomerGroups, App $app)
-    {
-        $this->catalogRuleChannels = $catalogRuleChannels;
-
-        $this->catalogRuleCustomerGroups = $catalogRuleCustomerGroups;
-
-        parent::__construct($app);
-    }
-
-    /**
-     * Specify Model class name
-     *
-     * @return String
-     */
-    function model()
-    {
-        return 'Webkul\Discount\Contracts\CatalogRule';
-    }
-
-    /**
-     * To sync the customer groups related records
-     *
-     * @param Array $newCustomerGroups
-     * @param CatalogRule $catalogRule
-     *
-     * @return Boolean
-     */
-    public function CustomerGroupSync($newCustomerGroups, $catalogRule)
-    {
-        $oldCustomerGroups = array();
-        foreach ($catalogRule->customer_groups as $oldCustomerGroup) {
-            array_push($oldCustomerGroups, ['id' => $oldCustomerGroup->id, 'customer_group_id' => $oldCustomerGroup->customer_group_id]);
-        }
-
-        foreach ($oldCustomerGroups as $key => $oldCustomerGroup) {
-            $found = 0;
-
-            foreach($newCustomerGroups as $newCustomerGroup) {
-                if ($oldCustomerGroup['customer_group_id'] == $newCustomerGroup)
-                    $found = 1;
-            }
-
-            if ($found == 0) {
-                $this->catalogRuleCustomerGroups->find($oldCustomerGroup['id'])->delete();
-            } else {
-                $found = 0;
-            }
-        }
-
-        //unset the commons
-        if (count($newCustomerGroups) && count($oldCustomerGroups)) {
-            foreach ($oldCustomerGroups as $oldCustomerGroup) {
-                $found = 0;
-
-                foreach ($newCustomerGroups as $key => $newCustomerGroup) {
-                    if ($oldCustomerGroup['customer_group_id'] == $newCustomerGroup)
-                        unset($newCustomerGroups[$key]);
-                }
-            }
-        }
-
-        //create the left ones
-        foreach ($newCustomerGroups as $newCustomerGroup) {
-            $data['customer_group_id'] = $newCustomerGroup;
-            $data['catalog_rule_id'] = $catalogRule->id;
-
-            $this->catalogRuleCustomerGroups->create($data);
-        }
-
-        return true;
-    }
-
-    /**
-     * To sync the channels related records
-     *
-     * @param Array $newChannels
-     * @param CatalogRule $catalogRule
-     *
-     * @return Boolean
-     */
-    public function ChannelSync($newChannels, $catalogRule)
-    {
-        $oldChannels = array();
-        foreach ($catalogRule->channels as $oldChannel) {
-            array_push($oldChannels, ['id' => $oldChannel->id, 'channel_id' => $oldChannel->channel_id]);
-        }
-
-        foreach ($oldChannels as $key => $oldChannel) {
-            $found = 0;
-            foreach($newChannels as $newChannel) {
-                if ($oldChannel['channel_id'] == $newChannel)
-                    $found = 1;
-            }
-
-            if ($found == 0) {
-                $this->catalogRuleChannels->find($oldChannel['id'])->delete();
-            } else {
-                $found = 0;
-            }
-        }
-
-        //unset the commons
-        if (count($newChannels) && count($oldChannels)) {
-            foreach ($oldChannels as $oldChannel) {
-                $found = 0;
-
-                foreach ($newChannels as $key => $newChannel) {
-                    if ($oldChannel['channel_id'] == $newChannel)
-                        unset($newChannels[$key]);
-                }
-            }
-        }
-
-        //create the left ones
-        foreach ($newChannels as $newChannel) {
-            $data['channel_id'] = $newChannel;
-            $data['catalog_rule_id'] = $catalogRule->id;
-            $this->catalogRuleChannels->create($data);
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Discount/src/resources/manifest.php b/packages/Webkul/Discount/src/resources/manifest.php
deleted file mode 100644
index a5d9bb930..000000000
--- a/packages/Webkul/Discount/src/resources/manifest.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
- return [
-    'name'    => 'Webkul Bagisto Discount',
-    'version' => '0.0.1'
- ];
diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php
index d257ae928..8ca737dd9 100644
--- a/packages/Webkul/Product/src/Type/AbstractType.php
+++ b/packages/Webkul/Product/src/Type/AbstractType.php
@@ -112,6 +112,13 @@ abstract class AbstractType
      */
     protected $hasVariants = false;
 
+    /**
+     * Product children price can be calculated or not
+     *
+     * @var boolean
+     */
+    protected $isChildrenCalculated = false;
+
     /**
      * Create a new product type instance.
      *
@@ -252,6 +259,26 @@ abstract class AbstractType
         return $this;
     }
 
+    /**
+     * Returns children ids
+     *
+     * @return array
+     */
+    public function getChildrenIds()
+    {
+        return [];
+    }
+
+    /**
+     * Check if catalog rule can be applied
+     *
+     * @return bool
+     */
+    public function priceRuleCanBeApplied()
+    {
+        return true;
+    }
+
     /**
      * Return true if this product type is saleable
      *
@@ -291,11 +318,21 @@ abstract class AbstractType
      *
      * @return bool
      */
-    public function hasVariants(): bool
+    public function hasVariants()
     {
         return $this->hasVariants;
     }
 
+    /**
+     * Product children price can be calculated or not
+     *
+     * @return bool
+     */
+    public function isChildrenCalculated()
+    {
+        return $this->isChildrenCalculated;
+    }
+
     /**
      * @param integer $qty
      * @return bool
@@ -452,12 +489,26 @@ abstract class AbstractType
      */
     public function haveSpecialPrice()
     {
-        if (is_null($this->product->special_price) || ! (float) $this->product->special_price) {
-            return false;
-        }
+        $rulePrice = app('Webkul\CatalogRule\Helpers\CatalogRuleProductPrice')->getRulePrice($this->product);
 
-        if (core()->isChannelDateInInterval($this->product->special_price_from, $this->product->special_price_to)) {
-            return true;
+        if ((is_null($this->product->special_price) || ! (float) $this->product->special_price) && ! $rulePrice)
+            return false;
+
+        if (! (float) $this->product->special_price) {
+            if ($rulePrice) {
+                $this->product->special_price = $rulePrice->price;
+
+                return true;
+            }
+        } else {
+            if ($rulePrice && $rulePrice->price <= $this->product->special_price) {
+                $this->product->special_price = $rulePrice->price;
+
+                return true;
+            } else {
+                if (core()->isChannelDateInInterval($this->product->special_price_from, $this->product->special_price_to))
+                    return true;
+            }
         }
 
         return false;
diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php
index dad347cec..52a1345da 100644
--- a/packages/Webkul/Product/src/Type/Bundle.php
+++ b/packages/Webkul/Product/src/Type/Bundle.php
@@ -68,6 +68,13 @@ class Bundle extends AbstractType
      */
     protected $isComposite = true;
 
+    /**
+     * Product children price can be calculated or not
+     *
+     * @var boolean
+     */
+    protected $isChildrenCalculated = true;
+
     /**
      * Create a new product type instance.
      *
@@ -126,6 +133,26 @@ class Bundle extends AbstractType
         return $product;
     }
 
+    /**
+     * Returns children ids
+     *
+     * @return array
+     */
+    public function getChildrenIds()
+    {
+        return array_unique($this->product->bundle_options()->pluck('product_id')->toArray());
+    }
+
+    /**
+     * Check if catalog rule can be applied
+     *
+     * @return bool
+     */
+    public function priceRuleCanBeApplied()
+    {
+        return false;
+    }
+
     /**
      * Get product minimal price
      *
diff --git a/packages/Webkul/Product/src/Type/Configurable.php b/packages/Webkul/Product/src/Type/Configurable.php
index e0f1c3eea..db2890f1d 100644
--- a/packages/Webkul/Product/src/Type/Configurable.php
+++ b/packages/Webkul/Product/src/Type/Configurable.php
@@ -286,6 +286,16 @@ class Configurable extends AbstractType
         return false;
     }
 
+    /**
+     * Returns children ids
+     *
+     * @return array
+     */
+    public function getChildrenIds()
+    {
+        return $this->product->variants()->pluck('id')->toArray();
+    }
+
     /**
      * @param CartItem $cartItem
      * @return bool
diff --git a/packages/Webkul/Product/src/Type/Grouped.php b/packages/Webkul/Product/src/Type/Grouped.php
index 2af33ccb6..0d1559f43 100644
--- a/packages/Webkul/Product/src/Type/Grouped.php
+++ b/packages/Webkul/Product/src/Type/Grouped.php
@@ -104,6 +104,26 @@ class Grouped extends AbstractType
         return $product;
     }
 
+    /**
+     * Returns children ids
+     *
+     * @return array
+     */
+    public function getChildrenIds()
+    {
+        return array_unique($this->product->grouped_products()->pluck('product_id')->toArray());
+    }
+
+    /**
+     * Check if catalog rule can be applied
+     *
+     * @return bool
+     */
+    public function priceRuleCanBeApplied()
+    {
+        return false;
+    }
+
     /**
      * Get product minimal price
      *
@@ -113,17 +133,8 @@ class Grouped extends AbstractType
     {
         $minPrices = [];
 
-        $result = $this->product->grouped_products()
-            ->join('product_flat', 'product_grouped_products.associated_product_id', '=', 'product_flat.product_id')
-            ->selectRaw('IF( product_flat.special_price_from IS NOT NULL
-            AND product_flat.special_price_to IS NOT NULL , IF( NOW( ) >= product_flat.special_price_from
-            AND NOW( ) <= product_flat.special_price_to, IF( product_flat.special_price IS NULL OR product_flat.special_price = 0 , product_flat.price, LEAST( product_flat.special_price, product_flat.price ) ) , product_flat.price ) , IF( product_flat.special_price_from IS NULL , IF( product_flat.special_price_to IS NULL , IF( product_flat.special_price IS NULL OR product_flat.special_price = 0 , product_flat.price, LEAST( product_flat.special_price, product_flat.price ) ) , IF( NOW( ) <= product_flat.special_price_to, IF( product_flat.special_price IS NULL OR product_flat.special_price = 0 , product_flat.price, LEAST( product_flat.special_price, product_flat.price ) ) , product_flat.price ) ) , IF( product_flat.special_price_to IS NULL , IF( NOW( ) >= product_flat.special_price_from, IF( product_flat.special_price IS NULL OR product_flat.special_price = 0 , product_flat.price, LEAST( product_flat.special_price, product_flat.price ) ) , product_flat.price ) , product_flat.price ) ) ) AS min_price')
-            ->where('product_flat.channel', core()->getCurrentChannelCode())
-            ->where('product_flat.locale', app()->getLocale())
-            ->get();
-
-        foreach ($result as $price) {
-            $minPrices[] = $price->min_price;
+        foreach ($this->product->grouped_products as $groupOptionProduct) {
+            $minPrices[] = $groupOptionProduct->associated_product->getTypeInstance()->getMinimalPrice();
         }
 
         if (empty($minPrices))
diff --git a/packages/Webkul/Rule/src/Helpers/Validator.php b/packages/Webkul/Rule/src/Helpers/Validator.php
new file mode 100644
index 000000000..ac510f314
--- /dev/null
+++ b/packages/Webkul/Rule/src/Helpers/Validator.php
@@ -0,0 +1,240 @@
+<?php
+
+namespace Webkul\Rule\Helpers;
+
+use Webkul\Checkout\Facades\Cart;
+
+class Validator
+{
+    /**
+     * Validate cart rule for condition
+     *
+     * @param CartRule|CatalogRule  $rule
+     * @param Cart|CartItem|Product $entity
+     * @return boolean
+     */
+    public function validate($rule, $entity)
+    {
+        if (! $rule->conditions)
+            return true;
+
+        $validConditionCount = $totalConditionCount = 0;
+
+        foreach ($rule->conditions as $condition) {
+            if (! $condition['attribute'] || ! isset($condition['value']) || is_null($condition['value']) ||  $condition['value'] == '')
+                continue;
+
+            if ($entity instanceof \Webkul\Checkout\Contracts\Cart && strpos($condition['attribute'], 'cart|') === false)
+                continue;
+            
+            $totalConditionCount++;
+
+            if ($rule->condition_type == 1) {
+                if (! $this->validateObject($condition, $entity)) {
+                    return false;
+                } else {
+                    $validConditionCount++;
+                }
+            } else {
+                if ($this->validateObject($condition, $entity))
+                    return true;
+            }
+        }
+
+        return $validConditionCount == $totalConditionCount ? true : false;
+    }
+
+    /**
+     * Return value for the attribute
+     *
+     * @param array            $condition
+     * @param CartItem|Product $entity
+     * @return boolean
+     */
+    public function getAttributeValue($condition, $entity)
+    {
+        $chunks = explode('|', $condition['attribute']);
+
+        $attributeNameChunks = explode('::', $chunks[1]);
+
+        $attributeCode = $attributeNameChunks[count($attributeNameChunks) - 1];
+
+        switch (current($chunks)) {
+            case 'cart':
+                $cart = $entity instanceof \Webkul\Checkout\Contracts\Cart ? $entity : $entity->cart;
+
+                if (in_array($attributeCode, ['postcode', 'state', 'country'])) {
+                    if (! $cart->shipping_address)
+                        return;
+
+                    return $cart->shipping_address->{$attributeCode};
+                } else if ($attributeCode == 'shipping_method') {
+                    if (! $cart->shipping_method)
+                        return;
+
+                    $shippingChunks = explode('_', $cart->shipping_method);
+
+                    return current($shippingChunks);
+                } else if ($attributeCode == 'payment_method') {
+                    if (! $cart->payment)
+                        return;
+
+                    return $cart->payment->method;
+                } else {
+                    return $cart->{$attributeCode};
+                }
+
+            case 'cart_item':
+                return $entity->{$attributeCode};
+
+            case 'product':
+                if ($attributeCode == 'category_ids') {
+                    $value = $entity->product
+                                ? $entity->product->categories()->pluck('id')->toArray()
+                                : $entity->categories()->pluck('id')->toArray();
+                    
+                    return $value;
+                } else {
+                    $value = $entity->product
+                                ? $entity->product->{$attributeCode}
+                                : $entity->{$attributeCode};
+
+                    if (! in_array($condition['attribute_type'], ['multiselect', 'checkbox']))
+                        return $value;
+    
+                    return $value ? explode(',', $value) : [];
+                }
+        }
+    }
+
+    /**
+     * Validate object
+     *
+     * @param array    $condition
+     * @param CartItem $entity
+     * @return bool
+     */
+    private function validateObject($condition, $entity)
+    {
+        $validated = false;
+
+        foreach ($this->getAllItems($this->getAttributeScope($condition), $entity) as $item) {
+            $attributeValue = $this->getAttributeValue($condition, $item);
+
+            if ($validated = $this->validateAttribute($condition, $attributeValue))
+                break;
+        }
+
+        return $validated;
+    }
+
+    /**
+     * Return all cart items
+     *
+     * @param string                $attributeScope
+     * @param Cart|CartItem|Product $item
+     * @return array
+     */
+    private function getAllItems($attributeScope, $item)
+    {
+        if ($attributeScope === 'parent') {
+            return [$item];
+        } elseif ($attributeScope === 'children') {
+            return $item->children ?: [$item];
+        } else {
+            $items = $item->children ?: [];
+
+            $items[] = $item;
+        }
+
+        return $items;
+    }
+
+    /**
+     * Validate object
+     *
+     * @param array $condition
+     * @return string
+     */
+    private function getAttributeScope($condition)
+    {
+        $chunks = explode('|', $condition['attribute']);
+
+        $attributeNameChunks = explode('::', $chunks[1]);
+
+        return count($attributeNameChunks) == 2 ? $attributeNameChunks[0] : null;
+    }
+
+    /**
+     * Validate attribute value for condition
+     *
+     * @param array $condition
+     * @param mixed $attributeValue
+     * @return boolean
+     */
+    public function validateAttribute($condition, $attributeValue)
+    {
+        switch ($condition['operator']) {
+            case '==': case '!=':
+                if (is_array($condition['value'])) {
+                    if (! is_array($attributeValue))
+                        return false;
+
+                    $result = ! empty(array_intersect($condition['value'], $attributeValue));
+                } else {
+                    if (is_array($attributeValue)) {
+                        $result = count($attributeValue) == 1 && array_shift($attributeValue) == $condition['value'];
+                    } else {
+                        $result = $attributeValue == $condition['value'];
+                    }
+                }
+
+                break;
+
+            case '<=': case '>':
+                if (! is_scalar($attributeValue))
+                    return false;
+
+                $result = $attributeValue <= $condition['value'];
+
+                break;
+
+            case '>=': case '<':
+                if (! is_scalar($attributeValue))
+                    return false;
+
+                $result = $attributeValue >= $condition['value'];
+
+                break;
+
+            case '{}': case '!{}':
+                if (is_scalar($attributeValue) && is_array($condition['value'])) {
+                    foreach ($condition['value'] as $item) {
+                        if (stripos($attributeValue, $item) !== false) {
+                            $result = true;
+
+                            break;
+                        }
+                    }
+                } else if (is_array($condition['value'])) {
+                    if (! is_array($attributeValue))
+                        return false;
+
+                    $result = ! empty(array_intersect($condition['value'], $attributeValue));
+                } else {
+                    if (is_array($attributeValue)) {
+                        $result = in_array($condition['value'], $attributeValue);
+                    } else {
+                        $result = (strpos($attributeValue, $condition['value']) !== false) ? true : false;
+                    }
+                }
+
+                break;
+        }
+
+        if (in_array($condition['operator'], ['!=', '>', '<', '!{}']))
+            $result = ! $result;
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Rule/src/Providers/RuleServiceProvider.php b/packages/Webkul/Rule/src/Providers/RuleServiceProvider.php
new file mode 100644
index 000000000..2a48f4d5d
--- /dev/null
+++ b/packages/Webkul/Rule/src/Providers/RuleServiceProvider.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Webkul\Rule\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class RuleServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Sales/src/Database/Migrations/2019_11_30_124437_add_applied_cart_rule_ids_column_in_orders_table.php b/packages/Webkul/Sales/src/Database/Migrations/2019_11_30_124437_add_applied_cart_rule_ids_column_in_orders_table.php
new file mode 100644
index 000000000..6ee96be4b
--- /dev/null
+++ b/packages/Webkul/Sales/src/Database/Migrations/2019_11_30_124437_add_applied_cart_rule_ids_column_in_orders_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAppliedCartRuleIdsColumnInOrdersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('orders', function (Blueprint $table) {
+            $table->string('applied_cart_rule_ids')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('orders', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
index b23c42b4c..ddd139e7e 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
@@ -155,4 +155,52 @@ class CartController extends Controller
 
         return redirect()->back();
     }
+
+    /**
+     * Apply coupon to the cart
+     *
+     * @return \Illuminate\Http\JsonResponse
+    */
+    public function applyCoupon()
+    {
+        $couponCode = request()->get('code');
+
+        try {
+            if (strlen($couponCode)) {
+                Cart::setCouponCode($couponCode)->collectTotals();
+
+                if (Cart::getCart()->coupon_code == $couponCode) {
+                    return response()->json([
+                        'success' => true,
+                        'message' => trans('shop::app.checkout.total.success-coupon')
+                    ]);
+                }
+            }
+
+            return response()->json([
+                'success' => false,
+                'message' => trans('shop::app.checkout.total.invalid-coupon')
+            ]);
+        } catch (\Exception $e) {
+            return response()->json([
+                'success' => false,
+                'message' => trans('shop::app.checkout.total.coupon-apply-issue')
+            ]);
+        }
+    }
+
+    /**
+     * Apply coupon to the cart
+     *
+     * @return \Illuminate\Http\JsonResponse
+    */
+    public function removeCoupon()
+    {
+        Cart::removeCouponCode()->collectTotals();
+
+        return response()->json([
+            'success' => true,
+            'message' => trans('shop::app.checkout.total.remove-coupon')
+        ]);
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
index a77f66752..12dad01aa 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@@ -8,9 +8,6 @@ use Webkul\Shipping\Facades\Shipping;
 use Webkul\Payment\Facades\Payment;
 use Webkul\Checkout\Http\Requests\CustomerAddressForm;
 use Webkul\Sales\Repositories\OrderRepository;
-use Webkul\Discount\Helpers\Cart\CouponAbleRule as Coupon;
-use Webkul\Discount\Helpers\Cart\NonCouponAbleRule as NonCoupon;
-use Webkul\Discount\Helpers\Cart\ValidatesDiscount;
 use Webkul\Customer\Repositories\CustomerRepository;
 
 /**
@@ -22,13 +19,6 @@ use Webkul\Customer\Repositories\CustomerRepository;
  */
 class OnepageController extends Controller
 {
-    /**
-     * OrderRepository object
-     *
-     * @var array
-     */
-    protected $orderRepository;
-
     /**
      * Contains route related configuration
      *
@@ -37,21 +27,11 @@ class OnepageController extends Controller
     protected $_config;
 
     /**
-     * CouponAbleRule instance object
+     * OrderRepository object
      *
+     * @var array
      */
-    protected $coupon;
-
-    /**
-     * NoncouponAbleRule instance object
-     *
-     */
-    protected $nonCoupon;
-
-    /**
-     * ValidatesDiscount instance object
-     */
-    protected $validatesDiscount;
+    protected $orderRepository;
 
      /**
      * customerRepository instance object
@@ -61,25 +41,17 @@ class OnepageController extends Controller
     /**
      * Create a new controller instance.
      *
-     * @param  \Webkul\Attribute\Repositories\OrderRepository  $orderRepository
+     * @param  \Webkul\Attribute\Repositories\OrderRepository   $orderRepository
+     * @param  \Webkul\Customer\Repositories\CustomerRepository $customerRepository
      * @return void
      */
     public function __construct(
         OrderRepository $orderRepository,
-        Coupon $coupon,
-        NonCoupon $nonCoupon,
-        ValidatesDiscount $validatesDiscount,
         CustomerRepository $customerRepository
     )
     {
-        $this->coupon = $coupon;
-
-        $this->nonCoupon = $nonCoupon;
-
         $this->orderRepository = $orderRepository;
 
-        $this->validatesDiscount = $validatesDiscount;
-
         $this->customerRepository = $customerRepository;
 
         $this->_config = request('_config');
@@ -100,8 +72,6 @@ class OnepageController extends Controller
         if (! auth()->guard('customer')->check() && $cart->haveDownloadableItems())
             return redirect()->route('customer.session.index');
 
-        $this->nonCoupon->apply();
-
         Cart::collectTotals();
 
         return view($this->_config['view'], compact('cart'));
@@ -139,8 +109,6 @@ class OnepageController extends Controller
         } else {
             $cart = Cart::getCart();
 
-            $this->nonCoupon->apply();
-
             Cart::collectTotals();
 
             if ($cart->haveStockableItems()) {
@@ -166,8 +134,6 @@ class OnepageController extends Controller
         if (Cart::hasError() || !$shippingMethod || !Cart::saveShippingMethod($shippingMethod))
             return response()->json(['redirect_url' => route('shop.checkout.cart.index')], 403);
 
-        $this->nonCoupon->apply();
-
         Cart::collectTotals();
 
         return response()->json(Payment::getSupportedPaymentMethods());
@@ -185,8 +151,6 @@ class OnepageController extends Controller
         if (Cart::hasError() || ! $payment || ! Cart::savePaymentMethod($payment))
             return response()->json(['redirect_url' => route('shop.checkout.cart.index')], 403);
 
-        $this->nonCoupon->apply();
-
         Cart::collectTotals();
 
         $cart = Cart::getCart();
@@ -253,23 +217,53 @@ class OnepageController extends Controller
     {
         $cart = Cart::getCart();
 
-        $this->validatesDiscount->validate();
-
-        if ($cart->haveStockableItems() && ! $cart->shipping_address) {
+        if ($cart->haveStockableItems() && ! $cart->shipping_address)
             throw new \Exception(trans('Please check shipping address.'));
-        }
 
-        if (! $cart->billing_address) {
+        if (! $cart->billing_address)
             throw new \Exception(trans('Please check billing address.'));
-        }
 
-        if ($cart->haveStockableItems() && ! $cart->selected_shipping_rate) {
+        if ($cart->haveStockableItems() && ! $cart->selected_shipping_rate)
             throw new \Exception(trans('Please specify shipping method.'));
-        }
 
-        if (! $cart->payment) {
+        if (! $cart->payment)
             throw new \Exception(trans('Please specify payment method.'));
-        }
+    }
+
+    /**
+     * Check Customer is exist or not
+     *
+     * @return Response
+     */
+    public function checkExistCustomer()
+    {
+       $customer = $this->customerRepository->findOneWhere([
+            'email' => request()->email
+       ]);
+
+       if (! is_null($customer))
+           return 'true';
+
+       return 'false';
+    }
+
+    /**
+     * Login for checkout
+     *
+     * @return Response
+     */
+    public function loginForCheckout()
+    {
+        $this->validate(request(), [
+            'email' => 'required|email'
+        ]);
+
+        if (! auth()->guard('customer')->attempt(request(['email', 'password'])))
+            return response()->json(['error' => trans('shop::app.customer.login-form.invalid-creds')]);
+
+        Cart::mergeCart();
+
+        return response()->json(['success' => 'Login successfully']);
     }
 
     /**
@@ -333,40 +327,4 @@ class OnepageController extends Controller
                 ], 422);
         }
     }
-
-    /**
-     * Check Customer is exist or not
-     *
-     * @return Response
-     */
-    public function checkExistCustomer()
-    {
-       //check customer is exist or not
-       $customer = $this->customerRepository->findOneWhere([
-        'email' => request()->email
-       ]);
-
-        //if customer is exist
-       if (! is_null($customer)) {
-           return 'true';
-       }
-       return 'false';
-    }
-
-    //login for checkout
-    public function loginForCheckout()
-    {
-        $this->validate(request(), [
-            'email' => 'required|email'
-        ]);
-
-        if (! auth()->guard('customer')->attempt(request(['email', 'password']))) {
-            return response()->json(['error' => trans('shop::app.customer.login-form.invalid-creds')]);
-        }
-
-        //Event passed to prepare cart after login
-        Cart::mergeCart();
-
-        return response()->json(['success' => 'Login successfully']);
-    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php b/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php
index 6a8a0bc7b..f10fd3196 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php
@@ -3,11 +3,7 @@
 
 namespace Webkul\Shop\Http\Controllers;
 
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\Facades\DB;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Webkul\Category\Models\CategoryTranslation;
-use Webkul\Product\Models\ProductFlat;
+use Illuminate\Http\Request;
 use Webkul\Category\Repositories\CategoryRepository;
 use Webkul\Product\Repositories\ProductRepository;
 
@@ -51,24 +47,31 @@ class ProductsCategoriesProxyController extends Controller
     }
 
     /**
-     * Display a listing of the resource which can be a category or a product.
+     * Show product or category view. If neither category nor product matches,
+     * abort with code 404.
      *
-     *
-     * @param string $slugOrPath
+     * @param Request $request
      *
      * @return \Illuminate\View\View
      */
-    public function index(string $slugOrPath)
+    public function index(Request $request)
     {
-        if ($category = $this->categoryRepository->findByPath($slugOrPath)) {
-            return view($this->_config['category_view'], compact('category'));
-        }
+        $slugOrPath = trim($request->getPathInfo(), '/');
 
-        if ($product = $this->productRepository->findBySlug($slugOrPath)) {
+        if (preg_match('/^([a-z0-9-]+\/?)+$/', $slugOrPath)) {
 
-            $customer = auth()->guard('customer')->user();
+            if ($category = $this->categoryRepository->findByPath($slugOrPath)) {
+
+                return view($this->_config['category_view'], compact('category'));
+            }
+
+            if ($product = $this->productRepository->findBySlug($slugOrPath)) {
+
+                $customer = auth()->guard('customer')->user();
+
+                return view($this->_config['product_view'], compact('product', 'customer'));
+            }
 
-            return view($this->_config['product_view'], compact('product', 'customer'));
         }
 
         abort(404);
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index 129c625fa..db644a6d0 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -34,10 +34,10 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
         'view' => 'shop::checkout.cart.index'
     ])->name('shop.checkout.cart.index');
 
-        Route::post('checkout/check/coupons', 'Webkul\Shop\Http\Controllers\OnepageController@applyCoupon')->name('shop.checkout.check.coupons');
-
-        Route::post('checkout/remove/coupon', 'Webkul\Shop\Http\Controllers\OnepageController@removeCoupon')->name('shop.checkout.remove.coupon');
+    Route::post('checkout/cart/coupon', 'Webkul\Shop\Http\Controllers\CartController@applyCoupon')->name('shop.checkout.cart.coupon.apply');
 
+    Route::delete('checkout/cart/coupon', 'Webkul\Shop\Http\Controllers\CartController@removeCoupon')->name('shop.checkout.coupon.remove.coupon');
+    
     //Cart Items Add
     Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->defaults('_config', [
         'redirect' => 'shop.checkout.cart.index'
@@ -297,13 +297,10 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
 
     Route::get('page/{slug}', 'Webkul\CMS\Http\Controllers\Shop\PagePresenterController@presenter')->name('shop.cms.page');
 
-    Route::get('{slugOrPath}', \Webkul\Shop\Http\Controllers\ProductsCategoriesProxyController::class . '@index')
+    Route::fallback(\Webkul\Shop\Http\Controllers\ProductsCategoriesProxyController::class . '@index')
         ->defaults('_config', [
             'product_view' => 'shop::products.view',
             'category_view' => 'shop::products.index'
         ])
-        ->where('slugOrPath', '^([a-z0-9-]+\/?)+$')
         ->name('shop.productOrCategory.index');
-
-    Route::fallback('Webkul\Shop\Http\Controllers\HomeController@notFound');
 });
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 6b4e35b19..4f6ae0e9b 100755
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -2478,6 +2478,32 @@ section.cart {
     }
 }
 
+.coupon-container {
+    .discount-control {
+        .control-group {
+            margin-top: 20px;
+
+            .control {
+                width: 100%;
+            }
+        }
+    }
+
+    .applied-coupon-details {
+        margin-top: 30px;
+
+        .right {
+            float: right;
+
+            .icon {
+                vertical-align: text-bottom;
+                margin-bottom: 1px;
+                cursor: pointer;
+            }
+        }
+    }
+}
+
 .order-summary {
     h3 {
         font-size: 16px;
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 7095c10b6..27547f8c4 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -499,7 +499,8 @@ return [
             'free-desc' => 'This is a free shipping',
             'flat-desc' => 'This is a flat rate',
             'password' => 'Password',
-            'login-exist-message' => 'You already have an account with us, Sign in or continue as guest.'
+            'login-exist-message' => 'You already have an account with us, Sign in or continue as guest.',
+            'enter-coupon-code' => 'Enter Coupon Code'
         ],
 
         'total' => [
@@ -513,9 +514,12 @@ return [
             'disc-amount' => 'Amount discounted',
             'new-grand-total' => 'New Grand Total',
             'coupon' => 'Coupon',
-            'coupon-applied' => 'Coupon Applied',
+            'coupon-applied' => 'Applied Coupon',
             'remove-coupon' => 'Remove Coupon',
-            'cannot-apply-coupon' => 'Cannot Apply Coupon'
+            'cannot-apply-coupon' => 'Cannot Apply Coupon',
+            'invalid-coupon' => 'Coupon code is invalid.',
+            'success-coupon' => 'Coupon code applied successfully.',
+            'coupon-apply-issue' => 'Coupon code can\'t be applied.'
         ],
 
         'success' => [
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php
new file mode 100644
index 000000000..090740935
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php
@@ -0,0 +1,119 @@
+@if ($cart)
+    <script type="text/x-template" id="coupon-component-template">
+        <div class="coupon-container">    
+            <div class="discount-control">
+                <form class="coupon-form" method="post" @submit.prevent="applyCoupon">
+                    <div class="control-group" :class="[error_message ? 'has-error' : '']">
+                        <input type="text" class="control" v-model="coupon_code" name="code" placeholder="{{ __('shop::app.checkout.onepage.enter-coupon-code') }}">
+
+                        <div class="control-error">@{{ error_message }}</div>
+                    </div>
+
+                    <button class="btn btn-lg btn-black" :disabled="disable_button">{{ __('shop::app.checkout.onepage.apply-coupon') }}</button>
+                </form>
+            </div>
+
+            <div class="applied-coupon-details" v-if="applied_coupon">
+                <label>{{ __('shop::app.checkout.total.coupon-applied') }}</label>
+
+                <label class="right" style="display: inline-flex; align-items: center;">
+                    <b>@{{ applied_coupon }}</b>
+
+                    <span class="icon cross-icon" title="{{ __('shop::app.checkout.total.remove-coupon') }}" v-on:click="removeCoupon"></span>
+                </label>
+            </div>
+        </div>
+    </script>
+
+    <script>
+        Vue.component('coupon-component', {
+            template: '#coupon-component-template',
+
+            inject: ['$validator'],
+
+            data: function() {
+                return {
+                    coupon_code: '',
+
+                    applied_coupon: "{{ $cart->coupon_code }}",
+
+                    error_message: '',
+
+                    route_name: "{{ request()->route()->getName() }}",
+
+                    disable_button: false
+                }
+            },
+            
+            methods: {
+                applyCoupon: function() {
+                    var self = this;
+
+                    if (! self.coupon_code.length)
+                        return;
+
+                    self.error_message = null;
+
+                    self.disable_button = true;
+
+                    axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.coupon_code})
+                        .then(function(response) {
+                            if (response.data.success) {
+                                self.$emit('onApplyCoupon');
+
+                                self.applied_coupon = self.coupon_code;
+
+                                self.coupon_code = '';
+
+                                window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
+
+                                self.$root.addFlashMessages();
+                                
+                                self.redirectIfCartPage();
+                            } else {
+                                self.error_message = response.data.message;
+                            }
+
+                            self.disable_button = false;
+                        })
+                        .catch(function(error) {
+                            self.error_message = error.response.data.message;
+
+                            self.disable_button = false;
+                        });
+                },
+
+                removeCoupon: function () {
+                    var self = this;
+
+                    axios.delete('{{ route('shop.checkout.coupon.remove.coupon') }}')
+                        .then(function(response) {
+                            self.$emit('onRemoveCoupon')
+
+                            self.applied_coupon = '';
+
+                            window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
+
+                            self.$root.addFlashMessages();
+
+                            self.redirectIfCartPage();
+                        })
+                        .catch(function(error) {
+                            window.flashMessages = [{'type': 'alert-error', 'message': error.response.data.message}];
+
+                            self.$root.addFlashMessages();
+                        });
+                },
+
+                redirectIfCartPage: function() {
+                    if (this.route_name != 'shop.checkout.cart.index')
+                        return;
+
+                    setTimeout(function() {
+                        window.location.reload();
+                    }, 700);
+                }
+            }
+        });
+    </script>
+@endif
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
index 269fc5ca4..294c0c5b6 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -25,7 +25,7 @@
 
                                 <div class="item mt-5">
                                     <div class="item-image" style="margin-right: 15px;">
-                                        <a href="{{ url()->to('/').'/products/'.$item->product->url_key }}"><img src="{{ $productBaseImage['medium_image_url'] }}" /></a>
+                                        <a href="{{ route('shop.productOrCategory.index', $item->product->url_key) }}"><img src="{{ $productBaseImage['medium_image_url'] }}" /></a>
                                     </div>
 
                                     <div class="item-details">
@@ -33,7 +33,7 @@
                                         {!! view_render_event('bagisto.shop.checkout.cart.item.name.before', ['item' => $item]) !!}
 
                                         <div class="item-title">
-                                            <a href="{{ url()->to('/').'/products/'.$item->product->url_key }}">
+                                            <a href="{{ route('shop.productOrCategory.index', $item->product->url_key) }}">
                                                 {{ $item->product->name }}
                                             </a>
                                         </div>
@@ -127,6 +127,8 @@
 
                     @include('shop::checkout.total.summary', ['cart' => $cart])
 
+                    <coupon-component></coupon-component>
+
                     {!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
                 </div>
             </div>
@@ -155,6 +157,7 @@
 @endsection
 
 @push('scripts')
+    @include('shop::checkout.cart.coupon')
 
     <script type="text/x-template" id="quantity-changer-template">
         <div class="quantity control-group" :class="[errors.has(controlName) ? 'has-error' : '']">
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index 7956cc53f..f5e3d787d 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -9,6 +9,8 @@
 @endsection
 
 @push('scripts')
+    @include('shop::checkout.cart.coupon')
+    
     <script type="text/x-template" id="checkout-template">
         <div id="checkout" class="checkout-process">
             <div class="col-main">
@@ -76,12 +78,12 @@
                 <div class="step-content review" v-show="current_step == 4" id="summary-section">
                     <review-section v-if="current_step == 4" :key="reviewComponentKey">
                         <div slot="summary-section">
-                            <summary-section
-                                discount="1"
-                                :key="summeryComponentKey"
+                            <summary-section :key="summeryComponentKey"></summary-section>
+
+                            <coupon-component
                                 @onApplyCoupon="getOrderSummary"
-                                @onRemoveCoupon="getOrderSummary"
-                            ></summary-section>
+                                @onRemoveCoupon="getOrderSummary">
+                            </coupon-component>
                         </div>
                     </review-section>
 
@@ -563,25 +565,9 @@
         Vue.component('summary-section', {
             inject: ['$validator'],
 
-            props: {
-                discount: {
-                    type: [String, Number],
-
-                    default: 0,
-                }
-            },
-
             data: function() {
                 return {
-                    templateRender: null,
-
-                    coupon_code: null,
-
-                    error_message: null,
-
-                    couponChanged: false,
-
-                    changeCount: 0
+                    templateRender: null
                 }
             },
 
@@ -604,53 +590,6 @@
                         this.templateRender() :
                         '')
                     ]);
-            },
-
-            methods: {
-                onSubmit: function() {
-                    var this_this = this;
-                    const emptyCouponErrorText = "Please enter a coupon code";
-                    axios.post('{{ route('shop.checkout.check.coupons') }}', {code: this_this.coupon_code})
-                        .then(function(response) {
-                            this_this.$emit('onApplyCoupon');
-
-                            this_this.couponChanged = true;
-                        })
-                        .catch(function(error) {
-                            this_this.couponChanged = true;
-
-                            this_this.error_message = (error.response.data.message === "The given data was invalid.")?
-                                emptyCouponErrorText :
-                                    (error.response.data.message === "Cannot Apply Coupon")?
-                                        "Sorry, this Coupon code is invalid":error.response.data.message;
-                        });
-                },
-
-                changeCoupon: function() {
-                    if (this.couponChanged == true && this.changeCount == 0) {
-                        this.changeCount++;
-
-                        this.error_message = null;
-
-                        this.couponChanged = false;
-                    } else {
-                        this.changeCount = 0;
-                    }
-                },
-
-                removeCoupon: function () {
-                    var this_this = this;
-
-                    axios.post('{{ route('shop.checkout.remove.coupon') }}')
-                        .then(function(response) {
-                            this_this.$emit('onRemoveCoupon')
-                        })
-                        .catch(function(error) {
-                            window.flashMessages = [{'type' : 'alert-error', 'message' : error.response.data.message}];
-
-                            this_this.$root.addFlashMessages();
-                        });
-                }
             }
         })
     </script>
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
index bbab890a3..70d5d87d6 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
@@ -24,15 +24,12 @@
         </div>
     @endif
 
-
     <div class="item-detail" id="discount-detail" @if ($cart->base_discount_amount && $cart->base_discount_amount > 0) style="display: block;" @else style="display: none;" @endif>
         <label>
-            <b>{{ __('shop::app.checkout.total.disc-amount') }}</b>
+            {{ __('shop::app.checkout.total.disc-amount') }}
         </label>
         <label class="right">
-            <b id="discount-detail-discount-amount">
-                {{ core()->currency($cart->base_discount_amount) }}
-            </b>
+            -{{ core()->currency($cart->base_discount_amount) }}
         </label>
     </div>
 
@@ -43,36 +40,4 @@
             {{ core()->currency($cart->base_grand_total) }}
         </label>
     </div>
-
-    <div @if (! request()->is('checkout/cart')) v-if="parseInt(discount)" @endif>
-        @if (! request()->is('checkout/cart'))
-            @if (! $cart->coupon_code)
-                <div class="discount">
-                    <div class="discount-group">
-                        <form class="coupon-form" method="post" @submit.prevent="onSubmit">
-                            <div class="control-group mt-20" :class="[errors.has('code') ? 'has-error' : '']" style="margin-bottom: 10px">
-                                <input type="text" class="control" value="" v-model="coupon_code" name="code" placeholder="Enter Coupon Code" v-validate="'required'" style="width: 100%" @change="changeCoupon">
-                            </div>
-
-                            <div class="control-error mb-10" v-if="error_message != null" style="color: #FF6472">* @{{ error_message }}</div>
-
-                            <button class="btn btn-lg btn-black" :disabled="couponChanged">{{ __('shop::app.checkout.onepage.apply-coupon') }}</button>
-                        </form>
-                    </div>
-                </div>
-            @else
-                <div class="discount-details-group">
-                    <div class="item-detail">
-                        <label>{{ __('shop::app.checkout.total.coupon-applied') }}</label>
-
-                        <label class="right" style="display: inline-flex; align-items: center;">
-                            <b>{{ $cart->coupon_code }}</b>
-
-                            <span class="icon cross-icon" title="{{ __('shop::app.checkout.total.remove-coupon') }}" v-on:click="removeCoupon"></span>
-                        </label>
-                    </div>
-                </div>
-            @endif
-        @endif
-    </div>
 </div>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
index 0e24927d6..a456ae557 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
@@ -36,13 +36,13 @@
                             <div class="media-info">
                                 <?php $image = $productImageHelper->getProductBaseImage($review->product); ?>
 
-                                <a href="{{ url()->to('/').'/products/'.$review->product->url_key }}" title="{{ $review->product->name }}">
+                                <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
                                     <img class="media" src="{{ $image['small_image_url'] }}"/>
                                 </a>
 
                                 <div class="info">
                                     <div class="product-name">
-                                        <a href="{{ url()->to('/').'/products/'.$review->product->url_key }}" title="{{ $review->product->name }}">
+                                        <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
                                             {{$review->product->name}}
                                         </a>
                                     </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
index 6880d5204..b315da0f1 100755
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@@ -76,7 +76,7 @@
                     @if (core()->getConfigData('general.content.footer.footer_content'))
                         {{ core()->getConfigData('general.content.footer.footer_content') }}
                     @else
-                        {{ trans('admin::app.footer.copy-right') }}
+                        {!! trans('admin::app.footer.copy-right') !!}
                     @endif
                 </p>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
index f8413fcc4..7db9e4e9b 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
@@ -42,7 +42,7 @@
         <div class="sorter">
             <label>{{ __('shop::app.products.sort-by') }}</label>
 
-            <select onchange="window.location.href = this.value">
+            <select style="-webkit-appearance: none;" onchange="window.location.href = this.value">
 
                 @foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
index 0ce797b32..2c1867cfc 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
@@ -64,7 +64,7 @@
                         <span class="control-error" v-if="errors.has('title')">@{{ errors.first('title') }}</span>
                     </div>
 
-                    @if ($guest_review && ! auth()->guard('customer')->user())
+                    @if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user())
                         <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                             <label for="title" class="required">
                                 {{ __('shop::app.reviews.name') }}
diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
index 2780b4d56..cd7da08f1 100644
--- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css
+++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
@@ -7,31 +7,11 @@
   background-image: url("../images/Icon-Velocity.svg");
 }
 
-.router-link-active .velocity-icon,
-.active .velocity-icon {
+.router-link-active .velocity-icon, .active .velocity-icon {
   background-image: url("../images/Icon-Velocity-Active.svg");
 }
 
-.router-link-active.velocity-icon,
-.active.velocity-icon {
-  background-image: url("../images/Icon-Velocity-Active.svg");
-}
-
-.velocity-icon {
-  width: 60px;
-  height: 55px;
-  display: inline-block;
-  background-size: cover;
-  background-image: url("../images/Icon-Velocity.svg");
-}
-
-.router-link-active .velocity-icon,
-.active .velocity-icon {
-  background-image: url("../images/Icon-Velocity-Active.svg");
-}
-
-.router-link-active.velocity-icon,
-.active.velocity-icon {
+.router-link-active.velocity-icon, .active.velocity-icon {
   background-image: url("../images/Icon-Velocity-Active.svg");
 }
 
@@ -252,7 +232,7 @@
   content: "\E92E";
 }
 
-.rango-eye-visible:before {
+.rango-eye-visible:before, .table .action .eye-icon:before {
   content: "\E92F";
 }
 
@@ -700,6 +680,22 @@
   content: "\E99F";
 }
 
+.velocity-icon {
+  width: 60px;
+  height: 55px;
+  display: inline-block;
+  background-size: cover;
+  background-image: url("../images/Icon-Velocity.svg");
+}
+
+.router-link-active .velocity-icon, .active .velocity-icon {
+  background-image: url("../images/Icon-Velocity-Active.svg");
+}
+
+.router-link-active.velocity-icon, .active.velocity-icon {
+  background-image: url("../images/Icon-Velocity-Active.svg");
+}
+
 .qty-btn {
   height: 36px;
   display: inline-block;
@@ -728,9 +724,9 @@
 }
 
 .btn-add-to-cart {
-  padding: 8px;
-  color: #fff !important;
+  padding: 3px 14px !important;
   border-radius: 0px !important;
+  color: #FFFFFF !important;
   border-color: #26A37C !important;
   background-color: #26A37C !important;
 }
@@ -842,6 +838,14 @@
   padding-bottom: 30px;
 }
 
+.review-page-container .submit-btn {
+  font-weight: 600;
+}
+
+.review-page-container .submit-btn button {
+  padding: 10px 15px;
+}
+
 .customer-rating .rating-container {
   padding: 30px 0;
 }
@@ -862,12 +866,13 @@
   top: 12px;
   height: 5px;
   position: relative;
+  background-color: #F7F7F9;
 }
 
 .customer-rating .rating-bar > div {
   width: 0px;
   height: 100%;
-  background-color: black;
+  background-color: #111111;
 }
 
 .customer-rating .btn-write-review {
@@ -930,6 +935,11 @@
   vertical-align: super;
 }
 
+.filters-container .limiter::after {
+  margin-left: 10px;
+  content: 'per page';
+}
+
 .view-mode {
   margin-bottom: 20px;
 }
@@ -1006,60 +1016,90 @@
   width: 100%;
 }
 
-@media only screen and (max-width: 770px) {
-  .modal-container {
-    max-width: 80%;
-    left: 10%;
-    margin-left: 0px;
-  }
-}
-
-#product-card-new {
-  border: none;
+.product-card-new {
+  border: none !important;
   margin: 0 5px 10px 10px;
-  padding-bottom: 10px;
 }
 
-#product-card-new .product-image-container {
+.product-card-new .product-image-container {
   height: 220px;
+  position: relative;
 }
 
-#product-card-new .product-image-container img {
+.product-card-new .product-image-container img {
   width: 100%;
   height: 100%;
 }
 
-#product-card-new .card-current-price {
+.product-card-new .card-current-price {
   font-size: 18px;
 }
 
-#product-card-new .product-rating .stars {
+.product-card-new .product-rating .stars {
   display: inline-block;
 }
 
-#product-card-new .product-rating span {
+.product-card-new .product-rating span {
   font-size: 14px;
   vertical-align: middle;
 }
 
-#product-card-new .card-body > div:not(:last-child) {
+.product-card-new .product-rating .material-icons {
+  font-size: 16px;
+}
+
+.product-card-new .card-body > div:not(:last-child) {
   margin-bottom: 5px;
 }
 
-#product-card-new .product-price .sticker {
+.product-card-new .product-price .sticker {
   display: block;
 }
 
-#product-card-new .cart-wish-wrap .wishlist-icon {
+.product-card-new .cart-wish-wrap .wishlist-icon {
   height: 32px;
   display: table;
+  text-align: right;
 }
 
-#product-card-new .cart-wish-wrap .wishlist-icon > i {
+.product-card-new .cart-wish-wrap .wishlist-icon > i {
   display: table-cell;
   vertical-align: middle;
 }
 
+.quick-view-btn-container {
+  left: -12px;
+  width: 100%;
+  bottom: 10px;
+  display: none;
+  position: absolute;
+}
+
+.quick-view-btn-container span {
+  left: 32%;
+  top: -26px;
+  z-index: 1;
+  font-size: 16px;
+  color: #FFFFFF;
+  position: absolute;
+}
+
+.quick-view-btn-container button {
+  left: 30%;
+  top: -36px;
+  border: none;
+  color: white;
+  font-size: 16px;
+  padding: 5px 10px 7px 24px;
+  position: absolute;
+  opacity: 0.8;
+  background-color: #0D2438;
+}
+
+.product-card-new:hover #quick-view-btn-container {
+  display: block;
+}
+
 .quantity {
   width: 100%;
   padding-bottom: 10px;
@@ -1068,18 +1108,38 @@
 
 .quantity label {
   float: left;
-  padding: 5px 10px 10px 0;
+  padding: 5px 15px 10px 0;
 }
 
 .quantity button,
 .quantity input {
-  font-size: 16px !important;
-  background-color: white;
+  height: 35px;
+  border-radius: 0px;
+  vertical-align: top;
+  padding: 0 10px !important;
+  font-size: 24px !important;
+  font-weight: 600 !important;
   border: 1px solid #CCCCCC !important;
+  color: #000000 !important;
+  background-color: #FFFFFF;
+}
+
+.quantity button:nth-of-type(1) {
+  border-right: 0px !important;
 }
 
 .quantity input {
   width: 50px;
+  cursor: default;
+  font-size: 16px !important;
+  border-left: 0px !important;
+  border-right: 0px !important;
+  text-align: center;
+}
+
+.quantity button:nth-last-of-type(1) {
+  border-radius: 0px;
+  border-left: 0px !important;
 }
 
 .quantity button:active,
@@ -1141,6 +1201,7 @@
 }
 
 .customer-options {
+  top: 40px;
   float: right;
   padding: 20px;
   height: 150px;
@@ -1156,6 +1217,7 @@
 
 .customer-options li {
   padding: 3px 0;
+  height: unset !important;
 }
 
 .customer-options a {
@@ -1237,7 +1299,7 @@
   top: 44px;
   z-index: 100;
   width: 350px;
-  left: -230px;
+  left: -265px;
   position: absolute;
 }
 
@@ -1248,6 +1310,14 @@
   position: relative;
 }
 
+#cart-modal-content .mini-cart-container {
+  height: 100%;
+  font-size: 14px;
+  max-height: 200px;
+  overflow-y: scroll;
+  padding: 10px 15px 0 20px;
+}
+
 #cart-modal-content .small-card-container {
   margin: 0;
   width: 100%;
@@ -1308,6 +1378,7 @@
 .cart-details .cart-details-header .cart-header {
   max-height: 45px;
   margin-bottom: 20px;
+  padding-bottom: 20px !important;
   border-bottom: 2px solid #E5E5E5;
 }
 
@@ -1362,12 +1433,13 @@
 }
 
 .account-content .sidebar {
+  height: 100%;
   border-right: 1px solid #E5E5E5;
 }
 
 .account-content .sidebar .customer-sidebar .account-details {
   text-align: center;
-  padding: 15px 20px;
+  padding: 25px 20px;
 }
 
 .account-content .sidebar .customer-sidebar .account-details .customer-name {
@@ -1389,29 +1461,62 @@
 
 .account-content .sidebar .customer-sidebar .navigation {
   width: 100%;
-  margin-top: 25px;
 }
 
 .account-content .sidebar .customer-sidebar .navigation li {
-  width: 99%;
-  padding: 15px 20px;
+  width: 100%;
+  padding: 10px 15px;
+  margin-bottom: 10px;
 }
 
-.account-content .sidebar .customer-sidebar .navigation li:hover {
-  color: #4D7EA8;
-}
-
-.account-content .sidebar .customer-sidebar .navigation li.active {
-  color: #4D7EA8;
+.account-content .sidebar .customer-sidebar .navigation li:hover, .account-content .sidebar .customer-sidebar .navigation li.active {
+  color: #28557B;
   background-color: #F7F7F9;
 }
 
+.account-content .sidebar .customer-sidebar .navigation li i.icon {
+  font-size: 18px;
+  padding-right: 5px;
+}
+
+.account-content .sidebar .customer-sidebar .navigation li i.icon.profile::before {
+  content: "\E995";
+}
+
+.account-content .sidebar .customer-sidebar .navigation li i.icon.address::before {
+  content: "\E949";
+}
+
+.account-content .sidebar .customer-sidebar .navigation li i.icon.reviews::before {
+  content: "\E97D";
+}
+
+.account-content .sidebar .customer-sidebar .navigation li i.icon.wishlist::before {
+  content: "\E93E";
+}
+
+.account-content .sidebar .customer-sidebar .navigation li i.icon.orders::before {
+  content: "\E931";
+}
+
+.account-content .sidebar .customer-sidebar .navigation li i.icon.downloadables::before {
+  content: "\E926";
+}
+
+.account-content .sidebar .customer-sidebar .navigation li:last-child {
+  margin-bottom: 0;
+}
+
 .account-content .account-layout {
   color: rgba(0, 0, 0, 0.83);
   padding: 15px 20px;
   padding-bottom: 60px;
 }
 
+.account-content .account-layout.right {
+  padding-left: 250px !important;
+}
+
 .account-content .account-layout .account-head {
   margin-bottom: 20px;
 }
@@ -1469,11 +1574,27 @@
   margin-bottom: 40px;
 }
 
+.account-content .account-layout .account-table-content #datagrid-filters .dropdown-filters {
+  right: 0;
+  width: 220px;
+  position: relative;
+  padding: 10px 15px;
+  border: 1px solid #CCCCCC;
+}
+
+.account-content .account-layout .account-table-content #datagrid-filters .dropdown-filters .grid-dropdown-header {
+  display: inline-block;
+}
+
+.account-content .account-layout .account-table-content #datagrid-filters .dropdown-filters .dropdown-list li {
+  list-style: none;
+}
+
 .account-content .account-layout .account-items-list.wishlist-container .col-3 {
   padding-left: 0;
 }
 
-.account-content .account-layout .account-items-list.wishlist-container .col-3 #product-card-new {
+.account-content .account-layout .account-items-list.wishlist-container .col-3 .product-card-new {
   margin: 0;
   width: 22rem;
 }
@@ -1516,17 +1637,9 @@
 .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-left-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-right-icon,
 .account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-left-icon {
   margin: 0;
-  speak: none;
-  line-height: 1;
   font-size: 24px;
   background: unset;
   text-align: center;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  -webkit-font-smoothing: antialiased;
-  font-family: 'Webkul Rango' !important;
 }
 
 .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-right-icon::before {
@@ -1565,11 +1678,7 @@
 }
 
 .wishlist-icon i {
-  color: #F05153;
-}
-
-.wishlist-icon i:hover::before {
-  content: "\E93D";
+  color: #111111;
 }
 
 .checkout-process {
@@ -1585,7 +1694,7 @@
   margin-bottom: 30px;
 }
 
-.checkout-process .scrollable {
+.checkout-process .scrollable, .checkout-process .layered-filter-wrapper {
   padding-top: 25px;
 }
 
@@ -1603,6 +1712,17 @@
   -webkit-transform: scale(1.3);
 }
 
+.checkout-process .styled-select {
+  cursor: pointer;
+}
+
+.checkout-process .styled-select + .select-icon {
+  top: 55%;
+  left: 92%;
+  font-size: 20px;
+  position: absolute;
+}
+
 .address-container .address-holder {
   margin-top: 15px;
 }
@@ -1703,7 +1823,11 @@
 }
 
 .order-summary-container {
-  padding-top: 3%;
+  padding-top: 25px;
+  height: -webkit-max-content;
+  height: -moz-max-content;
+  height: max-content;
+  max-width: 500px !important;
 }
 
 .order-summary-container > div {
@@ -1719,11 +1843,6 @@
   margin-bottom: 20px;
 }
 
-.order-summary-container .order-summary .row > .col-8,
-.order-summary-container .order-summary .row .col-4 {
-  padding-right: 0;
-}
-
 .order-summary-container .order-summary > .row:not(:last-child) {
   margin-bottom: 10px;
 }
@@ -1744,6 +1863,11 @@
   padding: 10px;
 }
 
+.table .action .eye-icon {
+  font-size: 24px;
+  padding-left: 10px;
+}
+
 .search-result-status {
   width: 100%;
   display: -webkit-box;
@@ -1769,10 +1893,14 @@
   margin-top: 20px;
 }
 
-#related-products-carousel #product-card-new:first-child {
+#related-products-carousel .product-card-new:first-child {
   margin-left: 0px !important;
 }
 
+.product-price span:nth-child(1) {
+  font-weight: 600;
+}
+
 .product-price .price-label {
   margin-right: 6px;
 }
@@ -1795,6 +1923,7 @@
 }
 
 .product-price .regular-price {
+  font-weight: 500;
   margin-right: 10px;
   text-decoration: line-through;
 }
@@ -1807,13 +1936,23 @@
   min-height: 65vh;
 }
 
+.search-container {
+  padding: 30px 20px;
+}
+
+.search-container .lg-card-container.list-card {
+  margin: 0 15px;
+}
+
 .search-container :first-child {
-  margin-left: 0px;
+  margin-top: 0px;
 }
 
 .method-sticker {
   font-size: 13px;
   padding: 4px 8px;
+  margin-right: 3px;
+  margin-bottom: 3px;
   text-align: center;
   border-radius: 1px;
   display: inline-block;
@@ -1822,13 +1961,10 @@
 }
 
 .sidebar {
+  z-index: 1000000;
   width: 230px;
 }
 
-.sidebar .category-content {
-  margin-bottom: 10px;
-}
-
 .sidebar .category-content .category-title {
   top: -1px;
   font-weight: 600;
@@ -1862,9 +1998,53 @@
   display: none;
 }
 
+.category-list-container {
+  z-index: 10;
+  padding: 0px !important;
+  background: #FFFFFF;
+  position: absolute !important;
+  -webkit-box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
+          box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
+}
+
+.category-list-container .category {
+  width: 100%;
+  line-height: 2.5rem;
+  display: inline-block;
+}
+
+.category-list-container .category span {
+  top: -4px;
+  position: relative;
+}
+
+.category-list-container li {
+  padding: 7px 0 5px 15px;
+}
+
+.category-list-container li:hover {
+  background: #ECECEC;
+}
+
+.category-list-container .sub-categories {
+  top: 0px;
+  left: 100%;
+  z-index: 100;
+  padding-top: 10px;
+  position: absolute;
+  background: #FFFFFF;
+  border-left: 1px solid #CCCCCC;
+  -webkit-box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
+          box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
+}
+
+.category-list-container .sub-categories li:nth-last-of-type(1) {
+  margin-bottom: 10px;
+}
+
 #sidebar-level-0 {
   display: none;
-  border-top: 1px solid #CCCCCC;
+  z-index: 100000;
 }
 
 .grouped-product-container .grouped-product-list {
@@ -2076,6 +2256,7 @@
 }
 
 .category-container {
+  min-height: 670px;
   margin-left: 15px;
   padding: 40px 15px !important;
 }
@@ -2162,10 +2343,18 @@
           box-shadow: none;
 }
 
+.slides-container .VueCarousel-pagination .VueCarousel-dot {
+  padding: 5px !important;
+}
+
 .slides-container .VueCarousel-dot--active {
   background-color: #26A37C !important;
 }
 
+.slides-container .VueCarousel .VueCarousel-inner {
+  padding-top: 0;
+}
+
 .filter-attributes-item {
   margin-bottom: 10px;
   border-bottom: 1px solid #CCCCCC;
@@ -2199,9 +2388,42 @@
 }
 
 .layered-filter-wrapper {
+  max-height: 670px;
+  margin-bottom: 42px;
   padding: 42px 10px 0 10px;
 }
 
+.layered-filter-wrapper .recently-viewed {
+  margin-top: 20px;
+}
+
+.layered-filter-wrapper .recently-viewed h2 {
+  font-size: 18px;
+}
+
+.selective-div {
+  -webkit-appearance: none;
+}
+
+.select-icon-margin {
+  margin-top: 10px;
+  margin-left: 96px;
+}
+
+.down-icon-position {
+  position: absolute;
+}
+
+.select-icon-show-margin {
+  margin-left: 35px;
+  margin-top: 10px;
+}
+
+.down-arrow-margin {
+  margin-left: 75px;
+  margin-top: 8px;
+}
+
 /* @author Shubham Mehrotra */
 body {
   overflow-x: hidden;
@@ -2212,65 +2434,6 @@ body .container-margin {
   margin: auto 20px;
 }
 
-.account-modal {
-  right: 10px;
-  z-index: 100;
-  width: 350px !important;
-  position: absolute !important;
-}
-
-.account-modal .theme-btn, .account-modal .cart-details .continue-shopping-btn, .cart-details .account-modal .continue-shopping-btn, .account-modal .account-content .account-layout .bottom-toolbar .pagination .page-item, .account-content .account-layout .bottom-toolbar .pagination .account-modal .page-item {
-  padding: .5rem .9rem;
-}
-
-.account-modal .modal-footer .text-left {
-  padding-left: 5px;
-}
-
-.category-list-container {
-  z-index: 10;
-  padding: 0px !important;
-  background: #FFFFFF;
-  position: absolute !important;
-  -webkit-box-shadow: inset -1px 0 0 0 #ECECEC;
-          box-shadow: inset -1px 0 0 0 #ECECEC;
-}
-
-.category-list-container .category {
-  width: 100%;
-  line-height: 2.5rem;
-  display: inline-block;
-}
-
-.category-list-container .category span {
-  top: -4px;
-  position: relative;
-}
-
-.category-list-container li {
-  padding: 7px 0 5px 15px;
-}
-
-.category-list-container li:hover {
-  background: #ECECEC;
-}
-
-.category-list-container .sub-category-container {
-  position: relative;
-}
-
-.category-list-container .sub-categories {
-  top: -50px;
-  left: 100%;
-  z-index: 100;
-  padding-top: 10px;
-  position: absolute;
-  background: #FFFFFF;
-  border-left: 1px solid #CCCCCC;
-  -webkit-box-shadow: inset -1px 0 0 0 #ECECEC;
-          box-shadow: inset -1px 0 0 0 #ECECEC;
-}
-
 .root-category-menu {
   border-bottom: solid 1px #d8e6ed;
 }
@@ -2284,7 +2447,7 @@ body .container-margin {
 }
 
 .banner-icon {
-  height: 525px;
+  height: unset;
   display: inline-block;
 }
 
@@ -2339,20 +2502,6 @@ body .container-margin {
   font-size: 20px;
 }
 
-#header-search-icon {
-  min-width: 40px;
-  background-color: #26A37C;
-}
-
-#header-search-icon i {
-  color: #FFFFFF;
-}
-
-#header-search-icon .material-icons {
-  color: white;
-  padding-top: 5px;
-}
-
 header #search-form > *:focus {
   outline: none;
   -webkit-box-shadow: none;
@@ -2403,6 +2552,10 @@ header #search-form > *:focus {
   padding: 0 10px;
 }
 
+.advertisement-four-container .offers-ct-panel a:first-child {
+  padding-bottom: 15px !important;
+}
+
 .advertisement-four-container .offers-ct-panel .offers-ct-top {
   height: 180px;
 }
@@ -2436,7 +2589,7 @@ header #search-form > *:focus {
   height: 500px;
 }
 
-.advertisement-three-container .col-6:first-child img {
+.advertisement-three-container img {
   height: 100%;
 }
 
@@ -2468,6 +2621,13 @@ header #search-form > *:focus {
 
 /* product policy section */
 /* category with custom option */
+.category-with-custom-options img {
+  width: 100%;
+  max-width: 100%;
+  height: 100%;
+  max-height: 100%;
+}
+
 .category-with-custom-options .row:nth-child(1) {
   margin-bottom: 0px;
 }
@@ -2483,14 +2643,10 @@ header #search-form > *:focus {
 
 .category-with-custom-options .row:nth-child(1) > div:first-child {
   max-height: 345px;
-  background-size: cover;
-  background-image: url("../images/girl.png");
 }
 
 .category-with-custom-options .row:nth-child(1) > div:nth-child(3) {
   max-height: 345px;
-  background-size: cover;
-  background-image: url("../images/man.png");
 }
 
 .category-with-custom-options .row:nth-child(2) .category-image {
@@ -2504,26 +2660,24 @@ header #search-form > *:focus {
 
 .category-with-custom-options .row:nth-child(2) > div:nth-child(2) {
   max-height: 345px;
-  background-size: cover;
-  background-image: url("../images/man.png");
 }
 
 .category-with-custom-options .row:nth-child(2) > div:nth-child(4) {
   max-height: 345px;
-  background-size: cover;
-  background-image: url("../images/girl.png");
 }
 
 .category-with-custom-options .categories-collection {
+  width: 100%;
   height: 100%;
-  min-height: 330px;
+  display: table;
+  min-height: 310px;
   max-height: 345px;
   padding-left: 36px;
   background: #2B2B2B;
 }
 
 .category-with-custom-options .categories-collection h2 {
-  color: white;
+  color: #FFFFFF;
 }
 
 .category-with-custom-options .categories-collection li {
@@ -2531,24 +2685,21 @@ header #search-form > *:focus {
 }
 
 .category-with-custom-options .categories-collection .category-text-content {
-  top: 50%;
-  position: relative;
-  -webkit-transform: translateY(-50%);
-          transform: translateY(-50%);
+  height: 100%;
+  display: table-cell;
+  vertical-align: middle;
 }
 
 /* category with custom option */
 /* hot & popular categories */
 .hot-categories-container .hot-category-wrapper {
-  padding: 15px 10px 15px 0;
+  padding: 0 10px 0 0;
 }
 
 .hot-categories-container .hot-category-wrapper .card {
   height: 100%;
   padding: 20px;
   border: none;
-  box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
-  -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
 }
 
 .hot-categories-container .hot-category-wrapper .velocity-divide-page .left {
@@ -2567,11 +2718,11 @@ header #search-form > *:focus {
 }
 
 .hot-categories-container .hot-category-wrapper:nth-last-child(2) {
-  padding: 15px 0 15px 0px;
+  padding: 0 0 0 0px;
 }
 
 .hot-categories-container .hot-category-wrapper:last-child {
-  padding: 15px 0 15px 10px;
+  padding: 0 0 0 10px;
 }
 
 .hot-categories-container ul,
@@ -2591,8 +2742,6 @@ header #search-form > *:focus {
 .popular-categories-container .popular-category-wrapper .card {
   height: 100%;
   border: none;
-  box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
-  -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
 }
 
 .popular-categories-container .popular-category-wrapper .card .category-image {
@@ -2611,8 +2760,7 @@ header #search-form > *:focus {
 }
 
 .popular-categories-container .popular-category-wrapper .card-description {
-  padding: 25px;
-  margin-top: 15px;
+  padding: 10px 20px;
 }
 
 .popular-categories-container .popular-category-wrapper:first-child {
@@ -2669,24 +2817,26 @@ header #search-form > *:focus {
 
 /* Customer Reviews */
 /* sidebar */
-.categories-sidebar-container {
+.main-content-wrapper {
   margin: 0;
   margin-bottom: 60px;
   display: inline-block;
 }
 
-.categories-sidebar-container > .row.disabled {
+.main-content-wrapper > .row.disabled {
   cursor: not-allowed;
 }
 
-.categories-sidebar-container .main-category {
+.main-content-wrapper .main-category {
   padding: 8px 15px;
+  border-top: 1px solid #CCCCCC;
   border-bottom: 1px solid #CCCCCC;
 }
 
-.categories-sidebar-container .content-list {
+.main-content-wrapper .content-list {
   margin: 0;
   width: 100%;
+  height: 42px;
   text-align: left;
   list-style: none;
   position: relative;
@@ -2694,25 +2844,29 @@ header #search-form > *:focus {
   display: inline-block;
 }
 
-.categories-sidebar-container .content-list ul {
+.main-content-wrapper .content-list ul {
   width: 100%;
   height: 100%;
-  padding-left: 10px;
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;
   display: inline-flex;
   background-color: #4D7EA8;
 }
 
-.categories-sidebar-container .content-list ul li a {
+.main-content-wrapper .content-list ul li a {
   display: block;
   cursor: pointer;
   font-size: 16px;
-  color: #FFFFFF;
+  font-weight: 600;
+  padding: 8px 15px;
   letter-spacing: 0;
   position: relative;
+  color: #FFFFFF;
   text-decoration: none;
-  padding: 8px 20px 8px 5px;
+}
+
+.main-content-wrapper .content-list ul li:hover {
+  background-color: #42719a;
 }
 
 .velocity-divide-page {
@@ -2775,34 +2929,9 @@ header #search-form > *:focus {
   font: 18px "josefin sans", arial;
 }
 
-.quick-view-btn-container {
-  display: none;
-  position: relative;
-}
-
-.quick-view-btn-container span {
-  left: 32%;
-  top: -26px;
-  z-index: 1000;
-  font-size: 16px;
-  color: #FFFFFF;
-  position: absolute;
-}
-
-.quick-view-btn-container button {
-  left: 30%;
-  top: -36px;
-  border: none;
-  color: white;
-  font-size: 16px;
-  padding: 5px 10px 7px 24px;
-  position: absolute;
-  background-color: #0D2438;
-}
-
 body::after {
   /* dark overlay layer - visible when we fire .cd-quick-view */
-  position: fixed;
+  position: absolute;
   top: 0;
   left: 0;
   width: 100%;
@@ -2850,7 +2979,8 @@ body::after {
 }
 
 .cd-quick-view .action-buttons {
-  padding-top: 20px;
+  padding-top: 10px;
+  margin-left: 118px;
 }
 
 .cd-quick-view .action-buttons > span {
@@ -2868,18 +2998,37 @@ body::after {
   padding: 0px !important;
 }
 
+.demo {
+  border: 1px solid red;
+}
+
+.ul-shadow {
+  -webkit-box-shadow: 1px 2px 8px #888888;
+          box-shadow: 1px 2px 8px #888888;
+}
+
+.quick-addtocart-btn {
+  margin-top: 306px;
+  margin-left: -82px;
+}
+
+.model-display-block {
+  display: block;
+}
+
 .footer {
   width: 100%;
   background-color: #ffffff;
   display: inline-block;
 }
 
-.footer .newsletter-subscription {
+.footer .footer-content .newsletter-subscription {
+  color: white;
   padding: 10px 130px;
   background-color: #4d7ea8;
 }
 
-.footer .newsletter-subscription .newsletter-wrapper {
+.footer .footer-content .newsletter-subscription .newsletter-wrapper {
   display: flex;
   display: -webkit-box;
   display: -ms-flexbox;
@@ -2888,53 +3037,50 @@ body::after {
   justify-content: space-between;
 }
 
-.footer .newsletter-subscription .newsletter-wrapper input.subscribe-field {
+.footer .footer-content .newsletter-subscription .newsletter-wrapper input.subscribe-field {
   width: 300px;
-  height: 38px;
   border: none;
+  height: 38px;
   font-size: 18px;
+  max-width: 250px;
   padding: 10px 20px;
   color: rgba(0, 0, 0, 0.83);
-  border-radius: 5px 0px 0px 5px;
 }
 
-.footer .newsletter-subscription .newsletter-wrapper button.subscribe-btn {
-  left: -1px;
+.footer .footer-content .newsletter-subscription .newsletter-wrapper button.subscribe-btn {
+  left: -2px;
   height: 38px;
   font-size: 18px;
+  max-width: 110px;
   line-height: 10px;
   position: relative;
-  border-radius: 0px 5px 5px 0px;
 }
 
-.footer .newsletter-subscription .newsletter-wrapper .social-icons {
+.footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons {
+  height: 100%;
   padding: 20px 0;
   color: #FFFFFF;
 }
 
-.footer .newsletter-subscription .newsletter-wrapper .social-icons i {
+.footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons i {
   margin: 0;
   cursor: pointer;
 }
 
-.footer .newsletter-subscription .newsletter-wrapper .social-icons .within-circle {
+.footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons .within-circle {
   background: #4d7ea8;
   border: 1px solid rgba(255, 255, 255, 0.52);
 }
 
-.footer .newsletter-subscription .newsletter-wrapper .social-icons img {
+.footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons img {
   background: #4d7ea8;
   border: 1px solid rgba(255, 255, 255, 0.52);
   padding-left: 15px;
   padding-right: 15px;
 }
 
-.footer .newsletter-subscription .newsletter-wrapper .subscribe-newsletter {
-  padding: 30px 0;
-}
-
-.footer .footer-content .newsletter-subscription {
-  color: white;
+.footer .footer-content .newsletter-subscription .newsletter-wrapper .subscribe-newsletter {
+  padding: 25px 0 30px 0;
 }
 
 .footer .footer-content > .row {
@@ -2954,7 +3100,15 @@ body::after {
   line-height: 2.5rem;
 }
 
-.footer .footer-content > .row .footer-ct-content > div li a {
+.footer .footer-content > .row .footer-ct-content > div ul {
+  margin-bottom: 0px;
+}
+
+.footer .footer-content > .row .footer-ct-content > div ul li {
+  margin-bottom: 5px;
+}
+
+.footer .footer-content > .row .footer-ct-content > div ul li a {
   color: rgba(255, 255, 255, 0.83);
 }
 
@@ -3013,9 +3167,7 @@ body::after {
 }
 
 .footer .top-brands {
-  padding: 40px;
-  padding-left: 10%;
-  padding-right: 10%;
+  padding: 30px 130px;
 }
 
 .footer .top-brands .top-brands-body ul {
@@ -3024,6 +3176,9 @@ body::after {
 }
 
 .footer .top-brands .top-brands-body ul li {
+  margin-left: 0;
+  font-size: 16px;
+  padding: 15px 0 0 0;
   display: inline-block;
 }
 
@@ -3040,18 +3195,6 @@ body::after {
   padding: 0px 20px;
 }
 
-@media all and (max-width: 720px) {
-  .footer {
-    padding-left: 15px;
-  }
-  .footer .footer-list-container {
-    padding-left: 0px !important;
-  }
-  .footer .currency {
-    display: block !important;
-  }
-}
-
 .padding-15 {
   padding: 15px;
 }
@@ -3064,11 +3207,11 @@ body::after {
   font-weight: 500;
 }
 
-.fw6, .product-view .right .info .price, .product-view .right h3, .product-view .right h4, .product-detail .right .info .price, .product-detail .right h3, .product-detail .right h4 {
+.fw6, .product-detail .right .info .price, .product-detail .right h3, .product-detail .right h4 {
   font-weight: 600;
 }
 
-.fw7, .product-view .right .info h2, .product-detail .right .info h2 {
+.fw7, .product-detail .right .info h2 {
   font-weight: 700;
 }
 
@@ -3076,7 +3219,7 @@ body::after {
   font-size: 13px !important;
 }
 
-.fs14, .categories-sidebar-container {
+.fs14, .main-content-wrapper {
   font-size: 14px;
 }
 
@@ -3084,7 +3227,7 @@ body::after {
   font-size: 15px;
 }
 
-.fs16, .account-content .account-layout .bottom-toolbar .pagination .page-item, .product-view .right, .product-detail .right {
+.fs16, .account-content .account-layout .bottom-toolbar .pagination .page-item, .product-detail .right {
   font-size: 16px;
 }
 
@@ -3096,7 +3239,7 @@ body::after {
   font-size: 17px;
 }
 
-.fs18, .product-view .right h3, .product-detail .right h3 {
+.fs18, .product-detail .right h3 {
   font-size: 18px;
 }
 
@@ -3108,11 +3251,11 @@ body::after {
   font-size: 20px;
 }
 
-.fs24, .product-view .right .info h2, .product-detail .right .info h2 {
+.fs24, .product-detail .right .info h2 {
   font-size: 24px;
 }
 
-.fs30, .product-view .right .info .price, .product-detail .right .info .price .card-current-price {
+.fs30, .product-detail .right .info .price .card-current-price {
   font-size: 30px;
 }
 
@@ -3220,7 +3363,7 @@ body::after {
   margin-right: 10px;
 }
 
-.mr15, .product-view .right .options .quantity > label, .product-view .right .options .buttons *:not(:last-child), .product-detail .right .options .quantity > label, .product-detail .right .options .buttons *:not(:last-child) {
+.mr15, .product-detail .right .options .quantity > label, .product-detail .right .options .buttons *:not(:last-child) {
   margin-right: 15px;
 }
 
@@ -3228,15 +3371,19 @@ body::after {
   margin-right: 20px;
 }
 
-.mb10, .product-view .left .main-product-image {
+.mb5 {
+  margin-bottom: 5px !important;
+}
+
+.mb10 {
   margin-bottom: 10px !important;
 }
 
-.mb15, .product-view .right .info, .product-detail .right .info {
+.mb15, .product-detail .right .info {
   margin-bottom: 15px;
 }
 
-.mb20, .product-view .right > div, .product-view .right .options > *, .product-detail .right > div, .product-detail .right .options > * {
+.mb20, .product-detail .right > div, .product-detail .right .options > * {
   margin-bottom: 20px;
 }
 
@@ -3244,11 +3391,11 @@ body::after {
   margin-bottom: 25px;
 }
 
-.mb30, .product-view .right .customer-reviews .row, .product-detail .right .customer-reviews .row {
+.mb30, .product-detail .right .customer-reviews .row {
   margin-bottom: 30px;
 }
 
-.ml0, .product-view .right > div:not(:first-child), .product-detail .right > div:not(:first-child) {
+.ml0, .product-detail .right > div:not(:first-child) {
   margin-left: 0px !important;
 }
 
@@ -3256,7 +3403,7 @@ body::after {
   margin-left: 5px;
 }
 
-.ml0, .product-view .right > div:not(:first-child), .product-detail .right > div:not(:first-child) {
+.ml0, .product-detail .right > div:not(:first-child) {
   margin-left: 0px;
 }
 
@@ -3277,7 +3424,7 @@ body::after {
   margin: 0px !important;
 }
 
-.no-padding, .product-view .left .main-product-image, .product-view .right h3, .product-detail .right h3 {
+.no-padding, .product-detail .right h3 {
   padding: 0px !important;
 }
 
@@ -3290,6 +3437,10 @@ body::after {
   cursor: pointer;
 }
 
+.cursor-default {
+  cursor: default;
+}
+
 .grey {
   color: #9e9e9e;
 }
@@ -3302,11 +3453,15 @@ body::after {
   color: rgba(255, 255, 255, 0.52);
 }
 
-.display-inbl, .product-view .right .options .quantity > label, .product-detail .right .options .quantity > label {
+.font-clr {
+  color: rgba(0, 0, 0, 0.83);
+}
+
+.display-inbl, .product-detail .right .options .quantity > label {
   display: inline-block !important;
 }
 
-.display-block, .product-view .right .options label, .product-detail .right .options label {
+.display-block, .product-detail .right .options label {
   display: block !important;
 }
 
@@ -3347,6 +3502,7 @@ body::after {
 .theme-btn, .cart-details .continue-shopping-btn, .account-content .account-layout .bottom-toolbar .pagination .page-item {
   border: none;
   cursor: pointer;
+  font-weight: 600;
   padding: 10px 20px;
   vertical-align: top;
   color: #FFFFFF !important;
@@ -3456,7 +3612,7 @@ body::after {
 }
 
 .lg-card-container #quick-view-btn-container :hover {
-  color: white !important;
+  color: #FFFFFF !important;
 }
 
 .lg-card-container .background-image-group {
@@ -3513,11 +3669,11 @@ body::after {
 }
 
 .lg-card-container.list-card .product-rating span {
-  vertical-align: middle;
+  vertical-align: top;
 }
 
 .lg-card-container.list-card .product-information {
-  height: 150px;
+  height: 200px;
   display: table;
 }
 
@@ -3531,7 +3687,7 @@ body::after {
 }
 
 .lg-card-container.list-card .wishlist-icon {
-  height: 34px;
+  height: 40px;
   display: table;
 }
 
@@ -3540,6 +3696,10 @@ body::after {
   vertical-align: middle;
 }
 
+.lg-card-container.list-card .add-to-cart-btn {
+  max-width: 150px;
+}
+
 .lg-card-container.grid-card {
   padding: 15px;
 }
@@ -3560,6 +3720,14 @@ body::after {
   margin-top: 20px;
 }
 
+.small-padding {
+  padding: 3px 4px !important;
+}
+
+.medium-padding {
+  padding: 3px 10px !important;
+}
+
 .general-container {
   cursor: pointer;
 }
@@ -3568,26 +3736,33 @@ body::after {
   border: none;
 }
 
-#product-card-new:hover,
+.product-card-new:hover,
 .lg-card-container:hover,
 .general-container:hover {
-  -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
-          box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
+  -webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+          box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
 }
 
 .lg-card-container:hover .quick-view-btn-container {
   display: block;
 }
 
-.text-nowrap, #product-card-new .product-rating {
+.text-nowrap, .product-card-new .product-rating {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  color: #555555;
 }
 
 .small-card-container {
   cursor: pointer;
   margin-bottom: 10px;
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+}
+
+.small-card-container .material-icons {
+  font-size: 16px;
 }
 
 .small-card-container .product-image-container {
@@ -3597,6 +3772,7 @@ body::after {
 
 .small-card-container .product-image {
   height: 100%;
+  background-position: center;
 }
 
 .small-card-container .card-body {
@@ -3605,6 +3781,11 @@ body::after {
   padding: 10px 0 !important;
 }
 
+.small-card-container .sticker,
+.small-card-container .regular-price {
+  display: none;
+}
+
 .small-card-container:hover {
   -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
           box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
@@ -3669,7 +3850,7 @@ ul.circle-list li.circle:not(:last-child) {
   color: #4D7EA8;
 }
 
-a.unset, .account-content .account-layout .bottom-toolbar .pagination a.page-item {
+a.unset, .account-content .account-layout .bottom-toolbar .pagination a.page-item, .table .action a {
   color: unset !important;
   text-decoration: none !important;
 }
@@ -3678,7 +3859,7 @@ a.remove-decoration {
   text-decoration: none;
 }
 
-a.remove-decoration:hover {
+a.remove-decoration:hover, a.remove-decoration:active, a.remove-decoration:focus {
   text-decoration: none;
 }
 
@@ -3719,8 +3900,12 @@ a.default {
   cursor: pointer;
 }
 
-.VueCarousel .VueCarousel-slide:nth-of-type(1) #product-card-new {
-  margin-left: 0px;
+.VueCarousel .VueCarousel-inner {
+  padding-top: 5px;
+}
+
+.VueCarousel .VueCarousel-slide:nth-of-type(1) .product-card-new {
+  margin-left: 5px;
 }
 
 .navigation-hide .VueCarousel-navigation {
@@ -3731,12 +3916,14 @@ a.default {
   display: none;
 }
 
-.scrollable {
+.scrollable, .layered-filter-wrapper {
   max-height: 100vh;
   overflow-y: scroll;
+  scrollbar-width: none;
+  -ms-overflow-style: none;
 }
 
-.scrollable::-webkit-scrollbar {
+.scrollable::-webkit-scrollbar, .layered-filter-wrapper::-webkit-scrollbar {
   width: 0 !important;
 }
 
@@ -3788,83 +3975,42 @@ button[disabled] {
   vertical-align: middle;
 }
 
-.product-view {
-  padding: 20px;
+.rango-default, .account-content .sidebar .customer-sidebar .navigation li i.icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-right-icon,
+.account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-left-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-right-icon,
+.account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-left-icon, .table .action .eye-icon, header #search-form .btn-group .selectdiv, header #search-form .quantity .selectdiv {
+  speak: none;
+  line-height: 1;
+  font-style: normal;
+  font-weight: normal;
+  text-transform: none;
+  font-variant: normal;
+  -webkit-font-smoothing: antialiased;
+  font-family: 'Webkul Rango' !important;
 }
 
-.product-view .left .main-product-image {
-  width: 465px;
-  height: 450px;
+.quick-view-name {
+  font-size: 24px;
 }
 
-.product-view .left .product-more-images img {
-  height: 109px;
+.quick-view-price {
+  font-size: 30px;
 }
 
-.product-view .left .product-more-images img.active {
-  border: 1px solid #26A37C;
+.description-text {
+  font-size: 14px;
 }
 
-.product-view .left .move-btn {
-  z-index: 10;
-  width: 25px;
-  height: 109px;
-  cursor: pointer;
-  font-size: 22px;
-  font-weight: 700;
-  padding-left: 7px;
-  line-height: 10rem;
-  position: absolute;
-  background: #D6D6D6;
-  color: rgba(0, 0, 0, 0.53);
+.max-height-350 {
+  max-height: 350px;
 }
 
-.product-view .left .move-btn.left {
-  left: -20px;
-}
-
-.product-view .left .move-btn.right {
-  right: 0px;
-}
-
-.product-view .right > div {
-  border-bottom: 1px solid #CCCCCC;
-}
-
-.product-view .right .category-breadcrumb {
-  margin-left: 0;
-  padding: 0 15px;
-}
-
-.product-view .right .reviews > div {
-  display: inline-block;
-}
-
-.product-view .right .info > * {
-  margin-bottom: 10px;
-}
-
-.product-view .right .info .availability button {
-  border: none;
-  color: white;
-  font-weight: 600;
-  padding: 2px 11px;
-  background: #4D7EA8;
-}
-
-.product-view .right .options .box {
-  width: 32px;
-  height: 32px;
-  display: inline-block;
-  background-color: #CCCCCC;
-}
-
-.product-view .right .row.reviews .reviews-text {
-  line-height: 3rem;
+.border-normal {
+  border: 1px solid #DCDCDC;
 }
 
 .product-detail {
   padding-top: 20px;
+  margin-bottom: 60px;
 }
 
 .product-detail .magnifier > img {
@@ -3885,6 +4031,10 @@ button[disabled] {
   padding: 0 15px;
 }
 
+.product-detail .right .reviews {
+  vertical-align: top;
+}
+
 .product-detail .right .reviews > div {
   display: inline-block;
 }
@@ -3905,6 +4055,7 @@ button[disabled] {
   border: none;
   color: white;
   font-weight: 600;
+  cursor: default;
   padding: 2px 11px;
   background: #F05153;
 }
@@ -3930,14 +4081,16 @@ button[disabled] {
 
 .product-detail .right .add-to-cart-btn {
   padding: 0px;
+  max-width: 130px;
 }
 
 .product-detail .right .add-to-cart-btn button {
-  padding: 10px 15px;
   text-transform: uppercase;
+  padding: 9px 15px !important;
 }
 
 .product-detail .right .add-to-cart-btn button span {
+  top: 0;
   font-size: 16px;
 }
 
@@ -3991,6 +4144,7 @@ button[disabled] {
 .product-detail .wishlist-icon {
   height: 46px;
   display: table;
+  padding-left: 10px;
 }
 
 .product-detail .wishlist-icon i {
@@ -3998,6 +4152,256 @@ button[disabled] {
   vertical-align: middle;
 }
 
+.store-meta-images {
+  margin-top: 20px;
+}
+
+.store-meta-images img {
+  width: 100%;
+  height: 100%;
+  max-height: 300px;
+}
+
+.vc-small-screen {
+  display: none;
+}
+
+@media only screen and (max-width: 1100px) {
+  .footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons {
+    width: 100%;
+    padding: 5px 0;
+    text-align: center !important;
+  }
+  .footer .footer-content .newsletter-subscription .newsletter-wrapper .subscribe-newsletter {
+    width: 100%;
+    padding: 10px 0;
+    text-align: center;
+  }
+  .footer .footer-content .footer-statics > div:not(:last-child) {
+    margin-bottom: 30px;
+  }
+}
+
+@media only screen and (max-width: 768px) {
+  .modal-container {
+    left: 10%;
+    max-width: 80%;
+    margin-left: 0px;
+  }
+  .footer .footer-list-container {
+    padding-left: 0px !important;
+  }
+  .footer .currency {
+    display: block !important;
+  }
+}
+
+@media only screen and (max-width: 576px) and (max-width: 768px) and (max-width: 992px) {
+  .main-content-wrapper .vc-header > div {
+    display: none;
+  }
+  .main-content-wrapper .vc-header > div.vc-small-screen {
+    display: block;
+  }
+  .main-content-wrapper .vc-header > div.vc-small-screen img {
+    width: 100%;
+    height: 100%;
+    max-height: 50px;
+  }
+  .main-content-wrapper .vc-header > div.vc-small-screen .hamburger-wrapper {
+    display: table;
+    height: 50px;
+  }
+  .main-content-wrapper .vc-header > div.vc-small-screen .hamburger-wrapper .hamburger {
+    font-size: 24px;
+    display: table-cell;
+    vertical-align: middle;
+  }
+  .main-content-wrapper .vc-header > div.vc-small-screen .right-vc-header {
+    text-align: right;
+    height: 50px;
+  }
+  .main-content-wrapper .vc-header > div.vc-small-screen .right-vc-header * {
+    top: 13px;
+    width: 24px;
+    position: relative;
+    padding-right: 10px;
+  }
+  #top {
+    display: none;
+  }
+  #top + header {
+    display: none;
+  }
+  .product-card-new .cart-wish-wrap .wishlist-icon {
+    text-align: left;
+  }
+  .advertisement-four-container .offers-ct-panel {
+    padding: 8px 0;
+  }
+  .advertisement-four-container .offers-ct-panel a:first-child {
+    padding-bottom: 10px !important;
+  }
+  .advertisement-three-container .top-container img,
+  .advertisement-three-container .bottom-container img {
+    padding: 0px;
+  }
+  .advertisement-three-container .second-panel {
+    padding-top: 10px;
+  }
+  .advertisement-two-container a:nth-of-type(2) {
+    padding: 15px 0 0 0;
+  }
+  .category-with-custom-options {
+    display: none;
+  }
+  .category-with-custom-options.vc-small-screen {
+    display: block;
+  }
+  .category-with-custom-options.vc-small-screen .smart-category-container .col-12 {
+    padding: 0;
+  }
+  .category-with-custom-options.vc-small-screen .smart-category-container:not(:first-child) {
+    padding-top: 20px;
+  }
+  .footer .footer-content .newsletter-subscription .newsletter-wrapper input.subscribe-field {
+    width: 200px;
+  }
+  .popular-category-wrapper {
+    padding: 0px;
+  }
+  .main-content-wrapper {
+    margin-bottom: 25px;
+  }
+  .slides-container .VueCarousel .VueCarousel-pagination button {
+    width: 5px !important;
+    height: 5px !important;
+  }
+  .slides-container .VueCarousel .VueCarousel-pagination .VueCarousel-dot {
+    padding: 2px !important;
+  }
+}
+
+/* fallback */
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format("woff2");
+}
+
+/* fallback */
+@font-face {
+  font-family: 'Material Icons Outlined';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v14/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format("woff2");
+}
+
+/* fallback */
+@font-face {
+  font-family: 'Material Icons Round';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/materialiconsround/v14/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2) format("woff2");
+}
+
+/* fallback */
+@font-face {
+  font-family: 'Material Icons Sharp';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/materialiconssharp/v15/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format("woff2");
+}
+
+/* fallback */
+@font-face {
+  font-family: 'Material Icons Two Tone';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/materialiconstwotone/v13/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2) format("woff2");
+}
+
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}
+
+.material-icons-outlined {
+  font-family: 'Material Icons Outlined';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}
+
+.material-icons-round {
+  font-family: 'Material Icons Round';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}
+
+.material-icons-sharp {
+  font-family: 'Material Icons Sharp';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}
+
+.material-icons-two-tone {
+  font-family: 'Material Icons Two Tone';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}
+
 /*!
  * Bootstrap v3.4.1 (https://getbootstrap.com/)
  * Copyright 2011-2019 Twitter, Inc.
@@ -5616,7 +6020,7 @@ mark,
   text-align: justify;
 }
 
-.text-nowrap, #product-card-new .product-rating {
+.text-nowrap, .product-card-new .product-rating {
   white-space: nowrap;
 }
 
@@ -10977,7 +11381,7 @@ button.close {
   outline: 0;
 }
 
-.modal.fade .modal-dialog, .modal.fade .account-modal {
+.modal.fade .modal-dialog, .modal.fade #top #account + .account-modal, #top .modal.fade #account + .account-modal {
   -webkit-transform: translate(0, -25%);
   transform: translate(0, -25%);
   -webkit-transition: -webkit-transform 0.3s ease-out;
@@ -10986,7 +11390,7 @@ button.close {
   transition: transform 0.3s ease-out, -webkit-transform 0.3s ease-out;
 }
 
-.modal.in .modal-dialog, .modal.in .account-modal {
+.modal.in .modal-dialog, .modal.in #top #account + .account-modal, #top .modal.in #account + .account-modal {
   -webkit-transform: translate(0, 0);
   transform: translate(0, 0);
 }
@@ -10996,7 +11400,7 @@ button.close {
   overflow-y: auto;
 }
 
-.modal-dialog, .account-modal {
+.modal-dialog, #top #account + .account-modal {
   position: relative;
   width: auto;
   margin: 10px;
@@ -11108,7 +11512,7 @@ button.close {
 }
 
 @media (min-width: 768px) {
-  .modal-dialog, .account-modal {
+  .modal-dialog, #top #account + .account-modal {
     width: 600px;
     margin: 30px auto;
   }
@@ -11954,38 +12358,6 @@ button.close {
   }
 }
 
-@font-face {
-  font-family: "Material Icons";
-  font-style: normal;
-  font-weight: 400;
-  src: url("../material-icons/iconfont/MaterialIcons-Regular.eot");
-  /* For IE6-8 */
-  src: local("Material Icons"), local("MaterialIcons-Regular"), url("../material-icons/iconfont/MaterialIcons-Regular.woff2") format("woff2"), url("../material-icons/iconfont/MaterialIcons-Regular.woff") format("woff"), url("../material-icons/iconfont/MaterialIcons-Regular.ttf") format("truetype");
-}
-
-.material-icons {
-  font-family: "Material Icons";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  display: inline-block;
-  line-height: 1;
-  text-transform: none;
-  letter-spacing: normal;
-  word-wrap: normal;
-  white-space: nowrap;
-  direction: ltr;
-  /* Support for all WebKit browsers. */
-  -webkit-font-smoothing: antialiased;
-  /* Support for Safari and Chrome. */
-  text-rendering: optimizeLegibility;
-  /* Support for Firefox. */
-  -moz-osx-font-smoothing: grayscale;
-  /* Support for IE. */
-  -webkit-font-feature-settings: 'liga';
-          font-feature-settings: 'liga';
-}
-
 * {
   margin: 0;
   padding: 0;
@@ -12166,17 +12538,41 @@ body {
 
 #top #account .select-icon {
   top: 0px;
-  left: -3px;
+  left: 0px;
+  padding-left: 5px;
 }
 
 #top #account .welcome-content {
-  width: 150px;
+  float: right;
+  display: table;
+  min-width: 150px;
   cursor: pointer;
   text-align: right;
 }
 
+#top #account .welcome-content * {
+  display: table-cell;
+  vertical-align: middle;
+}
+
 #top #account + .account-modal {
-  height: 135px;
+  right: 10px;
+  z-index: 100;
+  height: -webkit-max-content;
+  height: -moz-max-content;
+  height: max-content;
+  width: 290px !important;
+  position: absolute !important;
+}
+
+#top #account + .account-modal .theme-btn, #top #account + .account-modal .cart-details .continue-shopping-btn, .cart-details #top #account + .account-modal .continue-shopping-btn, #top #account + .account-modal .account-content .account-layout .bottom-toolbar .pagination .page-item, .account-content .account-layout .bottom-toolbar .pagination #top #account + .account-modal .page-item {
+  padding: .5rem .9rem;
+}
+
+#top #account + .account-modal .modal-footer {
+  -webkit-box-pack: unset;
+      -ms-flex-pack: unset;
+          justify-content: unset;
 }
 
 #top > div:last-child {
@@ -12187,14 +12583,17 @@ body {
   height: 100%;
 }
 
-#top > div:last-child .welcome-content {
-  float: right;
-  display: table;
+#top .locale-icon {
+  width: 20px;
+  display: inline-block;
 }
 
-#top > div:last-child .welcome-content * {
-  display: table-cell;
-  vertical-align: middle;
+#top .locale-icon img {
+  width: 100%;
+}
+
+#top .locale-switcher {
+  padding-left: 5px;
 }
 
 .dropdown-menu {
@@ -12220,7 +12619,7 @@ body {
   color: #FFFFFF;
 }
 
-.no-padding, .product-view .left .main-product-image, .product-view .right h3, .product-detail .right h3 {
+.no-padding, .product-detail .right h3 {
   padding: 0px !important;
 }
 
@@ -12304,68 +12703,64 @@ body {
 
 header .logo {
   height: 50px;
+  padding-left: 10px;
 }
 
 header #search-form {
-  height: 35px;
+  height: 40px;
   margin: 5px 0px;
   background: #FFFFFF;
+  padding: 4px 1px 0px 0px;
 }
 
-header #search-form .selectdiv {
-  width: 30%;
-  font-family: 'Webkul Rango' !important;
-  speak: none;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
+header #search-form * {
+  height: 100%;
 }
 
-header #search-form .selectdiv:before {
-  top: 13px;
-  right: 72%;
+header #search-form .btn-group, header #search-form .quantity {
+  max-width: 550px;
+}
+
+header #search-form .btn-group .selectdiv, header #search-form .quantity .selectdiv {
+  width: 170px;
+}
+
+header #search-form .btn-group .selectdiv:before, header #search-form .quantity .selectdiv:before {
+  top: 10px;
+  left: 108px;
   z-index: 10;
   font-size: 16px;
   content: "\E906";
   position: absolute;
 }
 
-header #search-form select {
-  border-radius: 0px;
+header #search-form .btn-group select, header #search-form .quantity select {
   width: 100%;
   height: 100%;
   cursor: pointer;
-  border-right: none;
+  border-radius: 2px 0px 0px 2px;
   border: 1px solid #26A37C;
+  border-right: none;
   font-family: "Source Sans Pro", sans-serif;
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
 }
 
-header #search-form select::-ms-expand {
+header #search-form .btn-group select::-ms-expand, header #search-form .quantity select::-ms-expand {
   display: none;
 }
 
 header #search-form input {
   border-radius: 0px;
-  width: 70%;
+  width: 380px;
   height: 100%;
   font-size: 14px;
   padding: 0 10px;
-  border-left: 0px;
-  border-left: none;
   line-height: 20px;
   letter-spacing: 0;
   border: 1px solid #26A37C;
-}
-
-header #search-form .btn, header #search-form .quantity button, .quantity header #search-form button,
-header #search-form .quantity input, .quantity header #search-form input {
-  height: 40px;
+  border-left: 1px solid #CCCCCC;
 }
 
 header #search-form .btn:hover, header #search-form .quantity button:hover, .quantity header #search-form button:hover,
@@ -12385,6 +12780,16 @@ header #search-form .quantity input:active:hover, .quantity header #search-form
   outline-offset: 0px;
 }
 
+header #search-form #header-search-icon {
+  min-width: 40px;
+  border-radius: 0px 2px 2px 0px;
+  background-color: #26A37C;
+}
+
+header #search-form #header-search-icon i {
+  color: #FFFFFF;
+}
+
 header .mini-cart-container {
   height: 50px;
   padding: 5px 0px;
@@ -12394,7 +12799,7 @@ header .mini-cart-container #mini-cart .mini-cart-content {
   position: relative;
   width: 75px;
   text-align: right;
-  font-family: "SourceSansPro-Semibold";
+  font-weight: 600;
   font-size: 16px;
   color: rgba(0, 0, 0, 0.83);
   letter-spacing: 0;
@@ -12446,7 +12851,7 @@ header .dropdown-menu-large .dropdown-content .item .item-image .thumbnail {
 }
 
 header .dropdown-menu-large .dropdown-content .item .item-name {
-  font-family: "SourceSansPro-Semibold";
+  font-weight: 600;
   font-size: 18px;
   color: rgba(0, 0, 0, 0.83);
   letter-spacing: 0;
@@ -12470,7 +12875,6 @@ header .dropdown-menu-large .dropdown-content .item .item-details .item-qty-pric
 }
 
 header .dropdown-menu-large .dropdown-content .item .item-details .item-qty-price .item-qty {
-  font-family: "SourceSansPro-Regular";
   font-size: 16px;
   color: rgba(0, 0, 0, 0.83);
   letter-spacing: 0;
@@ -12478,7 +12882,7 @@ header .dropdown-menu-large .dropdown-content .item .item-details .item-qty-pric
 }
 
 header .dropdown-menu-large .dropdown-content .item .item-details .item-qty-price .item-price {
-  font-family: "SourceSansPro-Semibold";
+  font-weight: 600;
   font-size: 16px;
   color: rgba(0, 0, 0, 0.83);
   letter-spacing: 0;
@@ -12491,14 +12895,14 @@ header .dropdown-menu-large .dropdown-header {
 }
 
 header .dropdown-menu-large .dropdown-header .sub-total-text {
-  font-family: "SourceSansPro-Semibold";
+  font-weight: 600;
   font-size: 16px;
   color: rgba(0, 0, 0, 0.83);
   letter-spacing: 0;
 }
 
 header .dropdown-menu-large .dropdown-header .cart-sub-total {
-  font-family: "SourceSansPro-Bold";
+  font-weight: 700;
   font-size: 16px;
   color: rgba(0, 0, 0, 0.83);
   letter-spacing: 0;
@@ -12508,7 +12912,7 @@ header .dropdown-menu-large .dropdown-header .cart-sub-total {
 header .dropdown-menu-large .dropdown-footer {
   padding: 10px 10px 0px 10px;
   border-top: 1px solid #CCCCCC;
-  font-family: "SourceSansPro-Bold";
+  font-weight: 700;
   font-size: 16px;
   color: rgba(0, 0, 0, 0.83);
   letter-spacing: 0;
@@ -12552,8 +12956,8 @@ header .dropdown-menu-large .dropdown-footer .checkout-link {
 #nav-menu .navbar .navbar-header .main-category {
   width: 100%;
   overflow: hidden;
-  display: inline-block;
   position: relative;
+  display: inline-block;
   padding: 5px 5px 5px 35px;
 }
 
@@ -12583,7 +12987,7 @@ header .dropdown-menu-large .dropdown-footer .checkout-link {
 #nav-menu .navbar .category-dropdown li.category-list a {
   padding: 10px 0px;
   position: relative;
-  font-family: "SourceSansPro-Semibold";
+  font-weight: 600;
   font-size: 14px;
   color: rgba(0, 0, 0, 0.83);
   letter-spacing: 0;
@@ -12630,15 +13034,15 @@ header .dropdown-menu-large .dropdown-footer .checkout-link {
 }
 
 #nav-menu .secondary-navbar li a {
-  padding: 5px 20px 5px 5px;
-  font-family: SourceSansPro-Semibold;
-  font-size: 16px;
-  color: #FFFFFF;
-  letter-spacing: 0;
   display: block;
-  position: relative;
-  text-decoration: none;
   cursor: pointer;
+  font-size: 16px;
+  font-weight: 600;
+  letter-spacing: 0;
+  position: relative;
+  color: #FFFFFF;
+  text-decoration: none;
+  padding: 5px 20px 5px 5px;
 }
 
 .viewed-products .viewed-products-listing {
@@ -12767,10 +13171,6 @@ i.within-circle {
   height: 50px;
 }
 
-.mb60 {
-  margin-bottom: 60px;
-}
-
 .center_div {
   margin: 0 auto;
   width: 80%;
diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
index abb07d21b..e7559002f 100644
--- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js
+++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
@@ -1149,10 +1149,18 @@ $(document).ready(function () {
                             subCategories1 = $(subCategories1);
 
                             if (type == "mouseover") {
-                                // this.show(subCategories1);
+                                this.show(subCategories1);
+
+                                var sidebarChild = subCategories1.find('.sidebar');
+                                this.show(sidebarChild);
                             } else if (type == "mouseout") {
                                 this.hide(subCategories1);
                             }
+                        } else {
+                            if (type == "mouseout") {
+                                var _sidebar = $('#' + id);
+                                _sidebar.hide();
+                            }
                         }
                     }
                 }
@@ -35536,9 +35544,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 //
 //
 //
+//
+//
 
 /* harmony default export */ __webpack_exports__["default"] = ({
-    props: ['id', 'url', 'addClass', 'categories', 'mainSidebar', 'categoryCount'],
+    props: ['id', 'url', 'addClass', 'parentSlug', 'categories', 'mainSidebar', 'categoryCount'],
 
     data: function data() {
         var slicedCategories = this.categories;
@@ -35548,8 +35558,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
             slicedCategories = this.categories.slice(0, categoryCount);
         }
 
+        if (this.parentSlug) slicedCategories['parentSlug'] = this.parentSlug;
+
         return {
-            slicedCategories: slicedCategories
+            slicedCategories: slicedCategories,
+            sidebarLevel: Math.floor(Math.random() * 1000)
         };
     },
 
@@ -35558,38 +35571,14 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
             var sidebar = $('#' + id);
             if (sidebar && sidebar.length > 0) {
                 sidebar.show();
-            }
-        },
 
-        hover: function hover(index, actionType) {
-            var category = this.categories[index];
+                var actualId = id.replace('sidebar-level-', '');
 
-            if (category.children.length > 0) {
-                var categoryElement = document.getElementById('category-' + category.id);
-                var subCategories = categoryElement.querySelector('.sub-categories');
-
-                if (subCategories.style.display == "" || subCategories.style.display == "none") {
-                    subCategories.style.display = "block";
-                } else {
-                    subCategories.style.display = "none";
+                var sidebarContainer = sidebar.closest('.sub-category-' + actualId);
+                if (sidebarContainer && sidebarContainer.length > 0) {
+                    sidebarContainer.show();
                 }
             }
-        },
-
-        toggleSubCategory: function toggleSubCategory(index) {
-            // let category = this.categories[index];
-
-            // if (category.children.length > 0) {
-            //     let categoryElement = document.getElementById(`category-${category.id}`);
-            //     let subCategories = categoryElement.querySelector('.sub-categories');
-
-            //     if (subCategories.style.display == "" || subCategories.style.display == "none") {
-            //         subCategories.style.display = "block";
-            //     } else {
-            //         subCategories.style.display = "none";
-            //     }
-
-            // }
         }
     }
 });
@@ -35641,7 +35630,13 @@ var render = function() {
                       staticClass: "category unset",
                       class: category.children.length > 0 ? "fw6" : "",
                       attrs: {
-                        href: _vm.url + "/" + category["translations"][0].slug
+                        href:
+                          _vm.url +
+                          "/" +
+                          (_vm.slicedCategories.parentSlug
+                            ? _vm.slicedCategories.parentSlug + "/"
+                            : "") +
+                          category["translations"][0].slug
                       }
                     },
                     [
@@ -35667,10 +35662,13 @@ var render = function() {
                           }
                         },
                         [
-                          category.image
+                          category.category_icon_path
                             ? _c("img", {
                                 attrs: {
-                                  src: _vm.url + "/storage/" + category.image
+                                  src:
+                                    _vm.url +
+                                    "/storage/" +
+                                    category.category_icon_path
                                 }
                               })
                             : _vm._e()
@@ -35681,21 +35679,27 @@ var render = function() {
                         _vm._v(_vm._s(category["name"]))
                       ]),
                       _vm._v(" "),
-                      _c("i", {
-                        staticClass: "rango-arrow-right pr15",
-                        on: {
-                          mouseout: function($event) {
-                            return _vm.toggleSidebar(_vm.id, $event, "mouseout")
-                          },
-                          mouseover: function($event) {
-                            return _vm.toggleSidebar(
-                              _vm.id,
-                              $event,
-                              "mouseover"
-                            )
-                          }
-                        }
-                      })
+                      category.children.length && category.children.length > 0
+                        ? _c("i", {
+                            staticClass: "rango-arrow-right pr15",
+                            on: {
+                              mouseout: function($event) {
+                                return _vm.toggleSidebar(
+                                  _vm.id,
+                                  $event,
+                                  "mouseout"
+                                )
+                              },
+                              mouseover: function($event) {
+                                return _vm.toggleSidebar(
+                                  _vm.id,
+                                  $event,
+                                  "mouseover"
+                                )
+                              }
+                            }
+                          })
+                        : _vm._e()
                     ]
                   ),
                   _vm._v(" "),
@@ -35703,13 +35707,21 @@ var render = function() {
                     ? _c("div", { staticClass: "sub-category-container" }, [
                         _c(
                           "div",
-                          { staticClass: "sub-categories" },
+                          {
+                            class:
+                              "sub-categories sub-category-" +
+                              (_vm.sidebarLevel + index)
+                          },
                           [
                             _c("sidebar-component", {
                               attrs: {
                                 url: _vm.url,
-                                id: "sidebar-level-" + Math.random(),
-                                categories: category.children
+                                categories: category.children,
+                                id:
+                                  "sidebar-level-" + (_vm.sidebarLevel + index),
+                                "parent-slug": category.parentSlug
+                                  ? category.parentSlug
+                                  : category["translations"][0].slug
                               }
                             })
                           ],
@@ -35810,7 +35822,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 //
 
 /* harmony default export */ __webpack_exports__["default"] = ({
-    props: ['slidesCount', 'slidesPerPage', 'navigationEnabled', 'paginationEnabled', 'addClass']
+    props: ['id', 'addClass', 'slidesCount', 'slidesPerPage', 'navigationEnabled', 'paginationEnabled'],
+
+    data: function data() {
+        return {};
+    }
 });
 
 /***/ }),
@@ -36494,119 +36510,104 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  return _c(
-    "div",
-    { staticClass: "row mb20 unselectable col-12", class: _vm.rowClass },
-    [
-      _c("div", { staticClass: "col-lg-4 no-padding" }, [
-        _c("h2", { staticClass: "fs20" }, [_vm._v(_vm._s(_vm.headerHeading))])
-      ]),
-      _vm._v(" "),
+  return _c("div", { staticClass: "row mb15 col-12", class: _vm.rowClass }, [
+    _c("div", { staticClass: "col-4 no-padding" }, [
+      _c("h2", { staticClass: "fs20 fw6" }, [_vm._v(_vm._s(_vm.headerHeading))])
+    ]),
+    _vm._v(" "),
+    _c("div", { staticClass: "col-8 no-padding" }, [
       _c(
         "div",
-        { staticClass: "col-lg-8 no-padding popular-product-categories" },
+        { staticClass: "row justify-content-end text-right" },
         [
-          _c(
-            "div",
-            { staticClass: "row justify-content-end text-right" },
-            [
-              _vm.tabs
-                ? _vm._l(_vm.tabs.slice(0, 3), function(tab, index) {
-                    return _c(
-                      "div",
-                      {
-                        key: index,
-                        staticClass: "col-lg-2 no-padding",
-                        attrs: { title: tab },
-                        on: { click: _vm.switchTab }
-                      },
-                      [
-                        _c(
-                          "h2",
-                          {
-                            staticClass: "fs14 fw6 cursor-pointer tab",
-                            class: index == 0 ? "active" : ""
-                          },
-                          [_vm._v(_vm._s(tab))]
-                        )
-                      ]
-                    )
-                  })
-                : _vm._e(),
-              _vm._v(" "),
-              _vm.scrollable && !(_vm.scrollable == "")
-                ? [
+          _vm.tabs
+            ? _vm._l(_vm.tabs.slice(0, 3), function(tab, index) {
+                return _c(
+                  "div",
+                  {
+                    key: index,
+                    staticClass: "col-lg-2 no-padding",
+                    attrs: { title: tab },
+                    on: { click: _vm.switchTab }
+                  },
+                  [
                     _c(
-                      "div",
-                      { staticClass: "col-lg-2 no-padding switch-buttons" },
-                      [
-                        _c(
-                          "div",
-                          { staticClass: "row justify-content-center" },
-                          [
-                            _c("h2", {
-                              staticClass:
-                                "col-lg-1 no-padding v-mr-20 fw6 cursor-pointer",
-                              attrs: { title: "previous" },
-                              domProps: { innerHTML: _vm._s("<") },
-                              on: {
-                                click: function($event) {
-                                  return _vm.navigation("prev")
-                                }
-                              }
-                            }),
-                            _vm._v(" "),
-                            _c(
-                              "h2",
-                              {
-                                staticClass:
-                                  "col-lg-1 no-padding fw6 cursor-pointer",
-                                attrs: { title: "next" },
-                                on: {
-                                  click: function($event) {
-                                    return _vm.navigation("next")
-                                  }
-                                }
-                              },
-                              [_vm._v(">")]
-                            )
-                          ]
-                        )
-                      ]
+                      "h2",
+                      {
+                        staticClass: "fs14 fw6 cursor-pointer tab",
+                        class: index == 0 ? "active" : ""
+                      },
+                      [_vm._v(_vm._s(tab))]
                     )
                   ]
-                : _vm._e(),
-              _vm._v(" "),
-              !(_vm.viewAll == "false" || _vm.viewAll == "") && _vm.viewAll
-                ? [
-                    _c("div", { staticClass: "mr15" }, [
+                )
+              })
+            : _vm._e(),
+          _vm._v(" "),
+          _vm.scrollable && !(_vm.scrollable == "")
+            ? [
+                _c(
+                  "div",
+                  { staticClass: "col-lg-2 no-padding switch-buttons" },
+                  [
+                    _c("div", { staticClass: "row justify-content-center" }, [
+                      _c("h2", {
+                        staticClass:
+                          "col-lg-1 no-padding v-mr-20 fw6 cursor-pointer",
+                        attrs: { title: "previous" },
+                        domProps: { innerHTML: _vm._s("<") },
+                        on: {
+                          click: function($event) {
+                            return _vm.navigation("prev")
+                          }
+                        }
+                      }),
+                      _vm._v(" "),
                       _c(
-                        "a",
+                        "h2",
                         {
-                          staticClass: "remove-decoration normal-text",
-                          attrs: {
-                            href: _vm.viewAll,
-                            title: "View all " + _vm.headerHeading + " products"
+                          staticClass: "col-lg-1 no-padding fw6 cursor-pointer",
+                          attrs: { title: "next" },
+                          on: {
+                            click: function($event) {
+                              return _vm.navigation("next")
+                            }
                           }
                         },
-                        [
-                          _c(
-                            "h2",
-                            { staticClass: "fs14 fw6 cursor-pointer tab" },
-                            [_vm._v("View All")]
-                          )
-                        ]
+                        [_vm._v(">")]
                       )
                     ])
                   ]
-                : _vm._e()
-            ],
-            2
-          )
-        ]
+                )
+              ]
+            : _vm._e(),
+          _vm._v(" "),
+          !(_vm.viewAll == "false" || _vm.viewAll == "") && _vm.viewAll
+            ? [
+                _c("div", { staticClass: "mr15" }, [
+                  _c(
+                    "a",
+                    {
+                      staticClass: "remove-decoration normal-text",
+                      attrs: {
+                        href: _vm.viewAll,
+                        title: "View all " + _vm.headerHeading + " products"
+                      }
+                    },
+                    [
+                      _c("h2", { staticClass: "fs14 fw6 cursor-pointer tab" }, [
+                        _vm._v("View All")
+                      ])
+                    ]
+                  )
+                ])
+              ]
+            : _vm._e()
+        ],
+        2
       )
-    ]
-  )
+    ])
+  ])
 }
 var staticRenderFns = []
 render._withStripped = true
@@ -36846,6 +36847,23 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 /* harmony default export */ __webpack_exports__["default"] = ({
     props: ['heading', 'headerContent', 'isEnabled']
@@ -36861,8 +36879,27 @@ var render = function() {
   var _c = _vm._self._c || _h
   return _c(
     "div",
-    { staticClass: "row velocity-divide-page remove-padding-margin" },
+    { staticClass: "row velocity-divide-page remove-padding-margin vc-header" },
     [
+      _c("div", { staticClass: "vc-small-screen container" }, [
+        _c("div", { staticClass: "row" }, [
+          _c("div", { staticClass: "col-8" }, [
+            _c(
+              "div",
+              { staticClass: "row col-12" },
+              [
+                _vm._m(0),
+                _vm._v(" "),
+                _c("logo-component", { attrs: { "add-class": "pl10" } })
+              ],
+              1
+            )
+          ]),
+          _vm._v(" "),
+          _vm._m(1)
+        ])
+      ]),
+      _vm._v(" "),
       _c(
         "div",
         {
@@ -36878,7 +36915,9 @@ var render = function() {
           }
         },
         [
-          _c("i", { class: "rango-view-list text-down-4 align-vertical-top" }),
+          _c("i", {
+            staticClass: "rango-view-list text-down-4 align-vertical-top fs18"
+          }),
           _vm._v(" "),
           _c("span", {
             staticClass: "pl5",
@@ -36895,7 +36934,7 @@ var render = function() {
       _c("div", { staticClass: "content-list right" }, [
         _c(
           "ul",
-          { staticClass: "no-margin", attrs: { type: "none" } },
+          { staticClass: "no-margin ul-shadow", attrs: { type: "none" } },
           _vm._l(_vm.headerContent, function(content, index) {
             return _c("li", { key: index }, [
               content["content_type"] == "link"
@@ -36918,7 +36957,28 @@ var render = function() {
     ]
   )
 }
-var staticRenderFns = []
+var staticRenderFns = [
+  function() {
+    var _vm = this
+    var _h = _vm.$createElement
+    var _c = _vm._self._c || _h
+    return _c("div", { staticClass: "hamburger-wrapper" }, [
+      _c("i", { staticClass: "rango-toggle hamburger" })
+    ])
+  },
+  function() {
+    var _vm = this
+    var _h = _vm.$createElement
+    var _c = _vm._self._c || _h
+    return _c("div", { staticClass: "row col-4 right-vc-header" }, [
+      _c("i", { staticClass: "fs16 fw6 rango-search" }),
+      _vm._v(" "),
+      _c("i", { staticClass: "material-icons text-down-3" }, [
+        _vm._v("shopping_cart")
+      ])
+    ])
+  }
+]
 render._withStripped = true
 module.exports = { render: render, staticRenderFns: staticRenderFns }
 if (false) {
diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2020_01_10_122226_update_velocity_meta_data.php b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_10_122226_update_velocity_meta_data.php
new file mode 100644
index 000000000..73a3e3548
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_10_122226_update_velocity_meta_data.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateVelocityMetaData extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('velocity_meta_data', function (Blueprint $table) {
+            $table->json('product_view_images')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('velocity_meta_data', function (Blueprint $table) {
+            $table->dropColumn('product_view_images');
+        });
+    }
+}
diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2020_01_13_155803_add_velocity_locale_icon.php b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_13_155803_add_velocity_locale_icon.php
new file mode 100644
index 000000000..f0f911804
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_13_155803_add_velocity_locale_icon.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddVelocityLocaleIcon extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('locales', function (Blueprint $table) {
+            $table->text('locale_image')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('locales', function (Blueprint $table) {
+            $table->dropColumn('locale_image');
+        });
+    }
+}
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_07_14_070809_add_products_selection_column_in_cart_rules_table.php b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_13_192149_add_category_velocity_meta_data.php
similarity index 55%
rename from packages/Webkul/Discount/src/Database/Migrations/2019_07_14_070809_add_products_selection_column_in_cart_rules_table.php
rename to packages/Webkul/Velocity/src/Database/Migrations/2020_01_13_192149_add_category_velocity_meta_data.php
index c8c86276b..ecd47f17a 100644
--- a/packages/Webkul/Discount/src/Database/Migrations/2019_07_14_070809_add_products_selection_column_in_cart_rules_table.php
+++ b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_13_192149_add_category_velocity_meta_data.php
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class AddProductsSelectionColumnInCartRulesTable extends Migration
+class AddCategoryVelocityMetaData extends Migration
 {
     /**
      * Run the migrations.
@@ -13,8 +13,8 @@ class AddProductsSelectionColumnInCartRulesTable extends Migration
      */
     public function up()
     {
-        Schema::table('cart_rules', function (Blueprint $table) {
-            $table->json('products_selection')->nullable();
+        Schema::table('categories', function (Blueprint $table) {
+            $table->text('category_icon_path')->nullable();
         });
     }
 
@@ -25,8 +25,8 @@ class AddProductsSelectionColumnInCartRulesTable extends Migration
      */
     public function down()
     {
-        Schema::table('cart_rules', function (Blueprint $table) {
-            $table->dropColumn('products_selection');
+        Schema::table('categories', function (Blueprint $table) {
+            $table->dropColumn('category_icon_path');
         });
     }
 }
diff --git a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
index 769c14dbc..ab5b67390 100644
--- a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
+++ b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
@@ -18,11 +18,11 @@ class VelocityMetaDataSeeder extends Seeder
 
                 'footer_left_content' => trans('velocity::app.admin.meta-data.footer-left-raw-content'),
 
-                'footer_middle_content' => '<div class="col-4 footer-ct-content"><div class="row"><div class="col-6"><ul type="none"><li><a href="">About Us</a></li><li><a href="">Customer Service</a></li><li><a href="">What’s New</a></li><li><a href="">Contact Us </a></li></div><div class="col-6"><ul type="none"><li><a href="">Order and Returns</a></li><li><a href="">Payment Policy</a></li><li><a href="">Shipping Policy</a></li><li><a href="">Privacy and Cookies Policy</a></li></div></div></div>',
+                'footer_middle_content' => '<div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="https://webkul.com/about-us/company-profile/">About Us</a></li><li><a href="https://webkul.com/about-us/company-profile/">Customer Service</a></li><li><a href="https://webkul.com/about-us/company-profile/">What&rsquo;s New</a></li><li><a href="https://webkul.com/about-us/company-profile/">Contact Us </a></li></ul></div><div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="https://webkul.com/about-us/company-profile/"> Order and Returns </a></li><li><a href="https://webkul.com/about-us/company-profile/"> Payment Policy </a></li><li><a href="https://webkul.com/about-us/company-profile/"> Shipping Policy</a></li><li><a href="https://webkul.com/about-us/company-profile/"> Privacy and Cookies Policy </a></li></ul></div>',
 
                 'slider' => 1,
 
-                'subscription_bar_content' => '<div class="social-icons wk-icon"><i class="fs24 within-circle rango-facebook" title="facebook"></i> <i class="fs24 within-circle rango-twitter" title="twitter"></i> <i class="fs24 within-circle rango-linked-in" title="linkedin"></i> <i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> <i class="fs24 within-circle rango-youtube" title="Youtube"></i> <i class="fs24 within-circle rango-instagram" title="instagram"></i></div>'
+                'subscription_bar_content' => '<div class="social-icons col-lg-6"><i class="fs24 within-circle rango-facebook" title="facebook"></i> <i class="fs24 within-circle rango-twitter" title="twitter"></i> <i class="fs24 within-circle rango-linked-in" title="linkedin"></i> <i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> <i class="fs24 within-circle rango-youtube" title="Youtube"></i> <i class="fs24 within-circle rango-instagram" title="instagram"></i></div>'
             ]);
     }
 }
diff --git a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php
new file mode 100644
index 000000000..d75f95290
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Webkul\Velocity\Helpers;
+
+use Illuminate\Support\Facades\Storage;
+use Webkul\Category\Repositories\CategoryRepository;
+
+class AdminHelper
+{
+    /**
+     * CategoryRepository object
+     *
+     * @var object
+     */
+    protected $categoryRepository;
+
+    public function __construct(
+        CategoryRepository $categoryRepository
+    ) {
+        $this->categoryRepository =  $categoryRepository;
+    }
+
+    public function saveLocaleImg($locale)
+    {
+        $locale->locale_image = $this->uploadImage('locale_image');
+        $locale->save();
+
+        return $locale;
+    }
+
+    public function storeCategoryIcon($categoryId)
+    {
+        $category = $this->categoryRepository->findOrFail($categoryId);
+
+        $category->category_icon_path = $this->uploadImage('category_icon_path');
+        $category->save();
+
+        return $category;
+    }
+
+    public function uploadImage($type)
+    {
+        $request = request();
+
+        $image = '';
+        $file = $type;
+        $dir = "velocity/$type";
+
+        if ($request->hasFile($file)) {
+            Storage::delete($dir . $file);
+
+            $image = $request->file($file)->store($dir);
+        }
+
+        return $image;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php
index 3186233f7..fc2369d11 100644
--- a/packages/Webkul/Velocity/src/Helpers/Helper.php
+++ b/packages/Webkul/Velocity/src/Helpers/Helper.php
@@ -10,16 +10,8 @@ use Webkul\Velocity\Repositories\VelocityMetadataRepository;
 use Webkul\Attribute\Repositories\AttributeOptionRepository;
 use Webkul\Product\Repositories\ProductRepository as ProductRepository;
 
-/**
- * Search controller
- *
- * @author  Shubham Mehrotra <shubhammehrotra.symfony@webkul.com> @shubhwebkul
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
-
 class Helper extends Review
 {
-
     /**
      * orderBrands object
      *
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
index b8282ec2c..d75f87bf0 100644
--- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
@@ -64,11 +64,18 @@ class ConfigurationController extends Controller
 
         foreach ($params['images'] as $index => $advertisement) {
             if ($advertisement['image_1'] !== "") {
-                $params['advertisement'][$index] = $this->uploadImages($advertisement, $index);
+                $params['advertisement'][$index] = $this->uploadAdvertisementImages($advertisement, $index);
+            }
+        }
+
+        foreach ($params['product_view_images'] as $index => $productViewImage) {
+            if ($productViewImage !== "") {
+                $params['product_view_images'][$index] = $this->uploadImage($productViewImage, $index);
             }
         }
 
         $params['advertisement'] = json_encode($params['advertisement']);
+        $params['product_view_images'] = json_encode($params['product_view_images']);
         $params['home_page_content'] = str_replace('=&gt;', '=>', $params['home_page_content']);
 
         unset($params['images']);
@@ -82,11 +89,12 @@ class ConfigurationController extends Controller
         return redirect()->route($this->_config['redirect']);
     }
 
-    public function uploadImages($data, $index)
+    public function uploadAdvertisementImages($data, $index)
     {
         $type = 'images';
         $request = request();
 
+        $advertisement = [];
         foreach ($data as $imageId => $image) {
             $file = $type . '.' . $index . '.' . $imageId;
             $dir = "velocity/$type";
@@ -100,4 +108,22 @@ class ConfigurationController extends Controller
 
         return $advertisement;
     }
+
+    public function uploadImage($data, $index)
+    {
+        $type = 'product_view_images';
+        $request = request();
+
+        $image = '';
+        $file = $type . '.' . $index;
+        $dir = "velocity/$type";
+
+        if ($request->hasFile($file)) {
+            Storage::delete($dir . $file);
+
+            $image = $request->file($file)->store($dir);
+        }
+
+        return $image;
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php
deleted file mode 100644
index 046ccf4b9..000000000
--- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Webkul\Velocity\Http\Controllers\Shop;
-
-use Webkul\Product\Repositories\SearchRepository;
-use Webkul\Velocity\Http\Shop\Controllers;
-
-/**
- * Search controller
- *
- * @author  Shubham Mehrotra <shubhammehrotra.symfony@webkul.com> @shubhwebkul
- * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
- */
- class SearchController extends Controller
-{
-    /**
-     * Contains route related configuration
-     *
-     * @var array
-     */
-    protected $_config;
-
-    /**
-     * SearchRepository object
-     *
-     * @var Object
-    */
-    protected $searchRepository;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @param  \Webkul\Product\Repositories\SearchRepository $searchRepository
-     * @return void
-    */
-    public function __construct(SearchRepository $searchRepository)
-    {
-        $this->_config = request('_config');
-
-        $this->searchRepository = $searchRepository;
-    }
-
-    /**
-     * Index to handle the view loaded with the search results
-     *
-     * @return \Illuminate\View\View
-     */
-    public function index()
-    {
-        $results = $this->searchRepository->search(request()->all());
-
-        return view($this->_config['view'])->with('results', $results ? $results : null);
-    }
-}
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
new file mode 100644
index 000000000..3f92755c6
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Webkul\Velocity\Http\Controllers\Shop;
+
+use Webkul\Velocity\Helpers\Helper;
+use Webkul\Velocity\Http\Shop\Controllers;
+use Webkul\Product\Repositories\SearchRepository;
+use Webkul\Product\Repositories\ProductRepository;
+
+/**
+ * Search controller
+ *
+ * @author  Shubham Mehrotra <shubhammehrotra.symfony@webkul.com> @shubhwebkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+ class ShopController extends Controller
+{
+    /**
+     * Contains route related configuration
+     *
+     * @var array
+     */
+    protected $_config;
+
+    /**
+     * SearchRepository object
+     *
+     * @var SearchRepository
+    */
+    protected $searchRepository;
+
+    /**
+     * ProductRepository object
+     *
+     * @var ProductRepository
+     */
+    protected $productRepository;
+
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param  \Webkul\Product\Repositories\SearchRepository $searchRepository
+     * @return void
+    */
+    public function __construct(
+        SearchRepository $searchRepository,
+        ProductRepository $productRepository
+    ) {
+        $this->_config = request('_config');
+
+        $this->searchRepository = $searchRepository;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Index to handle the view loaded with the search results
+     *
+     * @return \Illuminate\View\View
+     */
+    public function search()
+    {
+        $results = $this->searchRepository->search(request()->all());
+
+        return view($this->_config['view'])->with('results', $results ? $results : null);
+    }
+
+    public function fetchProductDetails($slug)
+    {
+        $product = $this->productRepository->findBySlug($slug);
+
+        if ($product) {
+            $productReviewHelper = app('Webkul\Product\Helpers\Review');
+            $productImageHelper = app('Webkul\Product\Helpers\ProductImage');
+
+            $response = [
+                'status' => true,
+                'details' => [
+                    'name' => $product->name,
+                    'urlKey' => $product->url_key,
+                    'priceHTML' => $product->getTypeInstance()->getPriceHtml(),
+                    'totalReviews' => $productReviewHelper->getTotalReviews($product),
+                    'rating' => ceil($productReviewHelper->getAverageRating($product)),
+                    'image' => $productImageHelper->getProductBaseImage($product)['small_image_url'],
+                ]
+            ];
+        } else {
+            $response = [
+                'status' => false
+            ];
+        }
+
+        return $response;
+    }
+}
diff --git a/packages/Webkul/Velocity/src/Http/admin-routes.php b/packages/Webkul/Velocity/src/Http/admin-routes.php
index 06da1f6a7..ee90c2d07 100644
--- a/packages/Webkul/Velocity/src/Http/admin-routes.php
+++ b/packages/Webkul/Velocity/src/Http/admin-routes.php
@@ -43,10 +43,4 @@ Route::group(['middleware' => ['web']], function () {
             });
         });
     });
-
-    Route::group(['middleware' => ['theme']], function () {
-        Route::get('/search', 'Webkul\Velocity\Http\Controllers\Shop\SearchController@index')->defaults('_config', [
-            'view' => 'velocity::search.search'
-        ])->name('shop.search.index');
-    });
 });
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Http/front-routes.php b/packages/Webkul/Velocity/src/Http/front-routes.php
new file mode 100644
index 000000000..ce689a927
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Http/front-routes.php
@@ -0,0 +1,14 @@
+<?php
+
+Route::group(['middleware' => ['web']], function () {
+    Route::group(['middleware' => ['theme']], function () {
+        Route::namespace('Webkul\Velocity\Http\Controllers\Shop')->group(function () {
+            // Content Pages Route
+            Route::get('/product-details/{slug}', 'ShopController@fetchProductDetails')->name('velocity.shop.product');
+        });
+
+        Route::get('/search', 'ShopController@search')->defaults('_config', [
+            'view' => 'velocity::search.search'
+        ])->name('shop.search.index');
+    });
+});
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Providers/EventServiceProvider.php b/packages/Webkul/Velocity/src/Providers/EventServiceProvider.php
index 24091dc55..65b7ebe3d 100644
--- a/packages/Webkul/Velocity/src/Providers/EventServiceProvider.php
+++ b/packages/Webkul/Velocity/src/Providers/EventServiceProvider.php
@@ -24,7 +24,16 @@ class EventServiceProvider extends ServiceProvider
             $viewRenderEventManager->addTemplate('velocity::admin.layouts.style');
         });
 
-        Event::listen('checkout.order.save.after', 'Webkul\Velocity\Helpers\Helper@topBrand');
+        Event::listen([
+            'core.locale.create.after',
+            'core.locale.update.after',
+        ], 'Webkul\Velocity\Helpers\AdminHelper@saveLocaleImg');
 
+        Event::listen([
+            'catalog.category.create.after',
+            'catalog.category.update.after',
+        ], 'Webkul\Velocity\Helpers\AdminHelper@storeCategoryIcon');
+
+        Event::listen('checkout.order.save.after', 'Webkul\Velocity\Helpers\Helper@topBrand');
     }
 }
diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
index e78968185..b50280b32 100644
--- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
+++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
@@ -3,6 +3,7 @@
 namespace Webkul\Velocity\Providers;
 
 use Illuminate\Routing\Router;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\ServiceProvider;
 
@@ -27,6 +28,7 @@ class VelocityServiceProvider extends ServiceProvider
     {
         include __DIR__ . '/../Http/helpers.php';
         include __DIR__ . '/../Http/admin-routes.php';
+        include __DIR__ . '/../Http/front-routes.php';
 
         $this->app->register(EventServiceProvider::class);
 
@@ -41,12 +43,32 @@ class VelocityServiceProvider extends ServiceProvider
             __DIR__ . '/../Resources/views/' => resource_path('themes/velocity/views'),
         ]);
 
+        Event::listen([
+            'bagisto.admin.settings.locale.edit.after',
+            'bagisto.admin.settings.locale.create.after',
+        ], function($viewRenderEventManager) {
+                $viewRenderEventManager->addTemplate(
+                    'velocity::admin.settings.locales.locale-logo'
+                );
+            }
+        );
+
+        Event::listen([
+            'bagisto.admin.catalog.category.edit_form_accordian.general.after',
+            'bagisto.admin.catalog.category.create_form_accordian.general.after',
+        ], function($viewRenderEventManager) {
+                $viewRenderEventManager->addTemplate(
+                    'velocity::admin.catelog.categories.category-icon'
+                );
+            }
+        );
+
         $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'velocity');
 
         $velocityHelper = app('Webkul\Velocity\Helpers\Helper');
         $velocityMetaData = $velocityHelper->getVelocityMetaData();
 
-        view()->share('showRecentlyViewed', false);
+        view()->share('showRecentlyViewed', true);
         view()->share('velocityMetaData', $velocityMetaData);
     }
 
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue
index 7714b6860..8b14e3f8c 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue
@@ -1,11 +1,11 @@
 <template>
 
-    <div class="row mb20 unselectable col-12" :class="rowClass">
-        <div class="col-lg-4 no-padding">
-            <h2 class="fs20">{{ headerHeading }}</h2>
+    <div class="row mb15 col-12" :class="rowClass">
+        <div class="col-4 no-padding">
+            <h2 class="fs20 fw6">{{ headerHeading }}</h2>
         </div>
 
-        <div class="col-lg-8 no-padding popular-product-categories">
+        <div class="col-8 no-padding">
             <div class="row justify-content-end text-right">
 
                 <template v-if="tabs">
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue
index ff5977013..5ed6909fd 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue
@@ -20,11 +20,16 @@
 <script type="text/javascript">
     export default {
         props: [
+            'id',
+            'addClass',
             'slidesCount',
             'slidesPerPage',
             'navigationEnabled',
             'paginationEnabled',
-            'addClass'
         ],
+
+        data: function () {
+            return {}
+        }
     }
 </script>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
index 228494eb7..bf236159f 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
@@ -1,11 +1,28 @@
 <template>
-    <div class="row velocity-divide-page remove-padding-margin">
+    <div class="row velocity-divide-page remove-padding-margin vc-header">
+        <div class="vc-small-screen container">
+            <div class="row">
+                <div class="col-8">
+                    <div class="row col-12">
+                        <div class="hamburger-wrapper">
+                            <i class="rango-toggle hamburger"></i>
+                        </div>
+                        <logo-component add-class="pl10"></logo-component>
+                    </div>
+                </div>
+                <div class="row col-4 right-vc-header">
+                    <i class="fs16 fw6 rango-search"></i>
+                    <i class="material-icons text-down-3">shopping_cart</i>
+                </div>
+            </div>
+        </div>
+
         <div
             @mouseout="toggleSidebar('0', $event, 'mouseout')"
             @mouseover="toggleSidebar('0', $event, 'mouseover')"
             class="main-category fs16 unselectable fw6 cursor-pointer left">
 
-            <i :class="`rango-view-list text-down-4 align-vertical-top`">
+            <i class="rango-view-list text-down-4 align-vertical-top fs18">
             </i>
             <span
                 class="pl5"
@@ -15,7 +32,7 @@
         </div>
 
         <div class="content-list right">
-            <ul type="none" class="no-margin">
+            <ul type="none" class="no-margin ul-shadow">
                 <li v-for="(content, index) in headerContent" :key="index">
                     <a
                         v-text="content.title"
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue
index 472fc9f93..8b3194711 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue
@@ -15,10 +15,11 @@
                 @mouseout="toggleSidebar(id, $event, 'mouseout')"
                 @mouseover="toggleSidebar(id, $event, 'mouseover')">
 
+
                 <a
                     class="category unset"
                     :class="(category.children.length > 0) ? 'fw6' : ''"
-                    :href="`${url}/${category['translations'][0].slug}`">
+                    :href="`${url}/${slicedCategories.parentSlug ? slicedCategories.parentSlug + '/' : ''}${category['translations'][0].slug}`">
 
                     <div
                         class="category-icon"
@@ -26,15 +27,15 @@
                         @mouseover="toggleSidebar(id, $event, 'mouseover')">
 
                         <img
-                            v-if="category.image"
-                            :src="`${url}/storage/${category.image}`" />
+                            v-if="category.category_icon_path"
+                            :src="`${url}/storage/${category.category_icon_path}`" />
                     </div>
                     <span class="category-title">{{ category['name'] }}</span>
                     <i
                         class="rango-arrow-right pr15"
                         @mouseout="toggleSidebar(id, $event, 'mouseout')"
-                        @mouseover="toggleSidebar(id, $event, 'mouseover')">
-                        <!-- v-if="category.children.length && category.children.length > 0"> -->
+                        @mouseover="toggleSidebar(id, $event, 'mouseover')"
+                        v-if="category.children.length && category.children.length > 0">
                     </i>
                 </a>
 
@@ -42,11 +43,12 @@
                     class="sub-category-container"
                     v-if="category.children.length && category.children.length > 0">
 
-                    <div class="sub-categories">
+                    <div :class="`sub-categories sub-category-${sidebarLevel+index}`">
                         <sidebar-component
                             :url="url"
-                            :id="`sidebar-level-${Math.random()}`"
-                            :categories="category.children">
+                            :categories="category.children"
+                            :id="`sidebar-level-${sidebarLevel+index}`"
+                            :parent-slug="category.parentSlug ? category.parentSlug : category['translations'][0].slug">
                         </sidebar-component>
                     </div>
                 </div>
@@ -61,6 +63,7 @@
             'id',
             'url',
             'addClass',
+            'parentSlug',
             'categories',
             'mainSidebar',
             'categoryCount'
@@ -76,8 +79,12 @@
                 slicedCategories = this.categories.slice(0, categoryCount);
             }
 
+            if (this.parentSlug)
+                slicedCategories['parentSlug'] = this.parentSlug;
+
             return {
-                slicedCategories
+                slicedCategories,
+                sidebarLevel: Math.floor(Math.random() * 1000),
             }
         },
 
@@ -86,40 +93,16 @@
                 let sidebar = $(`#${id}`);
                 if (sidebar && sidebar.length > 0) {
                     sidebar.show();
-                }
-            },
 
-            hover: function (index, actionType) {
-                let category = this.categories[index];
+                    let actualId = id.replace('sidebar-level-', '');
 
-                if (category.children.length > 0) {
-                    let categoryElement = document.getElementById(`category-${category.id}`);
-                    let subCategories = categoryElement.querySelector('.sub-categories');
-
-                    if (subCategories.style.display == "" || subCategories.style.display == "none") {
-                        subCategories.style.display = "block";
-                    } else {
-                        subCategories.style.display = "none";
+                    let sidebarContainer = sidebar.closest(`.sub-category-${actualId}`)
+                    if (sidebarContainer && sidebarContainer.length > 0) {
+                        sidebarContainer.show();
                     }
 
                 }
             },
-
-            toggleSubCategory: function (index) {
-                // let category = this.categories[index];
-
-                // if (category.children.length > 0) {
-                //     let categoryElement = document.getElementById(`category-${category.id}`);
-                //     let subCategories = categoryElement.querySelector('.sub-categories');
-
-                //     if (subCategories.style.display == "" || subCategories.style.display == "none") {
-                //         subCategories.style.display = "block";
-                //     } else {
-                //         subCategories.style.display = "none";
-                //     }
-
-                // }
-            }
         }
     }
 </script>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/app.js b/packages/Webkul/Velocity/src/Resources/assets/js/app.js
index 9211524ea..84f3f76a8 100755
--- a/packages/Webkul/Velocity/src/Resources/assets/js/app.js
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/app.js
@@ -68,10 +68,18 @@ $(document).ready(function () {
                             subCategories1 = $(subCategories1);
 
                             if (type == "mouseover") {
-                                // this.show(subCategories1);
+                                this.show(subCategories1);
+
+                                let sidebarChild = subCategories1.find('.sidebar');
+                                this.show(sidebarChild);
                             } else if (type == "mouseout") {
                                 this.hide(subCategories1);
                             }
+                        } else {
+                            if (type == "mouseout") {
+                                let sidebar = $(`#${id}`);
+                                sidebar.hide();
+                            }
                         }
                     }
                 }
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss
index e363df7c7..39cb3dd0c 100755
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss
@@ -1,6 +1,7 @@
 @import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap');
 //velocity variables
 $white-color: #FFFFFF;
+$black-color: #111111;
 $font-color: rgba(0,0,0,0.83);
 $button-primary-bg: #21A179;
 $border-primary: #269c77;
@@ -23,8 +24,8 @@ $grey-clr: rgba(0,0,0,0.53);
 $light-grey-clr: rgb(158, 158, 158);
 $light-background: #F7F7F9;
 $sidebar-width: 230px;
+$box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
+$material-icons-font-path: "../material-icons/iconfont/" !default;
+$border-normal: 1px solid $border-dark;
 
 $font-family-pro: 'Source Sans Pro', sans-serif;
-$font-family-regular: 'SourceSansPro-Regular';
-$font-family-semibold: 'SourceSansPro-Semibold';
-$font-family-bold: 'SourceSansPro-Bold';
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/admin.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/admin.scss
index 5a36bd684..998a57a1a 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/admin.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/admin.scss
@@ -11,12 +11,6 @@
     font-style: normal;
   }
 
-.wk-icon {
-    font-size: 20px;
-    font-weight: 400;
-    text-align: center;
-    color: #0041ff;
-}
 
 [class^="rango-"], [class*=" rango-"] {
     /* use !important to prevent issues with browser extensions that change fonts */
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss
index a6d706d0d..e4cf9a222 100755
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss
@@ -1,18 +1,18 @@
-@import "icons";
-@import "variables";
-@import "mixins";
 @import "rango";
+@import "icons";
+@import "mixins";
+@import "variables";
 @import "components/UI";
 @import "components/app";
 @import "components/home";
 @import "components/footer";
 @import "components/shared";
 @import "components/product-view";
+@import "components/media";
 
+@import "static/material-icons";
 @import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
-
-$material-icons-font-path: "../material-icons/iconfont/" !default;
-@import '../../../../publishable/assets/material-icons/iconfont/material-icons.scss';
+// @import '../../../../publishable/assets/material-icons/iconfont/material-icons.scss';
 
 * {
     margin: 0;
@@ -179,19 +179,42 @@ body {
 
         .select-icon {
             top: 0px;
-            left: -3px;
+            left: 0px;
+            padding-left: 5px;
         }
 
         .welcome-content {
             @extend .unselectable;
 
-            width: 150px;
+
+            float: right;
+            display: table;
+            min-width: 150px;
             cursor: pointer;
             text-align: right;
+
+            * {
+                display: table-cell;
+                vertical-align: middle;
+            }
         }
 
         + .account-modal {
-            height: 135px;
+            @extend .modal-dialog;
+
+            right: 10px;
+            z-index: 100;
+            height: max-content;
+            width: 290px !important;
+            position: absolute !important;
+
+            .theme-btn {
+                padding: .5rem .9rem;
+            }
+
+            .modal-footer {
+                justify-content: unset;
+            }
         }
     }
 
@@ -201,17 +224,20 @@ body {
         * {
             height: 100%;
         }
+    }
 
-        .welcome-content {
-            float: right;
-            display: table;
+    .locale-icon {
+        width: 20px;
+        display: inline-block;
 
-            * {
-                display: table-cell;
-                vertical-align: middle;
-            }
+        img {
+            width: 100%;
         }
     }
+
+    .locale-switcher {
+        padding-left: 5px;
+    }
 }
 
 
@@ -326,69 +352,70 @@ body {
 header {
     .logo {
         height: 50px;
+        padding-left: 10px;
     }
 
     #search-form {
-        height: 35px;
+        height: 40px;
         margin: 5px 0px;
         background: $white-color;
+        padding: 4px 1px 0px 0px;
 
-        .selectdiv {
-            width: 30%;
-            font-family: 'Webkul Rango' !important;
-            speak: none;
-            font-style: normal;
-            font-weight: normal;
-            font-variant: normal;
-            text-transform: none;
-            line-height: 1;
-            -webkit-font-smoothing: antialiased;
-        }
-
-        .selectdiv:before {
-            top: 13px;
-            right: 72%;
-            z-index: 10;
-            font-size: 16px;
-            content: "\E906";
-            position: absolute;
-        }
-
-        select {
-            @include border-radius(0px);
-
-            width: 100%;
+        * {
             height: 100%;
-            cursor: pointer;
-            border-right: none;
-            border: 1px solid $theme-color;
-            font-family:"Source Sans Pro", sans-serif;
-
-            -webkit-appearance: none;
-            -moz-appearance: none;
-            appearance: none;
         }
 
-        select::-ms-expand {
-            display: none;
+        .btn-group {
+            max-width: 550px;
+
+            .selectdiv {
+                @extend .rango-default;
+
+                width: 170px;
+            }
+
+            .selectdiv:before {
+                top: 10px;
+                left: 108px;
+                z-index: 10;
+                font-size: 16px;
+                content: "\E906";
+                position: absolute;
+            }
+
+            select {
+                width: 100%;
+                height: 100%;
+                cursor: pointer;
+                border-radius: 2px 0px 0px 2px;
+                border: 1px solid $theme-color;
+                border-right: none;
+                font-family:"Source Sans Pro", sans-serif;
+
+                -webkit-appearance: none;
+                -moz-appearance: none;
+                appearance: none;
+            }
+
+            select::-ms-expand {
+                display: none;
+            }
         }
 
         input {
             @include border-radius(0px);
 
-            width: 70%;
+            width: 380px;
             height: 100%;
             font-size: 14px;
             padding: 0 10px;
-            border-left: 0px;
-            border-left: none;
             line-height: 20px;
             letter-spacing: 0;
             border: 1px solid $theme-color;
+            border-left: 1px solid $border-common;
         }
-        .btn {
-            height: 40px;
 
+        .btn {
             &:hover {
                 text-decoration: none;
             }
@@ -403,6 +430,16 @@ header {
                 outline-offset: 0px;
             }
         }
+
+        #header-search-icon {
+            min-width: 40px;
+            border-radius: 0px 2px 2px 0px;
+            background-color: $theme-color;
+
+            i {
+                color: $btn-text-color;
+            }
+        }
     }
 
     .mini-cart-container {
@@ -414,7 +451,7 @@ header {
                 position: relative;
                 width: 75px;
                 text-align: right;
-                font-family: $font-family-semibold;
+                font-weight: 600;
                 font-size: 16px;
                 color: $font-color;
                 letter-spacing: 0;
@@ -463,7 +500,7 @@ header {
                 }
 
                 .item-name {
-                    font-family: $font-family-semibold;
+                    font-weight: 600;
                     font-size: 18px;
                     color: $font-color;
                     letter-spacing: 0;
@@ -485,14 +522,13 @@ header {
                         display: inline-block;
 
                         .item-qty {
-                            font-family: $font-family-regular;
                             font-size: 16px;
                             color: $font-color;
                             letter-spacing: 0;
                             text-align: left;
                         }
                         .item-price {
-                            font-family: $font-family-semibold;
+                            font-weight: 600;
                             font-size: 16px;
                             color: $font-color;
                             letter-spacing: 0;
@@ -507,14 +543,14 @@ header {
             border-top: 1px solid $border-common;
 
             .sub-total-text {
-                font-family: $font-family-semibold;
+                font-weight: 600;
                 font-size: 16px;
                 color: $font-color;
                 letter-spacing: 0;
             }
 
             .cart-sub-total {
-                font-family: $font-family-bold;
+                font-weight: 700;
                 font-size: 16px;
                 color: $font-color;
                 letter-spacing: 0;
@@ -524,7 +560,7 @@ header {
         .dropdown-footer {
             padding: 10px 10px 0px 10px;
             border-top: 1px solid $border-common;
-            font-family: $font-family-bold;
+            font-weight: 700;
             font-size: 16px;
             color: $font-color;
             letter-spacing: 0;
@@ -566,8 +602,8 @@ header {
             .main-category {
                 width: 100%;
                 overflow: hidden;
-                display: inline-block;
                 position: relative;
+                display: inline-block;
                 padding: 5px 5px 5px 35px;
 
                 .material-icons{
@@ -596,7 +632,7 @@ header {
                 a {
                     padding: 10px 0px;
                     position: relative;
-                    font-family: $font-family-semibold;
+                    font-weight: 600;
                     font-size: 14px;
                     color: rgba(0,0,0,0.83);
                     letter-spacing: 0;
@@ -623,10 +659,6 @@ header {
                     left: 283px;
                     width: 250px;
                     height: 350px;
-
-                    .child-category {
-
-                    }
                 }
             }
         }
@@ -648,15 +680,15 @@ header {
             float: left;
 
             a {
-                padding: 5px 20px 5px 5px;
-                font-family: SourceSansPro-Semibold;
-                font-size: 16px;
-                color: #FFFFFF;
-                letter-spacing: 0;
                 display: block;
-                position: relative;
-                text-decoration: none;
                 cursor: pointer;
+                font-size: 16px;
+                font-weight: 600;
+                letter-spacing: 0;
+                position: relative;
+                color: $white-color;
+                text-decoration: none;
+                padding: 5px 20px 5px 5px;
             }
         }
     }
@@ -787,10 +819,6 @@ i.within-circle {
     height: 50px;
 }
 
-.mb60 {
-    margin-bottom: 60px;
-}
-
 .center_div {
     margin: 0 auto;
     width: 80%/* value of your choice which suits your alignment */
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss
index 501a7726f..37ca88db7 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss
@@ -30,11 +30,11 @@
 }
 
 .btn-add-to-cart {
-    padding: 8px;
-    color: #fff !important;
+    padding: 3px 14px !important;
     border-radius: 0px !important;
-    border-color: #26A37C !important;
-    background-color: #26A37C !important;
+    color: $white-color !important;
+    border-color: $theme-color !important;
+    background-color: $theme-color !important;
 
     &.large {
         padding: 12px 18px;
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
index 4a77c18a8..cdf0fc679 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
@@ -27,6 +27,14 @@
             }
         }
     }
+
+    .submit-btn {
+        font-weight: 600;
+
+        button {
+            padding: 10px 15px;
+        }
+    }
 }
 
 .customer-rating {
@@ -50,11 +58,12 @@
         top: 12px;
         height: 5px;
         position: relative;
+        background-color: $light-background;
 
         > div {
             width: 0px;
             height: 100%;
-            background-color: black;
+            background-color: $black-color;
         }
     }
 
@@ -116,6 +125,11 @@
     > div:not(:first-child) {
         vertical-align: super;
     }
+
+    .limiter::after {
+        margin-left: 10px;
+        content: 'per page';
+    }
 }
 
 .view-mode {
@@ -194,22 +208,14 @@
     }
 }
 
-// responsive css for modal
-@media only screen and (max-width: 770px) {
-    .modal-container {
-        max-width: 80%;
-        left: 10%;
-        margin-left: 0px;
-    }
-}
-
-#product-card-new {
-    border: none;
+.product-card-new {
+    // width: 19rem;
+    border: none !important;
     margin: 0 5px 10px 10px;
-    padding-bottom: 10px;
 
     .product-image-container {
         height: 220px;
+        position: relative;
 
         img {
             width: 100%;
@@ -232,6 +238,10 @@
             font-size: 14px;
             vertical-align: middle;
         }
+
+        .material-icons {
+            font-size: 16px;
+        }
     }
 
     .card-body {
@@ -250,6 +260,7 @@
         .wishlist-icon {
             height: 32px;
             display: table;
+            text-align: right;
 
             > i {
                 display: table-cell;
@@ -259,6 +270,41 @@
     }
 }
 
+.quick-view-btn-container {
+    left: -12px;
+    width: 100%;
+    bottom: 10px;
+    display: none;
+    position: absolute;
+
+    span {
+        left: 32%;
+        top: -26px;
+        z-index: 1;
+        font-size: 16px;
+        color: #FFFFFF;
+        position: absolute;
+    }
+
+    button {
+        left: 30%;
+        top: -36px;
+        border: none;
+        color: white;
+        font-size: 16px;
+        padding: 5px 10px 7px 24px;
+        position: absolute;
+        opacity: 0.8;
+        background-color: #0D2438;
+    }
+}
+
+.product-card-new:hover {
+    #quick-view-btn-container {
+        display: block;
+    }
+}
+
 .quantity {
     @extend .btn-group;
 
@@ -268,20 +314,40 @@
 
     label {
         float: left;
-        padding: 5px 10px 10px 0;
+        padding: 5px 15px 10px 0;
     }
 
     button,
     input {
         @extend .btn;
 
-        font-size: 16px !important;
-        background-color: white;
+        height: 35px;
+        border-radius: 0px;
+        vertical-align: top;
+        padding: 0 10px !important;
+        font-size: 24px !important;
+        font-weight: 600 !important;
         border: 1px solid $border-common !important;
+        color: $dark-color !important;
+        background-color: $white-color;
+    }
+
+    button:nth-of-type(1) {
+        border-right: 0px !important;
     }
 
     input {
         width: 50px;
+        cursor: default;
+        font-size: 16px !important;
+        border-left: 0px !important;
+        border-right: 0px !important;
+        text-align: center;
+    }
+
+    button:nth-last-of-type(1) {
+        border-radius: 0px;
+        border-left: 0px !important;
     }
 
     button:active,
@@ -349,6 +415,7 @@
 }
 
 .customer-options{
+    top: 40px;
     float: right;
     padding: 20px;
     height: 150px;
@@ -366,6 +433,7 @@
 
     li {
         padding: 3px 0;
+        height: unset !important;
     }
 
     a {
@@ -453,7 +521,7 @@
     top: 44px;
     z-index: 100;
     width: 350px;
-    left: -230px;
+    left: -265px;
     position: absolute;
 
     .close {
@@ -463,6 +531,14 @@
         position: relative;
     }
 
+    .mini-cart-container {
+        height: 100%;
+        font-size: 14px;
+        max-height: 200px;
+        overflow-y: scroll;
+        padding: 10px 15px 0 20px;
+    }
+
     .small-card-container {
         margin: 0;
         width: 100%;
@@ -523,6 +599,7 @@
         .cart-header {
             max-height: 45px;
             margin-bottom: 20px;
+            padding-bottom: 20px !important;
             border-bottom: 2px solid $border-general;
 
             > h3 {
@@ -588,12 +665,13 @@
 
 .account-content {
     .sidebar {
+        height: 100%;
         border-right: 1px solid $border-general;
 
         .customer-sidebar {
             .account-details {
                 text-align: center;
-                padding: 15px 20px;
+                padding: 25px 20px;
 
                 .customer-name {
                     width: 60px;
@@ -615,20 +693,54 @@
 
             .navigation {
                 width: 100%;
-                margin-top: 25px;
 
                 li {
-                    width: 99%;
-                    padding: 15px 20px;
-
-                    &:hover {
-                        color: $link-color;
-                    }
+                    width: 100%;
+                    padding: 10px 15px;
+                    margin-bottom: 10px;
 
+                    &:hover,
                     &.active {
-                        color: $link-color;
+                        color: $light-link-color;
                         background-color: $light-background;
                     }
+
+                    i {
+                        &.icon {
+                            @extend .rango-default;
+
+                            font-size: 18px;
+                            padding-right: 5px;
+
+                            &.profile::before {
+                                content: "\E995";
+                            }
+
+                            &.address::before {
+                                content: "\e949";
+                            }
+
+                            &.reviews::before {
+                                content: "\e97d";
+                            }
+
+                            &.wishlist::before {
+                                content: "\e93e";
+                            }
+
+                            &.orders::before {
+                                content: "\e931";
+                            }
+
+                            &.downloadables::before {
+                                content: "\e926";
+                            }
+                        }
+                    }
+                }
+
+                li:last-child {
+                    margin-bottom: 0;
                 }
             }
         }
@@ -639,6 +751,10 @@
         padding: 15px 20px;
         padding-bottom: 60px;
 
+        &.right {
+            padding-left: $sidebar-width + 20px !important;
+        }
+
         .account-head {
             margin-bottom: 20px;
         }
@@ -698,14 +814,34 @@
             .account-items-list {
                 margin-bottom: 40px;
             }
+
+            #datagrid-filters {
+                .dropdown-filters {
+                    right: 0;
+                    width: 220px;
+                    position: relative;
+                    padding: 10px 15px;
+                    border: 1px solid $border-common;
+
+                    .grid-dropdown-header {
+                        display: inline-block;
+                    }
+
+                    .dropdown-list {
+                        li {
+                            list-style: none;
+                        }
+                    }
+                }
+            }
         }
 
-        .account-items-list{
+        .account-items-list {
             &.wishlist-container {
                 .col-3 {
                     padding-left: 0;
 
-                    #product-card-new {
+                    .product-card-new {
                         margin: 0;
                         width: 22rem;
                     }
@@ -760,18 +896,12 @@
                     &.previous {
                         .angle-right-icon,
                         .angle-left-icon {
+                            @extend .rango-default;
+
                             margin: 0;
-                            speak: none;
-                            line-height: 1;
                             font-size: 24px;
                             background: unset;
                             text-align: center;
-                            font-style: normal;
-                            font-weight: normal;
-                            font-variant: normal;
-                            text-transform: none;
-                            -webkit-font-smoothing: antialiased;
-                            font-family: 'Webkul Rango' !important;
                         }
                     }
 
@@ -821,11 +951,11 @@
     vertical-align: middle;
 
     i {
-        color: $button-danger;
+        color: $black-color;
     }
 
     i:hover::before {
-        content: "\E93D";
+        // content: "\E93D";
     }
 }
 
@@ -864,6 +994,17 @@
         -ms-transform: scale(1.3);
         -webkit-transform: scale(1.3);
     }
+
+    .styled-select {
+        cursor: pointer;
+
+        + .select-icon {
+            top: 55%;
+            left: 92%;
+            font-size: 20px;
+            position: absolute;
+        }
+    }
 }
 
 .address-container {
@@ -962,7 +1103,9 @@
 }
 
 .order-summary-container {
-    padding-top: 3%;
+    padding-top: 25px;
+    height: max-content;
+    max-width: 500px !important;
 
     > div {
         width: 100%;
@@ -976,13 +1119,6 @@
             margin-bottom: 20px;
         }
 
-        .row {
-            > .col-8,
-            .col-4 {
-                padding-right: 0;
-            }
-        }
-
         > .row:not(:last-child) {
             margin-bottom: 10px;
         }
@@ -1005,6 +1141,20 @@
     .badge {
         padding: 10px;
     }
+
+    .action {
+        a {
+            @extend .unset;
+        }
+
+        .eye-icon {
+            @extend .rango-default;
+            @extend .rango-eye-visible;
+
+            font-size: 24px;
+            padding-left: 10px;
+        }
+    }
 }
 
 .search-result-status {
@@ -1028,12 +1178,16 @@
 }
 
 #related-products-carousel {
-    #product-card-new:first-child {
+    .product-card-new:first-child {
         margin-left: 0px !important;
     }
 }
 
 .product-price {
+    span:nth-child(1) {
+        font-weight: 600;
+    }
+
     .price-label {
         margin-right: 6px;
     }
@@ -1056,6 +1210,7 @@
     }
 
     .regular-price {
+        font-weight: 500;
         margin-right: 10px;
         text-decoration: line-through;
     }
@@ -1070,14 +1225,24 @@
 }
 
 .search-container {
+    padding: 30px 20px;
+
+    .lg-card-container {
+        &.list-card {
+            margin: 0 15px;
+        }
+    }
+
     :first-child {
-        margin-left: 0px;
+        margin-top: 0px;
     }
 }
 
 .method-sticker {
     font-size: 13px;
     padding: 4px 8px;
+    margin-right: 3px;
+    margin-bottom: 3px;
     text-align: center;
     border-radius: 1px;
     display: inline-block;
@@ -1086,10 +1251,11 @@
 }
 
 .sidebar {
+    z-index: 1000000;
     width: $sidebar-width;
 
     .category-content {
-        margin-bottom: 10px;
+        // margin-bottom: 10px;
 
         .category-title {
             top: -1px;
@@ -1130,9 +1296,57 @@
     }
 }
 
+.category-list-container {
+    z-index: 10;
+    padding: 0px !important;
+    background: $white-color;
+    position: absolute !important;
+    box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+
+    .category {
+        @extend .cursor-pointer;
+
+        width: 100%;
+        line-height: 2.5rem;
+        display: inline-block;
+
+        span {
+            top: -4px;
+            position: relative;
+        }
+    }
+
+    li {
+        padding: 7px 0 5px 15px;
+    }
+
+    li:hover {
+        background: $border-light;
+    }
+
+    .sub-category-container {
+        // position: relative;
+    }
+
+    .sub-categories {
+        top: 0px;
+        left: 100%;
+        z-index: 100;
+        padding-top: 10px;
+        position: absolute;
+        background: $light-color;
+        border-left: 1px solid $border-common;
+        box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+
+        li:nth-last-of-type(1) {
+            margin-bottom: 10px;
+        }
+    }
+}
+
 #sidebar-level-0 {
     display: none;
-    border-top: 1px solid $border-common;
+    z-index: 100000;
 }
 
 .grouped-product-container {
@@ -1368,6 +1582,7 @@
 }
 
 .category-container {
+    min-height: 670px;
     margin-left: 15px;
     padding: 40px 15px !important;
 
@@ -1454,11 +1669,20 @@
             outline: none;
             box-shadow: none;
         }
+
+        .VueCarousel-dot {
+            padding: 5px !important;
+        }
     }
 
     .VueCarousel-dot--active {
         background-color: $theme-color !important;
     }
+    .VueCarousel {
+        .VueCarousel-inner {
+            padding-top: 0;
+        }
+    }
 }
 
 .filter-attributes-item {
@@ -1496,5 +1720,40 @@
 }
 
 .layered-filter-wrapper {
+    @extend .scrollable;
+
+    max-height: 670px;
+    margin-bottom: 42px;
     padding: 42px 10px 0 10px;
-}
\ No newline at end of file
+
+    .recently-viewed {
+        margin-top: 20px;
+
+        h2 {
+            font-size: 18px;
+        }
+    }
+}
+
+.selective-div {
+    -webkit-appearance: none;
+}
+
+.select-icon-margin {
+    margin-top: 10px;
+    margin-left: 96px;
+
+}
+.down-icon-position {
+    position: absolute;
+}
+
+.select-icon-show-margin {
+    margin-left: 35px;
+    margin-top: 10px;
+}
+
+.down-arrow-margin {
+    margin-left: 75px;
+    margin-top: 8px;
+}
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss
index 21f255229..ae1aefb7b 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss
@@ -3,68 +3,66 @@
     background-color: #ffffff;
     display: inline-block;
 
-    .newsletter-subscription {
-        padding: 10px 130px;
-        background-color: #4d7ea8;
-
-        .newsletter-wrapper {
-            display: flex;
-            display: -webkit-box;
-            display: -ms-flexbox;
-            -ms-flex-pack: justify;
-            -webkit-box-pack: justify;
-            justify-content: space-between;
-
-            input.subscribe-field {
-                width: 300px;
-                height: 38px;
-                border: none;
-                font-size: 18px;
-                padding: 10px 20px;
-                color: rgba(0,0,0,0.83);
-                border-radius: 5px 0px 0px 5px;
-            }
-
-            button.subscribe-btn {
-                left: -1px;
-                height: 38px;
-                font-size: 18px;
-                line-height: 10px;
-                position: relative;
-                border-radius: 0px 5px 5px 0px;
-            }
-
-            .social-icons {
-                padding: 20px 0;
-                color: $light-color;
-
-                i {
-                    margin: 0;
-                    cursor: pointer;
-                }
-
-                .within-circle {
-                    background: #4d7ea8;
-                    border: 1px solid rgba(255, 255, 255, 0.52);
-                }
-
-                img {
-                    background: #4d7ea8;
-                    border: 1px solid rgba(255, 255, 255, 0.52);
-                    padding-left: 15px;
-                    padding-right: 15px;
-                }
-            }
-
-            .subscribe-newsletter {
-                padding: 30px 0;
-            }
-        }
-    }
-
     .footer-content {
         .newsletter-subscription {
             color: white;
+            padding: 10px 130px;
+            background-color: #4d7ea8;
+
+            .newsletter-wrapper {
+                display: flex;
+                display: -webkit-box;
+                display: -ms-flexbox;
+                -ms-flex-pack: justify;
+                -webkit-box-pack: justify;
+                justify-content: space-between;
+
+                input.subscribe-field {
+                    width: 300px;
+                    border: none;
+                    height: 38px;
+                    font-size: 18px;
+                    max-width: 250px;
+                    padding: 10px 20px;
+                    color: rgba(0,0,0,0.83);
+                }
+
+                button.subscribe-btn {
+                    left: -2px;
+                    height: 38px;
+                    font-size: 18px;
+                    max-width: 110px;
+                    line-height: 10px;
+                    position: relative;
+                }
+
+                .social-icons {
+                    height: 100%;
+                    padding: 20px 0;
+                    color: $light-color;
+
+                    i {
+                        margin: 0;
+                        cursor: pointer;
+                    }
+
+                    .within-circle {
+                        background: #4d7ea8;
+                        border: 1px solid rgba(255, 255, 255, 0.52);
+                    }
+
+                    img {
+                        background: #4d7ea8;
+                        border: 1px solid rgba(255, 255, 255, 0.52);
+                        padding-left: 15px;
+                        padding-right: 15px;
+                    }
+                }
+
+                .subscribe-newsletter {
+                    padding: 25px 0 30px 0;
+                }
+            }
         }
 
         > .row {
@@ -83,8 +81,16 @@
                     font-size: 14px;
                     line-height: 2.5rem;
 
-                    li a {
-                        color: rgba(255,255,255,0.83);
+                    ul {
+                        margin-bottom: 0px;
+
+                        li {
+                            margin-bottom: 5px;
+
+                            a {
+                                color: rgba(255,255,255,0.83);
+                            }
+                        }
                     }
                 }
             }
@@ -151,9 +157,7 @@
     }
 
     .top-brands {
-        padding: 40px;
-        padding-left: 10%;
-        padding-right: 10%;
+        padding: 30px 130px;
 
         .top-brands-body {
             ul {
@@ -161,6 +165,9 @@
                 display: inline-block;
 
                 li {
+                    margin-left: 0;
+                    font-size: 16px;
+                    padding: 15px 0 0 0;
                     display: inline-block;
                 }
             }
@@ -180,16 +187,4 @@
         }
     }
 
-}
-
-@media all and (max-width: 720px) {
-    .footer {
-        padding-left: 15px;
-    }
-    .footer .footer-list-container {
-        padding-left: 0px !important;
-    }
-    .footer .currency {
-        display: block !important;
-    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
index 9bade0fe7..f017a79ba 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
@@ -9,71 +9,6 @@ body {
     }
 }
 
-.account-modal {
-    @extend .modal-dialog;
-
-    right: 10px;
-    z-index: 100;
-    width: 350px !important;
-    position: absolute !important;
-
-    .theme-btn {
-        padding: .5rem .9rem;
-    }
-
-    .modal-footer {
-        .text-left {
-            padding-left: 5px;
-        }
-    }
-}
-
-.category-list-container {
-    z-index: 10;
-    padding: 0px !important;
-    background: $white-color;
-    position: absolute !important;
-    box-shadow: inset -1px 0 0 0 $border-light;
-
-    .category {
-        @extend .cursor-pointer;
-
-        width: 100%;
-        line-height: 2.5rem;
-        display: inline-block;
-
-        span {
-            top: -4px;
-            position: relative;
-        }
-    }
-}
-
-.category-list-container li {
-    padding: 7px 0 5px 15px;
-}
-
-.category-list-container li:hover {
-    background: $border-light;
-}
-
-.category-list-container {
-    .sub-category-container {
-        position: relative;
-    }
-
-    .sub-categories {
-        top: -50px;
-        left: 100%;
-        z-index: 100;
-        padding-top: 10px;
-        position: absolute;
-        background: $light-color;
-        border-left: 1px solid $border-common;
-        box-shadow: inset -1px 0 0 0 $border-light;
-    }
-}
-
 .root-category-menu {
     border-bottom: solid 1px #d8e6ed;
 }
@@ -87,7 +22,7 @@ body {
 }
 
 .banner-icon {
-    height: 525px;
+    height: unset;
     display: inline-block;
 }
 
@@ -145,19 +80,6 @@ body {
     font-size: 20px;
 }
 
-#header-search-icon {
-    min-width: 40px;
-    background-color: $theme-color;
-
-    i {
-        color: $btn-text-color;
-    }
-}
-#header-search-icon .material-icons {
-    color: white;
-    padding-top: 5px;
-}
-
 header #search-form > *:focus {
     outline: none;
     box-shadow: none;
@@ -208,6 +130,10 @@ header #search-form > *:focus {
             padding: 0 10px;
         }
 
+        a:first-child {
+            padding-bottom: 15px !important;
+        }
+
         .offers-ct-top {
             height: 180px;
         }
@@ -246,10 +172,8 @@ header #search-form > *:focus {
 }
 
 .advertisement-three-container {
-    .col-6:first-child {
-        img {
-            height: 100%;
-        }
+    img {
+        height: 100%;
     }
 
     .top-container,
@@ -288,6 +212,13 @@ header #search-form > *:focus {
 
 .category-with-custom-options {
 
+    img {
+        width: 100%;
+        max-width: 100%;
+        height: 100%;
+        max-height: 100%;
+    }
+
     .row:nth-child(1) {
         margin-bottom: 0px;
 
@@ -301,14 +232,10 @@ header #search-form > *:focus {
 
             &:first-child() {
                 max-height: 345px;
-                background-size: cover;
-                background-image: url('../images/girl.png');
             }
 
             &:nth-child(3) {
                 max-height: 345px;
-                background-size: cover;
-                background-image: url('../images/man.png');
             }
         }
     }
@@ -324,27 +251,25 @@ header #search-form > *:focus {
 
             &:nth-child(2) {
                 max-height: 345px;
-                background-size: cover;
-                background-image: url('../images/man.png');
             }
 
             &:nth-child(4) {
                 max-height: 345px;
-                background-size: cover;
-                background-image: url('../images/girl.png');
             }
         }
     }
 
     .categories-collection {
+        width: 100%;
         height: 100%;
-        min-height: 330px;
+        display: table;
+        min-height: 310px;
         max-height: 345px;
         padding-left: 36px;
         background:#2B2B2B;
 
         h2 {
-            color: white;
+            color: $white-color;
         }
 
         li {
@@ -352,9 +277,9 @@ header #search-form > *:focus {
         }
 
         .category-text-content {
-            top: 50%;
-            position: relative;
-            transform: translateY(-50%);
+            height: 100%;
+            display: table-cell;
+            vertical-align: middle;
         }
     }
 }
@@ -365,14 +290,14 @@ header #search-form > *:focus {
 
 .hot-categories-container {
     .hot-category-wrapper {
-        padding: 15px 10px 15px 0;
+        padding: 0 10px 0 0;
 
         .card {
             height: 100%;
             padding: 20px;
             border: none;
-            box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
-            -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
+            // box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
+            // -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
         }
 
         .velocity-divide-page {
@@ -394,11 +319,11 @@ header #search-form > *:focus {
     }
 
     .hot-category-wrapper:nth-last-child(2) {
-        padding: 15px 0 15px 0px;
+        padding: 0 0 0 0px;
     }
 
     .hot-category-wrapper:last-child {
-        padding: 15px 0 15px 10px;
+        padding: 0 0 0 10px;
     }
 }
 
@@ -420,8 +345,8 @@ header #search-form > *:focus {
         .card {
             height: 100%;
             border: none;
-            box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
-            -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
+            // box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
+            // -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
 
             .category-image {
                 height: 180px;
@@ -440,8 +365,7 @@ header #search-form > *:focus {
         }
 
         .card-description {
-            padding: 25px;
-            margin-top: 15px;
+            padding: 10px 20px;
         }
     }
 
@@ -504,7 +428,7 @@ header #search-form > *:focus {
 /* Customer Reviews */
 
 /* sidebar */
-.categories-sidebar-container {
+.main-content-wrapper {
     @extend .fs14;
 
     margin: 0;
@@ -519,12 +443,14 @@ header #search-form > *:focus {
 
     .main-category {
         padding: 8px 15px;
+        border-top: 1px solid $border-common;
         border-bottom: 1px solid $border-common;
     }
 
     .content-list {
         margin: 0;
         width: 100%;
+        height: 42px;
         text-align: left;
         list-style: none;
         position: relative;
@@ -534,7 +460,6 @@ header #search-form > *:focus {
         ul {
             width: 100%;
             height: 100%;
-            padding-left: 10px;
             display: inline-flex;
             background-color: $link-color;
 
@@ -543,13 +468,18 @@ header #search-form > *:focus {
                     display: block;
                     cursor: pointer;
                     font-size: 16px;
-                    color: #FFFFFF;
+                    font-weight: 600;
+                    padding: 8px 15px;
                     letter-spacing: 0;
                     position: relative;
+                    color: $white-color;
                     text-decoration: none;
-                    padding: 8px 20px 8px 5px;
                 }
             }
+
+            li:hover {
+                background-color: #42719a;
+            }
         }
     }
 }
@@ -614,42 +544,9 @@ header #search-form > *:focus {
     font: 18px "josefin sans", arial;
 }
 
-.quick-view-btn-container {
-    position: relative;
-    margin: 48px 1px 0px -18px;
-
-    span {
-        left: 32%;
-        top: -26px;
-        z-index: 1;
-        font-size: 16px;
-        color: #FFFFFF;
-        position: absolute;
-    }
-
-    button {
-        left: 30%;
-        top: -36px;
-        border: none;
-        color: white;
-        font-size: 16px;
-        padding: 5px 10px 7px 24px;
-        position: absolute;
-        opacity: 0.8;
-        background-color: #0D2438;
-    }
-}
-
-
-
-
-
-
-
-
 body::after {
     /* dark overlay layer - visible when we fire .cd-quick-view */
-    position: fixed;
+    position: absolute;
     top: 0;
     left: 0;
     width: 100%;
@@ -697,7 +594,8 @@ body::after {
     }
 
     .action-buttons {
-        padding-top: 20px;
+        padding-top: 10px;
+        margin-left: 118px;
 
         > span {
             font-size: 24px;
@@ -718,4 +616,18 @@ body::after {
 
 .demo {
     border: 1px solid red;
-}
\ No newline at end of file
+}
+
+.ul-shadow {
+    box-shadow: 1px 2px 8px #888888;
+}
+
+.quick-addtocart-btn {
+    margin-top: 306px;
+    margin-left: -82px;
+}
+
+.model-display-block {
+   display:block;
+}
+
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss
new file mode 100644
index 000000000..13d704b41
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss
@@ -0,0 +1,204 @@
+.vc-small-screen {
+    display: none;
+}
+
+@media only screen and (max-width: 1100px) {
+    .footer {
+        .footer-content {
+            .newsletter-subscription {
+                .newsletter-wrapper {
+                    .social-icons {
+                        width: 100%;
+                        padding: 5px 0;
+                        text-align: center !important;
+                    }
+
+                    .subscribe-newsletter {
+                        width: 100%;
+                        padding: 10px 0;
+                        text-align: center;
+                    }
+                }
+            }
+
+            .footer-statics {
+                > div:not(:last-child) {
+                    margin-bottom: 30px;
+                }
+            }
+        }
+    }
+}
+
+@media only screen and (max-width: 992px) {
+
+}
+
+@media only screen and (max-width: 768px) {
+    .modal-container {
+        left: 10%;
+        max-width: 80%;
+        margin-left: 0px;
+    }
+
+    .footer .footer-list-container {
+        padding-left: 0px !important;
+    }
+    .footer .currency {
+        display: block !important;
+    }
+}
+
+@media only screen
+    and (max-width: 576px)
+    and (max-width: 768px)
+    and (max-width: 992px) {
+    // body {
+    //     display: block;
+    // }
+
+    $header-height: 50px;
+
+    .main-content-wrapper {
+        .vc-header {
+            > div {
+                display: none;
+            }
+
+            > div.vc-small-screen {
+                display: block;
+
+                img {
+                    width: 100%;
+                    height: 100%;
+                    max-height: $header-height;
+                }
+
+                .hamburger-wrapper {
+                    display: table;
+                    height: $header-height;
+
+                    .hamburger {
+                        font-size: 24px;
+                        display: table-cell;
+                        vertical-align: middle;
+                    }
+                }
+
+                .right-vc-header {
+                    text-align: right;
+                    height: $header-height;
+
+                    * {
+                        top: 13px;
+                        width: 24px;
+                        position: relative;
+                        padding-right: 10px;
+                    }
+                }
+            }
+        }
+    }
+
+    #top {
+        display: none;
+
+        + header {
+            display: none;
+        }
+
+        // + .categories-sidebar-container {
+        //     display: none;
+        // }
+    }
+
+    .product-card-new {
+        .cart-wish-wrap {
+            .wishlist-icon {
+                text-align: left;
+            }
+        }
+    }
+
+    .advertisement-four-container {
+        .offers-ct-panel {
+            padding: 8px 0;
+
+            a:first-child {
+                padding-bottom: 10px !important;
+            }
+        }
+    }
+
+    .advertisement-three-container {
+        .top-container,
+        .bottom-container {
+            img {
+                padding: 0px;
+            }
+        }
+
+        .second-panel {
+            padding-top: 10px;
+        }
+    }
+
+    .advertisement-two-container {
+        a:nth-of-type(2) {
+            padding: 15px 0 0 0;
+        }
+    }
+
+    .category-with-custom-options {
+        display: none;
+
+        &.vc-small-screen {
+            display: block;
+
+            .smart-category-container {
+                .col-12 {
+                    padding: 0;
+                }
+            }
+
+            .smart-category-container:not(:first-child) {
+                padding-top: 20px;
+            }
+        }
+    }
+
+    .footer {
+        .footer-content {
+            .newsletter-subscription {
+                .newsletter-wrapper {
+                    input.subscribe-field {
+                        width: 200px;
+                    }
+                }
+            }
+        }
+    }
+
+    .popular-category-wrapper {
+        padding: 0px;
+    }
+
+    .main-content-wrapper {
+        margin-bottom: 25px;
+    }
+
+    .slides-container {
+        .VueCarousel {
+            .VueCarousel-pagination {
+                button {
+                    width: 5px !important;
+                    height: 5px !important;
+                }
+
+                .VueCarousel-dot {
+                    padding: 2px !important;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss
index be2606adc..3246efa1c 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss
@@ -1,156 +1,6 @@
-.product-view {
-    padding: 20px;
-
-    .left {
-        .main-product-image {
-            @extend .mb10;
-            @extend .no-padding;
-
-            width: 465px;
-            height: 450px;
-        }
-
-        .product-more-images {
-            img {
-                height: 109px;
-
-                &.active {
-                    border: 1px solid $theme-color;
-                }
-            }
-        }
-
-        .move-btn {
-            z-index: 10;
-            width: 25px;
-            height: 109px;
-            cursor: pointer;
-            font-size: 22px;
-            font-weight: 700;
-            padding-left: 7px;
-            line-height: 10rem;
-            position: absolute;
-            background: #D6D6D6;
-            color: rgba(0,0,0,0.53);
-
-            &.left {
-                left: -20px;
-            }
-
-            &.right {
-                right: 0px;
-            }
-        }
-    }
-
-    .right {
-        @extend .fs16;
-
-        > div:not(:first-child) {
-            @extend .ml0;
-        }
-
-        > div {
-            @extend .mb20;
-
-            border-bottom: 1px solid $border-common;
-        }
-
-        .category-breadcrumb {
-            margin-left: 0;
-            padding: 0 15px;
-        }
-
-        .reviews {
-            > div {
-                display: inline-block;
-            }
-        }
-
-        .info {
-            @extend .mb15;
-
-            > * {
-                margin-bottom: 10px;
-            }
-
-            h2 {
-                @extend .fw7;
-                @extend .fs24;
-            }
-
-            .price {
-                @extend .fw6;
-                @extend .fs30;
-            }
-
-            .availability {
-                button {
-                    border: none;
-                    color: white;
-                    font-weight: 600;
-                    padding: 2px 11px;
-                    background: #4D7EA8;
-                }
-            }
-        }
-
-        .options {
-            > * {
-                @extend .mb20;
-            }
-
-            label {
-                @extend .display-block;
-            }
-
-            .quantity > label {
-                @extend .mr15;
-                @extend .display-inbl;
-            }
-
-            .box {
-                width: 32px;
-                height: 32px;
-                display: inline-block;
-                background-color: $border-common;
-            }
-
-            .buttons {
-                *:not(:last-child) {
-                    @extend .mr15;
-                }
-            }
-        }
-
-        h3 {
-            @extend .fw6;
-            @extend .fs18;
-            @extend .no-padding;
-        }
-
-        h4 {
-            @extend .fw6;
-        }
-
-        .row {
-            &.reviews {
-                .reviews-text {
-                    line-height: 3rem;
-                }
-            }
-        }
-
-        .customer-reviews {
-            .row {
-                @extend .mb30;
-            }
-        }
-    }
-}
-
 .product-detail {
     padding-top: 20px;
+    margin-bottom: 60px;
 
     .magnifier {
         > img {
@@ -182,6 +32,8 @@
         }
 
         .reviews {
+            vertical-align: top;
+
             > div {
                 display: inline-block;
             }
@@ -218,6 +70,7 @@
                     border: none;
                     color: white;
                     font-weight: 600;
+                    cursor: default;
                     padding: 2px 11px;
                     background: $button-danger;
 
@@ -237,9 +90,11 @@
                 @extend .display-block;
             }
 
-            .quantity > label {
-                @extend .mr15;
-                @extend .display-inbl;
+            .quantity {
+                > label {
+                    @extend .mr15;
+                    @extend .display-inbl;
+                }
             }
 
             .box {
@@ -284,12 +139,14 @@
 
         .add-to-cart-btn {
             padding: 0px;
+            max-width: 130px;
 
             button {
-                padding: 10px 15px;
                 text-transform: uppercase;
+                padding: 9px 15px !important;
 
                 span {
+                    top: 0;
                     font-size: 16px;
                 }
             }
@@ -348,10 +205,22 @@
     .wishlist-icon {
         height: 46px;
         display: table;
+        padding-left: 10px;
 
         i {
             display: table-cell;
             vertical-align: middle;
         }
     }
+
+}
+
+.store-meta-images {
+    margin-top: 20px;
+
+    img {
+        width: 100%;
+        height: 100%;
+        max-height: 300px;
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
index a2858b615..c17c4783f 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
@@ -134,6 +134,9 @@
 .mr20 {
     margin-right: 20px;
 }
+.mb5 {
+    margin-bottom: 5px !important;
+}
 .mb10 {
     margin-bottom: 10px !important;
 }
@@ -184,6 +187,9 @@
 .cursor-pointer {
     cursor: pointer;
 }
+.cursor-default {
+    cursor: default;
+}
 
 .grey {
     color: rgb(158, 158, 158);
@@ -194,6 +200,9 @@
 .clr-dark {
     color: rgba(255,255,255,0.52);
 }
+.font-clr {
+    color: $font-color;
+}
 
 .display-inbl {
     display: inline-block !important;
@@ -238,6 +247,7 @@
 .theme-btn {
     border: none;
     cursor: pointer;
+    font-weight: 600;
     padding: 10px 20px;
     vertical-align: top;
     color: $light-color !important;
@@ -346,7 +356,7 @@
 
     #quick-view-btn-container {
         :hover {
-            color: white !important;
+            color: $white-color !important;
         }
     }
 
@@ -411,12 +421,12 @@
             }
 
             span {
-                vertical-align: middle;
+                vertical-align: top;
             }
         }
 
         .product-information {
-            height: 150px;
+            height: 200px;
             display: table;
 
             > div {
@@ -432,7 +442,7 @@
         }
 
         .wishlist-icon {
-            height: 34px;
+            height: 40px;
             display: table;
 
             i {
@@ -440,6 +450,10 @@
                 vertical-align: middle;
             }
         }
+
+        .add-to-cart-btn {
+            max-width: 150px;
+        }
     }
 
     &.grid-card {
@@ -463,6 +477,14 @@
     }
 }
 
+.small-padding {
+    padding: 3px 4px !important;
+}
+
+.medium-padding {
+    padding: 3px 10px !important;
+}
+
 .general-container {
     cursor: pointer;
 }
@@ -472,10 +494,10 @@
         border: none;
     }
 }
-#product-card-new:hover,
+.product-card-new:hover,
 .lg-card-container:hover,
 .general-container:hover {
-    box-shadow: 0 6px 14px 0 rgba(0,0,0,0.14);
+    box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
 }
 
 .lg-card-container:hover {
@@ -488,11 +510,18 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    color: #555555;
 }
 
 .small-card-container {
     cursor: pointer;
     margin-bottom: 10px;
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+
+    .material-icons {
+        font-size: 16px;
+    }
 
     .product-image-container {
         padding: 0;
@@ -503,6 +532,7 @@
         @extend .bg-image;
 
         height: 100%;
+        background-position: center;
     }
 
     .card-body {
@@ -510,6 +540,11 @@
         display: inline-block;
         padding: 10px 0 !important;
     }
+
+    .sticker,
+    .regular-price {
+        display: none;
+    }
 }
 
 .small-card-container:hover {
@@ -581,7 +616,9 @@ a {
         text-decoration: none;
     }
 
-    &.remove-decoration:hover {
+    &.remove-decoration:hover,
+    &.remove-decoration:active,
+    &.remove-decoration:focus {
         text-decoration: none;
     }
 }
@@ -625,9 +662,13 @@ a {
     width: 100%;
     cursor: pointer;
 
+    .VueCarousel-inner {
+        padding-top: 5px;
+    }
+
     .VueCarousel-slide:nth-of-type(1) {
-        #product-card-new {
-            margin-left: 0px;
+        .product-card-new {
+            margin-left: 5px;
         }
     }
 }
@@ -647,6 +688,8 @@ a {
 .scrollable {
     max-height: 100vh;
     overflow-y: scroll;
+    scrollbar-width: none;
+    -ms-overflow-style: none;
 }
 
 .scrollable::-webkit-scrollbar {
@@ -697,4 +740,35 @@ button[disabled] {
         display: table-cell;
         vertical-align: middle;
     }
+}
+
+.rango-default {
+    speak: none;
+    line-height: 1;
+    font-style: normal;
+    font-weight: normal;
+    text-transform: none;
+    font-variant: normal;
+    -webkit-font-smoothing: antialiased;
+    font-family: 'Webkul Rango' !important;
+}
+
+.quick-view-name {
+    font-size: 24px;
+}
+
+.quick-view-price {
+    font-size: 30px;
+}
+
+.description-text {
+    font-size: 14px;
+}
+
+.max-height-350 {
+    max-height: 350px;
+}
+
+.border-normal {
+    border: $border-normal;
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/static/material-icons.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/static/material-icons.scss
new file mode 100644
index 000000000..e1ac68a9c
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/static/material-icons.scss
@@ -0,0 +1,115 @@
+/* fallback */
+@font-face {
+    font-family: 'Material Icons';
+    font-style: normal;
+    font-weight: 400;
+    src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
+  }
+  /* fallback */
+  @font-face {
+    font-family: 'Material Icons Outlined';
+    font-style: normal;
+    font-weight: 400;
+    src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v14/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2');
+  }
+  /* fallback */
+  @font-face {
+    font-family: 'Material Icons Round';
+    font-style: normal;
+    font-weight: 400;
+    src: url(https://fonts.gstatic.com/s/materialiconsround/v14/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2) format('woff2');
+  }
+  /* fallback */
+  @font-face {
+    font-family: 'Material Icons Sharp';
+    font-style: normal;
+    font-weight: 400;
+    src: url(https://fonts.gstatic.com/s/materialiconssharp/v15/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2');
+  }
+  /* fallback */
+  @font-face {
+    font-family: 'Material Icons Two Tone';
+    font-style: normal;
+    font-weight: 400;
+    src: url(https://fonts.gstatic.com/s/materialiconstwotone/v13/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2) format('woff2');
+  }
+
+  .material-icons {
+    font-family: 'Material Icons';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    letter-spacing: normal;
+    text-transform: none;
+    display: inline-block;
+    white-space: nowrap;
+    word-wrap: normal;
+    direction: ltr;
+    -webkit-font-feature-settings: 'liga';
+    -webkit-font-smoothing: antialiased;
+  }
+
+  .material-icons-outlined {
+    font-family: 'Material Icons Outlined';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    letter-spacing: normal;
+    text-transform: none;
+    display: inline-block;
+    white-space: nowrap;
+    word-wrap: normal;
+    direction: ltr;
+    -webkit-font-feature-settings: 'liga';
+    -webkit-font-smoothing: antialiased;
+  }
+
+  .material-icons-round {
+    font-family: 'Material Icons Round';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    letter-spacing: normal;
+    text-transform: none;
+    display: inline-block;
+    white-space: nowrap;
+    word-wrap: normal;
+    direction: ltr;
+    -webkit-font-feature-settings: 'liga';
+    -webkit-font-smoothing: antialiased;
+  }
+
+  .material-icons-sharp {
+    font-family: 'Material Icons Sharp';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    letter-spacing: normal;
+    text-transform: none;
+    display: inline-block;
+    white-space: nowrap;
+    word-wrap: normal;
+    direction: ltr;
+    -webkit-font-feature-settings: 'liga';
+    -webkit-font-smoothing: antialiased;
+  }
+
+  .material-icons-two-tone {
+    font-family: 'Material Icons Two Tone';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    letter-spacing: normal;
+    text-transform: none;
+    display: inline-block;
+    white-space: nowrap;
+    word-wrap: normal;
+    direction: ltr;
+    -webkit-font-feature-settings: 'liga';
+    -webkit-font-smoothing: antialiased;
+  }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php
index 206082fe0..caf3e58f3 100644
--- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php
@@ -95,13 +95,14 @@ return [
             'subscription-content' => 'Subscription bar Content',
             'activate-slider' => 'Activate Slider',
             'sidebar-categories' => 'Sidebar Categories',
-            'footer-left-raw-content' => 'We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.',
+            'footer-left-raw-content' => '<p>We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.</p>',
             'footer-middle-content' => 'Footer Middle Content',
             'update-meta-data' => 'Update Meta Data',
             'advertisement-four' => 'Advertisement Four Images',
             'advertisement-three' => 'Advertisement Three Images',
             'advertisement-two' => 'Advertisement Two Images',
             'advertisement-one' => 'Advertisement One Images',
+            'product-view-image' => 'Product View Image',
             'footer' => 'Footer',
         ],
         'category' => [
@@ -135,6 +136,8 @@ return [
         'add-to-cart' => 'Add To Cart',
         'hot-categories' => 'Hot Categories',
         'popular-categories' => 'Popular Categories',
+        'payment-methods' => 'Payment Methods',
+        'shipping-methods' => 'Shipping Methods',
     ],
 
     'header' => [
@@ -185,6 +188,7 @@ return [
             'customer-login' => 'Customer Login',
             'registered-user' => 'Registered User',
             'form-login-text' => 'If you have an account, sign in with your email address.',
+            'sign-up' => 'Sign up',
             'new-customer' => 'New Customer',
             'your-email-address' => 'Your email address',
         ],
diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
index f3ff627e9..ed23f6745 100644
--- a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
@@ -1,5 +1,5 @@
 <script type="text/x-template" id="star-ratings-template">
-    <div :class="`stars mr10 fs${size ? size : '16'} ${pushClass ? pushClass : ''}`">
+    <div :class="`stars mr5 fs${size ? size : '16'} ${pushClass ? pushClass : ''}`">
         <input
             v-if="editable"
             type="number"
@@ -7,33 +7,39 @@
             name="rating"
             class="hidden" />
 
-        <span
-            :class="`rango-star-fill ${editable ? 'cursor-pointer' : ''}`"
+        <i
+            :class="`material-icons ${editable ? 'cursor-pointer' : ''}`"
             v-for="(rating, index) in parseInt(showFilled ? showFilled : 3)"
             :key="`${index}${Math.random()}`"
             @click="updateRating(index + 1)">
-        </span>
+            star
+        </i>
 
         <template v-if="!hideBlank">
-            <span
-                :class="`rango-star ${editable ? 'cursor-pointer' : ''}`"
+            <i
+                :class="`material-icons ${editable ? 'cursor-pointer' : ''}`"
                 v-for="(blankStar, index) in (5 - (showFilled ? showFilled : 3))"
                 :key="`${index}${Math.random()}`"
                 @click="updateRating(showFilled + index + 1)">
-            </span>
+                star_border
+            </i>
         </template>
+
+        {{-- <i class="material-icons">star_border</i>
+        <i class="material-icons">star</i> --}}
     </div>
 </script>
 
 <script type="text/x-template" id="cart-btn-template">
     <button
-        :class="`btn btn-link disable-box-shadow ${parseInt(itemCount) ? 'dropdown-icon-custom' : ''}`"
         type="button"
         id="mini-cart"
-        @click="toggleMiniCart">
+        @click="toggleMiniCart"
+        class="btn btn-link disable-box-shadow">
 
         <div class="mini-cart-content">
-            <i class="rango-cart-1 fs24 text-down-3"></i>
+            <i class="icon fs16 cell rango-arrow-down down-icon-position down-arrow-margin"></i>
+            <i class="material-icons-outlined text-down-3">shopping_cart</i>
             <span class="badge" v-text="itemCount"></span>
             <span class="fs18 fw6 cart-text">{{ __('velocity::app.minicart.cart') }}</span>
         </div>
@@ -60,6 +66,19 @@
     </div>
 </script>
 
+<script type="text/x-template" id="logo-template">
+    <a
+        :class="`left ${addClass}`"
+        href="{{ route('shop.home.index') }}">
+
+        @if ($logo = core()->getCurrentChannel()->logo_url)
+            <img class="logo" src="{{ $logo }}" />
+        @else
+            <img class="logo" src="{{ asset('themes/velocity/assets/images/logo-text.png') }}" />
+        @endif
+    </a>
+</script>
+
 <script type="text/javascript">
     (() => {
         Vue.component('star-ratings', {
@@ -172,5 +191,10 @@
                 }
             }
         });
+
+        Vue.component('logo-component', {
+            template: '#logo-template',
+            props: ['addClass'],
+        });
     })()
 </script>
diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
index 58534a1af..022e2c0d0 100644
--- a/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
@@ -6,13 +6,12 @@
     $productPrice = $product->getTypeInstance()->getProductPrices();
     $totalReviews = $product->reviews;
     $avgRatings = ceil($reviewHelper->getAverageRating($product));
-@endphp
 
-<?php
-    foreach ($totalReviews as $review) {
-        $productReview = $review;
-    }
-?>
+    // @TODO
+    // foreach ($totalReviews as $review) {
+    //     $productReview = $review;
+    // }
+@endphp
 
 <script type="text/x-template" id="quick-view-btn-template">
 
@@ -21,10 +20,7 @@
         id="quick-view-btn-container"
         :name="details"
         @click="openQuickView({details: details, event: $event})">
-        <product-quick-view
-            v-if="quickViewDetails"
-            :quick-view-details="quickViewDetails"
-        ></product-quick-view>
+        <product-quick-view v-if="quickViewDetails" :quick-view-details="quickViewDetails"></product-quick-view>
 
         <span class="rango-zoom-plus"></span>
 
@@ -34,7 +30,7 @@
 
 <script type="text/x-template" id="product-quick-view-template">
     <div class="cd-quick-view" v-if="quickView">
-        <div class="col-lg-6 cd-slider-wrapper">
+        <div class="col-lg-6 cd-slider-wrapper model-animation">
             <ul class="cd-slider" type="none">
                 <li class="selected">
                     <img src="{{ $productBaseImage['medium_image_url'] }}" :alt="quickViewDetails.name" />
@@ -51,13 +47,14 @@
         </div>
 
         <div class="col-lg-6 cd-item-info fs16">
-            <h2 class="text-nowrap fw6">{{ $product->name }}</h2>
+            <h2 class="text-nowrap fw6 quick-view-name">{{ $product->name }}</h2>
 
             <div class="product-price fs14">
-                <h2 class="text-nowrap fw6">{{ $product->price }}</h2>
+                <h2 class="text-nowrap fw6 quick-view-price">{{ $product->price }}</h2>
             </div>
 
-            @if ($totalReviews)
+            {{-- @TODO --}}
+            {{-- @if ($totalReviews)
                 <div class="">
                     {{ $productReview['rating'] }} Ratings
                 </div>
@@ -65,14 +62,17 @@
                 <div class="">
                     <a href="">{{ __('velocity::app.products.be-first-review') }}</a>
                 </div>
-            @endif
+            @endif --}}
 
-            <p class="pt20">
+            <p class="pt14 description-text">
                 {!! $product->description !!}
             </p>
+            <button type="submit" class="btn btn-add-to-cart quick-addtocart-btn">
+                <span class="rango-cart-1 fs20"></span>
+                    Add To Cart
+            </button>
 
             <div class="action-buttons">
-
                 <div style="display: inline-block;" class="rango-exchange fs24"></div>
                 <div style="display: inline-block;" class="rango-heart fs24"></div>
             </div>
@@ -98,25 +98,12 @@
 
                 methods: {
                     openQuickView: function ({details, event}) {
+                        document.getElementById('quick-view-btn-container').style.display = "block";
                         if (event) {
                             event.preventDefault();
                             event.stopPropagation();
                         }
 
-                        // this.quickView
-
-                        // .velocity({
-
-                        //     'width': '734px',
-                        //     'left': '200px',
-                        //     'top': '50px',
-                        // }, 1000, [ 500, 20 ])
-
-                        // .velocity({
-                        //     'width': '734px',
-                        //     'left': '200px',
-                        // }, 3000, 'ease');
-
                         this.quickViewDetails = true;
                     }
                 }
@@ -145,6 +132,9 @@
                     closeQuickView: function () {
                         this.quickView = false;
                         this.quickViewDetails = false;
+                        document.getElementById('quick-view-btn-container').style.display = "none";
+                        window.location.reload();
+
                     },
 
                     changeImage: function (imageIndex) {
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php
new file mode 100644
index 000000000..fa4302189
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php
@@ -0,0 +1 @@
+<input type="file" name="category_icon_path" />
\ No newline at end of file
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 40ff3913f..42074825e 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
@@ -121,6 +121,14 @@
                             input-name="images[1]">
                         </image-wrapper>
                     </div>
+
+                    <div class="control-group product-view-image">
+                        <label>{{ __('velocity::app.admin.meta-data.product-view-image') }}</label>
+
+                        <image-wrapper
+                            input-name="product_view_images">
+                        </image-wrapper>
+                    </div>
                 </div>
             </accordian>
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php
new file mode 100644
index 000000000..a2ec1c5c2
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php
@@ -0,0 +1 @@
+<input type="file" name="locale_image" />
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php
index c10d92d57..d93fc6b50 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php
@@ -11,7 +11,7 @@
     <section class="cart-details row offset-1">
         <h1 class="fw6 row col-12">{{ __('shop::app.checkout.cart.title') }}</h1>
 
-        <div class="cart-details-header row col-7">
+        <div class="cart-details-header row col-6">
             {{-- TODO:- USE table insted of column --}}
             @if ($cart)
                 <div class="row cart-header col-12 no-padding">
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php
index 356625872..ac48b0f26 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php
@@ -16,7 +16,7 @@
 
             <div class="modal-content sensitive-modal cart-modal-content hide" id="cart-modal-content">
                 <!--Body-->
-                <div class="pl20 pt10 pr15 fs14">
+                <div class="mini-cart-container">
                     @foreach ($items as $item)
                         @php
                             $images = $item->product->getTypeInstance()->getBaseImage($item);
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php
index b36a5f191..4f3258c37 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php
@@ -11,7 +11,7 @@
 @push('scripts')
     <script type="text/x-template" id="checkout-template">
         <div id="checkout" class="checkout-process offset-1 row col-11">
-            <h1 class="row col-12">Checkout</h1>
+            <h1 class="row col-12">{{ __('velocity::app.checkout.checkout') }}</h1>
 
             <div class="row col-7">
 
@@ -573,20 +573,6 @@
                     onSubmit: function() {
                         var this_this = this;
                         const emptyCouponErrorText = "Please enter a coupon code";
-                        axios.post('{{ route('shop.checkout.check.coupons') }}', {code: this_this.coupon_code})
-                            .then(function(response) {
-                                this_this.$emit('onApplyCoupon');
-
-                                this_this.couponChanged = true;
-                            })
-                            .catch(function(error) {
-                                this_this.couponChanged = true;
-
-                                this_this.error_message = (error.response.data.message === "The given data was invalid.")?
-                                    emptyCouponErrorText :
-                                        (error.response.data.message === "Cannot Apply Coupon")?
-                                            "Sorry, this Coupon code is invalid":error.response.data.message;
-                            });
                     },
 
                     changeCoupon: function() {
@@ -603,16 +589,6 @@
 
                     removeCoupon: function () {
                         var this_this = this;
-
-                        axios.post('{{ route('shop.checkout.remove.coupon') }}')
-                            .then(function(response) {
-                                this_this.$emit('onRemoveCoupon')
-                            })
-                            .catch(function(error) {
-                                window.flashMessages = [{'type' : 'alert-error', 'message' : error.response.data.message}];
-
-                                this_this.$root.addFlashMessages();
-                            });
                     }
                 }
             });
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-info.blade.php
index 91391d553..38ce3cfe5 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -1,162 +1,55 @@
 <form data-vv-scope="address-form" class="custom-form">
     <div class="form-container" v-if="!this.new_billing_address">
-        <div class="form-header mb-30">
-            <h3 class="fw6 display-inbl">
-                1. {{ __('shop::app.checkout.onepage.billing-address') }}
-            </h3>
-
-            <a
-                class="theme-btn light pull-right text-up-14"
-                @click="newBillingAddress()">
-                {{ __('shop::app.checkout.onepage.new-address') }}
-            </a>
-        </div>
-
-        <div class="address-container row full-width">
-            <div class="col address-holder" v-for='(addresses, index) in this.allAddress'>
-                <div class="card">
-                    <div class="card-body row">
-
-                        <div class="col-1">
-
-                            <input
-                                type="radio"
-                                v-validate="'required'"
-                                name="billing[address_id]"
-                                :value="addresses.id"
-                                v-model="address.billing.address_id"
-                                @change="validateForm('address-form')"
-                                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.billing-address') }}&quot;" />
-
-                            <span class="checkmark"></span>
-                        </div>
-
-                        <div class="col-10">
-                            <h5 class="card-title fw6">
-                                @{{ allAddress.first_name }} @{{ allAddress.last_name }},
-                            </h5>
-
-                            <ul type="none">
-                                <li>@{{ addresses.address1 }},</li>
-                                <li>@{{ addresses.city }},</li>
-                                <li>@{{ addresses.state }},</li>
-                                <li>@{{ addresses.country }} @{{ addresses.postcode }}</li>
-                                <li>
-                                    {{ __('shop::app.customer.account.address.index.contact') }} : @{{ addresses.phone }}
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div id="message"></div>
-
-        <div
-            class="control-group"
-            :class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
-
-            <span
-                class="control-error"
-                v-if="errors.has('address-form.billing[address_id]')">
-                @{{ errors.first('address-form.billing[address_id]') }}
-            </span>
-        </div>
-
-        @if ($cart->haveStockableItems())
-            <div class="mt10 mb10" v-if="address.billing.address_id">
-                <span class="checkbox fs16 display-inbl">
-                    <input
-                        type="checkbox"
-                        class="ml0"
-                        id="billing[use_for_shipping]"
-                        name="billing[use_for_shipping]"
-                        v-model="address.billing.use_for_shipping" />
-
-                    <span class="ml-5">
-                        {{ __('shop::app.checkout.onepage.use_for_shipping') }}
-                    </span>
-                </span>
-            </div>
-        @endif
-    </div>
-
-    <div class="form-container" v-else>
-        <div class="form-header">
-            <h3 class="fw6 display-inbl">
-                1. {{ __('shop::app.checkout.onepage.billing-address') }}
-            </h3>
-
-            @auth('customer')
-                @if(count(auth('customer')->user()->addresses))
-                    <a
-                        class="theme-btn light pull-right text-up-14"
-                        @click="backToSavedBillingAddress()">
-
-                        {{ __('shop::app.checkout.onepage.back') }}
-                    </a>
-                @endif
-            @endauth
-        </div>
-
-        <div class="col-12">
-            @include('shop::checkout.onepage.customer-new-form', [
-                'billing' => true
-            ])
-        </div>
-    </div>
-
-    @if ($cart->haveStockableItems())
-        <div
-            class="form-container"
-            v-if="!address.billing.use_for_shipping && !this.new_shipping_address">
-
-            <div class="form-header mb-30">
+        <accordian :title="'{{ __('shop::app.checkout.onepage.billing-address') }}'" :active="true">
+            <div class="form-header mb-30" slot="header">
                 <h3 class="fw6 display-inbl">
-                    {{ __('shop::app.checkout.onepage.shipping-address') }}
+                    1. {{ __('shop::app.checkout.onepage.billing-address') }}
                 </h3>
 
-                <a class="theme-btn light pull-right text-up-14" @click="newShippingAddress()">
+                <a
+                    class="theme-btn light pull-right text-up-14"
+                    @click="newBillingAddress()">
                     {{ __('shop::app.checkout.onepage.new-address') }}
                 </a>
+
+                <i class="rango-arrow"></i>
             </div>
 
-            <div class="address-container row">
-                <div
-                    class="col address-holder"
-                    v-for='(addresses, index) in this.allAddress'>
+            <div slot="body">
+                <div class="address-container row full-width">
+                    <div class="col address-holder" v-for='(addresses, index) in this.allAddress'>
+                        <div class="card">
+                            <div class="card-body row">
 
-                    <div class="card">
-                        <div class="card-body row">
+                                <div class="col-1">
 
-                            <div class="col-1">
-                                <input
-                                    type="radio"
-                                    v-validate="'required'"
-                                    :value="addresses.id"
-                                    id="shipping[address_id]"
-                                    name="shipping[address_id]"
-                                    v-model="address.shipping.address_id"
-                                    data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-address') }}&quot;" />
+                                    <input
+                                        type="radio"
+                                        v-validate="'required'"
+                                        name="billing[address_id]"
+                                        :value="addresses.id"
+                                        v-model="address.billing.address_id"
+                                        @change="validateForm('address-form')"
+                                        data-vv-as="&quot;{{ __('shop::app.checkout.onepage.billing-address') }}&quot;" />
 
-                                <span class="checkmark"></span>
-                            </div>
+                                    <span class="checkmark"></span>
+                                </div>
 
-                            <div class="col-10">
-                                <h5 class="card-title fw6">
-                                    @{{ allAddress.first_name }} @{{ allAddress.last_name }},
-                                </h5>
+                                <div class="col-10">
+                                    <h5 class="card-title fw6">
+                                        @{{ allAddress.first_name }} @{{ allAddress.last_name }},
+                                    </h5>
 
-                                <ul type="none">
-                                    <li>@{{ addresses.address1 }},</li>
-                                    <li>@{{ addresses.city }},</li>
-                                    <li>@{{ addresses.state }},</li>
-                                    <li>@{{ addresses.country }} @{{ addresses.postcode }}</li>
-                                    <li>
-                                        {{ __('shop::app.customer.account.address.index.contact') }} : @{{ addresses.phone }}
-                                    </li>
-                                </ul>
+                                    <ul type="none">
+                                        <li>@{{ addresses.address1 }},</li>
+                                        <li>@{{ addresses.city }},</li>
+                                        <li>@{{ addresses.state }},</li>
+                                        <li>@{{ addresses.country }} @{{ addresses.postcode }}</li>
+                                        <li>
+                                            {{ __('shop::app.customer.account.address.index.contact') }} : @{{ addresses.phone }}
+                                        </li>
+                                    </ul>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -164,40 +57,163 @@
 
                 <div id="message"></div>
 
-                <div class="control-group" :class="[errors.has('address-form.shipping[address_id]') ? 'has-error' : '']">
-                    <span class="control-error" v-if="errors.has('address-form.shipping[address_id]')">
-                        @{{ errors.first('address-form.shipping[address_id]') }}
+                <div
+                    class="control-group"
+                    :class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
+
+                    <span
+                        class="control-error"
+                        v-if="errors.has('address-form.billing[address_id]')">
+                        @{{ errors.first('address-form.billing[address_id]') }}
                     </span>
                 </div>
+
+                @if ($cart->haveStockableItems())
+                    <div class="mt10 mb10" v-if="address.billing.address_id">
+                        <span class="checkbox fs16 display-inbl">
+                            <input
+                                type="checkbox"
+                                class="ml0"
+                                id="billing[use_for_shipping]"
+                                name="billing[use_for_shipping]"
+                                v-model="address.billing.use_for_shipping" />
+
+                            <span class="ml-5">
+                                {{ __('shop::app.checkout.onepage.use_for_shipping') }}
+                            </span>
+                        </span>
+                    </div>
+                @endif
             </div>
-        </div>
+        </accordian>
+    </div>
 
-        <div
-            class="form-container"
-            v-if="!address.billing.use_for_shipping && this.new_shipping_address">
-
-            <div class="form-header">
+    <div class="form-container" v-else>
+        <accordian :title="'{{ __('shop::app.checkout.onepage.billing-address') }}'" :active="true">
+            <div class="form-header" slot="header">
                 <h3 class="fw6 display-inbl">
-                    {{ __('shop::app.checkout.onepage.shipping-address') }}
+                    1. {{ __('shop::app.checkout.onepage.billing-address') }}
                 </h3>
 
                 @auth('customer')
                     @if(count(auth('customer')->user()->addresses))
                         <a
                             class="theme-btn light pull-right text-up-14"
-                            @click="backToSavedShippingAddress()">
+                            @click="backToSavedBillingAddress()">
 
                             {{ __('shop::app.checkout.onepage.back') }}
                         </a>
                     @endif
                 @endauth
+
+                <i class="rango-arrow"></i>
             </div>
 
-            <div class="col-12">
+            <div class="col-12 no-padding" slot="body">
                 @include('shop::checkout.onepage.customer-new-form', [
-                    'shipping' => true
+                    'billing' => true
                 ])
             </div>
+        </accordian>
+    </div>
+
+    @if ($cart->haveStockableItems())
+        <div
+            class="form-container"
+            v-if="!address.billing.use_for_shipping && !this.new_shipping_address">
+
+            <accordian :title="'{{ __('shop::app.checkout.onepage.shipping-address') }}'" :active="true">
+                <div class="form-header mb-30" slot="header">
+                    <h3 class="fw6 display-inbl">
+                        {{ __('shop::app.checkout.onepage.shipping-address') }}
+                    </h3>
+
+                    <a class="theme-btn light pull-right text-up-14" @click="newShippingAddress()">
+                        {{ __('shop::app.checkout.onepage.new-address') }}
+                    </a>
+                    <i class="rango-arrow"></i>
+                </div>
+
+                <div class="address-container row" slot="body">
+                    <div
+                        class="col address-holder"
+                        v-for='(addresses, index) in this.allAddress'>
+
+                        <div class="card">
+                            <div class="card-body row">
+
+                                <div class="col-1">
+                                    <input
+                                        type="radio"
+                                        v-validate="'required'"
+                                        :value="addresses.id"
+                                        id="shipping[address_id]"
+                                        name="shipping[address_id]"
+                                        v-model="address.shipping.address_id"
+                                        data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-address') }}&quot;" />
+
+                                    <span class="checkmark"></span>
+                                </div>
+
+                                <div class="col-10">
+                                    <h5 class="card-title fw6">
+                                        @{{ allAddress.first_name }} @{{ allAddress.last_name }},
+                                    </h5>
+
+                                    <ul type="none">
+                                        <li>@{{ addresses.address1 }},</li>
+                                        <li>@{{ addresses.city }},</li>
+                                        <li>@{{ addresses.state }},</li>
+                                        <li>@{{ addresses.country }} @{{ addresses.postcode }}</li>
+                                        <li>
+                                            {{ __('shop::app.customer.account.address.index.contact') }} : @{{ addresses.phone }}
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div id="message"></div>
+
+                    <div class="control-group" :class="[errors.has('address-form.shipping[address_id]') ? 'has-error' : '']">
+                        <span class="control-error" v-if="errors.has('address-form.shipping[address_id]')">
+                            @{{ errors.first('address-form.shipping[address_id]') }}
+                        </span>
+                    </div>
+                </div>
+            </accordian>
+        </div>
+
+        <div
+            class="form-container"
+            v-if="!address.billing.use_for_shipping && this.new_shipping_address">
+
+            <accordian :title="'{{ __('shop::app.checkout.onepage.shipping-address') }}'" :active="true">
+                <div class="form-header" slot="header">
+                    <h3 class="fw6 display-inbl">
+                        {{ __('shop::app.checkout.onepage.shipping-address') }}
+                    </h3>
+
+                    @auth('customer')
+                        @if(count(auth('customer')->user()->addresses))
+                            <a
+                                class="theme-btn light pull-right text-up-14"
+                                @click="backToSavedShippingAddress()">
+
+                                {{ __('shop::app.checkout.onepage.back') }}
+                            </a>
+                        @endif
+                    @endauth
+                    <i class="rango-arrow"></i>
+                </div>
+
+                <div class="col-12 no-padding" slot="body">
+                    @include('shop::checkout.onepage.customer-new-form', [
+                        'shipping' => true
+                    ])
+                </div>
+            </accordian>
         </div>
     @endif
 </form>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-new-form.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-new-form.blade.php
index 7aa5e97f0..349a55be4 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-new-form.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-new-form.blade.php
@@ -2,413 +2,497 @@
     $isCustomer = auth()->guard('customer')->check();
 @endphp
 
-@if (isset($shipping) && $shipping)
-    <div class="row col-12" :class="[errors.has('address-form.shipping[first_name]') ? 'has-error' : '']">
-        <label for="shipping[first_name]" class="required">
-            {{ __('shop::app.checkout.onepage.first-name') }}
-        </label>
+<form>
+    @if (isset($shipping) && $shipping)
+        <div :class="`row col-12 ${errors.has('address-form.shipping[first_name]') ? 'has-error' : ''}`">
+            <label for="shipping[first_name]" class="required">
+                {{ __('shop::app.checkout.onepage.first-name') }}*
+            </label>
 
-        <input type="text" v-validate="'required'" class="control" id="shipping[first_name]" name="shipping[first_name]" v-model="address.shipping.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
+            <input
+                type="text"
+                class="control"
+                v-validate="'required'"
+                id="shipping[first_name]"
+                name="shipping[first_name]"
+                v-model="address.shipping.first_name"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;" />
 
-        <span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
-            @{{ errors.first('address-form.shipping[first_name]') }}
-        </span>
-    </div>
-
-    <div class="row col-12" :class="[errors.has('address-form.shipping[last_name]') ? 'has-error' : '']">
-        <label for="shipping[last_name]" class="required">
-            {{ __('shop::app.checkout.onepage.last-name') }}
-        </label>
-
-        <input type="text" v-validate="'required'" class="control" id="shipping[last_name]" name="shipping[last_name]" v-model="address.shipping.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
-
-        <span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
-            @{{ errors.first('address-form.shipping[last_name]') }}
-        </span>
-    </div>
-
-    <div class="row col-12" :class="[errors.has('address-form.shipping[email]') ? 'has-error' : '']">
-        <label for="shipping[email]" class="required">
-            {{ __('shop::app.checkout.onepage.email') }}
-        </label>
-
-        <input type="text" v-validate="'required|email'" class="control" id="shipping[email]" name="shipping[email]" v-model="address.shipping.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
-
-        <span class="control-error" v-if="errors.has('address-form.shipping[email]')">
-            @{{ errors.first('address-form.shipping[email]') }}
-        </span>
-    </div>
-
-    <div class="row col-12" :class="[errors.has('address-form.shipping[address1][]') ? 'has-error' : '']">
-        <label for="shipping_address_0" class="required">
-            {{ __('shop::app.checkout.onepage.address1') }}
-        </label>
-
-        <input type="text" v-validate="'required'" class="control" id="shipping_address_0" name="shipping[address1][]" v-model="address.shipping.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
-
-        <span class="control-error" v-if="errors.has('address-form.shipping[address1][]')">
-            @{{ errors.first('address-form.shipping[address1][]') }}
-        </span>
-    </div>
-
-    @if (
-        core()->getConfigData('customer.settings.address.street_lines')
-        && core()->getConfigData('customer.settings.address.street_lines') > 1
-    )
-        <div class="row col-12">
-            @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                <input type="text" class="control" name="shipping[address1][{{ $i }}]" id="shipping_address_{{ $i }}" v-model="address.shipping.address1[{{$i}}]">
-            @endfor
-        </div>
-    @endif
-
-    <div class="row col-12" :class="[errors.has('address-form.shipping[city]') ? 'has-error' : '']">
-        <label for="shipping[city]" class="required">
-            {{ __('shop::app.checkout.onepage.city') }}
-        </label>
-
-        <input type="text" v-validate="'required'" class="control" id="shipping[city]" name="shipping[city]" v-model="address.shipping.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
-
-        <span class="control-error" v-if="errors.has('address-form.shipping[city]')">
-            @{{ errors.first('address-form.shipping[city]') }}
-        </span>
-    </div>
-
-    <div class="row col-12" :class="[errors.has('address-form.shipping[state]') ? 'has-error' : '']">
-        <label for="shipping[state]" class="required">
-            {{ __('shop::app.checkout.onepage.state') }}
-        </label>
-
-
-        <input type="text" v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="!haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
-
-        <select v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
-
-            <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
-
-            <option v-for='(state, index) in countryStates[address.shipping.country]' :value="state.code">
-                @{{ state.default_name }}
-            </option>
-
-        </select>
-
-        <span class="control-error" v-if="errors.has('address-form.shipping[state]')">
-            @{{ errors.first('address-form.shipping[state]') }}
-        </span>
-    </div>
-
-    <div class="row col-12" :class="[errors.has('address-form.shipping[postcode]') ? 'has-error' : '']">
-        <label for="shipping[postcode]" class="required">
-            {{ __('shop::app.checkout.onepage.postcode') }}
-        </label>
-
-        <input type="text" v-validate="'required'" class="control" id="shipping[postcode]" name="shipping[postcode]" v-model="address.shipping.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
-
-        <span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
-            @{{ errors.first('address-form.shipping[postcode]') }}
-        </span>
-    </div>
-
-    <div class="row col-12" :class="[errors.has('address-form.shipping[country]') ? 'has-error' : '']">
-        <label for="shipping[country]" class="required">
-            {{ __('shop::app.checkout.onepage.country') }}
-        </label>
-
-        <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-            <option value=""></option>
-
-            @foreach (core()->countries() as $country)
-                <option value="{{ $country->code }}">{{ $country->name }}</option>
-            @endforeach
-        </select>
-
-        <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
-            @{{ errors.first('address-form.shipping[country]') }}
-        </span>
-    </div>
-
-    <div class="row col-12" :class="[errors.has('address-form.shipping[phone]') ? 'has-error' : '']">
-        <label for="shipping[phone]" class="required">
-            {{ __('shop::app.checkout.onepage.phone') }}
-        </label>
-
-        <input type="text" v-validate="'required'" class="control" id="shipping[phone]" name="shipping[phone]" v-model="address.shipping.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
-
-        <span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
-            @{{ errors.first('address-form.shipping[phone]') }}
-        </span>
-    </div>
-
-    @auth('customer')
-        <div class="mb10">
-            <span class="checkbox fs16 display-inbl no-margin">
-                <input
-                    type="checkbox"
-                    class="ml0"
-                    id="shipping[save_as_address]"
-                    name="shipping[save_as_address]" v-model="address.shipping.save_as_address"/>
-
-                <span class="ml-5">
-                    {{ __('shop::app.checkout.onepage.save_as_address') }}
-                </span>
+            <span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
+                @{{ errors.first('address-form.shipping[first_name]') }}
             </span>
         </div>
-    @endauth
 
-@elseif (isset($billing) && $billing)
+        <div :class="`row col-12 ${errors.has('address-form.shipping[last_name]') ? 'has-error' : ''}`">
+            <label for="shipping[last_name]" class="required">
+                {{ __('shop::app.checkout.onepage.last-name') }}*
+            </label>
 
-    <div :class="`row col-12 ${errors.has('address-form.billing[email]') ? 'has-error' : ''}`">
+            <input
+                type="text"
+                class="control"
+                v-validate="'required'"
+                id="shipping[last_name]"
+                name="shipping[last_name]"
+                v-model="address.shipping.last_name"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;" />
 
-        <label for="billing[email]" class="required">
-            {{ __('shop::app.checkout.onepage.email') }}
-        </label>
-
-        <input
-            type="text"
-            class="control"
-            id="billing[email]"
-            name="billing[email]"
-            @blur="isCustomerExist"
-            v-validate="'required|email'"
-            v-model="address.billing.email"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" />
-
-        <span class="control-error" v-if="errors.has('address-form.billing[email]')">
-            @{{ errors.first('address-form.billing[email]') }}
-        </span>
-    </div>
-
-    {{--  for customer login checkout   --}}
-    @if (! $isCustomer)
-        @include('shop::checkout.onepage.customer-checkout')
-    @endif
-
-    <div :class="`row col-12 ${errors.has('address-form.billing[first_name]') ? 'has-error' : ''}`">
-        <label for="billing[first_name]" class="required">
-            {{ __('shop::app.checkout.onepage.first-name') }}
-        </label>
-
-        <input
-            type="text"
-            class="control"
-            v-validate="'required'"
-            id="billing[first_name]"
-            name="billing[first_name]"
-            v-model="address.billing.first_name"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;" />
-
-        <span class="control-error" v-if="errors.has('address-form.billing[first_name]')">
-            @{{ errors.first('address-form.billing[first_name]') }}
-        </span>
-    </div>
-
-    <div :class="`row col-12 ${errors.has('address-form.billing[last_name]') ? 'has-error' : ''}`">
-        <label for="billing[last_name]" class="required">
-            {{ __('shop::app.checkout.onepage.last-name') }}
-        </label>
-
-        <input
-            type="text"
-            v-validate="'required'"
-            class="control"
-            id="billing[last_name]"
-            name="billing[last_name]"
-            v-model="address.billing.last_name"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;" />
-
-        <span class="control-error" v-if="errors.has('address-form.billing[last_name]')">
-            @{{ errors.first('address-form.billing[last_name]') }}
-        </span>
-    </div>
-
-    <div :class="`row col-12 ${errors.has('address-form.billing[address1][]') ? 'has-error' : ''}`">
-        <label for="billing_address_0" class="required">
-            {{ __('shop::app.checkout.onepage.address1') }}
-        </label>
-
-        <input
-            type="text"
-            class="control"
-            v-validate="'required'"
-            id="billing_address_0"
-            name="billing[address1][]"
-            v-model="address.billing.address1[0]"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;" />
-
-        <span class="control-error" v-if="errors.has('address-form.billing[address1][]')">
-            @{{ errors.first('address-form.billing[address1][]') }}
-        </span>
-    </div>
-
-    @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
-        <div class="row col-12" style="margin-top: -25px;">
-            @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                <input
-                    type="text"
-                    class="control"
-                    id="billing_address_{{ $i }}"
-                    name="billing[address1][{{ $i }}]"
-                    v-model="address.billing.address1[{{$i}}]" />
-            @endfor
-        </div>
-    @endif
-
-    <div :class="`row col-12 ${errors.has('address-form.billing[city]') ? 'has-error' : ''}`">
-        <label for="billing[city]" class="required">
-            {{ __('shop::app.checkout.onepage.city') }}
-        </label>
-
-        <input
-            type="text"
-            class="control"
-            id="billing[city]"
-            name="billing[city]"
-            v-validate="'required'"
-            v-model="address.billing.city"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;" />
-
-        <span class="control-error" v-if="errors.has('address-form.billing[city]')">
-            @{{ errors.first('address-form.billing[city]') }}
-        </span>
-    </div>
-
-    <div :class="`row col-12 ${errors.has('address-form.billing[country]') ? 'has-error' : ''}`">
-        <label for="billing[country]" class="required">
-            {{ __('shop::app.checkout.onepage.country') }}
-        </label>
-
-        <select
-            type="text"
-            class="control"
-            id="billing[country]"
-            name="billing[country]"
-            v-validate="'required'"
-            v-model="address.billing.country"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-
-            <option value=""></option>
-
-            @foreach (core()->countries() as $country)
-
-                <option value="{{ $country->code }}">{{ $country->name }}</option>
-
-            @endforeach
-        </select>
-
-        <span class="control-error" v-if="errors.has('address-form.billing[country]')">
-            @{{ errors.first('address-form.billing[country]') }}
-        </span>
-    </div>
-
-    <div :class="`row col-12 ${errors.has('address-form.billing[state]') ? 'has-error' : ''}`">
-        <label for="billing[state]" class="required">
-            {{ __('shop::app.checkout.onepage.state') }}
-        </label>
-
-        <input
-            type="text"
-            class="control"
-            id="billing[state]"
-            name="billing[state]"
-            v-validate="'required'"
-            v-if="!haveStates('billing')"
-            v-model="address.billing.state"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;" />
-
-        <select
-            class="control"
-            id="billing[state]"
-            name="billing[state]"
-            v-validate="'required'"
-            v-if="haveStates('billing')"
-            v-model="address.billing.state"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
-
-            <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
-
-            <option v-for='(state, index) in countryStates[address.billing.country]' :value="state.code">
-                @{{ state.default_name }}
-            </option>
-
-        </select>
-
-        <span class="control-error" v-if="errors.has('address-form.billing[state]')">
-            @{{ errors.first('address-form.billing[state]') }}
-        </span>
-    </div>
-
-    <div :class="`row col-12 ${errors.has('address-form.billing[postcode]') ? 'has-error' : ''}`">
-        <label for="billing[postcode]" class="required">
-            {{ __('shop::app.checkout.onepage.postcode') }}
-        </label>
-
-        <input
-            type="text"
-            class="control"
-            id="billing[postcode]"
-            v-validate="'required'"
-            name="billing[postcode]"
-            v-model="address.billing.postcode"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;" />
-
-        <span class="control-error" v-if="errors.has('address-form.billing[postcode]')">
-            @{{ errors.first('address-form.billing[postcode]') }}
-        </span>
-    </div>
-
-    <div :class="`row col-12 ${errors.has('address-form.billing[phone]') ? 'has-error' : ''}`">
-        <label for="billing[phone]" class="required">
-            {{ __('shop::app.checkout.onepage.phone') }}
-        </label>
-
-        <input
-            type="text"
-            class="control"
-            id="billing[phone]"
-            name="billing[phone]"
-            v-validate="'required'"
-            v-model="address.billing.phone"
-            @change="validateForm('address-form')"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;" />
-
-        <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
-            @{{ errors.first('address-form.billing[phone]') }}
-        </span>
-    </div>
-
-    @if ($cart->haveStockableItems())
-        <div class="mb10">
-            <span class="checkbox fs16 display-inbl no-margin">
-                <input
-                    class="ml0"
-                    type="checkbox"
-                    @change="validateForm('address-form')"
-                    id="billing[use_for_shipping]"
-                    name="billing[use_for_shipping]"
-                    v-model="address.billing.use_for_shipping" />
-
-                <span class="ml-5">
-                    {{ __('shop::app.checkout.onepage.use_for_shipping') }}
-                </span>
+            <span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
+                @{{ errors.first('address-form.shipping[last_name]') }}
             </span>
         </div>
-    @endif
 
-    @auth('customer')
-        <div class="mb10">
-            <span class="checkbox fs16 display-inbl no-margin">
-                <input
-                    class="ml0"
-                    type="checkbox"
-                    id="billing[save_as_address]"
-                    name="billing[save_as_address]" v-model="address.billing.save_as_address"/>
+        <div :class="`row col-12 ${errors.has('address-form.shipping[email]') ? 'has-error' : ''}`">
+            <label for="shipping[email]" class="required">
+                {{ __('shop::app.checkout.onepage.email') }}*
+            </label>
 
-                <span class="ml-5">
-                    {{ __('shop::app.checkout.onepage.save_as_address') }}
-                </span>
+            <input
+                type="text"
+                class="control"
+                id="shipping[email]"
+                name="shipping[email]"
+                v-validate="'required|email'"
+                v-model="address.shipping.email"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[email]')">
+                @{{ errors.first('address-form.shipping[email]') }}
             </span>
         </div>
-        @php
-        @endphp
-    @endauth
-@endif
+
+        <div :class="`row col-12 ${errors.has('address-form.shipping[address1][]') ? 'has-error' : ''}`">
+            <label for="shipping_address_0" class="required">
+                {{ __('shop::app.checkout.onepage.address1') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                v-validate="'required'"
+                id="shipping_address_0"
+                name="shipping[address1][]"
+                v-model="address.shipping.address1[0]"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[address1][]')">
+                @{{ errors.first('address-form.shipping[address1][]') }}
+            </span>
+        </div>
+
+        @if (
+            core()->getConfigData('customer.settings.address.street_lines')
+            && core()->getConfigData('customer.settings.address.street_lines') > 1
+        )
+            <div class="row col-12">
+                @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
+                    <input
+                        type="text"
+                        class="control"
+                        id="shipping_address_{{ $i }}"
+                        name="shipping[address1][{{ $i }}]"
+                        v-model="address.shipping.address1[{{$i}}]" />
+                @endfor
+            </div>
+        @endif
+
+        <div :class="`row col-12 ${errors.has('address-form.shipping[city]') ? 'has-error' : ''}`">
+            <label for="shipping[city]" class="required">
+                {{ __('shop::app.checkout.onepage.city') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="shipping[city]"
+                name="shipping[city]"
+                v-validate="'required'"
+                v-model="address.shipping.city"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[city]')">
+                @{{ errors.first('address-form.shipping[city]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.shipping[country]') ? 'has-error' : ''}`">
+            <label for="shipping[country]" class="required">
+                {{ __('shop::app.checkout.onepage.country') }}*
+            </label>
+
+            <select
+                type="text"
+                id="shipping[country]"
+                v-validate="'required'"
+                name="shipping[country]"
+                class="control styled-select"
+                v-model="address.shipping.country"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+
+                <option value=""></option>
+
+                @foreach (core()->countries() as $country)
+                    <option value="{{ $country->code }}">{{ $country->name }}</option>
+                @endforeach
+            </select>
+            <i class="select-icon rango-arrow-down"></i>
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
+                @{{ errors.first('address-form.shipping[country]') }}
+            </span>
+        </div>
+
+
+        <div :class="`row col-12 ${errors.has('address-form.shipping[state]') ? 'has-error' : ''}`">
+            <label for="shipping[state]" class="required">
+                {{ __('shop::app.checkout.onepage.state') }}*
+            </label>
+
+
+            <input
+                type="text"
+                class="control"
+                id="shipping[state]"
+                name="shipping[state]"
+                v-validate="'required'"
+                v-if="!haveStates('shipping')"
+                v-model="address.shipping.state"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;" />
+
+            <select
+                id="shipping[state]"
+                name="shipping[state]"
+                v-validate="'required'"
+                class="control styled-select"
+                v-if="haveStates('shipping')"
+                v-model="address.shipping.state"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
+
+                <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
+
+                <option v-for='(state, index) in countryStates[address.shipping.country]' :value="state.code">
+                    @{{ state.default_name }}
+                </option>
+            </select>
+            <i v-if="haveStates('shipping')" class="select-icon rango-arrow-down"></i>
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[state]')">
+                @{{ errors.first('address-form.shipping[state]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.shipping[postcode]') ? 'has-error' : ''}`">
+            <label for="shipping[postcode]" class="required">
+                {{ __('shop::app.checkout.onepage.postcode') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="shipping[postcode]"
+                v-validate="'required'"
+                name="shipping[postcode]"
+                v-model="address.shipping.postcode"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
+                @{{ errors.first('address-form.shipping[postcode]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.shipping[phone]') ? 'has-error' : ''}`">
+            <label for="shipping[phone]" class="required">
+                {{ __('shop::app.checkout.onepage.phone') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="shipping[phone]"
+                name="shipping[phone]"
+                v-validate="'required'"
+                v-model="address.shipping.phone"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
+                @{{ errors.first('address-form.shipping[phone]') }}
+            </span>
+        </div>
+
+        @auth('customer')
+            <div class="mb10">
+                <span class="checkbox fs16 display-inbl no-margin">
+                    <input
+                        class="ml0"
+                        type="checkbox"
+                        id="shipping[save_as_address]"
+                        name="shipping[save_as_address]"
+                        v-model="address.shipping.save_as_address"/>
+
+                    <span class="ml-5">
+                        {{ __('shop::app.checkout.onepage.save_as_address') }}
+                    </span>
+                </span>
+            </div>
+        @endauth
+
+    @elseif (isset($billing) && $billing)
+        <div :class="`row col-12 ${errors.has('address-form.billing[email]') ? 'has-error' : ''}`">
+            <label for="billing[email]" class="required">
+                {{ __('shop::app.checkout.onepage.email') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="billing[email]"
+                name="billing[email]"
+                @blur="isCustomerExist"
+                v-validate="'required|email'"
+                v-model="address.billing.email"
+                @change="validateForm('address-form')"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.billing[email]')">
+                @{{ errors.first('address-form.billing[email]') }}
+            </span>
+        </div>
+
+        {{--  for customer login checkout   --}}
+        @if (! $isCustomer)
+            @include('shop::checkout.onepage.customer-checkout')
+        @endif
+
+        <div :class="`row col-12 ${errors.has('address-form.billing[first_name]') ? 'has-error' : ''}`">
+            <label for="billing[first_name]" class="required">
+                {{ __('shop::app.checkout.onepage.first-name') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                v-validate="'required'"
+                id="billing[first_name]"
+                name="billing[first_name]"
+                v-model="address.billing.first_name"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.billing[first_name]')">
+                @{{ errors.first('address-form.billing[first_name]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.billing[last_name]') ? 'has-error' : ''}`">
+            <label for="billing[last_name]" class="required">
+                {{ __('shop::app.checkout.onepage.last-name') }}*
+            </label>
+
+            <input
+                type="text"
+                v-validate="'required'"
+                class="control"
+                id="billing[last_name]"
+                name="billing[last_name]"
+                v-model="address.billing.last_name"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.billing[last_name]')">
+                @{{ errors.first('address-form.billing[last_name]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.billing[address1][]') ? 'has-error' : ''}`">
+            <label for="billing_address_0" class="required">
+                {{ __('shop::app.checkout.onepage.address1') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                v-validate="'required'"
+                id="billing_address_0"
+                name="billing[address1][]"
+                v-model="address.billing.address1[0]"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.billing[address1][]')">
+                @{{ errors.first('address-form.billing[address1][]') }}
+            </span>
+        </div>
+
+        @if (
+            core()->getConfigData('customer.settings.address.street_lines')
+            && core()->getConfigData('customer.settings.address.street_lines') > 1
+        )
+            <div class="row col-12" style="margin-top: -25px;">
+                @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
+                    <input
+                        type="text"
+                        class="control"
+                        id="billing_address_{{ $i }}"
+                        name="billing[address1][{{ $i }}]"
+                        v-model="address.billing.address1[{{$i}}]" />
+                @endfor
+            </div>
+        @endif
+
+        <div :class="`row col-12 ${errors.has('address-form.billing[city]') ? 'has-error' : ''}`">
+            <label for="billing[city]" class="required">
+                {{ __('shop::app.checkout.onepage.city') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="billing[city]"
+                name="billing[city]"
+                v-validate="'required'"
+                v-model="address.billing.city"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.billing[city]')">
+                @{{ errors.first('address-form.billing[city]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.billing[country]') ? 'has-error' : ''}`">
+            <label for="billing[country]" class="required">
+                {{ __('shop::app.checkout.onepage.country') }}*
+            </label>
+
+            <select
+                type="text"
+                id="billing[country]"
+                name="billing[country]"
+                v-validate="'required'"
+                class="control styled-select"
+                v-model="address.billing.country"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+
+                <option value=""></option>
+
+                @foreach (core()->countries() as $country)
+                    <option value="{{ $country->code }}">{{ $country->name }}</option>
+                @endforeach
+            </select>
+            <i class="select-icon rango-arrow-down"></i>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[country]')">
+                @{{ errors.first('address-form.billing[country]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.billing[state]') ? 'has-error' : ''}`">
+            <label for="billing[state]" class="required">
+                {{ __('shop::app.checkout.onepage.state') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="billing[state]"
+                name="billing[state]"
+                v-validate="'required'"
+                v-if="!haveStates('billing')"
+                v-model="address.billing.state"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;" />
+
+            <select
+                id="billing[state]"
+                name="billing[state]"
+                v-validate="'required'"
+                v-if="haveStates('billing')"
+                class="control styled-select"
+                v-model="address.billing.state"
+                @change="validateForm('address-form')"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
+
+                <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
+
+                <option v-for='(state, index) in countryStates[address.billing.country]' :value="state.code">
+                    @{{ state.default_name }}
+                </option>
+            </select>
+            <i v-if="haveStates('billing')" class="select-icon rango-arrow-down"></i>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[state]')">
+                @{{ errors.first('address-form.billing[state]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.billing[postcode]') ? 'has-error' : ''}`">
+            <label for="billing[postcode]" class="required">
+                {{ __('shop::app.checkout.onepage.postcode') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="billing[postcode]"
+                v-validate="'required'"
+                name="billing[postcode]"
+                v-model="address.billing.postcode"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.billing[postcode]')">
+                @{{ errors.first('address-form.billing[postcode]') }}
+            </span>
+        </div>
+
+        <div :class="`row col-12 ${errors.has('address-form.billing[phone]') ? 'has-error' : ''}`">
+            <label for="billing[phone]" class="required">
+                {{ __('shop::app.checkout.onepage.phone') }}*
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="billing[phone]"
+                name="billing[phone]"
+                v-validate="'required'"
+                v-model="address.billing.phone"
+                @change="validateForm('address-form')"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
+                @{{ errors.first('address-form.billing[phone]') }}
+            </span>
+        </div>
+
+        @if ($cart->haveStockableItems())
+            <div class="mb10">
+                <span class="checkbox fs16 display-inbl no-margin">
+                    <input
+                        class="ml0"
+                        type="checkbox"
+                        @change="validateForm('address-form')"
+                        id="billing[use_for_shipping]"
+                        name="billing[use_for_shipping]"
+                        v-model="address.billing.use_for_shipping" />
+
+                    <span class="ml-5">
+                        {{ __('shop::app.checkout.onepage.use_for_shipping') }}
+                    </span>
+                </span>
+            </div>
+        @endif
+
+        @auth('customer')
+            <div class="mb10">
+                <span class="checkbox fs16 display-inbl no-margin">
+                    <input
+                        class="ml0"
+                        type="checkbox"
+                        id="billing[save_as_address]"
+                        name="billing[save_as_address]" v-model="address.billing.save_as_address"/>
+
+                    <span class="ml-5">
+                        {{ __('shop::app.checkout.onepage.save_as_address') }}
+                    </span>
+                </span>
+            </div>
+            @php
+            @endphp
+        @endauth
+    @endif
+</form>
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/payment.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/payment.blade.php
index bf9eb10ca..084653e5c 100755
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/payment.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/payment.blade.php
@@ -1,53 +1,56 @@
 <form data-vv-scope="payment-form" class="payment-form">
     <div class="form-container">
-        <div class="form-header mb-30">
-            <h3 class="fw6 display-inbl">
-                3. {{ __('shop::app.checkout.onepage.payment-methods') }}
-            </h3>
-        </div>
+        <accordian :title="'{{ __('shop::app.checkout.payment-methods') }}'" :active="true">
+            <div class="form-header mb-30" slot="header">
+                <h3 class="fw6 display-inbl">
+                    3. {{ __('shop::app.checkout.onepage.payment-methods') }}
+                </h3>
+                <i class="rango-arrow"></i>
+            </div>
 
-        <div class="payment-methods">
-            @foreach ($paymentMethods as $payment)
+            <div class="payment-methods" slot="body">
+                @foreach ($paymentMethods as $payment)
 
-                {!! view_render_event('bagisto.shop.checkout.payment-method.before', ['payment' => $payment]) !!}
+                    {!! view_render_event('bagisto.shop.checkout.payment-method.before', ['payment' => $payment]) !!}
 
-                <div class="row col-12">
-                    <div>
-                        <label class="radio-container">
-                            <input
-                                v-validate="'required'"
-                                type="radio"
-                                id="{{ $payment['method'] }}"
-                                name="payment[method]"
-                                value="{{ $payment['method'] }}"
-                                v-model="payment.method"
-                                @change="methodSelected()"
-                                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;" />
+                    <div class="row col-12">
+                        <div>
+                            <label class="radio-container">
+                                <input
+                                    v-validate="'required'"
+                                    type="radio"
+                                    id="{{ $payment['method'] }}"
+                                    name="payment[method]"
+                                    value="{{ $payment['method'] }}"
+                                    v-model="payment.method"
+                                    @change="methodSelected()"
+                                    data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;" />
 
-                            <span class="checkmark"></span>
-                        </label>
-                    </div>
-
-                    <div class="pl30">
-                        <div class="row">
-                            <span class="payment-method method-label">
-                                <b>{{ $payment['method_title'] }}</b>
-                            </span>
+                                <span class="checkmark"></span>
+                            </label>
                         </div>
 
-                        <div class="row">
-                            <span class="method-summary">{{ __($payment['description']) }}</span>
+                        <div class="pl30">
+                            <div class="row">
+                                <span class="payment-method method-label">
+                                    <b>{{ $payment['method_title'] }}</b>
+                                </span>
+                            </div>
+
+                            <div class="row">
+                                <span class="method-summary">{{ __($payment['description']) }}</span>
+                            </div>
                         </div>
                     </div>
-                </div>
 
-                {!! view_render_event('bagisto.shop.checkout.payment-method.after', ['payment' => $payment]) !!}
+                    {!! view_render_event('bagisto.shop.checkout.payment-method.after', ['payment' => $payment]) !!}
 
-            @endforeach
+                @endforeach
 
-            <span class="control-error" v-if="errors.has('payment-form.payment[method]')">
-                @{{ errors.first('payment-form.payment[method]') }}
-            </span>
-        </div>
+                <span class="control-error" v-if="errors.has('payment-form.payment[method]')">
+                    @{{ errors.first('payment-form.payment[method]') }}
+                </span>
+            </div>
+        </accordian>
     </div>
 </form>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/review.blade.php
index 34906bb6e..8140d29a6 100755
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/review.blade.php
@@ -1,167 +1,172 @@
 @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 
 <div class="form-container review-checkout-conainer">
-    <div class="form-header mb-30">
-        <h3 class="fw6 display-inbl">
-            4. {{ __('shop::app.checkout.onepage.summary') }}
-        </h3>
-    </div>
+    <accordian :title="'{{ __('shop::app.checkout.onepage.summary') }}'" :active="true">
+        <div class="form-header mb-30" slot="header">
+            <h3 class="fw6 display-inbl">
+                4. {{ __('shop::app.checkout.onepage.summary') }}
+            </h3>
+            <i class="rango-arrow"></i>
+        </div>
 
-    <div class="address-summary row">
-        @if ($billingAddress = $cart->billing_address)
-            <div class="billing-address col-6">
-                <div class="card-title mb-20">
-                    <b>{{ __('shop::app.checkout.onepage.billing-address') }}</b>
-                </div>
-
-                <div class="card-content">
-                    <ul type="none">
-                        <li>
-                            {{ $billingAddress->name }}
-                        </li><br />
-                        <li>
-                            {{ $billingAddress->address1 }}, <br />{{ $billingAddress->state }}
-                        </li><br />
-                        <li>
-                            {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
-                        </li><br />
-
-                        <li>
-                            {{ __('shop::app.checkout.onepage.contact') }} : {{ $billingAddress->phone }}
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        @endif
-
-        @if ($cart->haveStockableItems() && $shippingAddress = $cart->shipping_address)
-            <div class="shipping-address col-6">
-                <div class="card-title mb-20">
-                    <b>{{ __('shop::app.checkout.onepage.shipping-address') }}</b>
-                </div>
-
-                <div class="card-content">
-                    <ul>
-                        <li>
-                            {{ $shippingAddress->name }}
-                        </li><br/>
-                        <li>
-                            {{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
-                        </li><br/>
-                        <li>
-                            {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
-                        </li><br/>
-
-                        <li>
-                            {{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        @endif
-
-    </div>
-
-    <div class="cart-item-list">
-        <h4 class="fw6">{{ __('velocity::app.checkout.items') }}</h4>
-
-        @foreach ($cart->items as $item)
-            @php
-                $productBaseImage = $item->product->getTypeInstance()->getBaseImage($item);
-            @endphp
-
-            <div class="row col-12 no-padding">
-                <div class="col-2 max-sm-img-dimention">
-                    <img src="{{ $productBaseImage['medium_image_url'] }}" />
-                </div>
-
-                <div class="col-10 no-padding fs16">
-
-                    {!! view_render_event('bagisto.shop.checkout.name.before', ['item' => $item]) !!}
-
-                        <div class="row fs20">
-                            <span class="col-12 link-color fw6">{{ $item->product->name }}</span>
+        <div slot="body">
+            <div class="address-summary row">
+                @if ($billingAddress = $cart->billing_address)
+                    <div class="billing-address col-6">
+                        <div class="card-title mb-20">
+                            <b>{{ __('shop::app.checkout.onepage.billing-address') }}</b>
                         </div>
 
-                    {!! view_render_event('bagisto.shop.checkout.name.after', ['item' => $item]) !!}
+                        <div class="card-content">
+                            <ul type="none">
+                                <li>
+                                    {{ $billingAddress->name }}
+                                </li><br />
+                                <li>
+                                    {{ $billingAddress->address1 }}, <br />{{ $billingAddress->state }}
+                                </li><br />
+                                <li>
+                                    {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
+                                </li><br />
 
-                    <div class="row col-12">
-                        {!! view_render_event('bagisto.shop.checkout.price.before', ['item' => $item]) !!}
-                                <span class="value">
-                                    {{ core()->currency($item->base_price) }}
-                                </span>
-                        {!! view_render_event('bagisto.shop.checkout.price.after', ['item' => $item]) !!}
-
-                        <i class="rango-close text-down-4"></i>
-
-                        {!! view_render_event('bagisto.shop.checkout.quantity.before', ['item' => $item]) !!}
-                            <span class="value">
-                                {{ $item->quantity }} ({{ __('shop::app.checkout.onepage.quantity') }})
-                            </span>
-                        {!! view_render_event('bagisto.shop.checkout.quantity.after', ['item' => $item]) !!}
+                                <li>
+                                    {{ __('shop::app.checkout.onepage.contact') }} : {{ $billingAddress->phone }}
+                                </li>
+                            </ul>
+                        </div>
                     </div>
+                @endif
 
-                    <div class="row col-12">
-                        <b>{{ core()->currency($item->base_total) }}</b>
+                @if ($cart->haveStockableItems() && $shippingAddress = $cart->shipping_address)
+                    <div class="shipping-address col-6">
+                        <div class="card-title mb-20">
+                            <b>{{ __('shop::app.checkout.onepage.shipping-address') }}</b>
+                        </div>
+
+                        <div class="card-content">
+                            <ul>
+                                <li>
+                                    {{ $shippingAddress->name }}
+                                </li><br/>
+                                <li>
+                                    {{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
+                                </li><br/>
+                                <li>
+                                    {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
+                                </li><br/>
+
+                                <li>
+                                    {{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
+                                </li>
+                            </ul>
+                        </div>
                     </div>
+                @endif
 
-                    {!! view_render_event('bagisto.shop.checkout.options.before', ['item' => $item]) !!}
+            </div>
 
-                        @if (isset($item->additional['attributes']))
-                            <div class="item-options">
+            <div class="cart-item-list">
+                <h4 class="fw6">{{ __('velocity::app.checkout.items') }}</h4>
 
-                                @foreach ($item->additional['attributes'] as $attribute)
-                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                @endforeach
+                @foreach ($cart->items as $item)
+                    @php
+                        $productBaseImage = $item->product->getTypeInstance()->getBaseImage($item);
+                    @endphp
 
+                    <div class="row col-12 no-padding">
+                        <div class="col-2 max-sm-img-dimention">
+                            <img src="{{ $productBaseImage['medium_image_url'] }}" />
+                        </div>
+
+                        <div class="col-10 no-padding fs16">
+
+                            {!! view_render_event('bagisto.shop.checkout.name.before', ['item' => $item]) !!}
+
+                                <div class="row fs20">
+                                    <span class="col-12 link-color fw6">{{ $item->product->name }}</span>
+                                </div>
+
+                            {!! view_render_event('bagisto.shop.checkout.name.after', ['item' => $item]) !!}
+
+                            <div class="row col-12">
+                                {!! view_render_event('bagisto.shop.checkout.price.before', ['item' => $item]) !!}
+                                        <span class="value">
+                                            {{ core()->currency($item->base_price) }}
+                                        </span>
+                                {!! view_render_event('bagisto.shop.checkout.price.after', ['item' => $item]) !!}
+
+                                <i class="rango-close text-down-4"></i>
+
+                                {!! view_render_event('bagisto.shop.checkout.quantity.before', ['item' => $item]) !!}
+                                    <span class="value">
+                                        {{ $item->quantity }} ({{ __('shop::app.checkout.onepage.quantity') }})
+                                    </span>
+                                {!! view_render_event('bagisto.shop.checkout.quantity.after', ['item' => $item]) !!}
                             </div>
-                        @endif
 
-                    {!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!}
-                </div>
-            </div>
-        @endforeach
-    </div>
+                            <div class="row col-12">
+                                <b>{{ core()->currency($item->base_total) }}</b>
+                            </div>
 
-    <div class="order-description row fs16 cart-details">
-        <div class="col-4">
-            @if ($cart->haveStockableItems())
-                <div class="shipping mb20">
-                    <div class="decorator">
-                        <i class="icon shipping-icon"></i>
-                    </div>
+                            {!! view_render_event('bagisto.shop.checkout.options.before', ['item' => $item]) !!}
 
-                    <div class="text">
-                        <h4 class="fw6 fs18">
-                            {{ core()->currency($cart->selected_shipping_rate->base_price) }}
-                        </h4>
+                                @if (isset($item->additional['attributes']))
+                                    <div class="item-options">
 
-                        <div class="info">
-                            {{ $cart->selected_shipping_rate->method_title }}
+                                        @foreach ($item->additional['attributes'] as $attribute)
+                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                        @endforeach
+
+                                    </div>
+                                @endif
+
+                            {!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!}
                         </div>
                     </div>
-                </div>
-            @endif
-
-            <div class="payment mb20">
-                <div class="decorator">
-                    <i class="icon payment-icon"></i>
-                </div>
-
-                <div class="text">
-                    <h4 class="fw6 fs18">
-                        {{ core()->getConfigData('sales.paymentmethods.' . $cart->payment->method . '.title') }}
-                    </h4>
-
-                    <span>{{ __('shop::app.customer.account.order.view.payment-method') }}</span>
-                </div>
+                @endforeach
             </div>
 
-            <slot name="place-order-btn"></slot>
-        </div>
+            <div class="order-description row fs16 cart-details">
+                <div class="col-4">
+                    @if ($cart->haveStockableItems())
+                        <div class="shipping mb20">
+                            <div class="decorator">
+                                <i class="icon shipping-icon"></i>
+                            </div>
 
-        <div class="col-6 order-summary-container bottom pt0 offset-2">
-            <slot name="summary-section"></slot>
+                            <div class="text">
+                                <h4 class="fw6 fs18">
+                                    {{ core()->currency($cart->selected_shipping_rate->base_price) }}
+                                </h4>
+
+                                <div class="info">
+                                    {{ $cart->selected_shipping_rate->method_title }}
+                                </div>
+                            </div>
+                        </div>
+                    @endif
+
+                    <div class="payment mb20">
+                        <div class="decorator">
+                            <i class="icon payment-icon"></i>
+                        </div>
+
+                        <div class="text">
+                            <h4 class="fw6 fs18">
+                                {{ core()->getConfigData('sales.paymentmethods.' . $cart->payment->method . '.title') }}
+                            </h4>
+
+                            <span>{{ __('shop::app.customer.account.order.view.payment-method') }}</span>
+                        </div>
+                    </div>
+
+                    <slot name="place-order-btn"></slot>
+                </div>
+
+                <div class="col-6 order-summary-container bottom pt0 offset-2">
+                    <slot name="summary-section"></slot>
+                </div>
+            </div>
         </div>
-    </div>
+    </accordian>
 </div>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/shipping.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/shipping.blade.php
index 60f42ae63..7e6e26a05 100755
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/shipping.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/shipping.blade.php
@@ -1,59 +1,60 @@
 <form data-vv-scope="shipping-form" class="shipping-form">
     <div class="form-container">
-        <div class="form-header">
-            <h3 class="fw6 display-inbl">
-                2. {{ __('shop::app.checkout.onepage.shipping-method') }}
-            </h3>
-        </div>
+        <accordian :title="'{{ __('shop::app.checkout.onepage.shipping-method') }}'" :active="true">
+            <div class="form-header" slot="header">
+                <h3 class="fw6 display-inbl">
+                    2. {{ __('shop::app.checkout.onepage.shipping-method') }}
+                </h3>
+                <i class="rango-arrow"></i>
+            </div>
 
-        <div
-            class="shipping-methods"
-            :class="[errors.has('shipping-form.shipping_method') ? 'has-error' : '']">
+            <div :class="`shipping-methods ${errors.has('shipping-form.shipping_method') ? 'has-error' : ''}`" slot="body">
 
-            @foreach ($shippingRateGroups as $rateGroup)
+                @foreach ($shippingRateGroups as $rateGroup)
 
-                {!! view_render_event('bagisto.shop.checkout.shipping-method.before', ['rateGroup' => $rateGroup]) !!}
-                    @foreach ($rateGroup['rates'] as $rate)
-                        <div class="row col-12">
-                            <div>
-                                <label class="radio-container">
-                                    <input
-                                        v-validate="'required'"
-                                        type="radio"
-                                        id="{{ $rate->method }}"
-                                        name="shipping_method"
-                                        data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-method') }}&quot;"
-                                        value="{{ $rate->method }}"
-                                        v-model="selected_shipping_method"
-                                        @change="methodSelected()" />
+                    {!! view_render_event('bagisto.shop.checkout.shipping-method.before', ['rateGroup' => $rateGroup]) !!}
+                        @foreach ($rateGroup['rates'] as $rate)
+                            <div class="row col-12">
+                                <div>
+                                    <label class="radio-container">
+                                        <input
+                                            v-validate="'required'"
+                                            type="radio"
+                                            id="{{ $rate->method }}"
+                                            name="shipping_method"
+                                            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-method') }}&quot;"
+                                            value="{{ $rate->method }}"
+                                            v-model="selected_shipping_method"
+                                            @change="methodSelected()" />
 
-                                    <span class="checkmark"></span>
-                                </label>
-                            </div>
-
-                            <div class="pl30">
-                                <div class="row">
-                                    <b>{{ core()->currency($rate->base_price) }}</b>
+                                        <span class="checkmark"></span>
+                                    </label>
                                 </div>
 
-                                <div class="row">
-                                    <b>{{ $rate->method_title }}</b> - {{ __($rate->method_description) }}
+                                <div class="pl30">
+                                    <div class="row">
+                                        <b>{{ core()->currency($rate->base_price) }}</b>
+                                    </div>
+
+                                    <div class="row">
+                                        <b>{{ $rate->method_title }}</b> - {{ __($rate->method_description) }}
+                                    </div>
                                 </div>
                             </div>
-                        </div>
 
-                    @endforeach
+                        @endforeach
 
-                {!! view_render_event('bagisto.shop.checkout.shipping-method.after', ['rateGroup' => $rateGroup]) !!}
+                    {!! view_render_event('bagisto.shop.checkout.shipping-method.after', ['rateGroup' => $rateGroup]) !!}
 
-            @endforeach
+                @endforeach
 
-            <span
-                class="control-error"
-                v-if="errors.has('shipping-form.shipping_method')">
+                <span
+                    class="control-error"
+                    v-if="errors.has('shipping-form.shipping_method')">
 
-                @{{ errors.first('shipping-form.shipping_method') }}
-            </span>
-        </div>
+                    @{{ errors.first('shipping-form.shipping_method') }}
+                </span>
+            </div>
+        </accordian>
     </div>
 </form>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/customers/account/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/customers/account/index.blade.php
index d3a3c580f..7ac37a044 100644
--- a/packages/Webkul/Velocity/src/Resources/views/customers/account/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/customers/account/index.blade.php
@@ -1,12 +1,12 @@
 @extends('shop::layouts.master')
 
 @section('content-wrapper')
-    <div class="account-content row no-margin">
-        <div class="sidebar col-2">
+    <div class="account-content row no-margin velocity-divide-page">
+        <div class="sidebar left">
             @include('shop::customers.account.partials.sidemenu')
         </div>
 
-        <div class="account-layout col-10 mt10">
+        <div class="account-layout right mt10">
             @yield('page-detail-wrapper')
         </div>
     </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Velocity/src/Resources/views/customers/account/partials/sidemenu.blade.php
index 73949bcae..9f5f8a6bb 100644
--- a/packages/Webkul/Velocity/src/Resources/views/customers/account/partials/sidemenu.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/customers/account/partials/sidemenu.blade.php
@@ -1,5 +1,4 @@
-<div class="customer-sidebar row">
-
+<div class="customer-sidebar row no-margin no-padding">
     <div class="account-details col-12">
         <div class="customer-name col-12 text-uppercase">
             {{ substr(auth('customer')->user()->first_name, 0, 1) }}
@@ -10,10 +9,12 @@
 
     @foreach ($menu->items as $menuItem)
         <ul type="none" class="navigation">
-            @foreach ($menuItem['children'] as $subMenuItem)
+            @foreach ($menuItem['children'] as $index => $subMenuItem)
                 <li class="{{ $menu->getActive($subMenuItem) }}">
                     <a class="unset fw6 full-width" href="{{ $subMenuItem['url'] }}">
-                        {{ trans($subMenuItem['name']) }}
+                        <i class="icon {{ $index }} text-down-3"></i>
+                        <span>{{ trans($subMenuItem['name']) }}<span>
+                        <i class="rango-arrow-right pull-right text-down-3"></i>
                     </a>
                 </li>
             @endforeach
@@ -23,7 +24,7 @@
 
 @push('css')
     <style type="text/css">
-        .categories-sidebar-container {
+        .main-content-wrapper {
             margin-bottom: 0px;
             min-height: 100vh;
         }
diff --git a/packages/Webkul/Velocity/src/Resources/views/customers/session/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/customers/session/index.blade.php
index 910e23268..ee0244321 100755
--- a/packages/Webkul/Velocity/src/Resources/views/customers/session/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/customers/session/index.blade.php
@@ -9,94 +9,97 @@
 
         {!! view_render_event('bagisto.shop.customers.login.before') !!}
 
-        <div class="container">
-            <div class="heading">
-                <h2 class="fs24 fw6">
-                    {{ __('velocity::app.customer.login-form.customer-login')}}
-                </h2>
+            <div class="container">
+                <div class="row col-10 offset-1">
+                    <div class="heading">
+                        <h2 class="fs24 fw6">
+                            {{ __('velocity::app.customer.login-form.customer-login')}}
+                        </h2>
 
-                <a href="{{ route('customer.register.index') }}" class="btn-new-customer">
-                    <button type="button" class="theme-btn light">
-                        {{ __('velocity::app.customer.login-form.new-customer')}}
-                    </button>
-                </a>
-            </div>
-
-            <div class="body">
-                <div class="form-header">
-                    <h3 class="fw6">
-                        {{ __('velocity::app.customer.login-form.registered-user')}}
-                    </h3>
-
-                    <p class="fs16">
-                        {{ __('velocity::app.customer.login-form.form-login-text')}}
-                    </p>
-                </div>
-
-                <form
-                    method="POST"
-                    action="{{ route('customer.session.create') }}"
-                    @submit.prevent="onSubmit">
-
-                    {{ csrf_field() }}
-
-                    {!! view_render_event('bagisto.shop.customers.login_form_controls.before') !!}
-
-                    <div class="form-group" :class="[errors.has('email') ? 'has-error' : '']">
-                        <label for="email" class="required label-style">
-                            {{ __('shop::app.customer.login-form.email') }}*
-                        </label>
-
-                        <input
-                            type="text"
-                            class="form-style"
-                            name="email"
-                            v-validate="'required|email'"
-                            value="{{ old('email') }}"
-                            data-vv-as="&quot;{{ __('shop::app.customer.login-form.email') }}&quot;" />
-
-                        <span class="control-error" v-if="errors.has('email')">
-                            @{{ errors.first('email') }}
-                        </span>
-                    </div>
-
-                    <div class="form-group" :class="[errors.has('password') ? 'has-error' : '']">
-                        <label for="password" class="required label-style">
-                            {{ __('shop::app.customer.login-form.password') }}*
-                        </label>
-
-                        <input
-                            type="password"
-                            class="form-style"
-                            name="password"
-                            v-validate="'required'"
-                            value="{{ old('password') }}"
-                            data-vv-as="&quot;{{ __('shop::app.customer.login-form.password') }}&quot;" />
-
-                        <span class="control-error" v-if="errors.has('password')">
-                            @{{ errors.first('password') }}
-                        </span>
-
-                        <a href="{{ route('customer.forgot-password.create') }}" style="float: right;">
-                            {{ __('shop::app.customer.login-form.forgot_pass') }}
+                        <a href="{{ route('customer.register.index') }}" class="btn-new-customer">
+                            <button type="button" class="theme-btn light">
+                                {{ __('velocity::app.customer.login-form.sign-up')}}
+                            </button>
                         </a>
-
-                        <div class="mt10">
-                            @if (Cookie::has('enable-resend'))
-                                @if (Cookie::get('enable-resend') == true)
-                                    <a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
-                                @endif
-                            @endif
-                        </div>
                     </div>
 
-                    {!! view_render_event('bagisto.shop.customers.login_form_controls.after') !!}
+                    <div class="body col-12">
+                        <div class="form-header">
+                            <h3 class="fw6">
+                                {{ __('velocity::app.customer.login-form.registered-user')}}
+                            </h3>
 
-                    <input class="theme-btn" type="submit" value="{{ __('shop::app.customer.login-form.button_title') }}">
+                            <p class="fs16">
+                                {{ __('velocity::app.customer.login-form.form-login-text')}}
+                            </p>
+                        </div>
 
-                </form>
+                        <form
+                            method="POST"
+                            action="{{ route('customer.session.create') }}"
+                            @submit.prevent="onSubmit">
+
+                            {{ csrf_field() }}
+
+                            {!! view_render_event('bagisto.shop.customers.login_form_controls.before') !!}
+
+                            <div class="form-group" :class="[errors.has('email') ? 'has-error' : '']">
+                                <label for="email" class="required label-style">
+                                    {{ __('shop::app.customer.login-form.email') }}*
+                                </label>
+
+                                <input
+                                    type="text"
+                                    class="form-style"
+                                    name="email"
+                                    v-validate="'required|email'"
+                                    value="{{ old('email') }}"
+                                    data-vv-as="&quot;{{ __('shop::app.customer.login-form.email') }}&quot;" />
+
+                                <span class="control-error" v-if="errors.has('email')">
+                                    @{{ errors.first('email') }}
+                                </span>
+                            </div>
+
+                            <div class="form-group" :class="[errors.has('password') ? 'has-error' : '']">
+                                <label for="password" class="required label-style">
+                                    {{ __('shop::app.customer.login-form.password') }}*
+                                </label>
+
+                                <input
+                                    type="password"
+                                    class="form-style"
+                                    name="password"
+                                    v-validate="'required'"
+                                    value="{{ old('password') }}"
+                                    data-vv-as="&quot;{{ __('shop::app.customer.login-form.password') }}&quot;" />
+
+                                <span class="control-error" v-if="errors.has('password')">
+                                    @{{ errors.first('password') }}
+                                </span>
+
+                                <a href="{{ route('customer.forgot-password.create') }}" style="float: right;">
+                                    {{ __('shop::app.customer.login-form.forgot_pass') }}
+                                </a>
+
+                                <div class="mt10">
+                                    @if (Cookie::has('enable-resend'))
+                                        @if (Cookie::get('enable-resend') == true)
+                                            <a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
+                                        @endif
+                                    @endif
+                                </div>
+                            </div>
+
+                            {!! view_render_event('bagisto.shop.customers.login_form_controls.after') !!}
+
+                            <input class="theme-btn" type="submit" value="{{ __('shop::app.customer.login-form.button_title') }}">
+
+                        </form>
+                    </div>
+                </div>
             </div>
-        </div>
+
         {!! view_render_event('bagisto.shop.customers.login.after') !!}
     </div>
 @endsection
diff --git a/packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php b/packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php
index 89ec6ac47..3bfc6d9ea 100755
--- a/packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php
@@ -1,58 +1,71 @@
 @extends('shop::layouts.master')
 
 @section('page_title')
- {{ __('shop::app.customer.forgot-password.page_title') }}
-@stop
+    {{ __('shop::app.customer.forgot-password.page_title') }}
+@endsection
 
 @section('content-wrapper')
-<div class="auth-content">
-    <div class="container">
-        <div class="login-text">   
-            <h2 style="font-weight:bold;" class="fs24">
-                {{ __('velocity::app.customer.forget-password.forgot-password')}}
-                <div style="" class="w3-card-login"><a href="{{ route('customer.session.index') }}" class="btn-new-customer-login">{{ __('velocity::app.customer.signup-form.login')}}</a></div>
-            </h2>
-        </div>
-        <div class="mb60" style="height:260px;width:575px;border:1px solid #E5E5E5;margin: 0 auto;margin-bottom:44px;">
-            <div style="margin: 45px;">
+    <div class="auth-content form-container">
+        <div class="container">
+            <div class="row col-10 offset-1">
+                <div class="heading">
+                    <h2 class="fs24 fw6">
+                        {{ __('velocity::app.customer.forget-password.forgot-password')}}
+                    </h2>
 
-                <p class="fs16" style="font-weight:bold">
-                    {{ __('velocity::app.customer.forget-password.recover-password')}}
-                </p>
-                <p class="fs16">
-                    {{ __('velocity::app.customer.forget-password.recover-password-text')}}
-                </p>
+                    <a href="{{ route('customer.session.index') }}" class="btn-new-customer">
+                        <button type="button" class="theme-btn light">
+                            {{  __('velocity::app.customer.signup-form.login') }}
+                        </button>
+                    </a>
+                </div>
 
-                {!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
+                <div class="body col-12">
+                    <h3 class="fw6">
+                        {{ __('velocity::app.customer.forget-password.recover-password')}}
+                    </h3>
+
+                    <p class="fs16">
+                        {{ __('velocity::app.customer.forget-password.recover-password-text')}}
+                    </p>
+
+                    {!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
+
+                    <form
+                        method="post"
+                        action="{{ route('customer.register.create') }}"
+                        @submit.prevent="onSubmit">
+
+                        {{ csrf_field() }}
 
-                <form method="post" action="{{ route('customer.forgot-password.store') }}" @submit.prevent="onSubmit">
-            
-                    {{ csrf_field() }}
-            
-                    <div class="login-form">
-                        
                         {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
-            
+
                         <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
-                            <label for="email" class="label-style">{{ __('shop::app.customer.forgot-password.email') }}</label>
-                            <input type="email" class="form-control" name="email" v-validate="'required|email'">
-                            <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
+                            <label for="email" class="required label-style">
+                                {{ __('shop::app.customer.forgot-password.email') }}
+                            </label>
+
+                            <input
+                                type="email"
+                                class="form-style"
+                                name="email"
+                                v-validate="'required|email'" />
+
+                            <span class="control-error" v-if="errors.has('email')">
+                                @{{ errors.first('email') }}
+                            </span>
                         </div>
-                        <br>
-            
-                        {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
-            
-                        <div class="button-group">
-                            <button type="submit" class="btn btn-dark-green">
-                                {{ __('shop::app.customer.forgot-password.submit') }}
-                            </button>
-                        </div>
-                    </div>
-                </form>
-            
-                {!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
+
+                        {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.after') !!}
+
+                        <button class="theme-btn" type="submit">
+                            {{ __('shop::app.customer.forgot-password.submit') }}
+                        </button>
+                    </form>
+
+                    {!! view_render_event('bagisto.shop.customers.forget_password.after') !!}
+                </div>
             </div>
         </div>
     </div>
-</div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php
index a9d0f85ff..ca2814b69 100755
--- a/packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php
@@ -7,137 +7,138 @@
 @section('content-wrapper')
     <div class="auth-content form-container">
         <div class="container">
+            <div class="row col-10 offset-1">
+                <div class="heading">
+                    <h2 class="fs24 fw6">
+                        {{ __('velocity::app.customer.signup-form.user-registration')}}
+                    </h2>
 
-            <div class="heading">
-                <h2 class="fs24 fw6">
-                    {{ __('velocity::app.customer.signup-form.user-registration')}}
-                </h2>
+                    <a href="{{ route('customer.session.index') }}" class="btn-new-customer">
+                        <button type="button" class="theme-btn light">
+                            {{ __('velocity::app.customer.signup-form.login')}}
+                        </button>
+                    </a>
+                </div>
 
-                <a href="{{ route('customer.session.index') }}" class="btn-new-customer">
-                    <button type="button" class="theme-btn light">
-                        {{ __('velocity::app.customer.signup-form.login')}}
-                    </button>
-                </a>
-            </div>
+                <div class="body col-12">
+                    <h3 class="fw6">
+                        {{ __('velocity::app.customer.signup-form.become-user')}}
+                    </h3>
 
-            <div class="body">
-                <h3 class="fw6">
-                    {{ __('velocity::app.customer.signup-form.become-user')}}
-                </h3>
+                    <p class="fs16">
+                        {{ __('velocity::app.customer.signup-form.form-sginup-text')}}
+                    </p>
 
-                <p class="fs16">
-                    {{ __('velocity::app.customer.signup-form.form-sginup-text')}}
-                </p>
+                    {!! view_render_event('bagisto.shop.customers.signup.before') !!}
 
-                {!! view_render_event('bagisto.shop.customers.signup.before') !!}
+                    <form
+                        method="post"
+                        action="{{ route('customer.register.create') }}"
+                        @submit.prevent="onSubmit">
 
-                <form
-                    method="post"
-                    action="{{ route('customer.register.create') }}"
-                    @submit.prevent="onSubmit">
+                        {{ csrf_field() }}
 
-                    {{ csrf_field() }}
+                        {!! view_render_event('bagisto.shop.customers.signup_form_controls.before') !!}
 
-                    {!! view_render_event('bagisto.shop.customers.signup_form_controls.before') !!}
+                        <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                            <label for="first_name" class="required label-style">
+                                {{ __('shop::app.customer.signup-form.firstname') }}
+                            </label>
 
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                        <label for="first_name" class="required label-style">
-                            {{ __('shop::app.customer.signup-form.firstname') }}
-                        </label>
+                            <input
+                                type="text"
+                                class="form-style"
+                                name="first_name"
+                                v-validate="'required'"
+                                value="{{ old('first_name') }}"
+                                data-vv-as="&quot;{{ __('shop::app.customer.signup-form.firstname') }}&quot;" />
 
-                        <input
-                            type="text"
-                            class="form-style"
-                            name="first_name"
-                            v-validate="'required'"
-                            value="{{ old('first_name') }}"
-                            data-vv-as="&quot;{{ __('shop::app.customer.signup-form.firstname') }}&quot;" />
+                            <span class="control-error" v-if="errors.has('first_name')">
+                                @{{ errors.first('first_name') }}
+                            </span>
+                        </div>
 
-                        <span class="control-error" v-if="errors.has('first_name')">
-                            @{{ errors.first('first_name') }}
-                        </span>
-                    </div>
+                        <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                            <label for="last_name" class="required label-style">
+                                {{ __('shop::app.customer.signup-form.lastname') }}
+                            </label>
 
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required label-style">
-                            {{ __('shop::app.customer.signup-form.lastname') }}
-                        </label>
+                            <input
+                                type="text"
+                                class="form-style"
+                                name="last_name"
+                                v-validate="'required'"
+                                value="{{ old('last_name') }}"
+                                data-vv-as="&quot;{{ __('shop::app.customer.signup-form.lastname') }}&quot;" />
 
-                        <input
-                            type="text"
-                            class="form-style"
-                            name="last_name"
-                            v-validate="'required'"
-                            value="{{ old('last_name') }}"
-                            data-vv-as="&quot;{{ __('shop::app.customer.signup-form.lastname') }}&quot;" />
+                            <span class="control-error" v-if="errors.has('last_name')">
+                                @{{ errors.first('last_name') }}
+                            </span>
+                        </div>
 
-                        <span class="control-error" v-if="errors.has('last_name')">
-                            @{{ errors.first('last_name') }}
-                        </span>
-                    </div>
+                        <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
+                            <label for="email" class="required label-style">
+                                {{ __('shop::app.customer.signup-form.email') }}
+                            </label>
 
-                    <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
-                        <label for="email" class="required label-style">
-                            {{ __('shop::app.customer.signup-form.email') }}
-                        </label>
+                            <input
+                                type="email"
+                                class="form-style"
+                                name="email"
+                                v-validate="'required|email'"
+                                value="{{ old('email') }}"
+                                data-vv-as="&quot;{{ __('shop::app.customer.signup-form.email') }}&quot;" />
 
-                        <input
-                            type="email"
-                            class="form-style"
-                            name="email"
-                            v-validate="'required|email'"
-                            value="{{ old('email') }}"
-                            data-vv-as="&quot;{{ __('shop::app.customer.signup-form.email') }}&quot;" />
+                            <span class="control-error" v-if="errors.has('email')">
+                                @{{ errors.first('email') }}
+                            </span>
+                        </div>
 
-                        <span class="control-error" v-if="errors.has('email')">
-                            @{{ errors.first('email') }}
-                        </span>
-                    </div>
+                        <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                            <label for="password" class="required label-style">
+                                {{ __('shop::app.customer.signup-form.password') }}
+                            </label>
 
-                    <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                        <label for="password" class="required label-style">
-                            {{ __('shop::app.customer.signup-form.password') }}
-                        </label>
+                            <input
+                                type="password"
+                                class="form-style"
+                                name="password"
+                                v-validate="'required|min:6'"
+                                ref="password"
+                                value="{{ old('password') }}"
+                                data-vv-as="&quot;{{ __('shop::app.customer.signup-form.password') }}&quot;" />
 
-                        <input
-                            type="password"
-                            class="form-style"
-                            name="password"
-                            v-validate="'required|min:6'"
-                            ref="password"
-                            value="{{ old('password') }}"
-                            data-vv-as="&quot;{{ __('shop::app.customer.signup-form.password') }}&quot;" />
+                            <span class="control-error" v-if="errors.has('password')">
+                                @{{ errors.first('password') }}
+                            </span>
+                        </div>
 
-                        <span class="control-error" v-if="errors.has('password')">
-                            @{{ errors.first('password') }}
-                        </span>
-                    </div>
+                        <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
+                            <label for="password_confirmation" class="required label-style">
+                                {{ __('shop::app.customer.signup-form.confirm_pass') }}
+                            </label>
 
-                    <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
-                        <label for="password_confirmation" class="required label-style">
-                            {{ __('shop::app.customer.signup-form.confirm_pass') }}
-                        </label>
+                            <input
+                                type="password"
+                                class="form-style"
+                                name="password_confirmation"
+                                v-validate="'required|min:6|confirmed:password'"
+                                data-vv-as="&quot;{{ __('shop::app.customer.signup-form.confirm_pass') }}&quot;" />
 
-                        <input
-                            type="password"
-                            class="form-style"
-                            name="password_confirmation"
-                            v-validate="'required|min:6|confirmed:password'"
-                            data-vv-as="&quot;{{ __('shop::app.customer.signup-form.confirm_pass') }}&quot;" />
+                            <span class="control-error" v-if="errors.has('password_confirmation')">
+                                @{{ errors.first('password_confirmation') }}
+                            </span>
+                        </div>
 
-                        <span class="control-error" v-if="errors.has('password_confirmation')">
-                            @{{ errors.first('password_confirmation') }}
-                        </span>
-                    </div>
+                        {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!}
 
-                    {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!}
+                        <button class="theme-btn" type="submit">
+                            {{ __('shop::app.customer.signup-form.title') }}
+                        </button>
+                    </form>
 
-                    <button class="theme-btn" type="submit">
-                        {{ __('shop::app.customer.signup-form.title') }}
-                    </button>
-                </form>
-
-                {!! view_render_event('bagisto.shop.customers.signup.after') !!}
+                    {!! view_render_event('bagisto.shop.customers.signup.after') !!}
+                </div>
             </div>
         </div>
     </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-four.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-four.blade.php
index acdecb1e7..27d974395 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-four.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-four.blade.php
@@ -18,12 +18,12 @@
 
         <div class="container-fluid advertisement-four-container">
             <div class="row">
-                <a @if (isset($one)) href="{{ $one }}" @endif class="col-4 no-padding">
+                <a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-4 col-12 no-padding">
                     <img class="col-12" src="{{ asset('/storage/' . $advertisementFour['image_1']) }}" />
                 </a>
 
-                <div class="col-4 offers-ct-panel">
-                    <a @if (isset($two)) href="{{ $two }}" @endif class="row pb15 col-12 remove-padding-margin">
+                <div class="col-lg-4 col-12 offers-ct-panel">
+                    <a @if (isset($two)) href="{{ $two }}" @endif class="row col-12 remove-padding-margin">
                         <img class="col-12 offers-ct-top" src="{{ asset('/storage/' . $advertisementFour['image_2']) }}" />
                     </a>
                     <a @if (isset($three)) href="{{ $three }}" @endif class="row col-12 remove-padding-margin">
@@ -31,7 +31,7 @@
                     </a>
                 </div>
 
-                <a @if (isset($four)) href="{{ $four }}" @endif class="col-4 no-padding">
+                <a @if (isset($four)) href="{{ $four }}" @endif class="col-lg-4 col-12 no-padding">
                     <img class="col-12" src="{{ asset('/storage/' . $advertisementFour['image_4']) }}" />
                 </a>
             </div>
@@ -42,12 +42,12 @@
 @if (! $isRendered)
     <div class="container-fluid advertisement-four-container">
         <div class="row">
-            <a @if (isset($one)) href="{{ $one }}" @endif class="col-4 no-padding">
+            <a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-4 col-12 no-padding">
                 <img class="col-12" src="{{ asset('/themes/velocity/assets/images/big-sale-banner.png') }}" />
             </a>
 
-            <div class="col-4 offers-ct-panel">
-                <a @if (isset($two)) href="{{ $two }}" @endif class="row pb15 col-12 remove-padding-margin">
+            <div class="col-lg-4 col-12 offers-ct-panel">
+                <a @if (isset($two)) href="{{ $two }}" @endif class="row col-12 remove-padding-margin">
                     <img class="col-12 offers-ct-top" src="{{ asset('/themes/velocity/assets/images/seasons.png') }}" />
                 </a>
                 <a @if (isset($three)) href="{{ $three }}" @endif class="row col-12 remove-padding-margin">
@@ -55,7 +55,7 @@
                 </a>
             </div>
 
-            <a @if (isset($four)) href="{{ $four }}" @endif class="col-4 no-padding">
+            <a @if (isset($four)) href="{{ $four }}" @endif class="col-lg-4 col-12 no-padding">
                 <img class="col-12" src="{{ asset('/themes/velocity/assets/images/kids.png') }}" />
             </a>
         </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-three.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-three.blade.php
index 65db18dae..0fa8dc2fd 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-three.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-three.blade.php
@@ -18,11 +18,11 @@
 
         <div class="container-fluid advertisement-three-container">
             <div class="row">
-                <a @if (isset($one)) href="{{ $one }}" @endif class="col-6 no-padding">
+                <a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-6 col-md-12 no-padding">
                     <img src="{{ asset('/storage/' . $advertisementThree['image_1']) }}" class="full-width" />
                 </a>
 
-                <div class="col-6">
+                <div class="col-lg-6 col-md-12 second-panel">
                     <a @if (isset($two)) href="{{ $two }}" @endif class="row top-container">
                         <img src="{{ asset('/storage/' . $advertisementThree['image_2']) }}" class="col-12 pr0" />
                     </a>
@@ -38,11 +38,11 @@
 @if (! $isRendered)
     <div class="container-fluid advertisement-three-container">
         <div class="row">
-            <a @if (isset($one)) href="{{ $one }}" @endif class="col-6 no-padding">
+            <a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-6 col-md-12 no-padding">
                 <img src="{{ asset('/themes/velocity/assets/images/headphones.png') }}" class="full-width" />
             </a>
 
-            <div class="col-6">
+            <div class="col-lg-6 col-md-12 second-panel">
                 <a @if (isset($two)) href="{{ $two }}" @endif class="row top-container">
                     <img src="{{ asset('/themes/velocity/assets/images/watch.png') }}" class="col-12 pr0" />
                 </a>
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-two.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-two.blade.php
index 82f14fa55..225e7d17e 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-two.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-two.blade.php
@@ -18,11 +18,11 @@
 
         <div class="container-fluid advertisement-two-container">
             <div class="row">
-                <a class="col-8 no-padding">
+                <a class="col-lg-9 col-md-12 no-padding">
                     <img src="{{ asset('/storage/' . $advertisementTwo['image_1']) }}" />
                 </a>
 
-                <a class="col-4 pr0">
+                <a class="col-lg-3 col-md-12 pr0">
                     <img src="{{ asset('/storage/' . $advertisementTwo['image_2']) }}" />
                 </a>
             </div>
@@ -33,11 +33,11 @@
 @if (! $isRendered)
     <div class="container-fluid advertisement-two-container">
         <div class="row">
-            <a class="col-8 no-padding">
+            <a class="col-lg-9 col-md-12 no-padding">
                 <img src="{{ asset('/themes/velocity/assets/images/toster.png') }}" />
             </a>
 
-            <a class="col-4 pr0">
+            <a class="col-lg-3 col-md-12 pr0">
                 <img src="{{ asset('/themes/velocity/assets/images/trimmer.png') }}" />
             </a>
         </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php
new file mode 100644
index 000000000..d02fab9e2
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php
@@ -0,0 +1,164 @@
+@php
+    $category[0] = app('Webkul\Category\Repositories\CategoryRepository')->findByPath($category[0]);
+    $category[1] = app('Webkul\Category\Repositories\CategoryRepository')->findByPath($category[1]);
+    $category[2] = app('Webkul\Category\Repositories\CategoryRepository')->findByPath($category[2]);
+    $category[3] = app('Webkul\Category\Repositories\CategoryRepository')->findByPath($category[3]);
+@endphp
+
+<div class="container-fluid category-with-custom-options">
+    <div class="row">
+        <div class="col pr15">
+            <img src="{{ asset ('/storage/' . $category['2']->image) }}" />
+        </div>
+
+        <div class="col">
+            <div class="card-arrow-container">
+                <div class="card-arrow card-arrow-rt"></div>
+            </div>
+
+            <div class="categories-collection">
+                <div class="category-text-content">
+                    <h2 class="text-uppercase">
+                        <a href="{{ $category[0]->slug }}" class="unset">
+                            {{ $category[0]->name }}
+                        </a>
+                    </h2>
+                    <ul type="none" class="fs14">
+                        @foreach ($category[0]->children as $subCategory)
+                            <li>
+                                <a href="{{ $category[0]->slug . '/' . $subCategory->slug }}" class="unset">
+                                    {{ $subCategory->name }}
+                                </a>
+                            </li>
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+        <div class="col pr15">
+            <img src="{{ asset ('/storage/' . $category['0']->image) }}" />
+        </div>
+
+        <div class="col">
+            <div class="card-arrow-container">
+                <div class="card-arrow card-arrow-bt"></div>
+            </div>
+
+            <div class="categories-collection">
+                <div class="category-text-content">
+                    <h2 class="text-uppercase">
+                        <a href="{{ $category[1]->slug }}" class="unset">
+                            {{ $category[1]->name }}
+                        </a>
+                    </h2>
+                    <ul type="none" class="fs14">
+                        @foreach ($category[1]->children as $subCategory)
+                            <li>
+                                <a href="{{ $category[1]->slug . '/' . $subCategory->slug }}" class="unset">
+                                    {{ $subCategory->name }}
+                                </a>
+                            </li>
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col mr15">
+            <div class="card-arrow-container">
+                <div class="card-arrow card-arrow-tp"></div>
+            </div>
+
+            <div class="categories-collection">
+                <div class="category-text-content">
+                    <h2 class="text-uppercase">
+                        <a href="{{ $category[2]->slug }}" class="unset">
+                            {{ $category[2]->name }}
+                        </a>
+                    </h2>
+                    <ul type="none" class="fs14">
+                        @foreach ($category[2]->children as $subCategory)
+                            <li>
+                                <a href="{{ $category[2]->slug . '/' . $subCategory->slug }}" class="unset">
+                                    {{ $subCategory->name }}
+                                </a>
+                            </li>
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="col mt15">
+            <img src="{{ asset ('/storage/' . $category['3']->image) }}" />
+        </div>
+
+        <div class="col mt15 mr15">
+            <div class="card-arrow-container">
+                <div class="card-arrow card-arrow-lt"></div>
+            </div>
+
+            <div class="categories-collection">
+                <div class="category-text-content">
+                    <h2 class="text-uppercase">
+                        <a href="{{ $category[3]->slug }}" class="unset">
+                            {{ $category[3]->name }}
+                        </a>
+                    </h2>
+                    <ul type="none" class="fs14">
+                        @foreach ($category[3]->children as $subCategory)
+                            <li>
+                                <a href="{{ $category[3]->slug . '/' . $subCategory->slug }}" class="unset">
+                                    {{ $subCategory->name }}
+                                </a>
+                            </li>
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+        <div class="col">
+            <img src="{{ asset ('/storage/' . $category['1']->image) }}" />
+        </div>
+
+    </div>
+</div>
+
+<div class="container-fluid category-with-custom-options vc-small-screen">
+    @foreach ($category as $categoryItem)
+        <div class="smart-category-container">
+            <div class="col-12">
+                <img src="{{ asset ('/storage/' . $categoryItem->image) }}" />
+            </div>
+
+            <div class="col-12">
+                <div class="card-arrow-container">
+                    <div class="card-arrow card-arrow-tp"></div>
+                </div>
+
+                <div class="categories-collection">
+                    <div class="category-text-content">
+                        <h2 class="text-uppercase">
+                            <a href="{{ $categoryItem->slug }}" class="unset">
+                                {{ $categoryItem->name }}
+                            </a>
+                        </h2>
+                        <ul type="none" class="fs14">
+                            @foreach ($categoryItem->children as $subCategory)
+                                <li>
+                                    <a href="{{ $categoryItem->slug . '/' . $subCategory->slug }}" class="unset">
+                                        {{ $subCategory->name }}
+                                    </a>
+                                </li>
+                            @endforeach
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    @endforeach
+</div>
+
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php
index 641be1626..0ef2dbe58 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php
@@ -18,8 +18,10 @@
 
             <div class="row flex-nowrap">
                 <carousel-component
-                    :slides-count="{{ sizeof($products) }}"
                     slides-per-page="6"
+                    navigation-enabled="hide"
+                    pagination-enabled="hide"
+                    :slides-count="{{ sizeof($products) }}"
                     id="{{ $categoryDetails->name }}-carousel">
 
                     @foreach ($products as $index => $product)
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/featured-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/featured-products.blade.php
index 7520694ed..e1d7fad75 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/featured-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/featured-products.blade.php
@@ -8,7 +8,7 @@
 
 @if ($featuredProductsCount)
 
-    <div class="container-fluid popular-products">
+    <div class="container-fluid featured-products">
 
         <card-list-header heading="{{ __('shop::app.home.featured-products') }}">
         </card-list-header>
@@ -16,9 +16,11 @@
         <div class="row flex-nowrap">
 
             <carousel-component
-                :slides-count="{{ $featuredProductsCount }}"
                 slides-per-page="6"
-                id="fearured-products-carousel">
+                navigation-enabled="hide"
+                pagination-enabled="hide"
+                id="fearured-products-carousel"
+                :slides-count="{{ $featuredProductsCount }}">
 
                 @foreach ($featuredProducts as $index => $product)
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/hot-categories.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/hot-categories.blade.php
index c0e965505..66d69da74 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/hot-categories.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/hot-categories.blade.php
@@ -9,7 +9,7 @@
             @endphp
 
             @if ($categoryDetails)
-                <div class="col hot-category-wrapper">
+                <div class="col-lg-3 col-md-12 hot-category-wrapper">
                     <div class="card">
                         <div class="row velocity-divide-page">
                             <div class="left">
@@ -17,12 +17,16 @@
                             </div>
 
                             <div class="right">
-                                <h3 class="fs20 clr-light">{{ $categoryDetails->name }}</h3>
+                                <h3 class="fs20 clr-light text-uppercase">
+                                    <a href="{{ $slug }}" class="unset">
+                                        {{ $categoryDetails->name }}
+                                    </a>
+                                </h3>
 
                                 <ul type="none">
                                     @foreach ($categoryDetails->children as $subCategory)
                                         <li>
-                                            <a href="{{ $subCategory->slug }}" class="unset">
+                                            <a href="{{ $slug . '/' . $subCategory->slug }}" class="unset">
                                                 {{ $subCategory->name }}
                                             </a>
                                         </li>
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/category-with-custom-option.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/category-with-custom-option.blade.php
deleted file mode 100644
index 1845191d1..000000000
--- a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/category-with-custom-option.blade.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<div class="container-fluid category-with-custom-options">
-
-    <div class="row">
-
-        <div class="col bg-image mr15"></div>
-
-        <div class="col">
-
-            <div class="card-arrow-container">
-                <div class="card-arrow card-arrow-rt"></div>
-            </div>
-
-            <div class="categories-collection">
-                <div class="category-text-content">
-                    <h2>WOMEN</h2>
-                    <ul type="none" class="fs14">
-                        <li>Clothing</li>
-                        <li>Top Brands</li>
-                        <li>Watches</li>
-                        <li>Handbags & Clutches</li>
-                        <li>Gold & Diamond Jewellery</li>
-                        <li>Fashion & Silver Jewellery</li>
-                        <li>Sunglasses</li>
-                        <li>Handloom & Handicraft Store</li>
-                        <li>Handbags & Clutches</li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-        <div class="col bg-image mr15"></div>
-
-        <div class="col">
-            <div class="card-arrow-container">
-                <div class="card-arrow card-arrow-bt"></div>
-            </div>
-
-            <div class="categories-collection">
-                <div class="category-text-content">
-                    <h2>Kids</h2>
-                    <ul type="none" class="fs14">
-                        <li>Clothing</li>
-                        <li>Top Brands</li>
-                        <li>Watches</li>
-                        <li>Handbags & Clutches</li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-    </div>
-
-    <div class="row">
-
-        <div class="col mr15">
-            <div class="card-arrow-container">
-                <div class="card-arrow card-arrow-tp"></div>
-            </div>
-
-            <div class="categories-collection">
-                <div class="category-text-content">
-                    <h2>Women Apparel</h2>
-                    <ul type="none" class="fs14">
-                        <li>Hoodies & Sweatshirts</li>
-                        <li>Jackets</li>
-                        <li>Tees</li>
-                        <li>Tanks</li>
-                        <li>Pants</li>
-                        <li>Shorts</li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-        <div class="col bg-image mt10"></div>
-
-        <div class="col mt10 mr15">
-            <div class="card-arrow-container">
-                <div class="card-arrow card-arrow-lt"></div>
-            </div>
-
-            <div class="categories-collection">
-                <div class="category-text-content">
-                    <h2>Electronics</h2>
-                    <ul type="none" class="fs14">
-                        <li>Clothing</li>
-                        <li>Top Brands</li>
-                        <li>Watches</li>
-                        <li>Handbags & Clutches</li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-        <div class="col bg-image"></div>
-
-    </div>
-</div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php
index fd835f9bb..3d89fe73e 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php
@@ -122,7 +122,7 @@
     $cardCount = 5;
 @endphp
 
-<div class="container-fluid popular-products">
+<div class="container-fluid">
 
     <card-list-header
         heading="Plants"
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/index.blade.php
index 7a25492b4..b3b47a21b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/index.blade.php
@@ -63,9 +63,6 @@
     <!-- Show Product Policy -->
     {{-- @include('shop::home.product-policy') --}}
 
-    <!-- trending products -->
-    {{-- @include('shop::home.category-with-custom-option') --}}
-
     <!-- advertisement two -->
     {{-- @include('shop::home.advertisements.advertisement-two') --}}
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/new-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/new-products.blade.php
index b3a078a7b..caf07fbf4 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/new-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/new-products.blade.php
@@ -2,35 +2,56 @@
     $count = $velocityMetaData->new_products_count;
 
     $newProducts = app('Webkul\Velocity\Repositories\Product\ProductRepository')->getNewProducts($count);
-
-    $showRecentlyViewed = false;
 @endphp
 
 @if (! empty($newProducts))
-    <div class="container-fluid popular-products">
-
+    <div class="container-fluid">
         <card-list-header heading="{{ __('shop::app.home.new-products') }}">
         </card-list-header>
 
         {!! view_render_event('bagisto.shop.new-products.before') !!}
 
-        <div class="row flex-nowrap">
-            @if ($showRecentlyViewed)
-                @push('css')
-                    <style>
-                        .recently-viewed {
-                            padding-right: 0px;
-                        }
-                    </style>
-                @endpush
+            <div class="row flex-nowrap">
+                @if ($showRecentlyViewed)
+                    @push('css')
+                        <style>
+                            .recently-viewed {
+                                padding-right: 0px;
+                            }
+                        </style>
+                    @endpush
 
-                <div class="col-9 no-padding">
+                    <div class="col-9 no-padding">
+                        <carousel-component
+                            slides-per-page="5"
+                            navigation-enabled="hide"
+                            pagination-enabled="hide"
+                            id="new-products-carousel"
+                            :slides-count="{{ sizeof($newProducts) }}">
+
+                            @foreach ($newProducts as $index => $product)
+                                <slide slot="slide-{{ $index }}">
+                                    @include ('shop::products.list.card', [
+                                        'product' => $product,
+                                        'addToCartBtnClass' => 'small-padding'
+                                    ])
+                                </slide>
+                            @endforeach
+
+                        </carousel-component>
+                    </div>
+
+                    @include ('shop::products.list.recently-viewed', [
+                        'addClass' => 'col-3',
+                        'addClassWrapper' => 'scrollable max-height-350',
+                    ])
+                @else
                     <carousel-component
-                        :slides-count="{{ sizeof($newProducts) }}"
-                        slides-per-page="5"
-                        id="new-products-carousel"
+                        slides-per-page="6"
                         navigation-enabled="hide"
-                        pagination-enabled="hide">
+                        pagination-enabled="hide"
+                        id="new-products-carousel"
+                        :slides-count="{{ sizeof($newProducts) }}">
 
                         @foreach ($newProducts as $index => $product)
 
@@ -41,26 +62,8 @@
                         @endforeach
 
                     </carousel-component>
-                </div>
-
-                @include ('shop::products.list.recently-viewed')
-            @else
-                <carousel-component
-                    :slides-count="{{ sizeof($newProducts) }}"
-                    slides-per-page="6"
-                    id="new-products-carousel">
-
-                    @foreach ($newProducts as $index => $product)
-
-                        <slide slot="slide-{{ $index }}">
-                            @include ('shop::products.list.card', ['product' => $product])
-                        </slide>
-
-                    @endforeach
-
-                </carousel-component>
-            @endif
-        </div>
+                @endif
+            </div>
 
         {!! view_render_event('bagisto.shop.new-products.after') !!}
     </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/popular-categories.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/popular-categories.blade.php
index dbafaaf5b..eded4cd7b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/popular-categories.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/popular-categories.blade.php
@@ -9,7 +9,7 @@
             @endphp
 
             @if ($categoryDetails)
-                <div class="col popular-category-wrapper">
+                <div class="col-lg-3 col-md-12 popular-category-wrapper">
                     <div class="card col-12 no-padding">
                         <div class="category-image">
                             <img src="{{ asset('/storage/' . $categoryDetails->image) }}" />
@@ -18,7 +18,7 @@
                         <div class="card-description">
                             <h3 class="fs20">{{ $categoryDetails->name }}</h3>
 
-                            <ul class="clr-light pl40">
+                            <ul class="font-clr pl30">
                                 @foreach ($categoryDetails->children as $subCategory)
                                     <li>
                                         <a href="{{ $subCategory->slug }}" class="unset">
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-left.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-left.blade.php
index e359e673a..0b2eece3b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-left.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-left.blade.php
@@ -1,4 +1,4 @@
-<div class="col-4 software-description">
+<div class="col-lg-4 col-md-12 col-sm-12 software-description">
     <div class="logo">
         <a href="{{ route('shop.home.index') }}">
             @if ($logo = core()->getCurrentChannel()->logo_url)
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-middle.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-middle.blade.php
index 92fb19050..88447a6e6 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-middle.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-middle.blade.php
@@ -1 +1,5 @@
-{!! $velocityMetaData->footer_middle_content !!}
+<div class="col-lg-4 col-md-12 col-sm-12 footer-ct-content">
+	<div class="row">
+        {!! $velocityMetaData->footer_middle_content !!}
+	</div>
+</div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-right.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-right.blade.php
index 1ff131401..1706a45d6 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-right.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-right.blade.php
@@ -20,14 +20,13 @@
     }
 @endphp
 
-<div class="col-4 footer-rt-content">
-
+<div class="col-lg-4 col-md-12 col-sm-12 footer-rt-content">
     <div class="row">
-        <div class="mb10">
-            <h3>Payment Methods</h3>
+        <div class="mb5 col-12">
+            <h3>{{ __('velocity::app.home.payment-methods') }}</h3>
         </div>
 
-        <div class="payment-methods">
+        <div class="payment-methods col-12">
             @foreach($activePayments as $paymentMethod)
                 <div class="method-sticker">
                     {{ $paymentMethod}}
@@ -37,11 +36,11 @@
     </div>
 
     <div class="row">
-        <div class="mb10">
-            <h3>Shipping Methods</h3>
+        <div class="mb5 col-12">
+            <h3>{{ __('velocity::app.home.shipping-methods') }}</h3>
         </div>
 
-        <div class="shipping-methods">
+        <div class="shipping-methods col-12">
             @foreach($activeShippings as $shippingMethod)
                 <div class="method-sticker">
                     {{ $shippingMethod}}
@@ -49,5 +48,4 @@
             @endforeach
         </div>
     </div>
-
 </div>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php
index 3dd89c3dc..64dfc7097 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php
@@ -2,15 +2,13 @@
     <div class="footer-content">
 
         @include('shop::layouts.footer.newsletter-subscription')
-
         @include('shop::layouts.footer.footer-links')
 
         @if ($categories)
-            @include('shop::layouts.footer.top-brands')
+            {{-- @include('shop::layouts.footer.top-brands') --}}
         @endif
 
         @include('shop::layouts.footer.copy-right')
-
     </div>
 </div>
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php
index 14bcd73b4..3d9bb6a4e 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php
@@ -3,38 +3,33 @@
     || core()->getConfigData('customer.settings.newsletter.subscription')
 )
     <div class="newsletter-subscription">
-        <div class="newsletter-wrapper">
-                @if ($velocityMetaData->subscription_bar_content)
-                    {!! $velocityMetaData->subscription_bar_content !!}
-                @endif
+        <div class="newsletter-wrapper row">
+            @if ($velocityMetaData->subscription_bar_content)
+                {!! $velocityMetaData->subscription_bar_content !!}
+            @endif
 
-                @if (core()->getConfigData('customer.settings.newsletter.subscription'))
-                    <div class="subscribe-newsletter">
+            @if (core()->getConfigData('customer.settings.newsletter.subscription'))
+                <div class="subscribe-newsletter col-lg-6 text-right">
+                    <div class="form-container">
+                        <form action="{{ route('shop.subscribe') }}">
+                            <div class="subscriber-form-div">
+                                <div :class="`control-group ${errors.has('subscriber_email') ? 'has-error' : ''}`">
+                                    <input
+                                        type="email"
+                                        name="subscriber_email"
+                                        class="control subscribe-field"
+                                        placeholder="{{ __('velocity::app.customer.login-form.your-email-address') }}"
+                                        required />
 
-                            <div class="form-container">
-
-                                <form action="{{ route('shop.subscribe') }}">
-                                    <div class="subscriber-form-div">
-                                        <div
-                                            :class="`control-group ${errors.has('subscriber_email') ? 'has-error' : ''}`">
-
-                                            <input
-                                                type="email"
-                                                class="control subscribe-field"
-                                                name="subscriber_email"
-                                                placeholder="{{ __('velocity::app.customer.login-form.your-email-address') }}"
-                                                required />
-
-                                            <button class="theme-btn subscribe-btn fw6">
-                                                {{ __('shop::app.subscription.subscribe') }}
-                                            </button>
-
-                                        </div>
-                                    </div>
-                                </form>
+                                    <button class="theme-btn subscribe-btn fw6">
+                                        {{ __('shop::app.subscription.subscribe') }}
+                                    </button>
+                                </div>
                             </div>
+                        </form>
                     </div>
-                @endif
+                </div>
+            @endif
         </div>
     </div>
 @endif
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/top-brands.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/top-brands.blade.php
index 85719440a..650ed3cf0 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/top-brands.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/top-brands.blade.php
@@ -12,24 +12,20 @@
                     </div>
 
                     <ul class="list-group">
-                        <div class="row fs16 pb15">
-                            <span>
-                                @foreach($topBrandsCollection as $categoryName => $brandsCollection)
-                                    <div class="row fs16 pb15">
-                                        <label class="mr10">{{ $categoryName }} : </label>
+                        @foreach($topBrandsCollection as $categoryName => $brandsCollection)
+                            <li class="row col-12">
+                                <label class="mr10">{{ $categoryName }} : </label>
 
-                                        <span>
-                                            @foreach ($brandsCollection as $brandIndex => $brand )
-                                                {{$brand}}
-                                                @if ($brandIndex + 1 !== sizeof($brandsCollection))
-                                                    |
-                                                @endif
-                                            @endforeach
-                                        </span>
-                                    </div>
-                                @endforeach
-                            </span>
-                        </div>
+                                <span>
+                                    @foreach ($brandsCollection as $brandIndex => $brand )
+                                        {{$brand}}
+                                        @if ($brandIndex + 1 !== sizeof($brandsCollection))
+                                            |
+                                        @endif
+                                    @endforeach
+                                </span>
+                            </li>
+                        @endforeach
                     </ul>
                 @endif
         </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php
index 43b824235..0e9887a44 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php
@@ -1,28 +1,20 @@
 <header>
     <div class="row col-12 remove-padding-margin velocity-divide-page">
-        <a id="logo" class="left" href="{{ route('shop.home.index') }}">
-            @if ($logo = core()->getCurrentChannel()->logo_url)
-                <img class="logo" src="{{ $logo }}" class="img-responsive" title="" alt="" />
-            @else
-                <img class="logo" src="{{ asset('themes/velocity/assets/images/logo-text.png') }}" class="img-responsive" />
-            @endif
-        </a>
+        <logo-component></logo-component>
 
         <div class="row no-margin right">
-            <div class="col-8 no-padding">
+            <div class="col-8 no-padding input-group">
                 <form
-                    role="search"
-                    action="{{ route('shop.search.index') }}"
                     method="GET"
+                    role="search"
                     id="search-form"
-                    class="input-group">
+                    action="{{ route('shop.search.index') }}">
 
                     <div
                         class="btn-toolbar full-width"
                         role="toolbar">
 
-                        <div class="btn-group mr-2 full-width row">
-
+                        <div class="btn-group full-width">
                             <div class="selectdiv">
                                 <select class="form-control fs13 border-right-0" name="category">
                                     <option value="">
@@ -30,13 +22,15 @@
                                     </option>
 
                                     @foreach ($categories as $category)
-                                        <option value="{{ $category->id }}">{{ $category->name }}</option>
+                                        <option value="{{ $category->id }}">
+                                            {{ $category->name }}
+                                        </option>
                                     @endforeach
                                     <span class="select-icon rango-arrow-down"></span>
                                 </select>
                             </div>
 
-                            <div class="input-group col-md-8 rows">
+                            <div class="full-width">
                                 <input
                                     required
                                     name="term"
@@ -44,11 +38,9 @@
                                     class="form-control"
                                     placeholder="{{ __('velocity::app.header.search-text') }}" />
 
-                                <div class="input-group-append">
-                                    <button class="btn" type="submit" id="header-search-icon">
-                                        <i class="fs14 rango-search"></i>
-                                    </button>
-                                </div>
+                                <button class="btn" type="submit" id="header-search-icon">
+                                    <i class="fs16 fw6 rango-search"></i>
+                                </button>
                             </div>
                         </div>
                     </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
index a597eced1..3051a3857 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
@@ -63,7 +63,7 @@
                     @include('shop::layouts.top-nav.index')
                     @include('shop::layouts.header.index', ['categories' => $categories])
 
-                    <div class="categories-sidebar-container col-12 no-padding">
+                    <div class="main-content-wrapper col-12 no-padding">
 
                         @php
                             $velocityContent = app('Webkul\Velocity\Repositories\ContentRepository')->getAllContents();
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/locale-currency.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/locale-currency.blade.php
index e3e42b93d..10c91fe3b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/locale-currency.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/locale-currency.blade.php
@@ -2,7 +2,23 @@
 
     <div class="pull-left">
         <div class="dropdown">
-           <select
+
+            @php
+                $localeImage = null;
+            @endphp
+            @foreach (core()->getCurrentChannel()->locales as $locale)
+                @if ($locale->code == app()->getLocale())
+                    @php
+                        $localeImage = $locale->locale_image;
+                    @endphp
+                @endif
+            @endforeach
+
+            <div class="locale-icon">
+                <img src="{{ asset('/storage/' . $localeImage) }}" />
+            </div>
+
+            <select
                 class="btn btn-link dropdown-toggle control locale-switcher styled-select"
                 onchange="window.location.href = this.value"
                 @if (count(core()->getCurrentChannel()->locales) == 1)
@@ -11,7 +27,11 @@
 
                 @foreach (core()->getCurrentChannel()->locales as $locale)
                     @if (isset($serachQuery))
-                        <option value="?{{ $serachQuery }}&locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
+                        <option
+                            value="?{{ $serachQuery }}&locale={{ $locale->code }}"
+                            {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>
+                            {{ $locale->name }}
+                        </option>
                     @else
                         <option value="?locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
                     @endif
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
index 40623ac6f..b9236d373 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
@@ -41,22 +41,22 @@
 
                         <!--Footer-->
                         <div class="modal-footer">
-                            <div class="col-6 text-left">
+                            <div>
                                 <a href="{{ route('customer.session.index') }}">
                                     <button
                                         type="button"
-                                        class="theme-btn fs15">
+                                        class="theme-btn fs14 fw6">
 
                                         {{ __('velocity::app.header.sign-in') }}
                                     </button>
                                 </a>
                             </div>
 
-                            <div class="col-6 text-right">
+                            <div>
                                 <a href="{{ route('customer.register.index') }}">
                                     <button
                                         type="button"
-                                        class="theme-btn fs15">
+                                        class="theme-btn fs14 fw6">
                                         {{ __('velocity::app.header.sign-up') }}
                                     </button>
                                 </a>
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php
index 17b521b42..7c6dca49f 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/add-to-cart.blade.php
@@ -1,31 +1,34 @@
 {!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!}
 
-<form
-    action="{{ route('cart.add', $product->product_id) }}"
-    method="POST"
-    class="col-4 add-to-cart-btn">
+<div class="col-4 add-to-cart-btn">
+    <form
+        method="POST"
+        action="{{ route('cart.add', $product->product_id) }}">
 
-    @csrf
+        @csrf
 
-    <input type="hidden" name="product_id" value="{{ $product->product_id }}">
-    <input type="hidden" name="quantity" value="1">
-    <button
-        type="submit"
-        class="btn btn-add-to-cart"
-        {{ ! $product->isSaleable() ? 'disabled' : '' }}>
+        <input type="hidden" name="product_id" value="{{ $product->product_id }}">
+        <input type="hidden" name="quantity" value="1">
+        <button
+            type="submit"
+            {{ ! $product->isSaleable() ? 'disabled' : '' }}
+            class="btn btn-add-to-cart {{ $addToCartBtnClass ?? '' }}">
 
-        @if (! (isset($showCartIcon) && !$showCartIcon))
-            <span class="rango-cart-1 fs20"></span>
-        @endif
+            @if (! (isset($showCartIcon) && !$showCartIcon))
+                <i class="material-icons text-down-3">shopping_cart</i>
+            @endif
 
-        <span class="fs14 align-vertical-top fw6">
-            {{ __('shop::app.products.add-to-cart') }}
-        </span>
-    </button>
-</form>
+            <span class="fs14 fw6 text-uppercase text-up-4">
+                {{ __('shop::app.products.add-to-cart') }}
+            </span>
+        </button>
+    </form>
+</div>
 
 @if (! (isset($showWishlist) && !$showWishlist))
-    @include('shop::products.wishlist')
+    @include('shop::products.wishlist', [
+        'addClass' => $addWishlistClass ?? ''
+    ])
 @endif
 
 {!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/index.blade.php
index eb5fcab3f..08e5cbb39 100755
--- a/packages/Webkul/Velocity/src/Resources/views/products/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/index.blade.php
@@ -1,3 +1,4 @@
+@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
 @inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
 
 @extends('shop::layouts.master')
@@ -54,7 +55,6 @@
                 </div>
             </div>
 
-
             @if ($products->count())
                 <div class="filters-container">
                     @include ('shop::products.list.toolbar')
@@ -74,17 +74,11 @@
                 </div>
 
                 @if ($isDisplayMode)
-
                     @if ($products->count())
-
-                        @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
-
                         @if ($toolbarHelper->getCurrentMode() == 'grid')
                             <div class="row">
                                 @foreach ($products as $productFlat)
-
                                     @include ('shop::products.list.card', ['product' => $productFlat])
-
                                 @endforeach
                             </div>
                         @else
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php
index 60d2e0114..08d9c87a9 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php
@@ -46,18 +46,21 @@
                     </div>
 
                     <div class="product-rating">
-                        <star-ratings ratings="3"></star-ratings>
+                        <star-ratings ratings="{{ $avgRatings }}"></star-ratings>
                         <span>{{ $totalReviews }} Ratings</span>
                     </div>
 
                     <div class="cart-wish-wrap row mt5">
-                        @include ('shop::products.add-to-cart', ['product' => $product])
+                        @include ('shop::products.add-to-cart', [
+                            'product' => $product,
+                            'addToCartBtnClass' => 'medium-padding'
+                        ])
                     </div>
                 </div>
             </div>
         </div>
     @else
-        <div class="card grid-card" id="product-card-new">
+        <div class="card grid-card product-card-new">
             <a
                 href="{{ route('shop.productOrCategory.index', ['slug' => $product->url_key]) }}"
                 title="{{ $product->name }}"
@@ -67,9 +70,9 @@
                     src="{{ $productBaseImage['medium_image_url'] }}"
                     class="card-img-top"
                     alt="{{ $product->name }}">
-            </a>
 
-            <quick-view-btn details="{{ $product }}"></quick-view-btn>
+                <quick-view-btn details="{{ $product }}"></quick-view-btn>
+            </a>
 
             <div class="card-body">
                 <div class="product-name">
@@ -89,7 +92,7 @@
                 @if ($totalReviews)
                     <div class="product-rating">
                         <star-ratings ratings="{{ $avgRatings }}"></star-ratings>
-                        <span>{{ $totalReviews }} Ratings</span>
+                        <span class="align-top">{{ $totalReviews }} Ratings</span>
                     </div>
                 @else
                     <div class="product-rating">
@@ -98,7 +101,11 @@
                 @endif
 
                 <div class="cart-wish-wrap row">
-                    @include ('shop::products.add-to-cart', ['product' => $product])
+                    @include ('shop::products.add-to-cart', [
+                        'product' => $product,
+                        'addWishlistClass' => 'col-lg-4 col-md-4 col-sm-12 offset-lg-4',
+                        'addToCartBtnClass' => $addToCartBtnClass ?? ''
+                    ])
                 </div>
             </div>
         </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/list/layered-navigation.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/list/layered-navigation.blade.php
index ed5c1b541..4d7a49ace 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/list/layered-navigation.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/list/layered-navigation.blade.php
@@ -36,6 +36,10 @@
 
         <layered-navigation></layered-navigation>
 
+        @if ($showRecentlyViewed)
+            @include ('shop::products.list.recently-viewed')
+        @endif
+
     {!! view_render_event('bagisto.shop.products.list.layered-nagigation.after') !!}
 
 </div>
@@ -50,7 +54,13 @@
 
             <div class="filter-content">
                 <div class="filter-attributes">
-                    <filter-attribute-item v-for='(attribute, index) in attributes' :attribute="attribute" :key="index" :index="index" @onFilterAdded="addFilters(attribute.code, $event)" :appliedFilterValues="appliedFilters[attribute.code]">
+                    <filter-attribute-item
+                        :key="index"
+                        :index="index"
+                        :attribute="attribute"
+                        v-for='(attribute, index) in attributes'
+                        @onFilterAdded="addFilters(attribute.code, $event)"
+                        :appliedFilterValues="appliedFilters[attribute.code]">
                     </filter-attribute-item>
 
                 </div>
@@ -74,13 +84,21 @@
 
             <div class="filter-attributes-content">
                 <ul type="none" class="items ml15" v-if="attribute.type != 'price'">
-                    <li class="item" v-for='(option, index) in attribute.options'>
-
-                        <span class="checkbox">
-                            <input type="checkbox" :id="option.id" v-bind:value="option.id" v-model="appliedFilters" @change="addFilter($event)"/>
-                            @{{ option.label ? option.label : option.admin_name }}
-                        </span>
+                    <li
+                        class="item"
+                        v-for='(option, index) in attribute.options'>
 
+                        <div
+                            class="checkbox"
+                            @click="optionClicked(option.id, $event)">
+                            <input
+                                type="checkbox"
+                                :id="option.id"
+                                v-bind:value="option.id"
+                                v-model="appliedFilters"
+                                @change="addFilter($event)" />
+                            <span>@{{ option.label ? option.label : option.admin_name }}</span>
+                        </div>
                     </li>
                 </ul>
 
@@ -112,32 +130,25 @@
                         id="price_to">
                     </div>
                 </div>
-
             </div>
-
         </div>
     </script>
 
-    <script>
+    <script type="text/javascript">
         Vue.component('layered-navigation', {
-
             template: '#layered-navigation-template',
-
             data: function() {
                 return {
+                    appliedFilters: {},
                     attributes: @json($filterAttributes),
-
-                    appliedFilters: {}
                 }
             },
 
             created: function () {
-                var urlParams = new URLSearchParams(window.location.search);
+                let urlParams = new URLSearchParams(window.location.search);
 
-                var this_this = this;
-
-                urlParams.forEach(function (value, index) {
-                    this_this.appliedFilters[index] = value.split(',');
+                urlParams.forEach((value, index) => {
+                    this.appliedFilters[index] = value.split(',');
                 });
             },
 
@@ -162,14 +173,12 @@
                     }
 
                     window.location.href = "?" + params.join('&');
-                }
+                },
             }
         });
 
         Vue.component('filter-attribute-item', {
-
             template: '#filter-attribute-item-template',
-
             props: [
                 'index',
                 'attribute',
@@ -219,7 +228,6 @@
 
             methods: {
                 addFilter: function (e) {
-
                     this.$emit('onFilterAdded', this.appliedFilters)
                 },
 
@@ -236,10 +244,28 @@
                     this.appliedFilters = [];
 
                     this.$emit('onFilterAdded', this.appliedFilters)
+                },
+
+                optionClicked: function (id, {target}) {
+                    let checkbox = $(`#${id}`);
+                    if (checkbox && checkbox.length > 0 && target.type != "checkbox") {
+                        checkbox = checkbox[0];
+                        checkbox.checked = !checkbox.checked;
+
+                        if (checkbox.checked) {
+                            this.appliedFilters.push(id);
+                        } else {
+                            let idPosition = this.appliedFilters.indexOf(id);
+                            if (idPosition == -1)
+                                idPosition = this.appliedFilters.indexOf(id.toString());
+
+                            this.appliedFilters.splice(idPosition, 1);
+                        }
+
+                        this.addFilter(event);
+                    }
                 }
             }
-
         });
-
     </script>
 @endpush
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/list/recently-viewed.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/list/recently-viewed.blade.php
index a01efbb61..86542ce98 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/list/recently-viewed.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/list/recently-viewed.blade.php
@@ -1,46 +1,102 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+@inject ('velocityHelper', 'Webkul\Velocity\Helpers\Helper')
 @inject ('productRatingHelper', 'Webkul\Product\Helpers\Review')
+@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 
-@php
-    $recentlyViewedProducts = app('Webkul\Product\Repositories\ProductRepository')->getNewProducts(3)->items();
-@endphp
+<recently-viewed
+    add-class="{{ isset($addClass) ? $addClass : '' }}"
+    add-class-wrapper="{{ isset($addClassWrapper) ? $addClassWrapper : '' }}">
+</recently-viewed>
 
-<div class="col-3 recently-viewed">
-    <div class="row mb20 pl20">
-        <div class="col-12 no-padding">
-            <h2 class="fs20 fw6">{{ __('velocity::app.products.recently-viewed') }}</h2>
-        </div>
-    </div>
-
-    @foreach ($recentlyViewedProducts as $index => $product)
-
-        @php
-            $productBaseImage = $productImageHelper->getProductBaseImage($product);
-            $productAverageRating = $productRatingHelper->getAverageRating($product);
-        @endphp
-
-        <div class="row small-card-container">
-            <div class="col-4 product-image-container mr15">
-                <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" class="unset">
-                    <div class="product-image" style="background-image: url({{ $productBaseImage['small_image_url'] }})"></div>
-                </a>
+@push('scripts')
+    <script type="text/x-template" id="recently-viewed-template">
+        <div :class="`${addClass} recently-viewed`">
+            <div class="row remove-padding-margin">
+                <div class="col-12 no-padding">
+                    <h2 class="fs20 fw6 mb15">{{ __('velocity::app.products.recently-viewed') }}</h2>
+                </div>
             </div>
 
-            <div class="col-8 no-padding card-body align-vertical-top">
-                <div class="no-padding">
-                    <div class="fs16 text-nowrap">{{ $product->name }}</div>
+            <div :class="`recetly-viewed-products-wrapper ${addClassWrapper}`">
+                <div
+                    :key="Math.random()"
+                    class="row small-card-container"
+                    v-for="(product, index) in recentlyViewed">
 
-                    <div class="fs18 card-current-price fw6">
-                        @include ('shop::products.price', [
-                            'product' => $product,
-                            'showDiscount' => false,
-                        ])
+                    <div class="col-4 product-image-container mr15">
+                        <a :href="`${baseURL}/${product.urlKey}`" class="unset">
+                            <div class="product-image" :style="`background-image: url(${product.image})`"></div>
+                        </a>
                     </div>
 
-                    <star-ratings ratings="{{ intval($productAverageRating) }}"></star-ratings>
+                    <div class="col-8 no-padding card-body align-vertical-top">
+                        <a :href="`${baseURL}/${product.urlKey}`" class="unset no-padding">
+                            <span class="fs16 text-nowrap">@{{ product.name }}</span>
+
+                            <div
+                                v-html="product.priceHTML"
+                                class="fs18 card-current-price fw6">
+                            </div>
+
+                            <star-ratings
+                                push-class="display-inbl"
+                                :ratings="product.rating">
+                            </star-ratings>
+
+                            <span class="fs16 text-nowrap align-text-bottom">@{{ product.totalReviews }} Reviews</span>
+                        </a>
+                    </div>
                 </div>
 
+                <span
+                    class="fs16"
+                    v-if="!recentlyViewed"
+                    v-text="'Not available'">
+                </span>
             </div>
         </div>
-    @endforeach
-</div>
+    </script>
+
+    <script type="text/javascript">
+        (() => {
+            Vue.component('recently-viewed', {
+                template: '#recently-viewed-template',
+                props: ['addClass', 'addClassWrapper'],
+
+                data: function () {
+                    return {
+                        baseURL: '{{ url()->to('/') }}',
+                        recentlyViewed: (() => {
+                            let storedRecentlyViewed = window.localStorage.recentlyViewed;
+                            if (storedRecentlyViewed) {
+                                var slugs = JSON.parse(storedRecentlyViewed);
+                                var updatedSlugs = {};
+
+                                slugs.forEach(slug => {
+                                    updatedSlugs[slug] = {};
+                                });
+
+                                return updatedSlugs;
+                            }
+                        })(),
+                    }
+                },
+
+                created: function () {
+                    // @TODO:- current product and recentlyViewed
+
+                    for (slug in this.recentlyViewed) {
+                        if (slug) {
+                            this.$http(`${this.baseURL}/product-details/${slug}`)
+                            .then(response => {
+                                if (response.data.status) {
+                                    this.$set(this.recentlyViewed, response.data.details.urlKey, response.data.details);
+                                }
+                            })
+                            .catch(error => {})
+                        }
+                    }
+                },
+            })
+        })()
+    </script>
+@endpush
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php
index 4955e3e75..79933d378 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php
@@ -41,24 +41,24 @@
 
     <div class="sorter">
         <label>{{ __('shop::app.products.sort-by') }}</label>
+        <i class="icon fs16 cell rango-arrow-down select-icon-margin down-icon-position"></i>
+            <select class="selective-div border-normal" onchange="window.location.href = this.value">
 
-        <select onchange="window.location.href = this.value">
+                @foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
 
-            @foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
+                    <option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
+                        {{ __('shop::app.products.' . $order) }}
+                    </option>
 
-                <option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
-                    {{ __('shop::app.products.' . $order) }}
-                </option>
+                @endforeach
 
-            @endforeach
-
-        </select>
+            </select>
     </div>
 
     <div class="limiter">
         <label>{{ __('shop::app.products.show') }}</label>
-
-        <select onchange="window.location.href = this.value">
+        <i class="icon fs16 cell rango-arrow-down select-icon-show-margin down-icon-position"></i>
+        <select class="selective-div border-normal" onchange="window.location.href = this.value" style="width: 57px;">
 
             @foreach ($toolbarHelper->getAvailableLimits() as $limit)
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php
index 7894fabbc..e9e46e230 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php
@@ -3,22 +3,18 @@
 @extends('shop::layouts.master')
 
 @section('page_title')
-    {{ __('shop::app.reviews.add-review-page-title') }}
+    {{ __('shop::app.reviews.add-review-page-title') }} - {{ $product->name }}
 @endsection
 
 @section('content-wrapper')
-    <create-review></create-review>
-@endsection
-
-@push('scripts')
-    <script type="text/x-template" id="create-review-template">
-        <div class="row review-page-container">
 
+    <div class="container">
+        <section class="row review-page-container">
             @include ('shop::products.view.small-view', ['product' => $product])
 
             <div class="col-6">
                 <div class="row customer-rating">
-                    <h2 class="full-width">Reviews</h2>
+                    <h2 class="full-width">{{ __('shop::app.reviews.write-review') }}</h2>
 
                     <form
                         method="POST"
@@ -28,43 +24,72 @@
 
                         @csrf
 
-                        <div class="ratings">
-                            <label>Rating*</label>
+                        <div :class="`${errors.has('rating') ? 'has-error' : ''}`">
+                            <label for="title" class="required">
+                                {{ __('admin::app.customers.reviews.rating') }}
+                            </label>
                             <star-ratings ratings="5" size="24" editable="true"></star-ratings>
+                            <span class="control-error" v-if="errors.has('rating')">
+                                @{{ errors.first('rating') }}
+                            </span>
                         </div>
 
-                        <div class="title">
-                            <label>Title*</label>
-                            <input type="text" placeholder="Title" name="title" />
+                        <div :class="`${errors.has('title') ? 'has-error' : ''}`">
+                            <label for="title" class="required">
+                                {{ __('shop::app.reviews.title') }}
+                            </label>
+                            <input
+                                type="text"
+                                name="title"
+                                class="control"
+                                v-validate="'required'"
+                                value="{{ old('title') }}" />
+
+                            <span class="control-error" v-if="errors.has('title')">@{{ errors.first('title') }}</span>
                         </div>
 
-                        <div class="comment">
-                            <label>Rating*</label>
-                            <textarea rows="4" placeholder="Your Comment" name="comment"></textarea>
+                        @if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user())
+                            <div :class="`${errors.has('name') ? 'has-error' : ''}`">
+                                <label for="title" class="required">
+                                    {{ __('shop::app.reviews.name') }}
+                                </label>
+                                <input  type="text" class="control" name="name" v-validate="'required'" value="{{ old('name') }}">
+                                <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
+                            </div>
+                        @endif
+
+                        <div :class="`${errors.has('comment') ? 'has-error' : ''}`">
+                            <label for="comment" class="required">
+                                {{ __('admin::app.customers.reviews.comment') }}
+                            </label>
+                            <textarea
+                                type="text"
+                                class="control"
+                                name="comment"
+                                v-validate="'required'"
+                                value="{{ old('comment') }}">
+                            </textarea>
+                            <span class="control-error" v-if="errors.has('comment')">
+                                @{{ errors.first('comment') }}
+                            </span>
                         </div>
 
                         <div class="submit-btn">
-                            <button class="theme-btn fs16" type="submit">{{ __('velocity::app.products.submit-review') }}</button>
+                            <button
+                                type="submit"
+                                class="theme-btn fs16">
+                                {{ __('velocity::app.products.submit-review') }}
+                            </button>
                         </div>
                     </form>
                 </div>
             </div>
-
             @if ($showRecentlyViewed)
-                @include ('shop::products.list.recently-viewed')
+                @include ('shop::products.list.recently-viewed', [
+                    'addClass' => 'col-3'
+                ])
             @endif
-        </div>
-    </script>
+        </section>
+    </div>
 
-    <script type="text/javascript">
-        (() => {
-            Vue.component('create-review', {
-                template: '#create-review-template',
-
-                data: function () {
-                    return {}
-                }
-            })
-        })()
-    </script>
-@endpush
+@endsection
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/reviews/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/reviews/index.blade.php
index c9e893616..0e9d73564 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/reviews/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/reviews/index.blade.php
@@ -27,13 +27,15 @@
 @endpush
 
 @section('content-wrapper')
-    <div class="row review-page-container">
-        @include ('shop::products.view.small-view', ['product' => $product])
+    <div class="container">
+        <div class="row review-page-container">
+            @include ('shop::products.view.small-view', ['product' => $product])
 
-        <div class="col-7 scrollable fs16">
-            <h2 class="full-width mb30">Rating and Reviews</h2>
+            <div class="col-7 scrollable fs16">
+                <h2 class="full-width mb30">Rating and Reviews</h2>
 
-            @include ('shop::products.view.reviews')
+                @include ('shop::products.view.reviews')
+            </div>
         </div>
     </div>
 @endsection
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php
index 6fc037df8..2dd099200 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php
@@ -19,116 +19,142 @@
     <meta name="keywords" content="{{ $product->meta_keywords }}"/>
 @stop
 
-@section('content-wrapper')
+@push('css')
+    <style type="text/css">
+        .recently-viewed {
+            margin-top: 20px;
+        }
 
+        .store-meta-images > .recently-viewed:first-child {
+            margin-top: 0px;
+        }
+
+        .main-content-wrapper {
+            margin-bottom: 0px;
+        }
+    </style>
+
+@endpush
+
+@section('full-content-wrapper')
     {!! view_render_event('bagisto.shop.products.view.before', ['product' => $product]) !!}
 
-    @if ($showRecentlyViewed)
-        <section class="col-7 offset-1 product-detail">
-    @else
-        <section class="col-10 offset-1 product-detail">
-    @endif
-            <div class="layouter">
-                <product-view>
-                    <div class="form-container">
-                        @csrf()
+        <div class="row no-margin">
+            @if ($showRecentlyViewed)
+                <section class="col-9 product-detail">
+            @else
+                <section class="col-12 product-detail">
+            @endif
+                    <div class="layouter">
+                        <product-view>
+                            <div class="form-container">
+                                @csrf()
 
-                        <input type="hidden" name="product_id" value="{{ $product->product_id }}">
+                                <input type="hidden" name="product_id" value="{{ $product->product_id }}">
 
-                        {{-- product-gallery --}}
-                        <div class="left col-lg-5">
-                            @include ('shop::products.view.gallery')
-                        </div>
-
-                        {{-- right-section --}}
-                        <div class="right col-lg-7 scrollable">
-                            {{-- product-info-section --}}
-                            <div class="row info">
-                                <h2 class="col-lg-12">{{ $product->name }}</h2>
-
-                                @if ($total)
-                                    <div class="reviews col-lg-12">
-                                        <star-ratings
-                                            :ratings="{{ $avgStarRating }}"
-                                            push-class="mr5"
-                                        ></star-ratings>
-
-                                        <div class="reviews">
-                                            <span>{{ $avgRatings }} Ratings and {{ $total }} Reviews</span>
-                                        </div>
-                                    </div>
-                                @endif
-
-                                @include ('shop::products.view.stock', ['product' => $product])
-
-                                <div class="col-12 price">
-                                    @include ('shop::products.price', ['product' => $product])
+                                {{-- product-gallery --}}
+                                <div class="left col-lg-6">
+                                    @include ('shop::products.view.gallery')
                                 </div>
 
-                                @include ('shop::products.add-to-cart', [
-                                    'product' => $product,
-                                    'showCartIcon' => false
-                                ])
+                                {{-- right-section --}}
+                                <div class="right col-lg-6 scrollable">
+                                    {{-- product-info-section --}}
+                                    <div class="row info">
+                                        <h2 class="col-lg-12">{{ $product->name }}</h2>
+
+                                        @if ($total)
+                                            <div class="reviews col-lg-12">
+                                                <star-ratings
+                                                    :ratings="{{ $avgStarRating }}"
+                                                    push-class="mr5"
+                                                ></star-ratings>
+
+                                                <div class="reviews">
+                                                    <span>{{ $avgRatings }} Ratings and {{ $total }} Reviews</span>
+                                                </div>
+                                            </div>
+                                        @endif
+
+                                        @include ('shop::products.view.stock', ['product' => $product])
+
+                                        <div class="col-12 price">
+                                            @include ('shop::products.price', ['product' => $product])
+                                        </div>
+
+                                        @include ('shop::products.add-to-cart', [
+                                            'product' => $product,
+                                            'showCartIcon' => false,
+                                        ])
+                                    </div>
+
+                                    {!! view_render_event('bagisto.shop.products.view.short_description.before', ['product' => $product]) !!}
+
+                                    <div class="description">
+                                        <h3 class="col-lg-12">{{ __('velocity::app.products.short-description') }}</h3>
+
+                                        {!! $product->short_description !!}
+                                    </div>
+
+                                    {!! view_render_event('bagisto.shop.products.view.short_description.after', ['product' => $product]) !!}
+
+
+                                    {!! view_render_event('bagisto.shop.products.view.quantity.before', ['product' => $product]) !!}
+
+                                    @if ($product->getTypeInstance()->showQuantityBox())
+                                        <quantity-changer></quantity-changer>
+                                    @else
+                                        <input type="hidden" name="quantity" value="1">
+                                    @endif
+
+                                    {!! view_render_event('bagisto.shop.products.view.quantity.after', ['product' => $product]) !!}
+
+                                    @include ('shop::products.view.configurable-options')
+
+                                    @include ('shop::products.view.downloadable')
+
+                                    @include ('shop::products.view.grouped-products')
+
+                                    @include ('shop::products.view.bundle-options')
+
+                                    @include ('shop::products.view.attributes', [
+                                        'active' => true
+                                    ])
+
+                                    {{-- product long description --}}
+                                    @include ('shop::products.view.description')
+
+                                    {{-- reviews count --}}
+                                    @include ('shop::products.view.reviews', ['accordian' => true])
+                                </div>
                             </div>
-
-                            {!! view_render_event('bagisto.shop.products.view.short_description.before', ['product' => $product]) !!}
-
-                            <div class="description">
-                                <h3 class="col-lg-12">{{ __('velocity::app.products.short-description') }}</h3>
-
-                                {!! $product->short_description !!}
-                            </div>
-
-                            {!! view_render_event('bagisto.shop.products.view.short_description.after', ['product' => $product]) !!}
-
-
-                            {!! view_render_event('bagisto.shop.products.view.quantity.before', ['product' => $product]) !!}
-
-                            @if ($product->getTypeInstance()->showQuantityBox())
-                                <quantity-changer></quantity-changer>
-                            @else
-                                <input type="hidden" name="quantity" value="1">
-                            @endif
-
-                            {!! view_render_event('bagisto.shop.products.view.quantity.after', ['product' => $product]) !!}
-
-                            @include ('shop::products.view.configurable-options')
-
-                            @include ('shop::products.view.downloadable')
-
-                            @include ('shop::products.view.grouped-products')
-
-                            @include ('shop::products.view.bundle-options')
-
-                            @include ('shop::products.view.attributes', [
-                                'active' => true
-                            ])
-
-                            {{-- product long description --}}
-                            @include ('shop::products.view.description')
-
-                            {{-- reviews count --}}
-                            @include ('shop::products.view.reviews', ['accordian' => true])
-                        </div>
+                        </product-view>
                     </div>
-                </product-view>
+
+                    @include ('shop::products.view.related-products')
+
+                    @include ('shop::products.view.up-sells')
+
+            </section>
+
+            <div class="store-meta-images col-3">
+                @foreach (json_decode($velocityMetaData['product_view_images'], true) as $image)
+                    @if ($image && $image !== '')
+                        <img src="{{ url()->to('/') }}/storage/{{ $image }}" />
+                    @endif
+                @endforeach
+
+                @if ($showRecentlyViewed)
+                    @include ('shop::products.list.recently-viewed')
+                @endif
             </div>
 
-            @include ('shop::products.view.related-products')
-
-            @include ('shop::products.view.up-sells')
-
-    </section>
-
-    @if ($showRecentlyViewed)
-        @include ('shop::products.list.recently-viewed')
-    @endif
+        </div>
 
     {!! view_render_event('bagisto.shop.products.view.after', ['product' => $product]) !!}
 @endsection
 
 @push('scripts')
-
     <script type="text/x-template" id="product-view-template">
         <form method="POST" id="product-form" action="{{ route('cart.add', $product->product_id) }}" @click="onSubmit($event)">
 
@@ -155,17 +181,33 @@
 
     <script type="text/javascript">
         Vue.component('product-view', {
-
-            template: '#product-view-template',
-
             inject: ['$validator'],
-
+            template: '#product-view-template',
             data: function() {
                 return {
                     is_buy_now: 0,
                 }
             },
 
+            mounted: function () {
+                let currentProductId = '{{ $product->url_key }}';
+                let existingViewed = window.localStorage.getItem('recentlyViewed');
+                if (! existingViewed) {
+                    existingViewed = [];
+                } else {
+                    existingViewed = JSON.parse(existingViewed);
+                }
+
+                if (existingViewed.indexOf(currentProductId) == -1) {
+                    existingViewed.push(currentProductId);
+
+                    if (existingViewed.length > 4)
+                        existingViewed = existingViewed.slice(Math.max(existingViewed.length - 4, 1));
+
+                    window.localStorage.setItem('recentlyViewed', JSON.stringify(existingViewed));
+                }
+            },
+
             methods: {
                 onSubmit: function(e) {
                     if (e.target.getAttribute('type') != 'submit')
@@ -189,9 +231,8 @@
         });
 
         Vue.component('quantity-changer', {
-            template: '#quantity-changer-template',
-
             inject: ['$validator'],
+            template: '#quantity-changer-template',
 
             props: {
                 controlName: {
@@ -257,8 +298,7 @@
             var productHeroImage = document.getElementsByClassName('product-hero-image')[0];
 
             if (thumbList && productHeroImage) {
-
-                for(let i=0; i < thumbFrame.length ; i++) {
+                for (let i=0; i < thumbFrame.length ; i++) {
                     thumbFrame[i].style.height = (productHeroImage.offsetHeight/4) + "px";
                     thumbFrame[i].style.width = (productHeroImage.offsetHeight/4)+ "px";
                 }
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/view/reviews.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/view/reviews.blade.php
index 066a98994..8e7d4a1b1 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/view/reviews.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/view/reviews.blade.php
@@ -182,11 +182,13 @@
                         </div>
 
                         <div class="col-lg-12 review-date-time">
-                            <span>{{ __('velocity::app.products.review-by') }} -</span>
+                            @if ("{{ $review->name }}")
+                                <span>{{ __('velocity::app.products.review-by') }} -</span>
 
-                            <label>
-                                {{ $review->name }},
-                            </label>
+                                <label>
+                                    {{ $review->name }},
+                                </label>
+                            @endif
 
                             <span>{{ core()->formatDate($review->created_at, 'F d, Y') }}
                             </span>
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/wishlist.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/wishlist.blade.php
index 3f62abb1a..d25228e89 100755
--- a/packages/Webkul/Velocity/src/Resources/views/products/wishlist.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/wishlist.blade.php
@@ -1,23 +1,55 @@
 @inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
 
-@auth('customer')
-    {!! view_render_event('bagisto.shop.products.wishlist.before') !!}
+{!! view_render_event('bagisto.shop.products.wishlist.before') !!}
+    @auth('customer')
+        @php
+            $isWished = $wishListHelper->getWishlistProduct($product);
+        @endphp
 
-    @php
-        $isWished = $wishListHelper->getWishlistProduct($product);
-    @endphp
+        <a
+            class="unset wishlist-icon {{ $addWishlistClass ?? '' }}"
+            @if (! $isWished)
+                href="{{ route('customer.wishlist.add', $product->product_id) }}"
+            @elseif (isset($itemId) && $itemId)
+                href="{{ route('customer.wishlist.remove', $itemId) }}"
+            @endif
+            >
 
-    <a
-        class="unset wishlist-icon col-4 offset-4 text-right"
-        @if (! $isWished)
-            href="{{ route('customer.wishlist.add', $product->product_id) }}"
-        @elseif (isset($itemId) && $itemId)
-            href="{{ route('customer.wishlist.remove', $itemId) }}"
-        @endif
-        >
+            <wishlist-component active="{{ !$isWished }}"></wishlist-component>
+        </a>
+    @endauth
 
-        <i class="fs24 {{ $isWished ? 'rango-heart-fill' : 'rango-heart'}}"></i>
-    </a>
+    @guest('customer')
+        <a
+            href="{{ route('customer.session.index') }}"
+            class="unset wishlist-icon {{ $addWishlistClass ?? '' }}">
+            <wishlist-component active="false"></wishlist-component>
+        </a>
+    @endauth
+{!! view_render_event('bagisto.shop.products.wishlist.after') !!}
 
-    {!! view_render_event('bagisto.shop.products.wishlist.after') !!}
-@endauth
\ No newline at end of file
+@push('scripts')
+    <script type="text/x-template" id="wishlist-template">
+        <i
+            :class="`material-icons`"
+            @mouseover="isActive ? isActive = !isActive : ''"
+            @mouseout="active !== '' && !isActive ? isActive = !isActive : ''">
+
+            @{{ isActive ? 'favorite_border' : 'favorite' }}
+        </i>
+    </script>
+
+    <script type="text/javascript">
+        (() => {
+            Vue.component('wishlist-component', {
+                props: ['active'],
+                template: '#wishlist-template',
+                data: function () {
+                    return {
+                        isActive: this.active
+                    }
+                },
+            });
+        })()
+    </script>
+@endpush
diff --git a/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php
index a07652ccb..c5f441bdf 100644
--- a/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php
@@ -1,3 +1,5 @@
+@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
+
 @extends('shop::layouts.master')
 
 @section('page_title')
@@ -5,28 +7,39 @@
 @endsection
 
 @section('content-wrapper')
-    <section class="search-container cart-details row offset-1">
+    <section class="search-container cart-details row">
+        @if ($results->count())
+            <div class="filters-container col-12">
+                @include ('shop::products.list.toolbar')
+            </div>
+        @endif
+
         @if (! $results)
-            <h1 class="fw6 row col-12">{{  __('shop::app.search.no-results') }}</h1>
+            <h1 class="fw6 col-12">{{  __('shop::app.search.no-results') }}</h1>
         @else
             @if ($results->isEmpty())
-                <h1 class="fw6 row col-12">{{ __('shop::app.products.whoops') }}</h1>
+                <h1 class="fw6 col-12">{{ __('shop::app.products.whoops') }}</h1>
                 <span>{{ __('shop::app.search.no-results') }}</span>
             @else
                 @if ($results->total() == 1)
-                    <h2 class="fw6 row col-12 mb20">
+                    <h2 class="fw6 col-12 mb20">
                         {{ $results->total() }} {{ __('shop::app.search.found-result') }}
                     </h2>
                 @else
-                    <h2 class="fw6 row col-12 mb20">
+                    <h2 class="fw6 col-12 mb20">
                         {{ $results->total() }} {{ __('shop::app.search.found-results') }}
                     </h2>
                 @endif
 
                 @foreach ($results as $productFlat)
-
-                    @include('shop::products.list.card', ['product' => $productFlat->product])
-
+                    @if ($toolbarHelper->getCurrentMode() == 'grid')
+                        @include('shop::products.list.card', ['product' => $productFlat->product])
+                    @else
+                        @include('shop::products.list.card', [
+                            'list' => true,
+                            'product' => $productFlat->product
+                        ])
+                    @endif
                 @endforeach
 
                 @include('ui::datagrid.pagination')
diff --git a/public/installer/index.php b/public/installer/index.php
index 46036f5d8..c49424f86 100755
--- a/public/installer/index.php
+++ b/public/installer/index.php
@@ -28,6 +28,11 @@
             <div class="footer">
                 <img class="left-patern"  src= "<?php echo $leftIcon; ?>" >
                 <img class="right-patern"  src= "<?php echo $rightIcon; ?>" >
+
+                <div>
+                    Powered by <a href="https://bagisto.com/" target="_blank" style="color: blue">Bagisto</a>, A Community Project by
+                    <a href="https://webkul.com/" target="_blank" style="color: blue">Webkul</a>
+                </div>
             </div>
         </div>