From bfb0fbe4decd3b109b17381c54b4d897552ae65e Mon Sep 17 00:00:00 2001
From: root <root@134-0-115-58.ovz.vps.regruhosting.ru>
Date: Thu, 17 Nov 2022 07:25:30 +0000
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20=D0=B2=20?=
 =?UTF-8?q?=D1=81=D0=B0=D0=BD=D1=82=D0=B8=D0=BC=D0=B5=D1=82=D1=80=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skillparts/system/models/connection/Dellin.php    | 11 ++++++++---
 mirzaev/skillparts/system/views/product/index.php     |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mirzaev/skillparts/system/models/connection/Dellin.php b/mirzaev/skillparts/system/models/connection/Dellin.php
index ae0d856..d0ad2d1 100644
--- a/mirzaev/skillparts/system/models/connection/Dellin.php
+++ b/mirzaev/skillparts/system/models/connection/Dellin.php
@@ -68,9 +68,9 @@ class Dellin extends Model
      * @param int $from Идентификатор терминала Dellin
      * @param int $to Идентификатор терминала Dellin
      * @param int $weight Вес (кг)
-     * @param int $x Ширина (м)
-     * @param int $y Высота (м)
-     * @param int $z Длинна (м)
+     * @param int $x Ширина (cм)
+     * @param int $y Высота (cм)
+     * @param int $z Длинна (cм)
      * @param int $amount Количество
      * @param Account|int|null $account Аккаунт
      *
@@ -96,6 +96,11 @@ class Dellin extends Model
             if (empty($z) || $z === 0) $z = 25;
             if (empty($weight) || $weight === 0) $weight = 300;
 
+            // Конвертация из сантиметров в метры
+            $x /= 100;
+            $y /= 100;
+            $z /= 100;
+
             // Вычисление самой крупной стороны, так как ДеловыеЛинии имеют ограничения на все три поля и у длинны оно больше всех
             if ($x > $z && $x > $y) {
                 // "X" больше всех
diff --git a/mirzaev/skillparts/system/views/product/index.php b/mirzaev/skillparts/system/views/product/index.php
index fb44b40..6e33b18 100644
--- a/mirzaev/skillparts/system/views/product/index.php
+++ b/mirzaev/skillparts/system/views/product/index.php
@@ -157,7 +157,7 @@ use app\models\Search;
                             <section id="prod_<?= $model['catn'] ?>_info" class="col">
                                 <!-- Габариты -->
                                 <p class="form-control-sm p-0 h-auto">
-                                    <b>Габариты:</b><span id="prod_<?= $model['catn'] ?>_dmns_x" class="ml-1 pointer-event" role="button" onclick="return product_panel_dimensions_edit('<?= $model['catn'] ?>', '<?= $model['prod'] ?>', this, 'x');"><?= empty($model['dmns']['x']) ? '0' : $model['dmns']['x'] ?></span><span class="mr-1">м</span><small>x</small><span id="prod_<?= $model['catn'] ?>_dmns_y" class="ml-1 pointer-event" role="button" onclick="return product_panel_dimensions_edit('<?= $model['catn'] ?>', '<?= $model['prod'] ?>', this, 'y');"><?= empty($model['dmns']['y']) ? '0' : $model['dmns']['y'] ?></span><span class="mr-1">м</span><small>x</small><span id="prod_<?= $model['catn'] ?>_dmns_z" class="ml-1 pointer-event" role="button" onclick="return product_panel_dimensions_edit('<?= $model['catn'] ?>', '<?= $model['prod'] ?>', this, 'z');"><?= empty($model['dmns']['z']) ? '0' : $model['dmns']['z'] ?></span><span class="mr-1">м</span>
+                                    <b>Габариты:</b><span id="prod_<?= $model['catn'] ?>_dmns_x" class="ml-1 pointer-event" role="button" onclick="return product_panel_dimensions_edit('<?= $model['catn'] ?>', '<?= $model['prod'] ?>', this, 'x');"><?= empty($model['dmns']['x']) ? '0' : $model['dmns']['x'] ?></span><span class="mr-1">см</span><small>x</small><span id="prod_<?= $model['catn'] ?>_dmns_y" class="ml-1 pointer-event" role="button" onclick="return product_panel_dimensions_edit('<?= $model['catn'] ?>', '<?= $model['prod'] ?>', this, 'y');"><?= empty($model['dmns']['y']) ? '0' : $model['dmns']['y'] ?></span><span class="mr-1">см</span><small>x</small><span id="prod_<?= $model['catn'] ?>_dmns_z" class="ml-1 pointer-event" role="button" onclick="return product_panel_dimensions_edit('<?= $model['catn'] ?>', '<?= $model['prod'] ?>', this, 'z');"><?= empty($model['dmns']['z']) ? '0' : $model['dmns']['z'] ?></span><span class="mr-1">см</span>
                                 </p>
                                 <!-- Вес -->
                                 <p class="form-control-sm p-0 h-auto">
@@ -168,7 +168,7 @@ use app\models\Search;
                             <section id="prod_<?= $model['catn'] ?>_info" class="col mb-1">
                                 <!-- Габариты -->
                                 <p class="form-control-sm p-0 h-auto">
-                                    <b>Габариты:</b><span id="prod_<?= $model['catn'] ?>_dmns_x" class="ml-1"><?= empty($model['dmns']['x']) ? '0' : $model['dmns']['x'] ?></span><span class="mr-1">м</span><small>x</small><span id="prod_<?= $model['catn'] ?>_dmns_y" class="ml-1"><?= empty($model['dmns']['y']) ? '0' : $model['dmns']['y'] ?></span><span class="mr-1">м</span><small>x</small><span id="prod_<?= $model['catn'] ?>_dmns_z" class="ml-1"><?= empty($model['dmns']['z']) ? '0' : $model['dmns']['z'] ?></span><span class="mr-1">м</span>
+                                    <b>Габариты:</b><span id="prod_<?= $model['catn'] ?>_dmns_x" class="ml-1"><?= empty($model['dmns']['x']) ? '0' : $model['dmns']['x'] ?></span><span class="mr-1">см</span><small>x</small><span id="prod_<?= $model['catn'] ?>_dmns_y" class="ml-1"><?= empty($model['dmns']['y']) ? '0' : $model['dmns']['y'] ?></span><span class="mr-1">см</span><small>x</small><span id="prod_<?= $model['catn'] ?>_dmns_z" class="ml-1"><?= empty($model['dmns']['z']) ? '0' : $model['dmns']['z'] ?></span><span class="mr-1">см</span>
                                 </p>
                                 <!-- Вес -->
                                 <p class="form-control-sm p-0 h-auto">