]> _ Git - fluidbook-toolbox.git/commitdiff
wip #3753 @0.25
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 3 Dec 2020 14:03:44 +0000 (15:03 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 3 Dec 2020 14:03:44 +0000 (15:03 +0100)
29 files changed:
app/Console/Commands/WorkshopMigration.php
app/Fields/User.php
app/Http/Controllers/Admin/Base/QuizController.php
app/Http/Controllers/Admin/CompanyCrudController.php [deleted file]
app/Http/Controllers/Admin/FluidbookQuoteCrudController.php [deleted file]
app/Http/Controllers/Admin/LocaleCrudController.php [deleted file]
app/Http/Controllers/Admin/PageCrudController.php [deleted file]
app/Http/Controllers/Admin/QuizCrudController.php [deleted file]
app/Http/Controllers/Admin/QuizTranslationCrudController.php [deleted file]
app/Http/Controllers/Admin/QuizatttemptCrudController.php [deleted file]
app/Http/Controllers/Admin/SettingsCrudController.php [deleted file]
app/Http/Controllers/Admin/SignatureCrudController.php [deleted file]
app/Http/Controllers/Admin/UsersCrudController.php [deleted file]
app/Http/Controllers/PageController.php
app/Http/Kernel.php
app/Models/AuthUser.php
app/Models/FluidbookQuote.php
app/Models/Locale.php
app/Models/Page.php
app/Models/Quiz.php
app/Models/QuizAttempt.php
app/Models/QuizTranslation.php
app/Models/Settings.php
app/Models/Signature.php
app/SubForms/Answer.php
app/SubForms/Question.php
bootstrap/app.php
composer.lock
resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php

index 1256ce80c77f2093debbc161628ff6fc23608cdc..c3a4948a5ca840e65d99f9b69442f8d3944afde7 100644 (file)
@@ -5,7 +5,7 @@ namespace App\Console\Commands;
 
 use App\Models\FluidbookQuote;
 use App\Models\Signature;
-use Cubist\Backpack\app\Console\Commands\CubistCommand;
+use Cubist\Backpack\Console\Commands\CubistCommand;
 use Illuminate\Support\Facades\DB;
 
 class WorkshopMigration extends CubistCommand
index ef9eef6b59b27ada5f7b0b9fc4b6e32e3c177533..ed3ed1709703af8f2573bc5a87843bb6e14c6090 100644 (file)
@@ -4,7 +4,7 @@
 namespace App\Fields;
 
 
-class User extends \Cubist\Backpack\app\Magic\Fields\User
+class User extends \Cubist\Backpack\Magic\Fields\User
 {
 
 }
index 22f026f08cae380b3b4d132a622bf10bab999f18..4ee096989ee9f7ac8e4167c282abd65d29d51fd4 100644 (file)
@@ -8,7 +8,7 @@ use App\Http\Controllers\Admin\Operations\ImportOperation;
 use App\Http\Controllers\Admin\Operations\LogOperation;
 use App\Http\Controllers\Admin\Operations\PreviewOperation;
 use App\Http\Controllers\Admin\Operations\ReportOperation;
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
+use Cubist\Backpack\Magic\Controllers\CubistMagicController;
 
 class QuizController extends CubistMagicController
 {
diff --git a/app/Http/Controllers/Admin/CompanyCrudController.php b/app/Http/Controllers/Admin/CompanyCrudController.php
deleted file mode 100644 (file)
index 1e07939..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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
deleted file mode 100644 (file)
index 6674277..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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 \App\Http\Controllers\Admin\Operations\FluidbookQuote\ConfirmAssignmentOperation;
-       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
deleted file mode 100644 (file)
index 0e92e19..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-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 $_oneInstance= false;
-}
diff --git a/app/Http/Controllers/Admin/PageCrudController.php b/app/Http/Controllers/Admin/PageCrudController.php
deleted file mode 100644 (file)
index d5de5aa..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-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 $_oneInstance= false;
-}
diff --git a/app/Http/Controllers/Admin/QuizCrudController.php b/app/Http/Controllers/Admin/QuizCrudController.php
deleted file mode 100644 (file)
index 2a20a4a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-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 $_oneInstance= false;
-}
diff --git a/app/Http/Controllers/Admin/QuizTranslationCrudController.php b/app/Http/Controllers/Admin/QuizTranslationCrudController.php
deleted file mode 100644 (file)
index 7574b36..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-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 $_oneInstance= false;
-}
diff --git a/app/Http/Controllers/Admin/QuizatttemptCrudController.php b/app/Http/Controllers/Admin/QuizatttemptCrudController.php
deleted file mode 100644 (file)
index 488c506..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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
deleted file mode 100644 (file)
index 4d943d1..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-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 $_oneInstance= false;
-}
diff --git a/app/Http/Controllers/Admin/SignatureCrudController.php b/app/Http/Controllers/Admin/SignatureCrudController.php
deleted file mode 100644 (file)
index 73548b1..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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
deleted file mode 100644 (file)
index 920d151..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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;
-}
index 56f17ddba586b7273648047356ae71df925b2d41..5f100a4af348fceb001d5f2cf3b196e206e57acf 100644 (file)
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Cubist\Backpack\app\Http\Controllers\CubistRedirectToAdminController;
+use Cubist\Backpack\Http\Controllers\CubistRedirectToAdminController;
 
 class PageController extends CubistRedirectToAdminController
 {
index 87a5adba1ffdb98415fb47502449c2b142264d8a..f618823ce344cdb10ffecca58078443fb53ca4a3 100644 (file)
@@ -19,7 +19,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \Cubist\Backpack\app\Middleware\VariantSelector::class,
+        \Cubist\Backpack\Middleware\VariantSelector::class,
     ];
 
     /**
@@ -34,8 +34,8 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             \Backpack\CRUD\app\Http\Middleware\UseBackpackAuthGuardInsteadOfDefaultAuthGuard::class,
             \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Cubist\Backpack\app\Middleware\VariantSelector::class,
-            \Cubist\Backpack\app\Middleware\LocaleSelector::class,
+            \Cubist\Backpack\Middleware\VariantSelector::class,
+            \Cubist\Backpack\Middleware\LocaleSelector::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
@@ -80,8 +80,8 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\Authenticate::class,
         \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \Cubist\Backpack\app\Middleware\VariantSelector::class,
-        \Cubist\Backpack\app\Middleware\LocaleSelector::class,
+        \Cubist\Backpack\Middleware\VariantSelector::class,
+        \Cubist\Backpack\Middleware\LocaleSelector::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,
     ];
index e4f78e87613ab8cbf60c8a09de5b904d82bab04c..c4c2fe3f3f24af8b0bce3d1ff54a983c926f39fa 100644 (file)
@@ -12,10 +12,4 @@ class AuthUser extends User
     {
 
     }
-
-    public function can($abilities, $arguments = [])
-    {
-        debug($abilities, $arguments);
-        return $this->can($abilities, $arguments);
-    }
 }
index f4de2627dc902a5f2a434e2628c63af1dec440ca..3a2020464b847d9801b2cf167b5f93da271b17b8 100644 (file)
@@ -7,7 +7,8 @@ use App\Http\Controllers\Admin\Operations\FluidbookQuote\AssignOperation;
 use App\Http\Controllers\Admin\Operations\FluidbookQuote\ConfirmAssignmentOperation;
 use App\Http\Controllers\Admin\Operations\FluidbookQuote\CreateFromWebsite;
 use Cubedesigners\UserDatabase\User;
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Http\Controllers\Operations\ShowOperation;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 use Illuminate\Database\Eloquent\Builder;
 
 class FluidbookQuote extends CubistMagicAbstractModel
@@ -17,11 +18,12 @@ class FluidbookQuote extends CubistMagicAbstractModel
         'singular' => 'demande de devis',
         'plural' => 'demandes de devis'];
 
-    protected $_operations = [AssignOperation::class, CreateFromWebsite::class, ConfirmAssignmentOperation::class];
+    protected $_operations = [ShowOperation::class, AssignOperation::class, CreateFromWebsite::class, ConfirmAssignmentOperation::class];
     protected $_enableClone = false;
     protected $_enableDeletion = false;
     protected $_enableCreation = false;
 
+
     public static function addOwnerClause(Builder $builder)
     {
         $builder->where('reseller', backpack_user()->id);
@@ -52,15 +54,15 @@ class FluidbookQuote extends CubistMagicAbstractModel
         $this->addField('coupon', 'Text', 'Coupon');
 
         $this->addField('admin', 'SelectFromModel', 'Administrateur',
-            ['optionsmodel' => User::class, 'allows_null' => true, 'attribute' => 'nameWithCompany', 'column_attribute' => 'firstname', 'column' => true]
+            ['optionsmodel' => User::class, 'allows_null' => true, 'attribute' => 'nameWithCompany', 'column_attribute' => 'firstname', 'column' => true, 'can' => 'fluidbook-quote:admin',]
         );
 
         $this->addField('reseller', 'SelectFromModel', 'Confiée à',
-            ['optionsmodel' => User::class, 'allows_null' => true, 'attribute' => 'nameWithCompany', 'column_attribute' => 'companyName', 'column' => true]);
+            ['optionsmodel' => User::class, 'allows_null' => true, 'attribute' => 'nameWithCompany', 'column_attribute' => 'companyName', 'column' => true, 'can' => 'fluidbook-quote:admin',]);
 
         $this->addField('status', 'SelectFromArray', 'Status', ['options' => [
             0 => 'Non traitée',
-            1 => 'Confiée à un revendeur',
+            1 => 'En attente de traitement',
             2 => 'Traitée',
         ], 'column' => true]);
 
@@ -70,7 +72,7 @@ class FluidbookQuote extends CubistMagicAbstractModel
             2 => 'Devis refusé',
             3 => 'Projet validé',
             4 => 'Déjà client',
-        ], 'column' => true]);
+        ], 'column' => true, 'can' => 'fluidbook-quote:admin',]);
 
         $this->addField('origin_column', 'ModelAttribute', 'Origine', ['column' => true, 'attribute' => 'origin']);
         $this->addField('fluidbooks', 'ModelAttribute', 'Fluidbooks', ['column' => true, 'column_label' => '<img width="20" src="/images/icons/icon-fluidbook.svg">', 'attribute' => 'user.e1_ws_count']);
index fd75ee0b59a2cee2351464e349ba69210164f382..093c2285c572687cf38fa123f0270216c056ec5c 100644 (file)
@@ -2,7 +2,7 @@
 namespace App\Models;
 
 
-class Locale extends \Cubist\Backpack\app\Magic\Models\Locale
+class Locale extends \Cubist\Backpack\Magic\Models\Locale
 {
 
 }
index f2fc9bb71a07df92fe79a781572947c5b91b4790..1775a51a18e52c0eae3ed2e29ea38793d5b093ea 100644 (file)
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Cubist\Backpack\app\Magic\Models\CMSPage;
+use Cubist\Backpack\Magic\Models\CMSPage;
 
 class Page extends CMSPage
 {
index ab1b43a04a66af2e9c0675e43945c93d86979d11..1e2d1d7e6c5f3ace02637275c75397b3410b758b 100644 (file)
@@ -4,7 +4,7 @@
 namespace App\Models;
 
 use App\Http\Controllers\Admin\Base\QuizController;
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 use Cubist\Util\Files\Files;
 use Illuminate\Database\Eloquent\Builder;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
index 85570fa63b48ccb8f5e19a57e8d38690551d5970..3fb901242c520b22260ec8c47a06b4c042d2698e 100644 (file)
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 
 class QuizAttempt extends CubistMagicAbstractModel
 {
index b5001a64a1facd46f5f76eb39853e98cdc4acb2a..98e634ea619a8340fa1d98da391bbb181f45483f 100644 (file)
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 
 class QuizTranslation extends CubistMagicAbstractModel
 {
index f6c57ccd648f600caa6ec61c55e6f3a063314403..7210b6428b738c7dc56078067c2f0e9dd969454e 100644 (file)
@@ -4,7 +4,7 @@
 namespace App\Models;
 
 
-class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
+class Settings extends \Cubist\Backpack\Magic\Models\Settings
 {
     public function setFields()
     {
index a19b807407316d7ce7b564613ee6b84ecf40172b..cceee8f790a504547a8bb9547a92ea50204ec1ec 100644 (file)
@@ -4,7 +4,7 @@
 namespace App\Models;
 
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 
 class Signature extends CubistMagicAbstractModel
 {
index b1be18c31b56b4d50f62a0af8ba33fc8494ce931..795fe7ef8a9df69637eb284dbc11213fe3fcd225 100644 (file)
@@ -3,7 +3,7 @@
 
 namespace App\SubForms;
 
-use Cubist\Backpack\app\Magic\SubForm;
+use Cubist\Backpack\Magic\SubForm;
 
 class Answer extends SubForm
 {
index bee36a43d1705b31f86b8419e3fa8dadd955ca68..1ee5b77923581cdfa89da4bf6005006d6e741c30 100644 (file)
@@ -3,7 +3,7 @@
 
 namespace App\SubForms;
 
-use Cubist\Backpack\app\Magic\SubForm;
+use Cubist\Backpack\Magic\SubForm;
 
 class Question extends SubForm
 {
index 521fba491e849f56a49a6776f80d9aff3ce1da30..8d4e15eee919d214ef73f7d382a1ddb2ace7980a 100644 (file)
@@ -11,7 +11,7 @@
 |
 */
 
