i

app/Http/Controllers/Admin/StatisticsController.php

@@ -70,7 +70,12 @@ class StatisticsController extends CommonController
 
         DB::enableQueryLog();
         $paramedics = (new Paramedic())->where(function ($query) use ($project_id, $month) {
-            $query->where("project_id", $project_id);
+            $order_item_paramedic_ids = (new OrderItems())
+                ->whereRaw("(DATE_FORMAT(`service_date`,'%Y-%m') = '{$month}' or DATE_FORMAT(`paid_at`,'%Y-%m') = '{$month}')")
+                ->whereHas("order", function ($query) use ($project_id) {
+                    $query->where("project_id", $project_id);
+                })->pluck("paramedic_id")->toArray();
+            $query->where("project_id", $project_id)->orWhereIn("id", $order_item_paramedic_ids);
         })->with(["orderItems" => function ($query) use ($month) {
             $query->whereRaw("(DATE_FORMAT(`service_date`,'%Y-%m') = '{$month}' or DATE_FORMAT(`paid_at`,'%Y-%m') = '{$month}')")
                 ->where("total", ">", 0)

composer.json

@@ -27,7 +27,6 @@
         "zircote/swagger-php": "^3.0"
     },
     "require-dev": {
-        "barryvdh/laravel-ide-helper": "^2.6",
         "facade/ignition": "^2.0",
         "fzaninotto/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",

database/migrations/2023_06_18_225919_update_managers_add_order_status_ability.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateManagersAddOrderStatusAbility extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table("managers", function (Blueprint $table) {
+            $table->tinyInteger("order_status_ability")->default(1)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}