wip #3753 @1

diff --git a/app/Http/Controllers/Admin/Base/FluidbookQuoteController.php b/app/Http/Controllers/Admin/Base/FluidbookQuoteController.php
deleted file mode 100644 (file)
index 92a7a9d..0000000
--- a/app/Http/Controllers/Admin/Base/FluidbookQuoteController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-
-namespace App\Http\Controllers\Admin\Base;
-
-
-use App\Http\Controllers\Admin\Operations\FluidbookQuote\CreateFromWebsite;
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-
-class FluidbookQuoteController extends CubistMagicController
-{
-    use CreateFromWebsite;
-}

diff --git a/app/Http/Controllers/Admin/CompanyCrudController.php b/app/Http/Controllers/Admin/CompanyCrudController.php
new file mode 100644 (file)
index 0000000..1e07939
--- /dev/null
+++ b/app/Http/Controllers/Admin/CompanyCrudController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class CompanyCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+{
+    use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
+    protected $_modelNamespace = 'App\Models\Company';
+    protected $_routeURL = 'company';
+    protected $_singular = 'company';
+    protected $_plural = 'companies';
+    protected $_oneInstance= false;
+}

diff --git a/app/Http/Controllers/Admin/FluidbookQuoteCrudController.php b/app/Http/Controllers/Admin/FluidbookQuoteCrudController.php
new file mode 100644 (file)
index 0000000..5816c71
--- /dev/null
+++ b/app/Http/Controllers/Admin/FluidbookQuoteCrudController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class FluidbookQuoteCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+{
+    use \App\Http\Controllers\Admin\Operations\FluidbookQuote\AssignOperation;
+       use \App\Http\Controllers\Admin\Operations\FluidbookQuote\CreateFromWebsite;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
+    protected $_modelNamespace = 'App\Models\FluidbookQuote';
+    protected $_routeURL = 'fluidbook-quote';
+    protected $_singular = 'demande de devis';
+    protected $_plural = 'demandes de devis';
+    protected $_oneInstance= false;
+}

diff --git a/app/Http/Controllers/Admin/LocaleCrudController.php b/app/Http/Controllers/Admin/LocaleCrudController.php
index 0ec4b3e239d8ccc6a866fad6fd5116d84641fe28..0e92e192b3b2107fb4d41fe27d58d9fccf31def3 100644 (file)
--- a/app/Http/Controllers/Admin/LocaleCrudController.php
+++ b/app/Http/Controllers/Admin/LocaleCrudController.php
@@ -4,11 +4,20 @@ namespace App\Http\Controllers\Admin;
 
 class LocaleCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
+    use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
     protected $_modelNamespace = 'App\Models\Locale';
     protected $_routeURL = 'locale';
     protected $_singular = 'langue';
     protected $_plural = 'langues';
-    protected $_clonable = true;
-    protected $_bulk = true;
     protected $_oneInstance= false;
 }

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookQuote/AssignOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookQuote/AssignOperation.php
new file mode 100644 (file)
index 0000000..dc74714
--- /dev/null
+++ b/app/Http/Controllers/Admin/Operations/FluidbookQuote/AssignOperation.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Operations\FluidbookQuote;
+
+use Illuminate\Support\Facades\Route;
+
+trait AssignOperation
+{
+    protected function setupAssignRoutes($segment, $routeName, $controller)
+    {
+        Route::match(['get'], $segment . '/{id}/assign', $controller . '@assign');
+    }
+
+    protected function setupAssignDefaults()
+    {
+        $this->crud->addButtonFromView('line', 'assign', 'fluidbook_quote.assign', 'end');
+    }
+
+    protected function assign($id)
+    {
+
+    }
+}

diff --git a/app/Http/Controllers/Admin/PageCrudController.php b/app/Http/Controllers/Admin/PageCrudController.php
index 09ea83ca289bfa24dffeded1dc23ead9428cc76f..d5de5aa6d595f3820f6b26d9ce969ee4a92aa10d 100644 (file)
--- a/app/Http/Controllers/Admin/PageCrudController.php
+++ b/app/Http/Controllers/Admin/PageCrudController.php
@@ -4,11 +4,20 @@ namespace App\Http\Controllers\Admin;
 
 class PageCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController
 {
+    use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
     protected $_modelNamespace = 'App\Models\Page';
     protected $_routeURL = 'page';
     protected $_singular = 'page';
     protected $_plural = 'pages';
-    protected $_clonable = true;
-    protected $_bulk = true;
     protected $_oneInstance= false;
 }