-$app = new Cubist\Backpack\app\Application(
+$app = new Cubist\Backpack\Application(
     $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
index 55ce22f0f6c00c0bc9b5ba9492e84d7d874ded65..64d9c8644dffa68ca9e61908ddff2a74387f2b74 100644 (file)
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "e38d10f283a03e3dd79d046f3634fd95e1c5e9f0"
+                "reference": "a2541e0aff2013e59ed015ccbd5c591a7e4956f2"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-9f9fc8.tar",
-                "reference": "e38d10f283a03e3dd79d046f3634fd95e1c5e9f0",
-                "shasum": "81d40c0a9e6c556799cf8d8ed4ad05fb61d778af"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-8927aa.tar",
+                "reference": "a2541e0aff2013e59ed015ccbd5c591a7e4956f2",
+                "shasum": "521f358050fc3aff14fe69aa7ff0f9ba611bcfcb"
             },
             "require": {
                 "cubist/cms-back": "dev-master"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Cubedesigners\\UserDatabase\\": "src"
                 }
             },
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2020-12-01T17:19:49+00:00"
+            "time": "2020-12-03T13:19:23+00:00"
         },
         {
             "name": "cubist/cms-back",
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "1edbd9ec68c3a8fd38212147ace1e8ad67b2bd48"
+                "reference": "dad8db62e00e6c44c344c2b7443272a13cd574c4"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-6df5a2.tar",
-                "reference": "1edbd9ec68c3a8fd38212147ace1e8ad67b2bd48",
-                "shasum": "1409b1cbe1b629a9ce35804c79fb020eb9f8261c"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-a35bc0.tar",
+                "reference": "dad8db62e00e6c44c344c2b7443272a13cd574c4",
+                "shasum": "bcea7912513139e88150d73c6178302a15cce66c"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Cubist\\Backpack\\": "src"
+                "psr-4": {
+                    "Cubist\\Backpack\\": "src/app"
                 },
                 "files": [
                     "src/app/helpers.php"
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-12-01T15:41:08+00:00"
+            "time": "2020-12-03T13:14:43+00:00"
         },
         {
             "name": "cubist/cms-front",
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_gtag.git",
-                "reference": "7dd7eca00040c2e388581f7488bdd29cc27772d5"
+                "reference": "b8b93ecb7e423751ec12ef08548e5ff59b2c5de2"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/gtag/cubist-gtag-dev-master-a7fa7f.tar",
-                "reference": "7dd7eca00040c2e388581f7488bdd29cc27772d5",
-                "shasum": "71022389abf9e2b656841918648e6fac6cd303b5"
+                "url": "https://composer.cubedesigners.com/dist/cubist/gtag/cubist-gtag-dev-master-ccb0dc.tar",
+                "reference": "b8b93ecb7e423751ec12ef08548e5ff59b2c5de2",
+                "shasum": "035b366ce2272b69b3cad41fce135144ffc96bd1"
             },
             "require": {
                 "laravel/framework": "~5.8|^6.0|^7.0",
                 "google analytics",
                 "gtag"
             ],
-            "time": "2020-03-11T13:45:15+00:00"
+            "time": "2020-12-03T13:22:07+00:00"
         },
         {
             "name": "cubist/laravel-backpack-dropzone-field",
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_laravel-backpack-dropzone-field.git",
-                "reference": "967e60a491d8533e2ef6ea1aa4e8afd581da8118"
+                "reference": "f3e01848bcc09ea645d44859317eafa396a2ea45"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/laravel-backpack-dropzone-field/cubist-laravel-backpack-dropzone-field-dev-master-a8a6f8.tar",
-                "reference": "967e60a491d8533e2ef6ea1aa4e8afd581da8118",
-                "shasum": "9a1ede5f89ee7b1cff0664a17bce06653c0a0bb1"
+                "url": "https://composer.cubedesigners.com/dist/cubist/laravel-backpack-dropzone-field/cubist-laravel-backpack-dropzone-field-dev-master-1e284b.tar",
+                "reference": "f3e01848bcc09ea645d44859317eafa396a2ea45",
+                "shasum": "ecb081b01e9685edc2308f6a8a914c5ff2c11e06"
             },
             "require": {
                 "backpack/crud": "^4.0.0",
             },
             "autoload": {
                 "psr-4": {
-                    "Gaspertrix\\Backpack\\DropzoneField\\": "src"
+                    "Gaspertrix\\Backpack\\DropzoneField\\": "src/app"
                 }
             },
             "autoload-dev": {
                 "media",
                 "upload"
             ],
