Merge remote-tracking branch 'origin/develop' into develop

Author: Godmartinz

app/Listeners/CheckoutableListener.php

@@ -461,15 +461,18 @@ private function shouldSendEmailToAlertAddress($acceptance = null): bool
             return false;
         }
 
-        return (bool) $setting->admin_cc_email;
+        return $setting->admin_cc_email || $setting->alert_email;
     }
 
     private function getFormattedAlertAddresses(): array
-    {
-        $alertAddresses = Setting::getSettings()->admin_cc_email;
+    {   $setting = Setting::getSettings();
+        $alertAddresses = [
+            $setting->admin_cc_email?? '',
+            $setting->alert_email?? '',
+            ];
 
         if ($alertAddresses !== '') {
-            return array_filter(array_map('trim', explode(',', $alertAddresses)));
+            return array_filter(array_map('trim', explode(',', implode(',',$alertAddresses))));
         }
 
         return [];