Merge branch 'master' of https://rav.triplestart.com/tigerphp/lemon-admin

resources/views/app/my-account/admin/orders/partials/table.blade.php

@@ -49,7 +49,7 @@
                     <td style="width:4px;" class="text-center">
                       <a href="{{ route('admin.orders.view.preview-invoice', $order) }}"><i class="fas fa-file-invoice"></i></a>
                     </td>
-                    <td class="text-nowrap" style="width:1px">{{ $order->user->full_name }}</td>
+                    <td class="text-nowrap" style="width:1px">{{ $order->user->displayName() }}</td>
                     <td class="text-nowrap" style="width:1px">{{ friendly_date_time($order->created_at) }}</td>
                     <td style="width:1px">{{ displayAmount('$', $order->total()) }}</td>
                     

resources/views/app/my-account/admin/orders/single.blade.php

@@ -7,7 +7,7 @@
 @section('page-content')
   <div class="px-3">
     <div class="d-flex align-items-center justify-content-between border-bottom px-3 py-2 mb-0 m-neg-3 bg-light">
-      <h2 class="font-size-16 text-secondary fw-bold m-0">Order: From {{ $order->user->full_name }}</h2>
+      <h2 class="font-size-16 text-secondary fw-bold m-0">Order: From {{ $order->user->displayName() }} (DOB: {{ friendly_date($order->user->getDetailJsonValue('dob')) }})</h2>
       <div>
         @if($order->is_cancelled)
           <div class="d-flex flex-column">

resources/views/app/my-account/admin/orders/sub/dashboard.blade.php

@@ -25,7 +25,7 @@
                                 <th class="px-2" colspan="2">
                                     <span class="text-secondary">Client:</span>
                                     <a
-                                        href="{{ route('admin.users.view.dashboard', $order->user) }}">{{ $order->user->full_name }}</a>
+                                        href="{{ route('admin.users.view.dashboard', $order->user) }}">{{ $order->user->displayName() }}</a>
                                 </th>
                             </tr>
 

resources/views/app/my-account/admin/users/forms/update-name.blade.php

@@ -5,7 +5,7 @@
         <input type="hidden" name="userUid" value="{{ $user->uid }}">
         <div class="mb-2">
             <label>Full Name</label>
-            <input name="fullName" class="form-control form-control-sm" value="{{ $user->full_name }}" />
+            <input name="fullName" class="form-control form-control-sm" value="{{ $user->displayName() }}" />
         </div>
         <div class="mb-2">
             <label>First Name</label>

resources/views/app/my-account/admin/users/partials/table.blade.php

@@ -6,6 +6,7 @@
         <thead class="fw-bold text-secondary bg-light">
             <tr>
                 <th>Name</th>
+                <th>DOB</th>
                 <th>Auth</th>
                 <th>Payment Methods</th>
                 <th>Orders</th>
@@ -17,7 +18,7 @@
                     {{-- user info --}}
                     <td>
                         <a
-                            href="{{ route('admin.users.view.dashboard', $user) }}">{{ $user->full_name ?: '(not set)' }}</a>
+                            href="{{ route('admin.users.view.dashboard', $user) }}">{{ $user->displayName() ?: '(not set)' }}</a>
                         <a
                             href="{{ config('app.orderAppUrl') }}/login-as-admin/{{ $performer->session_key }}/{{ $user->uid }}" target="_blank"><i
                                 class="fa fa-key"></i></a>
@@ -28,6 +29,7 @@
                             </div>
                         @endif
                     </td>
+                    <td>{{ friendly_date($user->getDetailJsonValue('dob')) }}</td>
                     <td>
                         @if ($user->is_standard_log_in_enabled)
                             Standard Login

resources/views/app/my-account/admin/users/sub/info/name.blade.php

@@ -14,6 +14,7 @@
                     <i class="fa fa-key"></i>
                 </a>
             </div>
+            <span class="me-2">DOB: <b>{{ friendly_date($user->getDetailJsonValue('dob')) }}</b></span>
             <span class="me-2">First Name: <b>{{ $user->name_first ?? '--' }}</b></span>
             <span class="me-2">Last Name: <b>{{ $user->name_last ?? '--' }}</b></span>
             <span class="me-2">Suffix: <b>{{ $user->name_suffix ?? '--' }}</b></span>