tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

bugs fix callback

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-05-22 14:17:01 +07:00
parent ebd880d9c8
commit 8ae6e44680
4 changed files with 110 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Modules/Linksehat/Http/Controllers/Api/ChatController.php
View File

@@ -185,31 +185,55 @@ class ChatController extends Controller
$consultationStart = $livechat->start_date;
$consultationEnd = $livechat->end_date;
$work = '';
$weight = '-';
$height = '-';
$address = '';
$maritalStatus = '';
} else {
// Get nama pasien
$user = User::where('nID', $channel->member_id)->with('detail')->first();
$name = $user->sFirstName . ' ' . $user->sLastName;
$urlAvatarDefault = $user->detail->nIDJenisKelamin == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/female-avatar.png';
$avatar = $user->detail->sImage ?? $urlAvatarDefault;
$gender = DB::connection('oldlms')->table('tm_jenis_kelamin')->where('nID', $user->detail->nIDJenisKelamin)->first('sJenisKelamin');
if ($gender){
$gender = $gender->sJenisKelamin;
$gender = null;
if ($user->detail) {
$urlAvatarDefault = $user->detail->nIDJenisKelamin == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/female-avatar.png';
$avatar = $user->detail->sImage ?? $urlAvatarDefault;
$gender = DB::connection('oldlms')->table('tm_jenis_kelamin')->where('nID', $user->detail->nIDJenisKelamin)->first('sJenisKelamin');
$age = Helper::calculateAge($user->detail->dTanggalLahir);
if ($gender){
$gender = $gender->sJenisKelamin;
}
$work = DB::connection('oldlms')->table('tm_pekerjaan')->where('nID', $user->detail->nIDPekerjaan)->first('sPekerjaan');
if($work){
$work = $work->sPekerjaan;
}
$maritalStatus = DB::connection('oldlms')->table('tm_status_pernikahan')->where('nID', $user->detail->sMartialStatus)->first('sStatusPernikahan');
if($maritalStatus){
$maritalStatus = $maritalStatus->sStatusPernikahan;
}
$weight = $user->detail->sWeight;
$height = $user->detail->sWeight;
} else {
$avatar = 'https://linksehat.dev/assets/img/users/male-avatar.png';
$age = '-';
$work = '-';
$maritalStatus = '-';
$weight = '-';
$height = '-';
}
$age = Helper::calculateAge($user->detail->dTanggalLahir);
$question = $livechat->descriptions;
$consultationStart = $livechat->start_date;
$consultationEnd = $livechat->end_date;
$work = DB::connection('oldlms')->table('tm_pekerjaan')->where('nID', $user->detail->nIDPekerjaan)->first('sPekerjaan');
if($work){
$work = $work->sPekerjaan;
}
$address = DB::connection('oldlms')->table('tm_users_address')->where('nIDUser', $user->nID)->first('sAlamat');
if($address){
$address = $address->sAlamat;
}
}
// Ini Untul Chat
@@ -240,12 +264,22 @@ class ChatController extends Controller
'header' => $name,
'avatar' => $avatar,
'gender' => $gender,
'marital_status' => $maritalStatus,
'age' => $age,
'weight' => $weight,
'height' => $height,
'question' => $question,
'diseases' => [],
'medications' => [],
'allergy' => [],
'family_history' => [],
'start' => $consultationStart,
'end' => $consultationEnd,
'work' => $work,
'address' => $address,
'consultation_id' => $livechat->id,
'consultation_status' => Helper::getStatusLivechat($livechat->status),
'health_sertificate' => $healthSertificate,
'chat' => $data->items(),
'pagination' => [
'total' => $data->total(),
@@ -256,8 +290,7 @@ class ChatController extends Controller
'to' => $data->lastItem(),
],
'summary' => $consultationSummary,
'livechat_id' => $livechat->id,
'health_sertificate' => $healthSertificate,
]
]);
}

9
Modules/Linksehat/Http/Controllers/Api/Doctor/ChatDoctorController.php
View File

@@ -44,8 +44,12 @@ class ChatDoctorController extends Controller
if($chat) {
foreach($chat as $c){
$patient = UserLMS::where('nID',$c->patient_id)->with('detail')->first();
$urlAvatarDefault = $patient->detail->nIDJenisKelamin == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/female-avatar.png';
$avatarMember = $patient->detail->sImage ?? $urlAvatarDefault;
if ( $patient->detail) {
$urlAvatarDefault = $patient->detail->nIDJenisKelamin == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/female-avatar.png';
$avatarMember = $patient->detail->sImage ?? $urlAvatarDefault;
} else {
$avatarMember = 'https://linksehat.dev/assets/img/users/male-avatar.png';
}
$arr['id'] = $c->id;
$arr['patient_id'] = $patient->nID;
$arr['avatar'] = $avatarMember;
@@ -166,7 +170,6 @@ class ChatDoctorController extends Controller
public function summaryChat(Request $request)
{
$livechat = Livechat::find($request->id);
if ($livechat) {
// Memperbarui atribut model

3
Modules/Linksehat/Http/Controllers/Api/DuitkuController.php
View File

@@ -291,10 +291,9 @@ class DuitkuController extends Controller
// Update status pembayaran
$livechat->payment_method = $notif->paymentCode;
$livechat->status = 5; // success payment
$livechat->save();
// Update start chat
$livechat->start_date = date('Y-m-d H:i:s');
$livechat->save();
// Buat dan simpan data channel ke dalam tabel
$channel = Channel::updateOrCreate([
'name' => $livechat->patient_id .'_' . $request->doctor_id,

29
app/Helpers/Helper.php
View File

@@ -498,5 +498,34 @@ class Helper
return $start->diffInDays($end) + 1;
}
public static function getStatusLivechat($status) {
switch ($status) {
case 1:
return 'Requested'; // Clearer status name
break;
case 2:
return 'Accepted';
break;
case 3:
return 'Declined';
break;
case 4:
return 'Waiting Payment';
break;
case 5:
return 'Payment Successful';
break;
case 6:
return 'Chat Ended';
break;
case 7:
return 'Payment Failed';
break;
default:
return 'Unknown Status'; // Handle unknown statuses
break;
}
}
}