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

This commit is contained in:
Lasteinsa
2023-08-31 13:45:58 +07:00
2 changed files with 3 additions and 10 deletions

View File

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

View File

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