From df76e6eacf9aeb543c50a8d48e20f542cfff56dd Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 23 Jun 2022 11:15:15 -0700 Subject: [PATCH 1/3] adds eula blade for licenses and fixes assigned_to for dom_pdf --- .../Account/AcceptanceController.php | 44 ++++++++++++----- .../accept/accept-license-eula.blade.php | 47 +++++++++++++++++++ 2 files changed, 79 insertions(+), 12 deletions(-) create mode 100644 resources/views/account/accept/accept-license-eula.blade.php diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 685b5a965..906aa2ff1 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -133,19 +133,39 @@ class AcceptanceController extends Controller // this is horrible - if ($acceptance->checkoutable_type == 'App\Models\Asset') { - $pdf_view_route ='account.accept.accept-asset-eula'; - $asset_model = AssetModel::find($item->model_id); - $display_model = $asset_model->name; - $assigned_to = User::find($item->assigned_to)->present()->fullName; - - } elseif ($acceptance->checkoutable_type== 'App\Models\Accessory') { - $pdf_view_route ='account.accept.accept-accessory-eula'; - $accessory = Accessory::find($item->id); - $display_model = $accessory->name; - $assigned_to = User::find($item->assignedTo); - + switch($acceptance->checkoutable_type){ + case 'App\Models\Asset': + $pdf_view_route ='account.accept.accept-asset-eula'; + $asset_model = AssetModel::find($item->model_id); + $display_model = $asset_model->name; + $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName; + break; + case 'App\Models\Accessory': + $pdf_view_route ='account.accept.accept-accessory-eula'; + $accessory = Accessory::find($item->id); + $display_model = $accessory->name; + $assigned_to = User::find($item->assignedTo); + break; + case 'App\Models\LicenseSeat': + $pdf_view_route ='account.accept.accept-license-eula'; + $license = License::find($item->id); + $display_model = $license->name; + $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName; + break; } +// if ($acceptance->checkoutable_type == 'App\Models\Asset') { +// $pdf_view_route ='account.accept.accept-asset-eula'; +// $asset_model = AssetModel::find($item->model_id); +// $display_model = $asset_model->name; +// $assigned_to = User::find($item->assigned_to)->present()->fullName; +// +// } elseif ($acceptance->checkoutable_type== 'App\Models\Accessory') { +// $pdf_view_route ='account.accept.accept-accessory-eula'; +// $accessory = Accessory::find($item->id); +// $display_model = $accessory->name; +// $assigned_to = User::find($item->assignedTo); +// +// } /** * Gather the data for the PDF. We fire this whether there is a signature required or not, diff --git a/resources/views/account/accept/accept-license-eula.blade.php b/resources/views/account/accept/accept-license-eula.blade.php new file mode 100644 index 000000000..f35be6d5c --- /dev/null +++ b/resources/views/account/accept/accept-license-eula.blade.php @@ -0,0 +1,47 @@ + + + + + + + + + + +@if ($logo) +
+ +

{{$company_name}}

+
+@endif +
+ +

+ {{ trans('general.date') }}: {{ date($date_settings) }}
+ {{ trans('general.license') }}: {{ $item_model }}
+

+ +@if ($eula) +
+ {!! $eula !!} +
+@endif + + +

+ Assigned on: {{$check_out_date}}
+ Assigned to: {{$assigned_to}}
+ Accepted on: {{$accepted_date}} +

