KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix calculate upah akru

Browse Source
This commit is contained in:
afiq
2022-01-19 11:43:28 +08:00
parent d7e1fb4268
commit 2614b0156b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+11 -5
View File
@@ -3471,21 +3471,27 @@ class GadaiController extends Controller
$akru_cawangan_masih_aktif = $akru_cawangan_masih_aktif + $upah; $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]); // dd($tebus_all[0]);
$akru_cawangan_tebus = 0; $akru_cawangan_tebus = 0;
foreach($tebus_all as $index_tebus=>$tebus){ foreach($tebus_all as $index_tebus=>$tebus){
// dd($tebus['n']); // dd($tebus['n']);
if($tebus['t_tebus'] > $request->date_end){ 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{ }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; $year_gadai = $diff_gadai->format("%y") * 12;
$month_gadai = $diff_gadai->format("%m"); $month_gadai = $diff_gadai->format("%m");
$days_gadai = $diff_gadai->format("%d"); $days_gadai = $diff_gadai->format("%d");