Merge pull request #55 from pipedrive/GRAL-2493

GRAL-2493 Add support to custom fields in products

Author: SpaceOven

README.md

@@ -6307,7 +6307,7 @@ $results = $products->searchProducts($collect);
 
 ### <a name="add_a_product"></a>![Method: ](https://apidocs.io/img/method.png ".ProductsController.addAProduct") addAProduct
 
-> Adds a new product to the products inventory. For more information on how to add a product, see <a href="https://pipedrive.readme.io/docs/adding-a-product" target="_blank" rel="noopener noreferrer">this tutorial</a>.
+> Adds a new product to the products inventory. For more information on how to add a product, see <a href="https://pipedrive.readme.io/docs/adding-a-product" target="_blank" rel="noopener noreferrer">this tutorial</a>. Note that you can supply additional custom fields along with the request that are not described here. These custom fields are different for each Pipedrive account and can be recognized by long hashes as keys. To determine which custom fields exists, fetch the productFields and look for 'key' values.
 
 
 ```php
@@ -6388,7 +6388,7 @@ $products->getOneProduct($id);
 
 ### <a name="update_a_product"></a>![Method: ](https://apidocs.io/img/method.png ".ProductsController.updateAProduct") updateAProduct
 
-> Updates product data.
+> Updates product data. Note that you can supply additional custom fields along with the request that are not described here. These custom fields are different for each Pipedrive account and can be recognized by long hashes as keys. To determine which custom fields exists, fetch the productFields and look for 'key' values.
 
 
 ```php

src/Controllers/BaseController.php

@@ -24,7 +24,7 @@ class BaseController
      * User-agent to be sent with API calls
      * @var string
      */
-    const USER_AGENT = 'Pipedrive-SDK-PHP-3.2.0';
+    const USER_AGENT = 'Pipedrive-SDK-PHP-4.0.0';
 
     /**
      * HttpCallBack instance associated with this controller

src/Controllers/DealsController.php

@@ -174,9 +174,7 @@ public function getAllDeals(
         //handle errors defined at the API level
         $this->validateResponse($_httpResponse, $_httpContext);
 
-        $mapper = $this->getJsonMapper();
-
-        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeals'));
+        return CamelCaseHelper::keysToCamelCase($response->body);
     }
 
     /**
@@ -508,9 +506,7 @@ public function getDetailsOfADeal(
         //handle errors defined at the API level
         $this->validateResponse($_httpResponse, $_httpContext);
 
-        $mapper = $this->getJsonMapper();
-
-        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\GetDeal'));
+        return CamelCaseHelper::keysToCamelCase($response->body);
     }
 
     /**

src/Controllers/ProductsController.php

@@ -106,9 +106,7 @@ public function getAllProducts(
         //handle errors defined at the API level
         $this->validateResponse($_httpResponse, $_httpContext);
 
-        $mapper = $this->getJsonMapper();
-
-        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\Product'));
+        return CamelCaseHelper::keysToCamelCase($response->body);
     }
 
 
@@ -381,29 +379,18 @@ public function updateAProduct(
         $_headers = array (
             'user-agent'    => BaseController::USER_AGENT,
             'Accept'        => 'application/json',
+            'content-type'  => 'application/json; charset=utf-8',
             'Authorization' => sprintf('Bearer %1$s', Configuration::$oAuthToken->accessToken)
         );
 
-        //prepare parameters
-        $_parameters = array (
-            'name'        => $this->val($options, 'name'),
-            'code'        => $this->val($options, 'code'),
-            'unit'        => $this->val($options, 'unit'),
-            'tax'         => $this->val($options, 'tax'),
-            'active_flag' => APIHelper::prepareFormFields($this->val($options, 'activeFlag')),
-            'visible_to' => APIHelper::prepareFormFields($this->val($options, 'visibleTo')),
-            'owner_id'    => $this->val($options, 'ownerId'),
-            'prices'      => $this->val($options, 'prices')
-        );
-
         //call on-before Http callback
-        $_httpRequest = new HttpRequest(HttpMethod::PUT, $_headers, $_queryUrl, $_parameters);
+        $_httpRequest = new HttpRequest(HttpMethod::PUT, $_headers, $_queryUrl, $options);
         if ($this->getHttpCallBack() != null) {
             $this->getHttpCallBack()->callOnBeforeRequest($_httpRequest);
         }
 
         //and invoke the API call request to fetch the response
-        $response = Request::put($_queryUrl, $_headers, Request\Body::Form($_parameters));
+        $response = Request::put($_queryUrl, $_headers, Request\Body::Json($options));
 
         $_httpResponse = new HttpResponse($response->code, $response->headers, $response->raw_body);
         $_httpContext = new HttpContext($_httpRequest, $_httpResponse);
@@ -416,9 +403,7 @@ public function updateAProduct(
         //handle errors defined at the API level
         $this->validateResponse($_httpResponse, $_httpContext);
 
-        $mapper = $this->getJsonMapper();
-
-        return CamelCaseHelper::keysToCamelCase($mapper->mapClass($response->body, 'Pipedrive\\Models\\Product'));
+        return CamelCaseHelper::keysToCamelCase($response->body);
     }
 
     /**
@@ -650,19 +635,14 @@ public function addAFollowerToAProduct(
             'Authorization' => sprintf('Bearer %1$s', Configuration::$oAuthToken->accessToken)
         );
 
-        //prepare parameters
-        $_parameters = array (
-            'user_id' => $this->val($options, 'userId')
-        );
-
         //call on-before Http callback
-        $_httpRequest = new HttpRequest(HttpMethod::POST, $_headers, $_queryUrl, $_parameters);
+        $_httpRequest = new HttpRequest(HttpMethod::POST, $_headers, $_queryUrl, $options);
         if ($this->getHttpCallBack() != null) {
             $this->getHttpCallBack()->callOnBeforeRequest($_httpRequest);
         }
 
         //and invoke the API call request to fetch the response
-        $response = Request::post($_queryUrl, $_headers, Request\Body::Form($_parameters));
+        $response = Request::post($_queryUrl, $_headers, Request\Body::Json($options));
 
         $_httpResponse = new HttpResponse($response->code, $response->headers, $response->raw_body);
         $_httpContext = new HttpContext($_httpRequest, $_httpResponse);

src/Models/GetDealsTimeline.php

@@ -23,14 +23,14 @@ class GetDealsTimeline implements JsonSerializable
     /**
      * Open and won Deals grouped into periods by defined interval, amount and date-type dealField
      * (field_key)
-     * @var \Pipedrive\Models\Data25|null $data public property
+     * @var \Pipedrive\Models\Data25[]|null $data public property
      */
     public $data;
 
     /**
      * Constructor to set initial or default values of member properties
      * @param bool   $success Initialization value for $this->success
-     * @param Data25 $data    Initialization value for $this->data
+     * @param Data25[] $data    Initialization value for $this->data
      */
     public function __construct()
     {