Selaa lähdekoodia

Auto-send results attachment

Samson Mutunga 6 kuukautta sitten
vanhempi
commit
0ef4840e57

+ 8 - 1
app/Http/Controllers/AdminController.php

@@ -530,6 +530,10 @@ class AdminController extends Controller
     $order->detail_json = json_encode($detailJson);
     $order->save();
 
+    if($fileRef === 'results_attachment'){
+        $this->emailReport($request, $order);
+    }
+
     return $this->pass();
   }
 
@@ -545,10 +549,13 @@ class AdminController extends Controller
     $emailParams = [
         'toEmail' => $order->user->getEmail(),
         'toName' => $order->user->displayName(),
-        'subject' => 'Test Results for Order #' . $order->iid,
+        'subject' => 'Your Test Results Are Ready',
         'message' => $request->get('message'),
         'attachmentPath' => $results_attachment['path']
     ];
+    if(!$emailParams['message']){
+        $emailParams['message'] = '<p>Your test results are now available in your secure account.</p><p>To view your results, please click the button below to log in:</p>';
+    }
 
     $response = $this->emailService->sendEmailWithAttachment($emailParams);
     return $this->pass();

+ 1 - 1
resources/views/emails/layout.blade.php

@@ -316,7 +316,7 @@
 
 
 
-                                        <p style="color: #000; font-size: 15px; line-height: 1.625; margin: .4em 0 1.1875em;padding: 0 15px;">Cheers,</p>
+                                        <p style="color: #000; font-size: 15px; line-height: 1.625; margin: .4em 0 1.1875em;padding: 0 15px;">Thank you,</p>
 
                                         <p style="color: #000; font-size: 15px; line-height: 1.625; letter-spacing: 0; margin: .4em 0 1.1875em;padding: 0 15px;"><b>{{$stringMappingConfig['name']}} Team</b>
                                         <a href="{{$stringMappingConfig['productUrl']}}" target="_blank" style="margin-top:0px;display:block;color:#1C3D80;text-decoration:none;">{{$stringMappingConfig['productUrl']}}</a></p>

+ 1 - 0
resources/views/emails/templates/attachment.blade.php

@@ -12,4 +12,5 @@
     <p class="f-fallback" style="color: #000; font-size: 15px; padding: 0 15px; line-height: 24px; margin: .4em 0 0.1875em;">
     <?= nl2br($params['message']) ?>
     </p>
+    <p class="f-fallback" style="color: #000; font-size: 15px; padding: 0 15px; line-height: 24px; margin: .4em 0 0.1875em;">For your confidentiality, no details are included in this email.</p>
 @endsection