From e60106ad70b045440e9182d8de4dd747a88ec290 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 26 Jan 2024 11:24:05 +0100 Subject: [PATCH] wip #6571 @1.5 --- .../FluidbookPublicationCrudController.php | 1 + .../Admin/Operations/InvoiceOperation.php | 20 +++++ app/Models/FluidbookPublication.php | 1 + .../views/columns/fluidbook_status.blade.php | 77 +++++++++++++------ resources/views/invoice/dialog.blade.php | 1 + 5 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 app/Http/Controllers/Admin/Operations/InvoiceOperation.php create mode 100644 resources/views/invoice/dialog.blade.php diff --git a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php index bd16474d8..c33f41cf5 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\GetPageFromWebsiteOperation; diff --git a/app/Http/Controllers/Admin/Operations/InvoiceOperation.php b/app/Http/Controllers/Admin/Operations/InvoiceOperation.php new file mode 100644 index 000000000..f07a120cd --- /dev/null +++ b/app/Http/Controllers/Admin/Operations/InvoiceOperation.php @@ -0,0 +1,20 @@ + $entry]); + } +} diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index c8f4507ba..e6e1e726d 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -103,6 +103,7 @@ class FluidbookPublication extends ToolboxStatusModel EditOperation::class, ChangeownerOperation::class, ChangestatusOperation::class, + InvoiceOperation::class, // Services SocialImageOperation::class, ExportPdfOperation::class, diff --git a/resources/views/columns/fluidbook_status.blade.php b/resources/views/columns/fluidbook_status.blade.php index f0733e1c0..b2253dfc8 100644 --- a/resources/views/columns/fluidbook_status.blade.php +++ b/resources/views/columns/fluidbook_status.blade.php @@ -5,8 +5,7 @@ @endphp @can('fluidbook-publication:admin') - @if($entry->allowsEdit()) - getOption('name')}}-{{$column['name']}}="{{$values}}"> + getOption('name')}}-{{$column['name']}}="{{$values}}"> {{$v}} - @else - {{$v}} - @endif - @endcan +@endcan - @cannot('fluidbook-publication:admin') - {{$v}} - @endcannot +@cannot('fluidbook-publication:admin') + {{$v}} +@endcannot +@if(!isset($crud->seenStatusChange)) + @php $crud->seenStatusChange=true; @endphp + + - @endif + + } + +@endif diff --git a/resources/views/invoice/dialog.blade.php b/resources/views/invoice/dialog.blade.php new file mode 100644 index 000000000..7ab48328a --- /dev/null +++ b/resources/views/invoice/dialog.blade.php @@ -0,0 +1 @@ +{{$entry->id}} -- 2.39.5