fix gadai
This commit is contained in:
@@ -625,51 +625,39 @@ class GadaiController extends Controller
|
||||
|
||||
//Gadai Terkumpul
|
||||
$gadai = Gadai::on($cawangan['mysql'])
|
||||
->where('sttebus','=','')
|
||||
// ->where('sttebus','=','')
|
||||
->whereNull('hargajualan')
|
||||
->whereYear('t_gadai','=',$current->year)
|
||||
->sum('pinjaman');
|
||||
|
||||
$gadaitawarruq = Gadai::on($cawangan['mysql'])
|
||||
->where('sttebus','=','')
|
||||
// ->where('sttebus','=','')
|
||||
->whereNotNull('hargajualan')
|
||||
->whereYear('t_gadai','=',$current->year)
|
||||
->sum('pinjaman');
|
||||
|
||||
// //Tebus Terkumpul
|
||||
// $tebus = Tebus::on($cawangan['mysql'])
|
||||
// ->where('jenistebus','=','T')
|
||||
// ->whereNull('hargajualan')
|
||||
// ->whereYear('t_tebus','=',$current->year)
|
||||
// ->sum('pinjaman');
|
||||
$tebus = Tebus::on($cawangan['mysql'])
|
||||
->leftJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
|
||||
->whereNull('gadai.hargajualan')
|
||||
->whereYear('tebus.t_tebus','=',$current->year)
|
||||
->sum('tebus.pinjaman');
|
||||
|
||||
// $tebustawarruq = Tebus::on($cawangan['mysql'])
|
||||
// ->where('jenistebus','=','T')
|
||||
// ->whereNotNull('hargajualan')
|
||||
// ->whereYear('t_tebus','=',$current->year)
|
||||
// ->sum('pinjaman');
|
||||
|
||||
$tebus = Gadai::on($cawangan['mysql'])
|
||||
->where('sttebus','=','T')
|
||||
->whereNull('hargajualan')
|
||||
->whereYear('t_gadai','=',$current->year)
|
||||
->sum('pinjaman');
|
||||
|
||||
$tebustawarruq = Gadai::on($cawangan['mysql'])
|
||||
->where('sttebus','=','T')
|
||||
->whereNotNull('hargajualan')
|
||||
->whereYear('t_gadai','=',$current->year)
|
||||
->sum('pinjaman');
|
||||
$tebustawarruq = Tebus::on($cawangan['mysql'])
|
||||
->leftJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
|
||||
->whereNotNull('gadai.hargajualan')
|
||||
->whereYear('tebus.t_tebus','=',$current->year)
|
||||
->sum('tebus.pinjaman');
|
||||
|
||||
$gadvar = $gadai + $gadaitawarruq;
|
||||
$tebvar = $tebus + $tebustawarruq;
|
||||
|
||||
//Variasi
|
||||
$variasi = $gadai - $tebus;
|
||||
$variasi = $gadvar - $tebvar;
|
||||
|
||||
|
||||
//Outstanding
|
||||
$outstanding = Gadai::on($cawangan['mysql'])
|
||||
->where('sttebus','=','')
|
||||
->orderBy('t_gadai','desc')
|
||||
->sum('pinjaman');
|
||||
|
||||
array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
|
||||
|
||||
Reference in New Issue
Block a user