+ + +@if ($signature!='') + +@endif + + \ No newline at end of file From d00b469001bfedc075fa0861bf711ca2918145e1 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 23 Jun 2022 11:33:36 -0700 Subject: [PATCH 2/3] fixed the search for the license --- app/Http/Controllers/Account/AcceptanceController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 906aa2ff1..78b290733 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -15,6 +15,7 @@ use App\Models\Contracts\Acceptable; use App\Models\User; use App\Models\AssetModel; use App\Models\Accessory; +use App\Models\License; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; @@ -148,7 +149,7 @@ class AcceptanceController extends Controller break; case 'App\Models\LicenseSeat': $pdf_view_route ='account.accept.accept-license-eula'; - $license = License::find($item->id); + $license = License::find($item->license_id); $display_model = $license->name; $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName; break; From b0897a1fc90d5a992c0b04b14c4282e1912f5834 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 23 Jun 2022 11:52:35 -0700 Subject: [PATCH 3/3] adds acceptance for consumables and components --- .../Account/AcceptanceController.php | 19 ++++++++ .../accept/accept-component-eula.blade.php | 47 +++++++++++++++++++ .../accept/accept-consumable-eula.blade.php | 47 +++++++++++++++++++ 3 files changed, 113 insertions(+) create mode 100644 resources/views/account/accept/accept-component-eula.blade.php create mode 100644 resources/views/account/accept/accept-consumable-eula.blade.php diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 78b290733..e81a0329d 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -16,6 +16,8 @@ use App\Models\User; use App\Models\AssetModel; use App\Models\Accessory; use App\Models\License; +use App\Models\Component; +use App\Models\Consumable; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; @@ -24,6 +26,7 @@ use Illuminate\Support\Str; use App\Http\Controllers\SettingsController; use Barryvdh\DomPDF\Facade\Pdf; use Carbon\Carbon; +use phpDocumentor\Reflection\Types\Compound; class AcceptanceController extends Controller { @@ -141,18 +144,34 @@ class AcceptanceController extends Controller $display_model = $asset_model->name; $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName; break; + case 'App\Models\Accessory': $pdf_view_route ='account.accept.accept-accessory-eula'; $accessory = Accessory::find($item->id); $display_model = $accessory->name; $assigned_to = User::find($item->assignedTo); break; + case 'App\Models\LicenseSeat': $pdf_view_route ='account.accept.accept-license-eula'; $license = License::find($item->license_id); $display_model = $license->name; $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName; break; + + case 'App\Models\Component': + $pdf_view_route ='account.accept.accept-component-eula'; + $component = Component::find($item->id); + $display_model = $component->name; + $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName; + break; + + case 'App\Models\Consumable': + $pdf_view_route ='account.accept.accept-consumable-eula'; + $consumable = Consumable::find($item->id); + $display_model = $consumable->name; + $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName; + break; } // if ($acceptance->checkoutable_type == 'App\Models\Asset') { // $pdf_view_route ='account.accept.accept-asset-eula'; diff --git a/resources/views/account/accept/accept-component-eula.blade.php b/resources/views/account/accept/accept-component-eula.blade.php new file mode 100644 index 000000000..258894342 --- /dev/null +++ b/resources/views/account/accept/accept-component-eula.blade.php @@ -0,0 +1,47 @@ + + + + + + + + + + +@if ($logo) +
+ +

{{$company_name}}

+
+@endif +
+ +

+ {{ trans('general.date') }}: {{ date($date_settings) }}
+ {{ trans('general.component') }}: {{ $item_model }}
+

+ +@if ($eula) +
+ {!! $eula !!} +
+@endif + + +

+ Assigned on: {{$check_out_date}}
+ Assigned to: {{$assigned_to}}
+ Accepted on: {{$accepted_date}} +

+ + +@if ($signature!='') + +@endif + + \ No newline at end of file diff --git a/resources/views/account/accept/accept-consumable-eula.blade.php b/resources/views/account/accept/accept-consumable-eula.blade.php new file mode 100644 index 000000000..3800ca01a --- /dev/null +++ b/resources/views/account/accept/accept-consumable-eula.blade.php @@ -0,0 +1,47 @@ + + + + + + + + + + +@if ($logo) +
+ +

{{$company_name}}

+
+@endif +
+ +

+ {{ trans('general.date') }}: {{ date($date_settings) }}
+ {{ trans('general.consumable') }}: {{ $item_model }}
+

+ +@if ($eula) +
+ {!! $eula !!} +
+@endif + + +

+ Assigned on: {{$check_out_date}}
+ Assigned to: {{$assigned_to}}
+ Accepted on: {{$accepted_date}} +

+ + +@if ($signature!='') + +@endif + + \ No newline at end of file