Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2

app/Http/Controllers/HomeController.php

@@ -41,7 +41,7 @@ class HomeController extends Controller
         })->orWhere(function($query) use ($performerProID){
             $query->where('rmm_pro_id', $performerProID)->where('is_signed_by_rmm', false)->where('is_cancelled', false);;
         })->count();
-        
+
         $keyNumbers['pendingBillsToSign'] = $pendingBillsToSign;
 
         $pendingNotesToSign = Note::where(function($query) use ($performerProID){
@@ -50,7 +50,7 @@ class HomeController extends Controller
         ->orWhere(function($query) use ($performerProID){
             $query->where('ally_pro_id', $performerProID)->where('is_signed_by_ally', false)->where('is_cancelled', false);;
         })->count();
-        
+
         $keyNumbers['pendingNotesToSign'] = $pendingNotesToSign;
 
         $reimbursement = [];
@@ -62,16 +62,16 @@ class HomeController extends Controller
             $reimbursement["lastPaymentDate"] = $lastPayment->created_at;
         }else{
             $reimbursement["lastPayment"] = '--';
-            $reimbursement["lastPaymentDate"] = '--';   
+            $reimbursement["lastPaymentDate"] = '--';
         }
-        
+
 
         return view('app/dashboard', compact('keyNumbers','reimbursement'));
     }
 
     public function patients(Request $request)
     {
-        $patients = Client::all();
+        $patients = Client::orderBy('name_last', 'asc')->orderBy('name_first', 'asc')->get();
         return view('app/patients', ['patients' => $patients]);
     }
 

app/Http/Controllers/PracticeManagementController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\AppSession;
 use App\Models\Client;
+use App\Models\ProTransaction;
 use Illuminate\Http\Request;
 
 class PracticeManagementController extends Controller
@@ -25,7 +26,8 @@ class PracticeManagementController extends Controller
 
     public function financialTransactions(Request $request)
     {
-        return view('app.practice-management.financial-transactions');
+        $transactions = ProTransaction::where('pro_id', $this->performer()->pro->id)->orderBy('created_at', 'desc')->get();
+        return view('app.practice-management.financial-transactions', compact('transactions'));
     }
 
     public function pendingBillsToSign(Request $request)

app/Http/Middleware/RedirectAuthenticatedPro.php

@@ -20,7 +20,7 @@ class RedirectAuthenticatedPro
         $appSession = AppSession::where('session_key', $sessionKey)->first();
 
         if($appSession && $appSession->is_active && $appSession->pro) {
-            return redirect()->route('home');
+            return redirect()->route('dashboard');
         }
 
         return $next($request);

app/Models/Bill.php

@@ -7,4 +7,8 @@ namespace App\Models;
 class Bill extends Model
 {
     protected $table = 'bill';
+
+    public function careMonth() {
+        return $this->belongsTo(CareMonth::class);
+    }
 }

app/Models/CareMonth.php

@@ -18,6 +18,18 @@ class CareMonth extends Model
         return $this->hasOne(Pro::class, 'id', 'mcp_pro_id');
     }
 
+    public function cmPro(){
+        return $this->hasOne(Pro::class, 'id', 'cm_pro_id');
+    }
+
+    public function rmmPro(){
+        return $this->hasOne(Pro::class, 'id', 'rmm_pro_id');
+    }
+
+    public function rmePro(){
+        return $this->hasOne(Pro::class, 'id', 'rme_pro_id');
+    }
+
     public function entries() {
         return $this->hasMany(CareMonthEntry::class, 'care_month_id', 'id');
     }

app/Models/Pro.php

@@ -18,4 +18,12 @@ class Pro extends Model
     {
         return $this->hasMany(Bill::class, 'hcp_pro_id');
     }
+
+    public function lastPayment() {
+        return ProTransaction
+            ::where('pro_id', $this->id)
+            ->where('plus_or_minus', 'PLUS')
+            ->orderBy('created_at', 'desc')
+            ->first();
+    }
 }

app/Models/ProTransaction.php

@@ -7,4 +7,12 @@ namespace App\Models;
 class ProTransaction extends Model
 {
     protected $table = 'pro_transaction';
+
+    public function client() {
+        return $this->belongsTo(Client::class);
+    }
+
+    public function bill() {
+        return $this->belongsTo(Bill::class);
+    }
 }

public/css/style.css

