From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 26 Mar 2025 14:38:57 +0000 (+0300)
Subject: [ERP-381] inputed cost 6
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=32aaf10ad63153d6178f2bac27c4654fc1fffcc0;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-381] inputed cost 6
---

diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php
index 40862fc6..faf4a9a8 100644
--- a/erp24/controllers/BouquetController.php
+++ b/erp24/controllers/BouquetController.php
@@ -150,7 +150,7 @@ class BouquetController extends Controller
 
         return [
             'selfcost' => round($model->getSelfCost($data), 2),
-            'cost' => round($model->getBouquetCost($data), 2),
+            'cost' => round($model->getBouquetCost($data, true), 2),
             'markup' => round($model->getBouquetCostMarkup($data), 2),
         ];
     }
diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index 2ae35c57..4bb20efa 100644
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -373,13 +373,13 @@ class BouquetComposition extends ActiveRecord
         $newPriceDynamic->save();
     }
 
-    public function getBouquetCost($data = null) {
+    public function getBouquetCost($data = null, $forceDefault = false) {
         $priceModel = PricesDynamic::find()
             ->where(['product_id' => $this->guid])
             ->andWhere(['=', 'active', PricesDynamic::ACTIVE])
             ->one();
         /* @var PricesDynamic $priceModel */
-        return $priceModel ? $priceModel->price : $this->getSelfCost($data) * 1.3 * 1.15;
+        return $priceModel && !$forceDefault ? $priceModel->price : $this->getSelfCost($data) * 1.3 * 1.15;
     }
 
     public function getBouquetCostMarkup($data = null) {