From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 8 Oct 2024 08:21:34 +0000 (+0300)
Subject: [ERP-209] отфильтрованы отсутствующие телефоны
X-Git-Tag: 1.6~48^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=19fa67f67df0cac3321d14bd1f4de8f90640da7e;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-209] отфильтрованы отсутствующие телефоны
---

diff --git a/erp24/actions/orders/FillPhoneAction.php b/erp24/actions/orders/FillPhoneAction.php
index 0cbe8822..d8b61583 100644
--- a/erp24/actions/orders/FillPhoneAction.php
+++ b/erp24/actions/orders/FillPhoneAction.php
@@ -35,7 +35,7 @@ class FillPhoneAction extends Action
             $orderIds = ArrayHelper::getColumn($sales, 'order_id');
             $orderIdsClean = [];
             foreach ($orderIds as $orderId) {
-                if (is_int($orderId)) {
+                if (intval($orderId) == $orderId) {
                     $orderIdsClean[] = $orderId;
                 }
             }
@@ -44,12 +44,22 @@ class FillPhoneAction extends Action
                 ->andWhere(['not in', 'phone', ['', null]])
                 ->all();
             $phoneByAmoIdMap = ArrayHelper::map($ordersAmo, 'amo_id', 'phone');
+
+            $salesClean = [];
+            foreach ($sales as $sale) {
+                /** @var $sale Sales */
+                if (!empty($phoneByAmoIdMap[$sale->order_id]) &&
+                    intval($phoneByAmoIdMap[$sale->order_id]) == $phoneByAmoIdMap[$sale->order_id]) {
+                    $salesClean[] = $sale;
+                }
+            }
+
+            $sales = $salesClean;
+
             if ($action == 'update') {
                 foreach ($sales as $sale) {
                     /** @var $sale Sales */
-                    if (!empty($phoneByAmoIdMap[$sale->order_id]) && is_int($phoneByAmoIdMap[$sale->order_id])) {
-                        Sales::updateAll(['phone' => $phoneByAmoIdMap[$sale->order_id]], ['order_id' => $sale->order_id]);
-                    }
+                    Sales::updateAll(['phone' => $phoneByAmoIdMap[$sale->order_id]], ['order_id' => $sale->order_id]);
                 }
             }
         }