@@ -82,9 +82,12 @@ body.stag_rhs_collapsed .app-right-panel {
 .delete-column {
     width: 60px;
 }
-hr.m-negator {
-    margin-left: -1.25rem;
-    margin-right: -1.25rem;
+.m-negator {
+    margin-left: -1.25rem !important;
+    margin-right: -1.25rem !important;
+}
+.pl-3-5 {
+    padding-left: 1.25rem !important;
 }
 .mcp-theme-1 *:not(i) {
     font-family: Verdana, sans-serif;
@@ -129,3 +132,7 @@ hr.m-negator {
 .mcp-theme-1 .minutes-label {
     width: 40px;
 }
+.mcp-theme-1 .memo-textarea {
+    min-width: 200px;
+    height: 60px;
+}

public/js/mc.js

@@ -91,6 +91,10 @@ $(document).ready(function () {
     }
     initFastLoad();
 });
+function enableTimeSpecificFields(_checked, _valueClass, _rangeClass) {
+    if(_valueClass) $('.' + _valueClass).prop('disabled', _checked);
+    if(_rangeClass) $('.' + _rangeClass).prop('disabled', !_checked);
+}
 
 var fastCache = {};
 
@@ -150,6 +154,7 @@ function fastLoad(_href, _history = true, _useCache = true) {
             content += '<script src="/js/yemi.js"></script>';
             targetParent.html(content);
             initFastLoad(targetParent);
+            initializeCalendar();
 
             // push state
             if (_history) {
@@ -186,6 +191,7 @@ function openInRHS(_url) {
 }
 
 function initializeCalendar() {
+    if(!$('#calendar').length) return;
     var calendarEl = document.getElementById('calendar');
     var calendar = new FullCalendar.Calendar(calendarEl, {
         initialView: 'dayGridMonth'

public/js/yemi.js

@@ -346,6 +346,13 @@ jQuery(document).ready(function () {
                     return;
                 }
             }
+
+            // trigger validation
+            if(!$(form)[0].checkValidity()) {
+                $(form)[0].reportValidity();
+                return;
+            }
+
             moe.isProcessing = true;
             var data = {};
             var formData = $(form).serializeArray();

resources/views/app/patient/care-month/dashboard.blade.php

@@ -62,10 +62,57 @@
             </div>
         </div>
 
-        <hr class="m-negator">
+        <hr class="m-negator mb-0">
+
+        <div class="row m-negator bg-light py-1 text-sm-incl-children">
+            <div class="col-3 pl-3-5">
+                <span class="text-secondary">MCP:</span>
+                <span class="text-nowrap">{{ $careMonth->mcp ? $careMonth->mcp->name_display : '-' }}</span>
+            </div>
+            <div class="col-3">
+                <span class="text-secondary">CM:</span>
+                <span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->name_display : '-' }}</span>
+            </div>
+            <div class="col-3">
+                <span class="text-secondary">RMM:</span>
+                <span class="text-nowrap">{{ $careMonth->rmmPro ? $careMonth->rmmPro->name_display : '-' }}</span>
+            </div>
+            <div class="col-3">
+                <span class="text-secondary">RME:</span>
+                <span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->name_display : '-' }}</span>
+            </div>
+        </div>
+
+        <hr class="m-negator mt-0">
 
         <?php
         $entries = $careMonth->entries;
+
+        $cmBills = $careMonth->getBillsOfType('CM');
+        $activeCMBill = false;
+        $cancelledCMBills = new \Illuminate\Support\Collection();
+        foreach ($cmBills as $cmBill) {
+            if(!$cmBill->is_cancelled && $careMonth->cm_bill_id === $cmBill->id) {
+                $activeCMBill = $cmBill;
+                break;
+            }
+            else if($cmBill->is_cancelled) {
+                $cancelledCMBills->add($cmBill);
+            }
+        }
+
+        $rmBills = $careMonth->getBillsOfType('RM');
+        $activeRMBill = false;
+        $cancelledRMBills = new \Illuminate\Support\Collection();
+        foreach ($rmBills as $rmBill) {
+            if(!$rmBill->is_cancelled && $careMonth->rm_bill_id === $rmBill->id) {
+                $activeRMBill = $rmBill;
+                break;
+            }
+            else if($rmBill->is_cancelled) {
+                $cancelledRMBills->add($rmBill);
+            }
+        }
         ?>
 
         <div class="row">
@@ -73,52 +120,68 @@
                 <div class="d-flex align-items-center">
                     <h6 class="my-0 text-secondary font-weight-bold text-dark">CM Time Entries</h6>
                     <span class="mx-2 text-secondary">|</span>
-                    <div moe>
-                        <a start show class="py-0 mb-3">Add</a>
-                        <form url="/api/careMonthEntry/createForCm">
-                            <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
-                            <div class="mb-2">
-                                <select class="form-control form-control-sm" name="proUid">
-                                    <option value="">-- Select Pro --</option>
-                                    @foreach($pros as $pro)
-                                    <option value="{{ $pro->uid }}">{{ $pro->name_display }}</option>
-                                    @endforeach
-                                </select>
-                            </div>
-                            <div class="mb-2">
-                                <input type="date" class="form-control form-control-sm" name="effectiveDate"
-                                       value="" placeholder="Effective Date">
-                            </div>
-                            <div class="mb-2">
-                                <input type="number" min="0" max="9999" class="form-control form-control-sm" name="timeInSeconds"
-                                       value="" placeholder="Time in Seconds">
-                            </div>
-                            <div class="mb-2 d-flex align-items-center">
-                                <span>Time Specific:</span>
-                                <input type="checkbox" name="isTimeSpecific" class="ml-1">
-                            </div>
-                            <div class="mb-2">
-                                <input type="time" class="form-control form-control-sm" name="startingTime"
-                                       value="" placeholder="Starting Time">
-                            </div>
-                            <div class="mb-2">
-                                <input type="time" class="form-control form-control-sm" name="endingTime"
-                                       value="" placeholder="Ending Time">
-                            </div>
-                            <div class="mb-2">
-                                <input type="text" class="form-control form-control-sm" name="contentText"
-                                       value="" placeholder="Content Text">
-                            </div>
-                            <div class="mb-2">
-                                <input type="text" class="form-control form-control-sm" name="contentDetail"
-                                       value="" placeholder="Content Detail">
-                            </div>
-                            <div class="d-flex align-items-center">
-                                <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </div>
+                    @if(!$activeCMBill)
+                        <div moe>
+                            <a start show class="py-0 mb-3">Add</a>
+                            <form url="/api/careMonthEntry/createForCm">
+                                <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
+                                <div class="mb-2">
+                                    <select class="form-control form-control-sm" name="proUid">
+                                        <option value="">-- Select Pro --</option>
+                                        @foreach($pros as $pro)
+                                        <option value="{{ $pro->uid }}">{{ $pro->name_display }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="mb-2">
+                                    <?php
+                                    $sD = strtotime($careMonth->start_date);
+                                    $y = date('Y', $sD);
+                                    $m = date('m', $sD);
+                                    $d = date('t', $sD);
+                                    $yCurrent = date('Y');
+                                    $mCurrent = date('m');
+                                    if($y === $yCurrent && $m === $mCurrent) {
+                                        $d = date('d');
+                                    }
+                                    ?>
+                                    <input type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}" class="form-control form-control-sm" name="effectiveDate"
+                                           value="" placeholder="Effective Date">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="number" min="0" max="9999" class="form-control form-control-sm cm-time-value" name="timeInSeconds"
+                                           value="" placeholder="Time in Seconds">
+                                </div>
+                                <div class="mb-2 d-flex align-items-center">
+                                    <span>Time Specific:</span>
+                                    <input type="checkbox" name="isTimeSpecific" class="ml-1"
+                                           onchange="enableTimeSpecificFields(this.checked, 'cm-time-value', 'cm-time-range')">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="time" class="form-control form-control-sm cm-time-range" name="startingTime"
+                                           value="" placeholder="Starting Time" disabled>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="time" class="form-control form-control-sm cm-time-range" name="endingTime"
+                                           value="" placeholder="Ending Time" disabled>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="contentText"
+                                           value="" placeholder="Content Text">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="contentDetail"
+                                           value="" placeholder="Content Detail">
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @else
+                        <span class="text-secondary">Cannot modify. Bill existing.</span>
+                    @endif
                 </div>
                 <table class="table table-striped table-sm table-bordered mt-2 mb-0">
                     <thead>
@@ -167,52 +230,68 @@
                 <div class="d-flex align-items-center">
                     <h6 class="my-0 text-secondary font-weight-bold text-dark">RM Time Entries</h6>
                     <span class="mx-2 text-secondary">|</span>
-                    <div moe>
-                        <a start show class="py-0 mb-3">Add</a>
-                        <form url="/api/careMonthEntry/createForRm">
-                            <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
-                            <div class="mb-2">
-                                <select class="form-control form-control-sm" name="proUid">
-                                    <option value="">-- Select Pro --</option>
-                                    @foreach($pros as $pro)
-                                        <option value="{{ $pro->uid }}">{{ $pro->name_display }}</option>
-                                    @endforeach
-                                </select>
-                            </div>
-                            <div class="mb-2">
-                                <input type="date" class="form-control form-control-sm" name="effectiveDate"
-                                       value="" placeholder="Effective Date">
-                            </div>
-                            <div class="mb-2">
-                                <input type="number" min="0" max="9999" class="form-control form-control-sm" name="timeInSeconds"
-                                       value="" placeholder="Time in Seconds">
-                            </div>
-                            <div class="mb-2 d-flex align-items-center">
-                                <span>Time Specific:</span>
-                                <input type="checkbox" name="isTimeSpecific" class="ml-1">
-                            </div>
-                            <div class="mb-2">
-                                <input type="time" class="form-control form-control-sm" name="startingTime"
-                                       value="" placeholder="Starting Time">
-                            </div>
-                            <div class="mb-2">
-                                <input type="time" class="form-control form-control-sm" name="endingTime"
-                                       value="" placeholder="Ending Time">
-                            </div>
-                            <div class="mb-2">
-                                <input type="text" class="form-control form-control-sm" name="contentText"
-                                       value="" placeholder="Content Text">
-                            </div>
-                            <div class="mb-2">
-                                <input type="text" class="form-control form-control-sm" name="contentDetail"
-                                       value="" placeholder="Content Detail">
-                            </div>
-                            <div class="d-flex align-items-center">
-                                <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </div>
+                    @if(!$activeRMBill)
+                        <div moe>
+                            <a start show class="py-0 mb-3">Add</a>
+                            <form url="/api/careMonthEntry/createForRm">
+                                <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
+                                <div class="mb-2">
+                                    <select class="form-control form-control-sm" name="proUid">
+                                        <option value="">-- Select Pro --</option>
+                                        @foreach($pros as $pro)
+                                            <option value="{{ $pro->uid }}">{{ $pro->name_display }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="mb-2">
+                                    <?php
+                                    $sD = strtotime($careMonth->start_date);
+                                    $y = date('Y', $sD);
+                                    $m = date('m', $sD);
+                                    $d = date('t', $sD);
+                                    $yCurrent = date('Y');
+                                    $mCurrent = date('m');
+                                    if($y === $yCurrent && $m === $mCurrent) {
+                                        $d = date('d');
+                                    }
+                                    ?>
+                                    <input type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}" class="form-control form-control-sm" name="effectiveDate"
+                                           value="" placeholder="Effective Date">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="number" min="0" max="9999" class="form-control form-control-sm rm-time-value" name="timeInSeconds"
+                                           value="" placeholder="Time in Seconds">
+                                </div>
+                                <div class="mb-2 d-flex align-items-center">
+                                    <span>Time Specific:</span>
+                                    <input type="checkbox" name="isTimeSpecific" class="ml-1"
+                                           onchange="enableTimeSpecificFields(this.checked, 'rm-time-value', 'rm-time-range')">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="time" class="form-control form-control-sm rm-time-range" name="startingTime"
+                                           value="" placeholder="Starting Time" disabled>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="time" class="form-control form-control-sm rm-time-range" name="endingTime"
+                                           value="" placeholder="Ending Time" disabled>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="contentText"
+                                           value="" placeholder="Content Text">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="contentDetail"
+                                           value="" placeholder="Content Detail">
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @else
+                        <span class="text-secondary">Cannot modify. Bill existing.</span>
+                    @endif
                 </div>
                 <table class="table table-striped table-sm table-bordered mt-2 mb-0">
                     <thead>
@@ -261,39 +340,9 @@
 
         <hr class="m-negator mt-4 mb-3">
 
-        <?php
-        $cmBills = $careMonth->getBillsOfType('CM');
-        $activeCMBill = false;
-        $cancelledCMBills = new \Illuminate\Support\Collection();
-        foreach ($cmBills as $cmBill) {
-            if(!$cmBill->is_cancelled && $careMonth->cm_bill_id === $cmBill->id) {
-                $activeCMBill = $cmBill;
-                break;
-            }
-            else if($cmBill->is_cancelled) {
-                $cancelledCMBills->add($cmBill);
-            }
-        }
-        ?>
-
-        <?php
-        $rmBills = $careMonth->getBillsOfType('RM');
-        $activeRMBill = false;
-        $cancelledRMBills = new \Illuminate\Support\Collection();
-        foreach ($rmBills as $rmBill) {
-            if(!$rmBill->is_cancelled && $careMonth->rm_bill_id === $rmBill->id) {
-                $activeRMBill = $rmBill;
-                break;
-            }
-            else if($rmBill->is_cancelled) {
-                $cancelledRMBills->add($rmBill);
-            }
-        }
-        ?>
-
         <div class="row">
 
-            {{-- active cm bill --}}
+            {{-- cm bills --}}
             <div class="col-6">
                 <div class="d-flex align-items-center">
                     <h6 class="my-0 text-secondary font-weight-bold text-dark">CM Bill
@@ -320,6 +369,9 @@
                                     <option value="CM90">CM90</option>
                                 </select>
                             </div>
+                            <div class="mb-2">
+                                <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="form-control form-control-sm"></textarea>
+                            </div>
                             <div class="d-flex align-items-center">
                                 <button class="btn btn-sm btn-primary mr-2" submit>Generate</button>
                                 <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -345,7 +397,10 @@
                             <a start show class="py-0 mb-3 text-danger">Cancel</a>
                             <form url="/api/bill/markCancelled">
                                 <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                <p class="small">Are you sure you want to cancel this CM bill?</p>
+                                <p class="small mb-2">Are you sure you want to cancel this CM bill?</p>
+                                <div class="mb-2">
+                                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
+                                </div>
                                 <div class="d-flex align-items-center">
                                     <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
                                     <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
@@ -358,7 +413,8 @@
                     <div class="border bg-white p-2 mt-2">
                         <div class="">
                             Code: <span class="font-weight-bold text-dark">{{ $activeCMBill->code }}</span>
-                            <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
+                            <div class="small text-secondary">Memo: {{$activeCMBill->memo}}</div>
+                            <div class="small text-secondary">Created: {{friendly_date_time($activeCMBill->created_at)}}</div>
                         </div>
                         <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
                         @if(1) {{-- check if auther user is hcp pro --}}
@@ -368,7 +424,28 @@
                                 <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->hcp_payment_amount }}</span>
                             @else
                                 <span class="text-dark">Expected HCP Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">${{ $activeCMBill->hcp_expected_payment_amount }}</span>
+                                <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->hcp_expected_payment_amount ? '$' . $activeCMBill->hcp_expected_payment_amount : '-' }}</span>
+                                <span class="ml-auto">
+                                    @if($activeCMBill->is_signed_by_hcp)
+                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                    @else
+                                        <div class="text-primary ml-3">
+                                            <div moe class="text-dark">
+                                                <a start show class="py-0 mb-3 text-primary text-sm">
+                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                </a>
+                                                <form url="/api/bill/signAsHcp">
+                                                    <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                                    <p class="small">Sign this RM bill as HCP?</p>
+                                                    <div class="d-flex align-items-center">
+                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    @endif
+                                </span>
                             @endif
                         </div>
                         @endif
