closes #75

mailchimp · Aug 29, 2017 · 2aa6c88 · 2aa6c88
1 parent 5474a22
commit 2aa6c88
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -490,7 +490,10 @@ protected function _getCustomerMergeVarsValues($map, $customer, $merge_vars)
                     $merge_vars = array_merge($merge_vars, $this->_getCustomerGroup($customer, $key, $merge_vars));
                     break;
                 case 'store_id':
-                    $merge_vars[$key] = $customer->getStoreId();
+                    $storeId = $customer->getStoreId();
+                    if($storeId) {
+                        $merge_vars[$key] = $storeId;
+                    }
                     break;
             }
             return $merge_vars;
@@ -523,7 +526,9 @@ protected function _getSubscriberMergeVarsValues($map, $subscriber, $merge_vars)
                     $merge_vars = $this->_getCustomerGroup($subscriber, $key, $merge_vars);
                     break;
                 case 'store_id':
-                    $merge_vars[$key] = $subscriber->getStoreId();
+                    if($subscriber->getStoreId()) {
+                        $merge_vars[$key] = $subscriber->getStoreId();
+                    }
                     break;
             }
             return $merge_vars;