From 19fa67f67df0cac3321d14bd1f4de8f90640da7e Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Tue, 8 Oct 2024 11:21:34 +0300 Subject: [PATCH] =?utf8?q?[ERP-209]=20=D0=BE=D1=82=D1=84=D0=B8=D0=BB=D1=8C?= =?utf8?q?=D1=82=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=BE=D1=82=D1=81?= =?utf8?q?=D1=83=D1=82=D1=81=D1=82=D0=B2=D1=83=D1=8E=D1=89=D0=B8=D0=B5=20?= =?utf8?q?=D1=82=D0=B5=D0=BB=D0=B5=D1=84=D0=BE=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/orders/FillPhoneAction.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) 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]); } } } -- 2.39.5