@@ -379,15 +456,74 @@
                                 <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->cm_payment_amount }}</span>
                             @else
                                 <span class="text-dark">Expected CM Pro Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">${{ $activeCMBill->cm_expected_payment_amount }}</span>
+                                <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->cm_expected_payment_amount ? '$' . $activeCMBill->cm_expected_payment_amount : '-' }}</span>
+                                <span class="ml-auto">
+                                    @if($activeCMBill->is_signed_by_cm)
+                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                    @else
+                                        <div class="text-primary ml-3">
+                                            <div moe class="text-dark">
+                                                <a start show class="py-0 mb-3 text-primary text-sm">
+                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                </a>
+                                                <form url="/api/bill/signAsCm">
+                                                    <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                                    <p class="small">Sign this RM bill as CM Pro?</p>
+                                                    <div class="d-flex align-items-center">
+                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    @endif
+                                </span>
                             @endif
                         </div>
                         @endif
                     </div>
                 @endif
+                {{-- cancelled cm bills --}}
+                @if(count($cancelledCMBills))
+                    @foreach($cancelledCMBills as $cancelledBill)
+                        <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
+                            <div class="d-flex">
+                                <div class="">
+                                    Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
+                                    <div class="small text-secondary">Memo: {{$cancelledBill->memo}}</div>
+                                    <div class="small text-secondary">Created: {{friendly_date_time($cancelledBill->created_at)}}</div>
+                                </div>
+                                <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
+                            </div>
+                            <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
+                            @if(1) {{-- check if auther user is hcp pro --}}
+                            <div class="d-flex align-items-center">
+                                @if($cancelledBill->has_hcp_been_paid)
+                                    <span class="text-dark">Received HCP Amount: </span>
+                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
+                                @else
+                                    <span class="text-dark">Expected HCP Amount: </span>
+                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_amount : '-' }}</span>
+                                @endif
+                            </div>
+                            @endif
+                            @if(1) {{-- check if auther user is cm pro --}}
+                            <div class="d-flex align-items-center">
+                                @if($cancelledBill->has_cm_been_paid)
+                                    <span class="text-dark">Received CM Pro Amount: </span>
+                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->cm_payment_amount }}</span>
+                                @else
+                                    <span class="text-dark">Expected CM Pro Amount: </span>
+                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->cm_expected_payment_amount ? '$' . $cancelledBill->cm_expected_payment_amount : '-' }}</span>
+                                @endif
+                            </div>
+                            @endif
+                        </div>
+                    @endforeach
+                @endif
             </div>
 
