added penyelarasan and fix onepercent formula for lejeram
This commit is contained in:
@@ -1488,7 +1488,7 @@ class TebusController extends Controller
|
||||
$bukanansuran = 0;
|
||||
if($bukanansuran_data){
|
||||
foreach($bukanansuran_data as $index=>$bukanansuranData){
|
||||
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bukanansuranData['norujukan']],['hargajualan','<>',null]])->first();
|
||||
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bukanansuranData['norujukan']],['hargajualan','<>',null],['tagbaru',0]])->first();
|
||||
if($gadaiData){
|
||||
$bukanansuran += $bukanansuranData['keuntungan_rebet'];
|
||||
}
|
||||
@@ -1756,6 +1756,7 @@ class TebusController extends Controller
|
||||
}else if($calculate_month < 0){
|
||||
$jumlahakru = AkruNet::on($cawangan['mysql'])
|
||||
->where('bulan','<=',$intmonth_sekarang)
|
||||
->where('tahun',$year)
|
||||
->sum('jumlah');
|
||||
|
||||
return response()->json($jumlahakru);
|
||||
|
||||
Reference in New Issue
Block a user