Merged in ECM-462 (pull request bagisto#129)

[ECM-462] Move abandoned cart and order creating in sales Approved-by: Zoran Bogoevski
naumcei · Jul 21, 2021 · 675cabe · 675cabe
2 parents 4a07847 + 767a035
commit 675cabe
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 81 deletions.
diff --git a/packages/Bookmark/API/src/Config/system.php b/packages/Bookmark/API/src/Config/system.php
@@ -1,31 +1,16 @@
 <?php
 
 return [
-    [
-        'key'  => 'abandon-cart',
-        'name' => 'admin::app.admin.system.abandon-cart',
-        'sort'   => 3,
-    ], [
-        'key'  => 'abandon-cart.settings',
-        'name' => 'admin::app.admin.system.abandon-cart-settings',
-        'sort'   => 3,
+   [
+        'key'  => 'sales.orderSettings.abandonCart',
+        'name' => 'Abandoned Cart',
+        'sort'   => 4,
         'fields' => [
             [
                 'name'  => 'abandon_cart_enabled',
-                'title' => 'admin::app.admin.system.abandon-cart-settings',
-                'type'  => 'boolean',
+                'title' => 'Enabled',
+                'type'  => 'boolean'
             ],
         ],
-    ], [
-        'key'  => 'abandon-cart.settings.general',
-        'name' => 'admin::app.admin.system.abandon-cart-settings-general',
-        'sort'   => 3,
-        'fields' => [
-            [
-                'name'  => 'abandon_cart_enabled',
-                'title' => 'admin::app.admin.system.abandon-cart-settings-status',
-                'type'  => 'boolean',
-            ],
-        ],
-    ],
+    ]
 ];
diff --git a/packages/Bookmark/API/src/Http/Requests/AbandonedCartRequest.php b/packages/Bookmark/API/src/Http/Requests/AbandonedCartRequest.php
@@ -12,7 +12,7 @@ class AbandonedCartRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return (bool) core()->getConfigData('abandon-cart.settings.general.abandon_cart_enabled');
+        return (bool) core()->getConfigData('sales.orderSettings.abandonCart.abandon_cart_enabled');
     }
 
     /**

diff --git a/packages/Bookmark/API/src/Http/helpers.php b/packages/Bookmark/API/src/Http/helpers.php
@@ -18,6 +18,6 @@ function cookie(): string
      */
     function abandoned_cart_enabled(): bool
     {
-        return (bool) core()->getConfigData('abandon-cart.settings.general.abandon_cart_enabled');
+        return (bool) core()->getConfigData('sales.orderSettings.abandonCart.abandon_cart_enabled');
     }
 }