-            {{-- active rm bill --}}
+            {{-- rm bills --}}
             <div class="col-6">
                 <div class="d-flex align-items-center">
                     <h6 class="my-0 text-secondary font-weight-bold text-dark">RM Bill
@@ -408,12 +544,15 @@
                                 <div class="mb-2">
                                     <select class="form-control" name="rmCode" value="">
                                         <option value="">-- Select RM Code --</option>
-                                        <option value="RM1">RM1</option>
+                                        <option value="RMB">RMB</option>
                                         <option value="RM20">RM20</option>
                                         <option value="RM30">RM30</option>
                                         <option value="RM60">RM60</option>
                                     </select>
                                 </div>
+                                <div class="mb-2">
+                                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="form-control form-control-sm"></textarea>
+                                </div>
                                 <div class="d-flex align-items-center">
                                     <button class="btn btn-sm btn-primary mr-2" submit>Generate</button>
                                     <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -435,11 +574,14 @@
                         </div>
                         <span class="mx-2 text-secondary">|</span>
                         @endif
-                        <div moe>
+                        <div moe relative>
                             <a start show class="py-0 mb-3 text-danger">Cancel</a>
-                            <form url="/api/bill/markCancelled">
+                            <form url="/api/bill/markCancelled" right>
                                 <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                <p class="small">Are you sure you want to cancel this RM bill?</p>
+                                <p class="small mb-2">Are you sure you want to cancel this RM bill?</p>
+                                <div class="mb-2">
+                                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
+                                </div>
                                 <div class="d-flex align-items-center">
                                     <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
                                     <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
@@ -452,7 +594,8 @@
                     <div class="border bg-white p-2 mt-2">
                         <div class="">
                             Code: <span class="font-weight-bold text-dark">{{ $activeRMBill->code }}</span>
