[ERP-381] force default price

diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php
index 9fbdd64c6f989d2c5fa9f4bff96df06377b539ce..84a82d49560741b70da0e199c714a8289bb18b56 100644 (file)
--- a/erp24/controllers/BouquetController.php
+++ b/erp24/controllers/BouquetController.php
@@ -151,7 +151,7 @@ class BouquetController extends Controller
         return [
             'selfcost' => round($model->getSelfCost($data), 2),
             'cost' => round($model->getBouquetCost($data, true)),
-            'markup' => round($model->getBouquetCostMarkup($data), 2),
+            'markup' => round($model->getBouquetCostMarkup($data, true), 2),
         ];
     }
 

diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index 4bb20efa93e0bc27ce5c1e2ffa89f36ad12dba60..a68b801865c3067f8cc0ec136019c748acf5d5f4 100644 (file)
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -382,9 +382,9 @@ class BouquetComposition extends ActiveRecord
         return $priceModel && !$forceDefault ? $priceModel->price : $this->getSelfCost($data) * 1.3 * 1.15;
     }
 
-    public function getBouquetCostMarkup($data = null) {
+    public function getBouquetCostMarkup($data = null, $forceDefault = false) {
         $selfCost = $this->getSelfCost($data);
-        return $selfCost > 0 ? ($this->getBouquetCost($data) / (1.3 * $selfCost) - 1) * 100 : 0;
+        return $selfCost > 0 ? ($this->getBouquetCost($data, $forceDefault) / (1.3 * $selfCost) - 1) * 100 : 0;
     }
 
 //    /**