Peter Muturi пре 7 месеци
родитељ
комит
b0c3e0f8cc

+ 9 - 9
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'),

+ 0 - 3
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>