Merge branch 'cleanup' of https://rav.triplestart.com/tigerphp/stagfe2 into cleanup

.env.example

@@ -65,4 +65,11 @@ GOOGLE_SPREADSHEET_PRODUCTS_SHEET_NAME=records
 
 OPENTOK_API_KEY=46871644
 OPENTOK_API_SECRET=48c39d640cbcfb1032606d7c40ab5971290a5163
-OPENTOK_SESSION_ID=1_MX40Njg3MTY0NH5-MTU5NjQyMzcxMjQ4OX5PRnNIVmFDU2t2d3BnWG1YbkMvSWFRNk1-fg
+OPENTOK_SESSION_ID=1_MX40Njg3MTY0NH5-MTU5NjQyMzcxMjQ4OX5PRnNIVmFDU2t2d3BnWG1YbkMvSWFRNk1-fg
+
+DEFAULT_ERX_COMPANY_NAME='Scholar Medical Group MD LLC'
+DEFAULT_ERX_COMPANY_LINE_1='133 Rollins Ave'
+DEFAULT_ERX_COMPANY_LINE_2='Ste 3'
+DEFAULT_ERX_COMPANY_CITY='Rockville'
+DEFAULT_ERX_COMPANY_STATE='MD'
+DEFAULT_ERX_COMPANY_ZIP='20852'

config/app.php

