From 27c2a8ac80bd9c170d8e0ce49ff0741096c37bf8 Mon Sep 17 00:00:00 2001
From: Kwesi Banson Jnr <kwesibanson@Jaehaerys.local>
Date: Thu, 27 Aug 2026 10:17:12 +0000
Subject: [PATCH] bug fix on otp, rearranged MNO display order

---
 app/Http/Controllers/Auth/LoginController.php       | 11 +++++++----
 app/Http/Controllers/ClientsController.php          |  2 +-
 app/Http/Controllers/NetworkOperatorsController.php |  8 +++++---
 resources/views/network_operators/index.blade.php   |  5 +++--
 routes/web.php                                      |  3 +++
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index e92ef4d..9429029 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -3,10 +3,14 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use App\Mail\LoginOtpMail;
+use App\Models\StaffMember;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Log;
+
 
 class LoginController extends Controller
 {
@@ -42,6 +46,7 @@ class LoginController extends Controller
     }
     public function authenticate(Request $request)
     {
+        // dd('The custom method is running!'); 
         $request->validate([
             'email' => 'required|email',
             'password' => 'required',
@@ -55,16 +60,14 @@ class LoginController extends Controller
             // 2. Generate 6-digit OTP
             $otp = rand(100000, 999999);
             
-            // 3. Save to database with 10-minute expiration
             $staff->update([
                 'otp_code' => $otp,
-                'otp_expires_at' => now()->addMinutes(10)
+                'otp_expires_at' => now()->addMinutes(3)
             ]);
+            \Log::info($otp);
 
-            // 4. Send Email
             Mail::to($staff->email)->send(new LoginOtpMail($otp));
 
-            // 5. Store staff ID in session
             session(['otp_staff_id' => $staff->id]);
 
             return redirect()->route('otp.verify');
diff --git a/app/Http/Controllers/ClientsController.php b/app/Http/Controllers/ClientsController.php
index 5fa3806..8668532 100644
--- a/app/Http/Controllers/ClientsController.php
+++ b/app/Http/Controllers/ClientsController.php
@@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Barryvdh\DomPDF\Facade\Pdf; // Ensure you have dompdf installed if exporting PDFs
+use Barryvdh\DomPDF\Facade\Pdf;
 
 
 
diff --git a/app/Http/Controllers/NetworkOperatorsController.php b/app/Http/Controllers/NetworkOperatorsController.php
index 1207044..4cff93d 100644
--- a/app/Http/Controllers/NetworkOperatorsController.php
+++ b/app/Http/Controllers/NetworkOperatorsController.php
@@ -28,10 +28,12 @@ class NetworkOperatorsController extends Controller
             $query->where('connection_status', 'like', "%{$request->input('connection_status')}%");
         }
 
-        // Paginate instead of getting all records at once (e.g., 10 per page)
-        $operators = $query->latest('id')->paginate(10)->withQueryString();
+        // $operators = $query->latest('id')->paginate(10)->withQueryString();
+        $operators = $query->orderBy('country', 'asc')
+                       ->orderBy('name', 'asc')
+                       ->paginate(10)
+                       ->withQueryString();
 
-        // dd($operators);
 
         $totalActive = NetworkOperator::where('connection_status', 'Active')->count();
         $totalSipLinks = NetworkOperator::where('connection_type', 'like', '%VPN%')->count();
diff --git a/resources/views/network_operators/index.blade.php b/resources/views/network_operators/index.blade.php
index a82be2e..da16153 100644
--- a/resources/views/network_operators/index.blade.php
+++ b/resources/views/network_operators/index.blade.php
@@ -78,8 +78,8 @@
             <table class="table table-custom table-hover mb-0">
                 <thead>
                     <tr>
-                        <th>Operator</th>
                         <th>Country</th>
+                        <th>Operator</th>  
                         <th>Connection Type</th>
                         <th>Services</th>
                         <th>Status</th>
@@ -89,6 +89,7 @@
                 <tbody>
                     @forelse($operators as $operator)
                         <tr>
+                            <td><span class="fw-semibold">{{ $operator->country }}</span></td>
                             <td>
                                 <div class="d-flex align-items-center">
                                     <div class="avatar-circle bg-primary bg-opacity-10 text-primary me-3">
@@ -100,7 +101,7 @@
                                     </div>
                                 </div>
                             </td>
-                            <td><span class="fw-semibold">{{ $operator->country }}</span></td>
+                            
                             <td>
                                 <div class="text-dark fw-semibold" style="font-size: 0.85rem;"><i class="bi bi-shield-lock me-1 text-primary"></i> {{ $operator->connection_type ?? 'N/A' }}</div>
                             </td>
diff --git a/routes/web.php b/routes/web.php
index b24e10e..7ec6349 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,6 +12,9 @@ Route::get('test', function () {
 Auth::routes([
     'register' => false,
 ]);
+// If your method is in LoginController
+Route::post('/login', [App\Http\Controllers\Auth\LoginController::class, 'authenticate'])->name('login.post');
+
 Route::get('/verify-otp', [App\Http\Controllers\OtpController::class, 'show'])->name('otp.verify');
 Route::post('/verify-otp', [App\Http\Controllers\OtpController::class, 'verify'])->name('otp.verify.post');
 Route::post('/resend-otp', [App\Http\Controllers\OtpController::class, 'resend'])->name('otp.resend');