kent-logistics/Kent-logistics-Laravel
SHA256
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

status update

Browse Source
This commit is contained in:
Abhishek Mali
2025-12-23 00:36:15 +05:30
parent 1885d3beef
commit e0a8a5c69c
8 changed files with 332 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/Http/Controllers/Admin/AdminOrderController.php
View File

@@ -36,43 +36,43 @@ class AdminOrderController extends Controller
return view('admin.orders_create', compact('markList'));
}
public function store(Request $request)
{
$data = $request->validate([
'mark_no' => 'required|string',
'origin' => 'nullable|string',
'destination' => 'nullable|string',
'ctn' => 'nullable|numeric',
'qty' => 'nullable|numeric',
'ttl_qty' => 'nullable|numeric',
'ttl_amount' => 'nullable|numeric',
'cbm' => 'nullable|numeric',
'ttl_cbm' => 'nullable|numeric',
'kg' => 'nullable|numeric',
'ttl_kg' => 'nullable|numeric',
]);
// public function store(Request $request)
// {
// $data = $request->validate([
// 'mark_no' => 'required|string',
// 'origin' => 'nullable|string',
// 'destination' => 'nullable|string',
// 'ctn' => 'nullable|numeric',
// 'qty' => 'nullable|numeric',
// 'ttl_qty' => 'nullable|numeric',
// 'ttl_amount' => 'nullable|numeric',
// 'cbm' => 'nullable|numeric',
// 'ttl_cbm' => 'nullable|numeric',
// 'kg' => 'nullable|numeric',
// 'ttl_kg' => 'nullable|numeric',
// ]);
$order = Order::create([
'order_id' => $this->generateOrderId(),
'mark_no' => $data['mark_no'],
'origin' => $data['origin'] ?? null,
'destination'=> $data['destination'] ?? null,
'ctn' => $data['ctn'] ?? 0,
'qty' => $data['qty'] ?? 0,
'ttl_qty' => $data['ttl_qty'] ?? 0,
'ttl_amount' => $data['ttl_amount'] ?? 0,
'cbm' => $data['cbm'] ?? 0,
'ttl_cbm' => $data['ttl_cbm'] ?? 0,
'kg' => $data['kg'] ?? 0,
'ttl_kg' => $data['ttl_kg'] ?? 0,
'status' => 'pending',
]);
// $order = Order::create([
// 'order_id' => $this->generateOrderId(),
// 'mark_no' => $data['mark_no'],
// 'origin' => $data['origin'] ?? null,
// 'destination'=> $data['destination'] ?? null,
// 'ctn' => $data['ctn'] ?? 0,
// 'qty' => $data['qty'] ?? 0,
// 'ttl_qty' => $data['ttl_qty'] ?? 0,
// 'ttl_amount' => $data['ttl_amount'] ?? 0,
// 'cbm' => $data['cbm'] ?? 0,
// 'ttl_cbm' => $data['ttl_cbm'] ?? 0,
// 'kg' => $data['kg'] ?? 0,
// 'ttl_kg' => $data['ttl_kg'] ?? 0,
// 'status' => 'pending',
// ]);
$this->createInvoice($order);
// $this->createInvoice($order);
return redirect()->route('admin.orders.show', $order->id)
->with('success', 'Order created successfully.');
}
// return redirect()->route('admin.orders.show', $order->id)
// ->with('success', 'Order created successfully.');
// }
/* ---------------------------
* SHOW / POPUP
@@ -580,7 +580,7 @@ class AdminOrderController extends Controller
'ttl_cbm' => $total_ttl_cbm,
'kg' => $total_kg,
'ttl_kg' => $total_ttl_kg,
'status' => 'pending',
'status' => 'order_placed',
]);
// 6) order items

96
app/Http/Controllers/Admin/ShipmentController.php
View File

@@ -20,7 +20,11 @@ class ShipmentController extends Controller
$usedOrderIds = ShipmentItem::pluck('order_id')->toArray();
// 2) Load available orders (not used in any shipment)
$availableOrders = Order::whereNotIn('id', $usedOrderIds)->get();
$availableOrders = Order::whereNotIn('id', $usedOrderIds)
->where('status', '!=', 'order_placed')
->get();
// 3) Load all shipments for listing
$shipments = Shipment::latest()->get();
@@ -65,6 +69,16 @@ class ShipmentController extends Controller
// CALCULATE TOTALS
// -----------------------------
$orders = Order::whereIn('id', $request->order_ids)->get();
foreach ($orders as $order) {
if ($order->status === 'order_placed') {
return back()->with(
'error',
"Order {$order->order_id} is not ready for shipment"
);
}
}
$total_ctn = $orders->sum('ctn');
$total_qty = $orders->sum('qty');
@@ -82,7 +96,7 @@ class ShipmentController extends Controller
'shipment_id' => $newShipmentId,
'origin' => $request->origin,
'destination' => $request->destination,
'status' => Shipment::STATUS_PENDING,
'status' => Shipment::STATUS_SHIPMENT_READY,
'shipment_date' => $request->shipment_date,
'total_ctn' => $total_ctn,
@@ -135,29 +149,35 @@ class ShipmentController extends Controller
* Update Shipment status from action button
*/
public function updateStatus(Request $request)
{
$request->validate([
'shipment_id' => 'required|exists:shipments,id',
'status' => 'required|string'
]);
{
$request->validate([
'shipment_id' => 'required|exists:shipments,id',
'status' => 'required|string'
]);
// 1) Update shipment status
$shipment = Shipment::findOrFail($request->shipment_id);
$shipment->status = $request->status;
$shipment->save();
$shipment = Shipment::findOrFail($request->shipment_id);
$shipment->status = $request->status;
$shipment->save();
// 2) Update ALL related orders' status
foreach ($shipment->orders as $order) {
$order->status = $shipment->status; // status is string: pending, in_transit, dispatched, delivered
$order->save();
// ✅ Sync shipment status to orders ONLY after shipment exists
foreach ($shipment->orders as $order) {
// Prevent rollback or overwrite
if ($order->status === 'delivered') {
continue;
}
return redirect()->back()->with(
'success',
"Shipment status updated to {$shipment->statusLabel()} and related orders updated."
);
$order->status = $shipment->status;
$order->save();
}
return redirect()->back()->with(
'success',
"Shipment status updated to {$shipment->statusLabel()}."
);
}
/**
* Update shipment details
*/
@@ -266,11 +286,23 @@ public function addOrders(Request $request, Shipment $shipment)
'order_ids' => 'required|array|min:1',
]);
// फक्त न वापरलेले orders घ्या
$orders = Order::whereIn('id', $request->order_ids)->get();
foreach ($orders as $order) {
// pivot मध्ये insert
if ($order->status === 'order_placed') {
return back()->with(
'error',
"Order {$order->order_id} is not ready for shipment"
);
}
// Prevent duplicates
if (ShipmentItem::where('order_id', $order->id)->exists()) {
continue;
}
ShipmentItem::create([
'shipment_id' => $shipment->id,
'order_id' => $order->id,
@@ -282,23 +314,25 @@ public function addOrders(Request $request, Shipment $shipment)
]);
}
// totals
// Recalculate 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();
$shipment->update([
'total_ctn' => $allOrders->sum('ctn'),
'total_qty' => $allOrders->sum('qty'),
'total_ttl_qty' => $allOrders->sum('ttl_qty'),
'total_cbm' => $allOrders->sum('cbm'),
'total_ttl_cbm' => $allOrders->sum('ttl_cbm'),
'total_kg' => $allOrders->sum('kg'),
'total_ttl_kg' => $allOrders->sum('ttl_kg'),
'total_amount' => $allOrders->sum('ttl_amount'),
]);
return redirect()
->route('admin.shipments.dummy', $shipment->id)
->with('success', 'Orders added to shipment successfully.');
}
}

38
app/Http/Controllers/user/UserOrderController.php
View File

@@ -289,6 +289,44 @@ public function invoiceDetails($invoice_id)
]);
}
public function confirmOrder($order_id)
{
$user = JWTAuth::parseToken()->authenticate();
if (! $user) {
return response()->json([
'success' => false,
'message' => 'Unauthorized'
], 401);
}
$order = $user->orders()
->where('order_id', $order_id)
->first();
if (! $order) {
return response()->json([
'success' => false,
'message' => 'Order not found'
], 404);
}
// 🚫 Only allow confirm from order_placed
if ($order->status !== 'order_placed') {
return response()->json([
'success' => false,
'message' => 'Order cannot be confirmed'
], 422);
}
$order->status = 'order_confirmed';
$order->save();
return response()->json([
'success' => true,
'message' => 'Order confirmed successfully'
]);
}