[ERP-381] inputed cost 2

diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index c168cca571a71603e9a788319bc10aad3fc0967a..2ae35c57401901dd247a97901b102780ca12df43 100644 (file)
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -369,7 +369,7 @@ class BouquetComposition extends ActiveRecord
         $newPriceDynamic->active = PricesDynamic::ACTIVE;
         $newPriceDynamic->date_from = date('Y-m-d H:i:s');
         $newPriceDynamic->date_to = date('2100-01-01 00:00:00');
-        $newPriceDynamic->price = $cost;
+        $newPriceDynamic->price = round($cost);
         $newPriceDynamic->save();
     }
 

diff --git a/erp24/views/bouquet/_product_edit.php b/erp24/views/bouquet/_product_edit.php
index 284541a42cbccb84c3d5fe85fcefdbc40e9c2ed5..e571921492bcb039bc86d9e6d02ab9ed4851eaf2 100644 (file)
--- a/erp24/views/bouquet/_product_edit.php
+++ b/erp24/views/bouquet/_product_edit.php
@@ -27,9 +27,9 @@ $this->registerCSS('.cost-value {max-width: 75px}');
                 <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> +30% / +<span class="markup-value"><?= 0.3 * ($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) ?>" />₽. +<span class="markup-cost-value"><?= $markUp ?></span>%</p>
+                                                          min="<?= 1.3 * ($selfCost ?? 0) ?>" step="1" />₽. +<span class="markup-cost-value"><?= $markUp ?></span>%</p>
         </div>
     </div>
 

diff --git a/erp24/web/js/bouquet/bouquet.js b/erp24/web/js/bouquet/bouquet.js
index 7b39edf8dd67c01b8c5e1313bf263f32a020291a..1077329bee45aa17d75f774d9a3248fb1c21258d 100644 (file)
--- a/erp24/web/js/bouquet/bouquet.js
+++ b/erp24/web/js/bouquet/bouquet.js
@@ -102,12 +102,12 @@ $('.calculate-btn').on('click', function () {
                     $('.cost-value').val(+response.cost);
                 }
                 if (response.selfcost !== undefined) {
-                    $('.selfcost-value').text(response.selfcost);
-                    $('.markup-value').text(0.3 * (+response.selfcost));
-                    $('.cost-value').attr('min', 1.3 * (+response.selfcost));
+                    $('.selfcost-value').text(Math.round(response.selfcost));
+                    $('.markup-value').text(Math.round(0.3 * (+response.selfcost)));
+                    $('.cost-value').attr('min', Math.round(1.3 * (+response.selfcost)));
                 }
                 if (response.markup !== undefined) {
-                    $('.markup-cost-value').text(+response.markup);
+                    $('.markup-cost-value').text(Math.round(+response.markup));
                 }
             }
         },