diff --git a/app/Http/Controllers/Admin/AdminStaffController.php b/app/Http/Controllers/Admin/AdminStaffController.php index 020239e..f7d8ddb 100644 --- a/app/Http/Controllers/Admin/AdminStaffController.php +++ b/app/Http/Controllers/Admin/AdminStaffController.php @@ -55,6 +55,7 @@ class AdminStaffController extends Controller DB::beginTransaction(); try { + // 1️⃣ Create staff WITHOUT employee_id (ID not available yet) $admin = Admin::create([ 'name' => $request->name, 'email' => $request->email, @@ -69,23 +70,33 @@ class AdminStaffController extends Controller 'status' => $request->status, 'additional_info' => $request->additional_info, - 'username' => $request->username, + // username may be NULL here + 'username' => $request->username ?: null, 'password' => Hash::make($request->password), 'type' => 'staff', ]); - // Generate EMPLOYEE ID using admin ID (safe) + // 2️⃣ Generate EMPLOYEE ID $employeeId = 'EMP' . str_pad($admin->id, 4, '0', STR_PAD_LEFT); - $admin->update(['employee_id' => $employeeId]); - // Assign permissions (if any) + // 3️⃣ Auto-generate username if left blank + $username = $request->username ?: strtolower($employeeId); + + // 4️⃣ Update employee_id + username together + $admin->update([ + 'employee_id' => $employeeId, + 'username' => $username, + ]); + + // 5️⃣ Assign permissions (if any) if ($request->permissions) { $admin->givePermissionTo($request->permissions); } DB::commit(); - return redirect()->route('admin.staff.index') + return redirect() + ->route('admin.staff.index') ->with('success', 'Staff created successfully.'); } catch (\Exception $e) { @@ -94,6 +105,7 @@ class AdminStaffController extends Controller } } + public function edit($id) { $staff = Admin::where('type', 'staff')->findOrFail($id); diff --git a/app/Http/Controllers/Admin/ShipmentController.php b/app/Http/Controllers/Admin/ShipmentController.php index 0eab511..6feffef 100644 --- a/app/Http/Controllers/Admin/ShipmentController.php +++ b/app/Http/Controllers/Admin/ShipmentController.php @@ -224,5 +224,81 @@ class ShipmentController extends Controller return view('admin.view_shipment', compact('shipment', 'dummyData')); } + // App\Models\Shipment.php + +public function orders() +{ + return $this->belongsToMany(\App\Models\Order::class, 'shipment_items', 'shipment_id', 'order_id'); +} + +public function removeOrder(Shipment $shipment, Order $order) +{ + // Remove row from pivot table shipment_items + ShipmentItem::where('shipment_id', $shipment->id) + ->where('order_id', $order->id) + ->delete(); // removes link shipment <-> order [web:41][web:45] + + // Recalculate totals on this shipment (optional but recommended) + $orders = Order::whereIn( + 'id', + ShipmentItem::where('shipment_id', $shipment->id)->pluck('order_id') + )->get(); + + $shipment->total_ctn = $orders->sum('ctn'); + $shipment->total_qty = $orders->sum('qty'); + $shipment->total_ttl_qty = $orders->sum('ttl_qty'); + $shipment->total_cbm = $orders->sum('cbm'); + $shipment->total_ttl_cbm = $orders->sum('ttl_cbm'); + $shipment->total_kg = $orders->sum('kg'); + $shipment->total_ttl_kg = $orders->sum('ttl_kg'); + $shipment->total_amount = $orders->sum('ttl_amount'); + $shipment->save(); + + // Redirect back to preview page where your blade is loaded + return redirect() + ->route('admin.shipments.dummy', $shipment->id) + ->with('success', 'Order removed from shipment successfully.'); +} + +public function addOrders(Request $request, Shipment $shipment) +{ + $request->validate([ + 'order_ids' => 'required|array|min:1', + ]); + + // फक्त न वापरलेले orders घ्या + $orders = Order::whereIn('id', $request->order_ids)->get(); + + foreach ($orders as $order) { + // pivot मध्ये insert + ShipmentItem::create([ + 'shipment_id' => $shipment->id, + 'order_id' => $order->id, + 'order_ctn' => $order->ctn, + 'order_qty' => $order->qty, + 'order_ttl_qty' => $order->ttl_qty, + 'order_ttl_amount' => $order->ttl_amount, + 'order_ttl_kg' => $order->ttl_kg, + ]); + } + + // totals + $orderIds = ShipmentItem::where('shipment_id', $shipment->id)->pluck('order_id'); + $allOrders = Order::whereIn('id', $orderIds)->get(); + + $shipment->total_ctn = $allOrders->sum('ctn'); + $shipment->total_qty = $allOrders->sum('qty'); + $shipment->total_ttl_qty = $allOrders->sum('ttl_qty'); + $shipment->total_cbm = $allOrders->sum('cbm'); + $shipment->total_ttl_cbm = $allOrders->sum('ttl_cbm'); + $shipment->total_kg = $allOrders->sum('kg'); + $shipment->total_ttl_kg = $allOrders->sum('ttl_kg'); + $shipment->total_amount = $allOrders->sum('ttl_amount'); + $shipment->save(); + + return redirect() + ->route('admin.shipments.dummy', $shipment->id) + ->with('success', 'Orders added to shipment successfully.'); +} } \ No newline at end of file diff --git a/app/Http/Controllers/Admin/UserRequestController.php b/app/Http/Controllers/Admin/UserRequestController.php index e09c56f..eb977c6 100644 --- a/app/Http/Controllers/Admin/UserRequestController.php +++ b/app/Http/Controllers/Admin/UserRequestController.php @@ -15,7 +15,12 @@ class UserRequestController extends Controller public function index() { $requests = CustomerRequest::orderBy('id', 'desc')->get(); - return view('admin.requests', compact('requests')); + $pendingProfileUpdates = \App\Models\UpdateRequest::where('status', 'pending')->count(); + + return view('admin.requests', compact( + 'requests', + 'pendingProfileUpdates' + )); } // Approve user request diff --git a/app/Models/Admin.php b/app/Models/Admin.php index 118f371..c897aeb 100644 --- a/app/Models/Admin.php +++ b/app/Models/Admin.php @@ -18,7 +18,7 @@ class Admin extends Authenticatable 'name', 'email', 'password', 'username', 'phone', 'emergency_phone', 'address', 'role', 'department', 'designation', 'joining_date', - 'status', 'additional_info', 'type', // admin/staff indicator + 'status', 'additional_info', 'type','employee_id', // admin/staff indicator ]; protected $hidden = [ diff --git a/public/invoices/invoice-INV-2025-000016.pdf b/public/invoices/invoice-INV-2025-000016.pdf new file mode 100644 index 0000000..0a36ff8 Binary files /dev/null and b/public/invoices/invoice-INV-2025-000016.pdf differ diff --git a/public/invoices/invoice-INV-2025-000030.pdf b/public/invoices/invoice-INV-2025-000030.pdf index 2f12f72..8eab796 100644 Binary files a/public/invoices/invoice-INV-2025-000030.pdf and b/public/invoices/invoice-INV-2025-000030.pdf differ diff --git a/resources/views/admin/chat_support.blade.php b/resources/views/admin/chat_support.blade.php index 9add999..623fa65 100644 --- a/resources/views/admin/chat_support.blade.php +++ b/resources/views/admin/chat_support.blade.php @@ -1,96 +1,605 @@ @extends('admin.layouts.app') -@section('page-title', 'Chat Support') +@section('page-title', 'Chat Support Dashboard') @section('content') + + +
+ +
+

Live Chat Dashboard

+

+ Monitor customer conversations with real-time updates +

- - - @endforeach - - - @endif - + +
+
+
💬
+
+

{{ $tickets->count() }}

+

Total Conversations

+
+
+
📈
+
+

{{ $tickets->where('status', 'open')->count() }}

+

Active Tickets

+
+
+
+
✅
+
+

{{ $tickets->where('status', 'closed')->count() }}

+

Resolved Tickets

+
+
+
+ + +
+
+
+

+ 📋 Active Conversations + {{ $tickets->count() }} +

+
+
+ + @if($tickets->count() === 0) + +
+
💬
+

No Active Conversations

+

+ Customer conversations will appear here with real-time notifications. +

+
Ready for support requests
+
+ @else + +
+ @foreach($tickets as $ticket) +
+ @if($ticket->unread_count > 0) +
+ @endif + +
+
+ {{ strtoupper(substr($ticket->user->customer_name ?? $ticket->user->name, 0, 1)) }} +
+
+
+ {{ $ticket->user->customer_name ?? $ticket->user->name }} + @if($ticket->unread_count > 0) + + {{ $ticket->unread_count }} + + @endif +
+ + @php + $lastMsg = $ticket->messages()->latest()->first(); + @endphp + +
+ @if($lastMsg) + @if($lastMsg->message) + {{ Str::limit($lastMsg->message, 55) }} + @elseif(Str::startsWith($lastMsg->file_type, 'image')) + 📷 Photo shared + @else + 📎 File attached + @endif + @else + Conversation started + @endif +
+ + @if($lastMsg) +
+ + + + + {{ $lastMsg->created_at->diffForHumans() }} +
+ @endif +
+
#{{ $ticket->id }}
+
+ +
+ + {{ ucfirst($ticket->status) }} + + + Open Chat + +
+
+ @endforeach +
+ @endif
+@endsection + @section('scripts') -@endsection - - - -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/admin/chat_window.blade.php b/resources/views/admin/chat_window.blade.php index 2dec287..d908aa8 100644 --- a/resources/views/admin/chat_window.blade.php +++ b/resources/views/admin/chat_window.blade.php @@ -3,132 +3,828 @@ @section('page-title', 'Chat With ' . ($ticket->user->customer_name ?? $ticket->user->name)) @section('content') - -
- -
-

- Chat With: {{ $ticket->user->customer_name ?? $ticket->user->name }} -

- - {{ ucfirst($ticket->status) }} - -
- -
- - @foreach($messages as $msg) -
- - {{-- TEXT --}} - @if($msg->message) -
{{ $msg->message }}
- @endif - - {{-- FILE --}} - @if($msg->file_path) - - @php - $isImage = Str::startsWith($msg->file_type, 'image'); - $isVideo = Str::startsWith($msg->file_type, 'video'); - @endphp - - {{-- IMAGE --}} - @if($isImage) - - - {{-- VIDEO --}} - @elseif($isVideo) - - - {{-- PDF / EXCEL / OTHER --}} - @else - - 📎 View Attachment - - @endif - - @endif - - - - {{ $msg->created_at->format('d M h:i A') }} - +
+
+
+
+ +
+ + {{ ucfirst($ticket->status) }} + + + + + + Back + +
- @endforeach +
-
+ {{-- Messages --}} +
+
+ @foreach($messages as $msg) +
+ @if($msg->message) +
{{ $msg->message }}
+ @endif -
-
-
- - - + @if($msg->file_path) + @php + $isImage = Str::startsWith($msg->file_type, 'image'); + $isVideo = Str::startsWith($msg->file_type, 'video'); + $isPdf = Str::endsWith($msg->file_path, '.pdf'); + $isDocument = in_array(Str::lower(Str::afterLast($msg->file_path, '.')), ['doc', 'docx', 'txt']); + $fileName = basename($msg->file_path); + + // Get file size from storage if possible + $fileSize = 'N/A'; + try { + $fullPath = storage_path('app/public/' . $msg->file_path); + if (file_exists($fullPath)) { + $size = filesize($fullPath); + if ($size < 1024) { + $fileSize = $size . ' B'; + } elseif ($size < 1048576) { + $fileSize = round($size / 1024, 1) . ' KB'; + } else { + $fileSize = round($size / 1048576, 1) . ' MB'; + } + } + } catch (Exception $e) { + $fileSize = 'Unknown'; + } + + // Determine file class + if ($isImage) { + $fileClass = 'image-file'; + $fileIcon = '🖼️'; + } elseif ($isVideo) { + $fileClass = 'video-file'; + $fileIcon = '🎬'; + } elseif ($isPdf) { + $fileClass = 'pdf-file'; + $fileIcon = '📄'; + } elseif ($isDocument) { + $fileClass = 'document-file'; + $fileIcon = '📝'; + } else { + $fileClass = 'other-file'; + $fileIcon = '📎'; + } + @endphp + +
+ @if($isImage) + {{ $fileName }} + @elseif($isVideo) + + @endif + + +
+ {{ $fileIcon }} +
+
+
{{ $fileName }}
+
{{ $fileSize }}
+
+
+ + + +
+ +
+ @endif + + + {{ $msg->created_at->format('d M h:i A') }} + +
+ @endforeach + +
+ + + +
+
+
+ + {{-- Input --}} +
+
+ + +
+
+ + +
+ + +
+
+ +
-
- @endsection - @section('scripts') - - - - -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index a983dcf..1586d1c 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -7,7 +7,7 @@ use App\Models\Shipment; use App\Models\Invoice; use App\Models\User; - use App\Models\Staff; + use App\Models\Admin; $totalOrders = Order::count(); $pendingOrders = Order::where('status', 'pending')->count(); @@ -16,12 +16,12 @@ $totalRevenue = Invoice::sum('final_amount_with_gst'); - // USERS (USING status COLUMN) + // USERS (CUSTOMERS) $activeCustomers = User::where('status', 'active')->count(); $inactiveCustomers = User::where('status', 'inactive')->count(); - // STAFF (ACTIVE ONLY, SoftDeletes SAFE) - $totalStaff = Staff::where('status', 'active')->count(); + // STAFF (FROM ADMINS TABLE) + $totalStaff = Admin::where('type', 'staff')->count(); $orders = Order::latest()->get(); @endphp @@ -356,6 +356,13 @@ body, .container-fluid { border-color: #f59e0b !important; } +.badge-loading { + background: linear-gradient(135deg, #e3f2fd, #90caf9) !important; + color: #1565c0 !important; + border-color: #2196f3 !important; + width: 110px; +} + /* In Transit Status - SAME SIZE WITH TRUCK ICON */ .badge-in_transit { background: linear-gradient(135deg, #dbeafe, #93c5fd) !important; @@ -1124,6 +1131,7 @@ body, .container-fluid { break-inside: avoid; } } +
diff --git a/resources/views/admin/layouts/app.blade.php b/resources/views/admin/layouts/app.blade.php index 7f63cc7..04b1698 100644 --- a/resources/views/admin/layouts/app.blade.php +++ b/resources/views/admin/layouts/app.blade.php @@ -201,7 +201,7 @@ background: #fff; padding: 10px 18px !important; position: relative; - height: 48px; + height: 65px; width: 100%; box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05); } @@ -221,6 +221,32 @@ font-size: 1.06rem; font-weight: 500; } + + /* ================================ + HEADER NOTIFICATION BADGE FIX +================================ */ + +/* Target ONLY badge inside bell icon */ +header .bi-bell { + position: relative; +} + +/* Override broken global badge styles */ +header .bi-bell .badge { + width: 22px !important; + height: 22px !important; + min-width: 22px !important; + padding: 0 !important; + font-size: 12px !important; + line-height: 22px !important; + border-radius: 50% !important; + display: inline-flex !important; + align-items: center; + justify-content: center; + animation: none !important; + box-shadow: 0 0 0 2px #ffffff; +} + @@ -285,12 +311,12 @@ @endcan - {{-- Profile Update Requests --}} + {{-- Staff (NO PERMISSION REQUIRED) --}} diff --git a/resources/views/admin/orders_show.blade.php b/resources/views/admin/orders_show.blade.php index d430814..ca2b532 100644 --- a/resources/views/admin/orders_show.blade.php +++ b/resources/views/admin/orders_show.blade.php @@ -13,47 +13,54 @@

Order Details

+ @php + $status = strtolower($order->status ?? ''); + @endphp + Detailed view of this shipment order
{{-- ADD ITEM --}} @can('order.create') - + @if($status === 'pending') + + @endif @endcan +
+
+ {{-- Edit Order --}} + @if($status === 'pending') + + @endif - {{-- EDIT ORDER --}} --> - + {{-- Delete Order --}} + @if($status === 'pending') +
+ @csrf + @method('DELETE') + +
+ @endif +
- - - +
@@ -190,32 +197,33 @@ {{ $item->ttl_kg }} {{ $item->shop_no }} - + + @if($status === 'pending') + {{-- EDIT BUTTON --}} + @can('order.edit') + + @endcan - {{-- EDIT BUTTON --}} - @can('order.edit') - - @endcan + {{-- DELETE BUTTON --}} + @can('order.delete') +
+ @csrf + @method('DELETE') + +
+ @endcan + @endif + - @can('order.delete') - {{-- DELETE BUTTON --}} -
- @csrf - @method('DELETE') - -
- @endcan - @endforeach @@ -617,7 +625,7 @@ function fillFormFromDeleted(item) { box-shadow: 0 4px 15px 0 rgba(102, 126, 234, 0.3); position: relative; overflow: hidden; - margin-right: -800px; + margin-right: -650px; } .btn-add-item:hover { diff --git a/resources/views/admin/profile_update_requests.blade.php b/resources/views/admin/profile_update_requests.blade.php index 4797665..e6938ce 100644 --- a/resources/views/admin/profile_update_requests.blade.php +++ b/resources/views/admin/profile_update_requests.blade.php @@ -5,107 +5,207 @@ @section('content')
- @php - $perPage = 5; - $currentPage = request()->get('page', 1); - $currentPage = max(1, (int)$currentPage); - $total = $requests->count(); - $totalPages = ceil($total / $perPage); - $currentItems = $requests->slice(($currentPage - 1) * $perPage, $perPage); - @endphp +@php + $perPage = 5; + $currentPage = request()->get('page', 1); + $currentPage = max(1, (int)$currentPage); + $total = $requests->count(); + $currentItems = $requests->slice(($currentPage - 1) * $perPage, $perPage); +@endphp - + + +

Profile Update Requests ({{ $total }})

+ +@foreach($currentItems as $index => $req) +@php + $user = $req->user; + $newData = is_array($req->data) ? $req->data : json_decode($req->data, true); +@endphp + +
+ + +
+ #{{ ($currentPage - 1) * $perPage + $index + 1 }} + +
+ {{ $user->customer_name }}
+ {{ $user->email }}
+ ID: {{ $user->customer_id }} +
+ +
+ @if($req->status == 'pending') + Pending + @elseif($req->status == 'approved') + Approved + @else + Rejected + @endif +
+ +
{{ $req->created_at->format('d M Y, h:i A') }}
+ +
+ @if($req->status == 'pending') + + ✔ Approve + + + ✖ Reject + + @else + Completed + @endif
+ + +
+ @foreach(['customer_name','company_name','email'] as $field) + @php + $old = $user->$field ?? '—'; + $new = $newData[$field] ?? $old; + @endphp +
+
{{ ucfirst(str_replace('_',' ', $field)) }}
+
Old: {{ $old }}
+
New: {{ $new }}
+
+ @endforeach +
+ + +
+ @foreach(['mobile_no','address','pincode'] as $field) + + @php + $old = $user->$field ?? '—'; + $new = $newData[$field] ?? $old; + @endphp +
+
{{ ucfirst(str_replace('_',' ', $field)) }}
+
Old: {{ $old }}
+
New: {{ $new }}
+
+ @endforeach +
+ +
+@endforeach +
@endsection diff --git a/resources/views/admin/requests.blade.php b/resources/views/admin/requests.blade.php index cab3f38..a4e598b 100644 --- a/resources/views/admin/requests.blade.php +++ b/resources/views/admin/requests.blade.php @@ -307,13 +307,54 @@ justify-content: center; } } +/* ============================================== + PROFILE UPDATE REQUEST BUTTON BADGE FIX +============================================== */ + +/* Ensure button is positioning context */ +a.btn.btn-primary.position-relative { + position: relative; + margin-right: 10px; +} + +/* Fix badge inside Profile Update Requests button */ +a.btn.btn-primary.position-relative .badge { + width: 30px !important; + height: 30px !important; + min-width: 30px !important; + padding: 0 !important; + font-size: 14px !important; + line-height: 30px !important; + border-radius: 50% !important; + display: inline-flex !important; + align-items: center; + justify-content: center; + animation: none !important; + box-shadow: 0 0 0 2px #ffffff; + +} + +
-

User Requests (Total: {{ $total }})

- -
+

User Requests (Total: {{ $total }})

+ + @can('request.update_profile') + + + Profile Update Requests + + @if($pendingProfileUpdates > 0) + + {{ $pendingProfileUpdates }} + + @endif + + @endcan +
+
diff --git a/resources/views/admin/see_order.blade.php b/resources/views/admin/see_order.blade.php index 066c1a4..196919b 100644 --- a/resources/views/admin/see_order.blade.php +++ b/resources/views/admin/see_order.blade.php @@ -1077,7 +1077,6 @@ Description Origin Destination - Description CTN QTY TTL/QTY @@ -1094,7 +1093,6 @@ {{ $orderItem['origin'] ?? '-' }} {{ $orderItem['destination'] ?? '-' }} - {{ $orderItem['description'] ?? '-' }} {{ $orderItem['ctn'] ?? '-' }} {{ $orderItem['qty'] ?? '-' }} {{ $orderItem['ttl_qty'] ?? '-' }} @@ -1105,7 +1103,7 @@ @endphp - {{ ucfirst($orderItem['status'] ?? 'Pending') }} + {{ ucfirst($shipment['status']) }} diff --git a/resources/views/admin/shipments.blade.php b/resources/views/admin/shipments.blade.php index 4fa2ad0..b3565a9 100644 --- a/resources/views/admin/shipments.blade.php +++ b/resources/views/admin/shipments.blade.php @@ -1297,9 +1297,10 @@ {{ \Carbon\Carbon::parse($ship->shipment_date)->format('d M Y') }} - + @@ -1596,13 +1597,13 @@ function renderTable() { ${new Date(shipment.shipment_date).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })} - - +
-
-
- - {{-- Stage 2 --}} -
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
- - {{-- Stage 3 --}} -
-
- - -
If left blank employee id will be used.
-
- -
- - -
- -
- - -
-
- - {{-- Stage 4 --}} -
-
Permissions
- - @foreach($permissions as $group => $groupPerms) -
-
-
{{ ucfirst($group) }}
-
- + +
+ +
+
+
👨‍💼
+

