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

app/Http/Controllers/AdminController.php

@@ -310,7 +310,7 @@ class AdminController extends Controller
             $this->emailService->notifyUserOnFailedTransaction($storeOrder->user, $storeOrder);
             return $this->fail($message);
         }
-        
+
         if($storeOrder){
             $user = $storeOrder->user;
             $this->emailService->sendUserOrderChargeSuccessful($user, $storeOrder);
@@ -333,7 +333,7 @@ class AdminController extends Controller
 
     public function userMessages(Request $request, User $user){
         $messages = Message::where('to_user_id', $user->id)->orWhere('from_user_id', $user->id);
-        $messages = $messages->orderBy('created_at', 'ASC')->paginate(25);
+        $messages = $messages->orderBy('created_at', 'ASC')->get();
 
         $opentok = null;
         $otSession = null;
@@ -524,13 +524,13 @@ class AdminController extends Controller
     $fileRef = $request->get('file_name', 'file');
     $accessToken = (string) Uuid::uuid6();
     $storageResponse = $this->storeFileAs($request, $fileRef, StoreOrder::FILE_PATH, $accessToken);
-       
+
     $detailJson = json_decode($order->detail_json ?? '{}', true);
     $detailJson[$fileRef] = $storageResponse;
     $order->detail_json = json_encode($detailJson);
     $order->save();
 
-    return $this->pass();    
+    return $this->pass();
   }
 
   public function emailAttachment(Request $request){
@@ -543,10 +543,10 @@ class AdminController extends Controller
     $results_attachment = $order->getDetailJsonValue('results_attachment');
 
     $emailParams = [
-        'toEmail' => $order->user->getEmail(), 
-        'toName' => $order->user->displayName(), 
-        'subject' => 'Test Results for Order #' . $order->iid, 
-        'message' => $request->get('message'), 
+        'toEmail' => $order->user->getEmail(),
+        'toName' => $order->user->displayName(),
+        'subject' => 'Test Results for Order #' . $order->iid,
+        'message' => $request->get('message'),
         'attachmentPath' => $results_attachment['path']
     ];
 
@@ -558,7 +558,7 @@ class AdminController extends Controller
   public function smsReport(Request $request, StoreOrder $order){
     $results_attachment = $order->getDetailJsonValue('results_attachment');
     $user = $order->user;
-    
+
     $response = $this->sendSmsToUser($user, [
         'fromNumber' => $request->get('fromNumber'),
         'toNumber' => $request->get('toNumber'),

public/css/fe2.css

@@ -3827,7 +3827,7 @@ table.v-top th {
     border-left-color: #aaa;
 }
 .h-content {
-    margin-top: 45px;
+    margin-top: 53px;
 }
 @media screen and (min-width: 769px) {
     .v-content {

resources/views/app/auth/log-in.blade.php

@@ -2,15 +2,15 @@
 
 @section('content')
 
-<div class="container-fluid">
+<div class="container-fluid mt-5">
   <div class="row">
     <div class="col-xl-10 offset-xl-1">
-        <div class="row mx-0">
-          <div class="shadow p-lg-5 p-4 border-rounded col-lg-6 offset-lg-3 col-md-8 offset-md-2 my-xl-5 my-4">
+        <div class="row mx-0 justify-content-center">
+          <div class="shadow p-lg-5 p-4 border-rounded col-lg-5 col-md-9 my-xl-5 my-4">
             <div id="loginComponent">
-                <h4 class="header mb-4 text-center w-100">Welcome! Log In</h4>
+                <h4 class="header mb-4 text-center w-100">Admin Portal</h4>
                 <div>
-                    <div class="text-center">
+                    <!-- <div class="text-center">
 
                     </div>
                     <div class="social-login">
@@ -19,21 +19,21 @@
                     </div>
                     <div class="auth-divider">
                         <span class="text-muted text-nowrap">or continue below</span>
-                    </div>
+                    </div> -->
                     <form  action="{{route('process-log-in')}}" method="post">
                         @csrf
                         <div class="mt-3">
                             <label for="" class="form-label">Email <span class="text-danger">*</span></label>
-                            <input type="email" class="form-control" required name="email" value="{{old('email')}}">
+                            <input type="email" class="form-control py-4" required name="email" value="{{old('email')}}">
                         </div>
-                        <div class="mt-3">
+                        <div class="mt-4">
                             <div class="d-flex align-items-start justify-content-between">
                               <label for="" class="form-label">Password <span class="text-danger">*</span></label>
-                              <a href="{{route('forgot-password')}}">Forgot password?</a>
+                              <a href="{{route('forgot-password')}}" tabindex="-1">Forgot password?</a>
                             </div>
                             <div class="password d-flex align-items-center">
                               <input :type="showPassword ? 'text' : 'password'" required class="border-0" name="password">
-                              <a href="javascript:;" @click="toggleField" class="d-block text-pry me-2"><i :class="showPassword ? 'far fa-eye' : 'far fa-eye-slash'"></i></a>
+                              <a href="javascript:;" @click="toggleField" tabindex="-1" class="d-block text-pry me-2"><i :class="showPassword ? 'far fa-eye' : 'far fa-eye-slash'"></i></a>
                             </div>
                         </div>
                         @if(session('message'))
@@ -46,7 +46,7 @@
                           <div class="alert alert-danger mt-3 py-1 px-2">{{ session('error') }}</div>
                         @endif
                         <div class="mt-4 d-flex align-items-baseline justify-content-around">
-                            <button class="btn btn-pry py-3 w-100">Log In</button>
+                            <button class="btn btn-pry py-2 w-100">Log In</button>
                         </div>
                     </form>
                 </div>

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

@@ -36,7 +36,7 @@
 	</div>
 	<div class="">
 		<div class="form-group mb-0">
-			<label class="text-secondary text-sm mb-1">Client Name</label>
+			<label class="text-secondary text-sm mb-1">User Name</label>
 			<input name="name" class="form-control form-control-sm min-width-unset" v-model="filters.name" />
 		</div>
 	</div>
@@ -46,9 +46,9 @@
 			<label class="text-secondary text-sm mb-1">Created At:</label>
 			<select name="created_at_date_category" class="form-control form-control-sm min-width-unset" v-model="filters.created_at_date_category">
 				<option value="">All</option>
-				<option value="EXACTLY">Exactly</option>
-				<option value="LESS_THAN">Less Than</option>
-				<option value="GREATER_THAN">Greater Than</option>
+				<option value="EXACTLY">Exactly on</option>
+				<option value="LESS_THAN">Before</option>
+				<option value="GREATER_THAN">After</option>
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
@@ -117,4 +117,4 @@ for ($i = 0; $i < count($allFilterKeys); $i++) {
 				},
 			});
 	});
-</script>
+</script>

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

@@ -171,14 +171,14 @@
         </div>
     </div>
     <div class="row mt-4">
-        <div class="col-md-6">
+        <div class="col-12">
             <?php
                 $orders = [];
                 array_push($orders, $order);
             ?>
             @include('app.my-account.admin.users.sub.info.customer-information-orders', ['parentOrders' => $orders, 'title' => 'Order Actions'])
         </div>
-        <div class="col-md-6">
+        <div class="col-12 mt-3">
              @include('app.my-account.admin.users.sub.info.customer-information', ['user' => $order->user])
         </div>
     </div>

resources/views/app/my-account/admin/payment-methods/index.blade.php

@@ -1,10 +1,10 @@
 @extends('app.my-account.layout-lite')
 @section('page')
     <div class="px-3">
-        @include('app.my-account.admin.payment-methods.filters')
         <div class="d-flex align-items-baseline border-bottom px-3 py-2 mb-2 m-neg-3 bg-light">
             <h2 class="font-size-16 text-secondary fw-bold m-0 me-3">Payment Methods</h2>
         </div>
+        @include('app.my-account.admin.payment-methods.filters')
         @include('app.my-account.admin.payment-methods.partials.table', ['rows' => $paymentMethods])
     </div>
 @endsection

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

@@ -1,13 +1,9 @@
-<div class="row">
-    <div class="col-md-12">
-        <div class="row bg-white p-2">
-            <div class="col-md-12">
-                @include('app.my-account.admin.users.sub.info.customer-information-payment-methods')
-            </div>
-            <div class="col-md-12">
-                <h6 class="fw-bold text-muted"><b>Memos</b></h6>
-                @include('app.my-account.admin.users.sub.info.memos')
-            </div>
-        </div>
-    </div>
+<div class="row bg-white">
+  <div class="col-md-12">
+    @include('app.my-account.admin.users.sub.info.customer-information-payment-methods')
+  </div>
+  <div class="col-md-12">
+    <h6 class="fw-bold text-muted"><b>Memos</b></h6>
+    @include('app.my-account.admin.users.sub.info.memos')
+  </div>
 </div>

resources/views/app/my-account/admin/users/sub/info/templates/parent-store-order.blade.php

@@ -15,8 +15,8 @@
     </div>
     <div class="card-body">
         <div class="">
-            <table class="table table-sm table-striped table-bordered table-hover">
-            <thead>
+            <table class="table table-sm table-bordered table-hover">
+            <thead class="bg-warning bg-opacity-10">
                 <tr>
                     <th>IID</th>
                     <th>Created At</th>
@@ -37,7 +37,7 @@
                             </div>
                             <div>
                                 <table class="table table-sm table-hover table-striped table-bordered mb-0">
-                                    <thead>
+                                    <thead class="bg-warning bg-opacity-10">
                                         <tr>
                                             <th>Date</th>
                                             <th>Charge/Refund</th>

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

@@ -159,9 +159,6 @@
                                         </div>
                                     @endif
 
-                                    <!-- <div>
-                                        {{ $messages->withQueryString()->links() }}
-                                    </div> -->
                                 </div>
                             </div>
                         </div>
@@ -202,11 +199,24 @@
                     toastr.error(msg);
                     return true;
                 }
+                function showInnerMask(){
+                    $('.msg-input textarea').css('background-color', '#fff !important');
+                    $('.msg-input textarea').prop('disabled', true);
+                    $('.msg-input button').prop('disabled', true);
+                    $('.msg-input i').removeClass('fa-paper-plane');
+                    $('.msg-input i').addClass('fa-circle-notch fa-spin ms-0');
+                  }
+                  function hideInnerMask(){
+                    $('.msg-input textarea').prop('disabled', false);
+                    $('.msg-input button').prop('disabled', false);
+                    $('.msg-input i').addClass('fa-paper-plane');
+                    $('.msg-input i').removeClass('fa-circle-notch fa-spin ms-0');
+                  }
 
                 function doSend(_elem) {
                     if (inProgress) return false;
                     inProgress = true;
-                    showMask();
+                    showInnerMask();
                     let text = $.trim(_elem.value);
                     let formData = new FormData();
                     formData.set('fromUserUid', '{{ $performer->user->uid }}');
@@ -225,7 +235,7 @@
 
                     if (!hasFiles && !text) { // either attachment or text or both should be there
                         inProgress = false;
-                        hideMask();
+                        hideInnerMask();
                         return false;
                     }
 
@@ -241,7 +251,7 @@
                         } else {
                             $('.im-input textarea').val('');
                             inProgress = false;
-                            hideMask();
+                            hideInnerMask();
                         }
                     });
                     return false;

