From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 31 Mar 2025 19:06:30 +0000 (+0300)
Subject: [ERP-381] fix formula
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=7fbc0b3173eb325d3a538fb35e9d9ae32bcbdfc9;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-381] fix formula
---

diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index 23cd7b72..dc1e1a58 100644
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -435,7 +435,7 @@ class BouquetComposition extends ActiveRecord
             $costModel->selfcost_markup_price = 0.3 * $costModel->selfcost;
         }
         $costModel->price = round($cost);
-        $costModel->price_markup = $costModel->selfcost > 0 ? 100 * $costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) : 0;
+        $costModel->price_markup = $costModel->selfcost > 0 ? 100 * ($costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) - 1) : 0;
         $costModel->save();
     }
 
@@ -449,7 +449,7 @@ class BouquetComposition extends ActiveRecord
             $costModel->selfcost_markup = 30;
             $costModel->selfcost_markup_price = 0.3 * $costModel->selfcost;
             $costModel->price = round(1.15 * ($costModel->selfcost_markup_price + $costModel->selfcost));
-            $costModel->price_markup = $costModel->selfcost > 0 ? 100 * $costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) : 0;
+            $costModel->price_markup = $costModel->selfcost > 0 ? 100 * ($costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) - 1): 0;
             $costModel->save();
         }
         return $costModel;