Merge pull request #407 from mageplaza/2.4-develop

2.4 develop

Helper/EmailMarketing.php

@@ -538,7 +538,7 @@ public function getCustomerName(Quote $quote)
             if ($customer && $customer->getId()) {
                 $customerName = trim($customer->getFirstname() . ' ' . $customer->getLastname());
             } else {
-                $customerName = explode('@', $quote->getCustomerEmail())[0];
+                $customerName = explode('@', $quote->getCustomerEmail() ?: '')[0];
             }
         }
 

composer.json

@@ -2,10 +2,10 @@
   "name": "mageplaza/module-smtp",
   "description": "SMTP Extension for Magento 2 helps the owner of store simply install SMTP (Simple Mail Transfer Protocol) server which transmits the messages into codes or numbers",
   "require": {
-    "mageplaza/module-core": "^1.5.3"
+    "mageplaza/module-core": "^1.5.4"
   },
   "type": "magento2-module",
-  "version": "4.7.7",
+  "version": "4.7.8",
   "license": "proprietary",
   "authors": [
     {

etc/email_templates.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Mageplaza
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Mageplaza.com license that is
- * available through the world-wide-web at this URL:
- * https://www.mageplaza.com/LICENSE.txt
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade this extension to newer
- * version in the future.
- *
- * @category    Mageplaza
- * @package     Mageplaza_Smtp
- * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
- * @license     https://www.mageplaza.com/LICENSE.txt
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
-    <template id="mpsmtp_resend_email_template" label="SMTP Resend Email" file="resend_email_template.html" type="html" module="Mageplaza_Smtp" area="frontend"/>
-    <template id="mpsmtp_test_email_template" label="SMTP Test Email" file="test_email_template.html" type="html" module="Mageplaza_Smtp" area="frontend"/>
-    <template id="mpsmtp_abandoned_cart_email_template" label="SMTP Abandoned Cart Email" file="abandoned_cart_email_template.html" type="html" module="Mageplaza_Smtp" area="frontend"/>
-</config>
+<?xml version="1.0"?>
+<!--
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_Smtp
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
+    <template id="mpsmtp_resend_email_template" label="SMTP Resend Email" file="resend_email_template.html" type="html" module="Mageplaza_Smtp" area="frontend"/>
+    <template id="mpsmtp_test_email_template" label="SMTP Test Email" file="test_email_template.html" type="html" module="Mageplaza_Smtp" area="frontend"/>
+    <template id="mpsmtp_abandoned_cart_email_templates" label="SMTP Abandoned Cart Email" file="abandoned_cart_email_template.html" type="html" module="Mageplaza_Smtp" area="frontend"/>
+</config>