-                            <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
+                            <div class="small text-secondary">Memo: {{$activeRMBill->memo}}</div>
+                            <div class="small text-secondary">Created: {{friendly_date_time($activeRMBill->created_at)}}</div>
                         </div>
                         <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
                         @if(1) {{-- check if auther user is hcp pro --}}
@@ -462,7 +605,28 @@
                                 <span class="font-weight-bold text-success ml-2">${{ $activeRMBill->hcp_payment_amount }}</span>
                             @else
                                 <span class="text-dark">Expected HCP Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">${{ $activeRMBill->hcp_expected_payment_amount }}</span>
+                                <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->hcp_expected_payment_amount ? '$' . $activeRMBill->hcp_expected_payment_amount : '-' }}</span>
+                                <span class="ml-auto">
+                                    @if($activeRMBill->is_signed_by_hcp)
+                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                    @else
+                                        <div class="text-primary ml-3">
+                                            <div moe class="text-dark">
+                                                <a start show class="py-0 mb-3 text-primary text-sm">
+                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                </a>
+                                                <form url="/api/bill/signAsHcp">
+                                                    <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
+                                                    <p class="small">Sign this RM bill as HCP?</p>
+                                                    <div class="d-flex align-items-center">
+                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    @endif
+                                </span>
                             @endif
                         </div>
                         @endif
@@ -473,7 +637,28 @@
                                 <span class="font-weight-bold text-success ml-2">${{ $activeRMBill->rmm_payment_amount }}</span>
                             @else
                                 <span class="text-dark">Expected RMM Pro Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">${{ $activeRMBill->rmm_expected_payment_amount }}</span>
+                                <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->rmm_expected_payment_amount ? '$' . $activeRMBill->rmm_expected_payment_amount : '-' }}</span>
+                                <span class="ml-auto">
+                                    @if($activeRMBill->is_signed_by_rmm)
+                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                    @else
+                                        <div class="text-primary ml-3">
+                                            <div moe class="text-dark">
+                                                <a start show class="py-0 mb-3 text-primary text-sm">
+                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                </a>
+                                                <form url="/api/bill/signAsRmm">
+                                                    <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
+                                                    <p class="small">Sign this RM bill as RMM Pro?</p>
+                                                    <div class="d-flex align-items-center">
+                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    @endif
+                                </span>
                             @endif
                         </div>
                         @endif
@@ -484,67 +669,42 @@
                                 <span class="font-weight-bold text-dark ml-2">${{ $activeRMBill->rme_payment_amount }}</span>
                             @else
                                 <span class="text-dark">Expected RME Pro Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">${{ $activeRMBill->rme_expected_payment_amount }}</span>
+                                <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->rme_expected_payment_amount ? '$' . $activeRMBill->rme_expected_payment_amount : '-' }}</span>
+                                <span class="ml-auto">
+                                    @if($activeRMBill->is_signed_by_rme)
+                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                    @else
+                                        <div class="text-primary ml-3">
+                                            <div moe class="text-dark">
+                                                <a start show class="py-0 mb-3 text-primary text-sm">
+                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                </a>
+                                                <form url="/api/bill/signAsRme">
+                                                    <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
+                                                    <p class="small">Sign this RM bill as RME Pro?</p>
+                                                    <div class="d-flex align-items-center">
+                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    @endif
+                                </span>
                             @endif
                         </div>
                         @endif
                     </div>
                 @endif
-            </div>
-
-        </div>
-
-        <div class="row">
-
-            {{-- cancelled cm bills --}}
-            <div class="col-6">
-                @if(count($cancelledCMBills))
-                    @foreach($cancelledCMBills as $cancelledBill)
-                        <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
-                            <div class="d-flex">
-                                <div class="">
-                                    Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
-                                    <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
-                                </div>
-                                <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
-                            </div>
-                            <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
-                            @if(1) {{-- check if auther user is hcp pro --}}
-                            <div class="d-flex align-items-center">
-                                @if($cancelledBill->has_hcp_been_paid)
-                                    <span class="text-dark">Received HCP Amount: </span>
-                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
-                                @else
-                                    <span class="text-dark">Expected HCP Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->hcp_expected_payment_amount }}</span>
-                                @endif
-                            </div>
-                            @endif
-                            @if(1) {{-- check if auther user is cm pro --}}
-                            <div class="d-flex align-items-center">
-                                @if($cancelledBill->has_cm_been_paid)
-                                    <span class="text-dark">Received CM Pro Amount: </span>
-                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->cm_payment_amount }}</span>
-                                @else
-                                    <span class="text-dark">Expected CM Pro Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->cm_expected_payment_amount }}</span>
-                                @endif
-                            </div>
-                            @endif
-                        </div>
-                    @endforeach
-                @endif
-            </div>
-
-            {{-- cancelled rm bills --}}
-            <div class="col-6">
+                {{-- cancelled rm bills --}}
                 @if(count($cancelledRMBills))
                     @foreach($cancelledRMBills as $cancelledBill)
                         <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
                             <div class="d-flex">
                                 <div class="">
                                     Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
-                                    <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
+                                    <div class="small text-secondary">Memo: {{$cancelledBill->memo}}</div>
+                                    <div class="small text-secondary">Created: {{friendly_date_time($cancelledBill->created_at)}}</div>
                                 </div>
                                 <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
                             </div>
@@ -556,7 +716,7 @@
                                     <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
                                 @else
                                     <span class="text-dark">Expected HCP Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->hcp_expected_payment_amount }}</span>
+                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_amount : '-' }}</span>
                                 @endif
                             </div>
                             @endif
@@ -567,7 +727,7 @@
                                     <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->rmm_payment_amount }}</span>
                                 @else
                                     <span class="text-dark">Expected RMM Pro Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rmm_expected_payment_amount }}</span>
+                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->rmm_expected_payment_amount ? '$' . $cancelledBill->rmm_expected_payment_amount : '-' }}</span>
                                 @endif
                             </div>
                             @endif
@@ -578,7 +738,7 @@
                                     <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rme_payment_amount }}</span>
                                 @else
                                     <span class="text-dark">Expected RME Pro Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rme_expected_payment_amount }}</span>
