Преглед на файлове

Update tree & /join page

Vijayakrishnan Krishnan преди 4 години
родител
ревизия
6f0877928e
променени са 3 файла, в които са добавени 14 реда и са изтрити 8 реда
  1. 3 2
      generatecv/tree.txt
  2. 9 4
      resources/views/join.blade.php
  3. 2 2
      resources/views/layouts/pro-logged-in.blade.php

+ 3 - 2
generatecv/tree.txt

@@ -757,10 +757,11 @@ PRO
                 !col:pro_id:Pro:~pros:name_display:id,=,$pro_id:all
                 !nal:
     bills|bill|view|icon:file-invoice-dollar
+        !inc:created_at,bill_service_type,cm_or_rm,is_cancelled,is_submitted,code
     bills/view/{uid}
         ACTIONS
             payHcpAmount
-                hcpPaymentAmount:number
+                hcpPaymentAmount:number=hcp_expected_payment_amount
             payHcpDifferentAmount
                 differentHcpPaymentAmount:number
             payCmAmount
@@ -1020,7 +1021,7 @@ ADMIN
                 !nal:
             my_payment_schedule
                 id=pro_rate.pro_id=>/pro_rates/view/UID
-                !inc:@uid,code,amount,responsibility
+                !inc:@uid,responsibility,code,amount
                 add_new:pro_rate:create
                     proUid:hidden=uid
                     responsibility:select:HCP,NA,CM,RME,RMM

+ 9 - 4
resources/views/join.blade.php

@@ -12,18 +12,23 @@
         @endif
 
         <div class="form-group mb-3">
-            <input type="text" name="nameFirst" class="form-control" placeholder="First Name" value="{{ request()->old('nameFirst') }}">
+            <label class="text--secondary small mb-1 font-weight-normal">First Name *</label>
+            <input type="text" name="nameFirst" class="form-control" placeholder="First Name" value="{{ request()->old('nameFirst') }}" required>
         </div>
         <div class="form-group mb-3">
-            <input type="text" name="nameLast" class="form-control" placeholder="Last Name" value="{{ request()->old('nameLast') }}">
+            <label class="text--secondary small mb-1 font-weight-normal">Last Name *</label>
+            <input type="text" name="nameLast" class="form-control" placeholder="Last Name" value="{{ request()->old('nameLast') }}" required>
         </div>
         <div class="form-group mb-3">
-            <input type="date" name="dob" class="form-control" placeholder="Date of Birth" value="{{ request()->old('dob') }}">
+            <label class="text--secondary small mb-1 font-weight-normal">Date of Birth *</label>
+            <input type="date" name="dob" class="form-control" placeholder="Date of Birth" value="{{ request()->old('dob') }}" required>
         </div>
         <div class="form-group mb-3">
-            <input type="text" name="medicareNumber" class="form-control" placeholder="Medicare Number" value="{{ request()->old('medicareNumber') }}">
+            <label class="text--secondary small mb-1 font-weight-normal">Medicare Number *</label>
+            <input type="text" name="medicareNumber" class="form-control" placeholder="Medicare Number" value="{{ request()->old('medicareNumber') }}" required>
         </div>
         <div class="form-group mb-3">
+            <label class="text--secondary small mb-1 font-weight-normal">Phone Number</label>
             <input type="tel" name="phoneNumber" class="form-control" placeholder="Phone Number" value="{{ request()->old('phoneNumber') }}">
         </div>
         <button type="submit" class="btn btn-primary btn-block mx-auto w-50 mt-4 mb-2">Check In</button>

+ 2 - 2
resources/views/layouts/pro-logged-in.blade.php

@@ -53,8 +53,8 @@
 
         <ul class="navbar-nav ml-auto ml-2">
             <li class="nav-item">
-                <a class="nav-link small d-flex align-items-center" href="#">
-                    <i class="fa fa-user mr-1"></i> {{$pro->name_display}}
+                <a class="nav-link small d-flex align-items-center" href="#" title="Cell# {{$pro->cell_number}}">
+                    Hello {{$pro->name_first}}!
                 </a>
             </li>
         </ul>