From 837c7276aba8ab2df1cda27fb2a4b61b18c702f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Thu, 14 Nov 2019 21:57:21 +0100
Subject: [PATCH 01/10] API New get categories linked to an object

---
 .../categories/class/api_categories.class.php | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 0f2a425fe87..5b8f0cdbe39 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -264,6 +264,41 @@ class Categories extends DolibarrApi
             )
         );
     }
+    
+    /**
+     * List categories of an object
+     *
+     * Get the list of categories linked to an object
+     *
+     * @param int       $id         Object ID
+     * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param int		$limit		Limit for list
+     * @return array                Array of category objects
+     *
+     * @throws RestException
+     * 
+     * @url GET /object/{type}/{id}
+     */
+    public function getListForObject($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+    {
+        // TODO add other types
+        if (!in_array($type, ['product'/*, 'member', 'customer', 'supplier', 'contact'*/])) {
+            throw new RestException(401);
+        }
+        
+        if($type == 'product' && ! (DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
+            throw new RestException(401);
+        }
+        
+        $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
+        
+        if( ! count($categories)) {
+            throw new RestException(404, 'No category found for this object');
+        }
+        return $categories;
+    }
 
     /**
      * Link an object to a category by id

From b2d18a8e0c011f5011c42450eb4cacdd3fb4335b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 14 Nov 2019 20:56:31 +0000
Subject: [PATCH 02/10] Fixing style errors.

---
 htdocs/categories/class/api_categories.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 5b8f0cdbe39..92ce17642ab 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -264,7 +264,7 @@ class Categories extends DolibarrApi
             )
         );
     }
-    
+
     /**
      * List categories of an object
      *
@@ -278,7 +278,7 @@ class Categories extends DolibarrApi
      * @return array                Array of category objects
      *
      * @throws RestException
-     * 
+     *
      * @url GET /object/{type}/{id}
      */
     public function getListForObject($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
@@ -287,13 +287,13 @@ class Categories extends DolibarrApi
         if (!in_array($type, ['product'/*, 'member', 'customer', 'supplier', 'contact'*/])) {
             throw new RestException(401);
         }
-        
+
         if($type == 'product' && ! (DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
             throw new RestException(401);
         }
-        
+
         $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
-        
+
         if( ! count($categories)) {
             throw new RestException(404, 'No category found for this object');
         }

From 88692fe95d62628a7d4fd89fd0fd4aa2c86e71ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Thu, 14 Nov 2019 22:00:46 +0100
Subject: [PATCH 03/10] Doc for $page

---
 htdocs/categories/class/api_categories.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 92ce17642ab..a202ee97df9 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -275,6 +275,7 @@ class Categories extends DolibarrApi
      * @param string	$sortfield	Sort field
      * @param string	$sortorder	Sort order
      * @param int		$limit		Limit for list
+     * @param int		$page		Page number
      * @return array                Array of category objects
      *
      * @throws RestException

From 100827ae0be85e0891f2879cde9050beaac00caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Thu, 14 Nov 2019 22:16:08 +0100
Subject: [PATCH 04/10] Fix error process

---
 htdocs/categories/class/api_categories.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index a202ee97df9..d532c481c24 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -295,8 +295,11 @@ class Categories extends DolibarrApi
 
         $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
 
-        if( ! count($categories)) {
-            throw new RestException(404, 'No category found for this object');
+        if( ! is_array($categories)) {
+            if ($categories == 0) {
+                throw new RestException(404, 'No category found for this object');
+            }
+            throw new RestException(500, 'Error when fetching object categories', array_merge(array($this->category->error), $this->category->errors));
         }
         return $categories;
     }

From 0f907fbc297143dcdec0d58a79c97f6d4817e680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Thu, 14 Nov 2019 22:26:15 +0100
Subject: [PATCH 05/10] $type is mandatory

---
 htdocs/categories/class/api_categories.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index d532c481c24..5cb733789ee 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -282,7 +282,7 @@ class Categories extends DolibarrApi
      *
      * @url GET /object/{type}/{id}
      */
-    public function getListForObject($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+    public function getListForObject($id, $type, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
     {
         // TODO add other types
         if (!in_array($type, ['product'/*, 'member', 'customer', 'supplier', 'contact'*/])) {

From 0c9b4fe16b3a72445722107f465443242de89007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Thu, 14 Nov 2019 22:36:16 +0100
Subject: [PATCH 06/10] Add all types

---
 htdocs/categories/class/api_categories.class.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 5cb733789ee..aa908ec7965 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -284,14 +284,21 @@ class Categories extends DolibarrApi
      */
     public function getListForObject($id, $type, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
     {
-        // TODO add other types
-        if (!in_array($type, ['product'/*, 'member', 'customer', 'supplier', 'contact'*/])) {
+        if (!in_array($type, ['product', 'member', 'customer', 'supplier', 'contact'])) {
             throw new RestException(401);
         }
 
-        if($type == 'product' && ! (DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
+        if($type == Categorie::TYPE_PRODUCT && ! (DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
             throw new RestException(401);
-        }
+        } elseif ($type == Categorie::TYPE_CONTACT && ! DolibarrApiAccess::$user->rights->contact->lire) {
+            throw new RestException(401);
+ 		} elseif ($type == Categorie::TYPE_CUSTOMER && ! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+ 		} elseif ($type == Categorie::TYPE_SUPPLIER && ! DolibarrApiAccess::$user->rights->fournisseur->lire) {
+            throw new RestException(401);
+ 		} elseif ($type == Categorie::TYPE_MEMBER && ! DolibarrApiAccess::$user->rights->adherent->lire) {
+            throw new RestException(401);
+ 		}
 
         $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
 

From fa3c63ea28f4872b24f73f5f3eb579a94b53c7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Fri, 15 Nov 2019 14:47:08 +0100
Subject: [PATCH 07/10] API New can include childs when get a category

---
 htdocs/categories/class/api_categories.class.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index aa908ec7965..ffbfff4d90f 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -71,11 +71,12 @@ class Categories extends DolibarrApi
      * Return an array with category informations
      *
      * @param 	int 	$id ID of category
+     * @param 	bool 	$include_childs Include child categories list (true or false)
      * @return 	array|mixed data without useless information
      *
      * @throws 	RestException
      */
-    public function get($id)
+    public function get($id, $include_childs = false)
     {
         if (! DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
@@ -89,6 +90,17 @@ class Categories extends DolibarrApi
         if ( ! DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
+		
+        if ($include_childs) {
+            $cats = $this->category->get_filles();
+            if (!is_array($cats)) {
+                throw new RestException(500, 'Error when fetching child categories', array_merge(array($this->category->error), $this->category->errors));
+            }
+            $this->category->childs = [];
+            foreach ($cats as $cat) {
+                $this->category->childs[] = $this->_cleanObjectDatas($cat);
+            }
+        }
 
         return $this->_cleanObjectDatas($this->category);
     }

From cc6d8f159bf102f8b8a81541680d15b2b0d1896d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 15 Nov 2019 13:47:40 +0000
Subject: [PATCH 08/10] Fixing style errors.

---
 htdocs/categories/class/api_categories.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index ffbfff4d90f..3dff8066070 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -90,7 +90,7 @@ class Categories extends DolibarrApi
         if ( ! DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-		
+
         if ($include_childs) {
             $cats = $this->category->get_filles();
             if (!is_array($cats)) {

From 4332834ff7cd0b28ecab32837f889c97c22569dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Fri, 15 Nov 2019 23:08:25 +0100
Subject: [PATCH 09/10] Add all types everywhere

---
 .../categories/class/api_categories.class.php | 118 +++++++++++++++---
 1 file changed, 100 insertions(+), 18 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 3dff8066070..d1b2973041e 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -296,21 +296,27 @@ class Categories extends DolibarrApi
      */
     public function getListForObject($id, $type, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
     {
-        if (!in_array($type, ['product', 'member', 'customer', 'supplier', 'contact'])) {
+        if (!in_array($type, [
+            Categorie::TYPE_PRODUCT,
+            Categorie::TYPE_CONTACT,
+            Categorie::TYPE_CUSTOMER,
+            Categorie::TYPE_SUPPLIER,
+            Categorie::TYPE_MEMBER
+        ])) {
             throw new RestException(401);
         }
-
+        
         if($type == Categorie::TYPE_PRODUCT && ! (DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
             throw new RestException(401);
         } elseif ($type == Categorie::TYPE_CONTACT && ! DolibarrApiAccess::$user->rights->contact->lire) {
             throw new RestException(401);
- 		} elseif ($type == Categorie::TYPE_CUSTOMER && ! DolibarrApiAccess::$user->rights->societe->lire) {
+        } elseif ($type == Categorie::TYPE_CUSTOMER && ! DolibarrApiAccess::$user->rights->societe->lire) {
             throw new RestException(401);
- 		} elseif ($type == Categorie::TYPE_SUPPLIER && ! DolibarrApiAccess::$user->rights->fournisseur->lire) {
+        } elseif ($type == Categorie::TYPE_SUPPLIER && ! DolibarrApiAccess::$user->rights->fournisseur->lire) {
             throw new RestException(401);
- 		} elseif ($type == Categorie::TYPE_MEMBER && ! DolibarrApiAccess::$user->rights->adherent->lire) {
+        } elseif ($type == Categorie::TYPE_MEMBER && ! DolibarrApiAccess::$user->rights->adherent->lire) {
             throw new RestException(401);
- 		}
+        }
 
         $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
 
@@ -349,13 +355,32 @@ class Categories extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'category not found');
         }
-
-        // TODO Add all types
-        if ($type === "product") {
+        
+        if ($type === Categorie::TYPE_PRODUCT) {
             if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
             }
             $object = new Product($this->db);
+        } elseif ($type === Categorie::TYPE_CUSTOMER) {
+            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+                throw new RestException(401);
+            }
+            $object = new Societe($this->db);
+        } elseif ($type === Categorie::TYPE_SUPPLIER) {
+            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+                throw new RestException(401);
+            }
+            $object = new Societe($this->db);
+        } elseif ($type === Categorie::TYPE_CONTACT) {
+            if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+                throw new RestException(401);
+            }
+            $object = new Contact($this->db);
+        } elseif ($type === Categorie::TYPE_MEMBER) {
+            if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+                throw new RestException(401);
+            }
+            $object = new Adherent($this->db);
         } else {
             throw new RestException(401, "this type is not recognized yet.");
         }
@@ -410,13 +435,32 @@ class Categories extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'category not found');
         }
-
-        // TODO Add all types
-        if ($type === "product") {
+        
+        if ($type === Categorie::TYPE_PRODUCT) {
             if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
             }
             $object = new Product($this->db);
+        } elseif ($type === Categorie::TYPE_CUSTOMER) {
+            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+                throw new RestException(401);
+            }
+            $object = new Societe($this->db);
+        } elseif ($type === Categorie::TYPE_SUPPLIER) {
+            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+                throw new RestException(401);
+            }
+            $object = new Societe($this->db);
+        } elseif ($type === Categorie::TYPE_CONTACT) {
+            if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+                throw new RestException(401);
+            }
+            $object = new Contact($this->db);
+        } elseif ($type === Categorie::TYPE_MEMBER) {
+            if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+                throw new RestException(401);
+            }
+            $object = new Adherent($this->db);
         } else {
             throw new RestException(401, "this type is not recognized yet.");
         }
@@ -471,13 +515,32 @@ class Categories extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'category not found');
         }
-
-        // TODO Add all types
-        if ($type === "product") {
+        
+        if ($type === Categorie::TYPE_PRODUCT) {
             if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
             }
             $object = new Product($this->db);
+        } elseif ($type === Categorie::TYPE_CUSTOMER) {
+            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+                throw new RestException(401);
+            }
+            $object = new Societe($this->db);
+        } elseif ($type === Categorie::TYPE_SUPPLIER) {
+            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+                throw new RestException(401);
+            }
+            $object = new Societe($this->db);
+        } elseif ($type === Categorie::TYPE_CONTACT) {
+            if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+                throw new RestException(401);
+            }
+            $object = new Contact($this->db);
+        } elseif ($type === Categorie::TYPE_MEMBER) {
+            if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+                throw new RestException(401);
+            }
+            $object = new Adherent($this->db);
         } else {
             throw new RestException(401, "this type is not recognized yet.");
         }
@@ -530,13 +593,32 @@ class Categories extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'category not found');
         }
-
-        // TODO Add all types
-        if ($type === "product") {
+        
+        if ($type === Categorie::TYPE_PRODUCT) {
             if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
             }
             $object = new Product($this->db);
+        } elseif ($type === Categorie::TYPE_CUSTOMER) {
+            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+                throw new RestException(401);
+            }
+            $object = new Societe($this->db);
+        } elseif ($type === Categorie::TYPE_SUPPLIER) {
+            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+                throw new RestException(401);
+            }
+            $object = new Societe($this->db);
+        } elseif ($type === Categorie::TYPE_CONTACT) {
+            if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+                throw new RestException(401);
+            }
+            $object = new Contact($this->db);
+        } elseif ($type === Categorie::TYPE_MEMBER) {
+            if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+                throw new RestException(401);
+            }
+            $object = new Adherent($this->db);
         } else {
             throw new RestException(401, "this type is not recognized yet.");
         }

