fix reports

app/Http/Controllers/ReportController.php

@@ -27,7 +27,6 @@ class ReportController extends Controller
 
     public function index()
     {
-        $mountStatuses = [5, 7, 8, 9, 10];
         $installedStatuses = [
             Order::STATUS_READY_TO_HAND_OVER,
             Order::STATUS_NOT_HANDED_OVER_WITH_NOTES,
@@ -47,7 +46,7 @@ class ReportController extends Controller
         // всего заказов, выполнено заказов
         $this->data['totalOrders']  = Order::all()->count();
         $this->data['doneOrders']  = Order::query()->whereIn('order_status_id', $doneStatuses)->count();
-        $this->data['mountOrders']  = Order::query()->whereIn('order_status_id', $mountStatuses)->count();
+        $this->data['mountOrders']  = Order::query()->whereIn('order_status_id', $installedStatuses)->count();
         $this->data['installedOrders'] = Order::query()->whereIn('order_status_id', $installedStatuses)->count();
 
         // всего маф / завершено маф / установлено маф
@@ -57,8 +56,8 @@ class ReportController extends Controller
                 $query->whereIn('order_status_id', $doneStatuses);
             })->count();
         $this->data['mountMafs']    = ProductSKU::query()->
-        whereHas('order', function ($query) use ($mountStatuses){
-            $query->whereIn('order_status_id', $mountStatuses);
+        whereHas('order', function ($query) use ($installedStatuses){
+            $query->whereIn('order_status_id', $installedStatuses);
         })->count();
         $this->data['installedMafs'] = ProductSKU::query()
             ->whereHas('order', function ($query) use ($installedStatuses) {
@@ -110,27 +109,27 @@ class ReportController extends Controller
                     $query->where('object_type_id', '=', $objectTypeId);
                 })->count();
 
-            // со статусами: в монтаже, готова к сдаче, не сдана замечания, сдана замечания, сдана - зеленый цвет
+            // Установленные: статусы после выхода из "В монтаже".
 
             $this->data['mountOrdersType'][$objectTypeId]  = Order::query()
                 ->where('object_type_id', '=', $objectTypeId)
-                ->whereIn('order_status_id', $mountStatuses)
+                ->whereIn('order_status_id', $installedStatuses)
                 ->count();
             $this->data['mountMafsType'][$objectTypeId]     = ProductSKU::query()->
-            whereHas('order', function ($query) use ($objectTypeId, $mountStatuses) {
+            whereHas('order', function ($query) use ($objectTypeId, $installedStatuses) {
                 $query->where('object_type_id', '=', $objectTypeId)
-                ->whereIn('order_status_id', $mountStatuses);
+                ->whereIn('order_status_id', $installedStatuses);
             })->count();
 
             // остальные - не готовы
             $this->data['notMountOrdersType'][$objectTypeId]  = Order::query()
                 ->where('object_type_id', '=', $objectTypeId)
-                ->whereNotIn('order_status_id', $mountStatuses)
+                ->whereNotIn('order_status_id', $installedStatuses)
                 ->count();
             $this->data['notMountMafsType'][$objectTypeId]     = ProductSKU::query()->
-            whereHas('order', function ($query) use ($objectTypeId, $mountStatuses) {
+            whereHas('order', function ($query) use ($objectTypeId, $installedStatuses) {
                 $query->where('object_type_id', '=', $objectTypeId)
-                    ->whereNotIn('order_status_id', $mountStatuses);
+                    ->whereNotIn('order_status_id', $installedStatuses);
             })->count();
 
         }
@@ -214,24 +213,24 @@ class ReportController extends Controller
 
             $totalYardOrders = $this->getOrderCount($districtId, null, 1);
             $totalYardMafs = $this->getMafCount($districtId, null, 1);
-            $mountYardOrders = $this->getOrderCount($districtId, $mountStatuses, 1);
-            $mountYardMafs = $this->getMafCount($districtId, $mountStatuses, 1);
+            $mountYardOrders = $this->getOrderCount($districtId, $installedStatuses, 1);
+            $mountYardMafs = $this->getMafCount($districtId, $installedStatuses, 1);
             $ostYardOrders = $totalYardOrders - $mountYardOrders;
             $ostYardMafs = $totalYardMafs - $mountYardMafs;
 
             $totalEduOrders = $this->getOrderCount($districtId, null, 2);
             $totalEduMafs = $this->getMafCount($districtId, null, 2);
-            $mountEduOrders = $this->getOrderCount($districtId, $mountStatuses, 2);
-            $mountEduMafs = $this->getMafCount($districtId, $mountStatuses, 2);
-            $ostEduOrders = $totalYardOrders - $mountYardOrders;
-            $ostEduMafs = $totalYardMafs - $mountYardMafs;
+            $mountEduOrders = $this->getOrderCount($districtId, $installedStatuses, 2);
+            $mountEduMafs = $this->getMafCount($districtId, $installedStatuses, 2);
+            $ostEduOrders = $totalEduOrders - $mountEduOrders;
+            $ostEduMafs = $totalEduMafs - $mountEduMafs;
 
             $totalZnakOrders = $this->getOrderCount($districtId, null, 3);
             $totalZnakMafs = $this->getMafCount($districtId, null, 3);
-            $mountZnakOrders = $this->getOrderCount($districtId, $mountStatuses, 3);
-            $mountZnakMafs = $this->getMafCount($districtId, $mountStatuses, 3);
-            $ostZnakOrders = $totalYardOrders - $mountYardOrders;
-            $ostZnakMafs = $totalYardMafs - $mountYardMafs;
+            $mountZnakOrders = $this->getOrderCount($districtId, $installedStatuses, 3);
+            $mountZnakMafs = $this->getMafCount($districtId, $installedStatuses, 3);
+            $ostZnakOrders = $totalZnakOrders - $mountZnakOrders;
+            $ostZnakMafs = $totalZnakMafs - $mountZnakMafs;
             $this->data['byDistrict'][$districtId] = [
                 'name'  => $district,
                 'totalSum' => $this->getDistrictSum($districtId),

tests/Feature/ReportControllerTest.php

@@ -109,8 +109,8 @@ class ReportControllerTest extends TestCase
 
         $response->assertViewHas('installedOrders', 4);
         $response->assertViewHas('installedMafs', 4);
-        $response->assertViewHas('mountOrders', 5);
-        $response->assertViewHas('mountMafs', 5);
+        $response->assertViewHas('mountOrders', 4);
+        $response->assertViewHas('mountMafs', 4);
     }
 
     public function test_reports_index_has_reclamations_data(): void