Add New Staff Member

+

Complete all the steps below to add a new staff member to your team

-
- -
- @foreach($groupPerms as $perm) - - @endforeach -
- @endforeach -
- - -
+ +
+
+
1
+
Personal
+
+
+
2
+
Professional
+
+
+
3
+
Account
+
+
+
4
+
Permissions
+
+
+ + + @if($errors->any()) +
+
+ ⚠️ + Please fix the following errors +
+
    + @foreach($errors->all() as $err) +
  • {{ $err }}
    • + @endforeach +
+
+ @endif + + + @csrf + + +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ + +
+
+ +
+ + +
+
+ +
+ + +
+
+ + +
+
+
+ + +
+ ℹ️ + If left blank, username will be generated from employee ID +
+
+ +
+ + +
+
+
+
+ 🔒 + Minimum 8 characters with letters and numbers +
+
+ +
+ + +
+
+ +
+ + +
+
+ + +
+
+

🔐 Set Access Permissions

+

Select the permissions you want to grant to this staff member.

+
+ +
+ @foreach($permissions as $group => $groupPerms) +
+
+

{{ ucfirst($group) }}

+ +
+
+ @foreach($groupPerms as $perm) + + @endforeach +
+
+ @endforeach +
+ +
+ + +
+
+
-
-@endsection +@endsection \ No newline at end of file diff --git a/resources/views/admin/staff/edit.blade.php b/resources/views/admin/staff/edit.blade.php index d6fc451..09bb26a 100644 --- a/resources/views/admin/staff/edit.blade.php +++ b/resources/views/admin/staff/edit.blade.php @@ -1,156 +1,896 @@ @extends('admin.layouts.app') -@section('page-title', 'Account Dashboard') +@section('page-title', 'Edit Staff') @section('content') -
-

