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

Merge branch 'staging' of http://itcorp.primaya.id:3000/rajif/aso into staging

Browse Source
This commit is contained in:
Lasteinsa
2023-08-31 13:45:58 +07:00
parent 96ee80f681 18d46f09c7
commit 5db9121a16
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Internal/Http/Controllers/Api/LivechatController.php
View File

@@ -22,15 +22,8 @@ class LivechatController extends Controller
$livechat = Livechat::with('doctor.user', 'doctor.speciality', 'appointment.appointmentDetail', 'healthCare') $livechat = Livechat::with('doctor.user', 'doctor.speciality', 'appointment.appointmentDetail', 'healthCare')
->where('nIDAppointment', '!=', null)->where('nIDAppointment', '!=', ''); ->where('nIDAppointment', '!=', null)->where('nIDAppointment', '!=', '');
// dd($livechat);
if ($startDate){
$livechat->where('dStartTime', '>=', $startDate);
}
if ($endDate){ $livechat = $livechat->latest()->paginate(15);
$livechat->where('dStartTime', '<=', $endDate);
}
$livechat->latest()->paginate(15);
return response()->json(Helper::paginateResources(LivechatResource::collection($livechat))); return response()->json(Helper::paginateResources(LivechatResource::collection($livechat)));
} }

2
Modules/Internal/Services/CorporateService.php
View File

@@ -229,7 +229,7 @@ class CorporateService
public function handleBenefitRow(Corporate $corporate, $row) public function handleBenefitRow(Corporate $corporate, $row)
{ {
try { try {
// $row['limit_free_tc'] = 0; $row['limit_free_tc'] = 0;
$benefit_data = $row; $benefit_data = $row;
$this->validateBenefitRow($benefit_data, $corporate->id); $this->validateBenefitRow($benefit_data, $corporate->id);
$benefit_data["corporate_id"] = $corporate->id; $benefit_data["corporate_id"] = $corporate->id;