Catch email fetching errors

trustpilot · Aug 1, 2018 · c65989b · c65989b
1 parent 242ab80
commit c65989b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 17 deletions.
diff --git a/Helper/OrderData.php b/Helper/OrderData.php
@@ -31,19 +31,35 @@ public function getEmail($order)
     {
         if ($this->is_empty($order))
             return '';
-
-        if (!($this->is_empty($order->getCustomerEmail())))
-            return $order->getCustomerEmail();
 
-        else if (!($this->is_empty($order->getShippingAddress()->getEmail())))
-            return $order->getShippingAddress()->getEmail();
+        try {
+            if (!($this->is_empty($order->getCustomerEmail())))
+                return $order->getCustomerEmail();
+        } catch(\Exception $e) {
+            // Just going to the next check
+        }
 
-        else if (!($this->is_empty($order->getBillingAddress()->getEmail())))
-            return $order->getBillingAddress()->getEmail();
+        try {
+            if (!($this->is_empty($order->getShippingAddress()->getEmail())))
+                return $order->getShippingAddress()->getEmail();
+        } catch (\Exception $e) {
+            // Just going to the next check
+        }
+
+        try {
+            if (!($this->is_empty($order->getBillingAddress()->getEmail())))
+                return $order->getBillingAddress()->getEmail();
+        } catch (\Exception $e) {
+            // Just going to the next check
+        }
+
+        try {
+            if (!($this->is_empty($order->getCustomerId())))
+                return $this->_customer->load($order->getCustomerId())->getEmail();
+        } catch (\Exception $e) {
+            // Just skipping an email
+        }
 
-        else if (!($this->is_empty($order->getCustomerId())))
-            return $this->_customer->load($order->getCustomerId())->getEmail();
-
         return '';
     }
 

diff --git a/Observer/ConfigObserver.php b/Observer/ConfigObserver.php
@@ -35,9 +35,9 @@ public function getSettings()
         $globalSettings = new \stdClass();
         $globalSettings->source         = 'Magento2';
         $globalSettings->pluginVersion  = $this->_helper->getGeneralConfigValue('ReleaseNumber');
-        $globalSettings->magentoVersion = 'Magento-'.$this->getVersion();
-        $id = 0;
+        $globalSettings->version = 'Magento-'.$this->getVersion();
         $stores = $this->getStores();
+        $globalSettings->stores = array();
         foreach ($stores as $store) {
             $general = new \stdClass();
             $general->key            = trim($this->_helper->getGeneralConfigValue('key'));
@@ -59,9 +59,7 @@ public function getSettings()
             $settings = new \stdClass();
             $settings->general = $general;
             $settings->trustbox = $trustbox;
-
-            $globalSettings->$id = $settings;
-            $id = $id + 1;
+            array_push($globalSettings->stores, $settings);
         }
 
         return $globalSettings;

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "trustpilot/module-reviews",
     "description": "The Trustpilot Review extension makes it simple and easy for merchants to collect reviews from their customers to power their marketing efforts, increase sales conversion, build their online reputation and draw business insights.",
     "type": "magento2-module",
-    "version": "1.0.201",
+    "version": "1.0.214",
     "license": [
       "OSL-3.0"
     ],

diff --git a/etc/config.xml b/etc/config.xml
@@ -10,7 +10,7 @@
                <ConnectUrl>https://ecommerce-invitations.b2b.trustpilot.com/#/magento</ConnectUrl>
                <SnippetUrl>https://businessapp.b2b.trustpilot.com/#/integrations/trustbox/library</SnippetUrl>
                <PreviewUrl>//ecommplugins-scripts.trustpilot.com/</PreviewUrl>
-               <ReleaseNumber>1.0.201</ReleaseNumber>
+               <ReleaseNumber>1.0.214</ReleaseNumber>
                <key></key>
             </general>
        </trustpilotGeneral>