Edit Staff — {{ $staff->display_name ?? $staff->name }}

- - @if($errors->any()) -
- There were some problems with your input: -
    - @foreach($errors->all() as $err) -
  • {{ $err }}
    • - @endforeach -
-
- @endif - -
- @csrf - @method('PUT') - -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- - -
- -
- - -
- -
- -
Permissions
- - @foreach($permissions as $group => $groupPerms) -
-
-
{{ ucfirst($group) }}
-
- -
+
+ +
+ +
+
+
+ {{ strtoupper(substr($staff->name, 0, 2)) }} +
+
+

Edit Staff Profile

+
{{ $staff->name }}
+
{{ $staff->employee_id }}
-
- @foreach($groupPerms as $perm) - - @endforeach -
-
- @endforeach + + @if($errors->any()) +
+
+ ⚠️ + There were some problems with your input +
+
    + @foreach($errors->all() as $err) +
  • {{ $err }}
    • + @endforeach +
+
+ @endif -
- Cancel - + + @csrf + @method('PUT') + + +
+
+
👤
+

Personal Information

+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ + +
+
+
💼
+

Professional Information

+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ + +
+
+
+
+ + +
+
+
🔐
+

Account Information

+
+
+
+ + +
+ +
+ + +
+
+
+
+ +
+ + +
+
+
+ + +
+
+
📝
+

