Merge branch 'master' of https://github.com/bagisto/bagisto

packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php

@@ -2,8 +2,8 @@
 
 namespace Webkul\Admin\DataGrids;
 
-use Illuminate\Support\Facades\DB;
 use Webkul\Ui\DataGrid\DataGrid;
+use Illuminate\Support\Facades\DB;
 
 class CartRuleDataGrid extends DataGrid
 {
@@ -141,11 +141,19 @@ class CartRuleDataGrid extends DataGrid
             'icon'   => 'icon pencil-lg-icon',
         ]);
 
+        $this->addAction([
+            'title'  => trans('admin::app.datagrid.copy'),
+            'method' => 'GET',
+            'route'  => 'admin.cart-rules.copy',
+            'icon'   => 'icon note-icon',
+        ]);
+
         $this->addAction([
             'title'  => trans('admin::app.datagrid.delete'),
             'method' => 'POST',
             'route'  => 'admin.cart-rules.delete',
             'icon'   => 'icon trash-icon',
         ]);
+
     }
 }

packages/Webkul/Admin/src/Http/routes.php

@@ -7,69 +7,69 @@ Route::group(['middleware' => ['web']], function () {
 
         // Login Routes
         Route::get('/login', 'Webkul\User\Http\Controllers\SessionController@create')->defaults('_config', [
-            'view' => 'admin::users.sessions.create'
+            'view' => 'admin::users.sessions.create',
         ])->name('admin.session.create');
 
         //login post route to admin auth controller
         Route::post('/login', 'Webkul\User\Http\Controllers\SessionController@store')->defaults('_config', [
-            'redirect' => 'admin.dashboard.index'
+            'redirect' => 'admin.dashboard.index',
         ])->name('admin.session.store');
 
         // Forget Password Routes
         Route::get('/forget-password', 'Webkul\User\Http\Controllers\ForgetPasswordController@create')->defaults('_config', [
-            'view' => 'admin::users.forget-password.create'
+            'view' => 'admin::users.forget-password.create',
         ])->name('admin.forget-password.create');
 
         Route::post('/forget-password', 'Webkul\User\Http\Controllers\ForgetPasswordController@store')->name('admin.forget-password.store');
 
         // Reset Password Routes
         Route::get('/reset-password/{token}', 'Webkul\User\Http\Controllers\ResetPasswordController@create')->defaults('_config', [
-            'view' => 'admin::users.reset-password.create'
+            'view' => 'admin::users.reset-password.create',
         ])->name('admin.reset-password.create');
 
         Route::post('/reset-password', 'Webkul\User\Http\Controllers\ResetPasswordController@store')->defaults('_config', [
-            'redirect' => 'admin.dashboard.index'
+            'redirect' => 'admin.dashboard.index',
         ])->name('admin.reset-password.store');
 
 
         // Admin Routes
         Route::group(['middleware' => ['admin']], function () {
             Route::get('/logout', 'Webkul\User\Http\Controllers\SessionController@destroy')->defaults('_config', [
-                'redirect' => 'admin.session.create'
+                'redirect' => 'admin.session.create',
             ])->name('admin.session.destroy');
 
             // Dashboard Route
             Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->defaults('_config', [
-                'view' => 'admin::dashboard.index'
+                'view' => 'admin::dashboard.index',
             ])->name('admin.dashboard.index');
 
             //Customer Management Routes
             Route::get('customers', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [
-                'view' => 'admin::customers.index'
+                'view' => 'admin::customers.index',
             ])->name('admin.customer.index');
 
-            Route::get('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[
+            Route::get('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config', [
-                'view' => 'admin::customers.create'
+                'view' => 'admin::customers.create',
             ])->name('admin.customer.create');
 
-            Route::post('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[
+            Route::post('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config', [
-                'redirect' => 'admin.customer.index'
+                'redirect' => 'admin.customer.index',
             ])->name('admin.customer.store');
 
-            Route::get('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[
+            Route::get('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config', [
-                'view' => 'admin::customers.edit'
+                'view' => 'admin::customers.edit',
             ])->name('admin.customer.edit');
 
-            Route::get('customers/note/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@createNote')->defaults('_config',[
+            Route::get('customers/note/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@createNote')->defaults('_config', [
-                'view' => 'admin::customers.note'
+                'view' => 'admin::customers.note',
             ])->name('admin.customer.note.create');
 
-            Route::put('customers/note/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@storeNote')->defaults('_config',[
+            Route::put('customers/note/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@storeNote')->defaults('_config', [
-                'redirect' => 'admin.customer.index'
+                'redirect' => 'admin.customer.index',
             ])->name('admin.customer.note.store');
 
             Route::put('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [
-                'redirect' => 'admin.customer.index'
+                'redirect' => 'admin.customer.index',
             ])->name('admin.customer.update');
 
             Route::post('customers/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@destroy')->name('admin.customer.delete');
@@ -78,95 +78,95 @@ Route::group(['middleware' => ['web']], function () {
 
             Route::post('customers/masssupdate', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@massUpdate')->name('admin.customer.mass-update');
 
-            Route::get('reviews', 'Webkul\Product\Http\Controllers\ReviewController@index')->defaults('_config',[
+            Route::get('reviews', 'Webkul\Product\Http\Controllers\ReviewController@index')->defaults('_config', [
-                'view' => 'admin::customers.reviews.index'
+                'view' => 'admin::customers.reviews.index',
             ])->name('admin.customer.review.index');
 
             //Customer's addresses routes
             Route::get('customers/{id}/addresses', 'Webkul\Admin\Http\Controllers\Customer\AddressController@index')->defaults('_config', [
-                'view' => 'admin::customers.addresses.index'
+                'view' => 'admin::customers.addresses.index',
             ])->name('admin.customer.addresses.index');
 
-            Route::get('customers/{id}/addresses/create', 'Webkul\Admin\Http\Controllers\Customer\AddressController@create')->defaults('_config',[
+            Route::get('customers/{id}/addresses/create', 'Webkul\Admin\Http\Controllers\Customer\AddressController@create')->defaults('_config', [
-                'view' => 'admin::customers.addresses.create'
+                'view' => 'admin::customers.addresses.create',
             ])->name('admin.customer.addresses.create');
 
-            Route::post('customers/{id}/addresses/create', 'Webkul\Admin\Http\Controllers\Customer\AddressController@store')->defaults('_config',[
+            Route::post('customers/{id}/addresses/create', 'Webkul\Admin\Http\Controllers\Customer\AddressController@store')->defaults('_config', [
-                'redirect' => 'admin.customer.addresses.index'
+                'redirect' => 'admin.customer.addresses.index',
             ])->name('admin.customer.addresses.store');
 
-            Route::get('customers/addresses/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\AddressController@edit')->defaults('_config',[
+            Route::get('customers/addresses/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\AddressController@edit')->defaults('_config', [
-                'view' => 'admin::customers.addresses.edit'
+                'view' => 'admin::customers.addresses.edit',
             ])->name('admin.customer.addresses.edit');
 
             Route::put('customers/addresses/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\AddressController@update')->defaults('_config', [
-                'redirect' => 'admin.customer.addresses.index'
+                'redirect' => 'admin.customer.addresses.index',
             ])->name('admin.customer.addresses.update');
 
             Route::post('customers/addresses/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\AddressController@destroy')->defaults('_config', [
-                'redirect' => 'admin.customer.addresses.index'
+                'redirect' => 'admin.customer.addresses.index',
             ])->name('admin.customer.addresses.delete');
 
             //mass destroy
             Route::post('customers/{id}/addresses', 'Webkul\Admin\Http\Controllers\Customer\AddressController@massDestroy')->defaults('_config', [
-                'redirect' => 'admin.customer.addresses.index'
+                'redirect' => 'admin.customer.addresses.index',
             ])->name('admin.customer.addresses.massdelete');
 
             // Configuration routes
             Route::get('configuration/{slug?}/{slug2?}', 'Webkul\Admin\Http\Controllers\ConfigurationController@index')->defaults('_config', [
-                'view' => 'admin::configuration.index'
+                'view' => 'admin::configuration.index',
             ])->name('admin.configuration.index');
 
             Route::post('configuration/{slug?}/{slug2?}', 'Webkul\Admin\Http\Controllers\ConfigurationController@store')->defaults('_config', [
-                'redirect' => 'admin.configuration.index'
+                'redirect' => 'admin.configuration.index',
             ])->name('admin.configuration.index.store');
 
             Route::get('configuration/{slug?}/{slug2?}/{path}', 'Webkul\Admin\Http\Controllers\ConfigurationController@download')->defaults('_config', [
-                'redirect' => 'admin.configuration.index'
+                'redirect' => 'admin.configuration.index',
             ])->name('admin.configuration.download');
 
             // Reviews Routes
-            Route::get('reviews/edit/{id}', 'Webkul\Product\Http\Controllers\ReviewController@edit')->defaults('_config',[
+            Route::get('reviews/edit/{id}', 'Webkul\Product\Http\Controllers\ReviewController@edit')->defaults('_config', [
-                'view' => 'admin::customers.reviews.edit'
+                'view' => 'admin::customers.reviews.edit',
             ])->name('admin.customer.review.edit');
 
             Route::put('reviews/edit/{id}', 'Webkul\Product\Http\Controllers\ReviewController@update')->defaults('_config', [
-                'redirect' => 'admin.customer.review.index'
+                'redirect' => 'admin.customer.review.index',
             ])->name('admin.customer.review.update');
 
             Route::post('reviews/delete/{id}', 'Webkul\Product\Http\Controllers\ReviewController@destroy')->defaults('_config', [
-                'redirect' => 'admin.customer.review.index'
+                'redirect' => 'admin.customer.review.index',
             ])->name('admin.customer.review.delete');
 
             //mass destroy
             Route::post('reviews/massdestroy', 'Webkul\Product\Http\Controllers\ReviewController@massDestroy')->defaults('_config', [
-                'redirect' => 'admin.customer.review.index'
+                'redirect' => 'admin.customer.review.index',
             ])->name('admin.customer.review.massdelete');
 
             //mass update
             Route::post('reviews/massupdate', 'Webkul\Product\Http\Controllers\ReviewController@massUpdate')->defaults('_config', [
-                'redirect' => 'admin.customer.review.index'
+                'redirect' => 'admin.customer.review.index',
             ])->name('admin.customer.review.massupdate');
 
             // Customer Groups Routes
-            Route::get('groups', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@index')->defaults('_config',[
+            Route::get('groups', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@index')->defaults('_config', [
-                'view' => 'admin::customers.groups.index'
+                'view' => 'admin::customers.groups.index',
             ])->name('admin.groups.index');
 
-            Route::get('groups/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@create')->defaults('_config',[
+            Route::get('groups/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@create')->defaults('_config', [
-                'view' => 'admin::customers.groups.create'
+                'view' => 'admin::customers.groups.create',
             ])->name('admin.groups.create');
 
-            Route::post('groups/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@store')->defaults('_config',[
+            Route::post('groups/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@store')->defaults('_config', [
-                'redirect' => 'admin.groups.index'
+                'redirect' => 'admin.groups.index',
             ])->name('admin.groups.store');
 
-            Route::get('groups/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@edit')->defaults('_config',[
+            Route::get('groups/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@edit')->defaults('_config', [
-                'view' => 'admin::customers.groups.edit'
+                'view' => 'admin::customers.groups.edit',
             ])->name('admin.groups.edit');
 
-            Route::put('groups/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@update')->defaults('_config',[
+            Route::put('groups/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@update')->defaults('_config', [
-                'redirect' => 'admin.groups.index'
+                'redirect' => 'admin.groups.index',
             ])->name('admin.groups.update');
 
             Route::post('groups/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@destroy')->name('admin.groups.delete');
@@ -176,15 +176,15 @@ Route::group(['middleware' => ['web']], function () {
             Route::prefix('sales')->group(function () {
                 // Sales Order Routes
                 Route::get('/orders', 'Webkul\Admin\Http\Controllers\Sales\OrderController@index')->defaults('_config', [
-                    'view' => 'admin::sales.orders.index'
+                    'view' => 'admin::sales.orders.index',
                 ])->name('admin.sales.orders.index');
 
                 Route::get('/orders/view/{id}', 'Webkul\Admin\Http\Controllers\Sales\OrderController@view')->defaults('_config', [
-                    'view' => 'admin::sales.orders.view'
+                    'view' => 'admin::sales.orders.view',
                 ])->name('admin.sales.orders.view');
 
                 Route::get('/orders/cancel/{id}', 'Webkul\Admin\Http\Controllers\Sales\OrderController@cancel')->defaults('_config', [
-                    'view' => 'admin::sales.orders.cancel'
+                    'view' => 'admin::sales.orders.cancel',
                 ])->name('admin.sales.orders.cancel');
 
                 Route::post('/orders/create/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\OrderController@comment')->name('admin.sales.orders.comment');
@@ -192,63 +192,63 @@ Route::group(['middleware' => ['web']], function () {
 
                 // Sales Invoices Routes
                 Route::get('/invoices', 'Webkul\Admin\Http\Controllers\Sales\InvoiceController@index')->defaults('_config', [
-                    'view' => 'admin::sales.invoices.index'
+                    'view' => 'admin::sales.invoices.index',
                 ])->name('admin.sales.invoices.index');
 
                 Route::get('/invoices/create/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\InvoiceController@create')->defaults('_config', [
-                    'view' => 'admin::sales.invoices.create'
+                    'view' => 'admin::sales.invoices.create',
                 ])->name('admin.sales.invoices.create');
 
                 Route::post('/invoices/create/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\InvoiceController@store')->defaults('_config', [
-                    'redirect' => 'admin.sales.orders.view'
+                    'redirect' => 'admin.sales.orders.view',
                 ])->name('admin.sales.invoices.store');
 
                 Route::get('/invoices/view/{id}', 'Webkul\Admin\Http\Controllers\Sales\InvoiceController@view')->defaults('_config', [
-                    'view' => 'admin::sales.invoices.view'
+                    'view' => 'admin::sales.invoices.view',
                 ])->name('admin.sales.invoices.view');
 
                 Route::get('/invoices/print/{id}', 'Webkul\Admin\Http\Controllers\Sales\InvoiceController@print')->defaults('_config', [
-                    'view' => 'admin::sales.invoices.print'
+                    'view' => 'admin::sales.invoices.print',
                 ])->name('admin.sales.invoices.print');
 
 
                 // Sales Shipments Routes
                 Route::get('/shipments', 'Webkul\Admin\Http\Controllers\Sales\ShipmentController@index')->defaults('_config', [
-                    'view' => 'admin::sales.shipments.index'
+                    'view' => 'admin::sales.shipments.index',
                 ])->name('admin.sales.shipments.index');
 
                 Route::get('/shipments/create/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\ShipmentController@create')->defaults('_config', [
-                    'view' => 'admin::sales.shipments.create'
+                    'view' => 'admin::sales.shipments.create',
                 ])->name('admin.sales.shipments.create');
 
                 Route::post('/shipments/create/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\ShipmentController@store')->defaults('_config', [
-                    'redirect' => 'admin.sales.orders.view'
+                    'redirect' => 'admin.sales.orders.view',
                 ])->name('admin.sales.shipments.store');
 
                 Route::get('/shipments/view/{id}', 'Webkul\Admin\Http\Controllers\Sales\ShipmentController@view')->defaults('_config', [
-                    'view' => 'admin::sales.shipments.view'
+                    'view' => 'admin::sales.shipments.view',
                 ])->name('admin.sales.shipments.view');
 
 
                 // Sales Redunds Routes
                 Route::get('/refunds', 'Webkul\Admin\Http\Controllers\Sales\RefundController@index')->defaults('_config', [
-                    'view' => 'admin::sales.refunds.index'
+                    'view' => 'admin::sales.refunds.index',
                 ])->name('admin.sales.refunds.index');
 
                 Route::get('/refunds/create/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\RefundController@create')->defaults('_config', [
-                    'view' => 'admin::sales.refunds.create'
+                    'view' => 'admin::sales.refunds.create',
                 ])->name('admin.sales.refunds.create');
 
                 Route::post('/refunds/create/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\RefundController@store')->defaults('_config', [
-                    'redirect' => 'admin.sales.orders.view'
+                    'redirect' => 'admin.sales.orders.view',
                 ])->name('admin.sales.refunds.store');
 
                 Route::post('/refunds/update-qty/{order_id}', 'Webkul\Admin\Http\Controllers\Sales\RefundController@updateQty')->defaults('_config', [
-                    'redirect' => 'admin.sales.orders.view'
+                    'redirect' => 'admin.sales.orders.view',
                 ])->name('admin.sales.refunds.update_qty');
 
                 Route::get('/refunds/view/{id}', 'Webkul\Admin\Http\Controllers\Sales\RefundController@view')->defaults('_config', [
-                    'view' => 'admin::sales.refunds.view'
+                    'view' => 'admin::sales.refunds.view',
                 ])->name('admin.sales.refunds.view');
             });
 
@@ -258,23 +258,23 @@ Route::group(['middleware' => ['web']], function () {
 
                 // Catalog Product Routes
                 Route::get('/products', 'Webkul\Product\Http\Controllers\ProductController@index')->defaults('_config', [
-                    'view' => 'admin::catalog.products.index'
+                    'view' => 'admin::catalog.products.index',
                 ])->name('admin.catalog.products.index');
 
                 Route::get('/products/create', 'Webkul\Product\Http\Controllers\ProductController@create')->defaults('_config', [
-                    'view' => 'admin::catalog.products.create'
+                    'view' => 'admin::catalog.products.create',
                 ])->name('admin.catalog.products.create');
 
                 Route::post('/products/create', 'Webkul\Product\Http\Controllers\ProductController@store')->defaults('_config', [
-                    'redirect' => 'admin.catalog.products.edit'
+                    'redirect' => 'admin.catalog.products.edit',
                 ])->name('admin.catalog.products.store');
 
                 Route::get('/products/edit/{id}', 'Webkul\Product\Http\Controllers\ProductController@edit')->defaults('_config', [
-                    'view' => 'admin::catalog.products.edit'
+                    'view' => 'admin::catalog.products.edit',
                 ])->name('admin.catalog.products.edit');
 
                 Route::put('/products/edit/{id}', 'Webkul\Product\Http\Controllers\ProductController@update')->defaults('_config', [
-                    'redirect' => 'admin.catalog.products.index'
+                    'redirect' => 'admin.catalog.products.index',
                 ])->name('admin.catalog.products.update');
 
                 Route::post('/products/upload-file/{id}', 'Webkul\Product\Http\Controllers\ProductController@uploadLink')->name('admin.catalog.products.upload_link');
@@ -289,44 +289,44 @@ Route::group(['middleware' => ['web']], function () {
 
                 //product massdelete
                 Route::post('products/massdelete', 'Webkul\Product\Http\Controllers\ProductController@massDestroy')->defaults('_config', [
-                    'redirect' => 'admin.catalog.products.index'
+                    'redirect' => 'admin.catalog.products.index',
                 ])->name('admin.catalog.products.massdelete');
 
                 //product massupdate
                 Route::post('products/massupdate', 'Webkul\Product\Http\Controllers\ProductController@massUpdate')->defaults('_config', [
-                    'redirect' => 'admin.catalog.products.index'
+                    'redirect' => 'admin.catalog.products.index',
                 ])->name('admin.catalog.products.massupdate');
 
                 //product search for linked products
                 Route::get('products/search', 'Webkul\Product\Http\Controllers\ProductController@productLinkSearch')->defaults('_config', [
-                    'view' => 'admin::catalog.products.edit'
+                    'view' => 'admin::catalog.products.edit',
                 ])->name('admin.catalog.products.productlinksearch');
 
                 Route::get('products/search-simple-products', 'Webkul\Product\Http\Controllers\ProductController@searchSimpleProducts')->name('admin.catalog.products.search_simple_product');
 
                 Route::get('/products/{id}/{attribute_id}', 'Webkul\Product\Http\Controllers\ProductController@download')->defaults('_config', [
-                    'view' => 'admin.catalog.products.edit'
+                    'view' => 'admin.catalog.products.edit',
                 ])->name('admin.catalog.products.file.download');
 
                 // Catalog Category Routes
                 Route::get('/categories', 'Webkul\Category\Http\Controllers\CategoryController@index')->defaults('_config', [
-                    'view' => 'admin::catalog.categories.index'
+                    'view' => 'admin::catalog.categories.index',
                 ])->name('admin.catalog.categories.index');
 
                 Route::get('/categories/create', 'Webkul\Category\Http\Controllers\CategoryController@create')->defaults('_config', [
-                    'view' => 'admin::catalog.categories.create'
+                    'view' => 'admin::catalog.categories.create',
                 ])->name('admin.catalog.categories.create');
 
                 Route::post('/categories/create', 'Webkul\Category\Http\Controllers\CategoryController@store')->defaults('_config', [
-                    'redirect' => 'admin.catalog.categories.index'
+                    'redirect' => 'admin.catalog.categories.index',
                 ])->name('admin.catalog.categories.store');
 
                 Route::get('/categories/edit/{id}', 'Webkul\Category\Http\Controllers\CategoryController@edit')->defaults('_config', [
-                    'view' => 'admin::catalog.categories.edit'
+                    'view' => 'admin::catalog.categories.edit',
                 ])->name('admin.catalog.categories.edit');
 
                 Route::put('/categories/edit/{id}', 'Webkul\Category\Http\Controllers\CategoryController@update')->defaults('_config', [
-                    'redirect' => 'admin.catalog.categories.index'
+                    'redirect' => 'admin.catalog.categories.index',
                 ])->name('admin.catalog.categories.update');
 
                 Route::post('/categories/delete/{id}', 'Webkul\Category\Http\Controllers\CategoryController@destroy')->name('admin.catalog.categories.delete');
@@ -334,23 +334,23 @@ Route::group(['middleware' => ['web']], function () {
 
                 // Catalog Attribute Routes
                 Route::get('/attributes', 'Webkul\Attribute\Http\Controllers\AttributeController@index')->defaults('_config', [
-                    'view' => 'admin::catalog.attributes.index'
+                    'view' => 'admin::catalog.attributes.index',
                 ])->name('admin.catalog.attributes.index');
 
                 Route::get('/attributes/create', 'Webkul\Attribute\Http\Controllers\AttributeController@create')->defaults('_config', [
-                    'view' => 'admin::catalog.attributes.create'
+                    'view' => 'admin::catalog.attributes.create',
                 ])->name('admin.catalog.attributes.create');
 
                 Route::post('/attributes/create', 'Webkul\Attribute\Http\Controllers\AttributeController@store')->defaults('_config', [
-                    'redirect' => 'admin.catalog.attributes.index'
+                    'redirect' => 'admin.catalog.attributes.index',
                 ])->name('admin.catalog.attributes.store');
 
                 Route::get('/attributes/edit/{id}', 'Webkul\Attribute\Http\Controllers\AttributeController@edit')->defaults('_config', [
-                    'view' => 'admin::catalog.attributes.edit'
+                    'view' => 'admin::catalog.attributes.edit',
                 ])->name('admin.catalog.attributes.edit');
 
                 Route::put('/attributes/edit/{id}', 'Webkul\Attribute\Http\Controllers\AttributeController@update')->defaults('_config', [
-                    'redirect' => 'admin.catalog.attributes.index'
+                    'redirect' => 'admin.catalog.attributes.index',
                 ])->name('admin.catalog.attributes.update');
 
                 Route::post('/attributes/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeController@destroy')->name('admin.catalog.attributes.delete');
@@ -359,23 +359,23 @@ Route::group(['middleware' => ['web']], function () {
 
                 // Catalog Family Routes
                 Route::get('/families', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@index')->defaults('_config', [
-                    'view' => 'admin::catalog.families.index'
+                    'view' => 'admin::catalog.families.index',
                 ])->name('admin.catalog.families.index');
 
                 Route::get('/families/create', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@create')->defaults('_config', [
-                    'view' => 'admin::catalog.families.create'
+                    'view' => 'admin::catalog.families.create',
                 ])->name('admin.catalog.families.create');
 
                 Route::post('/families/create', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@store')->defaults('_config', [
-                    'redirect' => 'admin.catalog.families.index'
+                    'redirect' => 'admin.catalog.families.index',
                 ])->name('admin.catalog.families.store');
 
                 Route::get('/families/edit/{id}', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@edit')->defaults('_config', [
-                    'view' => 'admin::catalog.families.edit'
+                    'view' => 'admin::catalog.families.edit',
                 ])->name('admin.catalog.families.edit');
 
                 Route::put('/families/edit/{id}', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@update')->defaults('_config', [
-                    'redirect' => 'admin.catalog.families.index'
+                    'redirect' => 'admin.catalog.families.index',
                 ])->name('admin.catalog.families.update');
 
                 Route::post('/families/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@destroy')->name('admin.catalog.families.delete');
@@ -384,59 +384,59 @@ Route::group(['middleware' => ['web']], function () {
             // User Routes
             //datagrid for backend users
             Route::get('/users', 'Webkul\User\Http\Controllers\UserController@index')->defaults('_config', [
-                'view' => 'admin::users.users.index'
+                'view' => 'admin::users.users.index',
             ])->name('admin.users.index');
 
             //create backend user get
             Route::get('/users/create', 'Webkul\User\Http\Controllers\UserController@create')->defaults('_config', [
-                'view' => 'admin::users.users.create'
+                'view' => 'admin::users.users.create',
             ])->name('admin.users.create');
 
             //create backend user post
             Route::post('/users/create', 'Webkul\User\Http\Controllers\UserController@store')->defaults('_config', [
-                'redirect' => 'admin.users.index'
+                'redirect' => 'admin.users.index',
             ])->name('admin.users.store');
 
             //delete backend user view
             Route::get('/users/edit/{id}', 'Webkul\User\Http\Controllers\UserController@edit')->defaults('_config', [
-                'view' => 'admin::users.users.edit'
+                'view' => 'admin::users.users.edit',
             ])->name('admin.users.edit');
 
             //edit backend user submit
             Route::put('/users/edit/{id}', 'Webkul\User\Http\Controllers\UserController@update')->defaults('_config', [
-                'redirect' => 'admin.users.index'
+                'redirect' => 'admin.users.index',
             ])->name('admin.users.update');
 
             //delete backend user
             Route::post('/users/delete/{id}', 'Webkul\User\Http\Controllers\UserController@destroy')->name('admin.users.delete');
 
             Route::get('/users/confirm/{id}', 'Webkul\User\Http\Controllers\UserController@confirm')->defaults('_config', [
-                'view' => 'admin::customers.confirm-password'
+                'view' => 'admin::customers.confirm-password',
             ])->name('super.users.confirm');
 
             Route::post('/users/confirm/{id}', 'Webkul\User\Http\Controllers\UserController@destroySelf')->defaults('_config', [
-                'redirect' => 'admin.users.index'
+                'redirect' => 'admin.users.index',
             ])->name('admin.users.destroy');
 
             // User Role Routes
             Route::get('/roles', 'Webkul\User\Http\Controllers\RoleController@index')->defaults('_config', [
-                'view' => 'admin::users.roles.index'
+                'view' => 'admin::users.roles.index',
             ])->name('admin.roles.index');
 
             Route::get('/roles/create', 'Webkul\User\Http\Controllers\RoleController@create')->defaults('_config', [
-                'view' => 'admin::users.roles.create'
+                'view' => 'admin::users.roles.create',
             ])->name('admin.roles.create');
 
             Route::post('/roles/create', 'Webkul\User\Http\Controllers\RoleController@store')->defaults('_config', [
-                'redirect' => 'admin.roles.index'
+                'redirect' => 'admin.roles.index',
             ])->name('admin.roles.store');
 
             Route::get('/roles/edit/{id}', 'Webkul\User\Http\Controllers\RoleController@edit')->defaults('_config', [
-                'view' => 'admin::users.roles.edit'
+                'view' => 'admin::users.roles.edit',
             ])->name('admin.roles.edit');
 
             Route::put('/roles/edit/{id}', 'Webkul\User\Http\Controllers\RoleController@update')->defaults('_config', [
-                'redirect' => 'admin.roles.index'
+                'redirect' => 'admin.roles.index',
             ])->name('admin.roles.update');
 
             Route::post('/roles/delete/{id}', 'Webkul\User\Http\Controllers\RoleController@destroy')->name('admin.roles.delete');
@@ -444,23 +444,23 @@ Route::group(['middleware' => ['web']], function () {
 
             // Locale Routes
             Route::get('/locales', 'Webkul\Core\Http\Controllers\LocaleController@index')->defaults('_config', [
-                'view' => 'admin::settings.locales.index'
+                'view' => 'admin::settings.locales.index',
             ])->name('admin.locales.index');
 
             Route::get('/locales/create', 'Webkul\Core\Http\Controllers\LocaleController@create')->defaults('_config', [
-                'view' => 'admin::settings.locales.create'
+                'view' => 'admin::settings.locales.create',
             ])->name('admin.locales.create');
 
             Route::post('/locales/create', 'Webkul\Core\Http\Controllers\LocaleController@store')->defaults('_config', [
-                'redirect' => 'admin.locales.index'
+                'redirect' => 'admin.locales.index',
             ])->name('admin.locales.store');
 
             Route::get('/locales/edit/{id}', 'Webkul\Core\Http\Controllers\LocaleController@edit')->defaults('_config', [
-                'view' => 'admin::settings.locales.edit'
+                'view' => 'admin::settings.locales.edit',
             ])->name('admin.locales.edit');
 
             Route::put('/locales/edit/{id}', 'Webkul\Core\Http\Controllers\LocaleController@update')->defaults('_config', [
-                'redirect' => 'admin.locales.index'
+                'redirect' => 'admin.locales.index',
             ])->name('admin.locales.update');
 
             Route::post('/locales/delete/{id}', 'Webkul\Core\Http\Controllers\LocaleController@destroy')->name('admin.locales.delete');
@@ -468,23 +468,23 @@ Route::group(['middleware' => ['web']], function () {
 
             // Currency Routes
             Route::get('/currencies', 'Webkul\Core\Http\Controllers\CurrencyController@index')->defaults('_config', [
-                'view' => 'admin::settings.currencies.index'
+                'view' => 'admin::settings.currencies.index',
             ])->name('admin.currencies.index');
 
             Route::get('/currencies/create', 'Webkul\Core\Http\Controllers\CurrencyController@create')->defaults('_config', [
-                'view' => 'admin::settings.currencies.create'
+                'view' => 'admin::settings.currencies.create',
             ])->name('admin.currencies.create');
 
             Route::post('/currencies/create', 'Webkul\Core\Http\Controllers\CurrencyController@store')->defaults('_config', [
-                'redirect' => 'admin.currencies.index'
+                'redirect' => 'admin.currencies.index',
             ])->name('admin.currencies.store');
 
             Route::get('/currencies/edit/{id}', 'Webkul\Core\Http\Controllers\CurrencyController@edit')->defaults('_config', [
-                'view' => 'admin::settings.currencies.edit'
+                'view' => 'admin::settings.currencies.edit',
             ])->name('admin.currencies.edit');
 
             Route::put('/currencies/edit/{id}', 'Webkul\Core\Http\Controllers\CurrencyController@update')->defaults('_config', [
-                'redirect' => 'admin.currencies.index'
+                'redirect' => 'admin.currencies.index',
             ])->name('admin.currencies.update');
 
             Route::post('/currencies/delete/{id}', 'Webkul\Core\Http\Controllers\CurrencyController@destroy')->name('admin.currencies.delete');
@@ -494,25 +494,25 @@ Route::group(['middleware' => ['web']], function () {
 
             // Exchange Rates Routes
             Route::get('/exchange_rates', 'Webkul\Core\Http\Controllers\ExchangeRateController@index')->defaults('_config', [
-                'view' => 'admin::settings.exchange_rates.index'
+                'view' => 'admin::settings.exchange_rates.index',
             ])->name('admin.exchange_rates.index');
 
             Route::get('/exchange_rates/create', 'Webkul\Core\Http\Controllers\ExchangeRateController@create')->defaults('_config', [
-                'view' => 'admin::settings.exchange_rates.create'
+                'view' => 'admin::settings.exchange_rates.create',
             ])->name('admin.exchange_rates.create');
 
             Route::post('/exchange_rates/create', 'Webkul\Core\Http\Controllers\ExchangeRateController@store')->defaults('_config', [
-                'redirect' => 'admin.exchange_rates.index'
+                'redirect' => 'admin.exchange_rates.index',
             ])->name('admin.exchange_rates.store');
 
             Route::get('/exchange_rates/edit/{id}', 'Webkul\Core\Http\Controllers\ExchangeRateController@edit')->defaults('_config', [
-                'view' => 'admin::settings.exchange_rates.edit'
+                'view' => 'admin::settings.exchange_rates.edit',
             ])->name('admin.exchange_rates.edit');
 
             Route::get('/exchange_rates/update-rates', 'Webkul\Core\Http\Controllers\ExchangeRateController@updateRates')->name('admin.exchange_rates.update_rates');
 
             Route::put('/exchange_rates/edit/{id}', 'Webkul\Core\Http\Controllers\ExchangeRateController@update')->defaults('_config', [
-                'redirect' => 'admin.exchange_rates.index'
+                'redirect' => 'admin.exchange_rates.index',
             ])->name('admin.exchange_rates.update');
 
             Route::post('/exchange_rates/delete/{id}', 'Webkul\Core\Http\Controllers\ExchangeRateController@destroy')->name('admin.exchange_rates.delete');
@@ -520,46 +520,46 @@ Route::group(['middleware' => ['web']], function () {
 
             // Inventory Source Routes
             Route::get('/inventory_sources', 'Webkul\Inventory\Http\Controllers\InventorySourceController@index')->defaults('_config', [
-                'view' => 'admin::settings.inventory_sources.index'
+                'view' => 'admin::settings.inventory_sources.index',
             ])->name('admin.inventory_sources.index');
 
             Route::get('/inventory_sources/create', 'Webkul\Inventory\Http\Controllers\InventorySourceController@create')->defaults('_config', [
-                'view' => 'admin::settings.inventory_sources.create'
+                'view' => 'admin::settings.inventory_sources.create',
             ])->name('admin.inventory_sources.create');
 
             Route::post('/inventory_sources/create', 'Webkul\Inventory\Http\Controllers\InventorySourceController@store')->defaults('_config', [
-                'redirect' => 'admin.inventory_sources.index'
+                'redirect' => 'admin.inventory_sources.index',
             ])->name('admin.inventory_sources.store');
 
             Route::get('/inventory_sources/edit/{id}', 'Webkul\Inventory\Http\Controllers\InventorySourceController@edit')->defaults('_config', [
-                'view' => 'admin::settings.inventory_sources.edit'
+                'view' => 'admin::settings.inventory_sources.edit',
             ])->name('admin.inventory_sources.edit');
 
             Route::put('/inventory_sources/edit/{id}', 'Webkul\Inventory\Http\Controllers\InventorySourceController@update')->defaults('_config', [
-                'redirect' => 'admin.inventory_sources.index'
+                'redirect' => 'admin.inventory_sources.index',
             ])->name('admin.inventory_sources.update');
 
             Route::post('/inventory_sources/delete/{id}', 'Webkul\Inventory\Http\Controllers\InventorySourceController@destroy')->name('admin.inventory_sources.delete');
 
             // Channel Routes
             Route::get('/channels', 'Webkul\Core\Http\Controllers\ChannelController@index')->defaults('_config', [
-                'view' => 'admin::settings.channels.index'
+                'view' => 'admin::settings.channels.index',
             ])->name('admin.channels.index');
 
             Route::get('/channels/create', 'Webkul\Core\Http\Controllers\ChannelController@create')->defaults('_config', [
-                'view' => 'admin::settings.channels.create'
+                'view' => 'admin::settings.channels.create',
             ])->name('admin.channels.create');
 
             Route::post('/channels/create', 'Webkul\Core\Http\Controllers\ChannelController@store')->defaults('_config', [
-                'redirect' => 'admin.channels.index'
+                'redirect' => 'admin.channels.index',
             ])->name('admin.channels.store');
 
             Route::get('/channels/edit/{id}', 'Webkul\Core\Http\Controllers\ChannelController@edit')->defaults('_config', [
-                'view' => 'admin::settings.channels.edit'
+                'view' => 'admin::settings.channels.edit',
             ])->name('admin.channels.edit');
 
             Route::put('/channels/edit/{id}', 'Webkul\Core\Http\Controllers\ChannelController@update')->defaults('_config', [
-                'redirect' => 'admin.channels.index'
+                'redirect' => 'admin.channels.index',
             ])->name('admin.channels.update');
 
             Route::post('/channels/delete/{id}', 'Webkul\Core\Http\Controllers\ChannelController@destroy')->name('admin.channels.delete');
@@ -567,51 +567,51 @@ Route::group(['middleware' => ['web']], function () {
 
             // Admin Profile route
             Route::get('/account', 'Webkul\User\Http\Controllers\AccountController@edit')->defaults('_config', [
-                'view' => 'admin::account.edit'
+                'view' => 'admin::account.edit',
             ])->name('admin.account.edit');
 
             Route::put('/account', 'Webkul\User\Http\Controllers\AccountController@update')->name('admin.account.update');
 
 
             // Admin Store Front Settings Route
-            Route::get('/subscribers','Webkul\Core\Http\Controllers\SubscriptionController@index')->defaults('_config',[
+            Route::get('/subscribers', 'Webkul\Core\Http\Controllers\SubscriptionController@index')->defaults('_config', [
-                'view' => 'admin::customers.subscribers.index'
+                'view' => 'admin::customers.subscribers.index',
             ])->name('admin.customers.subscribers.index');
 
             //destroy a newsletter subscription item
             Route::post('subscribers/delete/{id}', 'Webkul\Core\Http\Controllers\SubscriptionController@destroy')->name('admin.customers.subscribers.delete');
 
             Route::get('subscribers/edit/{id}', 'Webkul\Core\Http\Controllers\SubscriptionController@edit')->defaults('_config', [
-                'view' => 'admin::customers.subscribers.edit'
+                'view' => 'admin::customers.subscribers.edit',
             ])->name('admin.customers.subscribers.edit');
 
             Route::put('subscribers/update/{id}', 'Webkul\Core\Http\Controllers\SubscriptionController@update')->defaults('_config', [
-                'redirect' => 'admin.customers.subscribers.index'
+                'redirect' => 'admin.customers.subscribers.index',
             ])->name('admin.customers.subscribers.update');
 
             //slider index
-            Route::get('/slider','Webkul\Core\Http\Controllers\SliderController@index')->defaults('_config',[
+            Route::get('/slider', 'Webkul\Core\Http\Controllers\SliderController@index')->defaults('_config', [
-                'view' => 'admin::settings.sliders.index'
+                'view' => 'admin::settings.sliders.index',
             ])->name('admin.sliders.index');
 
             //slider create show
-            Route::get('slider/create','Webkul\Core\Http\Controllers\SliderController@create')->defaults('_config',[
+            Route::get('slider/create', 'Webkul\Core\Http\Controllers\SliderController@create')->defaults('_config', [
-                'view' => 'admin::settings.sliders.create'
+                'view' => 'admin::settings.sliders.create',
             ])->name('admin.sliders.create');
 
             //slider create show
-            Route::post('slider/create','Webkul\Core\Http\Controllers\SliderController@store')->defaults('_config',[
+            Route::post('slider/create', 'Webkul\Core\Http\Controllers\SliderController@store')->defaults('_config', [
-                'redirect' => 'admin.sliders.index'
+                'redirect' => 'admin.sliders.index',
             ])->name('admin.sliders.store');
 
             //slider edit show
-            Route::get('slider/edit/{id}','Webkul\Core\Http\Controllers\SliderController@edit')->defaults('_config',[
+            Route::get('slider/edit/{id}', 'Webkul\Core\Http\Controllers\SliderController@edit')->defaults('_config', [
-                'view' => 'admin::settings.sliders.edit'
+                'view' => 'admin::settings.sliders.edit',
             ])->name('admin.sliders.edit');
 
             //slider edit update
-            Route::post('slider/edit/{id}','Webkul\Core\Http\Controllers\SliderController@update')->defaults('_config',[
+            Route::post('slider/edit/{id}', 'Webkul\Core\Http\Controllers\SliderController@update')->defaults('_config', [
-                'redirect' => 'admin.sliders.index'
+                'redirect' => 'admin.sliders.index',
             ])->name('admin.sliders.update');
 
             //destroy a slider item
@@ -619,25 +619,25 @@ Route::group(['middleware' => ['web']], function () {
 
             //tax routes
             Route::get('/tax-categories', 'Webkul\Tax\Http\Controllers\TaxController@index')->defaults('_config', [
-                'view' => 'admin::tax.tax-categories.index'
+                'view' => 'admin::tax.tax-categories.index',
             ])->name('admin.tax-categories.index');
 
 
             // tax category routes
             Route::get('/tax-categories/create', 'Webkul\Tax\Http\Controllers\TaxCategoryController@show')->defaults('_config', [
-                'view' => 'admin::tax.tax-categories.create'
+                'view' => 'admin::tax.tax-categories.create',
             ])->name('admin.tax-categories.show');
 
             Route::post('/tax-categories/create', 'Webkul\Tax\Http\Controllers\TaxCategoryController@create')->defaults('_config', [
-                'redirect' => 'admin.tax-categories.index'
+                'redirect' => 'admin.tax-categories.index',
             ])->name('admin.tax-categories.create');
 
             Route::get('/tax-categories/edit/{id}', 'Webkul\Tax\Http\Controllers\TaxCategoryController@edit')->defaults('_config', [
-                'view' => 'admin::tax.tax-categories.edit'
+                'view' => 'admin::tax.tax-categories.edit',
             ])->name('admin.tax-categories.edit');
 
             Route::put('/tax-categories/edit/{id}', 'Webkul\Tax\Http\Controllers\TaxCategoryController@update')->defaults('_config', [
-                'redirect' => 'admin.tax-categories.index'
+                'redirect' => 'admin.tax-categories.index',
             ])->name('admin.tax-categories.update');
 
             Route::post('/tax-categories/delete/{id}', 'Webkul\Tax\Http\Controllers\TaxCategoryController@destroy')->name('admin.tax-categories.delete');
@@ -646,29 +646,29 @@ Route::group(['middleware' => ['web']], function () {
 
             //tax rate
             Route::get('tax-rates', 'Webkul\Tax\Http\Controllers\TaxRateController@index')->defaults('_config', [
-                'view' => 'admin::tax.tax-rates.index'
+                'view' => 'admin::tax.tax-rates.index',
             ])->name('admin.tax-rates.index');
 
             Route::get('tax-rates/create', 'Webkul\Tax\Http\Controllers\TaxRateController@show')->defaults('_config', [
-                'view' => 'admin::tax.tax-rates.create'
+                'view' => 'admin::tax.tax-rates.create',
             ])->name('admin.tax-rates.show');
 
             Route::post('tax-rates/create', 'Webkul\Tax\Http\Controllers\TaxRateController@create')->defaults('_config', [
-                'redirect' => 'admin.tax-rates.index'
+                'redirect' => 'admin.tax-rates.index',
             ])->name('admin.tax-rates.create');
 
             Route::get('tax-rates/edit/{id}', 'Webkul\Tax\Http\Controllers\TaxRateController@edit')->defaults('_config', [
-                'view' => 'admin::tax.tax-rates.edit'
+                'view' => 'admin::tax.tax-rates.edit',
             ])->name('admin.tax-rates.store');
 
             Route::put('tax-rates/update/{id}', 'Webkul\Tax\Http\Controllers\TaxRateController@update')->defaults('_config', [
-                'redirect' => 'admin.tax-rates.index'
+                'redirect' => 'admin.tax-rates.index',
             ])->name('admin.tax-rates.update');
 
             Route::post('/tax-rates/delete/{id}', 'Webkul\Tax\Http\Controllers\TaxRateController@destroy')->name('admin.tax-rates.delete');
 
             Route::post('/tax-rates/import', 'Webkul\Tax\Http\Controllers\TaxRateController@import')->defaults('_config', [
-                'redirect' => 'admin.tax-rates.index'
+                'redirect' => 'admin.tax-rates.index',
             ])->name('admin.tax-rates.import');
             //tax rate ends
 
@@ -677,23 +677,27 @@ Route::group(['middleware' => ['web']], function () {
 
             Route::prefix('promotions')->group(function () {
                 Route::get('cart-rules', 'Webkul\CartRule\Http\Controllers\CartRuleController@index')->defaults('_config', [
-                    'view' => 'admin::promotions.cart-rules.index'
+                    'view' => 'admin::promotions.cart-rules.index',
                 ])->name('admin.cart-rules.index');
 
                 Route::get('cart-rules/create', 'Webkul\CartRule\Http\Controllers\CartRuleController@create')->defaults('_config', [
-                    'view' => 'admin::promotions.cart-rules.create'
+                    'view' => 'admin::promotions.cart-rules.create',
                 ])->name('admin.cart-rules.create');
 
                 Route::post('cart-rules/create', 'Webkul\CartRule\Http\Controllers\CartRuleController@store')->defaults('_config', [
-                    'redirect' => 'admin.cart-rules.index'
+                    'redirect' => 'admin.cart-rules.index',
                 ])->name('admin.cart-rules.store');
 
+                Route::get('cart-rules/copy/{id}', 'Webkul\CartRule\Http\Controllers\CartRuleController@copy')->defaults('_config', [
+                    'view' => 'admin::promotions.cart-rules.edit',
+                ])->name('admin.cart-rules.copy');
+
                 Route::get('cart-rules/edit/{id}', 'Webkul\CartRule\Http\Controllers\CartRuleController@edit')->defaults('_config', [
-                    'view' => 'admin::promotions.cart-rules.edit'
+                    'view' => 'admin::promotions.cart-rules.edit',
                 ])->name('admin.cart-rules.edit');
 
                 Route::post('cart-rules/edit/{id}', 'Webkul\CartRule\Http\Controllers\CartRuleController@update')->defaults('_config', [
-                    'redirect' => 'admin.cart-rules.index'
+                    'redirect' => 'admin.cart-rules.index',
                 ])->name('admin.cart-rules.update');
 
                 Route::post('cart-rules/delete/{id}', 'Webkul\CartRule\Http\Controllers\CartRuleController@destroy')->name('admin.cart-rules.delete');
@@ -705,23 +709,23 @@ Route::group(['middleware' => ['web']], function () {
 
                 //Catalog rules
                 Route::get('catalog-rules', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@index')->defaults('_config', [
-                    'view' => 'admin::promotions.catalog-rules.index'
+                    'view' => 'admin::promotions.catalog-rules.index',
                 ])->name('admin.catalog-rules.index');
 
                 Route::get('catalog-rules/create', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@create')->defaults('_config', [
-                    'view' => 'admin::promotions.catalog-rules.create'
+                    'view' => 'admin::promotions.catalog-rules.create',
                 ])->name('admin.catalog-rules.create');
 
                 Route::post('catalog-rules/create', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@store')->defaults('_config', [
-                    'redirect' => 'admin.catalog-rules.index'
+                    'redirect' => 'admin.catalog-rules.index',
                 ])->name('admin.catalog-rules.store');
 
                 Route::get('catalog-rules/edit/{id}', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@edit')->defaults('_config', [
-                    'view' => 'admin::promotions.catalog-rules.edit'
+                    'view' => 'admin::promotions.catalog-rules.edit',
                 ])->name('admin.catalog-rules.edit');
 
                 Route::post('catalog-rules/edit/{id}', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@update')->defaults('_config', [
-                    'redirect' => 'admin.catalog-rules.index'
+                    'redirect' => 'admin.catalog-rules.index',
                 ])->name('admin.catalog-rules.update');
 
                 Route::post('catalog-rules/delete/{id}', 'Webkul\CatalogRule\Http\Controllers\CatalogRuleController@destroy')->name('admin.catalog-rules.delete');
@@ -729,32 +733,32 @@ Route::group(['middleware' => ['web']], function () {
 
             Route::prefix('cms')->group(function () {
                 Route::get('/', 'Webkul\CMS\Http\Controllers\Admin\PageController@index')->defaults('_config', [
-                    'view' => 'admin::cms.index'
+                    'view' => 'admin::cms.index',
                 ])->name('admin.cms.index');
 
 
                 Route::get('create', 'Webkul\CMS\Http\Controllers\Admin\PageController@create')->defaults('_config', [
-                    'view' => 'admin::cms.create'
+                    'view' => 'admin::cms.create',
                 ])->name('admin.cms.create');
 
                 Route::post('create', 'Webkul\CMS\Http\Controllers\Admin\PageController@store')->defaults('_config', [
-                    'redirect' => 'admin.cms.index'
+                    'redirect' => 'admin.cms.index',
                 ])->name('admin.cms.store');
 
                 Route::get('edit/{id}', 'Webkul\CMS\Http\Controllers\Admin\PageController@edit')->defaults('_config', [
-                    'view' => 'admin::cms.edit'
+                    'view' => 'admin::cms.edit',
                 ])->name('admin.cms.edit');
 
                 Route::post('edit/{id}', 'Webkul\CMS\Http\Controllers\Admin\PageController@update')->defaults('_config', [
-                    'redirect' => 'admin.cms.index'
+                    'redirect' => 'admin.cms.index',
                 ])->name('admin.cms.update');
 
                 Route::post('/delete/{id}', 'Webkul\CMS\Http\Controllers\Admin\PageController@delete')->defaults('_config', [
-                    'redirect' => 'admin.cms.index'
+                    'redirect' => 'admin.cms.index',
                 ])->name('admin.cms.delete');
 
                 Route::post('/massdelete', 'Webkul\CMS\Http\Controllers\Admin\PageController@massDelete')->defaults('_config', [
-                    'redirect' => 'admin.cms.index'
+                    'redirect' => 'admin.cms.index',
                 ])->name('admin.cms.mass-delete');
 
                 // Route::post('/delete/{id}', 'Webkul\CMS\Http\Controllers\Admin\PageController@delete')->defaults('_config', [

packages/Webkul/Admin/src/Resources/lang/de/app.php

@@ -152,6 +152,7 @@ return array (
             'direction' => 'Richtung',
             'fullname' => 'Vollständiger Name',
             'type' => 'Typ',
+            'copy' => 'Kopieren',
             'required' => 'Erforderlich',
             'unique' => 'Einzigartig',
             'per-locale' => 'Sprach-basierend',

packages/Webkul/Admin/src/Resources/lang/en/app.php

@@ -151,6 +151,7 @@ return [
         'code' => 'Code',
         'admin-name' => 'Name',
         'name' => 'Name',
+        'copy' => 'Copy',
         'direction' => 'Direction',
         'fullname' => 'Full Name',
         'type' => 'Type',

packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php

@@ -1,3 +1,8 @@
+<?php
+/** @var array $selectedOptionIds */
+/** @var \Webkul\CartRule\Models\CartRule $cartRule */
+?>
+
 @extends('admin::layouts.content')
 
 @section('page_title')

packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php

@@ -130,6 +130,7 @@
                         <tbody>
                             <tr>
                                 <td>
+                                    <p>{{ $invoice->order->billing_address->company_name ?? '' }}</p>
                                     <p>{{ $invoice->order->billing_address->name }}</p>
                                     <p>{{ $invoice->order->billing_address->address1 }}</p>
                                     <p>{{ $invoice->order->billing_address->city }}</p>
@@ -140,6 +141,7 @@
 
                                 @if ($invoice->order->shipping_address)
                                     <td>
+                                        <p>{{ $invoice->order->shipping_address->company_name ?? '' }}</p>
                                         <p>{{ $invoice->order->shipping_address->name }}</p>
                                         <p>{{ $invoice->order->shipping_address->address1 }}</p>
                                         <p>{{ $invoice->order->shipping_address->city }}</p>

packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php

@@ -2,6 +2,7 @@
 
 namespace Webkul\CartRule\Http\Controllers;
 
+use Illuminate\View\View;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Event;
 use Webkul\CartRule\Repositories\CartRuleRepository;
@@ -11,21 +12,21 @@ class CartRuleController extends Controller
 {
     /**
      * Initialize _config, a default request parameter with route
-     * 
+     *
      * @param array
      */
     protected $_config;
 
     /**
      * To hold Cart repository instance
-     * 
+     *
      * @var \Webkul\CartRule\Repositories\CartRuleRepository
      */
     protected $cartRuleRepository;
 
     /**
      * To hold CartRuleCouponRepository repository instance
-     * 
+     *
      * @var \Webkul\CartRule\Repositories\CartRuleCouponRepository
      */
     protected $cartRuleCouponRepository;
@@ -33,8 +34,8 @@ class CartRuleController extends Controller
     /**
      * Create a new controller instance.
      *
-     * @param  \Webkul\CartRule\Repositories\CartRuleRepository $cartRuleRepository
+     * @param \Webkul\CartRule\Repositories\CartRuleRepository       $cartRuleRepository
-     * @param  \Webkul\CartRule\Repositories\CartRuleCouponRepository  $cartRuleCouponRepository
+     * @param \Webkul\CartRule\Repositories\CartRuleCouponRepository $cartRuleCouponRepository
      *
      * @return void
      */
@@ -63,6 +64,7 @@ class CartRuleController extends Controller
     /**
      * Show the form for creating a new resource.
      *
+     *
      * @return \Illuminate\Http\Response
      */
     public function create()
@@ -70,6 +72,28 @@ class CartRuleController extends Controller
         return view($this->_config['view']);
     }
 
+    /**
+     * Copy a given Cart Rule id. Always make the copy is inactive so the
+     * user is able to configure it before setting it live.
+     */
+    public function copy(int $cartRuleId): View
+    {
+        $originalCartRule = $this->cartRuleRepository
+            ->findOrFail($cartRuleId)
+            ->load('channels')
+            ->load('customer_groups');
+
+        $copiedCartRule = $originalCartRule
+            ->replicate()
+            ->fill(['status' => 0]);
+
+        $copiedCartRule->save();
+
+        return view($this->_config['view'], [
+            'cartRule' => $copiedCartRule,
+        ]);
+    }
+
     /**
      * Store a newly created resource in storage.
      *
@@ -106,7 +130,8 @@ class CartRuleController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit($id)
@@ -119,8 +144,9 @@ class CartRuleController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
-     * @param  int                       $id
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Request $request, $id)
@@ -154,7 +180,8 @@ class CartRuleController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy($id)
@@ -190,7 +217,7 @@ class CartRuleController extends Controller
             '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);
         }

packages/Webkul/Category/src/Repositories/CategoryRepository.php

@@ -108,7 +108,7 @@ class CategoryRepository extends Repository
         }
 
         return $categories[$id] = $id
-               ? $this->model::orderBy('position', 'ASC')->where('status', 1)->descendantsOf($id)->toTree()
+               ? $this->model::orderBy('position', 'ASC')->where('status', 1)->descendantsAndSelf($id)->toTree($id)
                : $this->model::orderBy('position', 'ASC')->where('status', 1)->get()->toTree();
     }
 

packages/Webkul/Shop/src/Resources/lang/ar/app.php

@@ -396,6 +396,7 @@ return [
         'new' => 'جديد',
         'empty' => 'لا توجد منتجات متاحة في هذه الفئة',
         'add-to-cart' => 'أضف إلى العربة',
+        'book-now' => 'احجز الآن',
         'buy-now' => 'اشتر الآن',
         'whoops' => 'خطأ!',
         'quantity' => 'الكمية',
@@ -477,6 +478,7 @@ return [
             'shipping' => 'الشحن',
             'payment' => 'الدفع',
             'complete' => 'اكتمل',
+            'review' => 'مراجعة',
             'billing-address' => 'عنوان الفواتير',
             'sign-in' => 'تسجيل الدخول',
             'first-name' => 'الاسم الأول',

packages/Webkul/Shop/src/Resources/lang/de/app.php

@@ -393,6 +393,7 @@ return [
         'new' => 'Neu',
         'empty' => 'Keine Produkte in dieser Kategorie verfügbar',
         'add-to-cart' => 'In Warenkorb',
+        'book-now' => 'buchen Sie jetzt',
         'buy-now' => 'Jetzt kaufen',
         'whoops' => 'Hoppla!',
         'quantity' => 'Menge',
@@ -471,6 +472,7 @@ return [
             'shipping' => 'Versand',
             'payment' => 'Zahlung',
             'complete' => 'Komplett',
+            'review' => 'Rezension',
             'billing-address' => 'Rechnungsadresse',
             'sign-in' => 'Anmelden',
             'company-name' => 'Name der Firma',

packages/Webkul/Shop/src/Resources/lang/en/app.php

@@ -396,6 +396,7 @@ return [
         'new' => 'New',
         'empty' => 'No products available in this category',
         'add-to-cart' => 'Add To Cart',
+        'book-now' => 'Book Now',
         'buy-now' => 'Buy Now',
         'whoops' => 'Whoops!',
         'quantity' => 'Quantity',
@@ -477,6 +478,7 @@ return [
             'shipping' => 'Shipping',
             'payment' => 'Payment',
             'complete' => 'Complete',
+            'review' => 'Review',
             'billing-address' => 'Billing Address',
             'sign-in' => 'Sign In',
             'company-name' => 'Company Name',

packages/Webkul/Shop/src/Resources/lang/es/app.php

@@ -377,6 +377,7 @@ return [
         'new' => 'Nuevo',
         'empty' => 'No hay prodcutos disponibles en esta categoría',
         'add-to-cart' => 'Añadir a la cesta',
+        'book-now' => 'reservar ahora',
         'buy-now' => 'Comprar ahora',
         'whoops' => 'Ups!',
         'quantity' => 'Cantidad',
@@ -443,6 +444,7 @@ return [
             'shipping' => 'Envío',
             'payment' => 'Pago',
             'complete' => 'Completado',
+            'review' => 'revisión',
             'billing-address' => 'Dirección de facturación',
             'sign-in' => 'Entrar',
             'first-name' => 'Nombre',

packages/Webkul/Shop/src/Resources/lang/fa/app.php

@@ -395,6 +395,7 @@ return [
         'new' => 'جدید',
         'empty' => 'هیچ کالایی در این گروه موجود نیست',
         'add-to-cart' => 'افزودن به سبد خرید',
+        'book-now' => 'اکنون ثبت کن',
         'buy-now' => 'هم اکنون خریداری کنید',
         'whoops' => 'وای!',
         'quantity' => 'مقدار',
@@ -476,6 +477,7 @@ return [
             'shipping' => 'حمل دریایی',
             'payment' => 'پرداخت',
             'complete' => 'تکمیل',
+            'review' => 'مرور',
             'billing-address' => 'آدرس قبض',
             'sign-in' => 'ورود',
             'company-name' => 'نام شرکت',

packages/Webkul/Shop/src/Resources/lang/it/app.php

@@ -395,6 +395,7 @@ return [
         'new' => 'Nuovo',
         'empty' => 'Nessun prodotto disponibile in questa categoria',
         'add-to-cart' => 'Aggiungi al Carrello',
+        'book-now' => 'Prenota ora',
         'buy-now' => 'Compra ora',
         'whoops' => 'Whoops!',
         'quantity' => 'Quantità',
@@ -476,6 +477,7 @@ return [
             'shipping' => 'Spedizione',
             'payment' => 'Pagamento',
             'complete' => 'Completo',
+            'review' => 'Revisione',
             'billing-address' => 'Indirizzo Fatturazione',
             'sign-in' => 'Login',
             'company-name' => 'Azienda',

packages/Webkul/Shop/src/Resources/lang/ja/app.php

@@ -373,6 +373,7 @@ return [
         'new' => 'new',
         'empty' => 'このカテゴリーにアイテムがありません。',
         'add-to-cart' => 'カートに追加する',
+        'book-now' => '今予約する',
         'buy-now' => '今すぐ購入',
         'whoops' => 'すみません！',
         'quantity' => '数量',
@@ -435,6 +436,7 @@ return [
             'shipping' => '発送',
             'payment' => '支払い',
             'complete' => '完了',
+            'review' => 'レビュー',
             'billing-address' => '領収書宛先',
             'sign-in' => 'ログイン',
             'first-name' => '名',

packages/Webkul/Shop/src/Resources/lang/nl/app.php

@@ -400,6 +400,7 @@ return [
         'new' => 'Nieuw',
         'empty' => 'Geen producten beschikbaar in deze categorie',
         'add-to-cart' => 'Voeg toe aan winkelkar',
+        'book-now' => 'boek nu',
         'buy-now' => 'Koop nu',
         'whoops' => 'Whoops!',
         'quantity' => 'Aantal',
@@ -481,6 +482,7 @@ return [
             'shipping' => 'Verzending',
             'payment' => 'Betaling',
             'complete' => 'Complete',
+            'review' => 'Beoordeling',
             'billing-address' => 'Factuur adres',
             'sign-in' => 'Inloggen',
             'company-name' => 'Bedrijfsnaam',

packages/Webkul/Shop/src/Resources/lang/pl/app.php

@@ -388,12 +388,13 @@ return [
         'related-product-title' => 'Powiązane produkty ',
         'cross-sell-title' => 'Więcej opcji',
         'reviews-title' => 'Oceny i recenzje',
-        'write-review-btn' => ''Napisz recenzję',
+        'write-review-btn' => 'Napisz recenzję',
         'choose-option' => 'Wybierz opcję',
         'sale' => 'Wyprzedaż',
         'new' => 'Nowość',
         'empty' => 'Brak produktów w tej kategorii',
         'add-to-cart' => 'Dodaj do koszyka',
+        'book-now' => 'Rezerwuj teraz',
         'buy-now' => 'Kup teraz',
         'whoops' => 'Whoops!',
         'quantity' => 'Ilość',
@@ -474,6 +475,7 @@ return [
             'shipping' => 'Wysyłka',
             'payment' => 'Płatność',
             'complete' => 'Kompletna',
+            'review' => 'Przejrzeć',
             'billing-address' => 'Adres rozliczeniowy',
             'sign-in' => 'Zaloguj się',
             'company-name' => 'Nazwa firmy',

packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php

@@ -388,6 +388,7 @@ return [
         'new' => 'Novo',
         'empty' => 'Nenhum produto disponível nesta categoria',
         'add-to-cart' => 'Adicionar ao Carrinho',
+        'book-now' => 'Agende agora',
         'buy-now' => 'Comprar Agora',
         'whoops' => 'Oppss!',
         'quantity' => 'Quantidade',
@@ -466,6 +467,7 @@ return [
             'shipping' => 'Entrega',
             'payment' => 'Pagamento',
             'complete' => 'Completo',
+            'review' => 'Reveja',
             'billing-address' => 'Endereço de Cobrança',
             'sign-in' => 'Entrar',
             'first-name' => 'Nome',

packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php

@@ -40,7 +40,7 @@
 
                     <li :class="[current_step == 4 ? 'active' : '']">
                         <div class="decorator review"></div>
-                        <span>{{ __('shop::app.checkout.onepage.complete') }}</span>
+                        <span>{{ __('shop::app.checkout.onepage.review') }}</span>
                     </li>
                 </ul>
 

packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php

@@ -17,7 +17,7 @@
                     </label>
 
                     <ul class="address-card-list" style="float: right; width: 85%;">
-                        <li class="mb-5" v-if="addresses.company-name != ''">
+                        <li class="mb-5" v-if="addresses.company_name != ''">
                             @{{ addresses.company_name }}
                         </li>
 
@@ -273,7 +273,7 @@
                         </label>
 
                         <ul class="address-card-list" style="float: right; width: 85%;">
-                            <li class="mb-5" v-if="addresses.company-name != ''">
+                            <li class="mb-5" v-if="addresses.company_name != ''">
                                 @{{ addresses.company_name }}
                             </li>
 

packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php

@@ -96,7 +96,7 @@
                         <img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}"/>
                     </div>
                 @endif
-                
+
                 <div class="address">
                     <p>
                       <b> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }} </b>
@@ -135,6 +135,7 @@
                         <tbody>
                             <tr>
                                 <td>
+                                    <p>{{ $invoice->order->billing_address->company_name ?? '' }}</p>
                                     <p>{{ $invoice->order->billing_address->name }}</p>
                                     <p>{{ $invoice->order->billing_address->address1 }}</p>
                                     <p>{{ $invoice->order->billing_address->city }}</p>
@@ -148,6 +149,7 @@
 
                                 @if ($invoice->order->shipping_address)
                                     <td>
+                                        <p>{{ $invoice->order->shipping_address->company_name ?? '' }}</p>
                                         <p>{{ $invoice->order->shipping_address->name }}</p>
                                         <p>{{ $invoice->order->shipping_address->address1 }}</p>
                                         <p>{{ $invoice->order->shipping_address->city }}</p>

packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php

@@ -38,6 +38,10 @@
                     {{ __('shop::app.mail.order.shipping-address') }}
                 </div>
 
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->shipping_address->name }}
                 </div>
@@ -70,6 +74,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>

packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php

@@ -39,6 +39,10 @@
                     {{ __('shop::app.mail.order.shipping-address') }}
                 </div>
 
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->shipping_address->name }}
                 </div>
@@ -81,6 +85,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>

packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php

@@ -38,6 +38,10 @@
                         {{ __('shop::app.mail.order.shipping-address') }}
                     </div>
 
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
                     <div>
                         {{ $order->shipping_address->name }}
                     </div>
@@ -71,6 +75,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>

packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php

@@ -35,6 +35,10 @@
                         {{ __('shop::app.mail.order.shipping-address') }}
                     </div>
 
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
                     <div>
                         {{ $order->shipping_address->name }}
                     </div>
@@ -68,6 +72,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>

packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php

@@ -37,6 +37,10 @@
                         {{ __('shop::app.mail.order.shipping-address') }}
                     </div>
 
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
                     <div>
                         {{ $order->shipping_address->name }}
                     </div>
@@ -70,6 +74,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>

packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php

@@ -36,6 +36,10 @@
                     {{ __('shop::app.mail.order.shipping-address') }}
                 </div>
 
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->shipping_address->name }}
                 </div>
@@ -78,6 +82,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>

packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php

@@ -34,6 +34,10 @@
                     {{ __('shop::app.mail.order.cancel.shipping-address') }}
                 </div>
 
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->shipping_address->name }}
                 </div>
@@ -66,6 +70,10 @@
                     {{ __('shop::app.mail.order.cancel.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>

packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php

@@ -3,7 +3,7 @@
         @csrf
         <input type="hidden" name="product_id" value="{{ $product->product_id }}">
         <input type="hidden" name="quantity" value="1">
-        <button class="btn btn-lg btn-primary addtocart" {{ $product->isSaleable() ? '' : 'disabled' }}>{{ __('shop::app.products.add-to-cart') }}</button>
+        <button class="btn btn-lg btn-primary addtocart" {{ $product->isSaleable() ? '' : 'disabled' }}>{{ ($product->type == 'booking') ?  __('shop::app.products.book-now') :  __('shop::app.products.add-to-cart') }}</button>
     </form>
 
     @include('shop::products.wishlist')

packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php

@@ -1,7 +1,7 @@
 {!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!}
 
 <button type="submit" class="btn btn-lg btn-primary addtocart" {{ ! $product->isSaleable() ? 'disabled' : '' }}>
-    {{ __('shop::app.products.add-to-cart') }}
+    {{ ($product->type == 'booking') ?  __('shop::app.products.book-now') :  __('shop::app.products.add-to-cart') }}
 </button>
 
 {!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!}

packages/Webkul/Ui/src/Resources/assets/js/components/datetime.vue

@@ -7,37 +7,38 @@
 </template>
 
 <script>
-import Flatpickr from "flatpickr";
+    import Flatpickr from "flatpickr";
 
-export default {
+    export default {
-	props: {
+        props: {
-		name: String,
+            name: String,
-		value: String
+            value: String
-	},
+        },
 
-	data() {
+        data() {
-		return {
+            return {
-			datepicker: null
+                datepicker: null
-		};
+            };
-	},
+        },
 
-	created() {
+        created() {
 
-	},
+        },
 
-	mounted() {
+        mounted() {
-		var this_this = this;
+            var this_this = this;
 
-		var element = this.$el.getElementsByTagName("input")[0];
+            var element = this.$el.getElementsByTagName("input")[0];
-		this.datepicker = new Flatpickr(element, {
+            this.datepicker = new Flatpickr(element, {
-			allowInput: true,
+                allowInput: true,
-			altFormat: "Y-m-d H:i:S",
+                altFormat: "Y-m-d H:i:S",
-			dateFormat: "Y-m-d H:i:S",
+                dateFormat: "Y-m-d H:i:S",
-			enableTime: true,
+                enableTime: true,
-			onChange: function(selectedDates, dateStr, instance) {
+                time_24hr: true,
-				this_this.$emit('onChange', dateStr)
+                onChange: function (selectedDates, dateStr, instance) {
-			},
+                    this_this.$emit('onChange', dateStr)
-		});
+                },
-  	}
+            });
-};
+        }
+    };
 </script>

packages/Webkul/Velocity/publishable/assets/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/velocity.js": "/js/velocity.js?id=262ea9133f92cd60ee3e",
+    "/js/velocity.js": "/js/velocity.js?id=38c9bb2e6b07d87d123f",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
-    "/css/velocity.css": "/css/velocity.css?id=2b9d7cbacb1f71e9f110"
+    "/css/velocity.css": "/css/velocity.css?id=fb18207e4410872a861a"
 }

packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss

@@ -112,6 +112,8 @@
                 }
 
                 .right-vc-header {
+                    position: relative;
+                    z-index: 2;
                     display: table;
                     text-align: right;
                     height: $header-height;

packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php

@@ -19,6 +19,9 @@
 
                         <div class="card-content">
                             <ul type="none">
+                                <li>
+                                    {{ $billingAddress->company_name ?? '' }}
+                                </li><br />
                                 <li>
                                     {{ $billingAddress->name }}
                                 </li><br />
@@ -45,6 +48,9 @@
 
                         <div class="card-content">
                             <ul>
+                                <li>
+                                    {{ $shippingAddress->company_name ?? '' }}
+                                </li><br/>
                                 <li>
                                     {{ $shippingAddress->name }}
                                 </li><br/>

packages/Webkul/Velocity/src/Resources/views/shop/products/add-to-cart.blade.php

@@ -33,7 +33,7 @@
                         <i class="material-icons text-down-3">shopping_cart</i>
                     @endif
 
-                        {{ __('shop::app.products.add-to-cart') }}
+                    {{ ($product->type == 'booking') ?  __('shop::app.products.book-now') :  __('shop::app.products.add-to-cart') }}
                 </button>
             @elseif(isset($addToCartForm) && !$addToCartForm)
                 <form
@@ -54,7 +54,7 @@
                         @endif
 
                         <span class="fs14 fw6 text-uppercase text-up-4">
-                            {{ $btnText ?? __('shop::app.products.add-to-cart') }}
+                            {{ ($product->type == 'booking') ?  __('shop::app.products.book-now') : $btnText ?? __('shop::app.products.add-to-cart') }}
                         </span>
                     </button>
                 </form>
@@ -69,7 +69,7 @@
                     add-class-to-btn="{{ $addToCartBtnClass ?? '' }}"
                     is-enable={{ ! $product->isSaleable() ? 'false' : 'true' }}
                     show-cart-icon={{ !(isset($showCartIcon) && !$showCartIcon) }}
-                    btn-text="{{ $btnText ?? __('shop::app.products.add-to-cart') }}">
+                    btn-text="{{ ($product->type == 'booking') ?  __('shop::app.products.book-now') : $btnText ?? __('shop::app.products.add-to-cart') }}">
                 </add-to-cart>
             @endif
         </div>

resources/lang/nl/auth.php

@@ -0,0 +1,18 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed'   => 'Deze combinatie van e-mailadres en wachtwoord is niet geldig.',
+    'throttle' => 'Te veel mislukte loginpogingen. Probeer het over :seconds seconden nogmaals.',
+];

resources/lang/nl/pagination.php

@@ -0,0 +1,18 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Vorige',
+    'next'     => 'Volgende &raquo;',
+];

resources/lang/nl/passwords.php

@@ -0,0 +1,21 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'password' => 'Wachtwoord moet minimaal zes tekens lang zijn en de wachtwoorden moeten overeenkomen.',
+    'reset'    => 'Het wachtwoord van uw account is gewijzigd.',
+    'sent'     => 'We hebben een e-mail verstuurd met instructies om een nieuw wachtwoord in te stellen.',
+    'token'    => 'Dit wachtwoordhersteltoken is ongeldig of verlopen.',
+    'user'     => 'Geen gebruiker bekend met het e-mailadres.',
+];

resources/lang/nl/validation.php

@@ -0,0 +1,179 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    'accepted'             => ':attribute moet geaccepteerd zijn.',
+    'active_url'           => ':attribute is geen geldige URL.',
+    'after'                => ':attribute moet een datum na :date zijn.',
+    'after_or_equal'       => ':attribute moet een datum na of gelijk aan :date zijn.',
+    'alpha'                => ':attribute mag alleen letters bevatten.',
+    'alpha_dash'           => ':attribute mag alleen letters, nummers, underscores (_) en streepjes (-) bevatten.',
+    'alpha_num'            => ':attribute mag alleen letters en nummers bevatten.',
+    'array'                => ':attribute moet geselecteerde elementen bevatten.',
+    'before'               => ':attribute moet een datum voor :date zijn.',
+    'before_or_equal'      => ':attribute moet een datum voor of gelijk aan :date zijn.',
+    'between'              => [
+        'numeric' => ':attribute moet tussen :min en :max zijn.',
+        'file'    => ':attribute moet tussen :min en :max kilobytes zijn.',
+        'string'  => ':attribute moet tussen :min en :max karakters zijn.',
+        'array'   => ':attribute moet tussen :min en :max items bevatten.',
+    ],
+    'boolean'              => ':attribute moet ja of nee zijn.',
+    'confirmed'            => ':attribute bevestiging komt niet overeen.',
+    'date'                 => ':attribute moet een datum bevatten.',
+    'date_format'          => ':attribute moet een geldig datum formaat bevatten.',
+    'different'            => ':attribute en :other moeten verschillend zijn.',
+    'digits'               => ':attribute moet bestaan uit :digits cijfers.',
+    'digits_between'       => ':attribute moet bestaan uit minimaal :min en maximaal :max cijfers.',
+    'dimensions'           => ':attribute heeft geen geldige afmetingen voor afbeeldingen.',
+    'distinct'             => ':attribute heeft een dubbele waarde.',
+    'email'                => ':attribute is geen geldig e-mailadres.',
+    'exists'               => ':attribute bestaat niet.',
+    'file'                 => ':attribute moet een bestand zijn.',
+    'filled'               => ':attribute is verplicht.',
+    'gt'                   => [
+        'numeric' => 'De :attribute moet groter zijn dan :value.',
+        'file'    => 'De :attribute moet groter zijn dan :value kilobytes.',
+        'string'  => 'De :attribute moet meer dan :value tekens bevatten.',
+        'array'   => 'De :attribute moet meer dan :value waardes bevatten.',
+    ],
+    'gte'                  => [
+        'numeric' => 'De :attribute moet groter of gelijk zijn aan :value.',
+        'file'    => 'De :attribute moet groter of gelijk zijn aan :value kilobytes.',
+        'string'  => 'De :attribute moet minimaal :value tekens bevatten.',
+        'array'   => 'De :attribute moet :value waardes of meer bevatten.',
+    ],
+    'image'                => ':attribute moet een afbeelding zijn.',
+    'in'                   => ':attribute is ongeldig.',
+    'in_array'             => ':attribute bestaat niet in :other.',
+    'integer'              => ':attribute moet een getal zijn.',
+    'ip'                   => ':attribute moet een geldig IP-adres zijn.',
+    'ipv4'                 => ':attribute moet een geldig IPv4-adres zijn.',
+    'ipv6'                 => ':attribute moet een geldig IPv6-adres zijn.',
+    'json'                 => ':attribute moet een geldige JSON-string zijn.',
+    'lt'                   => [
+        'numeric' => 'De :attribute moet kleiner zijn dan :value.',
+        'file'    => 'De :attribute moet kleiner zijn dan :value kilobytes.',
+        'string'  => 'De :attribute moet minder dan :value tekens bevatten.',
+        'array'   => 'De :attribute moet minder dan :value waardes bevatten.',
+    ],
+    'lte'                  => [
+        'numeric' => 'De :attribute moet kleiner of gelijk zijn aan :value.',
+        'file'    => 'De :attribute moet kleiner of gelijk zijn aan :value kilobytes.',
+        'string'  => 'De :attribute moet maximaal :value tekens bevatten.',
+        'array'   => 'De :attribute moet :value waardes of minder bevatten.',
+    ],
+    'max'                  => [
+        'numeric' => ':attribute mag niet hoger dan :max zijn.',
+        'file'    => ':attribute mag niet meer dan :max kilobytes zijn.',
+        'string'  => ':attribute mag niet uit meer dan :max tekens bestaan.',
+        'array'   => ':attribute mag niet meer dan :max items bevatten.',
+    ],
+    'mimes'                => ':attribute moet een bestand zijn van het bestandstype :values.',
+    'mimetypes'            => ':attribute moet een bestand zijn van het bestandstype :values.',
+    'min'                  => [
+        'numeric' => ':attribute moet minimaal :min zijn.',
+        'file'    => ':attribute moet minimaal :min kilobytes zijn.',
+        'string'  => ':attribute moet minimaal :min tekens zijn.',
+        'array'   => ':attribute moet minimaal :min items bevatten.',
+    ],
+    'not_in'               => 'Het formaat van :attribute is ongeldig.',
+    'not_regex'            => 'De :attribute formaat is ongeldig.',
+    'numeric'              => ':attribute moet een nummer zijn.',
+    'present'              => ':attribute moet bestaan.',
+    'regex'                => ':attribute formaat is ongeldig.',
+    'required'             => ':attribute is verplicht.',
+    'required_if'          => ':attribute is verplicht indien :other gelijk is aan :value.',
+    'required_unless'      => ':attribute is verplicht tenzij :other gelijk is aan :values.',
+    'required_with'        => ':attribute is verplicht i.c.m. :values',
+    'required_with_all'    => ':attribute is verplicht i.c.m. :values',
+    'required_without'     => ':attribute is verplicht als :values niet ingevuld is.',
+    'required_without_all' => ':attribute is verplicht als :values niet ingevuld zijn.',
+    'same'                 => ':attribute en :other moeten overeenkomen.',
+    'size'                 => [
+        'numeric' => ':attribute moet :size zijn.',
+        'file'    => ':attribute moet :size kilobyte zijn.',
+        'string'  => ':attribute moet :size tekens zijn.',
+        'array'   => ':attribute moet :size items bevatten.',
+    ],
+    'starts_with'          => ':attribute moet starten met een van de volgende: :values',
+    'string'               => ':attribute moet een tekst zijn.',
+    'timezone'             => ':attribute moet een geldige tijdzone zijn.',
+    'unique'               => ':attribute is al in gebruik.',
+    'uploaded'             => 'Het uploaden van :attribute is mislukt.',
+    'url'                  => ':attribute moet een geldig URL zijn.',
+    'uuid'                 => ':attribute moet een geldig UUID zijn.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [
+        'address'               => 'adres',
+        'age'                   => 'leeftijd',
+        'available'             => 'beschikbaar',
+        'city'                  => 'stad',
+        'content'               => 'inhoud',
+        'country'               => 'land',
+        'date'                  => 'datum',
+        'day'                   => 'dag',
+        'description'           => 'omschrijving',
+        'email'                 => 'e-mailadres',
+        'excerpt'               => 'uittreksel',
+        'first_name'            => 'voornaam',
+        'gender'                => 'geslacht',
+        'hour'                  => 'uur',
+        'last_name'             => 'achternaam',
+        'message'               => 'boodschap',
+        'minute'                => 'minuut',
+        'mobile'                => 'mobiel',
+        'month'                 => 'maand',
+        'name'                  => 'naam',
+        'password'              => 'wachtwoord',
+        'password_confirmation' => 'wachtwoordbevestiging',
+        'phone'                 => 'telefoonnummer',
+        'second'                => 'seconde',
+        'sex'                   => 'geslacht',
+        'size'                  => 'grootte',
+        'subject'               => 'onderwerp',
+        'time'                  => 'tijd',
+        'title'                 => 'titel',
+        'username'              => 'gebruikersnaam',
+        'year'                  => 'jaar',
+    ],
+];

tests/_support/FunctionalTester.php

@@ -1,15 +1,11 @@
 <?php
 
-use Illuminate\Routing\RouteCollection;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Route;
 use Webkul\User\Models\Admin;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 use Webkul\Customer\Models\Customer;
-use Webkul\Customer\Models\CustomerAddress;
+use Illuminate\Support\Facades\Route;
-use Webkul\Checkout\Models\Cart;
+use Illuminate\Routing\RouteCollection;
-use Webkul\Checkout\Models\CartItem;
-use Webkul\Checkout\Models\CartAddress;
 
 /**
  * Inherited Methods
@@ -90,10 +86,10 @@ class FunctionalTester extends \Codeception\Actor
     /**
      * @param string $name
      */
-    public function amOnAdminRoute(string $name)
+    public function amOnAdminRoute(string $name, array $params = [])
     {
         $I = $this;
-        $I->amOnRoute($name);
+        $I->amOnRoute($name, $params);
         $I->seeCurrentRouteIs($name);
 
         /** @var RouteCollection $routes */

tests/functional/CartRule/CartRuleCopyCest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Functional\CartRule;
+
+use FunctionalTester;
+use Webkul\CartRule\Models\CartRule;
+
+class CartRuleCopyCest
+{
+
+    public function testCartRuleCopy(FunctionalTester $I)
+    {
+        $I->loginAsAdmin();
+
+        $original = $I->have(CartRule::class, [
+            'status' => 1,
+        ]);
+
+        $count = count(cartRule::all());
+
+        $I->amOnAdminRoute('admin.cart-rules.copy', ['id' => $original->id]);
+
+        $I->seeRecord(CartRule::class, [
+            'id'     => $original->id + 1,
+            'status' => 0,
+            'name'   => $original->name,
+        ]);
+
+        $I->assertCount($count + 1, CartRule::all());
+
+        $I->seeResponseCodeIsSuccessful();
+
+    }
+}

tests/functional/CartRule/CartRuleCreateCest.php

@@ -2,13 +2,10 @@
 
 namespace Tests\Functional\CartRule;
 
-use Webkul\Product\Models\ProductAttributeValue;
-use Webkul\Product\Models\ProductFlat;
 use FunctionalTester;
-
 use Webkul\CartRule\Models\CartRule;
 
-class CartRuleCest
+class CartRuleCreateCest
 {
 
     public function testCartRuleCreation(FunctionalTester $I)

tests/functional/Customer/CustomerCest.php

@@ -10,22 +10,18 @@ class CustomerCest
 {
     public $fields = [];
 
-    public function updateCustomerProfile(FunctionalTester $I)
+    public function updateCustomerProfile(FunctionalTester $I): void
     {
         $customer = $I->loginAsCustomer();
 
         $I->amOnPage('/');
 
         $I->click('Profile');
-
         $I->click('Edit');
-
         $I->selectOption('gender', 'Other');
-
         $I->click('Update Profile');
 
         $I->dontSeeInSource('The old password does not match.');
-
         $I->seeInSource('Profile updated successfully.');
 
         $I->seeRecord(Customer::class, [
@@ -34,7 +30,7 @@ class CustomerCest
         ]);
     }
 
-    public function updateCustomerAddress(FunctionalTester $I)
+    public function updateCustomerAddress(FunctionalTester $I): void
     {
         $I->wantTo('Instantiate a european faker factory to have the vat provider available');
         $faker = \Faker\Factory::create('at_AT');
@@ -46,9 +42,7 @@ class CustomerCest
         $I->amOnPage('/');
 
         $I->click('Profile');
-
         $I->click('Address');
-
         $I->click('Add Address');
 
         $this->fields = [
@@ -65,7 +59,7 @@ class CustomerCest
         ];
 
         foreach ($this->fields as $key => $value) {
-            // the following fields are being rendered via javascript so we ignore them:
+            // the following fields are rendered via javascript so we ignore them:
             if (! in_array($key, [
                 'country',
                 'state',
@@ -111,8 +105,7 @@ class CustomerCest
     }
 
     /**
-     * @param \FunctionalTester $I
+     * @param FunctionalTester $I
-     * @param array             $fields
      */
     private function assertCustomerAddress(FunctionalTester $I): void
     {