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

fix skit2

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-07-13 17:22:58 +08:00
parent 94d80b4971
commit 4bd4f814cc
2 changed files with 25 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+22 -50
View File
@@ -2542,19 +2542,19 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$Gadai = Gadai::on($cawangan['mysql']) // $Gadai = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0) // ->where('tagpalsu','=',0)
->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) // ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) // ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
->sum('pinjaman'); // ->sum('pinjaman');
$Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman');
$Tebus = Tebus::on($cawangan['mysql']) $Tebus = Tebus::on($cawangan['mysql'])
->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan') ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('gad.tagpalsu','=',0) ->where('gad.tagpalsu','=',0)
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']]) ->where([['tebus.t_tebus','>=',$request->mula],['tebus.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']])
->sum('teb.pinjaman'); ->sum('tebus.pinjaman');
dd($Tebus);
$rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
@@ -2676,29 +2676,15 @@ class GadaiController extends Controller
{ {
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rekodaudit = Gadai::on($cawangan['mysql']) $audit = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0) ->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
->get();
$totalrekod = Gadai::on($cawangan['mysql']) $rekodaudit = $audit->get();
->where('tagpalsu','=',0) $totalrekod = $audit->sum('pinjaman');
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) $totalberat = $audit->sum('berat');
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) $totalnilaimarhun = $audit->sum('nilaimarhun');
->sum('pinjaman');
$totalberat = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('berat');
$totalnilaimarhun = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('nilaimarhun');
$arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun];
@@ -2709,29 +2695,15 @@ class GadaiController extends Controller
{ {
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rekodaudit = Gadai::on($cawangan['mysql']) $audit = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1) ->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
->get();
$totalrekod = Gadai::on($cawangan['mysql']) $rekodaudit = $audit->get();
->where('tagpalsu','=',1) $totalrekod = $audit->sum('pinjaman');
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) $totalberat = $audit->sum('berat');
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) $totalnilaimarhun = $audit->sum('nilaimarhun');
->sum('pinjaman');
$totalberat = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('berat');
$totalnilaimarhun = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('nilaimarhun');
$arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun];
app/Http/Controllers/TebusController.php
+3 -8
View File
@@ -1051,29 +1051,24 @@ class TebusController extends Controller
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
if($request->tarikh < '2021-06-09') if($request->tarikh < '2021-06-09')
{ {
$keuntungan = TransaksiKeuntungan::on('mysql7') $keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan'); ->sum('bayaran_keuntungan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7') $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet'); ->sum('keuntungan_rebet');
// dd($keuntungan,$keuntunganreducing);
$total = ($keuntungan + $keuntunganreducing); $total = ($keuntungan + $keuntunganreducing);