Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -124,7 +124,7 @@ class LivechatController extends Controller
|
|||||||
|
|
||||||
if ($liveChat->doctor->user->detail !== null) {
|
if ($liveChat->doctor->user->detail !== null) {
|
||||||
if ($liveChat->doctor->user->detail->sTitlePrefix !== null) {
|
if ($liveChat->doctor->user->detail->sTitlePrefix !== null) {
|
||||||
$fullNameDoctor .= $liveChat->doctor->user->detail->sTitlePrefix . ' ';
|
$fullNameDoctor .= $liveChat->doctor->user->detail->sTitlePrefix . '. ';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($liveChat->doctor->user->full_name !== null) {
|
if ($liveChat->doctor->user->full_name !== null) {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class LivechatResource extends JsonResource
|
|||||||
{
|
{
|
||||||
$livechat = [
|
$livechat = [
|
||||||
'id' => $this->nID,
|
'id' => $this->nID,
|
||||||
'doctor_name' => isset($this->doctor->user->sFirstName) ? $this->doctor->user->detail->sTitlePrefix . ' ' . $this->doctor->user->sFirstName . ' ' . $this->doctor->user->sLastName . ' ' . $this->doctor->user->detail->sTitleSuffix : null,
|
'doctor_name' => isset($this->doctor->user->sFirstName) ? $this->doctor->user->detail->sTitlePrefix . '. ' . $this->doctor->user->sFirstName . ' ' . $this->doctor->user->sLastName . ' ' . $this->doctor->user->detail->sTitleSuffix : null,
|
||||||
'pasien_name' => isset($this->user->sFirstName) ? $this->user->sFirstName . ' ' . $this->user->sLastName : null,
|
'pasien_name' => isset($this->user->sFirstName) ? $this->user->sFirstName . ' ' . $this->user->sLastName : null,
|
||||||
'pasien_phone' => isset($this->user->sPhone) ? $this->user->sPhone : '-',
|
'pasien_phone' => isset($this->user->sPhone) ? $this->user->sPhone : '-',
|
||||||
'pasien_email' => isset($this->user->sEmail) ? $this->user->sEmail : '-',
|
'pasien_email' => isset($this->user->sEmail) ? $this->user->sEmail : '-',
|
||||||
|
|||||||
Reference in New Issue
Block a user