From 17667d6a1be453e7b6195f122811320ddf2396bd Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 15 Nov 2019 22:08:56 +0000
Subject: [PATCH 10/10] Fixing style errors.

---
 htdocs/categories/class/api_categories.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index d1b2973041e..e916255f7b5 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -305,7 +305,7 @@ class Categories extends DolibarrApi
         ])) {
             throw new RestException(401);
         }
-        
+
         if($type == Categorie::TYPE_PRODUCT && ! (DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
             throw new RestException(401);
         } elseif ($type == Categorie::TYPE_CONTACT && ! DolibarrApiAccess::$user->rights->contact->lire) {
@@ -355,7 +355,7 @@ class Categories extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'category not found');
         }
-        
+
         if ($type === Categorie::TYPE_PRODUCT) {
             if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
@@ -435,7 +435,7 @@ class Categories extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'category not found');
         }
-        
+
         if ($type === Categorie::TYPE_PRODUCT) {
             if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
@@ -515,7 +515,7 @@ class Categories extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'category not found');
         }
-        
+
         if ($type === Categorie::TYPE_PRODUCT) {
             if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
@@ -593,7 +593,7 @@ class Categories extends DolibarrApi
         if( ! $result ) {
             throw new RestException(404, 'category not found');
         }
-        
+
         if ($type === Categorie::TYPE_PRODUCT) {
             if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);