Additional Information

+
+
+
+ + +
+
+
+ + +
+
+
🔑
+

Permissions & Access

+
+ +
+ @foreach($permissions as $group => $groupPerms) +
+
+

{{ ucfirst($group) }}

+ +
+
+ @foreach($groupPerms as $perm) + + @endforeach +
+
+ @endforeach +
+
+ + +
+ + ← + Cancel + + +
+
-
-@endsection +@endsection \ No newline at end of file diff --git a/resources/views/admin/staff/index.blade.php b/resources/views/admin/staff/index.blade.php index 479014d..184a2a2 100644 --- a/resources/views/admin/staff/index.blade.php +++ b/resources/views/admin/staff/index.blade.php @@ -1,65 +1,896 @@ @extends('admin.layouts.app') -@section('page-title', 'Account Dashboard') +@section('page-title', 'Staff Management Dashboard') @section('content') -
-

Staff

- Add Staff +
+ + @if(session('success')) +
+ {{ session('success') }} +
+ @endif + + {{-- Stats Cards --}} +
+
+
+ 👥 +
+
+

{{ $staff->count() }}

+

Total Staff

+
+
+
+
+ ✅ +
+
+

{{ $staff->where('status', 'active')->count() }}

+

Active Staff

+
+
+
+
+ 👑 +
+
+

