fix skit2

This commit is contained in:
hafifierahman
2023-06-07 22:52:40 +08:00
parent 6ae8ccbbdd
commit ec3e81fbff
2 changed files with 112 additions and 99 deletions
+15 -15
View File
@@ -3624,26 +3624,26 @@ class AdminPageController extends Controller
return response()->json($batchleltuntutbaki);
}
public function StoreRingkasanHarian(Request $request){
$current = Carbon::now();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray();
public function StoreRingkasanHarian(Request $request){
$ringkasan = new RingkasanHarianServices;
$res = $ringkasan->StoreRingkasanHarian();
if($request->jenisgenerate == 'daily'){
$date = $request->tarikh;
$res = $ringkasan->StoreRingkasanHarian($date,$date,$request->zone);
}else{
$res = $ringkasan->StoreRingkasanHarian($request->mula,$request->hingga,$request->zone);
}
return response($res);
}
public function getRingkasanHarian(Request $request){
$current = Carbon::now();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray();
public function getRingkasanHarian(Request $request){
$ringkasan = new RingkasanHarianServices;
$test = $ringkasan->getRingkasanHarian($request->mula,$request->hingga);
$getData = $ringkasan->getRingkasanHarian($request->mula,$request->hingga,$request->kodcaw);
dd($test);
if($getData != 'error'){
return response($getData);
}else{
return response('error');
}
}
}
+97 -84
View File
@@ -322,8 +322,8 @@ class RingkasanHarianServices
$baki_lelong = $data_lelong_baki->sum('baki');
$rugi_lelong = $data_lelong_rugi->sum('baki');
$tuntut_baki_rugi = TuntutBaki::on($connection)->where('tarikh','>=',$date)->where('jumlah','<',0);
$tuntut_baki_bayar = TuntutBaki::on($connection)->where('tarikh','>=',$date)->where('jumlah','>',0);
$tuntut_baki_rugi = TuntutBaki::on($connection)->where('tarikh','=',$date)->where('jumlah','<',0);
$tuntut_baki_bayar = TuntutBaki::on($connection)->where('tarikh','=',$date)->where('jumlah','>',0);
$bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
@@ -375,12 +375,11 @@ class RingkasanHarianServices
}
public function StoreRingkasanHarian(){
public function StoreRingkasanHarian($mula,$hingga,$zone){
$period = CarbonPeriod::create('2023-01-01', '2023-03-31');
$period = CarbonPeriod::create($mula, $hingga);
$cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray();
// foreach()
foreach($period as $current){
foreach($cawangan as $index=>$caw){
DB::connection($caw['mysql'])->beginTransaction();
@@ -496,91 +495,105 @@ class RingkasanHarianServices
return response('success');
}
public function getRingkasanHarian($date1,$date2) : Array{
public function getRingkasanHarian($date1,$date2,$kodcaw) : Array{
//gadai
$totalgadai = RingkasanMain::JumlahGadai($date1,$date2);
$bilangangadai = RingkasanMain::BilanganGadai($date1,$date2);
$gadai70 = RingkasanMain::Gadai70($date1,$date2);
$gadai75 = RingkasanMain::Gadai75($date1,$date2);
$gadai80 = RingkasanMain::Gadai80($date1,$date2);
$nilaimarhun70 = RingkasanMain::Nm70($date1,$date2);
$nilaimarhun75 = RingkasanMain::Nm75($date1,$date2);
$nilaimarhun80 = RingkasanMain::Nm80($date1,$date2);
$bilangan70 = RingkasanMain::Bil70($date1,$date2);
$bilangan75 = RingkasanMain::Bil75($date1,$date2);
$bilangan80 = RingkasanMain::Bil80($date1,$date2);
$cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray();
$cawangan = (sizeof($cawangan) > 0) ? $cawangan[0] : null;
if($cawangan != null){
//gadai
$totalgadai = RingkasanMain::on($cawangan['mysql'])->JumlahGadai($date1,$date2);
$bilangangadai = RingkasanMain::on($cawangan['mysql'])->BilanganGadai($date1,$date2);
$gadai70 = RingkasanMain::on($cawangan['mysql'])->Gadai70($date1,$date2);
$gadai75 = RingkasanMain::on($cawangan['mysql'])->Gadai75($date1,$date2);
$gadai80 = RingkasanMain::on($cawangan['mysql'])->Gadai80($date1,$date2);
$nilaimarhun70 = RingkasanMain::on($cawangan['mysql'])->Nm70($date1,$date2);
$nilaimarhun75 = RingkasanMain::on($cawangan['mysql'])->Nm75($date1,$date2);
$nilaimarhun80 = RingkasanMain::on($cawangan['mysql'])->Nm80($date1,$date2);
$bilangan70 = RingkasanMain::on($cawangan['mysql'])->Bil70($date1,$date2);
$bilangan75 = RingkasanMain::on($cawangan['mysql'])->Bil75($date1,$date2);
$bilangan80 = RingkasanMain::on($cawangan['mysql'])->Bil80($date1,$date2);
$totalbilperatusan = intval($bilangan70) + intval($bilangan75) + intval($bilangan80);
$totalnmperatusan = floatval($nilaimarhun70) + floatval($nilaimarhun75) + floatval($nilaimarhun80);
$totalgadperatusan = floatval($gadai70) + floatval($gadai75) + floatval($gadai80);
//main
$pendahuluan = RingkasanMain::on($cawangan['mysql'])->pendahuluan($date1,$date2);
$pelanggan = RingkasanMain::on($cawangan['mysql'])->pelanggan($date1,$date2);
$serahan = RingkasanMain::on($cawangan['mysql'])->Serahan($date1,$date2);
$serahanonline = RingkasanMain::on($cawangan['mysql'])->SerahanOnline($date1,$date2);
$belanja = RingkasanMain::on($cawangan['mysql'])->BelanjaAm($date1,$date2);
$baiki = RingkasanMain::on($cawangan['mysql'])->BaikiDanSelenggara($date1,$date2);
$keraian = RingkasanMain::on($cawangan['mysql'])->Keraian($date1,$date2);
//tebus
$tebus = RingkasanMain::on($cawangan['mysql'])->penebusan($date1,$date2);
$tebus_keuntungan = RingkasanMain::on($cawangan['mysql'])->KeuntunganPenebusan($date1,$date2);
$bilangan_tebus = RingkasanMain::on($cawangan['mysql'])->BilanganPenebusan($date1,$date2);
//lelong
$jumlahlelong = RingkasanMain::on($cawangan['mysql'])->JumlahLelong($date1,$date2);
$bakilelong = RingkasanMain::on($cawangan['mysql'])->BakiLelong($date1,$date2);
$rugilelong = RingkasanMain::on($cawangan['mysql'])->RugiLelong($date1,$date2);
$bayaranrugi = RingkasanMain::on($cawangan['mysql'])->BayaranRugi($date1,$date2);
$bayaranbaki = RingkasanMain::on($cawangan['mysql'])->BayaranBaki($date1,$date2);
$cajlelong = RingkasanMain::on($cawangan['mysql'])->CajLelong($date1,$date2);
$billelong = RingkasanMain::on($cawangan['mysql'])->BilLelong($date1,$date2);
//main
$pendahuluan = RingkasanMain::pendahuluan($date1,$date2);
$pelanggan = RingkasanMain::pelanggan($date1,$date2);
$serahan = RingkasanMain::Serahan($date1,$date2);
$serahanonline = RingkasanMain::SerahanOnline($date1,$date2);
$belanja = RingkasanMain::BelanjaAm($date1,$date2);
$baiki = RingkasanMain::BaikiDanSelenggara($date1,$date2);
$keraian = RingkasanMain::Keraian($date1,$date2);
//tebus
$tebus = RingkasanMain::penebusan($date1,$date2);
$tebus_keuntungan = RingkasanMain::KeuntunganPenebusan($date1,$date2);
$bilangan_tebus = RingkasanMain::BilanganPenebusan($date1,$date2);
//lelong
$jumlahlelong = RingkasanMain::JumlahLelong($date1,$date2);
$bakilelong = RingkasanMain::BakiLelong($date1,$date2);
$rugilelong = RingkasanMain::RugiLelong($date1,$date2);
$bayaranrugi = RingkasanMain::BayaranRugi($date1,$date2);
$bayaranbaki = RingkasanMain::BayaranBaki($date1,$date2);
$cajlelong = RingkasanMain::CajLelong($date1,$date2);
$billelong = RingkasanMain::BilLelong($date1,$date2);
//ansuran
$pembiayaanansuran = RingkasanMain::on($cawangan['mysql'])->PembiayaanAnsuran($date1,$date2);
$keuntunganansuran = RingkasanMain::on($cawangan['mysql'])->KeuntunganAnsuran($date1,$date2);
$bilansuran = RingkasanMain::on($cawangan['mysql'])->BilAnsuran($date1,$date2);
$pembiayaanonline = RingkasanMain::on($cawangan['mysql'])->PembiayaanOnline($date1,$date2);
$keuntunganonline = RingkasanMain::on($cawangan['mysql'])->KeuntunganOnline($date1,$date2);
$bilonline = RingkasanMain::on($cawangan['mysql'])->BilOnline($date1,$date2);
//ansuran
$pembiayaanansuran = RingkasanMain::PembiayaanAnsuran($date1,$date2);
$keuntunganansuran = RingkasanMain::KeuntunganAnsuran($date1,$date2);
$bilansuran = RingkasanMain::BilAnsuran($date1,$date2);
$pembiayaanonline = RingkasanMain::PembiayaanOnline($date1,$date2);
$keuntunganonline = RingkasanMain::KeuntunganOnline($date1,$date2);
$bilonline = RingkasanMain::BilOnline($date1,$date2);
return [
'totalgadai' => $totalgadai,
'bilangangadai' => $bilangangadai,
'pendahuluan' => $pendahuluan,
'pelanggan' => $pelanggan,
'serahan' => $serahan,
'serahanonline' => $serahanonline,
'belanja' => $belanja,
'baiki' => $baiki,
'keraian' => $keraian,
'tebus' => $tebus,
'tebus_keuntungan' => $tebus_keuntungan,
'bilangan_tebus' => $bilangan_tebus,
'jumlahlelong' => $jumlahlelong,
'bakilelong' => $bakilelong,
'rugilelong' => $rugilelong,
'bayaranrugi' => $bayaranrugi,
'bayaranbaki' => $bayaranbaki,
'cajlelong' => $cajlelong,
'billelong' => $billelong,
'pembiayaanansuran' => $pembiayaanansuran,
'keuntunganansuran' => $keuntunganansuran,
'bilansuran' => $bilansuran,
'pembiayaanonline' => $pembiayaanonline,
'keuntunganonline' => $keuntunganonline,
'bilonline' => $bilonline,
'gadai70' => $gadai70,
'gadai75' => $gadai75,
'gadai80' => $gadai80,
'nilaimarhun70' => $nilaimarhun70,
'nilaimarhun75' => $nilaimarhun75,
'nilaimarhun80' => $nilaimarhun80,
'bilangan70' => $bilangan70,
'bilangan75' => $bilangan75,
'bilangan80' => $bilangan80,
'totalbilperatusan' => $totalbilperatusan,
'totalnmperatusan' => $totalnmperatusan,
'totalgadperatusan' => $totalgadperatusan,
];
}else{
return 'error';
}
return [
'totalgadai' => $totalgadai,
'bilangangadai' => $bilangangadai,
'pendahuluan' => $pendahuluan,
'pelanggan' => $pelanggan,
'serahan' => $serahan,
'serahanonline' => $serahanonline,
'belanja' => $belanja,
'baiki' => $baiki,
'keraian' => $keraian,
'tebus' => $tebus,
'tebus_keuntungan' => $tebus_keuntungan,
'bilangan_tebus' => $bilangan_tebus,
'jumlahlelong' => $jumlahlelong,
'bakilelong' => $bakilelong,
'rugilelong' => $rugilelong,
'bayaranrugi' => $bayaranrugi,
'bayaranbaki' => $bayaranbaki,
'cajlelong' => $cajlelong,
'billelong' => $billelong,
'pembiayaanansuran' => $pembiayaanansuran,
'keuntunganansuran' => $keuntunganansuran,
'bilansuran' => $bilansuran,
'pembiayaanonline' => $pembiayaanonline,
'keuntunganonline' => $keuntunganonline,
'bilonline' => $bilonline,
'gadai70' => $gadai70,
'gadai75' => $gadai75,
'gadai80' => $gadai80,
'nilaimarhun70' => $nilaimarhun70,
'nilaimarhun75' => $nilaimarhun75,
'nilaimarhun80' => $nilaimarhun80,
'bilangan70' => $bilangan70,
'bilangan75' => $bilangan75,
'bilangan80' => $bilangan80,
];
}
}