fix latest
This commit is contained in:
@@ -162,8 +162,14 @@ class KhazanahController extends Controller
|
||||
$auth_user = Auth::user();
|
||||
$api_url = config('api.url');
|
||||
|
||||
$harini = Carbon::now();
|
||||
$harini = new Carbon;
|
||||
|
||||
$arraytunaiharini = [];
|
||||
$arraytunai = [];
|
||||
$arraygadaitebus = [];
|
||||
$arraytuntutbaki = [];
|
||||
$arrayaddtunai = [];
|
||||
|
||||
$listUser = User::where([['cawangan', '=', $auth_user['cawangan']],['role_harian','=','teller']])->get();
|
||||
|
||||
@@ -172,15 +178,23 @@ class KhazanahController extends Controller
|
||||
$tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json();
|
||||
$tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json();
|
||||
|
||||
$gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'].'/teller/',['tarikh' => $harini->toDateString(),'teller' => $ls->name])->json();
|
||||
$tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'].'/teller/',['teller' => $ls->name])->json();
|
||||
$addtunai = Http::get(config('api.url').'/api/getAddTunai/'.$auth_user['cawangan'].'/kodlaluan/',['kodlaluan' => $ls->name])->json();
|
||||
|
||||
array_push($arraygadaitebus,$gadai_tebus);
|
||||
array_push($arraytuntutbaki,$tuntutbaki);
|
||||
array_push($addtunai,$addtunai);
|
||||
array_push($arraytunaiharini,$tunai);
|
||||
array_push($arraytunai,$tunaipast);
|
||||
|
||||
}
|
||||
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
|
||||
$petibesi = Http::get(config('api.url') . '/api/VaultController/all/'. $auth_user['cawangan'])->json();
|
||||
|
||||
return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi'));
|
||||
return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi','arraygadaitebus','arraytuntutbaki'));
|
||||
}
|
||||
|
||||
public function gadaian()
|
||||
@@ -268,218 +282,6 @@ class KhazanahController extends Controller
|
||||
'bakiakhir'=>$bakiakhir
|
||||
]);
|
||||
|
||||
|
||||
$getTunaigadTeb=Http::get(config('api.url').'/api/getTunaiGadTeb/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json();
|
||||
|
||||
|
||||
$gadai=$getTunaigadTeb['gadai'];
|
||||
$tebus=$getTunaigadTeb['tebus'];
|
||||
$tebusT=$tebus+$tebus_detail['pinjaman'];
|
||||
$upah=$getTunaigadTeb['upah'];
|
||||
$upahT=$upah+$tebus_detail['bakiupah'];
|
||||
|
||||
|
||||
|
||||
|
||||
$updateTunaiGadTeb=Http::put(config('api.url').'/api/updateTunaiGadteb/'.$auth_user['cawangan'],[
|
||||
'kodlaluan' => $gadai_detail['teller'],
|
||||
'gadai'=>$gadai,
|
||||
'tebus'=>$tebusT,
|
||||
'upah'=>$upahT
|
||||
]);
|
||||
|
||||
|
||||
$getVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
|
||||
$bakiEOD=$getVault[0]['bakieod'];
|
||||
$bakiAkhir_EOD=$tebus_detail['bakipjm']+$bakiEOD;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$updateBakiEod=Http::put(config('api.url').'/api/updateBakiEOD_Vault/'.$auth_user['cawangan'],[
|
||||
'bakieod'=>$bakiAkhir_EOD
|
||||
]);
|
||||
|
||||
|
||||
//--GLEJER BERMULA UNTUK PENEBUSAN
|
||||
|
||||
|
||||
$getProduct=Http::get(config('api.url').'/api/getProduct/'.$auth_user['cawangan'])->json();
|
||||
$glcode=$getProduct[0]['glcode'];
|
||||
$kodGL=$getProduct[0]['kodgl'];
|
||||
$glcode_UP=$getProduct[0]['glcode_up'];
|
||||
|
||||
|
||||
$get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$kodGL])->json();
|
||||
$keterangan=$get_GLCode[0]['descpt'];
|
||||
$acctype=$get_GLCode[0]['acttype'];
|
||||
|
||||
$get_lejerPinj=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$kodGL])->json();
|
||||
if(sizeof($get_lejerPinj)!=0)
|
||||
{
|
||||
|
||||
|
||||
$hariIni=$get_lejerPinj[0]['hariini'];
|
||||
$jumlah=$get_lejerPinj[0]['kelmarin'];
|
||||
$kredit=$get_lejerPinj[0]['kredit'];
|
||||
$debit=$get_lejerPinj[0]['debit'];
|
||||
$recno=$get_lejerPinj[0]['recno'];
|
||||
|
||||
|
||||
|
||||
$kredit=$kredit+$tebus_detail['bakipjm'];
|
||||
$Hari_Ini=$debit-$kredit;
|
||||
$Kelmarin=$jumlah-$Hari_Ini;
|
||||
|
||||
|
||||
|
||||
$updateGlejer=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
|
||||
'recno'=>$recno,
|
||||
'debit'=>$debit,
|
||||
'kredit'=>$kredit,
|
||||
'hariini'=>$hariIni,
|
||||
'kelmarin' =>$Kelmarin,
|
||||
|
||||
]);
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
// kalau kosong getglejer
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->json();
|
||||
$keterangan=$get_GLCode[0]['descpt'];
|
||||
$acctype=$get_GLCode[0]['acttype'];
|
||||
|
||||
$get_lejerPinjUpah=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->json();
|
||||
if(sizeof($get_lejerPinjUpah)!=0)
|
||||
{
|
||||
|
||||
|
||||
|
||||
$hariIniU=$get_lejerPinjUpah[0]['hariini'];
|
||||
$jumlahU=$get_lejerPinjUpah[0]['kelmarin'];
|
||||
$kreditU=$get_lejerPinjUpah[0]['kredit'];
|
||||
$debitU=$get_lejerPinjUpah[0]['debit'];
|
||||
$recnoU=$get_lejerPinjUpah[0]['recno'];
|
||||
|
||||
|
||||
$kredit_U=$kreditU+$tebus_detail['bakiupah'];
|
||||
$hariIniU=$debitU-$kreditU;
|
||||
$kelmarinU=$jumlahU-$hariIniU;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$updateGlejerU=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
|
||||
'recno'=>$recnoU,
|
||||
'debit'=>$debitU,
|
||||
'kredit'=>$kreditU,
|
||||
'hariini'=>$hariIniU,
|
||||
'kelmarin' =>$kelmarinU
|
||||
|
||||
]);
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
$jumlah=0.0; $hariIniSemalam=0.0;
|
||||
$getGlejer_prevUpah=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->json();
|
||||
if(sizeof($getGlejer_prevUpah)!=0)
|
||||
{
|
||||
|
||||
$jumSemalam=$getGlejer_prevUpah[0]['jumlah'];
|
||||
$hariIniSemalam=$getGlejer_prevUpah[0]['hariini'];
|
||||
$jumlah=$jumSemalam+$hariIniSemalam;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
$jumlah=0.0;
|
||||
}//end getGlejerPrev_Upah
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$jumlahBulan_ini=0.0;
|
||||
$get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->json();
|
||||
|
||||
if( sizeof($get_GlejerBulan_Tahun)==0)
|
||||
{
|
||||
$jumlahBulan_ini=0.0;
|
||||
}
|
||||
else
|
||||
{
|
||||
$jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
|
||||
$jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
|
||||
}//end bulan tahun
|
||||
|
||||
|
||||
|
||||
$Jumlah_TahunIni=0.0;
|
||||
$get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->json();
|
||||
if(sizeof($get_Glejer_Tahun)==0)
|
||||
{
|
||||
$Jumlah_TahunIni=0.0;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
|
||||
$JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
|
||||
$Jumlah_TahunIni=$jumlah-$JumTahunIni;
|
||||
|
||||
}
|
||||
|
||||
$hariIni=0.0-$tebus_detail['bakiupah'];
|
||||
$kelmarin=$jumlah-$hariIni;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//insert glejer untuk current date /hari ini
|
||||
$daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
|
||||
|
||||
'kodcaw' =>$auth_user['cawangan'],
|
||||
'glcode' =>$glcode_UP,
|
||||
'descpt' =>$keterangan,
|
||||
'debit'=>0.0,
|
||||
'kredit'=>0.0,
|
||||
'hariini'=>$hariIni,
|
||||
'kelmarin'=>$kelmarin,
|
||||
'jumlah'=>$jumlah,
|
||||
'bulanini'=>$jumlahBulan_ini,
|
||||
'tahunini'=>$Jumlah_TahunIni,
|
||||
'acttype'=> $acctype
|
||||
|
||||
]);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
|
||||
@@ -2274,7 +2076,8 @@ class KhazanahController extends Controller
|
||||
//Harta semasa
|
||||
$pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberi/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
$tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
|
||||
$penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
|
||||
|
||||
//Tanggungan Semasa
|
||||
$panjar = Http::get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
@@ -2282,22 +2085,23 @@ class KhazanahController extends Controller
|
||||
$wtd = Http::get(config('api.url').'/api/WTD/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
$cajlelong = Http::get(config('api.url').'/api/cajlelong/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
$keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
$cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
|
||||
|
||||
//Terkumpul
|
||||
$ringkasanterkumpul = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
$ringkasanterkumpul = $ringkasanterkumpul[0];
|
||||
|
||||
$keseluruhanupahterkumpul = $ringkasanterkumpul['lelongupahsimpan'] + $ringkasanterkumpul['tebus'][0]['upahsimpan'] + $ringkasanterkumpul['advansur'][0]['upahsimpan'];
|
||||
|
||||
$untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
|
||||
|
||||
$hartasemasa = [];
|
||||
// $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
|
||||
|
||||
array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]);
|
||||
array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
|
||||
array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
|
||||
array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Penghutang Ar-Rahn', 'amaun' => $keuntungan]);
|
||||
array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Pendahuluan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
|
||||
array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
|
||||
array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
|
||||
array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
|
||||
array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]);
|
||||
array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
|
||||
|
||||
$totalhartasemasa = 0;
|
||||
foreach($hartasemasa as $index => $hs)
|
||||
@@ -2320,9 +2124,8 @@ class KhazanahController extends Controller
|
||||
array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
|
||||
array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
|
||||
array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
|
||||
array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $keseluruhanupahterkumpul]);
|
||||
|
||||
|
||||
array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
|
||||
array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
|
||||
|
||||
$totaltanggungansemasa = 0;
|
||||
foreach($tanggungansemasa as $index => $ts)
|
||||
|
||||
Reference in New Issue
Block a user