{{ $staff->unique('role')->count() }}

+

Unique Roles

+
+
+
+ + {{-- Search Bar --}} +
+ 🔍 + +
+ +
+ + + ➕ + Add Staff + +
+ + {{-- Staff Table --}} +
+
+
Staff Management
+
+ +
+
+ + + + + + + + + + + + + + + + @php + $totalStaff = count($staff); + @endphp + @forelse($staff as $s) + + + + + + + + + + + @empty + + + + @endforelse + +
#Employee IDNameEmailPhoneRoleStatusActions
{{ $totalStaff - $loop->index }} + {{ $s->employee_id }} + +
+
+ {{ strtoupper(substr($s->name, 0, 1)) }} +
+ {{ $s->name }} +
+ 		{{ $s->email }}{{ $s->phone ?? '-' }} + @if($s->role) + {{ $s->role }} + @else + - + @endif + + + {{ ucfirst($s->status) }} + + +
+ + + Edit + +
+ @csrf + @method('DELETE') + +
+
+
+
+ No staff members found +
+
+
+ + {{-- Pagination --}} +
+
+ Showing 1 to {{ $staff->count() }} of {{ $staff->count() }} entries +
+
+ +
+ +
+ +
+
+
+
-
- @if(session('success')) -
{{ session('success') }}
- @endif + +@endsection \ No newline at end of file diff --git a/resources/views/admin/view_shipment.blade.php b/resources/views/admin/view_shipment.blade.php index f46f1cc..143f233 100644 --- a/resources/views/admin/view_shipment.blade.php +++ b/resources/views/admin/view_shipment.blade.php @@ -3,32 +3,964 @@ @section('page-title', 'Shipment Preview') @section('content') + + +
+
+
+

