From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 21 May 2024 19:12:31 +0000 (+0300)
Subject: fix part 016
X-Git-Tag: 1.1~18^2~6
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=6c293dfb271704a497303e6f356faea73b595397;p=erp24_rep%2Fyii-erp24%2F.git

fix part 016
---

diff --git a/erp24/modul/shipment/ajaxField.php b/erp24/modul/shipment/ajaxField.php
index 648366d3..7de3777a 100644
--- a/erp24/modul/shipment/ajaxField.php
+++ b/erp24/modul/shipment/ajaxField.php
@@ -118,7 +118,7 @@ if($name_eng=="quantity_zakup_new") {
  $min_lot=1;
  $min_lot=$db::getValue("SELECT min_lot FROM products_1c_options WHERE id=?",[$product_id]);
  $value=(int)$value;
-  $a = $value/$min_lot;
+  $a = $min_lot > 0 ? $value/$min_lot : 0;
   $b = $a - floor($a); // $b = 0.5953
     if($b>0 || $value < $min_lot) exit("вы ввели данные не краные минимальному лоту деления!");   
 }
diff --git a/erp24/modul/shipment/fields/order_supplier_sum.php b/erp24/modul/shipment/fields/order_supplier_sum.php
index d244444f..9e640097 100644
--- a/erp24/modul/shipment/fields/order_supplier_sum.php
+++ b/erp24/modul/shipment/fields/order_supplier_sum.php
@@ -3,12 +3,12 @@
 global $orderId;
 
   $prices=[];
-  $sql = "SELECT product_id, value FROM store_orders_fields_data WHERE  field_name='purchase_price' AND value>0  AND order_id='$orderId'  AND store_id='' AND color='' group by product_id, value";
+  $sql = "SELECT product_id, value FROM store_orders_fields_data WHERE  field_name='purchase_price' AND value>0  AND order_id=" . ($orderId ?? 0). "  AND store_id='' AND color='' group by product_id, value";
 //  var_dump($sql); die;
   $data=$db::getRows($sql);
      foreach($data as $row) $prices[$row["product_id"]]=$row["value"];
   $sql = "SELECT product_id,sum(value) as value, store_id FROM store_orders_fields_data WHERE field_name='quantity_zakup_new' AND value>0
-  AND order_id='$orderId' AND color='' AND store_id!='' group by product_id,store_id";
+  AND order_id=" . ($orderId ?? 0) . " AND color='' AND store_id!='' group by product_id,store_id";
 //  var_dump($sql); die;
   $data=$db::getRows($sql);
      foreach($data as $row) {