[ERP-394] fixes

diff --git a/erp24/actions/orders/DeliveryAction.php b/erp24/actions/orders/DeliveryAction.php
index 7bb21de458e3fce629ad89dd8180f8faa213b1e2..d552b2553af83f8fc345687f879bf9d390c7f12c 100644 (file)
--- a/erp24/actions/orders/DeliveryAction.php
+++ b/erp24/actions/orders/DeliveryAction.php
@@ -157,7 +157,6 @@ class DeliveryAction extends Action
 
         $ordersAmo = $ordersAmoQuery->orderBy(['delivery_date' => SORT_DESC, 'updated_at' => SORT_DESC])->limit(1750)->asArray()->all();
 
-        $in_orders = [];
         $yeses = [];
         $itog = 0;
         $seller_id = [];
@@ -174,8 +173,6 @@ class DeliveryAction extends Action
 
             $itog += $orderAmo["price"];
 
-            $in_orders[] = $orderAmo["amo_id"];
-
             $seller_idRec = ExportImportTable::find()->select(['export_val'])->where(['entity' => 'admin', 'export_id' => 1, 'entity_id' => $orderAmo["florist_id"]])->one();
             $seller_id []= $seller_idRec ? $seller_idRec->export_val : null;
 

diff --git a/erp24/views/orders/delivery.php b/erp24/views/orders/delivery.php
index 34d969f7bce3182224f3665e391c229d6703aad2..f272b4e40fcd76bab67624f89100e488fcde36fa 100644 (file)
--- a/erp24/views/orders/delivery.php
+++ b/erp24/views/orders/delivery.php
@@ -11,7 +11,6 @@ use yii\widgets\ActiveForm;
 /* @var $checkarr array */
 /* @var $ordersAmo array */
 /* @var $yeses array */
-/* @var $in_orders array */
 /* @var $users_arr_group_3_plus array */
 /* @var $check_sale_cnt array */
 /* @var $check_vozvrat_cnt array */
@@ -97,6 +96,7 @@ $this->registerCss('
 
     <table class="table table-hover">
         <tbody>
+        <?php $in_orders = []; ?>
         <?php foreach ($ordersAmo as $ind => $orderAmo): ?>
             <tr>
                 <td class="bg-<?= $yeses[$ind] == 0 ? "danger" : "success" ?>">
@@ -253,6 +253,7 @@ $this->registerCss('
                     </div>
                 </td>
             </tr>
+            <?php $in_orders[] = $orderAmo["amo_id"]; ?>
         <?php endforeach; ?>
         </tbody>
     </table>