From: Alexander Smirnov <fredeom@mail.ru>
Date: Thu, 27 Mar 2025 14:10:58 +0000 (+0300)
Subject: [ERP-381] force default price
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=89ea94ccc360083f3bf2a1320143285fe3cb00c1;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-381] force default price
---

diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php
index 9fbdd64c..84a82d49 100644
--- 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 4bb20efa..a68b8018 100644
--- 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;
     }
 
 //    /**