+                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->rme_expected_payment_amount ? '$' . $cancelledBill->rme_expected_payment_amount : '-' }}</span>
                                 @endif
                             </div>
                             @endif

resources/views/app/patient/care-team.blade.php

@@ -5,24 +5,27 @@
 
 @section('inner-content')
     <div class="">
-        <div class="d-flex align-items-center" moe>
-            <h4 class="mr-3 mb-3 font-weight-normal">Care Team</h4>
-            <a start show class="btn btn-sm btn-primary py-0 mb-3">+ Add</a>
-            <form url="/api/clientInfoLine/create">
-                <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                <input type="hidden" name="category" value="care_team">
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Name"></div>
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Specialty" value="" placeholder="Specialty"></div>
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Organization" value="" placeholder="Organization"></div>
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Phone" value="" placeholder="Phone"></div>
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Fax" value="" placeholder="Fax"></div>
-                <div class="mb-2"><input type="date" class="form-control form-control-sm" name="Next Appointment" value="" placeholder="Next Appointment"></div>
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Memo" value="" placeholder="Memo"></div>
-                <div class="d-flex align-items-center">
-                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                </div>
-            </form>
+        <div class="d-flex align-items-center pb-2">
+            <h4 class="font-weight-bold m-0">Care Team</h4>
+            <span class="mx-2 text-secondary">|</span>
+            <div moe>
+                <a start show class="">Add</a>
+                <form url="/api/clientInfoLine/create">
+                    <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                    <input type="hidden" name="category" value="care_team">
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Name"></div>
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Specialty" value="" placeholder="Specialty"></div>
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Organization" value="" placeholder="Organization"></div>
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Phone" value="" placeholder="Phone"></div>
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Fax" value="" placeholder="Fax"></div>
+                    <div class="mb-2"><input type="date" class="form-control form-control-sm" name="Next Appointment" value="" placeholder="Next Appointment"></div>
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Memo" value="" placeholder="Memo"></div>
+                    <div class="d-flex align-items-center">
+                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                    </div>
+                </form>
+            </div>
         </div>
         <table class="table table-striped table-sm table-bordered">
             <thead>
@@ -35,6 +38,8 @@
                 <th class="px-2 text-secondary">Fax</th>
                 <th class="px-2 text-secondary">Next Appointment</th>
                 <th class="px-2 text-secondary">Memo</th>
+                <th class="px-2 text-secondary">Created By</th>
+                <th class="px-2 text-secondary">Created At</th>
                 <th class="px-2 text-secondary delete-column">&nbsp;</th>
             </tr>
             </thead>
@@ -51,9 +56,11 @@
                             <td class="px-2">{{ $line->contentDetail->{"Fax"} }}</td>
                             <td class="px-2">{{ $line->contentDetail->{"Next Appointment"} }}</td>
                             <td class="px-2">{{ $line->contentDetail->{"Memo"} }}</td>
+                            <td class="px-2">-</td>
+                            <td class="px-2">-</td>
                             <td class="px-2 text-center delete-column">
                                 <div moe relative>
-                                    <a start show><i class="fa fa-trash text-danger"></i></a>
+                                    <a start show class="on-hover-opaque"><i class="fa fa-trash-alt text-danger"></i></a>
                                     <form url="/api/clientInfoLine/remove" right>
                                         <input type="hidden" name="uid" value="{{ $line->uid }}">
                                         <p class="small">Are you sure you want to delete this entry?</p>

resources/views/app/patient/dx-and-focus-areas.blade.php

@@ -5,29 +5,32 @@
 
 @section('inner-content')
     <div class="">
-        <div class="d-flex align-items-center" moe>
-            <h4 class="mr-3 mb-3 font-weight-normal">Dx and Focus Areas</h4>
-            <a start show class="btn btn-sm btn-primary py-0 mb-3">+ Add</a>
-            <form url="/api/clientInfoLine/create">
-                <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                <input type="hidden" name="category" value="dx">
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Title"></div>
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="ICD" value="" placeholder="ICD"></div>
-                <div class="mb-2">
-                    <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
-                        <option>Chronic or Acute (select one)</option>
-                        <option value="Chronic">Chronic</option>
-                        <option value="Acute">Acute</option>
-                    </select>
-                </div>
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Prognosis" value="" placeholder="Prognosis"></div>
-                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Goal" value="" placeholder="Treatment Goal"></textarea></div>
-                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Plan" value="" placeholder="Treatment Plan"></textarea></div>
-                <div class="d-flex align-items-center">
-                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                </div>
-            </form>
+        <div class="d-flex align-items-center pb-2">
+            <h4 class="font-weight-bold m-0">Dx and Focus Areas</h4>
+            <span class="mx-2 text-secondary">|</span>
+            <div moe>
+                <a start show class="">Add</a>
+                <form url="/api/clientInfoLine/create">
+                    <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                    <input type="hidden" name="category" value="dx">
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Title"></div>
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="ICD" value="" placeholder="ICD"></div>
+                    <div class="mb-2">
+                        <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
+                            <option>Chronic or Acute (select one)</option>
+                            <option value="Chronic">Chronic</option>
+                            <option value="Acute">Acute</option>
+                        </select>
+                    </div>
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Prognosis" value="" placeholder="Prognosis"></div>
+                    <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Goal" value="" placeholder="Treatment Goal"></textarea></div>
+                    <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Plan" value="" placeholder="Treatment Plan"></textarea></div>
+                    <div class="d-flex align-items-center">
+                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                    </div>
+                </form>
+            </div>
         </div>
         <table class="table table-striped table-sm table-bordered">
             <thead>
@@ -39,6 +42,8 @@
                 <th class="px-2 text-secondary">Prognosis</th>
                 <th class="px-2 text-secondary">Treatment Goal</th>
                 <th class="px-2 text-secondary">Treatment Plan</th>
+                <th class="px-2 text-secondary">Created By</th>
+                <th class="px-2 text-secondary">Created At</th>
                 <th class="px-2 text-secondary delete-column">&nbsp;</th>
             </tr>
             </thead>
@@ -54,9 +59,11 @@
                             <td class="px-2">{{ $line->contentDetail->{"Prognosis"} }}</td>
                             <td class="px-2">{{ $line->contentDetail->{"Treatment Goal"} }}</td>
                             <td class="px-2">{{ $line->contentDetail->{"Treatment Plan"} }}</td>
