A free open source IT asset/license management system
Separate out info and prompt
Marcus Moorea34ea0804df6
diff --git a/app/Mail/BulkAssetCheckoutMail.php b/app/Mail/BulkAssetCheckoutMail.phpindex 32040c68be..536634c993 100644--- a/app/Mail/BulkAssetCheckoutMail.php+++ b/app/Mail/BulkAssetCheckoutMail.php@@ -52,8 +52,8 @@ class BulkAssetCheckoutMail extends Mailablewith: ['introduction' => $this->getIntroduction(),'requires_acceptance' => $this->requires_acceptance,- 'requires_acceptance_wording' => $this->getRequiresAcceptanceWording(),- 'acceptance_url' => $this->getAcceptanceUrl(),+ 'requires_acceptance_info' => $this->getRequiresAcceptanceInfo(),+ 'requires_acceptance_prompt' => $this->getRequiresAcceptancePrompt(),'singular_eula' => $this->getSingularEula(),],);@@ -109,13 +109,31 @@ class BulkAssetCheckoutMail extends Mailablereturn trans_choice('mail.new_item_checked', $this->assets->count());}- private function getAcceptanceUrl()+ private function getRequiresAcceptanceInfo(): ?string{- if ($this->assets->count() > 1) {- return route('account.accept');+ if (!$this->requiresAcceptance()) {+ return null;}- return route('account.accept.item', $this->assets->first());+ return trans_choice('mail.items_checked_out_require_acceptance', $this->assets->count());+ }++ private function getRequiresAcceptancePrompt(): ?string+ {+ if (!$this->requiresAcceptance()) {+ return null;+ }++ $acceptanceUrl = $this->assets->count() === 1+ ? route('account.accept.item', $this->assets->first())+ : route('account.accept');++ return+ sprintf(+ '**[✔ %s](%s)**',+ trans_choice('mail.click_here_to_review_terms_and_accept_item', $this->assets->count()),+ $acceptanceUrl,+ );}private function getSingularEula()@@ -140,20 +158,4 @@ class BulkAssetCheckoutMail extends Mailablefn($count, $asset) => $count + $asset->requireAcceptance());}-- private function getRequiresAcceptanceWording(): array- {- if (!$this->requiresAcceptance()) {- return [];- }-- return [- trans_choice('mail.items_checked_out_require_acceptance', $this->assets->count()),- sprintf(- '**[✔ %s](%s)**',- trans_choice('mail.click_here_to_review_terms_and_accept_item', $this->assets->count()),- $this->getAcceptanceUrl(),- ),- ];- }}diff --git a/resources/views/mail/markdown/bulk-asset-checkout-mail.blade.php b/resources/views/mail/markdown/bulk-asset-checkout-mail.blade.phpindex d8d71e1482..a603a0da06 100644--- a/resources/views/mail/markdown/bulk-asset-checkout-mail.blade.php+++ b/resources/views/mail/markdown/bulk-asset-checkout-mail.blade.php@@ -17,9 +17,9 @@{{ $introduction }}@if ($requires_acceptance)-@foreach($requires_acceptance_wording as $line)-{{ $line }}<br>-@endforeach+{{ $requires_acceptance_info }}++{{ $requires_acceptance_prompt }}<hr>@endif@@ -83,6 +83,10 @@</x-mail::panel>@endif+@if ($requires_acceptance)+{{ $requires_acceptance_prompt }}+@endif+**{{ trans('general.administrator') }}**: {{ $admin->display_name }}{{ trans('mail.best_regards') }}<br>