diff --git a/app/Http/Controllers/Admin/QuizCrudController.php b/app/Http/Controllers/Admin/QuizCrudController.php
index ca7b3c6b5b3d5b34a53de6fb0505d390cf3530f7..2a20a4a5a42eb2577ed1105d667567f0310d8624 100644 (file)
--- a/app/Http/Controllers/Admin/QuizCrudController.php
+++ b/app/Http/Controllers/Admin/QuizCrudController.php
@@ -4,11 +4,20 @@ namespace App\Http\Controllers\Admin;
 
 class QuizCrudController extends \App\Http\Controllers\Admin\Base\QuizController
 {
+    use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
     protected $_modelNamespace = 'App\Models\Quiz';
     protected $_routeURL = 'quiz';
     protected $_singular = 'quiz';
     protected $_plural = 'quizzes';
-    protected $_clonable = true;
-    protected $_bulk = true;
     protected $_oneInstance= false;
 }

diff --git a/app/Http/Controllers/Admin/QuizTranslationCrudController.php b/app/Http/Controllers/Admin/QuizTranslationCrudController.php
index 1d115a1472eda7cd5bde337dcf2d51604228515d..7574b36929b33bc348571b35f1fb140909c27356 100644 (file)
--- a/app/Http/Controllers/Admin/QuizTranslationCrudController.php
+++ b/app/Http/Controllers/Admin/QuizTranslationCrudController.php
@@ -4,11 +4,20 @@ namespace App\Http\Controllers\Admin;
 
 class QuiztranslationCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
+    use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
     protected $_modelNamespace = 'App\Models\QuizTranslation';
     protected $_routeURL = 'quiztranslation';
     protected $_singular = 'quiz translation';
     protected $_plural = 'quiz translations';
-    protected $_clonable = true;
-    protected $_bulk = true;
     protected $_oneInstance= false;
 }

diff --git a/app/Http/Controllers/Admin/QuizatttemptCrudController.php b/app/Http/Controllers/Admin/QuizatttemptCrudController.php
new file mode 100644 (file)
index 0000000..488c506
--- /dev/null
+++ b/app/Http/Controllers/Admin/QuizatttemptCrudController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class QuizatttemptCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+{
+    use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
+    protected $_modelNamespace = 'App\Models\QuizAttempt';
+    protected $_routeURL = 'quizatttempt';
+    protected $_singular = 'quiz attempt';
+    protected $_plural = 'quiz attempts';
+    protected $_oneInstance= false;
+}

diff --git a/app/Http/Controllers/Admin/SettingsCrudController.php b/app/Http/Controllers/Admin/SettingsCrudController.php
index 727ca4e484bf40db5177bae74d63ebd178a89edc..4d943d1f9e77ab7db1b22f8bfca14649c38563d5 100644 (file)
--- a/app/Http/Controllers/Admin/SettingsCrudController.php
+++ b/app/Http/Controllers/Admin/SettingsCrudController.php
@@ -4,11 +4,20 @@ namespace App\Http\Controllers\Admin;
 
 class SettingsCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
 {
+    use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
     protected $_modelNamespace = 'App\Models\Settings';
     protected $_routeURL = 'settings';
     protected $_singular = 'paramètre';
     protected $_plural = 'paramètres';
-    protected $_clonable = true;
-    protected $_bulk = true;
     protected $_oneInstance= false;
 }

diff --git a/app/Http/Controllers/Admin/SignatureCrudController.php b/app/Http/Controllers/Admin/SignatureCrudController.php
new file mode 100644 (file)
index 0000000..73548b1
--- /dev/null
+++ b/app/Http/Controllers/Admin/SignatureCrudController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class SignatureCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+{
+    use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
+    protected $_modelNamespace = 'App\Models\Signature';
+    protected $_routeURL = 'signature';
+    protected $_singular = 'signature';
+    protected $_plural = 'signatures';
+    protected $_oneInstance= false;
+}

