Added functionality to add from e-mail address and from name

Author: rickdegraaf-dq

database/migrations/2017_12_14_151403_create_emails_table.php

@@ -21,6 +21,7 @@ public function up()
             $table->increments('id');
             $table->string('label')->nullable();
             $table->binary('recipient');
+            $table->binary('from')>nullable();
             $table->binary('cc')->nullable();
             $table->binary('bcc')->nullable();
             $table->binary('subject');

src/Email.php

@@ -10,6 +10,7 @@
  * @property $id
  * @property $label
  * @property $recipient
+ * @property $from
  * @property $cc
  * @property $bcc
  * @property $subject
@@ -84,6 +85,16 @@ public function getRecipient()
         return $this->recipient;
     }
 
+    /**
+     * Get the e-mail from.
+     *
+     * @return string|null
+     */
+    public function getFrom()
+    {
+        return $this->from;
+    }
+
     /**
      * Get the e-mail recipient(s) as string.
      *
@@ -231,6 +242,16 @@ public function getError()
         return $this->error;
     }
 
+    /**
+     * Determine if the e-mail should be sent with custom from values.
+     *
+     * @return bool
+     */
+    public function hasFrom()
+    {
+        return strlen($this->getOriginal('from')) > 0;
+    }
+
     /**
      * Determine if the e-mail should be sent as a carbon copy.
      *

src/EmailComposer.php

@@ -92,6 +92,17 @@ public function label($label)
         return $this->setData('label', $label);
     }
 
+    /**
+     * Set the e-mail from address and aname.
+     *
+     * @param array $from
+     * @return static
+     */
+    public function from($address, $name)
+    {
+        return $this->setData('from', ['address' => $address, 'name' => $name]);
+    }
+
     /**
      * Set the e-mail recipient(s).
      *

src/Encrypter.php

@@ -15,6 +15,8 @@ public function encrypt(EmailComposer $composer)
 
         $this->encryptRecipients($composer);
 
+        $this->encryptFrom($composer);
+
         $this->encryptSubject($composer);
 
         $this->encryptVariables($composer);
@@ -48,6 +50,20 @@ private function encryptRecipients(EmailComposer $composer)
         ]);
     }
 
+    /**
+     * Encrypt the e-mail addresses for the from field.
+     *
+     * @param EmailComposer $composer
+     */
+    private function encryptFrom(EmailComposer $composer)
+    {
+        $email = $composer->getEmail();
+
+        $email->fill([
+            'from' => encrypt($email->from),
+        ]);
+    }
+
     /**
      * Encrypt the e-mail subject.
      *

src/HasEncryptedAttributes.php

@@ -13,6 +13,7 @@ trait HasEncryptedAttributes
      */
     private $encrypted = [
         'recipient',
+        'from',
         'cc',
         'bcc',
         'subject',
@@ -27,6 +28,7 @@ trait HasEncryptedAttributes
      */
     private $encoded = [
         'recipient',
+        'from',
         'cc',
         'bcc',
         'variables',

src/MailableReader.php

@@ -16,6 +16,12 @@ public function read(EmailComposer $composer)
     {
         $this->readRecipient($composer);
 
+
+
+        $this->readFrom($composer);
+
+
+
         $this->readCc($composer);
 
         $this->readBcc($composer);
@@ -54,6 +60,20 @@ private function readRecipient(EmailComposer $composer)
         $composer->recipient($to);
     }
 
+    /**
+     * Read the mailable from field to the email composer.
+     *
+     * @param EmailComposer $composer
+     */
+    private function readFrom(EmailComposer $composer)
+    {
+        $from = $this->convertMailableAddresses(
+            $composer->getData('mailable')->from
+        );
+
+        $composer->from($from);
+    }
+
     /**
      * Read the mailable cc to the email composer.
      *

src/Preparer.php

@@ -17,6 +17,8 @@ public function prepare(EmailComposer $composer)
 
         $this->prepareRecipient($composer);
 
+        $this->prepareFrom($composer);
+
         $this->prepareCc($composer);
 
         $this->prepareBcc($composer);
@@ -66,6 +68,22 @@ private function prepareRecipient(EmailComposer $composer)
         ]);
     }
 
+    /**
+     * Prepare the from values for database storage.
+     *
+     * @param EmailComposer $composer
+     */
+    private function prepareFrom(EmailComposer $composer)
+    {
+        if (!$composer->hasData('from')) {
+            return;
+        }
+
+        $composer->getEmail()->fill([
+            'from' => json_encode($composer->getData('from')),
+        ]);
+    }
+
     /**
      * Prepare the carbon copies for database storage.
      *

src/Sender.php

@@ -45,11 +45,17 @@ private function getMailerInstance()
      */
     private function buildMessage(Message $message, Email $email)
     {
+
+        $from = $email->hasFrom() ? $email->getFrom() : ['address' => config('mail.from.address'), 'name' => config('mail.from.name')];
+        foreach ($from as $key => $val) {
+            $from[$key] = !empty($val) ? $val : config('mail.from.' . $key);
+        }
+
         $message->to($email->getRecipient())
             ->cc($email->hasCc() ? $email->getCc() : [])
             ->bcc($email->hasBcc() ? $email->getBcc() : [])
             ->subject($email->getSubject())
-            ->from(config('mail.from.address'), config('mail.from.name'))
+            ->from($from['address'], $from['name'])
             ->setBody($email->getBody(), 'text/html');
 
         $attachmentMap = [