diff --git a/packages/Bookmark/API/src/Language/ar/app.php b/packages/Bookmark/API/src/Language/ar/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/de/app.php b/packages/Bookmark/API/src/Language/de/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/en/app.php b/packages/Bookmark/API/src/Language/en/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/es/app.php b/packages/Bookmark/API/src/Language/es/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/fa/app.php b/packages/Bookmark/API/src/Language/fa/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/fr/app.php b/packages/Bookmark/API/src/Language/fr/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/it/app.php b/packages/Bookmark/API/src/Language/it/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/nl/app.php b/packages/Bookmark/API/src/Language/nl/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/pl/app.php b/packages/Bookmark/API/src/Language/pl/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/pt_BR/app.php b/packages/Bookmark/API/src/Language/pt_BR/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/API/src/Language/tr/app.php b/packages/Bookmark/API/src/Language/tr/app.php
@@ -32,7 +32,7 @@
     ],
 
     'abandon-cart' => [
-        'title' => 'Abandon Cart',
+        'title' => 'Abandoned Cart',
         'cart-and-account' => 'Cart And Account',
         'cart-info' => 'Cart Information',
         'products-info' => 'Products Information',
@@ -91,7 +91,7 @@
         'system' => [
             'customer-attributes' => 'Customer Attributes',
             'customer-attributes-enabled' => 'Customer Attributes Enabled',
-            'abandon-cart' => 'Abandon Cart',
+            'abandon-cart' => 'Abandoned Cart',
             'abandon-cart-settings' => 'Settings',
             'abandon-cart-settings-general' => 'General',
             'abandon-cart-settings-status' => 'Status',

diff --git a/packages/Bookmark/OrderCreation/src/Config/system.php b/packages/Bookmark/OrderCreation/src/Config/system.php
@@ -1,32 +1,16 @@
 <?php
 
-    return [
-        [
-            'key'  => 'ordercreate',
-            'name' => 'ordercreation::app.module-name',
-            'sort' => 1,
-        ],
-        [
-            'key'  => 'ordercreate.general',
-            'name' => 'ordercreation::app.general',
-            'sort' => 1,
-        ],
-
-        [
-            'key'    => 'ordercreate.general.general',
-            'name'   => 'ordercreation::app.general',
-            'sort'   => 1,
-            'fields' => [
-                [
-                    'name'          => 'module_enable',
-                    'title'         => 'ordercreation::app.module-enable',
-                    'type'          => 'boolean',
-                    'validation'    => 'required',
-                    'channel_based' => false,
-                    'locale_based'  => true,
-                ],
-
+return [
+    [
+        'key'    => 'sales.orderSettings.orderCreation',
+        'name'   => 'Manual order creating',
+        'sort'   => 5,
+        'fields' => [
+            [
+                'name'          => 'module_enable',
+                'title'         => 'Enabled',
+                'type'          => 'boolean'
             ],
         ],
-
-    ];
+    ]
+];
diff --git a/packages/Bookmark/OrderCreation/src/Database/Seeders/OrderCreationConfiguration.php b/packages/Bookmark/OrderCreation/src/Database/Seeders/OrderCreationConfiguration.php
@@ -10,28 +10,28 @@ class OrderCreationConfiguration extends Seeder
         public function run()
         {
             CoreConfig::create([
-                'code'         => 'ordercreate.general.general.module_enable',
+                'code'         => 'sales.orderSettings.orderCreation.module_enable',
                 'value'        => '1',
                 'company_id'   => 1,
                 'channel_code' => 'default',
                 'locale_code'  => 'en',
             ]);
             CoreConfig::create([
-                'code'         => 'ordercreate.general.general.module_enable',
+                'code'         => 'sales.orderSettings.orderCreation.module_enable',
                 'value'        => '1',
                 'company_id'   => 1,
                 'channel_code' => 'default',
                 'locale_code'  => 'fr',
             ]);
             CoreConfig::create([
-                'code'         => 'ordercreate.general.general.module_enable',
+                'code'         => 'sales.orderSettings.orderCreation.module_enable',
                 'value'        => '1',
                 'company_id'   => 1,
                 'channel_code' => 'default',
                 'locale_code'  => 'nl',
             ]);
             CoreConfig::create([
-                'code'         => 'ordercreate.general.general.module_enable',
+                'code'         => 'sales.orderSettings.orderCreation.module_enable',
                 'value'        => '1',
                 'company_id'   => 1,
                 'channel_code' => 'default',

diff --git a/packages/Bookmark/OrderCreation/src/Http/Controllers/OrderCreateController.php b/packages/Bookmark/OrderCreation/src/Http/Controllers/OrderCreateController.php
@@ -97,6 +97,8 @@ public function __construct(
             ProductRepository $productRepository,
             ProductInventoryRepository $productInventoryRepository
         ) {
+            abort_unless(core()->getConfigData('sales.orderSettings.orderCreation.module_enable'), 404);
+
             $this->middleware('admin');
 
             $this->_config = request('_config');

diff --git a/packages/Bookmark/OrderCreation/src/Resources/views/order.blade.php b/packages/Bookmark/OrderCreation/src/Resources/views/order.blade.php
@@ -32,8 +32,7 @@
                     {{ __('admin::app.export.export') }}
                 </span>
                 </div>
-
-                @if(core()->getConfigData('ordercreate.general.general.module_enable'))
+                @if(core()->getConfigData('sales.orderSettings.orderCreation.module_enable'))
 
                     @if($permissionType != 'all'  && in_array('sales.orders.product', $allowedPermissions))
                         <a href="{{ route('admin.ordercreate.customer') }}" class="btn btn-lg btn-primary">

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Checkout/AbandonedCartController.php b/packages/Webkul/Admin/src/Http/Controllers/Checkout/AbandonedCartController.php
@@ -17,6 +17,8 @@ class AbandonedCartController extends Controller
     public function __construct(
         AbandonedCartRepository $abandonedCartRepository
     ) {
+        abort_unless(core()->getConfigData('sales.orderSettings.abandonCart.abandon_cart_enabled'), 404);
+
         $this->abandonedCartRepository = $abandonedCartRepository;
     }
 

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php
@@ -18,7 +18,7 @@
                         {{ __('admin::app.export.export') }}
                     </span>
                 </div>
-                @if(core()->getConfigData('ordercreate.general.general.module_enable'))
+                @if(core()->getConfigData('sales.orderSettings.orderCreation.module_enable'))
                     <a href="{{ route('admin.ordercreate.customer') }}" class="btn btn-lg btn-primary">
                         {{ __('ordercreation::app.datagrid.create-order-customer') }}
                     </a>