Merge branch 'dev' of https://rav.triplestart.com/jmudaka/stagfe2 into dev

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/sms.blade.php

@@ -31,9 +31,7 @@
                 <th class="px-2 text-secondary w-25">From</th>
                 <th class="px-2 text-secondary w-25">To</th>
                 <th class="px-2 text-secondary w-50">Content</th>
-                @if($performer->pro->pro_type == 'ADMIN')
-                    <th></th>
-                @endif
+                <th></th>
             </tr>
             </thead>
             <tbody>
@@ -44,29 +42,27 @@
                     <td class="px-2">{{ $sms->from_number }}</td>
                     <td class="px-2">{{ $sms->to_number }}</td>
                     <td class="px-2">{{ $sms->body }}</td>
-                    @if($performer->pro->pro_type == 'ADMIN')
-                        <td>
-                            <div moe relative>
-                                <a start show class="">Update Is Reply Needed</a>
-                                <form url="/api/clientSms/updateIsReplyNeeded" class="mcp-theme-1" right>
-                                    <input type="hidden" name="uid" value="{{ $sms->uid }}">
-                                    <div class="mb-2">
-                                        <label for="" class="text-sm text-secondary mb-1">Is reply needed?</label>
-                                        <select class="form-control form-control-sm" name="isReplyNeeded" value="{{$patient->cell_number}}">
-                                            <option value="UNKNOWN">--</option>
-                                            <option value="YES">Yes</option>
-                                            <option value="NO">No</option>
-                                        </select>
-                                    </div>
 
-                                    <div class="d-flex align-items-center">
-                                        <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                        </td>
-                    @endif
+                    <td>
+                        @if($sms->is_reply_needed)
+                        <div moe relative>
+                            <a start show class="">clear</a>
+                            <form url="/api/clientSms/updateIsReplyNeeded" class="mcp-theme-1" right>
+                                <input type="hidden" name="uid" value="{{ $sms->uid }}">
+                                <input type="hidden" name="isReplyNeeded" value="NO">
+                                <div class="mb-2">
+                                    <label for="" class="text-sm text-secondary mb-1">Are you sure?</label>
+
+                                </div>
+
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                        @endif
+                    </td>
                 </tr>
             @endforeach
             </tbody>

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;