Manage eRx (wip)

resources/views/app/patient/prescriptions/list-popup.blade.php

@@ -177,8 +177,18 @@
                                v-on:click.prevent="removeDrugFromERx(drug.medication)">
                                 <i class="fa fa-trash-alt text-danger on-hover-opaque"></i>
                             </a>
-                            <b class="mr-2">@{{drug.medication ?? '-'}}</b>
-                            <span class="text-secondary mr-1">@{{drug.frequency ?? ''}}</span>
+                            <div>
+                                <div class="d-flex align-items-baseline">
+                                    <b class="mr-2">@{{drug.medication ?? '-'}}</b>
+                                    <span class="text-secondary ml-1">@{{drug.frequency ?? ''}}</span>
+                                </div>
+                                <div class="d-flex align-items-baseline">
+                                    <span class="text-secondary">Dispense:</span>
+                                    <span class="ml-1">@{{ drug.dispense ? drug.dispense : '-' }}</span>
+                                    <span class="text-secondary ml-2">Refills:</span>
+                                    <span class="ml-1">@{{ drug.refills ? drug.refills : '-' }}</span>
+                                </div>
+                            </div>
                         </div>
                     </div>
 
@@ -898,7 +908,9 @@
                         });
                     },
                     notAlreadyAdded: function(_name) {
-                        if(!this.currentPrescription || !this.currentPrescription.clinical_detail_json) return true;
+                        if(!this.currentPrescription ||
+                            !this.currentPrescription.clinical_detail_json ||
+                            !this.currentPrescription.clinical_detail_json.items) return true;
                         for (let i = 0; i < this.currentPrescription.clinical_detail_json.items.length; i++) {
                             if(this.currentPrescription.clinical_detail_json.items[i].medication === _name) {
                                 return false;