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

[ERP-381] inputed cost 4
---

diff --git a/erp24/views/bouquet/_product_edit.php b/erp24/views/bouquet/_product_edit.php
index e5719214..c0f05e12 100644
--- a/erp24/views/bouquet/_product_edit.php
+++ b/erp24/views/bouquet/_product_edit.php
@@ -26,10 +26,10 @@ $this->registerCSS('.cost-value {max-width: 75px}');
             <div class="loader-overlay d-none">
                 <div class="spinner-border text-primary" role="status"></div>
             </div>
-            <p class="mb-1"><strong>Себестоимость:</strong> <span class="selfcost-value"><?= $selfCost ?? 0 ?></span> ₽</p>
+            <p class="mb-1"><strong>Себестоимость:</strong> <span class="selfcost-value"><?= round($selfCost ?? 0) ?></span> ₽</p>
             <p class="mb-1"><strong>Наценка:</strong> +30% / +<span class="markup-value"><?= round(0.3 * ($selfCost ?? 0)) ?></span>₽</p>
-            <p class="mb-0"><strong>Цена:</strong> <input type="number" name="cost-value" class="cost-value" value="<?= $cost ?>"
-                                                          min="<?= 1.3 * ($selfCost ?? 0) ?>" step="1" />₽. +<span class="markup-cost-value"><?= $markUp ?></span>%</p>
+            <p class="mb-0"><strong>Цена:</strong> <input type="number" name="cost-value" class="cost-value" value="<?= round($cost) ?>"
+                                                          min="<?= 1.3 * ($selfCost ?? 0) ?>" step="1" />₽. +<span class="markup-cost-value"><?= round($markUp, 2) ?></span>%</p>
         </div>
     </div>
 
diff --git a/erp24/views/bouquet/_product_list.php b/erp24/views/bouquet/_product_list.php
index 0a7d8c05..7a9b253a 100644
--- a/erp24/views/bouquet/_product_list.php
+++ b/erp24/views/bouquet/_product_list.php
@@ -33,7 +33,7 @@
         <div class='self-cost pt-3' style='display: flex; gap: 10px;'>
             Себестоимость: <?= round($model->getSelfCost()) ?>₽<br>
             Наценка: +30% / +<?= round(0.3 * $model->getSelfCost()) ?>₽<br>
-            Цена: <?= $model->getBouquetCost() ?>₽. +<?= round($model->getBouquetCostMarkup(), 2) ?>%<br>
+            Цена: <?= round($model->getBouquetCost()) ?>₽. +<?= round($model->getBouquetCostMarkup(), 2) ?>%<br>
         </div>
     </div>
     <div class="col-md-4">