A free open source IT asset/license management system
send checkout mail without link or acceptance reference
Godfrey Mf19ac4d5bbe6
diff --git a/app/Mail/CheckoutAssetMail.php b/app/Mail/CheckoutAssetMail.phpindex a9a883b1e3..dc264baf8b 100644--- a/app/Mail/CheckoutAssetMail.php+++ b/app/Mail/CheckoutAssetMail.php@@ -132,6 +132,9 @@ class CheckoutAssetMail extends BaseMailableprivate function introductionLine(): string{+ if (is_null($this->acceptance)) {+ return trans_choice('mail.new_item_checked', 1);+ }if ($this->firstTimeSending && $this->target instanceof Location) {return trans_choice('mail.new_item_checked_location', 1, ['location' => $this->target->name]);}@@ -140,7 +143,7 @@ class CheckoutAssetMail extends BaseMailablereturn trans_choice('mail.new_item_checked_with_acceptance', 1);}- if ($this->firstTimeSending && ! $this->requiresAcceptance()) {+ if ($this->firstTimeSending && !$this->requiresAcceptance()) {return trans_choice('mail.new_item_checked', 1);}@@ -149,7 +152,7 @@ class CheckoutAssetMail extends BaseMailable}// we shouldn't get here but let's send a default message just in case- return trans('new_item_checked');+ return trans('mail.new_item_checked');}private function requiresAcceptance(): int|booldiff --git a/resources/views/mail/markdown/checkout-asset.blade.php b/resources/views/mail/markdown/checkout-asset.blade.phpindex 0fdd43baa9..2b05ec0f99 100644--- a/resources/views/mail/markdown/checkout-asset.blade.php+++ b/resources/views/mail/markdown/checkout-asset.blade.php@@ -52,7 +52,7 @@| **{{ trans('mail.additional_notes') }}** | {{ $note }} |@endif@endcomponent-+@if($accept_url)@if (($req_accept == 1) && ($eula!='')){{ trans('mail.read_the_terms_and_click') }}@elseif (($req_accept == 1) && ($eula==''))@@ -70,7 +70,7 @@@if ($req_accept == 1)**[✔ {{ trans('mail.i_have_read') }}]({{ $accept_url }})**@endif-+@endif{{ trans('mail.best_regards') }}