]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
empty bonus levels
authorAlexander Smirnov <fredeom@mail.ru>
Wed, 8 May 2024 09:09:58 +0000 (12:09 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Wed, 8 May 2024 09:09:58 +0000 (12:09 +0300)
erp24/services/BonusService.php
erp24/services/SalesService.php

index 440752346706dfc02df51b96f76d38f8108d79d5..2291a52298bbbbb58240671db82289237002928a 100755 (executable)
@@ -171,7 +171,7 @@ class BonusService
     {
         $coefficient = 1;
 
-        $minLevel = min(array_keys($levels));
+        $minLevel = empty($levels) ? -1 : min(array_keys($levels));
 
         if ($value > $minLevel) {
             ksort($levels);
index 5be4a1df910a3b1e309bb0addc597d379112645b..3c24b63f7d133bdc6696f8e5882cdc5bb7066872 100755 (executable)
@@ -802,7 +802,7 @@ class SalesService
 
             if(!empty($rowDateT)) {
                 $sales_store[$rowDateT][$rowStoreId]=$rowCnt;
-                $sales_store_summ[$rowDateT][$rowStoreId]=round($rowSumm/$rowCnt);
+                $sales_store_summ[$rowDateT][$rowStoreId] = $rowCnt > 0 ? round($rowSumm/$rowCnt) : 0;
                 if (!empty(ArrayHelper::getValue($sales_store_summ_all, $rowDateT))) {
                     $sales_store_summ_all[$rowDateT] = $sales_store_summ_all[$rowDateT] + $rowSumm;
                 } else {