Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Models/CheckoutAcceptance.php

@@ -207,6 +207,9 @@ public function generateAcceptancePdf($data, $pdf_filename) {
         if ($data['item_serial'] != null) {
             $pdf->writeHTML(trans('admin/hardware/form.serial').': '.e($data['item_serial']), true, 0, true, 0, '');
         }
+        if (($data['qty'] != null) && ($data['qty'] > 1)) {
+            $pdf->writeHTML(trans('general.qty').': '.e($data['qty']), true, 0, true, 0, '');
+        }
         $pdf->writeHTML(trans('general.assignee').': '.e($data['assigned_to']), true, 0, true, 0, '');
         $pdf->Ln();
         $pdf->writeHTML('<hr>', true, 0, true, 0, '');

app/Notifications/AcceptanceAssetAcceptedToUserNotification.php

@@ -72,10 +72,10 @@ public function toMail()
                 'company_name'  => $this->company_name,
                 'admin'         => $this->admin,
                 'qty' => $this->qty,
-                'intro_text'    => trans('mail.acceptance_asset_accepted_to_user', ['site_name' => $this->company_name ?? $this->settings->site_name]),
+                'intro_text'    => trans_choice('mail.acceptance_asset_accepted_to_user', $this->qty, ['qty' => $this->qty, 'site_name' => $this->settings->site_name]),
             ])
             ->attach($pdf_path)
-            ->subject(trans('mail.acceptance_asset_accepted_to_user', ['site_name' => $this->settings->site_name]));
+            ->subject(trans_choice('mail.acceptance_asset_accepted_to_user', $this->qty, ['qty' => $this->qty, 'site_name' => $this->settings->site_name]));
 
         return $message;
     }

resources/lang/en-US/mail.php

@@ -31,7 +31,7 @@
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
-    'acceptance_asset_accepted_to_user' => 'You have accepted an item assigned to you by :site_name',
+    'acceptance_asset_accepted_to_user' => 'You have accepted an item assigned to you by :site_name|You have accepted :qty items assigned to you by :site_name',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
     'send_pdf_copy' => 'Send a copy of this acceptance to my email address',