KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

changes at scannedtebus

Browse Source
This commit is contained in:
fariz
2021-04-18 23:17:57 +08:00
parent fb0d53e3c8 475262dda1
commit bb39ddc8ac
22 changed files with 369 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+33 -3
View File
@@ -98,6 +98,7 @@ class AliranTunaiController extends Controller
$GT = $GT[0];
}
$api_url = config('api.url');
$gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
@@ -105,6 +106,7 @@ class AliranTunaiController extends Controller
$tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'])->json();
//******************* INITIALIZE LEJER AM START HERE****************************//
@@ -480,16 +482,15 @@ class AliranTunaiController extends Controller
}
else
{
//$glejer=$getGLedjer[0];
$jumlahSemalam_Upah=$getGLedjer_Upah[0]['jumlah'];
$hariIniSemalam_Upah=$getGLedjer_Upah[0]['hariini'];
$jumlah_Upah=$jumlahSemalam_Upah+$hariIniSemalam_Upah;
}
$jumlahBulan_ini_Upah=0.0;
$get_GlejerBulan_Tahun_Upah=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KOD_Upah])->json();
@@ -1051,6 +1052,16 @@ class AliranTunaiController extends Controller
//************************ END LEJER AM**********************************
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki'));
}
@@ -1200,4 +1211,23 @@ class AliranTunaiController extends Controller
return view('aliran_tunai.laporan.laporanserahan',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','array_requestteller'));
}
public function kemaskiniupah(Request $request)
{
$auth_user = Auth::user();
$requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
$requestupah = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
$requestalirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
$upah = $requestupah['baki'];
$alirantunaisemasa = $requestalirantunai['baki'];
$totalalirantunai = floatval($upah) + floatval($alirantunaisemasa);
return response($totalalirantunai);
}
}
app/Http/Controllers/GadaianController.php
+9 -4
View File
@@ -565,10 +565,15 @@ class GadaianController extends Controller
"norujukan" => $history
])->json();
array_push($arrayhist,["pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
if(sizeof($gadai) > 0)
$history = $gadai[0][0]['historygadaian'];
{
if($history == $gadai[0][0]['historygadaian'])
$history = 0;
else{
array_push($arrayhist,["hargajualan" => ((isset($gadai[0][0]['hargajualan'])) ? $gadai[0][0]['hargajualan'] : ''), "pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
$history = $gadai[0][0]['historygadaian'];
}
}
$count++;
@@ -580,7 +585,7 @@ class GadaianController extends Controller
])->json();
array_push($arrayhist,["pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $norujukan,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
array_push($arrayhist,["hargajualan" => ((isset($gadai[0][0]['hargajualan'])) ? $gadai[0][0]['hargajualan'] : ''),"pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $norujukan,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
break;
}
}
app/Http/Controllers/KhazanahController.php
+76 -22
View File
@@ -227,7 +227,7 @@ class KhazanahController extends Controller
public function barcodescannedtebus(Request $request)
{
$auth_user = Auth::user();
@@ -272,8 +272,7 @@ class KhazanahController extends Controller
$jum_bayaran=Http::get(config('api.url').'/api/transaction/one/'.$request->norujukan_barcode)->json();
$jumlah_bayaran=$jum_bayaran['duit_masuk'];
//tarikh tawawruqq
@@ -445,7 +444,7 @@ class KhazanahController extends Controller
$get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
$bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
$get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$Untung_Semasa])->json();
$get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$Untung_Semasa])->json();
$hariini_untung=$get_lejer_Untung[0]['hariini'];
$kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
@@ -458,7 +457,7 @@ class KhazanahController extends Controller
$hariini_untung=$debit_untung-$kredit_untung;
$kelmarin_untung=$jumlah_untung-$hariini_untung;
$updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
$updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_untung,
'debit'=>$debit_untung,
'kredit'=>$kredit_untung,
@@ -467,10 +466,10 @@ class KhazanahController extends Controller
]);
$get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan)->json();
$get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan_barcode)->json();
$jumlah_bp=$get_bayaranPD[0]['total_byr_pendahuluan'];
$get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_BP])->json();
$get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_BP])->json();
$hariini_bp= $get_lejerBayaran_Pendahuluan[0]['hariini'];
$kelmarin_bp=$get_lejerBayaran_Pendahuluan[0]['kelmarin'];
$jumlah_bp= $get_lejerBayaran_Pendahuluan[0]['jumlah'];
@@ -482,7 +481,7 @@ class KhazanahController extends Controller
$hariini_bp=$debit_bp-$kredit_bp;
$kelmarin_bp=$jumlah_bp-$hariini_bp;
$updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
$updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_bp,
'debit'=>$debit_bp,
'kredit'=>$kredit_bp,
@@ -505,7 +504,7 @@ class KhazanahController extends Controller
{
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
//KIRAAN LEJER AM UNTUK PENEBUSAN S
$get_GLCode_Tunai=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$KOD_tunai])->json();
@@ -535,6 +534,7 @@ class KhazanahController extends Controller
]);
$get_lejerPinjaman=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_Pembiayaan])->json();
$hariIni_Pinjaman=$get_lejerPinjaman[0]['hariini'];
@@ -559,7 +559,7 @@ class KhazanahController extends Controller
$get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
$bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
$get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$Untung_Semasa])->json();
$get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$Untung_Semasa])->json();
$hariini_untung=$get_lejer_Untung[0]['hariini'];
$kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
@@ -572,7 +572,7 @@ class KhazanahController extends Controller
$hariini_untung=$debit_untung-$kredit_untung;
$kelmarin_untung=$jumlah_untung-$hariini_untung;
$updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
$updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_untung,
'debit'=>$debit_untung,
'kredit'=>$kredit_untung,
@@ -585,7 +585,7 @@ class KhazanahController extends Controller
$get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan_barcode)->json();
$jumlah_bp=$get_bayaranPD[0]['total_byr_pendahuluan'];
$get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$KOD_BP])->json();
$get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_BP])->json();
$hariini_bp=$get_lejerBayaran_Pendahuluan[0]['hariini'];
$kelmarin_bp=$get_lejerBayaran_Pendahuluan[0]['kelmarin'];
@@ -598,7 +598,7 @@ class KhazanahController extends Controller
$hariini_bp=$debit_bp-$kredit_bp;
$kelmarin_bp=$jumlah_bp-$hariini_bp;
$updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
$updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_cawangan['cawangan'],[
'recno'=>$recno_bp,
'debit'=>$debit_bp,
'kredit'=>$kredit_bp,
@@ -639,7 +639,7 @@ class KhazanahController extends Controller
]);
$get_lejerPinjaman=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_Pembiayaan])->json();
$hariIni_Pinjaman=$get_lejerPinjaman[0]['hariini'];
@@ -664,7 +664,7 @@ class KhazanahController extends Controller
$get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
$bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
$get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$Untung_Semasa])->json();
$get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$Untung_Semasa])->json();
$hariini_untung=$get_lejer_Untung[0]['hariini'];
$kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
@@ -676,7 +676,7 @@ class KhazanahController extends Controller
$hariini_untung=$debit_untung-$kredit_untung;
$kelmarin_untung=$jumlah_untung-$hariini_untung;
$updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
$updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_untung,
'debit'=>$debit_untung,
'kredit'=>$kredit_untung,
@@ -687,7 +687,7 @@ class KhazanahController extends Controller
$get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan_barcode)->json();
$jumlah_bp=$get_bayaranPD[0]['total_byr_pendahuluan'];
$get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $KOD_BP])->json();
$get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=> $KOD_BP])->json();
$hariini_bp= $get_lejerBayaran_Pendahuluan[0]['hariini'];
$kelmarin_bp=$get_lejerBayaran_Pendahuluan[0]['kelmarin'];
@@ -700,7 +700,7 @@ class KhazanahController extends Controller
$hariini_bp=$debit_bp-$kredit_bp;
$kelmarin_bp=$jumlah_bp-$hariini_bp;
$updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
$updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_bp,
'debit'=>$debit_bp,
'kredit'=>$kredit_bp,
@@ -724,8 +724,58 @@ class KhazanahController extends Controller
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
//masuk dalam tunai aliran
return $this->tebus();
}
//END KHAZANAH FARIS
public function pendahuluanserah($id)
{
$array_reqteller = [];
$auth_user = Auth::user();
$api_url = config('api.url');
$gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'])->json();
foreach($reqTeller as $index=>$req)
{
if($id == $req['no'])
array_push($array_reqteller,["teller" => $req]);
}
$array_reqteller = $array_reqteller[0]['teller'];
$listUser=User::where('cawangan',$auth_user['cawangan'] )->get();
$denominasi=Http::get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
if(sizeof($denominasi) == 0)
{
$denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
}
else
{
$denominasi=$denominasi[0];
}
return view('khazanah.pendahuluanserah',compact('cawangan_info','api_url','listUser','denominasi','array_reqteller'));
}
@@ -1185,10 +1235,10 @@ class KhazanahController extends Controller
'bakiakhir' => $bakiakhir
]);
//************KIRAAN LEJER AM BERMULA ***/
$pembiayaan_tawaruq='1000/017';
$GL_Untung_Tangguh='1000/211';
$GL_Untung_Suspense='2000/007';
//************KIRAAN LEJER AM BERMULA ***/
$pembiayaan_tawaruq='1000/017';
$GL_Untung_Tangguh='1000/211';
$GL_Untung_Suspense='2000/007';
$getProduct=Http::get(config('api.url').'/api/getProduct/'.$auth_user['cawangan'])->json();
$glcode=$getProduct[0]['glcode'];
@@ -1196,6 +1246,8 @@ class KhazanahController extends Controller
$get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$glcode])->json();
$keterangan=$get_GLCode[0]['descpt'];
$acctype=$get_GLCode[0]['acttype'];
$get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$glcode])->json();
if(sizeof($get_lejer)>0)
{
@@ -2327,6 +2379,8 @@ class KhazanahController extends Controller
])->json();
}else{
$pendahuluanserahan = Http::put(config('api.url').'/api/UpdateVaultPendahuluanSerahan/'. $auth_user['cawangan'],[
'jenispendahuluanserahan' => $request->jenisgldetail,
'amaun' => $request->amaun,