Add default replyToEmail

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes for Campaign
 
+## 2.17.7 - 2024-10-31
+
+### Changed
+
+- The “from names and emails” setting now accepts environment variables ([#503](https://github.com/putyourlightson/craft-campaign/issues/503)).
+
 ## 2.17.6 - 2024-10-08
 
 ### Fixed

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "putyourlightson/craft-campaign",
   "description": "Send and manage email campaigns, contacts and mailing lists.",
-  "version": "2.17.6",
+  "version": "2.17.7",
   "type": "craft-plugin",
   "homepage": "https://putyourlightson.com/plugins/campaign",
   "license": "proprietary",

src/Campaign.php

@@ -401,9 +401,9 @@ protected function createSettingsModel(): SettingsModel
         $settings->apiKey = StringHelper::randomString(16);
         $settings->fromNamesEmails = [
             [
-                $mailSettings->fromName,
-                $mailSettings->fromEmail,
-                '',
+                $mailSettings->fromName ?? '',
+                $mailSettings->fromEmail ?? '',
+                $mailSettings->replyToEmail ?? '',
                 Craft::$app->getSites()->getPrimarySite()->id,
             ],
         ];

src/helpers/SettingsHelper.php

@@ -57,9 +57,9 @@ public static function getFromNameEmail(int $siteId = null): array
             $mailSettings = App::mailSettings();
 
             $firstFromNameEmail = [
-                'name' => App::parseEnv($mailSettings->fromName),
-                'email' => App::parseEnv($mailSettings->fromEmail),
-                'replyTo' => App::parseEnv($mailSettings->replyToEmail),
+                'name' => App::parseEnv($mailSettings->fromName) ?? '',
+                'email' => App::parseEnv($mailSettings->fromEmail) ?? '',
+                'replyTo' => App::parseEnv($mailSettings->replyToEmail) ?? '',
             ];
         }
 

src/models/SettingsModel.php

@@ -456,7 +456,7 @@ public function getTurnstileErrorMessage(): string
     /**
      * Returns the parsed from names and emails.
      *
-     * @since 3.5.6
+     * @since 2.17.7
      */
     public function getFromNamesEmails(): array
     {