-            "time": "2020-04-20T18:37:16+00:00"
+            "time": "2020-12-03T13:00:53+00:00"
         },
         {
             "name": "cubist/locale",
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_locale.git",
-                "reference": "cf4ea2c560bf1a77eb0a90c4f0b4bed563eccafe"
+                "reference": "ee8a379414d80135720342cae9159ae998093ff9"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/locale/cubist-locale-dev-master-c0aaa6.tar",
-                "reference": "cf4ea2c560bf1a77eb0a90c4f0b4bed563eccafe",
-                "shasum": "75243dc9dae48b373f295c99d3810032c71a77c7"
+                "url": "https://composer.cubedesigners.com/dist/cubist/locale/cubist-locale-dev-master-3ab43d.tar",
+                "reference": "ee8a379414d80135720342cae9159ae998093ff9",
+                "shasum": "86e4ad572356b0cab136af74e3c211ad9edc8b8f"
             },
             "require": {
                 "php": ">=7.1.3",
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Cubist\\Locale\\": "src"
-                },
-                "files": []
+                }
             },
             "license": [
                 "proprietary"
                 }
             ],
             "description": "Cubist Locale",
-            "time": "2020-01-28T16:10:30+00:00"
+            "time": "2020-12-03T12:56:22+00:00"
         },
         {
             "name": "cubist/net",
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_net.git",
-                "reference": "c09271be9a1690dd4c546ce8e2a3dc30232b0a6c"
+                "reference": "4e815d62a6f868789ecce6bdcb9f0a81ddffc64a"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-0c0393.tar",
-                "reference": "c09271be9a1690dd4c546ce8e2a3dc30232b0a6c",
-                "shasum": "02a9364b02340d20b4b9aa90b0fa0890eefb98d2"
+                "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-28d1c1.tar",
+                "reference": "4e815d62a6f868789ecce6bdcb9f0a81ddffc64a",
+                "shasum": "05f377a7717110e79d264b30738265441d4d9106"
             },
             "require": {
                 "ext-ssh2": "*",
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "Cubist\\Net": "src/"
+                "psr-4": {
+                    "Cubist\\Net\\": "src"
                 }
             },
             "license": [
                 }
             ],
             "description": "net cubist composer package",