+                            <td class="px-2">-</td>
+                            <td class="px-2">-</td>
                             <td class="px-2 text-center delete-column">
                                 <div moe relative>
-                                    <a start show><i class="fa fa-trash text-danger"></i></a>
+                                    <a start show class="on-hover-opaque"><i class="fa fa-trash-alt text-danger"></i></a>
                                     <form url="/api/clientInfoLine/remove" right>
                                         <input type="hidden" name="uid" value="{{ $line->uid }}">
                                         <p class="small">Are you sure you want to delete this entry?</p>

resources/views/app/patient/medications.blade.php

@@ -5,26 +5,29 @@
 
 @section('inner-content')
     <div class="">
-        <div class="d-flex align-items-center" moe>
-            <h4 class="mr-3 mb-3 font-weight-normal">Medications</h4>
-            <a start show class="btn btn-sm btn-primary py-0 mb-3">+ Add</a>
-            <form url="/api/clientInfoLine/create">
-                <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                <input type="hidden" name="category" value="rx">
-                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Medication"></div>
-                {{--<div class="mb-2"><input type="text" name="customField" value="" placeholder="Custom Field"></div>--}}
-                <div class="d-flex align-items-center">
-                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                </div>
-            </form>
+        <div class="d-flex align-items-center pb-2">
+            <h4 class="font-weight-bold m-0">Medications</h4>
+            <span class="mx-2 text-secondary">|</span>
+            <div moe>
+                <a start show class="">Add</a>
+                <form url="/api/clientInfoLine/create">
+                    <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                    <input type="hidden" name="category" value="rx">
+                    <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Medication"></div>
+                    {{--<div class="mb-2"><input type="text" name="customField" value="" placeholder="Custom Field"></div>--}}
+                    <div class="d-flex align-items-center">
+                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                    </div>
+                </form>
+            </div>
         </div>
         <table class="table table-striped table-sm table-bordered">
             <thead>
             <tr>
-                {{--<th class="px-2 text-secondary">Category</th>--}}
                 <th class="px-2 text-secondary">Medication</th>
-                {{--<th class="px-2 text-secondary">Content Detail</th>--}}
+                <th class="px-2 text-secondary">Created By</th>
+                <th class="px-2 text-secondary">Created At</th>
                 <th class="px-2 text-secondary delete-column">&nbsp;</th>
             </tr>
             </thead>
@@ -35,10 +38,11 @@
                         <tr>
                             {{--<td class="px-2">{{$category}}</td>--}}
                             <td class="px-2">{{$line->contentText}}</td>
-                            {{--<td class="px-2"><pre><?php print_r($line->contentDetail) ?></pre></td>--}}
+                            <td class="px-2">-</td>
+                            <td class="px-2">-</td>
                             <td class="px-2 text-center delete-column">
                                 <div moe relative>
-                                    <a start show><i class="fa fa-trash text-danger"></i></a>
+                                    <a start show class="on-hover-opaque"><i class="fa fa-trash-alt text-danger"></i></a>
                                     <form url="/api/clientInfoLine/remove" right>
                                         <input type="hidden" name="uid" value="{{ $line->uid }}">
                                         <p class="small">Are you sure you want to delete this entry?</p>

resources/views/app/practice-management/financial-transactions.blade.php

@@ -5,5 +5,49 @@
 @endsection
 
 @section('inner-content')
-    CONTENT
+    <div class="mcp-theme-1">
+        <table class="table table-sm">
+            <thead>
+                <tr>
+                    <th>Date</th>
+                    <th>Type</th>
+                    <th>Client</th>
+                    <th>Care Month</th>
+                    <th>Bill/Code</th>
+                    <th>Memo</th>
+                    <th>Amount</th>
+                    <th>Balance</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach($transactions as $transaction)
+                    <tr>
+                        <td>
+                            {{ friendly_date_time($transaction->created_at, true) }}
+                        </td>
+                        <td>
+                            {{ $transaction->plus_or_minus === 'PLUS' ? 'Credit' : 'Debit' }}
+                        </td>
+                        <td>
+                            <a href="/patients/view/{{ $transaction->client->uid }}">
+                                <b>{{ implode(", ", [$transaction->client->name_last, $transaction->client->name_first]) }}</b>
+                            </a>
+                        </td>
+                        <td>
+                            <a href="/patients/view/{{ $transaction->client->uid }}/care-months/view/{{ $transaction->bill->careMonth->uid }}">
+                                <b>{{ friendly_month($transaction->bill->careMonth->start_date) }}</b>
+                            </a>
+                        </td>
+                        <td>
+                            <b>{{ $transaction->bill->code }}</b>
+                            <div class="text-secondary text-sm">Created: {{ friendly_date_time($transaction->bill->created_at, true) }}</div>
+                        </td>
+                        <td>{{ $transaction->custom_memo ? $transaction->custom_memo : '-' }}</td>
+                        <td>${{ $transaction->amount }}</td>
+                        <td>${{ $transaction->resulting_balance }}</td>
+                    </tr>
+                @endforeach
+            </tbody>
+        </table>
+    </div>
 @endsection

resources/views/layouts/patient.blade.php

@@ -129,15 +129,31 @@
                                                             None provided.
                                                         @endif
                                                     </a>
-                                                    <form url="/api/client/putMcn">
+                                                    <form url="/api/client/putMcn" class="mcp-theme-1">
                                                         <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                        <input type="text" name="name_first" value="{{$patient->name_first}}">
-                                                        <input type="text" name="name_last" value="{{$patient->name_last}}">
-                                                        <input type="text" name="dob" value="{{$patient->dob}}">
-                                                        <input type="text" name="mcn" value="{{$patient->mcn}}">
+                                                        <div class="mb-2">
+                                                            <input type="text" class="form-control form-control-sm" name="name_first"
+                                                                   value="{{$patient->name_first}}"
+                                                                   placeholder="First Name">
+                                                        </div>
+                                                        <div class="mb-2">
+                                                            <input type="text" class="form-control form-control-sm" name="name_last"
+                                                                   value="{{$patient->name_last}}"
+                                                                   placeholder="Last Name">
+                                                        </div>
+                                                        <div class="mb-2">
+                                                            <input type="date" class="form-control form-control-sm" name="dob"
+                                                                   value="{{$patient->dob}}"
+                                                                   placeholder="Date of Birth">
+                                                        </div>
+                                                        <div class="mb-2">
+                                                            <input type="text" class="form-control form-control-sm" name="mcn"
+                                                                   value="{{$patient->mcn}}"
+                                                                   placeholder="Medicare Number">
+                                                        </div>
                                                         <div>