@@ -85,6 +85,12 @@ return [
     'opentokApiSecret' => env('OPENTOK_API_SECRET'),
     'opentokSessionId' => env('OPENTOK_SESSION_ID'),
     'socketIoUrl' => env('SOCKET_IO_URL'),
+    'defaultErxCompanyName' => env('DEFAULT_ERX_COMPANY_NAME'),
+    'defaultErxCompanyLine_1' => env('DEFAULT_ERX_COMPANY_LINE_1'),
+    'defaultErxCompanyLine_2' => env('DEFAULT_ERX_COMPANY_LINE_2'),
+    'defaultErxCompanyCity' => env('DEFAULT_ERX_COMPANY_CITY'),
+    'defaultErxCompanyState' => env('DEFAULT_ERX_COMPANY_STATE'),
+    'defaultErxCompanyZip' => env('DEFAULT_ERX_COMPANY_ZIP'),
 
     /*
     |--------------------------------------------------------------------------

resources/views/app/patient/modules/sleep_health_intake/edit.blade.php

@@ -89,16 +89,21 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 				data: {
 					form: $('#edit-sleep_health_intake-container').closest('form'),
 					data: <?= json_encode($contentData) ?>,
-					defaultDropdownOptions: {}
+					defaultDropdownOptions: {},
+					isAutoSaving: false,
 				},
 				methods: {
 					autoSaveForm: function() {
 						var self = this;
+						if(self.isAutoSaving) return;
 						var url = self.form.attr('url');
 						self.form.find('input[name=data]').val(JSON.stringify(self.data));
 						// autosave on change
 						var dataArray = self.form.serializeArray();
-						$.post(url, dataArray, function(response) {}, 'json');
+						self.isAutoSaving = true;
+						$.post(url, dataArray, function(response) {
+							self.isAutoSaving = false;
+						}, 'json');
 						refreshSegment('omega_subjective_system');
 						refreshSegment('omega_assessment_system');
 						refreshSegment('omega_plan_system');
@@ -139,7 +144,6 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 						var arr = $('.select2');
 						for (var i = 0; i < arr.length; i++) {
 							var loadedData = self.data[arr[i].name] || [];
-
 							$(arr[i]).select2({
 								data: loadedData,
 								tags: true,

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

@@ -402,7 +402,7 @@
                     <div v-else>-</div>
                 </div>
             </div>
-            <div class="pb-2 d-flex align-items-start" v-if="currentPrescription.has_hcp_pro_signed">
+            <div class="pb-2 d-flex align-items-start" v-if="currentPrescription.has_hcp_pro_signed || proType == 'ADMIN'">
                 <span class="min-width-140px text-secondary text-sm">PDF</span>
                 <div class="d-flex align-items-baseline">
                     <a class="pdf-viewer-trigger d-block mb-1" native target="_blank"
@@ -525,6 +525,7 @@ GROUP BY erx_category");
                 el: '#prescriptions-{{$patient->id}}',
                 delimiters: ['@{{', '}}'],
                 data: {
+                    proType: "{{$pro->pro_type}}",
                     includeCancelled: '',
 
                     prescriptions: <?= json_encode($prescriptions) ?>,
@@ -1616,6 +1617,7 @@ GROUP BY erx_category");
                 },
                 mounted: function() {
                     let self = this;
+
                     $(document).on('pro-changed', '.erx-hcp-pro-select', function() {
                         self.currentPrescriptionHcpPro.newHcpProUid = this.value;
                     });

resources/views/app/patient/prescriptions/pdf/DRUG.blade.php

@@ -44,7 +44,7 @@ if($coverage) {
         <td style="vertical-align:top;padding: 5px;">
           <h4 style="line-height:20px;margin:0;">INSURANCE</h4>
           <span style="font-size:13px;line-height:20px;display:block">{{$payerName}}</span>
-          <span style="font-size:13px;line-height:20px;display:block">Member ID: {{$memberID}}</span>
+          {{-- <span style="font-size:13px;line-height:20px;display:block">Member ID: {{$memberID}}</span> --}}
           <span style="font-size:13px;line-height:20px;display:block">Insurance Contact:</span>
         </td>
       </tr>

resources/views/app/patient/prescriptions/pdf/pdf-preview.blade.php

@@ -16,12 +16,12 @@
         $hcpCompanyProPayer = $note->hcpCompanyProPayer;
         $hcpCompanyLocation = $note->hcpCompanyLocation;
     }
-    $companyName = $hcpCompany ? $hcpCompany->name : 'Scholar Medical Group MD LLC';
-    $addressLine1 = $hcpCompanyLocation ? $hcpCompanyLocation->line1 : '133 Rollins Ave';
-    $addressLine2 = $hcpCompanyLocation ? $hcpCompanyLocation->line2 : 'Ste 3';
-    $city = $hcpCompanyLocation ? $hcpCompanyLocation->city : 'Rockville';
-    $state = $hcpCompanyLocation ? $hcpCompanyLocation->state : 'MD';
-    $zip = $hcpCompanyLocation ? $hcpCompanyLocation->zip : '20852';
+    $companyName = $hcpCompany ? $hcpCompany->name : config('app.defaultErxCompanyName');
+    $addressLine1 = $hcpCompanyLocation ? $hcpCompanyLocation->line1 : config('app.defaultErxCompanyLine_1');
+    $addressLine2 = $hcpCompanyLocation ? $hcpCompanyLocation->line2 : config('app.defaultErxCompanyLine_2');
+    $city = $hcpCompanyLocation ? $hcpCompanyLocation->city : config('app.defaultErxCompanyCity');
+    $state = $hcpCompanyLocation ? $hcpCompanyLocation->state : config('app.defaultErxCompanyState');
+    $zip = $hcpCompanyLocation ? $hcpCompanyLocation->zip : config('app.defaultErxCompanyZip');
     ?>
     <?php
     use App\Models\Erx;
@@ -46,13 +46,13 @@
         </div>
     </header>
 
-    <hr style="border-top: 2px solid #5ca4e8; border-bottom: 0; margin-top:-5px; margin-bottom:.5rem;">
+    <hr style="border-top: 2px solid #5ca4e8; border-bottom: 0; margin-top:5px; margin-bottom:.5rem;">
 
     @include('app.patient.prescriptions.pdf.' . $prescription->erx_category)
 
     <?php if($prescription->logistics_detail_json): ?>
         <?php $logistics = json_decode($prescription->logistics_detail_json); ?>
-        <hr style="margin: 0 0 0.5rem 0; border-top-width: 0; border-bottom-width: 1px; border-color: #bbb">
+        <hr style="margin: 0 0 0.5rem 0; border:0; border-color: #bbb">
         <div style="font-size: 14px; opacity: 0.75; ">
             <p style="margin: 0.5rem 0;"><b>{{ $logistics->facilityName }}</b></p>
             <p style="margin: 0.5rem 0;">{{$logistics->facilityCity}} {{$logistics->facilityState}} {{$logistics->facilityZip}}</p>