Merge branch 'development'

byng-systems · Sep 22, 2015 · c822c84 · c822c84
2 parents 5c7acd7 + 9686a49
commit c822c84
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Service/SendGridTemplatingMailerService.php b/Service/SendGridTemplatingMailerService.php
@@ -100,10 +100,10 @@ public function setThrowExceptionsOnFail($throwExceptionsOnFail)
         $this->throwExceptionsOnFail = ($throwExceptionsOnFail === true);
     }
 
-    public function sendHtmlEmail(array $from, array $to, $subject, $bodyHtml, array $additionalHeaders = array())
+    public function sendHtmlEmail(array $from, array $to, $subject, $bodyHtml, array $additionalHeaders = array(), array $attachments = null)
     {
         // 
-        $email = static::buildBaseEmail($from, $to, $subject, $additionalHeaders);
+        $email = static::buildBaseEmail($from, $to, $subject, $additionalHeaders, $attachments);
 
         // If the given body is a TemplatedEmailBody object, populate and reassign the string value to itself
         if ($bodyHtml instanceof TemplatedEmailBody) {
@@ -139,7 +139,7 @@ protected function processResponse(StdClass $response, $throwExceptionOnFail = t
         return $result;
     }
 
-    protected static function buildBaseEmail(array $from, array $to, $subject, array $additionalHeaders = array())
+    protected static function buildBaseEmail(array $from, array $to, $subject, array $additionalHeaders = array(), array $attachments = null)
     {
         $email = new Email();
 
@@ -168,6 +168,10 @@ protected static function buildBaseEmail(array $from, array $to, $subject, array
         if (isset($additionalHeaders["reply-to"])) {
             $email->setReplyTo($additionalHeaders["reply-to"]);
         }
+
+        if (isset($attachments)) {
+            $email->setAttachments($attachments);
+        }
 
         return $email;
     }