Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2 into dev-mc-visit

resources/views/app/patient/allergies-center.blade.php

@@ -225,7 +225,7 @@ list($allergies, $counts) = Point::getPointsOfCategoryExtended($patient, 'ALLERG
 
                 });
 
-            @include('app.patient.wizard-partials.common-script', ['label' => 'allergy'])
+            @include('app.patient.wizard-partials.common-script', ['label' => 'allergy', 'segment_part' => 'allergies'])
 
             initSegmentMoes($('#allergies-center-{{$note->id}}'));
             __initRTEs(parentSegment.find('[note-rte]:not(.ql-container)'));

resources/views/app/patient/careteam-center.blade.php

@@ -271,7 +271,7 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                 })
                 .trigger('change');
 
-            @include('app.patient.wizard-partials.common-script', ['label' => 'care-team-member'])
+            @include('app.patient.wizard-partials.common-script', ['label' => 'care-team-member', 'segment_part' => 'care_team'])
 
             initSegmentMoes($('#careteam-center-{{$note->id}}'));
             __initRTEs(parentSegment.find('[note-rte]:not(.ql-container)'));

resources/views/app/patient/coverage-status.blade.php

@@ -22,14 +22,14 @@
             @endif
           </td>
         </tr>
-        @if($coverage->auto_medicare_is_partbactive == 'YES')
+        @if($coverage->auto_medicare_is_partbactive == 'YES' && $performer->pro->pro_type == 'ADMIN')
         <tr>
           <td class="font-weight-bold">Part B Deductible</td>
-          <td>{{$coverage->auto_medicare_mpb_deductible ?? '-'}}</td>
+          <td>{{number_format($coverage->auto_medicare_mpb_deductible, 2, '.',',') ?? '-'}}</td>
         </tr>
         <tr>
           <td class="font-weight-bold">Part B Remaining</td>
-          <td>{{$coverage->auto_medicare_mpb_remaining ?? '-'}}</td>
+          <td>{{number_format($coverage->auto_medicare_mpb_remaining,2, '.',',') ?? '-'}}</td>
         </tr>
         @endif
       </table>
@@ -50,14 +50,14 @@
             @endif
           </td>
         </tr>
-        @if($coverage->auto_medicare_is_partbactive)
+        @if($coverage->auto_medicare_is_partbactive && $performer->pro->pro_type == 'ADMIN')
         <tr>
           <td class="font-weight-bold">Part B Deductible</td>
-          <td>{{$coverage->auto_medicare_mpb_deductible ?? '-'}}</td>
+          <td>{{number_format($coverage->auto_medicare_mpb_deductible,2,'.',',') ?? '-'}}</td>
         </tr>
         <tr>
           <td class="font-weight-bold">Part B Remaining</td>
-          <td>{{$coverage->auto_medicare_mpb_remaining ?? '-'}}</td>
+          <td>{{number_format($coverage->auto_medicare_mpb_remaining, 2, '.',',') ?? '-'}}</td>
         </tr>
         @endif
       </table>

resources/views/app/patient/goals-center.blade.php

@@ -211,7 +211,7 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                 })
                 .trigger('change');
 
-            @include('app.patient.wizard-partials.common-script', ['label' => 'goal'])
+            @include('app.patient.wizard-partials.common-script', ['label' => 'goal', 'segment_part' => 'goals'])
 
             initSegmentMoes($('#goals-center-{{$note->id}}'));
             __initRTEs(parentSegment.find('[note-rte]:not(.ql-container)'));

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

@@ -262,7 +262,7 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                 return false;
             });
 
-        @include('app.patient.wizard-partials.common-script', ['label' => 'medication'])
+        @include('app.patient.wizard-partials.common-script', ['label' => 'medication', 'segment_part' => 'medications'])
 
         // custom buttons on title bar
         $('.button-container').remove();

resources/views/app/patient/problems-center.blade.php

@@ -309,7 +309,7 @@ $ccSegment = $note->getSegmentByInternalName('chief_complaint');
                     }, 'json');
                 });
 
-            @include('app.patient.wizard-partials.common-script', ['label' => 'problem'])
+            @include('app.patient.wizard-partials.common-script', ['label' => 'problem', 'segment_part' => 'problems'])
 
             @if($patient->core_note_id !== $note->id)
             parentSegment.find('.regenerate-cc')

resources/views/app/patient/wizard-partials/common-script.blade.php

@@ -239,8 +239,8 @@ parentSegment.find('#frm-add-{{$label}}')
             if(!hasResponseError(_data)) {
                 hideMask();
                 refreshDynamicStagPopup();
-                $('.visit-segment[data-segment-template-name="intake_{{$label}}s"]').find('.refresh-segment').trigger('click');
-                $('.visit-segment[data-segment-template-name="plan_{{$label}}s"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
             }
         }, 'json');
         return false;