resources/views/app/my-account/layout.blade.php

@@ -1,6 +1,6 @@
 @extends('layouts.app')
 @section('content')
-<div class="container py-3">
+<div class="container py-3 mt-5">
   <h2 class="mt-4">My Account</h2>
   <hr class="my-3">
   @yield('page')

resources/views/layouts/nav.blade.php

@@ -2,7 +2,7 @@
   $appInternalName = config('app.internalName');
   $appConfig = config('constants.' . $appInternalName);
  ?>
-<nav class="navbar navbar-light border-bottom py-0 border-bottom-primary-3px w-100 d-block">
+<nav class="navbar navbar-light border-bottom py-4 border-bottom-primary-3px w-100 d-block">
     <div class="d-flex align-items-center px-3 mcp-theme-1 h-100">
         <a class="navbar-brand" href="{{route('index')}}">
             <img src="{{asset($appConfig['logo'])}}" style="max-width:120px;object-fit:contain;height:30px;" alt="">
@@ -14,12 +14,12 @@
                 @endif
                 <div class="ms-auto">
                     <div class="d-flex align-items-center justify-content-md-end justify-content-center w-100">
+                        @if($performer && $performer->user)
                         <div>
-                            <form action="{{ route('admin.users') }}" method="GET">
-                                <input type="search" name="customer_name" placeholder="Search by name" class="form-control" value="{{ @$filters['customer_name'] }}" />
-                            </form>
+                          <form action="{{ route('admin.users') }}" method="GET">
+                            <input type="search" name="customer_name" placeholder="Search by name" class="form-control" value="{{ @$filters['customer_name'] }}" />
+                          </form>
                         </div>
-                        @if($performer && $performer->user)
                             <a class="text-dark d-block ms-3" href="{{ route('my-account.index') }}">
                                 <h4 class="m-0"><i class="fal fa-user"></i></h4>
                             </a>