|
|
|
|
@ -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) {
|
|
|
|
|
|