- Shipment Preview: {{ $shipment->shipment_id }} -

+ Shipment Details - {{ $shipment->shipment_id }} + + + {{-- SHOW BUTTON ONLY FOR PENDING --}} + @if($shipment->status === 'pending') + + @endif
-
- - -
- {{ $dummyData['title'] }}
- Generated On: {{ $dummyData['generated_on'] }}
- Note: {{ $dummyData['note'] }} -
- - -
Shipment Details
- +
+ + Shipment Information +
+
+ - - + + @@ -40,89 +972,608 @@ - + -
Shipment ID{{ $shipment->shipment_id }}Shipment ID{{ $shipment->shipment_id }}
Origin
Status{{ ucfirst($shipment->status) }} + @php + $statusColors = [ + 'pending' => 'warning', + 'loading' => 'info', + 'in_transit' => 'primary', + 'dispatched' => 'success', + 'delivered' => 'success', + ]; + $statusColor = $statusColors[$shipment->status] ?? 'secondary'; + @endphp + + {{ ucfirst(str_replace('_', ' ', $shipment->status)) }} + +
Date {{ \Carbon\Carbon::parse($shipment->shipment_date)->format('d M Y') }}
+ + - -
Orders Contained in Shipment
+
+ + Orders Contained in Shipment +
- @if($shipment->orders->isEmpty()) -

