Merge branch 'master' into dev-vj

app/Http/Controllers/HomeController.php

@@ -56,11 +56,11 @@ class HomeController extends Controller
         $keyNumbers['pendingNotesToSign'] = $pendingNotesToSign;
 
         $reimbursement = [];
-        $reimbursement["currentBalance"] = $performer->pro->balance;
+        $reimbursement["currentBalance"] = '$'.$performer->pro->balance;
         $reimbursement["nextPaymentDate"] = '--';
         $lastPayment = ProTransaction::where('pro_id', $performerProID)->where('plus_or_minus', 'PLUS')->orderBy('created_at', 'DESC')->first();
         if ($lastPayment) {
-            $reimbursement["lastPayment"] = $lastPayment->amount;
+            $reimbursement["lastPayment"] = '$'.$lastPayment->amount;
             $reimbursement["lastPaymentDate"] = $lastPayment->created_at;
         } else {
             $reimbursement["lastPayment"] = '--';
@@ -92,7 +92,7 @@ class HomeController extends Controller
         $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;
+        $reimbursement['nextPaymentAmount'] = '$'.$totalExpectedAmount;
 
         $clientsWithAppointments = Client::where("mcp_pro_id", $performerProID)
             ->whereNotNull('next_mcp_appointment')->get();

resources/views/app/dashboard.blade.php

@@ -45,7 +45,7 @@
                         <table class="table table-condensed table-bordered m-0">
                             <tbody>
                                 <tr>
-                                    <th>${{$reimbursement['currentBalance']}}</th>
+                                    <th>{{$reimbursement['currentBalance']}}</th>
                                     <th>Current balance</th>
                                 </tr>
                                 <tr>
@@ -53,7 +53,7 @@
                                     <th>Next Payment Date</th>
                                 </tr>
                                 <tr>
-                                    <th>${{$reimbursement['nextPaymentAmount']}}</th>
+                                    <th>{{$reimbursement['nextPaymentAmount']}}</th>
                                     <th>Next Payment Amount</th>
                                 </tr>
                                 <tr>