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

fix aliran tunai fix penebusan

Browse Source
This commit is contained in:
hafifierahman
2021-02-09 11:22:56 +08:00
parent 4a89aa13d3
commit 0ee3c888d2
22 changed files with 7138 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+13 -3
View File
@@ -18,9 +18,8 @@ class AliranTunaiController extends Controller
public function index(){
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'] . '/' . $auth_user['name'])->json();
$alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json();
// dd($alirantunai);
if(sizeof($alirantunai) == 0)
{
$alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
@@ -36,6 +35,17 @@ class AliranTunaiController extends Controller
])->json();
}
$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];
}
$GT = Http::get(config('api.url') . '/api/countGT/' . $auth_user['cawangan'])->json();
if(sizeof($GT) > 0);
@@ -45,6 +55,6 @@ class AliranTunaiController extends Controller
$api_url = config('api.url');
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT'));
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi'));
}
}
app/Http/Controllers/GadaianController.php
-19
View File
@@ -288,25 +288,6 @@ class GadaianController extends Controller
'penilai' => $auth_user['name']
]);
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $gadai_detail['teller'])->json();
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk'];
$totalkeluar = 0;
$bakiakhir = 0;
$totalkeluar = $gadai_detail['pinjaman'] + $keluar;
$bakiakhir = $baki - $gadai_detail['pinjaman'];
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'].'/'.$gadai_detail['teller'], [
'keluar'=>$totalkeluar,
'masuk'=>$masuk,
'bakiakhir'=>$bakiakhir
]);
}
$customer = Http::get(config('api.url') . '/api/customers/'. $gadai_detail['nokp'])->json();
$customer_detail = $customer[0];
app/Http/Controllers/KhazanahController.php
+83 -32
View File
@@ -129,6 +129,8 @@ class KhazanahController extends Controller
$gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
$petibesi = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/petibesi/'. $auth_user['cawangan'])->json();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.gadaian',compact('cawangan_info','api_url','gadai','petibesi'));
}
@@ -152,7 +154,38 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_barcode)->json();
$gadai_detail = $gadai[0];
$tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan_barcode])->json();
//dd($tebus);
$tebus_detail = $tebus[0];
//dd($tebus_detail);
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json();
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk'];
$bakiawal=$getTunai2['bakiawal'];
$pendahuluan=$getTunai2['tambah'];
$serahan=$getTunai2['kurang'];
$totalmasuk = 0;
$bakiakhir = 0;
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
$bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$keluar,
'masuk'=>$totalmasuk,
'bakiakhir'=>$bakiakhir
]);
return $this->tebus();
}
@@ -174,17 +207,12 @@ class KhazanahController extends Controller
foreach($reqTeller as $index=>$req)
{
if($id == $req['no'])
array_push($array_reqteller,["teller" => $req]);
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();
@@ -490,7 +518,32 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_barcode)->json();
$gadai_detail = $gadai[0];
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $gadai_detail['teller']])->json();
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk'];
$bakiawal=$getTunai2['bakiawal'];
$pendahuluan=$getTunai2['tambah'];
$serahan=$getTunai2['kurang'];
$totalkeluar = 0;
$bakiakhir = 0;
$totalkeluar = $gadai_detail['pinjaman'] + $keluar;
$bakiakhir = $bakiawal-$totalkeluar+$masuk+$pendahuluan-$serahan;
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $gadai_detail['teller'],
'keluar' => $totalkeluar,
'masuk' => $masuk,
'bakiakhir' => $bakiakhir
]);
event(new NotifikasiPembayaran('TellerkepadaKhazanah'));
@@ -599,9 +652,9 @@ class KhazanahController extends Controller
]);
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . $request->teller,[
'no'=>$request->no
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
'kodlaluan' => $request->teller,
'no' => $request->no
]);
@@ -677,9 +730,9 @@ class KhazanahController extends Controller
]);
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . $request->teller,[
'no'=>$request->no
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
'kodlaluan' => $request->teller,
'no' => $request->no
]);
@@ -732,7 +785,7 @@ class KhazanahController extends Controller
'nota'=>$nota
]);
$getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
$getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $kodlaluan])->json();
if(sizeof($getTunai) == 0)
{
@@ -744,12 +797,13 @@ class KhazanahController extends Controller
$BakiAkhirT=0;$BakiAwalT=0;$tambahT=0;
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $kodlaluan])->json();
$bakiAwal=$getTunai2['bakiawal'];
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$kurangT=$getTunai2['kurang'];
$tam=$getTunai2['tambah'];
$masukT=$getTunai2['masuk'];
if($bakiAwal==0)
{
@@ -759,21 +813,18 @@ class KhazanahController extends Controller
{
$BakiAwalT=$bakiAwal;
}
if($keluar==0)
{
$tambahT=$tambah + $tam;
}
else
$tambahT=$keluar;
$tambahT=$tambah + $tam;
$kurang=$kurangT;
$BakiAkhirT=$BakiAwalT+$tambahT-$kurang;
$updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'].'/'.$kodlaluan, [
$keluarT = $keluar;
$bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang;
$updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
'kodlaluan'=>$kodlaluan,
'tambah'=>$tambahT,
'kurang'=>$kurang,
'bakiakhir'=>$BakiAkhirT
'bakiakhir'=>$bakiAkhirT
]);
$latestVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
@@ -781,7 +832,7 @@ class KhazanahController extends Controller
$keluarV=$latestVault[0]['keluar'];
$pendahuluanV=$latestVault[0]['pendahuluan'];
$serahanV=$latestVault[0]['serahan'];
$BakiAwalV=$latestVault[0]['bakiawal'];
$bakiAwalV=$latestVault[0]['bakiawal'];
// return;
// dd($tambahT);
@@ -790,7 +841,6 @@ class KhazanahController extends Controller
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
$bakiTerkini=$GetLatestBakiTunai;
$bakiAwalV=$BakiAwalV;
$bakiAkhirV=$bakiAwalV-$keluarV+$masukV+$pendahuluanV-$serahanV;
// $bakiEOD=$bakiAkhirV+$GetLatestBakiTunai; //try test
$bakiEOD = $bakiAkhirV;
@@ -866,7 +916,7 @@ class KhazanahController extends Controller
'kurang'=>$kurang,
'nota'=>$nota]);
$getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
$getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $kodlaluan])->json();
if(sizeof($getTunai) == 0)
{
@@ -874,7 +924,7 @@ class KhazanahController extends Controller
}
else
{
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $kodlaluan])->json();
$bakiAwalT=$getTunai2['bakiawal'];
$keluarT=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
@@ -911,7 +961,8 @@ class KhazanahController extends Controller
$bakiAkhirT=$baki_AwalT+$tambah_T+$masukT-$keluarT-$kurang_T;
$updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'].'/'.$kodlaluan, [
$updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
'kodlaluan'=>$kodlaluan,
'tambah'=>$tambah_T,
'kurang'=>$kurang_T,
'bakiakhir'=>$bakiAkhirT
app/Http/Controllers/PenebusanController.php
+41 -3
View File
@@ -34,6 +34,41 @@ class PenebusanController extends Controller
return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama'));
}
public function bayaransuransTawarruq(Request $request)
{
$api_url = config('api.url');
$updategadai = Http::put(config('api.url').'/api/gadaikaunter/'. $request->kodcaw .'/norujukan/' . $request->norujukan,[
'bayaran' => $request->bayaran,
'teller' => $request->teller
])->json();
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$request->kodcaw,['kodlaluan' => $request->teller])->json();
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk'];
$bakiawal=$getTunai2['bakiawal'];
$pendahuluan=$getTunai2['tambah'];
$serahan=$getTunai2['kurang'];
$totalmasuk = 0;
$bakiakhir = 0;
$totalmasuk = $request->bayaran + $masuk;
$bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$request->kodcaw, [
'kodlaluan' => $request->teller,
'keluar' => $keluar,
'masuk' => $totalmasuk,
'bakiakhir' => $bakiakhir
]);
return response()->json($updateTunai,200);
}
public function bayaransurans(Request $request)
{
$api_url = config('api.url');
@@ -62,7 +97,8 @@ class PenebusanController extends Controller
'nowakil' => $request->nowakil,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun,
'jenisbayarantebus' => $request->jenisbayarantebus
'jenisbayarantebus' => $request->jenisbayarantebus,
'teller' => $request->teller
])->json();
//////////////////////
@@ -183,7 +219,8 @@ class PenebusanController extends Controller
'bakiupah' => $request->bakiupah,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun,
'jenisbayarantebus' => $request->jenisbayarantebus
'jenisbayarantebus' => $request->jenisbayarantebus,
'teller' => $request->teller
])->json();
//////////////////////
@@ -304,7 +341,8 @@ class PenebusanController extends Controller
'nowakil' => $request->nowakil,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun,
'jenisbayarantebus' => $request->jenisbayarantebus
'jenisbayarantebus' => $request->jenisbayarantebus,
'teller' => $request->teller
])->json();