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