Josh 4 жил өмнө
parent
commit
e73d685574

+ 12 - 1
app/Http/Controllers/HomeController.php

@@ -9,6 +9,7 @@ use App\Models\Bill;
 use App\Models\Note;
 use App\Models\ProTransaction;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class HomeController extends Controller
 {
@@ -80,9 +81,19 @@ class HomeController extends Controller
              $nextPaymentDate = new \DateTime();
              $lastDayOfMonth = date('t', $today);
              $nextPaymentDate->setDate($todayYear, $todayMonth, $lastDayOfMonth);
-             $reimbursement['nextPaymentDate'] = $nextPaymentDate->format('m/d/Y');;
+             $reimbursement['nextPaymentDate'] = $nextPaymentDate->format('m/d/Y');
          }
 
+         //expectedPay
+        $expectedForHcp = DB::select(DB::raw("SELECT coalesce(SUM(hcp_expected_payment_amount),0) as expected_pay FROM bill WHERE hcp_pro_id = :performerProID  AND has_hcp_been_paid = false AND is_cancelled = false"), ['performerProID'=>$performerProID])[0]->expected_pay;
+        $expectedForCm = DB::select(DB::raw("SELECT coalesce(SUM(cm_expected_payment_amount),0) as expected_pay  FROM bill WHERE cm_pro_id = :performerProID  AND has_cm_been_paid = false AND is_cancelled = false"), ['performerProID'=>$performerProID])[0]->expected_pay;
+        $expectedForRme = DB::select(DB::raw("SELECT coalesce(SUM(rme_expected_payment_amount),0) as expected_pay  FROM bill WHERE rme_pro_id = :performerProID  AND has_rme_been_paid = false AND is_cancelled = false"), ['performerProID'=>$performerProID])[0]->expected_pay;
+        $expectedForRmm = DB::select(DB::raw("SELECT coalesce(SUM(rmm_expected_payment_amount),0) as expected_pay  FROM bill WHERE rmm_pro_id = :performerProID  AND has_rmm_been_paid = false AND is_cancelled = false"), ['performerProID'=>$performerProID])[0]->expected_pay;
+        $expectedForNa = DB::select(DB::raw("SELECT coalesce(SUM(na_expected_payment_amount),0) as expected_pay  FROM bill WHERE na_pro_id = :performerProID  AND has_na_been_paid = false AND is_cancelled = false"), ['performerProID'=>$performerProID])[0]->expected_pay;
+       
+        $totalExpectedAmount =  $expectedForHcp + $expectedForCm + $expectedForRme + $expectedForRmm + $expectedForNa;
+        $reimbursement['nextPaymentAmount'] = $totalExpectedAmount;
+
         $clientsWithAppointments = Client::where("mcp_pro_id", $performerProID)
             ->whereNotNull('next_mcp_appointment')->get();
 

+ 4 - 0
resources/views/app/dashboard.blade.php

@@ -52,6 +52,10 @@
                                     <th>{{$reimbursement['nextPaymentDate']}}</th>
                                     <th>Next Payment Date</th>
                                 </tr>
+                                <tr>
+                                    <th>${{$reimbursement['nextPaymentAmount']}}</th>
+                                    <th>Next Payment Amount</th>
+                                </tr>
                                 <tr>
                                     <th>{{$reimbursement['lastPayment']}}</th>
                                     <th>Last payment</th>