wait #6278 @0.75

diff --git a/app/Http/Controllers/Admin/ApplicationCrudController.php b/app/Http/Controllers/Admin/ApplicationCrudController.php
index f1bf5f4454d23d65acb5046de9d7f66c7165036e..2ac828dbf17ebb24792e6b41cf9e85d64abb5184 100644 (file)
--- a/app/Http/Controllers/Admin/ApplicationCrudController.php
+++ b/app/Http/Controllers/Admin/ApplicationCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class ApplicationCrudController extends CubistMagicController
+class ApplicationCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Application';
     protected $_routeURL = 'application';

diff --git a/app/Http/Controllers/Admin/CartCrudController.php b/app/Http/Controllers/Admin/CartCrudController.php
index 0e78a797cfa8cc26afbaf3f5fc057a47cc0dcefb..9ebc7d381449646a75ee30fd77272cd9fb58af5e 100644 (file)
--- a/app/Http/Controllers/Admin/CartCrudController.php
+++ b/app/Http/Controllers/Admin/CartCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class CartCrudController extends CubistMagicController
+class CartCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Cart';
     protected $_routeURL = 'cart';

diff --git a/app/Http/Controllers/Admin/ClientCrudController.php b/app/Http/Controllers/Admin/ClientCrudController.php
index 5cb9bf4cb689c3d31e6d76a7bef8734a8abd6f33..7366739ed9f36d3a54faeca11c01805878c1a2de 100644 (file)
--- a/app/Http/Controllers/Admin/ClientCrudController.php
+++ b/app/Http/Controllers/Admin/ClientCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class ClientCrudController extends CubistMagicController
+class ClientCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Client';
     protected $_routeURL = 'client';

diff --git a/app/Http/Controllers/Admin/LocaleCrudController.php b/app/Http/Controllers/Admin/LocaleCrudController.php
index 32ea1848e172004b6d8d25695fca3de010786aff..0ec4b3e239d8ccc6a866fad6fd5116d84641fe28 100644 (file)
--- a/app/Http/Controllers/Admin/LocaleCrudController.php
+++ b/app/Http/Controllers/Admin/LocaleCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class LocaleCrudController extends CubistMagicController
+class LocaleCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Locale';
     protected $_routeURL = 'locale';

diff --git a/app/Http/Controllers/Admin/NewsCrudController.php b/app/Http/Controllers/Admin/NewsCrudController.php
index ff04f36a5cef928a1a56eed3a1400bc06ba9aa15..90be7c603e676852107cb998cb8bddceec33141c 100644 (file)
--- a/app/Http/Controllers/Admin/NewsCrudController.php
+++ b/app/Http/Controllers/Admin/NewsCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class NewsCrudController extends CubistMagicController
+class NewsCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\News';
     protected $_routeURL = 'news';

diff --git a/app/Http/Controllers/Admin/OrderCrudController.php b/app/Http/Controllers/Admin/OrderCrudController.php
new file mode 100644 (file)
index 0000000..c649e0c
--- /dev/null
+++ b/app/Http/Controllers/Admin/OrderCrudController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class OrderCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+{
+    protected $_modelNamespace = 'App\Models\Order';
+    protected $_routeURL = 'order';
+    protected $_singular = 'Commande';
+    protected $_plural = 'Commandes';
+    protected $_clonable = true;
+    protected $_bulk = true;
+    protected $_oneInstance= false;
+}

