Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Commit

Permalink
edit order dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
FemiNoviaLina committed May 25, 2022
1 parent 06eaea8 commit 8623a44
Show file tree
Hide file tree
Showing 12 changed files with 744 additions and 262 deletions.
18 changes: 18 additions & 0 deletions app/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,22 @@ public function addVehicle($type) {

return redirect()->route('vehicles-dashboard-'.$type);
}

public function getOrderDetails($id) {
$orders = Order::join('users', 'orders.user_id', '=', 'users.id')
->join('vehicles', 'orders.vehicle_id', '=', 'vehicles.id')
->select('orders.id', 'orders.pickup_date', 'orders.pickup_time', 'orders.pickup_address',
'orders.dropoff_date', 'orders.dropoff_time', 'orders.dropoff_address', 'orders.phone_1',
'orders.phone_2', 'orders.address_id', 'orders.address_mlg', 'orders.note', 'orders.order_status',
'orders.total_price', 'orders.id_card', 'orders.id_card_2', 'orders.driver_license',
'orders.payment_method', 'orders.created_at', 'orders.transaction_id', 'orders.payment_expiry_time',
'users.id as user_id', 'users.name as user_name', 'users.email',
'vehicles.id as vehicles_id', 'vehicles.name as vehicle_name', 'vehicles.type',
'vehicles.price', 'vehicles.available_unit', 'vehicles.photo', 'vehicles.fuel', 'vehicles.transmission',
'vehicles.cc', 'vehicles.year')
->where('orders.id', '=', $id)
->get();

return response()->json($orders);
}
}
32 changes: 30 additions & 2 deletions app/Http/Controllers/RentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,27 @@ public function getRentMotors()
return view('vehicles-list', ['vehicles' => session('vehicles'), 'pickup_date' => session('pickup_date'), 'dropoff_date' => session('dropoff_date'), 'type' => 'Motor', 'transmission' => session('transmission'), 'brand' => session('brand')]);
}

public function rentVehicle($type, $id)
public function rentVehicle($type, $id, Request $request)
{
$request = request()->input();

// $request = $request->validate([
// 'pickup_date' => 'required|before_or_equal:dropoff_date|after_or_equal:today',
// 'pickup_time' => 'required',
// 'dropoff_date' => 'required|after_or_equal:pickup_date',
// 'dropoff_time' => 'required',
// 'vehicle_id' => 'required',
// 'user_id' => 'required',
// 'pickup_address' => 'required',
// 'dropoff_address' => 'required',
// 'phone_1' => 'required',
// 'phone_2' => 'required',
// 'address_id' => 'required',
// 'address_mlg' => 'required',
// 'id_card' => 'required|image|mimes:jpeg,png,jpg,pdf|max:2048',
// 'id_card_2' => 'required|image|mimes:jpeg,png,jpg,pdf|max:2048',
// 'driver_license' => 'required|image|mimes:jpeg,png,jpg,pdf|max:2048',
// 'note' => 'nullable',
// ]);

$vehicle = Vehicle::find($id);

Expand Down Expand Up @@ -119,6 +137,16 @@ public function rentVehicle($type, $id)

public function getUserOrders()
{
// $orders = Order::join('vehicles', 'orders.vehicle_id', '=', 'vehicles.id')
// ->where('user_id', '=', auth()->user()->id)
// ->where('order_status', 'IN', ['PENDING', 'WAITING_FOR_PAYMENT'])
// ->where('pickup_date', '<', date('Y-m-d'))
// ->orWhere(function($query) {
// $query->where('pickup_date', '=', date('Y-m-d'))
// ->where('pickup_time', '<', date('H:i:s'));
// })
// ->update(['order_status' => 'CANCELED']);

$orders = Order::join('vehicles', 'orders.vehicle_id', '=', 'vehicles.id')
->select("orders.id", "orders.order_status", "orders.created_at", "vehicles.name")
->where('user_id', '=', auth()->user()->id)
Expand Down
Loading

0 comments on commit 8623a44

Please sign in to comment.