diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index ab8d9bd..d6f3d01 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -4,6 +4,7 @@ @section('content')
@@ -161,211 +390,19 @@ body, .container-fluid { background: #f4f7fc; }
Order Management -
- -
-
- -
New Order Form
-
- - {{-- FORM START --}} -
- @csrf - -
- - {{-- MARK NO --}} -
- - - @if(session('temp_order_items')) - {{-- Mark No locked, cannot be changed --}} - - - {{-- Hidden field to submit mark_no --}} - - - @else - {{-- Normal selectable dropdown --}} - - @endif -
- - - {{-- ORIGIN --}} -
- - -
- - {{-- DESTINATION --}} -
- - -
- -
- -
- - {{-- ITEM INPUTS --}} -
Add Item
- -
-
- - -
- -
-
-
- -
- -
-
- -
-
- -
-
- -
- -
- -
-
- -
- {{-- FORM END --}} - - {{-- RESET ORDER BUTTON --}} - @if(session('temp_order_items')) -
-
- @csrf - -
-
- @endif - - {{-- TEMPORARY ITEMS TABLE --}} - @if(session('temp_order_items') && count(session('temp_order_items')) > 0) - -
- -
Temporary Items
- - - - - - - - - - - - - - - - - - - - - - - @foreach(session('temp_order_items') as $index => $item) - - - - - - - - - - - - - - - - - - @endforeach - -
#DescriptionCTNQTYTTL/QTYUnitPriceTTL AmountCBMTTL CBMKGTTL KGShop NoRemove
{{ $index + 1 }}{{ $item['description'] }}{{ $item['ctn'] }}{{ $item['qty'] }}{{ $item['ttl_qty'] }}{{ $item['unit'] }}{{ $item['price'] }}{{ $item['ttl_amount'] }}{{ $item['cbm'] }}{{ $item['ttl_cbm'] }}{{ $item['kg'] }}{{ $item['ttl_kg'] }}{{ $item['shop_no'] }} -
- @csrf - - -
-
- -
-
- @csrf - - - - - -
-
- - @endif - -
-
-
-
Recent Orders
-
- @@ -386,86 +423,306 @@ body, .container-fluid { background: #f4f7fc; } - @forelse($orders as $order) - - - - - - - - @empty @endforelse -
#Action
{{ $order->id }} {{ $order->order_id }} {{ $order->mark_no }} {{ $order->origin }} {{ $order->destination }}{{ $order->ctn }} {{ $order->qty }} {{ $order->ttl_qty }} ₹{{ number_format($order->ttl_amount, 2) }}{{ $order->cbm }} {{ $order->ttl_cbm }} {{ $order->kg }} {{ $order->ttl_kg }} {{ ucfirst($order->status) }} {{ $order->created_at->format('d-m-Y') }} View
No orders found
-
-
-{{-- JS: LOCK MARK NO + LOAD ORIGIN/DESTINATION --}} + +
+
+
+
Create New Order
+ +
+
+ @if(session('success')) + + @endif + + +
+ @csrf +
+ {{-- MARK NO --}} +
+ + @if(session('temp_order_items')) + + + @else + + @endif +
+ + {{-- ORIGIN --}} +
+ + +
+ + {{-- DESTINATION --}} +
+ + +
+
+ +
+ + {{-- ITEM INPUTS --}} +
Add Item
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ + {{-- RESET ORDER BUTTON --}} + @if(session('temp_order_items')) +
+
+ @csrf + +
+
+ @endif + + {{-- TEMPORARY ITEMS TABLE --}} + @if(session('temp_order_items') && count(session('temp_order_items')) > 0) +
+
Temporary Items ({{ count(session('temp_order_items')) }} items)
+
+ + + + + + + + + + + + + + + + + + + + + @foreach(session('temp_order_items') as $index => $item) + + + + + + + + + + + + + + + + + @endforeach + +
#DescriptionCTNQTYTTL/QTYUnitPriceTTL AmountCBMTTL CBMKGTTL KGShop NoRemove
{{ $index + 1 }}{{ $item['description'] }}{{ $item['ctn'] }}{{ $item['qty'] }}{{ $item['ttl_qty'] }}{{ $item['unit'] }}{{ $item['price'] }}{{ $item['ttl_amount'] }}{{ $item['cbm'] }}{{ $item['ttl_cbm'] }}{{ $item['kg'] }}{{ $item['ttl_kg'] }}{{ $item['shop_no'] }} +
+ @csrf + + +
+
+
+
+
+ @csrf + + + + +
+
+ @endif +
+
+
+ -{{-- AUTO OPEN FORM AFTER REDIRECT --}} - - -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/admin/layouts/app.blade.php b/resources/views/admin/layouts/app.blade.php index 24a0dbd..c557b5d 100644 --- a/resources/views/admin/layouts/app.blade.php +++ b/resources/views/admin/layouts/app.blade.php @@ -56,15 +56,16 @@ align-items: center; color: #2b5cb6 !important; text-decoration: none; - padding: 10px 12px; + padding: 11px 13px; font-size: 0.97rem; border-radius: 12px; - margin: 6px 6px 0 6px; + margin: 10px 10px 0 10px; font-weight: 500; position: relative; overflow: hidden; transition: all 0.25s ease; z-index: 0; + } /* Background Animation */ diff --git a/resources/views/admin/orders_show.blade.php b/resources/views/admin/orders_show.blade.php index 08806dd..e9c1d8e 100644 --- a/resources/views/admin/orders_show.blade.php +++ b/resources/views/admin/orders_show.blade.php @@ -10,7 +10,7 @@
-

Order Details

+

Order Details

Detailed view of this shipment order
@@ -147,3 +147,4 @@
@endsection + diff --git a/routes/web.php b/routes/web.php index abdae90..565bf32 100644 --- a/routes/web.php +++ b/routes/web.php @@ -39,7 +39,9 @@ Route::prefix('admin')->middleware('auth:admin')->group(function () { Route::get('/staff', fn() => view('admin.staff'))->name('admin.staff'); Route::get('/account', fn() => view('admin.account'))->name('admin.account'); Route::get('/profile', fn() => view('admin.profile'))->name('admin.profile'); - + Route::get('/admin/orders/{id}/details', [OrderController::class, 'getOrderDetails'])->name('admin.orders.details'); + + // ✅ User Requests Controller Routes @@ -78,6 +80,7 @@ Route::prefix('admin')->middleware('auth:admin')->group(function () { +<<<<<<< HEAD Route::get('/shipments', [ShipmentController::class, 'index']) ->name('admin.shipments'); @@ -89,5 +92,7 @@ Route::prefix('admin')->middleware('auth:admin')->group(function () { Route::get('/shipments/{id}', [ShipmentController::class, 'show']) ->name('admin.shipments.show'); +======= +>>>>>>> 2c5d19779b747ce1d7f0bc8978d8c417b374849f3b9023bf30ac502d14d9650d });