No orders found.

- @else -
- - - - - - - - - - - - - - - @foreach($shipment->orders as $order) - - - - - - - - - - - @endforeach + @if($shipment->orders->isEmpty()) +
+ + No orders found in this shipment. +
+ @else +
+
Order IDOriginDestinationCTNQTYTTL/QTYKGAmount
{{ $order->order_id }}{{ $order->origin }}{{ $order->destination }}{{ $order->ctn }}{{ $order->qty }}{{ $order->ttl_qty }}{{ $order->ttl_kg }}₹{{ number_format($order->ttl_amount, 2) }}
+ + + + + + + + + + + + + + + + + -
Order IDOriginDestinationMark NoDescriptionCTNQTYTTL/QTYKGTTL/KGAmountRemove
+ +
+ +
+
+ Showing 1 to 0 of + 0 entries
- @endif +
+ +
+
+ +
+
+ @endif - -
Shipment Totals
- - - - - - - - - - - - - - - - - - - - - - - - - -
Total CTN{{ $shipment->total_ctn }}
Total Quantity{{ $shipment->total_qty }}
Total TTL Quantity{{ $shipment->total_ttl_qty }}
Total CBM{{ $shipment->total_cbm }}
Total KG{{ $shipment->total_kg }}
Total Amount - ₹{{ number_format($shipment->total_amount, 2) }} -
+
+ + Shipment Totals +
+
+
+ + + + + + + + + + + + + + + +
Total CTN{{ $shipment->total_ctn }}
Total QTY{{ $shipment->total_qty }}
Total TTL QTY{{ $shipment->total_ttl_qty }}
+
+
+ + + + + + + + + + + + + + + +
Total CBM{{ $shipment->total_cbm }}
Total KG{{ $shipment->total_kg }}
Total TTL KG{{ $shipment->total_ttl_kg }}
+
+
- - ← Back to Shipments +
+
+ + Total Amount: + ₹{{ number_format($shipment->total_amount, 2) }} +
+
+ +
+ + + Back to Shipments -
-@endsection + + + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 3489b9f..f79b3ce 100644 --- a/routes/web.php +++ b/routes/web.php @@ -183,11 +183,21 @@ Route::prefix('admin') // Shipment Delete Route::delete('/shipments/{id}', [ShipmentController::class, 'destroy']) ->name('admin.shipments.destroy'); + + Route::get('/shipment/dummy/{id}', [ShipmentController::class, 'dummy']) + ->name('admin.shipments.dummy'); + // web.php + Route::delete('/shipments/{shipment}/orders/{order}', + [ShipmentController::class, 'removeOrder'] + )->name('admin.shipments.removeOrder'); + + Route::post('/shipments/{shipment}/add-orders', + [ShipmentController::class, 'addOrders'] + )->name('admin.shipments.addOrders'); Route::get('/shipment/dummy/{id}', [ShipmentController::class, 'dummy']) ->name('admin.shipments.dummy'); - // --------------------------- // INVOICES // ---------------------------