Change Permissions

Fix merge_vars Fix get url
ebizmarts · Mar 2, 2016 · f0054b8 · f0054b8
1 parent ce16975
commit f0054b8
Show file tree

Hide file tree

Showing 28 changed files with 45 additions and 19 deletions.
diff --git a/Block/Adminhtml/System/Config/Account.php b/Block/Adminhtml/System/Config/Account.php
diff --git a/Block/Adminhtml/System/Config/Fieldset/Hint.php b/Block/Adminhtml/System/Config/Fieldset/Hint.php
diff --git a/Block/Adminhtml/System/Config/Form/Field/Customermap.php b/Block/Adminhtml/System/Config/Form/Field/Customermap.php
diff --git a/Block/Adminhtml/System/Config/OauthWizard.php b/Block/Adminhtml/System/Config/OauthWizard.php
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -81,13 +81,14 @@ public function getMergeVars($customer,$store = null)
         $mergeVars  = unserialize($this->scopeConfig->getValue(self::XML_PATH_MAPPING, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store));
         foreach($mergeVars as $map)
         {
-            $this->_getMergeVarsValue($map, $customer);
+            array_merge($merge_vars,$this->_getMergeVarsValue($map, $customer));
         }
         return $merge_vars;
     }
 
     protected function _getMergeVarsValue($map, $customer)
     {
+        $merge_vars = array();
         $customAtt = $map['magento'];
         $chimpTag  = $map['mailchimp'];
         if($chimpTag && $customAtt) {
@@ -120,27 +121,18 @@ protected function _getMergeVarsValue($map, $customer)
                 case 'billing_address':
                 case 'shipping_address':
                     $addr = explode('_', $customAtt);
-                    if ($address = $customer->{'getPrimary' . ucfirst($addr[0]) . 'Address'}()) {
+                    array_merge($merge_vars,$this->_updateMergeVars($key,ucfirst($addr[0]),$customer));
-                        $merge_vars[$key] = array(
-                            'addr1' => $address->getStreet(1),
-                            'addr2' => $address->getStreet(2),
-                            'city' => $address->getCity(),
-                            'state' => (!$address->getRegion() ? $address->getCity() : $address->getRegion()),
-                            'zip' => $address->getPostcode(),
-                            'country' => $address->getCountryId()
-                        );
-                    }
                     break;
                 case 'telephone':
-                    if ($address = $customer->{'getPrimaryBillingAddress'}()) {
+                    if ($address = $customer->{'getDefaultBillingAddress'}()) {
                         $telephone = $address->getTelephone();
                         if ($telephone) {
                             $merge_vars['TELEPHONE'] = $telephone;
                         }
                     }
                     break;
                 case 'company':
-                    if ($address = $customer->{'getPrimaryBillingAddress'}()) {
+                    if ($address = $customer->{'getDefaultBillingAddress'}()) {
                         $company = $address->getCompany();
                         if ($company) {
                             $merge_vars['COMPANY'] = $company;
@@ -168,4 +160,19 @@ protected function _getMergeVarsValue($map, $customer)
             return $merge_vars;
         }
     }
+    protected function _updateMergeVars($key,$type,$customer)
+    {
+        $merge_vars = array();
+        if ($address = $customer->{'getDefault' . $type . 'Address'}()) {
+            $merge_vars[$key] = array(
+                'addr1' => $address->getStreetLine(1),
+                'addr2' => $address->getStreetLine(2),
+                'city' => $address->getCity(),
+                'state' => (!$address->getRegion() ? $address->getCity() : $address->getRegion()),
+                'zip' => $address->getPostcode(),
+                'country' => $address->getCountryId()
+            );
+        }
+        return $merge_vars;
+    }
 }
diff --git a/Model/Api.php b/Model/Api.php
diff --git a/Model/Config.php b/Model/Config.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * magento2magemonkey Magento Component
+ *
+ * @category Ebizmarts
+ * @package magento2magemonkey
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 3/2/16 2:44 PM
+ * @file: ModelConfig.php
+ */
+namespace Ebizmarts\MageMonkey\Model;
+
+class Config
+{
+    CONST   ENDPOINT    = 'api.mailchimp.com';
+    CONST   SCHEME      = 'https';
+}
diff --git a/Model/Config/Source/Details.php b/Model/Config/Source/Details.php
diff --git a/Model/Config/Source/Monkeylist.php b/Model/Config/Source/Monkeylist.php
diff --git a/Model/Logger/Handler/System.php b/Model/Logger/Handler/System.php
diff --git a/Model/Logger/Magemonkey.php b/Model/Logger/Magemonkey.php
diff --git a/Model/MCAPI.php b/Model/MCAPI.php
@@ -14,7 +14,7 @@
 class MCAPI
 {
     protected $_version     = "3.0";
-    protected $_apiUrl      = null;
+//    protected $_apiUrl      = null;
     protected $_timeout     = 300;
     protected $_chunkSize   = 8192;
     protected $_apiKey      = null;
@@ -31,7 +31,7 @@ public function __construct(
     )
     {
         $this->_helper = $helper;
-        $this->_apiUrl  = parse_url("http://api.mailchimp.com/" . $this->_version);
+//        $this->_apiUrl  = parse_url(\Ebizmarts\MageMonkey\Model\Config::MAILCHIMP_ENDPOINT);
     }
 
     public function load($apiKey, $secure = false){
@@ -72,7 +72,7 @@ public function callServer($use = 'GET',$method = null, $params = null,$fields =
                 $dc = 'us1';
             }
         }
-        $host   = $dc.'.'.$this->_apiUrl['host'].'/'.$this->_version;
+        $host   = $dc.'.'.\Ebizmarts\MageMonkey\Model\Config::ENDPOINT.'/'.$this->_version;
         if($method)
         {
             $host .= "/$method";
@@ -120,7 +120,7 @@ public function callServer($use = 'GET',$method = null, $params = null,$fields =
 
         }
 
-        curl_setopt($ch, CURLOPT_URL, $host);
+        curl_setopt($ch, CURLOPT_URL, \Ebizmarts\MageMonkey\Model\Config::SCHEME.'://'.$host);
         curl_setopt($ch, CURLOPT_USERAGENT, 'MageMonkey/'); // @todo put the version of MageMonkey
         curl_setopt($ch, CURLOPT_HEADER, true);
         curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json','Authorization: apikey '.$key,'Cache-Control: no-cache'));
@@ -136,7 +136,7 @@ public function callServer($use = 'GET',$method = null, $params = null,$fields =
         $responseCode   = curl_getinfo($ch,CURLINFO_HTTP_CODE);
         curl_close($ch);
         $data           = json_decode($body);
-        $this->_helper->log(print_r(json_encode($data),1));
+        $this->_helper->log(var_export(json_encode($data),1));
         switch($use)
         {
             case 'DELETE':

diff --git a/Model/Plugin/Subscriber.php b/Model/Plugin/Subscriber.php
@@ -87,7 +87,7 @@ public function beforeSubscribeCustomerById(
             }else {
                 $data = array('list_id' => $this->_helper->getDefaultList(), 'email_address' => $customer->getEmail(), 'email_type' => 'html', 'status' => $status);
             }
-            $this->_helper->log(print_r(json_encode($data), 1));
+            $this->_helper->log(var_export(json_encode($data), 1));
             $return = $api->listCreateMember($this->_helper->getDefaultList(), json_encode($data));
             if (isset($return->id)) {
                 $subscriber->setMagemonkeyId($return->id);

diff --git a/Model/Resource/Setup.php b/Model/Resource/Setup.php
diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
diff --git a/Test/Unit/Model/Config/Source/DetailsTest.php b/Test/Unit/Model/Config/Source/DetailsTest.php
diff --git a/Test/Unit/Model/Config/Source/MonkeylistTest.php b/Test/Unit/Model/Config/Source/MonkeylistTest.php
diff --git a/Test/Unit/Model/Plugin/SubscriberTest.php b/Test/Unit/Model/Plugin/SubscriberTest.php
diff --git a/composer.json b/composer.json
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
diff --git a/etc/config.xml b/etc/config.xml
diff --git a/etc/di.xml b/etc/di.xml
diff --git a/etc/module.xml b/etc/module.xml
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
diff --git a/registration.php b/registration.php
diff --git a/view/adminhtml/templates/system/config/fieldset/hint.phtml b/view/adminhtml/templates/system/config/fieldset/hint.phtml
diff --git a/view/adminhtml/templates/system/config/oauth_wizard.phtml b/view/adminhtml/templates/system/config/oauth_wizard.phtml