From e8123a470bd0f703c423a3091c83fc54ccd439b4 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 3 Dec 2020 15:03:44 +0100 Subject: [PATCH] wip #3753 @0.25 --- app/Console/Commands/WorkshopMigration.php | 2 +- app/Fields/User.php | 2 +- .../Controllers/Admin/Base/QuizController.php | 2 +- .../Admin/CompanyCrudController.php | 23 ---- .../Admin/FluidbookQuoteCrudController.php | 21 --- .../Admin/LocaleCrudController.php | 23 ---- .../Controllers/Admin/PageCrudController.php | 23 ---- .../Controllers/Admin/QuizCrudController.php | 23 ---- .../Admin/QuizTranslationCrudController.php | 23 ---- .../Admin/QuizatttemptCrudController.php | 23 ---- .../Admin/SettingsCrudController.php | 23 ---- .../Admin/SignatureCrudController.php | 23 ---- .../Controllers/Admin/UsersCrudController.php | 24 ---- app/Http/Controllers/PageController.php | 2 +- app/Http/Kernel.php | 10 +- app/Models/AuthUser.php | 6 - app/Models/FluidbookQuote.php | 14 +- app/Models/Locale.php | 2 +- app/Models/Page.php | 2 +- app/Models/Quiz.php | 2 +- app/Models/QuizAttempt.php | 2 +- app/Models/QuizTranslation.php | 2 +- app/Models/Settings.php | 2 +- app/Models/Signature.php | 2 +- app/SubForms/Answer.php | 2 +- app/SubForms/Question.php | 2 +- bootstrap/app.php | 2 +- composer.lock | 129 +++++++++--------- .../confirm_assignment.blade.php | 2 +- 29 files changed, 92 insertions(+), 326 deletions(-) delete mode 100644 app/Http/Controllers/Admin/CompanyCrudController.php delete mode 100644 app/Http/Controllers/Admin/FluidbookQuoteCrudController.php delete mode 100644 app/Http/Controllers/Admin/LocaleCrudController.php delete mode 100644 app/Http/Controllers/Admin/PageCrudController.php delete mode 100644 app/Http/Controllers/Admin/QuizCrudController.php delete mode 100644 app/Http/Controllers/Admin/QuizTranslationCrudController.php delete mode 100644 app/Http/Controllers/Admin/QuizatttemptCrudController.php delete mode 100644 app/Http/Controllers/Admin/SettingsCrudController.php delete mode 100644 app/Http/Controllers/Admin/SignatureCrudController.php delete mode 100644 app/Http/Controllers/Admin/UsersCrudController.php diff --git a/app/Console/Commands/WorkshopMigration.php b/app/Console/Commands/WorkshopMigration.php index 1256ce80c..c3a4948a5 100644 --- a/app/Console/Commands/WorkshopMigration.php +++ b/app/Console/Commands/WorkshopMigration.php @@ -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 diff --git a/app/Fields/User.php b/app/Fields/User.php index ef9eef6b5..ed3ed1709 100644 --- a/app/Fields/User.php +++ b/app/Fields/User.php @@ -4,7 +4,7 @@ namespace App\Fields; -class User extends \Cubist\Backpack\app\Magic\Fields\User +class User extends \Cubist\Backpack\Magic\Fields\User { } diff --git a/app/Http/Controllers/Admin/Base/QuizController.php b/app/Http/Controllers/Admin/Base/QuizController.php index 22f026f08..4ee096989 100644 --- a/app/Http/Controllers/Admin/Base/QuizController.php +++ b/app/Http/Controllers/Admin/Base/QuizController.php @@ -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 index 1e0793908..000000000 --- a/app/Http/Controllers/Admin/CompanyCrudController.php +++ /dev/null @@ -1,23 +0,0 @@ -can($abilities, $arguments); - } } diff --git a/app/Models/FluidbookQuote.php b/app/Models/FluidbookQuote.php index f4de2627d..3a2020464 100644 --- a/app/Models/FluidbookQuote.php +++ b/app/Models/FluidbookQuote.php @@ -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' => '', 'attribute' => 'user.e1_ws_count']); diff --git a/app/Models/Locale.php b/app/Models/Locale.php index fd75ee0b5..093c2285c 100644 --- a/app/Models/Locale.php +++ b/app/Models/Locale.php @@ -2,7 +2,7 @@ namespace App\Models; -class Locale extends \Cubist\Backpack\app\Magic\Models\Locale +class Locale extends \Cubist\Backpack\Magic\Models\Locale { } diff --git a/app/Models/Page.php b/app/Models/Page.php index f2fc9bb71..1775a51a1 100644 --- a/app/Models/Page.php +++ b/app/Models/Page.php @@ -2,7 +2,7 @@ namespace App\Models; -use Cubist\Backpack\app\Magic\Models\CMSPage; +use Cubist\Backpack\Magic\Models\CMSPage; class Page extends CMSPage { diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php index ab1b43a04..1e2d1d7e6 100644 --- a/app/Models/Quiz.php +++ b/app/Models/Quiz.php @@ -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; diff --git a/app/Models/QuizAttempt.php b/app/Models/QuizAttempt.php index 85570fa63..3fb901242 100644 --- a/app/Models/QuizAttempt.php +++ b/app/Models/QuizAttempt.php @@ -2,7 +2,7 @@ namespace App\Models; -use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel; +use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel; class QuizAttempt extends CubistMagicAbstractModel { diff --git a/app/Models/QuizTranslation.php b/app/Models/QuizTranslation.php index b5001a64a..98e634ea6 100644 --- a/app/Models/QuizTranslation.php +++ b/app/Models/QuizTranslation.php @@ -2,7 +2,7 @@ namespace App\Models; -use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel; +use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel; class QuizTranslation extends CubistMagicAbstractModel { diff --git a/app/Models/Settings.php b/app/Models/Settings.php index f6c57ccd6..7210b6428 100644 --- a/app/Models/Settings.php +++ b/app/Models/Settings.php @@ -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() { diff --git a/app/Models/Signature.php b/app/Models/Signature.php index a19b80740..cceee8f79 100644 --- a/app/Models/Signature.php +++ b/app/Models/Signature.php @@ -4,7 +4,7 @@ namespace App\Models; -use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel; +use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel; class Signature extends CubistMagicAbstractModel { diff --git a/app/SubForms/Answer.php b/app/SubForms/Answer.php index b1be18c31..795fe7ef8 100644 --- a/app/SubForms/Answer.php +++ b/app/SubForms/Answer.php @@ -3,7 +3,7 @@ namespace App\SubForms; -use Cubist\Backpack\app\Magic\SubForm; +use Cubist\Backpack\Magic\SubForm; class Answer extends SubForm { diff --git a/app/SubForms/Question.php b/app/SubForms/Question.php index bee36a43d..1ee5b7792 100644 --- a/app/SubForms/Question.php +++ b/app/SubForms/Question.php @@ -3,7 +3,7 @@ namespace App\SubForms; -use Cubist\Backpack\app\Magic\SubForm; +use Cubist\Backpack\Magic\SubForm; class Question extends SubForm { diff --git a/bootstrap/app.php b/bootstrap/app.php index 521fba491..8d4e15eee 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -11,7 +11,7 @@ | */ -$app = new Cubist\Backpack\app\Application( +$app = new Cubist\Backpack\Application( $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__) ); diff --git a/composer.lock b/composer.lock index 55ce22f0f..64d9c8644 100644 --- a/composer.lock +++ b/composer.lock @@ -990,20 +990,20 @@ "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" } }, @@ -1017,7 +1017,7 @@ } ], "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", @@ -1025,13 +1025,13 @@ "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", @@ -1089,8 +1089,8 @@ } }, "autoload": { - "psr-0": { - "Cubist\\Backpack\\": "src" + "psr-4": { + "Cubist\\Backpack\\": "src/app" }, "files": [ "src/app/helpers.php" @@ -1106,7 +1106,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2020-12-01T15:41:08+00:00" + "time": "2020-12-03T13:14:43+00:00" }, { "name": "cubist/cms-front", @@ -1158,13 +1158,13 @@ "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", @@ -1198,7 +1198,7 @@ "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", @@ -1206,13 +1206,13 @@ "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", @@ -1229,7 +1229,7 @@ }, "autoload": { "psr-4": { - "Gaspertrix\\Backpack\\DropzoneField\\": "src" + "Gaspertrix\\Backpack\\DropzoneField\\": "src/app" } }, "autoload-dev": { @@ -1262,7 +1262,7 @@ "media", "upload" ], - "time": "2020-04-20T18:37:16+00:00" + "time": "2020-12-03T13:00:53+00:00" }, { "name": "cubist/locale", @@ -1270,13 +1270,13 @@ "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", @@ -1294,10 +1294,9 @@ } }, "autoload": { - "psr-0": { + "psr-4": { "Cubist\\Locale\\": "src" - }, - "files": [] + } }, "license": [ "proprietary" @@ -1309,7 +1308,7 @@ } ], "description": "Cubist Locale", - "time": "2020-01-28T16:10:30+00:00" + "time": "2020-12-03T12:56:22+00:00" }, { "name": "cubist/net", @@ -1317,13 +1316,13 @@ "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": "*", @@ -1331,8 +1330,8 @@ }, "type": "library", "autoload": { - "psr-0": { - "Cubist\\Net": "src/" + "psr-4": { + "Cubist\\Net\\": "src" } }, "license": [ @@ -1345,7 +1344,7 @@ } ], "description": "net cubist composer package", - "time": "2020-01-28T15:33:52+00:00" + "time": "2020-12-03T12:49:18+00:00" }, { "name": "cubist/util", @@ -1353,13 +1352,13 @@ "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", @@ -1374,8 +1373,8 @@ }, "type": "library", "autoload": { - "psr-0": { - "Cubist\\Util": "src/" + "psr-4": { + "Cubist\\Util\\": "src" } }, "license": [ @@ -1388,7 +1387,7 @@ } ], "description": "Utilities class", - "time": "2020-11-25T20:09:36+00:00" + "time": "2020-12-03T12:46:41+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -4845,16 +4844,16 @@ }, { "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": { @@ -4894,7 +4893,7 @@ "image", "spatie" ], - "time": "2020-11-27T14:44:09+00:00" + "time": "2020-12-01T20:42:11+00:00" }, { "name": "spatie/image-optimizer", @@ -9174,16 +9173,16 @@ }, { "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": { @@ -9192,7 +9191,7 @@ "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", @@ -9233,7 +9232,7 @@ "testing", "xunit" ], - "time": "2020-11-30T08:35:22+00:00" + "time": "2020-12-02T13:39:03+00:00" }, { "name": "phpunit/php-file-iterator", @@ -9377,29 +9376,29 @@ }, { "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": { @@ -9423,7 +9422,7 @@ "tokenizer" ], "abandoned": true, - "time": "2020-11-30T08:38:46+00:00" + "time": "2020-08-04T08:28:15+00:00" }, { "name": "phpunit/phpunit", diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php index 767797443..2f1a7a032 100644 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php +++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php @@ -1,7 +1,7 @@ @if($entry->status==1 && $entry->reseller==backpack_user()->id) Demande traitée + title="Confirmer le traitement de la demande"> Marquer comme traitée @endif -- 2.39.5