From ca663f5657ab51091978fd2af6365ddbec3d2830 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Thu, 10 Oct 2024 16:57:27 +0300
Subject: [PATCH] =?utf8?q?[ERP-220]=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D1=82?=
 =?utf8?q?=D1=8C=20=D0=B4=D0=B5=D1=84=D0=B5=D0=BA=D1=82=20=D0=BF=D0=BE?=
 =?utf8?q?=D1=81=D1=82=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B8=D0=B7=20=D0=BC?=
 =?utf8?q?=D0=BE=D1=82=D0=B8=D0=B2=D0=B0=D1=86=D0=B8=D0=B8,=20=D0=BD=D0=B5?=
 =?utf8?q?=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D0=BE=20=D1=83=D0=B1?=
 =?utf8?q?=D1=80=D0=B0=D1=82=D1=8C=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD?=
 =?utf8?q?=D0=BE=D1=81=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/MotivationCostsItem.php | 8 ++++----
 erp24/services/MotivationService.php  | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/erp24/records/MotivationCostsItem.php b/erp24/records/MotivationCostsItem.php
index 33dc54a4..c415d96e 100644
--- a/erp24/records/MotivationCostsItem.php
+++ b/erp24/records/MotivationCostsItem.php
@@ -37,8 +37,8 @@ class MotivationCostsItem extends ActiveRecord
         switch ($itemType) {
             case WriteOffsErp::WRITE_OFFS_TYPE_BRAK:
                 return self::ITEM_WRITE_OFF_OF_ILLIQUID_GOODS_SPOILAGE_EXPIRATION_OF_SHELF_LIFE;
-            case WriteOffsErp::WRITE_OFFS_TYPE_DELIVERY_BRAK:
-                return self::ITEM_DEFECTIVE_DELIVERY;
+//            case WriteOffsErp::WRITE_OFFS_TYPE_DELIVERY_BRAK:
+//                return self::ITEM_DEFECTIVE_DELIVERY;
             case WriteOffsErp::WRITE_OFFS_TYPE_DUE_TO_EQUIPMENT_FAILURE_BRAK:
                 return self::ITEM_DEFECT_DUE_TO_EQUIPMENT_FAILURE;
             case WriteOffsErp::WRITE_OFFS_TYPE_RESORTING_DOES_NOT_COUNT_TOWARDS_COST:
@@ -51,7 +51,7 @@ class MotivationCostsItem extends ActiveRecord
     public static function writeOffsToMotivationItemArray() {
         return [
             WriteOffsErp::WRITE_OFFS_TYPE_BRAK => self::ITEM_WRITE_OFF_OF_ILLIQUID_GOODS_SPOILAGE_EXPIRATION_OF_SHELF_LIFE,
-            WriteOffsErp::WRITE_OFFS_TYPE_DELIVERY_BRAK => self::ITEM_DEFECTIVE_DELIVERY,
+//            WriteOffsErp::WRITE_OFFS_TYPE_DELIVERY_BRAK => self::ITEM_DEFECTIVE_DELIVERY,
             WriteOffsErp::WRITE_OFFS_TYPE_DUE_TO_EQUIPMENT_FAILURE_BRAK => self::ITEM_DEFECT_DUE_TO_EQUIPMENT_FAILURE,
             WriteOffsErp::WRITE_OFFS_TYPE_RESORTING_DOES_NOT_COUNT_TOWARDS_COST => self::ITEM_REGRADING,
         ];
@@ -60,7 +60,7 @@ class MotivationCostsItem extends ActiveRecord
     public static function getWriteOffsItems() {
         return [
             WriteOffsErp::WRITE_OFFS_TYPE_BRAK,
-            WriteOffsErp::WRITE_OFFS_TYPE_DELIVERY_BRAK,
+//            WriteOffsErp::WRITE_OFFS_TYPE_DELIVERY_BRAK,
             WriteOffsErp::WRITE_OFFS_TYPE_DUE_TO_EQUIPMENT_FAILURE_BRAK,
             WriteOffsErp::WRITE_OFFS_TYPE_RESORTING_DOES_NOT_COUNT_TOWARDS_COST,
         ];
diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php
index 3ab5b416..79d55c44 100644
--- a/erp24/services/MotivationService.php
+++ b/erp24/services/MotivationService.php
@@ -31,7 +31,7 @@ class MotivationService
     const CODE_ONLINE_SALES = 2;
     const CODE_ASSEMBLY_SERVICES = 3;
     const CODE_DELIVERY_SERVICES = 4;
-    const CODE_DELIVERY_DEFECTS = 6;
+    //const CODE_DELIVERY_DEFECTS = 6;
     const CODE_WRITE_OFF_ILLIQUID_GOODS_SPOOLAGE_EXPIRATION_OF_SHELF_LIFE = 7;
     const CODE_EQUIPMENT_FAILURE_DEFECT = 8;
     const CODE_REGRADING = 9;
@@ -186,6 +186,7 @@ class MotivationService
 
         // 3. Получение данных из MotivationCostsItem
         $costsItems = MotivationCostsItem::find()
+            ->where(['is_active' => true])
             ->indexBy('code')
             ->orderBy(['order' => SORT_ASC])
             ->all();
@@ -1606,7 +1607,7 @@ class MotivationService
                 $motivationDataTableSort[$indMap[self::CODE_COSTS_OF_GOODS]][$column] + 0; // "Стоимость товара"
 
             $motivationDataTableSort[$indMap[self::CODE_DEFECT_RESORTING]][$column] = // "Брак, пересорт"
-                $motivationDataTableSort[$indMap[self::CODE_DELIVERY_DEFECTS]][$column] + // "Брак с поставки"
+                //$motivationDataTableSort[$indMap[self::CODE_DELIVERY_DEFECTS]][$column] + // "Брак с поставки"
                 $motivationDataTableSort[$indMap[self::CODE_WRITE_OFF_ILLIQUID_GOODS_SPOOLAGE_EXPIRATION_OF_SHELF_LIFE]][$column] + // "Списание неликвидного товара: порча, истечение срока годности"
                 $motivationDataTableSort[$indMap[self::CODE_EQUIPMENT_FAILURE_DEFECT]][$column] + // "Брак из-за поломки оборудования"
                 $motivationDataTableSort[$indMap[self::CODE_REGRADING]][$column] + 0; // "Пересорт"
-- 
2.39.5