-            "time": "2020-01-28T15:33:52+00:00"
+            "time": "2020-12-03T12:49:18+00:00"
         },
         {
             "name": "cubist/util",
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "9a5716478a1400bbfa1874686550648fc08066e7"
+                "reference": "fed4f134d99d57bdf942f7dbb0ff03aed9bd9548"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-6fcee9.tar",
-                "reference": "9a5716478a1400bbfa1874686550648fc08066e7",
-                "shasum": "ac575cbf050f9f127975293a92b9d25e6a347c84"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-696321.tar",
+                "reference": "fed4f134d99d57bdf942f7dbb0ff03aed9bd9548",
+                "shasum": "4c893b8f61c517f7e9d44f1b035d6081391924f0"
             },
             "require": {
                 "cubist/net": "dev-master",
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "Cubist\\Util": "src/"
+                "psr-4": {
+                    "Cubist\\Util\\": "src"
                 }
             },
             "license": [
                 }
             ],
             "description": "Utilities class",
-            "time": "2020-11-25T20:09:36+00:00"
+            "time": "2020-12-03T12:46:41+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",
         },
         {
             "name": "spatie/image",
-            "version": "1.10.0",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/image.git",
-                "reference": "65d615c1f604e479764f25525291d696041dfcea"
+                "reference": "6eaf45d61832c2396dd4b10cc81d9fce93a59e2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/image/zipball/65d615c1f604e479764f25525291d696041dfcea",
-                "reference": "65d615c1f604e479764f25525291d696041dfcea",
+                "url": "https://api.github.com/repos/spatie/image/zipball/6eaf45d61832c2396dd4b10cc81d9fce93a59e2d",
+                "reference": "6eaf45d61832c2396dd4b10cc81d9fce93a59e2d",
                 "shasum": ""
             },
             "require": {
                 "image",
                 "spatie"
             ],