diff --git a/app/Http/Controllers/Admin/PageCrudController.php b/app/Http/Controllers/Admin/PageCrudController.php
index 12ca6402ddbaf9f7006607c746f7a60e69f8ee0d..09ea83ca289bfa24dffeded1dc23ead9428cc76f 100644 (file)
--- a/app/Http/Controllers/Admin/PageCrudController.php
+++ b/app/Http/Controllers/Admin/PageCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController;
-
-class PageCrudController extends CubistMagicNestedController
+class PageCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController
 {
     protected $_modelNamespace = 'App\Models\Page';
     protected $_routeURL = 'page';

diff --git a/app/Http/Controllers/Admin/ProductCrudController.php b/app/Http/Controllers/Admin/ProductCrudController.php
index ab46ab6c4ed99140a376c6d0609131886a43b15b..edd9627f5fbca563f8e674dd888a0e69ccd1f0a4 100644 (file)
--- a/app/Http/Controllers/Admin/ProductCrudController.php
+++ b/app/Http/Controllers/Admin/ProductCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\App\Http\Controllers\Admin\ProductBaseController;
-
-class ProductCrudController extends App\Http\Controllers\Admin\ProductBaseController
+class ProductCrudController extends \App\Http\Controllers\Admin\ProductBaseController
 {
     protected $_modelNamespace = 'App\Models\Product';
     protected $_routeURL = 'product';

diff --git a/app/Http/Controllers/Admin/ProductTypeCrudController.php b/app/Http/Controllers/Admin/ProductTypeCrudController.php
index bc190302da1de0bc2c5f81885d6166be64620e02..d85c17cefb41054bfbea51340a285bdb7f4c52bb 100644 (file)
--- a/app/Http/Controllers/Admin/ProductTypeCrudController.php
+++ b/app/Http/Controllers/Admin/ProductTypeCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class ProductTypeCrudController extends CubistMagicController
+class ProductTypeCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\ProductType';
     protected $_routeURL = 'producttype';

diff --git a/app/Http/Controllers/Admin/QuotesCrudController.php b/app/Http/Controllers/Admin/QuotesCrudController.php
index d5cf41cb7483173b4bfd1a443e0b0f877e2e8691..6a565fafac294647a9eebf8c1be0a2f9f1247526 100644 (file)
--- a/app/Http/Controllers/Admin/QuotesCrudController.php
+++ b/app/Http/Controllers/Admin/QuotesCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class QuotesCrudController extends CubistMagicController
+class QuotesCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\QuoteRequest';
     protected $_routeURL = 'quotes';

diff --git a/app/Http/Controllers/Admin/SettingsCrudController.php b/app/Http/Controllers/Admin/SettingsCrudController.php
index 708729e1e84fbad16ad9434ee4b3ce90ce6d13dd..727ca4e484bf40db5177bae74d63ebd178a89edc 100644 (file)
--- a/app/Http/Controllers/Admin/SettingsCrudController.php
+++ b/app/Http/Controllers/Admin/SettingsCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class SettingsCrudController extends CubistMagicController
+class SettingsCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Settings';
     protected $_routeURL = 'settings';

diff --git a/app/Http/Controllers/Admin/SpecificationCrudController.php b/app/Http/Controllers/Admin/SpecificationCrudController.php
index 9dbac29ab2279c4bc45acf9d451c0e8ad5bd255a..7addfc19bc3723afcdfaab4cd31adbe37222fe2b 100644 (file)
--- a/app/Http/Controllers/Admin/SpecificationCrudController.php
+++ b/app/Http/Controllers/Admin/SpecificationCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class SpecificationCrudController extends CubistMagicController
+class SpecificationCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Specification';
     protected $_routeURL = 'specification';

diff --git a/app/Http/Controllers/Admin/TranslateCrudController.php b/app/Http/Controllers/Admin/TranslateCrudController.php
index 7b6773d747ac31cc76100bed41e1d7d24333f16b..adcb3bdfe9c873b0b583d79c0d7496e03d213db1 100644 (file)
--- a/app/Http/Controllers/Admin/TranslateCrudController.php
+++ b/app/Http/Controllers/Admin/TranslateCrudController.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class TranslateCrudController extends CubistMagicController
+class TranslateCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
     protected $_modelNamespace = 'App\Models\Translate';
     protected $_routeURL = 'translate';

diff --git a/app/Models/Product.php b/app/Models/Product.php
index 2da5ba1697111f076e6cbf2c3df5d6e40fbe6a62..f0d51b00e928c8777e3933fd0235694e8809a97e 100644 (file)
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -201,7 +201,7 @@ class Product extends CubistMagicPageModel
 
     protected function _getBaseController()
     {
-        return 'ProductBaseController';
+        return ProductBaseController::class;
     }
 
     protected static function _getRelatedEntities()

diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php
index eb832ec628c455e6aed8d62b1037d04e09660526..3b50e3ad6f36fb53b5f96d8fea58f3ee05f70446 100644 (file)
--- a/routes/backpack/custom.php
+++ b/routes/backpack/custom.php
@@ -1,20 +1,22 @@
 <?php
-
 Route::group([
-    'prefix' => config('backpack.base.route_prefix', 'admin'),
+    'prefix'     => config('backpack.base.route_prefix', 'admin'),
     'middleware' => ['web', config('backpack.base.middleware_key', 'admin')],
-    'namespace' => 'App\Http\Controllers\Admin',
+    'namespace'  => 'App\Http\Controllers\Admin',
 ], function () { // custom admin routes
-    new \Cubist\Backpack\CubistCrudRouter('application', 'ApplicationCrudController', []);
-    new \Cubist\Backpack\CubistCrudRouter('locale', 'LocaleCrudController', []);
-    new \Cubist\Backpack\CubistCrudRouter('news', 'NewsCrudController', []);
     new \Cubist\Backpack\CubistCrudRouter('page', 'PageCrudController', []);
-    new \Cubist\Backpack\CubistCrudRouter('product', 'ProductCrudController', []);
+    new \Cubist\Backpack\CubistCrudRouter('cart', 'CartCrudController', []);
     new \Cubist\Backpack\CubistCrudRouter('producttype', 'ProductTypeCrudController', []);
     new \Cubist\Backpack\CubistCrudRouter('quotes', 'QuotesCrudController', []);
     new \Cubist\Backpack\CubistCrudRouter('settings', 'SettingsCrudController', []);
-    new \Cubist\Backpack\CubistCrudRouter('specification', 'SpecificationCrudController', []);
+    new \Cubist\Backpack\CubistCrudRouter('product', 'ProductCrudController', []);
     new \Cubist\Backpack\CubistCrudRouter('translate', 'TranslateCrudController', []);
+    new \Cubist\Backpack\CubistCrudRouter('specification', 'SpecificationCrudController', []);
+    new \Cubist\Backpack\CubistCrudRouter('news', 'NewsCrudController', []);
+    new \Cubist\Backpack\CubistCrudRouter('order', 'OrderCrudController', []);
+    new \Cubist\Backpack\CubistCrudRouter('client', 'ClientCrudController', []);
+    new \Cubist\Backpack\CubistCrudRouter('application', 'ApplicationCrudController', []);
+    new \Cubist\Backpack\CubistCrudRouter('locale', 'LocaleCrudController', []);
 
     if (file_exists(__DIR__ . '/projectcustom.php')) {
         require_once __DIR__ . '/projectcustom.php';