Merge branch 'release/3.0.0' of https://github.com/agnostack/magento_extension into release/3.0.0

Author: rsbowers

src/app/code/community/Zendesk/Zendesk/Helper/Data.php

@@ -456,7 +456,7 @@ protected function formatPrice($price, $currency)
     protected function formatCustomer($order)
     {
         $isGuest = (bool)$order->getCustomerIsGuest();
-        $id = $order->getCustomerId();
+        $id = $order->getCustomerId(); // TODO: should this be customerId or entity id??
         $email = $order->getCustomerEmail();
         $customer = array();
 
@@ -552,6 +552,7 @@ public function getOrderDetailBasic($order)
         $currency = $order->getOrderCurrencyCode();
         $shippingAddress = $order->getShippingAddress();
         $shippingWithTax = $order->getShippingInclTax();
+        $shippingMethod = $order->getShippingMethod();
 
         $orderInfo = array(
             'id' => $order->getIncrementId(),
@@ -610,14 +611,14 @@ public function getOrderDetailBasic($order)
             );
         }
 
-        if ($shippingWithTax) {
+        if ($shippingWithTax && $shippingMethod) {
             $shippingTax = $order->getShippingTaxAmount();
             $shippingItem = array(
                 'type' => 'custom_item',
                 'id' => 'shipping--'.$order->getEntityId(),
                 'product_id' => $order->getEntityId(),
                 'name' => 'shipping--'.$order->getShippingDescription(),
-                'sku' => $order->getShippingMethod(),
+                'sku' => $shippingMethod,
                 'quantity' => 1,
                 'refunded' => 0,
                 'meta' => array(
@@ -759,7 +760,7 @@ public function getCustomer($customer)
         return $info;
     }
 
-    public function getFilteredOrders($customerFilters, $generalFilters)
+    public function getFilteredOrders($customerFilters, $genericFilters)
     {
         // Get a list of all orders for the given email address
         // This is used to determine if a missing customer is a guest or if they really aren't a customer at all
@@ -769,8 +770,8 @@ public function getFilteredOrders($customerFilters, $generalFilters)
             $orderCollection->addFieldToFilter('customer_'.$customerKey, $customerValue);
         }
 
-        foreach($generalFilters as $generalKey => $generalValue) {
-            $orderCollection->addFieldToFilter($generalKey, $generalValue);
+        foreach($genericFilters as $genericKey => $genericValue) {
+            $orderCollection->addFieldToFilter($genericKey, $genericValue);
         }
 
         $orders = array();

src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php

@@ -403,7 +403,93 @@ public function finaliseAction()
 
     #region V2
 
-    // TODO: rename to searchOrdersAction?
+    public function customerAction()
+    {
+        if(!$this->_authorise()) {
+            return $this;
+        }
+
+        $sections = explode('/', trim($this->getRequest()->getPathInfo(), '/'));
+        $customerId = $sections[3];
+
+        $customer = Mage::getModel('customer/customer')->load($customerId);
+
+        if(!$customer->getEntityId()) {
+            $this->getResponse()
+                ->setBody(json_encode(null))
+                ->setHttpResponseCode(200)
+                ->setHeader('Content-type', 'application/json', true);
+            return $this;
+        }
+
+        $customerData = Mage::helper('zendesk')->getCustomer($customer);
+
+        $this->getResponse()
+            ->setBody(json_encode($customerData))
+            ->setHttpResponseCode(200)
+            ->setHeader('Content-type', 'application/json', true);
+        return $this;
+    }
+
+    public function searchCustomersAction()
+    {
+        if(!$this->_authorise()) {
+            return $this;
+        }
+
+        $req = $this->getRequest();
+        $isPost = $req->isPost();
+
+        if (!$isPost) {
+            $this->getResponse()
+                ->setHttpResponseCode(405)
+                ->setHeader('Content-type', 'application/json', true);
+            return $this;
+        }
+
+        $customerKey = 'customer';
+
+        $filters = json_decode($req->getRawBody());
+        $genericFilters = array();
+
+        foreach($filters as $key => $val) {
+            if($key == $customerKey) {
+                $customerFilters = $val;
+            } else {
+                $genericFilters[$key] = $val;
+            }
+        }
+
+        $customerCollection = Mage::getModel('customer/customer')->getCollection();
+
+        // TODO does this bring back guest cutsomers
+        foreach($customerFilters as $customerKey => $customerValue) {
+            $customerCollection->addFieldToFilter($customerKey, $customerValue);
+        }
+
+        foreach($genericFilters as $genericKey => $genericValue) {
+            $customerCollection->addFieldToFilter($genericKey, $genericValue);
+        }
+
+        $customerCollection->load();
+
+        $urlModel = Mage::getModel('adminhtml/url')->setStore('admin');
+
+        $customers = array();
+
+        foreach($customerCollection as $customer) {
+            $id = $customer->getId();
+            $customerDetails = Mage::getModel('customer/customer')->load($id);
+            $customers[] = Mage::helper('zendesk')->getCustomer($customerDetails);
+        }
+
+        $this->getResponse()
+            ->setBody(json_encode($customers))
+            ->setHttpResponseCode(200)
+            ->setHeader('Content-type', 'application/json', true);
+        return $this;
+    }
+
     public function searchOrdersAction()
     {
         if(!$this->_authorise()) {
@@ -424,22 +510,22 @@ public function searchOrdersAction()
         $customerKey = 'customer';
 
         $filters = json_decode($req->getRawBody());
-        $generalFilters = array();
+        $genericFilters = array();
 
         foreach($filters as $key => $val) {
             if($key == $productKey) {
                 $productFilters = $val;
             } else if($key == $customerKey) {
                 $customerFilters = $val;
             } else {
-                $generalFilters[$key] = $val;
+                $genericFilters[$key] = $val;
             }
         }
 
         if($productFilters) {
             $orders = Mage::helper('zendesk')->getFilteredOrdersByProduct($customerFilters, $productFilters);
         } else {
-            $orders = Mage::helper('zendesk')->getFilteredOrders($customerFilters, $generalFilters);
+            $orders = Mage::helper('zendesk')->getFilteredOrders($customerFilters, $genericFilters);
         }
 
         $this->getResponse()
@@ -534,92 +620,5 @@ public function notesAction()
         return $this;
     }
 
-    public function customerAction()
-    {
-        if(!$this->_authorise()) {
-            return $this;
-        }
-
-        $sections = explode('/', trim($this->getRequest()->getPathInfo(), '/'));
-        $customerId = $sections[3];
-
-        $customer = Mage::getModel('customer/customer')->load($customerId);
-
-        if(!$customer->getEntityId()) {
-            $this->getResponse()
-                ->setBody(json_encode(null))
-                ->setHttpResponseCode(200)
-                ->setHeader('Content-type', 'application/json', true);
-            return $this;
-        }
-
-        $customerData = Mage::helper('zendesk')->getCustomer($customer);
-
-        $this->getResponse()
-            ->setBody(json_encode($customerData))
-            ->setHttpResponseCode(200)
-            ->setHeader('Content-type', 'application/json', true);
-        return $this;
-    }
-
-    public function searchCustomersAction()
-    {
-        if(!$this->_authorise()) {
-            return $this;
-        }
-
-        $req = $this->getRequest();
-        $isPost = $req->isPost();
-
-        if (!$isPost) {
-            $this->getResponse()
-                ->setHttpResponseCode(405)
-                ->setHeader('Content-type', 'application/json', true);
-            return $this;
-        }
-
-        $customerKey = 'customer';
-
-        $filters = json_decode($req->getRawBody());
-        $generalFilters = array();
-
-        foreach($filters as $key => $val) {
-            if($key == $customerKey) {
-                $customerFilters = $val;
-            } else {
-                $generalFilters[$key] = $val;
-            }
-        }
-
-        $customerCollection = Mage::getModel('customer/customer')->getCollection();
-
-        // TODO does this bring back guest cutsomers
-        foreach($customerFilters as $customerKey => $customerValue) {
-            $customerCollection->addFieldToFilter($customerKey, $customerValue);
-        }
-
-        foreach($generalFilters as $generalKey => $generalValue) {
-            $customerCollection->addFieldToFilter($generalKey, $generalValue);
-        }
-
-        $customerCollection->load();
-
-        $urlModel = Mage::getModel('adminhtml/url')->setStore('admin');
-
-        $customers = array();
-
-        foreach($customerCollection as $customer) {
-            $id = $customer->getId();
-            $customerDetails = Mage::getModel('customer/customer')->load($id);
-            $customers[] = Mage::helper('zendesk')->getCustomer($customerDetails);
-        }
-
-        $this->getResponse()
-            ->setBody(json_encode($customers))
-            ->setHttpResponseCode(200)
-            ->setHeader('Content-type', 'application/json', true);
-        return $this;
-    }
-
     #endregion V2
 }