Browse Source

minor update

Peter Muturi 1 year ago
parent
commit
c991870d69

+ 10 - 11
app/Http/Controllers/AdminController.php

@@ -31,8 +31,8 @@ class AdminController extends Controller
     {
         $ordersTotal = $this->getOrdersTotal();
         return view('app.my-account.admin.dashboard', compact('ordersTotal'));
-    }  
-    
+    }
+
     public function getOrdersTotal(){
         $orders = StoreOrder::all();
         $total = 0;
@@ -87,7 +87,7 @@ class AdminController extends Controller
         $transactions = FinancialTransaction::where('user_id', $user->id)->orderBy('created_at', 'DESC')->paginate(30);
         return view('app.my-account.admin.users.sub.transactions', compact('transactions', 'user'));
     }
-   
+
     public function userSessions(User $user)
     {
         $sessions = AppSession::where('user_id', $user->id)->orderBy('created_at', 'DESC')->paginate(30);
@@ -99,7 +99,7 @@ class AdminController extends Controller
         return view('app.my-account.admin.users.sub.user-events', compact('userEvents', 'user'));
     }
 
-   
+
     public function userPaymentMethods(User $user){
         $userPaymentMethods = PaymentMethod::where('user_id', $user->id)->orderBy('created_at', 'DESC')->paginate(30);
         return view('app.my-account.admin.users.sub.payment-methods', compact('user', 'userPaymentMethods'));
@@ -167,7 +167,7 @@ class AdminController extends Controller
                 ->orWhere('full_name', 'ilike', $wildCardedName);
             });
           }
-        
+
         $orderNumber = $request->get('order_number');
         if($orderNumber){
             $wildCardedOrderNumber = '%' . $orderNumber . '%';
@@ -181,7 +181,7 @@ class AdminController extends Controller
         $clonedOrdersQuery = clone $orders;
 
         $orders = $orders->paginate(30);
-        
+
         return view('app.my-account.admin.orders.index', compact('orders', 'filters'));
     }
 
@@ -214,7 +214,7 @@ class AdminController extends Controller
         return view('app.my-account.reports.' . $report, compact('rows'));
     }
 
-   
+
     public function sessions(Request $request){
         $filters = $request->all();
         $sessions = AppSession::query();
@@ -258,9 +258,9 @@ class AdminController extends Controller
         if (!@$response['success']) {
             $storeOrder = StoreOrder::where('uid', $request->get('orderUid'))->first();
             if($storeOrder){
-               $this->emailService->notifyUserOnFailedTransaction($storeOrder->user); 
+               $this->emailService->notifyUserOnFailedTransaction($storeOrder->user);
             }
-            
+
             return $this->fail($response['message']);
         }
         return $this->pass();
@@ -285,8 +285,7 @@ class AdminController extends Controller
           }
 
           $toUser = $user;
-
-        return view('app.my-account.admin.users.sub.messages', compact('otSessionId', 'otToken', 'messages', 'toUser'));
+        return view('app.my-account.admin.users.sub.messages', compact('otSessionId', 'otToken', 'messages', 'toUser', 'user'));
     }
     public function userMessageAttachments(Request $request, User $user, Message $message){
         if(!$message) return '';

+ 1 - 1
resources/views/app/my-account/admin/users/single.blade.php

@@ -33,4 +33,4 @@
         @yield('details')
     </div>
 </div>
-@endsection
+@endsection

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

@@ -62,7 +62,7 @@
                                                                         <!-- remove unecessary timestamps -->
                                                                         @if ($message->from_user_id !== $performer->user->id)
                                                                             <small
-                                                                                class="mr-2 text-secondary">{{ $message->fromUser->displayName() }},</small>
+                                                                                class="me-2 text-secondary">{{ $message->fromUser->displayName() }},</small>
                                                                         @endif
                                                                         <small
                                                                             class="header-item text-secondary text-sm">{{ friendly_time_by_time_zone($message->created_at) }}</small>

+ 1 - 1
resources/views/layouts/app-no-footer.blade.php

@@ -2,7 +2,7 @@
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <?php
   $appInternalName = config('app.internalName');
-  $appConfig = config('constants.' . $appInternalName);  
+  $appConfig = config('constants.' . $appInternalName);
  ?>
 <head>
     <meta charset="utf-8">