From fc07e99a74c3d94df2960c81ba35635e645cb307 Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Thu, 29 Aug 2024 18:03:59 +0300 Subject: [PATCH] =?utf8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?utf8?q?=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82=20=D1=83=D1=81=D0=BB=D1=83?= =?utf8?q?=D0=B3=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=BF?= =?utf8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B0=20?= =?utf8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/MotivationService.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index baca08ca..6ae878da 100644 --- a/erp24/services/MotivationService.php +++ b/erp24/services/MotivationService.php @@ -1124,9 +1124,23 @@ class MotivationService default: { $column = 'week' . $ind; break; } } - $motivationDataTableSort[$indMap[self::CODE_SALE_OF_GOODS]][$column] = // "Продажа товара" - $motivationDataTableSort[$indMap[self::CODE_OFFLINE_SALES]][$column] + // "Оффлайн продажи" - $motivationDataTableSort[$indMap[self::CODE_ONLINE_SALES]][$column] + 0; // "Онлайн продажи" + // Проверка на наличие необходимого ключа в $indMap + if (isset($indMap[self::CODE_SALE_OF_GOODS]) && + isset($indMap[self::CODE_OFFLINE_SALES]) && + isset($indMap[self::CODE_ONLINE_SALES])) { + + // Выполняем вычисление только если все нужные ключи существуют + $motivationDataTableSort[$indMap[self::CODE_SALE_OF_GOODS]][$column] = + $motivationDataTableSort[$indMap[self::CODE_OFFLINE_SALES]][$column] + + $motivationDataTableSort[$indMap[self::CODE_ONLINE_SALES]][$column] + 0; + + } else { + Yii::error("Один из ключей отсутствует: " . + (isset($indMap[self::CODE_SALE_OF_GOODS]) ? '' : 'CODE_SALE_OF_GOODS ') . + (isset($indMap[self::CODE_OFFLINE_SALES]) ? '' : 'CODE_OFFLINE_SALES ') . + (isset($indMap[self::CODE_ONLINE_SALES]) ? '' : 'CODE_ONLINE_SALES ') + ); + } $motivationDataTableSort[$indMap[self::CODE_OTHER_SERVICES]][$column] = // "Прочие услуги" $motivationDataTableSort[$indMap[self::CODE_ASSEMBLY_SERVICES]][$column] + // "Услуги по сборке" -- 2.39.5