Merge branch 'Feature#AnsuranResit' into 'master'

fix laporan stok kawalan stok

See merge request online-sistem1/api_arrahn!186
This commit is contained in:
hafifie rahman
2023-03-25 16:48:54 +00:00
+84 -189
View File
@@ -1140,18 +1140,21 @@ class GadaiController extends Controller
$gadai1 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
->where('t_gadai','<',$tarikh)
->where('tagpalsu',0)
->whereBetween('nilaimarhun', [1, 400.99])
->get();
$gadai2 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
->where('t_gadai','<',$tarikh)
->where('tagpalsu',0)
->whereBetween('nilaimarhun', [401, 2000.99])
->get();
$gadai3 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
->where('t_gadai','<',$tarikh)
->where('tagpalsu',0)
->whereBetween('nilaimarhun', [2001, 1000000])
->get();
@@ -1159,6 +1162,7 @@ class GadaiController extends Controller
$gadaiini1 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('t_gadai','=',$tarikh)
->where('tagpalsu',0)
// ->whereBetween('nilaimarhun', [1, 400.99])
->where('nilaimarhun','>=',1)
->where('nilaimarhun','<=',400.99)
@@ -1167,6 +1171,7 @@ class GadaiController extends Controller
$gadaiini2 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('t_gadai','=',$tarikh)
->where('tagpalsu',0)
// ->whereBetween('nilaimarhun', [401, 2000.99])
->where('nilaimarhun','>=',401)
->where('nilaimarhun','<=',2000.99)
@@ -1175,20 +1180,13 @@ class GadaiController extends Controller
$gadaiini3 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('t_gadai','=',$tarikh)
->where('tagpalsu',0)
// ->whereBetween('nilaimarhun', [2001, 100000])
->where('nilaimarhun','>=',2001)
->where('nilaimarhun','<=',1000000)
->get();
// dd($gadaiini3);
////////////
///TEBUS////
///////////
/*tebus*/
$tebus1 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
@@ -1198,6 +1196,7 @@ class GadaiController extends Controller
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',1)
->where('nilaimarhun','<=',400.99)
->get();
@@ -1210,6 +1209,7 @@ class GadaiController extends Controller
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',401)
->where('nilaimarhun','<=',2000.99)
->get();
@@ -1223,6 +1223,7 @@ class GadaiController extends Controller
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',2001)
->where('nilaimarhun','<=',1000000)
->get();
@@ -1231,6 +1232,7 @@ class GadaiController extends Controller
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('sttebus','T')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',1)
->where('nilaimarhun','<=',400.99)
->get();
@@ -1239,6 +1241,7 @@ class GadaiController extends Controller
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('sttebus','T')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',401)
->where('nilaimarhun','<=',2000.99)
->get();
@@ -1247,15 +1250,13 @@ class GadaiController extends Controller
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('sttebus','T')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',2001)
->where('nilaimarhun','<=',1000000)
->get();
//////////////
///LELONG/////
/////////////
/*lelong*/
$lelong1 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
@@ -1265,6 +1266,7 @@ class GadaiController extends Controller
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',1)
->where('nilaimarhun','<=',400.99)
->get();
@@ -1278,6 +1280,7 @@ class GadaiController extends Controller
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',401)
->where('nilaimarhun','<=',2000.99)
->get();
@@ -1290,6 +1293,7 @@ class GadaiController extends Controller
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',2001)
->where('nilaimarhun','<=',1000000)
->get();
@@ -1298,6 +1302,7 @@ class GadaiController extends Controller
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('sttebus','L')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',1)
->where('nilaimarhun','<=',400.99)
->get();
@@ -1306,6 +1311,7 @@ class GadaiController extends Controller
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('sttebus','L')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',401)
->where('nilaimarhun','<=',2000.99)
->get();
@@ -1314,72 +1320,13 @@ class GadaiController extends Controller
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('sttebus','L')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',2001)
->where('nilaimarhun','<=',1000000)
->get();
if($kodcaw == 'KB2')
{
// $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
// ->get();
// foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
// {
// //Gadai
// $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
// $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
// $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
// $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']);
// $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']);
// $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']);
// $gadai1[0]['bil'] = $gad1;
// $gadai1[0]['pinj'] = $gadpinj1;
// $gadai2[0]['bil'] = $gad2;
// $gadai2[0]['pinj'] = $gadpinj2;
// $gadai3[0]['bil'] = $gad3;
// $gadai3[0]['pinj'] = $gadpinj3;
// //Tebus
// $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']);
// $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']);
// $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']);
// $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']);
// $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']);
// $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']);
// $tebus1[0]['bil'] = $teb1;
// $tebus1[0]['pinj'] = $tebpinj1;
// $tebus2[0]['bil'] = $teb2;
// $tebus2[0]['pinj'] = $tebpinj2;
// $tebus3[0]['bil'] = $teb3;
// $tebus3[0]['pinj'] = $tebpinj3;
// //Lelong
// $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']);
// $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']);
// $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']);
// $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']);
// $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']);
// $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']);
// $lelong1[0]['bil'] = $lel1;
// $lelong1[0]['pinj'] = $lelpinj1;
// $lelong2[0]['bil'] = $lel2;
// $lelong2[0]['pinj'] = $lelpinj2;
// $lelong3[0]['bil'] = $lel3;
// $lelong3[0]['pinj'] = $lelpinj3;
}
//////////////////
/////ANSURAN//////
//////////////////
/*ansuran*/
$daterequest = new Carbon($tarikh);
@@ -1413,17 +1360,6 @@ class GadaiController extends Controller
->get();
// if($ansuran1_data){
// foreach($ansuran1_data as $index=>$ansuran1Data){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran1Data['norujukan'])->first();
// if($gadaiData){
// if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){
// array_push($ansuran1,['bayaran_pembiayaan'=>$ansuran1Data['bayaran_pembiayaan']]);
// }
// }
// }
// }
$ansuranharini1_data = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
@@ -1437,19 +1373,6 @@ class GadaiController extends Controller
->pluck('trans.norujukan');
// $ansuranharini1 = [];
// if($ansuranharini1_data){
// foreach($ansuranharini1_data as $index=>$ansuranharini1Data){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini1Data['norujukan'])->first();
// if($gadaiData){
// if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){
// array_push($ansuranharini1,['bayaran_pembiayaan'=>$ansuranharini1Data['bayaran_pembiayaan']]);
// }
// }
// }
// }
$ansuran1harini = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$ansuranharini1_data)
// ->whereBetween('nilaimarhun', [1, 400.99])
@@ -1478,19 +1401,6 @@ class GadaiController extends Controller
->pluck('trans.norujukan');
// $ansuran2 = [];
// if($ansuran2_data){
// foreach($ansuran2_data as $index=>$ansuran2Data){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran2Data['norujukan'])->first();
// if($gadaiData){
// if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){
// array_push($ansuran2,['bayaran_pembiayaan'=>$ansuran2Data['bayaran_pembiayaan']]);
// }
// }
// }
// }
$ansuran2 = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$ansuran2_data)
// ->whereBetween('nilaimarhun', [401, 2000.99])
@@ -1518,18 +1428,6 @@ class GadaiController extends Controller
->where('trans.kodcaw',$kodcaw)
->pluck('trans.norujukan');
// $ansuranharini2 = [];
// if($ansuranharini2_data){
// foreach($ansuranharini2_data as $index=>$ansuranharini2Data){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini2Data['norujukan'])->first();
// if($gadaiData){
// if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){
// array_push($ansuranharini2,['bayaran_pembiayaan'=>$ansuranharini2Data['bayaran_pembiayaan']]);
// }
// }
// }
// }
$ansuran2harini = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$ansuranharini2_data)
@@ -1557,18 +1455,6 @@ class GadaiController extends Controller
->where('trans.kodcaw',$kodcaw)
->pluck('trans.norujukan');
// $ansuran3 = [];
// if($ansuran3_data){
// foreach($ansuran3_data as $index=>$ansuran3Data){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran3Data['norujukan'])->first();
// if($gadaiData){
// if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 1000000){
// array_push($ansuran3,['bayaran_pembiayaan'=>$ansuran3Data['bayaran_pembiayaan']]);
// }
// }
// }
// }
$ansuran3 = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$ansuran3_data)
@@ -1599,20 +1485,6 @@ class GadaiController extends Controller
->pluck('trans.norujukan');
// $ansuranharini3 = [];
// if($ansuranharini3_data){
// foreach($ansuranharini3_data as $index=>$ansuranharini3Data){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini3Data['norujukan'])->first();
// if($gadaiData){
// if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 1000000){
// array_push($ansuranharini3,['bayaran_pembiayaan'=>$ansuranharini3Data['bayaran_pembiayaan']]);
// }
// }
// }
// }
$ansuran3harini = Gadai::on($cawangan['mysql'])
->whereIn('norujukan',$ansuranharini3_data)
// ->whereBetween('nilaimarhun', [2001, 1000000])
@@ -1637,57 +1509,80 @@ class GadaiController extends Controller
$arrayharinians3 = ['bil' => $transaksi3harini[0]->bil, 'pinj' => $transaksi3harini[0]->total];
//////////////////
///HAPUS KIRA/////
//////////////////
/*hapus kira*/
$hapuskira1 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','<',$tarikh)
->where('n_marhun','>=',1)
->where('n_marhun','<=',400.99)
->orderBy('tarikh')
$hapuskira1 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
->where('sttebus','H')
->where(function ($query) use($tarikh){
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',1)
->where('nilaimarhun','<=',400.99)
// ->orderBy('tarikh')
->get();
$hapuskira2 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','<',$tarikh)
->where('n_marhun','>=',401)
->where('n_marhun','<=',2000.99)
->orderBy('tarikh')
$hapuskira2 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
// ->where('tarikh','<',$tarikh)
->where('sttebus','H')
->where(function ($query) use($tarikh){
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',401)
->where('nilaimarhun','<=',2000.99)
// ->orderBy('tarikh')
->get();
$hapuskira3 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','<',$tarikh)
->where('n_marhun','>=',2001)
->where('n_marhun','<=',1000000)
->orderBy('tarikh')
$hapuskira3 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
// ->where('tarikh','<',$tarikh)
->where('sttebus','H')
->where(function ($query) use($tarikh){
$query->where('t_update','<',$tarikh)
->orWhereNull('t_update');
})
->where('tagpalsu',0)
->where('nilaimarhun','>=',2001)
->where('nilaimarhun','<=',1000000)
// ->orderBy('tarikh')
->get();
$hapuskiraini1 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','=',$tarikh)
->where('n_marhun','>=',1)
->where('n_marhun','<=',400.99)
->orderBy('tarikh')
$hapuskiraini1 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
// ->where('tarikh','=',$tarikh)
->where('sttebus','H')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',1)
->where('nilaimarhun','<=',400.99)
// ->orderBy('tarikh')
->get();
$hapuskiraini2 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','=',$tarikh)
->where('n_marhun','>=',401)
->where('n_marhun','<=',2000.99)
->orderBy('tarikh')
$hapuskiraini2 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
// ->where('tarikh','=',$tarikh)
->where('sttebus','H')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',401)
->where('nilaimarhun','<=',2000.99)
// ->orderBy('tarikh')
->get();
$hapuskiraini3 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','=',$tarikh)
->where('n_marhun','>=',2001)
->where('n_marhun','<=',1000000)
->orderBy('tarikh')
$hapuskiraini3 = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
// ->where('tarikh','=',$tarikh)
->where('sttebus','H')
->where('t_update','=',$tarikh)
->where('tagpalsu',0)
->where('nilaimarhun','>=',2001)
->where('nilaimarhun','<=',1000000)
// ->orderBy('tarikh')
->get();