weizong song 5 years ago
parent b988088b01
commit 06ef92538c

@ -13,6 +13,7 @@ use App\Models\Balance;
use App\Models\Bed;
use App\Models\OrderItems;
use App\Models\Orders;
use App\Models\Paramedic;
use App\Models\ParamedicLevel;
use App\Models\Patient;
use App\Models\Product;
@ -191,21 +192,28 @@ class OrdersController extends CommonController
$model = $this->_getOrderModel();
$order = $model->with([
"orderItems" => function ($query) {
$query->orderBy("service_date", "desc");
$query->orderBy("id", "desc");
},
"recharges",
"refunds"
])->find($id);
$paramedic_items = $order->orderItems->groupBy("paramedic_id");
$paramedic_service_days = [];
foreach ($paramedic_items as $k => $paramedic) {
}
$order = $order->refreshTotal();
$order->balance = $order->customer->balance;
$paramedic_items = $order->orderItems->groupBy("paramedic_id");
$group_by_paramedic = [];
foreach ($paramedic_items as $k => $items) {
$items = $items->sortBy("id");
$paramedic = Paramedic::find($k);
$group_by_paramedic[] = [
"paramedic_id" => $k,
"paramedic_name" => $paramedic->name,
"days" => $items->count(),
"from_date" => $items->first()->service_date,
"to_date" => $items->last()->service_date,
];
}
$order->group_by_paramedic = collect($group_by_paramedic);
return response()->json($order->toArray());
}
@ -981,6 +989,9 @@ class OrdersController extends CommonController
*/
public function checkoutOrder($id, Request $request)
{
dump(Carbon::parse("2021-04-18")->to());
dd(Carbon::parse("2021-04-18")->greaterThan("2021-04-18 23:59:59"));
$order = Orders::with("customer")->find($id);
if ($order->status != Orders::STATUS_ONGOING) {
return response()->json([

Loading…
Cancel
Save