Merge branch 'dev' into dev-vj

app/Http/Controllers/HomeController.php

@@ -250,11 +250,11 @@ class HomeController extends Controller
         }
 
         //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;
+        $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_signed_by_hcp IS TRUE 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_signed_by_cm IS TRUE 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_signed_by_rme IS TRUE 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_signed_by_rmm IS TRUE 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_signed_by_hcp IS TRUE AND is_cancelled = false"), ['performerProID' => $performerProID])[0]->expected_pay;
 
         $totalExpectedAmount =  $expectedForHcp + $expectedForCm + $expectedForRme + $expectedForRmm + $expectedForNa;
         $reimbursement['nextPaymentAmount'] =  $totalExpectedAmount;

resources/views/app/dashboard.blade.php

@@ -51,13 +51,13 @@
                                     <th class="px-2">${{friendly_money($reimbursement['currentBalance'])}}</th>
                                     <th class="pl-2"><a target="_top" href="/mc/practice-management/financial-transactions">Current balance</a></th>
                                 </tr>
-                                <tr>
+                                <!-- <tr>
                                     <th class="px-2">{{friendly_date_time($reimbursement['nextPaymentDate'], false)}}</th>
                                     <th class="pl-2">Next Payment Date</th>
-                                </tr>
+                                </tr> -->
                                 <tr>
                                     <th class="px-2">${{friendly_money($reimbursement['nextPaymentAmount'])}}</th>
-                                    <th class="pl-2">Next Payment Amount</th>
+                                    <th class="pl-2">Processing</th>
                                 </tr>
                                 {{--
                                 <tr>

storage/sections/cc/default.php

@@ -12,9 +12,19 @@ $items = !$items ? [] : $items;
 foreach($items as $item):
     $value[] = $item['title'];
 endforeach;
-$summaryHtml = $patient->displayName() . ", {$patient->age_in_years} years old {$patient->sex} ";
+
+$summaryHtml = 'Patient ' . $patient->name_first .' '.$patient->name_last . " is a {$patient->age_in_years} year old {$patient->sex} ";
 if(count($value)) {
-    $summaryHtml .= "presenting with " . implode(", ", $value);
+    $summaryHtml .= "presenting with ";
+    if(count($value) == 1){
+        $summaryHtml .= implode(", ", $value);
+    }else{
+        $allButLast = array_slice($value, 0, count($value)-1);
+        $last =  array_slice($value, count($value)-1, 1)[0];
+        $summaryHtml .= implode(", ", $allButLast);
+        $summaryHtml .= ' and ' . $last;
+    }
+
 }
 $contentData = [
     'value' => $summaryHtml