Merge pull request #17826 from marcusmoore/fixes/17585-accessory-checkout-amount-in-subject

Fixed #17585 - Display accessory checkout qty in subject line and intro text

Author: snipe

app/Mail/CheckoutAccessoryMail.php

@@ -43,7 +43,7 @@ public function envelope(): Envelope
 
         return new Envelope(
             from: $from,
-            subject: trans('mail.Accessory_Checkout_Notification'),
+            subject: trans_choice('mail.Accessory_Checkout_Notification', $this->checkout_qty),
         );
     }
 
@@ -83,17 +83,19 @@ public function content(): Content
             ],
         );
     }
+
     private function introductionLine(): string
     {
         if ($this->target instanceof Location) {
-            return trans('mail.new_item_checked_location', ['location' => $this->target->name ]);
+            return trans_choice('mail.new_item_checked_location', $this->checkout_qty, ['location' => $this->target->name]);
         }
+
         if ($this->requiresAcceptance()) {
-            return trans('mail.new_item_checked_with_acceptance');
+            return trans_choice('mail.new_item_checked_with_acceptance', $this->checkout_qty);
         }
 
         if (!$this->requiresAcceptance()) {
-            return trans('mail.new_item_checked');
+            return trans_choice('mail.new_item_checked', $this->checkout_qty);
         }
 
         // we shouldn't get here but let's send a default message just in case

app/Mail/CheckoutAssetMail.php

@@ -138,14 +138,15 @@ private function getSubject(): string
     private function introductionLine(): string
     {
         if ($this->firstTimeSending && $this->target instanceof Location) {
-            return trans('mail.new_item_checked_location', ['location' => $this->target->name ]);
+            return trans_choice('mail.new_item_checked_location', 1, ['location' => $this->target->name]);
         }
+
         if ($this->firstTimeSending && $this->requiresAcceptance()) {
-            return trans('mail.new_item_checked_with_acceptance');
+            return trans_choice('mail.new_item_checked_with_acceptance', 1);
         }
 
         if ($this->firstTimeSending && !$this->requiresAcceptance()) {
-            return trans('mail.new_item_checked');
+            return trans_choice('mail.new_item_checked', 1);
         }
 
         if (!$this->firstTimeSending && $this->requiresAcceptance()) {

resources/lang/en-US/mail.php

@@ -3,7 +3,7 @@
 return [
 
     'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Accessory_Checkout_Notification' => 'Accessory checked out',
+    'Accessory_Checkout_Notification' => 'Accessory checked out|:count Accessories checked out',
     'Asset_Checkin_Notification' => 'Asset checked in: :tag',
     'Asset_Checkout_Notification' => 'Asset checked out: :tag',
     'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
@@ -75,9 +75,9 @@
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
-    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
-    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
-    'new_item_checked_location' => 'A new item has been checked out to :location, details are below.',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.|:count new items have been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.|:count new items have been checked out under your name that requires acceptance, details are below.',
+    'new_item_checked_location' => 'A new item has been checked out to :location, details are below.|:count new items have been checked out to :location, details are below.',
     'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
     'password' => 'Password',

resources/views/mail/markdown/checkout-component.blade.php

@@ -1,7 +1,7 @@
 @component('mail::message')
 # {{ trans('mail.hello') }} {{ $target->assignedto->display_name }},
 
-{{ trans('mail.new_item_checked') }}
+{{ trans_choice('mail.new_item_checked', $qty) }}
 
 @component('mail::table')
 |        |          |
@@ -47,4 +47,4 @@
 
 {{ $snipeSettings->site_name }}
 
-@endcomponent
+@endcomponent

resources/views/mail/markdown/checkout-consumable.blade.php

@@ -1,7 +1,7 @@
 @component('mail::message')
 # {{ trans('mail.hello') }} {{ $target->display_name }},
 
-{{ trans('mail.new_item_checked') }}
+{{ trans_choice('mail.new_item_checked', $qty) }}
 
 
 @component('mail::table')

resources/views/mail/markdown/checkout-license.blade.php

@@ -1,7 +1,7 @@
 @component('mail::message')
 # {{ trans('mail.hello').' '.$target.','}}
 
-{{ trans('mail.new_item_checked') }}
+{{ trans_choice('mail.new_item_checked', 1) }}
 
 @component('mail::table')
 |        |          |