diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index aad90b7..4464702 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -971,9 +971,9 @@ class OrdersController extends CommonController * ) * ) */ - public function checkoutOrder($order_id, Request $request) + public function checkoutOrder($id, Request $request) { - $order = Orders::with("customer")->find($order_id); + $order = Orders::with("customer")->find($id); if ($order->status != Orders::STATUS_ONGOING) { return response()->json([ "errorcode" => 30000, @@ -981,7 +981,7 @@ class OrdersController extends CommonController ]); } - $order_items = OrderItems::where("order_id", $order_id) + $order_items = OrderItems::where("order_id", $id) ->orderBy("service_date", "asc") ->get(); $last_paid_order_item = $order_items->filter(function ($item) { diff --git a/routes/web.php b/routes/web.php index 63bb2d2..11474a8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -153,6 +153,7 @@ Route::group(["namespace" => "Manager", "prefix" => "manager"], function () { Route::post('create-patient', 'OrdersController@createPatient'); Route::post('create-order', 'OrdersController@createOrder'); Route::post('update-order/{id}', 'OrdersController@updateOrder'); + Route::post('checkout-order/{id}', 'OrdersController@checkoutOrder'); Route::post('update-order-items', 'OrdersController@updateOrderItems'); Route::post('checkout-order-items/{order_id}', 'OrdersController@checkoutOrderItems'); Route::post('scan-pay/{order_id}', 'OrdersController@scanPay');