From 2614b0156b5c006ca6f60fee7f781871afd69caf Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 19 Jan 2022 11:43:28 +0800 Subject: [PATCH] fix calculate upah akru --- app/Http/Controllers/GadaiController.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index ccb4722..e1a1edd 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3471,21 +3471,27 @@ class GadaiController extends Controller $akru_cawangan_masih_aktif = $akru_cawangan_masih_aktif + $upah; } - $tebus_all = Gadai::on($cawangan['mysql'])->join('tebus','tebus.norujukan','=','gadai.norujukan')->where([['gadai.t_gadai','<=',$request->date_end],['gadai.t_gadai','>=',$request->date_start]])->get(); + $tebus_all = Gadai::on($cawangan['mysql'])->join('tebus','tebus.norujukan','=','gadai.norujukan')->where([['gadai.t_gadai','<=',$request->date_end],['gadai.t_gadai','>=',$request->date_start]])->orWhere('tebus.t_tebus','>=',$request->date_start)->get(); // dd($tebus_all[0]); $akru_cawangan_tebus = 0; foreach($tebus_all as $index_tebus=>$tebus){ // dd($tebus['n']); if($tebus['t_tebus'] > $request->date_end){ - $date_compare = Carbon::parse($request->date_end. ' 00:00:00'); + $date_compare_end = Carbon::parse($request->date_end. ' 00:00:00'); }else{ - $date_compare = Carbon::parse($tebus['t_tebus']. ' 00:00:00'); + $date_compare_end = Carbon::parse($tebus['t_tebus']. ' 00:00:00'); } - $tarikh_gadai = Carbon::parse($tebus['t_gadai']. ' 00:00:00'); + if($tebus['t_gadai'] < $request->date_start){ + $date_compare_start = Carbon::parse($request->date_start. ' 00:00:00'); + }else{ + $date_compare_start = Carbon::parse($tebus['t_gadai']. ' 00:00:00'); + } - $diff_gadai = date_diff($tarikh_gadai,$date_compare); + // $tarikh_gadai = Carbon::parse($tebus['t_gadai']. ' 00:00:00'); + + $diff_gadai = date_diff($date_compare_start,$date_compare_end); $year_gadai = $diff_gadai->format("%y") * 12; $month_gadai = $diff_gadai->format("%m"); $days_gadai = $diff_gadai->format("%d");