diff --git a/app/Http/Controllers/Admin/UsersCrudController.php b/app/Http/Controllers/Admin/UsersCrudController.php
new file mode 100644 (file)
index 0000000..920d151
--- /dev/null
+++ b/app/Http/Controllers/Admin/UsersCrudController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class UsersCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController
+{
+    use \Cubedesigners\UserDatabase\Operations\LoginasOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Backpack\ReviseOperation\ReviseOperation;
+       
+
+
+    protected $_modelNamespace = 'App\Models\User';
+    protected $_routeURL = 'users';
+    protected $_singular = 'user';
+    protected $_plural = 'users';
+    protected $_oneInstance= false;
+}

diff --git a/app/Models/FluidbookQuote.php b/app/Models/FluidbookQuote.php
index 0292f4f2da1ac3142f2c895af71365ce848ec03a..b0bbeae86b01c7856a05563de9a50208d307ec98 100644 (file)
--- a/app/Models/FluidbookQuote.php
+++ b/app/Models/FluidbookQuote.php
@@ -5,18 +5,22 @@ namespace App\Models;
 
 
 use App\Http\Controllers\Admin\Base\FluidbookQuoteController;
+use App\Http\Controllers\Admin\Operations\FluidbookQuote\AssignOperation;
+use App\Http\Controllers\Admin\Operations\FluidbookQuote\CreateFromWebsite;
 use Cubedesigners\UserDatabase\User;
 use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
 
 class FluidbookQuote extends CubistMagicAbstractModel
 {
-    protected $_baseController = FluidbookQuoteController::class;
-
     protected $table = 'fluidbook_quote';
     protected $_options = ['name' => 'fluidbook-quote',
         'singular' => 'demande de devis',
         'plural' => 'demandes de devis'];
 
+    protected $_operations = [AssignOperation::class, CreateFromWebsite::class];
+    protected $_enableClone = false;
+    protected $_enableDeletion = false;
+
     public function setFields()
     {
         parent::setFields();

diff --git a/composer.lock b/composer.lock
index 792b849ec6f4b6edacd78aa77562c503361ff555..918d2ae63440a16c81173b331b8b48e7af0a8e81 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1025,13 +1025,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "13f6dcc2a9b77b14e2614f671f961719da607f88"
+                "reference": "1afd307e48012b1ef90d95d2c8f555de7fd5b9f3"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-3abbad.tar",
-                "reference": "13f6dcc2a9b77b14e2614f671f961719da607f88",
-                "shasum": "85246384ed16f7f923851ec105b45ab79cc8bce3"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-f7a41b.tar",
+                "reference": "1afd307e48012b1ef90d95d2c8f555de7fd5b9f3",
+                "shasum": "75815f263446312d54d8802068d855a9f1dd4eba"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -1106,7 +1106,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-11-26T08:09:07+00:00"
+            "time": "2020-11-26T13:19:21+00:00"
         },
         {
             "name": "cubist/cms-front",

diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php
new file mode 100644 (file)
index 0000000..9777e76
--- /dev/null
+++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php
@@ -0,0 +1,2 @@
+<a class="btn btn-sm btn-link" href="{{$crud->route}}/{{$entry->getKey()}}/assign" data-toggle="tooltip"
+   title="Assign to"><i class="la la-arrow-circle-down"></i> Confier</a>

diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php
index a956b0988150eeeb3d26acbce56c8bc2ec39ee51..3d2200b160e9f68db9cfe77fb62ad0cecf0d4112 100644 (file)
--- a/routes/backpack/custom.php
+++ b/routes/backpack/custom.php
@@ -4,9 +4,18 @@ Route::group([
     'middleware' => ['web', config('backpack.base.middleware_key', 'admin')],
     'namespace'  => 'App\Http\Controllers\Admin',
 ], function () { // custom admin routes
+    try {
+         Route::crud('company', 'CompanyCrudController');
+     Route::crud('fluidbook-quote', 'FluidbookQuoteCrudController');
      Route::crud('locale', 'LocaleCrudController');
-     Route::crud('settings', 'SettingsCrudController');
-     Route::crud('quiztranslation', 'QuiztranslationCrudController');
-     Route::crud('quiz', 'QuizCrudController');
      Route::crud('page', 'PageCrudController');
+     Route::crud('quiz', 'QuizCrudController');
+     Route::crud('quizatttempt', 'QuizatttemptCrudController');
+     Route::crud('quiztranslation', 'QuiztranslationCrudController');
+     Route::crud('settings', 'SettingsCrudController');
+     Route::crud('signature', 'SignatureCrudController');
+     Route::crud('users', 'UsersCrudController');
+    } catch(\Throwable $e) {
+
+    }
 });