-            "time": "2020-11-27T14:44:09+00:00"
+            "time": "2020-12-01T20:42:11+00:00"
         },
         {
             "name": "spatie/image-optimizer",
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "7.0.13",
+            "version": "7.0.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ad0dcd7b184e76f7198a1fe07685bfbec3ae911a"
+                "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ad0dcd7b184e76f7198a1fe07685bfbec3ae911a",
-                "reference": "ad0dcd7b184e76f7198a1fe07685bfbec3ae911a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bb7c9a210c72e4709cdde67f8b7362f672f2225c",
+                "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2",
                 "phpunit/php-file-iterator": "^2.0.2",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.1.1",
+                "phpunit/php-token-stream": "^3.1.1 || ^4.0",
                 "sebastian/code-unit-reverse-lookup": "^1.0.1",
                 "sebastian/environment": "^4.2.2",
                 "sebastian/version": "^2.0.1",
                 "testing",
                 "xunit"
             ],
-            "time": "2020-11-30T08:35:22+00:00"
+            "time": "2020-12-02T13:39:03+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "3.1.2",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "472b687829041c24b25f475e14c2f38a09edf1c2"
+                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/472b687829041c24b25f475e14c2f38a09edf1c2",
-                "reference": "472b687829041c24b25f475e14c2f38a09edf1c2",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=7.1"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
                 "tokenizer"
             ],
             "abandoned": true,
-            "time": "2020-11-30T08:38:46+00:00"
+            "time": "2020-08-04T08:28:15+00:00"
         },
         {
             "name": "phpunit/phpunit",
index 767797443e9a133afd7b50fcc3eebceec9f1d4eb..2f1a7a03286c47198eb201214150314a812cd931 100644 (file)
@@ -1,7 +1,7 @@
 @if($entry->status==1 && $entry->reseller==backpack_user()->id)
     <a class="btn btn-sm btn-link" href="/fluidbook-quote/{{$entry->id}}/confirm-assignment/{{$entry->reseller}}"
        data-toggle="tooltip"
-       title="Confirmer le traitement de la demande"><i class="la la-user-check"></i> Demande traitée
+       title="Confirmer le traitement de la demande"><i class="la la-user-check"></i> Marquer comme traitée
     </a>
 
 @endif