From: Vincent Vanwaelscappel Date: Fri, 29 Dec 2023 17:37:30 +0000 (+0100) Subject: wip #6571 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c090e422f697125acf79e9671696dcf0181dd5f4;p=fluidbook-toolbox.git wip #6571 @1.5 --- diff --git a/app/Http/Controllers/Admin/ElearningTranslateCrudController.php b/app/Http/Controllers/Admin/ElearningTranslateCrudController.php index 78c1833fc..22748090b 100644 --- a/app/Http/Controllers/Admin/ElearningTranslateCrudController.php +++ b/app/Http/Controllers/Admin/ElearningTranslateCrudController.php @@ -14,7 +14,7 @@ class ElearningTranslateCrudController extends \Cubist\Backpack\Magic\Controller use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; use \App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelExportOperation; use \App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelImportOperation; - + /* diff --git a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php index 35919e481..185f4b976 100644 --- a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php +++ b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php @@ -18,6 +18,7 @@ class FluidbookPublicationCrudController extends \Cubist\Backpack\Magic\Controll use \App\Http\Controllers\Admin\Operations\FluidbookPublication\EditOperation; use \App\Http\Controllers\Admin\Operations\ChangeownerOperation; use \App\Http\Controllers\Admin\Operations\ChangestatusOperation; + use \App\Http\Controllers\Admin\Operations\InvoiceOperation; use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\SocialImageOperation; use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\ExportPdfOperation; use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\BastideOperation; diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/InvoiceOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/InvoiceOperation.php deleted file mode 100644 index 658a830c9..000000000 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/InvoiceOperation.php +++ /dev/null @@ -1,23 +0,0 @@ -crud->addButtonFromView('line', 'invoice', 'fluidbook_publication.invoice', 'end'); - } - - protected function invoiceItem($id) - { - - } -} diff --git a/app/Http/Controllers/Admin/Operations/InvoiceOperation.php b/app/Http/Controllers/Admin/Operations/InvoiceOperation.php new file mode 100644 index 000000000..8116fa317 --- /dev/null +++ b/app/Http/Controllers/Admin/Operations/InvoiceOperation.php @@ -0,0 +1,23 @@ +crud->addButtonFromView('line', 'invoice', 'invoice', 'end'); + } + + protected function invoiceItem($id) + { + + } +} diff --git a/app/Http/Controllers/Admin/QuizThemeCrudController.php b/app/Http/Controllers/Admin/QuizThemeCrudController.php index 5581dbf14..39f3d9c58 100644 --- a/app/Http/Controllers/Admin/QuizThemeCrudController.php +++ b/app/Http/Controllers/Admin/QuizThemeCrudController.php @@ -10,6 +10,8 @@ class QuizThemeCrudController extends \Cubist\Backpack\Magic\Controllers\CubistM use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; + use \App\Http\Controllers\Admin\Operations\QuizTheme\PreviewOperation; + use \App\Http\Controllers\Admin\Operations\ChangeownerOperation; diff --git a/app/Http/Controllers/Admin/ToolboxTranslateCrudController.php b/app/Http/Controllers/Admin/ToolboxTranslateCrudController.php index dc09f9a3e..df5b82d85 100644 --- a/app/Http/Controllers/Admin/ToolboxTranslateCrudController.php +++ b/app/Http/Controllers/Admin/ToolboxTranslateCrudController.php @@ -13,6 +13,8 @@ class ToolboxTranslateCrudController extends \Cubist\Backpack\Magic\Controllers\ use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; + use \App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelExportOperation; + use \App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelImportOperation; diff --git a/app/Http/Controllers/Admin/TranslateCrudController.php b/app/Http/Controllers/Admin/TranslateCrudController.php index 9764a9c91..613b33a48 100644 --- a/app/Http/Controllers/Admin/TranslateCrudController.php +++ b/app/Http/Controllers/Admin/TranslateCrudController.php @@ -13,6 +13,8 @@ class TranslateCrudController extends \Cubist\Backpack\Magic\Controllers\CubistM use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; + use \App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelExportOperation; + use \App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelImportOperation; @@ -21,7 +23,7 @@ class TranslateCrudController extends \Cubist\Backpack\Magic\Controllers\CubistM __('traductions') */ - protected $_modelNamespace = 'App\Models\Base\ToolboxContentTranslate'; + protected $_modelNamespace = 'App\Models\Base\ToolboxBaseTranslate'; protected $_routeURL = 'translate'; protected $_singular = 'traduction'; protected $_plural = 'traductions'; diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index 52b41b7c9..56e73d663 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -25,7 +25,6 @@ use App\Http\Controllers\Admin\Operations\FluidbookPublication\CreateOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\DeletefbOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\DownloadOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\EditOperation; -use App\Http\Controllers\Admin\Operations\FluidbookPublication\InvoiceOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\LinksOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\PreviewOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\BastideOperation; @@ -34,6 +33,7 @@ use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\SocialIm use App\Http\Controllers\Admin\Operations\FluidbookPublication\StatsOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\UpgradeOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\YSLOperation; +use App\Http\Controllers\Admin\Operations\InvoiceOperation; use App\Jobs\FluidbookImagesPreprocess; use App\Jobs\FluidbookSocialImage; use App\Jobs\GenerateDeliveryThumbnailsPreview; @@ -46,6 +46,7 @@ use App\Models\Traits\SCORMVersionTrait; use App\Models\Traits\ToolboxSettings; use App\Slack\Slack; use App\SubForms\Link\Base; +use Cubedesigners\UserDatabase\Permissions; use Cubist\Backpack\Magic\Fields\Checkbox; use Cubist\Backpack\Magic\Fields\FormBigSection; use Cubist\Backpack\Magic\Fields\FormSuperSection; @@ -200,7 +201,7 @@ class FluidbookPublication extends ToolboxStatusModel $this->addField('extranet_task', FluidbookExtranetTask::class, __('Tâche de l\'extranet'), [ 'can' => 'fluidbook-publication:admin', - 'when' => ['status' => 3] + 'when' => ['status' => 3, 'invoicable_company' => ['values' => [7], 'operator' => '!=']] ]); $this->addField('project_manager', FluidbookProjectManager::class, __('Chef de projet'), [ @@ -243,8 +244,6 @@ class FluidbookPublication extends ToolboxStatusModel $this->addField('composition_updated_at', Datetime::class, __('Dernière modification de la composition'), ['read_only' => true]); $this->addField('status_date', Datetime::class, __('Date de changement de status'), ['read_only' => true]); $this->addField('version', Hidden::class, 'Version', ['column' => true, 'default' => 3, 'databaseDefault' => 3, 'column_label' => '']); - - } protected function _normalizeComposition($c) @@ -344,16 +343,19 @@ class FluidbookPublication extends ToolboxStatusModel throw new \Exception('User ' . $this->owner . ' should be assign to a company'); } + $invoicable_company_id = Permissions::getInvoicableCompany($owner->company); + $invoicable_company = Company::withoutGlobalScopes()->find($invoicable_company_id); + $this->admin = $company->admin; - $this->super_admin = ''; + $this->super_admin = $invoicable_company->admin; $this->owner_company_name = $company->company_with_name; $this->owner_name = $owner->name; + $this->invoicable_company = $invoicable_company_id; } else { Log::warning('Fluidbook ' . $this->id . ' has no owner : ' . $this->owner); } - $this->invoicable = ''; - $this->invoicable_company = ''; + $this->extranet_project = ''; $this->c_title = $this->title; diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/invoice.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/invoice.blade.php deleted file mode 100644 index c33e5afc9..000000000 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/invoice.blade.php +++ /dev/null @@ -1,8 +0,0 @@ -{{-- __('!! Paramètres des fluidbooks') --}} -@if($entry->status<3 && $entry->status>0 && $entry->canAdmin(backpack_user())) - - {{__('Facturer')}} - -@endif diff --git a/resources/views/vendor/backpack/crud/buttons/invoice.blade.php b/resources/views/vendor/backpack/crud/buttons/invoice.blade.php new file mode 100644 index 000000000..b589a84a1 --- /dev/null +++ b/resources/views/vendor/backpack/crud/buttons/invoice.blade.php @@ -0,0 +1,60 @@ +{{-- __('!! Paramètres des fluidbooks') --}} +@if($entry->status<3 && $entry->status>0 && $entry->canAdmin(backpack_user())) + + {{__('Facturer')}} + +@endif + + +@if(!isset($crud->seenInvoice)) + @php + $crud->seenInvoice=true; + // $crud->ajaxOwnerList=\Cubist\Backpack\Magic\Fields\SelectFromArray::hashOptions($column['options']); + @endphp + + +@endif