Merge pull request #12046 from frederic34/apisupplierproduct

api supplier price delete
Dolibarr · Oct 7, 2019 · 80cbc09 · 80cbc09
2 parents c3ae878 + b895f8a
commit 80cbc09
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
@@ -15,10 +15,11 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
- use Luracast\Restler\RestException;
+use Luracast\Restler\RestException;
 
- require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
- require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 /**
  * API class for products
@@ -41,6 +42,11 @@ class Products extends DolibarrApi
      */
     public $product;
 
+    /**
+     * @var ProductFournisseur $productsupplier {@type ProductFournisseur}
+     */
+    public $productsupplier;
+
     /**
      * Constructor
      */
@@ -49,6 +55,7 @@ public function __construct()
         global $db, $conf;
         $this->db = $db;
         $this->product = new Product($this->db);
+        $this->productsupplier = new ProductFournisseur($this->db);
     }
 
     /**
@@ -475,7 +482,7 @@ public function getCustomerPricesPerQuantity($id)
      *
      * @url DELETE {id}/purchase_prices/{priceid}
      *
-     * @return array
+     * @return int
      *
      * @throws 401
      * @throws 404
@@ -494,13 +501,13 @@ public function deletePurchasePrice($id, $priceid)
         if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
-        if($result) {
-        $this->product = new ProductFournisseur($this->db);
-        $this->product->fetch($id);
+        $resultsupplier = 0;
+        if ($result) {
+            $this->productsupplier->fetch($id);
+            $resultsupplier = $this->product->remove_product_fournisseur_price($priceid);
         }
 
-        return $this->product->remove_product_fournisseur_price($priceid);
+        return $resultsupplier;
     }
 
     /**
@@ -632,16 +639,15 @@ public function getPurchasePrices($id, $ref = '', $ref_ext = '', $barcode = '',
         }
 
         if ($includestockdata) {
-               $this->product->load_stock();
+            $this->product->load_stock();
         }
 
-        if($result) {
-        $this->product = new ProductFournisseur($this->db);
-        $this->product->fetch($id, $ref);
-        $this->product->list_product_fournisseur_price($id, '', '', 0, 0);
+        if ($result) {
+            $this->productsupplier->fetch($id, $ref);
+            $this->productsupplier->list_product_fournisseur_price($id, '', '', 0, 0);
         }
 
-        return $this->_cleanObjectDatas($this->product);
+        return $this->_cleanObjectDatas($this->productsupplier);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore