|
@@ -562,6 +562,7 @@ class DoctorController extends AuthController
|
|
$finds = Docter::select(['is_chat', 'is_phone', 'is_appoint'])->where('id', $doctor_id)->first();
|
|
$finds = Docter::select(['is_chat', 'is_phone', 'is_appoint'])->where('id', $doctor_id)->first();
|
|
$flag = false;
|
|
$flag = false;
|
|
|
|
|
|
|
|
+
|
|
Db::beginTransaction();
|
|
Db::beginTransaction();
|
|
try {
|
|
try {
|
|
if ($finds['is_appoint'] == 0) {
|
|
if ($finds['is_appoint'] == 0) {
|
|
@@ -633,6 +634,7 @@ class DoctorController extends AuthController
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
if($times_data&&$setting_data){
|
|
if($times_data&&$setting_data){
|
|
foreach ($times_data as $k => $v) {
|
|
foreach ($times_data as $k => $v) {
|
|
TimePeriod::insert($v);
|
|
TimePeriod::insert($v);
|
|
@@ -1287,19 +1289,21 @@ class DoctorController extends AuthController
|
|
$fuw_order = Order::with('orderPack')->where($ws)->orderBy('created_at', 'desc')->get();
|
|
$fuw_order = Order::with('orderPack')->where($ws)->orderBy('created_at', 'desc')->get();
|
|
if ($fuw_order) {
|
|
if ($fuw_order) {
|
|
$fuw_order = $fuw_order->toArray();
|
|
$fuw_order = $fuw_order->toArray();
|
|
|
|
+// var_dump($fuw_order);
|
|
|
|
|
|
foreach ($fuw_order as $kk => $vv) {
|
|
foreach ($fuw_order as $kk => $vv) {
|
|
$fuwArr[$kk]['order_id'] = $vv['id'];
|
|
$fuwArr[$kk]['order_id'] = $vv['id'];
|
|
if ($vv['order_pack']) {
|
|
if ($vv['order_pack']) {
|
|
- foreach ($vv['order_pack'] as $k => $v) {
|
|
|
|
- $fuwArr[$kk]['id'] = $v['id'];
|
|
|
|
- $fuwArr[$kk]['pack_name'] = $v['pack_name'];
|
|
|
|
- $fuwArr[$kk]['pack_intro'] = $v['pack_intro'];
|
|
|
|
- $fuwArr[$kk]['pack_price'] = $v['pack_price'];
|
|
|
|
- $fuwArr[$kk]['effective_days'] = $v['effective_days'];
|
|
|
|
- $fuwArr[$kk]['start_time'] = date('Y-m-d,H:i', $v['start_time']);
|
|
|
|
- $fuwArr[$kk]['end_time'] = date('Y-m-d,H:i', $v['end_time']);
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+// foreach ($vv['order_pack'] as $k => $v) {
|
|
|
|
+ $fuwArr[$kk]['id'] = $vv['order_pack']['id'];
|
|
|
|
+ $fuwArr[$kk]['pack_name'] = $vv['order_pack']['pack_name'];
|
|
|
|
+ $fuwArr[$kk]['pack_intro'] = $vv['order_pack']['pack_intro'];
|
|
|
|
+ $fuwArr[$kk]['pack_price'] = $vv['order_pack']['pack_price'];
|
|
|
|
+ $fuwArr[$kk]['effective_days'] = $vv['order_pack']['effective_days'];
|
|
|
|
+ $fuwArr[$kk]['start_time'] = date('Y-m-d,H:i', $vv['order_pack']['start_time']);
|
|
|
|
+ $fuwArr[$kk]['end_time'] = date('Y-m-d,H:i', $vv['order_pack']['end_time']);
|
|
|
|
+// }
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|