update listing

Modules/Client/Http/Controllers/Api/ClaimController.php

@@ -21,6 +21,7 @@ use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
 use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
 use Box\Spout\Common\Entity\Style\CellAlignment;
 use Box\Spout\Common\Entity\Style\Color;
+use Carbon\Carbon;
 
 class ClaimController extends Controller
 {
@@ -315,8 +316,8 @@ class ClaimController extends Controller
         // ->where('request_logs.status_final_log', '=', 'approved')
         ->where('request_logs.deleted_at', '=', null)
         ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
-            $query->where('request_logs.submission_date', '>=', $start)
-                ->where('request_logs.submission_date', '<=', $end);
+            $query->where('request_logs.submission_date', '>=',Carbon::parse($start)->subDay())
+                ->where('request_logs.submission_date', '<=',Carbon::parse($end)->addDay());
         })       
         ->select(
             DB::raw('1 AS no'),

Modules/Internal/Http/Controllers/Api/ClaimController.php

@@ -45,7 +45,7 @@ class ClaimController extends Controller
         $results = DB::table('claim_requests')
         ->leftJoin('request_logs', 'claim_requests.request_log_id','=', 'request_logs.id')
         ->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
-        ->leftJoin('member_plans', 'member_plans.member_id', '=', 'members.id')
+        // ->leftJoin('member_plans', 'member_plans.member_id', '=', 'members.id')
         ->when($request->input('search'), function ($query, $search) {
             $query->where(function ($query) use ($search) {
                 $query->orWhere('members.name', 'like', "%" . $search . "%");
@@ -84,8 +84,18 @@ class ClaimController extends Controller
                 (SELECT members.member_id FROM members WHERE members.id = claim_requests.member_id LIMIT 1) AS member_id
             '),
             'claim_requests.created_at',
+            // DB::raw('
+            //     (SELECT plans.code FROM plans WHERE plans.id = member_plans.plan_id LIMIT 1) AS plan_code
+            // '),
             DB::raw('
-                (SELECT plans.code FROM plans WHERE plans.id = member_plans.plan_id LIMIT 1) AS plan_code
+                (SELECT plans.code 
+                FROM plans 
+                WHERE plans.id IN (
+                    SELECT member_plans.plan_id 
+                    FROM member_plans 
+                    WHERE member_plans.member_id = claim_requests.member_id
+                ) 
+                AND plans.service_code = claim_requests.service_code) AS plan_code
             '),
             DB::raw('
                 (SELECT services.description FROM services WHERE services.code = claim_requests.service_code LIMIT 1) AS service_code