Handle orders/carts count errors

thirtybees · May 2, 2018 · 8c7406f · 8c7406f
1 parent 5a2df4e
commit 8c7406f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/classes/MailChimpCart.php b/classes/MailChimpCart.php
@@ -126,9 +126,16 @@ public static function getCarts($idShops = null, $offset = 0, $limit = 0, $remai
             }
             $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
         } catch (PrestaShopException $e) {
-            Context::getContext()->controller->errors[] = Translate::getModuleTranslation('mailchimp', 'Unable to count carts properly', 'mailchimp');
+            if ($count) {
+                Context::getContext()->controller->errors[] = Translate::getModuleTranslation('mailchimp', 'Unable to count carts properly', 'mailchimp');
+            } else {
+                Context::getContext()->controller->errors[] = Translate::getModuleTranslation('mailchimp', 'Unable to find carts', 'mailchimp');
+            }
 
-            return 0;
+            return false;
+        }
+        if (empty($results)) {
+            return [];
         }
 
         $defaultCurrency = Currency::getDefaultCurrency();

diff --git a/classes/MailChimpOrder.php b/classes/MailChimpOrder.php
@@ -124,7 +124,11 @@ public static function getOrders($idShops = null, $offset = 0, $limit = 0, $rema
 
             $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
         } catch (PrestaShopException $e) {
-            Context::getContext()->controller->errors[] = Translate::getModuleTranslation('mailchimp', 'Unable to count orders', 'mailchimp');
+            if ($count) {
+                Context::getContext()->controller->errors[] = Translate::getModuleTranslation('mailchimp', 'Unable to count orders', 'mailchimp');
+            } else {
+                Context::getContext()->controller->errors[] = Translate::getModuleTranslation('mailchimp', 'Unable to find orders', 'mailchimp');
+            }
 
             return false;
         }