-                                                            <button submit>Submit</button>
-                                                            <button cancel>Cancel</button>
+                                                            <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+                                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -157,7 +173,7 @@
                                 </section>
                                 <section>
                                     <div><label>Allergies:</label> Grass, Pollen, Latex</div>
-                                    <div><label>Next Appt:</label> {{$patient->mcp_onboarding_visit_date}}</div>
+                                    <div><label>Next Appt:</label> {{$patient->next_appointment ? friendly_date_time($patient->next_appointment, false) : '-'}}</div>
                                 </section>
                                 <section class=vbox>
                                     <div moe relative>
@@ -217,19 +233,20 @@
 
                                             <div class="mb-2">
                                                 <label class="text-secondary text-sm">Date</label>
-                                                <input type="date" name="date" class="form-control form-control-sm">
+                                                <input type="date" name="date" min="{{ date('Y-m-d') }}" class="form-control form-control-sm">
                                             </div>
 
                                             <div class="my-1 py-1">
                                                 <label class="text-dar d-flex align-items-center">
                                                     <span>Is time specific</span>
-                                                    <input type="checkbox" name="isTimeSpecific" class="my-0 ml-1">
+                                                    <input type="checkbox" name="isTimeSpecific" class="my-0 ml-1"
+                                                           onchange="enableTimeSpecificFields(this.checked, '', 'next-appt-time-range')">
                                                 </label>
                                             </div>
 
                                             <div class="mb-2">
                                                 <label class="text-secondary text-sm">Time</label>
-                                                <input type="time" name="time" class="form-control form-control-sm">
+                                                <input type="time" name="time" class="form-control form-control-sm next-appt-time-range" disabled>
                                             </div>
                                             <div>
                                                 <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
@@ -389,16 +406,14 @@
                                         @if(!$patient->was_medicare_validation_successful)
                                             <div moe>
                                                 <a href="" start show><i class="fas fa-edit"></i></a>
-                                                <form url="/api/client/putMcn">
+                                                <form url="/api/client/putMcn" class="mcp-theme-1">
                                                     <input type="hidden" name="uid" value="{{$patient->uid}}">
                                                     <div class="form-group">
-                                                        <input type="text" name="mcn" value="{{$patient->mcn}}">
+                                                        <input type="text" class="form-control form-control-sm" name="mcn" value="{{$patient->mcn}}">
                                                     </div>
-                                                    <div class="form-group">
-                                                        <button class="btn btn-success btn-sm" submit>Submit
-                                                        </button>
-                                                        <button class="btn btn-secondary btn-sm" cancel>Cancel
-                                                        </button>
+                                                    <div>
+                                                        <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+                                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
                                                     </div>
                                                 </form>
                                             </div>

resources/views/layouts/practice-management.blade.php

@@ -4,7 +4,7 @@
 @section('content')
     <div class="container-fluid">
         <div class="row">
-            <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse px-0">
+            {{--<nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse px-0">
                 <div class="sidebar-sticky pt-3">
                     <div>
                         <h4>
@@ -20,20 +20,25 @@
                         <li class="nav-item"><a class="nav-link" href="{{ route('practice-management.hr') }}">HR</a></li>
                     </ul>
                 </div>
-            </nav>
+            </nav>--}}
 
-            <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
+            {{--<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">--}}
+            <main role="main" class="col-12">
                 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
                     <h1 class="h2">@yield('section-title')</h1>
                     <div class="mb-2 mb-md-0">
                         <span class="">
-                            <strong>Current Balance:</strong> $1,024.00
-                        </span>&nbsp;
-                        <span class="">
-                            <strong>Next payment date:</strong> 30 June, 2020
+                            <strong>Current Balance:</strong> ${{ $pro->balance }}
                         </span>&nbsp;
+                        {{--<span class="">
+                            <strong>Next Payment date:</strong> -
+                        </span>&nbsp;--}}
                         <span>
-                            <strong>Last payment:</strong> $489.00 (15 June, 2020)
+                            <?php
+                            $lastPayment = $pro->lastPayment();
+                            ?>
+                            <strong>Last Payment:</strong>
+                                {{ $lastPayment ? '$' . $lastPayment->amount . ' (' . friendly_date_time($lastPayment->created_at, false) . ')' : '-' }}
                         </span>
                     </div>
                 </div>

resources/views/layouts/template.blade.php

@@ -49,12 +49,12 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="practice-management" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="mr-1 fas fa-tasks"></i> Practice Management</a>
                     <div class="dropdown-menu" aria-labelledby="practice-management">
-                        <a class="dropdown-item" href="{{ route('practice-management.dashboard') }}">Dashboard</a>
-                        <a class="dropdown-item" href="/practice-management/rates">Payment Rates</a>
-                        <a class="dropdown-item" href="/practice-management/previous-bills">Previous Bills</a>
+                        {{--<a class="dropdown-item" href="{{ route('practice-management.dashboard') }}">Dashboard</a>--}}
+                        {{--<a class="dropdown-item" href="/practice-management/rates">Payment Rates</a>--}}
+                        {{--<a class="dropdown-item" href="/practice-management/previous-bills">Previous Bills</a>--}}
                         <a class="dropdown-item" href="/practice-management/financial-transactions">Financial Transactions</a>
-                        <a class="dropdown-item" href="/practice-management/pending-bills-to-sign">Pending Bills to Sign</a>
-                        <a class="dropdown-item" href="/practice-management/hr">HR</a>
+                        {{--<a class="dropdown-item" href="/practice-management/pending-bills-to-sign">Pending Bills to Sign</a>--}}
+                        {{--<a class="dropdown-item" href="/practice-management/hr">HR</a>--}}
                     </div>
                 </li>
             </ul>