Remaining custom actions added

Author: tareqtms

lib/CustomerAddress.php

@@ -50,10 +50,18 @@ protected function pluralizeKey()
     }
 
 
-    //TODO Fix Issue (Api Error) : Internal server error
+    /**
+     * Perform bulk operations against a number of addresses
+     *
+     * @param array $params
+     *
+     * @return array
+     */
+    //TODO Issue (Api Error) : Internal server error
     public function set($params)
     {
-        $url = $this->resourceUrl . '/set.json?' . http_build_query($params);
+        $url = $this->generateUrl($params, 'set');
+
         return $this->put(array(), $url);
     }
 }

lib/RecurringApplicationCharge.php

@@ -22,7 +22,7 @@
  * RecurringApplicationCharge -> Custom actions
  * --------------------------------------------------------------------------
  * @method array activate()             Activate a recurring application charge
- * @method array customize($params)     Customize a recurring application charge
+ * @method array customize($data)     Customize a recurring application charge
  *
  */
 class RecurringApplicationCharge extends ShopifyAPI
@@ -57,8 +57,19 @@ class RecurringApplicationCharge extends ShopifyAPI
         'activate',
     );
 
-    //TODO PUT action
-    public function customize($params) {
+    /*
+     * Customize a recurring application charge
+     *
+     * @param array $data
+     *
+     * @return array
+     *
+     */
+    public function customize($data) {
+        $data = $this->wrapData($data);
+
+        $url = $this->generateUrl($data, 'customize');
 
+        return $this->put(array(), $url);
     }
 }

lib/ShopifyAPI.php

@@ -155,7 +155,7 @@ public function __call($name, $arguments)
     {
         //If the $name starts with an uppercase letter, it's considered as a child class
         //Otherwise it's a custom action
-        if(ctype_upper($name[0])) {
+        if (ctype_upper($name[0])) {
             //Get the array key of the childResource in the childResource array
             $childKey = array_search($name, $this->childResource);
 
@@ -350,8 +350,6 @@ public function search($query)
     public function post($data, $url = null)
     {
         if (! $url) $url = $this->generateUrl();
-
-        $data = array($this->getResourcePostKey() => $data);
 
         $this->prepareRequest($data);
 
@@ -375,8 +373,6 @@ public function put($data, $url = null)
 
         if (! $url) $url = $this->generateUrl();
 
-        $data = array($this->getResourcePostKey() => $data);
-
         $this->prepareRequest($data);
 
         $response = CurlRequest::put($url, $this->postDataJSON, $this->httpHeaders);
@@ -414,32 +410,47 @@ public function delete($params = array(), $url = null)
      */
     public function prepareRequest($data = array())
     {
+        if (!empty($data)) $data = $this->wrapData($data);
 
         $this->postDataJSON = json_encode($data);
 
         $this->httpHeaders = array();
 
-        if(isset($this->config['AccessToken'])) {
+        if (isset($this->config['AccessToken'])) {
             $this->httpHeaders['X-Shopify-Access-Token'] = $this->config['AccessToken'];
         }
 
-        if(!empty($data)) {
+        if (!empty($data)) {
             $this->httpHeaders['Content-type'] = 'application/json';
             $this->httpHeaders['Content-Length'] = strlen($this->postDataJSON);
         }
 
     }
 
+    /**
+     * Wrap data array with resource key
+     *
+     * @param array $data
+     * @param string $dataKey
+     *
+     * @return array
+     */
+    protected function wrapData($data, $dataKey = null) {
+        if (!$dataKey) $dataKey = $this->getResourcePostKey();
+
+        return array($dataKey => $data);
+    }
+
     /**
      * Convert an array to string
      *
      * @param array $array
      *
      * @return string
      */
-    public function castString($array)
+    protected function castString($array)
     {
-        if(is_string($array)) return $array;
+        if (is_string($array)) return $array;
 
         $string = '';
 

lib/SmartCollection.php

@@ -14,7 +14,7 @@
  * --------------------------------------------------------------------------
  * SmartCollection -> Custom actions
  * --------------------------------------------------------------------------
- * @method array order($params)     Set the ordering type and/or the manual order of products in a smart collection
+ * @method array sortOrder($params)     Set the ordering type and/or the manual order of products in a smart collection
  *
  */
 class SmartCollection extends ShopifyAPI
@@ -26,8 +26,16 @@ class SmartCollection extends ShopifyAPI
      */
     protected $resourceKey = 'smart_collection';
 
-    //TODO PUT action
-    public function order($params) {
+    /**
+     * Set the ordering type and/or the manual order of products in a smart collection
+     *
+     * @param array $params
+     *
+     * @return array
+     */
+    public function sortOrder($params) {
+        $url = $this->generateUrl($params, 'order');
 
+        return $this->put(array(), $url);
     }
 }