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

[ERP-381] inputed cost 3
---

diff --git a/erp24/views/bouquet/_product_list.php b/erp24/views/bouquet/_product_list.php
index 3354d6dd..0a7d8c05 100644
--- a/erp24/views/bouquet/_product_list.php
+++ b/erp24/views/bouquet/_product_list.php
@@ -31,9 +31,9 @@
     <div class="col-md-8">
         <strong>Нижегородская область</strong>
         <div class='self-cost pt-3' style='display: flex; gap: 10px;'>
-            Себестоимость: <?= $model->getSelfCost() ?><br>
-            Наценка: +30% / +<?= (0.3 * $model->getSelfCost()) ?><br>
-            Цена: <?= $model->getBouquetCost() ?>р. +<?= $model->getBouquetCostMarkup() ?>%<br>
+            Себестоимость: <?= round($model->getSelfCost()) ?>₽<br>
+            Наценка: +30% / +<?= round(0.3 * $model->getSelfCost()) ?>₽<br>
+            Цена: <?= $model->getBouquetCost() ?>₽. +<?= round($model->getBouquetCostMarkup(), 2) ?>%<br>
         </div>
     </div>
     <div class="col-md-4">
diff --git a/erp24/views/bouquet/index.php b/erp24/views/bouquet/index.php
index 72b7b224..133e6269 100644
--- a/erp24/views/bouquet/index.php
+++ b/erp24/views/bouquet/index.php
@@ -110,9 +110,9 @@ $this->title = 'Содержание матрицы';
                                     {$compositionHtml}
                                 </div>
                                 <div class='self-cost pt-3' style='display: flex; gap: 10px;'>
-                                    Себестоимость: " . $model->getSelfCost() . "<br>
-                                    Наценка: +30% / +" . (0.3 * $model->getSelfCost()) . "<br>
-                                    Цена: " . $model->getBouquetCost() . "р. +" . $model->getBouquetCostMarkup() . "%<br>
+                                    Себестоимость: " . round($model->getSelfCost()) . "₽<br>
+                                    Наценка: +30% / +" . round(0.3 * $model->getSelfCost()) . "₽<br>
+                                    Цена: " . round($model->getBouquetCost()) . "₽. +" . round($model->getBouquetCostMarkup(), 2) . "%<br>
                                 </div>
                             </div>