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

resolve conflict

Browse Source
This commit is contained in:
afiq
2021-08-06 09:34:49 +08:00
parent 9c88047218 27fa6fea0b
commit ecaa6a7357
66 changed files with 2234 additions and 4384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+15 -1118
View File
File diff suppressed because it is too large Load Diff
app/Http/Controllers/Auth/LoginController.php
+11 -5
View File
@@ -65,21 +65,27 @@ class LoginController extends Controller
if($auth_user['roles'] == 'teller'){
if($auth_user['role_harian'] == 'teller'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url'));
// return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url'));
return redirect()->route('home');
}elseif($auth_user['role_harian'] == 'penilai'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json();
$gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
// return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
return redirect()->route('home');
}else{
return view('not_assign');
}
}
elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
// return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
return redirect()->route('home');
}
elseif($auth_user['roles'] == 'operasi'){
else{
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
// return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
return redirect()->route('home');
}
}
app/Http/Controllers/HomeController.php
+4 -1
View File
@@ -39,12 +39,15 @@ class HomeController extends Controller
$gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
}
else{
return view('not_assign');
}
}
elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
}
elseif($auth_user['roles'] == 'operasi'){
else{
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}
app/Http/Controllers/KakitanganController.php
+75 -1
View File
@@ -22,7 +22,8 @@ class KakitanganController extends Controller
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$role = Role::get();
return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role'));
$kakitangan = User::all();
return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role','kakitangan'));
}
public function registerStaff(Request $request){
@@ -89,6 +90,79 @@ class KakitanganController extends Controller
));
}
// Check teller tak serah baki tunai untuk generate balik
$tunaisemalam = Http::get(config('api.url') . '/api/GetTunaiSemalam/'. $auth_user['cawangan'])->json();
if (sizeof($tunaisemalam) > 0)
{
foreach($tunaisemalam as $index=>$tunsem){
$latesttunai = Http::get(config('api.url') . '/api/GetCurrentTunai/'. $auth_user['cawangan'], ['kodlaluan' => $tunsem['kodlaluan']])->json();
if(sizeof($latesttunai) == 0)
{
$alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
'kodcaw' => $tunsem['kodcaw'],
'teller' => $tunsem['kodlaluan'],
'bakiawal' => $tunsem['baki'],
'masuk' => 0.00,
'yuran' => 0.00,
'keluar' => 0.00,
'baki' => $tunsem['baki'],
'tambah' => 0.00,
'kurang' => 0.00
])->json();
}
}
}
return redirect()->route('home');
}
public function tukartaraf(Request $request){
$api_url = config('api.url');
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$user = User::find($request->id);
$role = Role::get();
return view('operasi.tukar_taraf',compact('cawangan_info','api_url','role','user'));
}
public function tukartarafUpdate(Request $request){
$user = User::find($request->user_id);
if($user->role_harian == null){
if($user->role_asal == 'pc'){
$user->roles = $request->role;
$user->save();
}
}else{
if($user->role_asal == 'pc'){
$user->roles = $request->role;
$user->role_harian = $request->role;
$user->save();
}
}
return redirect()->route('daftar.kakitangan');
}
public function tukarcawangan(Request $request){
$api_url = config('api.url');
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$user = User::find($request->id);
$role = Role::get();
return view('operasi.tukar_cawangan',compact('cawangan_info','api_url','role','user'));
}
public function tukarcawanganUpdate(Request $request){
$user = User::find($request->user_id);
$user->cawangan = $request->cawangan;
$user->roles = $request->role;
$user->role_harian = $request->role;
$user->save();
return redirect()->route('daftar.kakitangan');
}
}
app/Http/Controllers/KhazanahController.php
+333 -1743
View File
File diff suppressed because it is too large Load Diff
app/Http/Controllers/OperasiController.php
+12 -2
View File
@@ -88,24 +88,26 @@ class OperasiController extends Controller
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$request->teller));
}
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 2,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller));
}
}
@@ -185,4 +187,12 @@ class OperasiController extends Controller
return view('operasi.hargaemas',compact('cawangan_info','api_url','harga_emas'));
}
public function margin(){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$margin_pembiayaan = Http::get(config('api.url') . '/api/maxpinjaman')->json();
return view('operasi.margin_pembiayaan',compact('cawangan_info','api_url','margin_pembiayaan'));
}
}
app/Http/Controllers/PenebusanController.php
+9 -213
View File
@@ -93,15 +93,15 @@ class PenebusanController extends Controller
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
$bakiakhir = $baki + $request->bayaran;
// Add on 20210411
$gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $request->kodcaw.'/'.$request->norujukan)->json();
$tempohGadai=$gadaidetail[0]['tempoh'];
$upah12bulan=$gadaidetail[0]['upah12'];
$bakiPinjaman=$gadaidetail[0]['bakipjm'];
$teller=$gadaidetail[0]['teller'];
$upah6bulan= $upah12bulan/2; //add on 202104011
$tempoh_bayar=$gadaidetail[0]['tempohbayar']; //add on 202104011
$tarikhgadai=$gadaidetail[0]['t_gadai'];//Add on 20210411
// // Add on 20210411
// $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $request->kodcaw.'/'.$request->norujukan)->json();
// $tempohGadai=$gadaidetail[0]['tempoh'];
// $upah12bulan=$gadaidetail[0]['upah12'];
// $bakiPinjaman=$gadaidetail[0]['bakipjm'];
// $teller=$gadaidetail[0]['teller'];
// $upah6bulan= $upah12bulan/2; //add on 202104011
// $tempoh_bayar=$gadaidetail[0]['tempohbayar']; //add on 202104011
// $tarikhgadai=$gadaidetail[0]['t_gadai'];//Add on 20210411
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$request->kodcaw, [
@@ -111,210 +111,6 @@ class PenebusanController extends Controller
'bakiakhir' => $bakiakhir
]);
//************** KIRAAN LEJER AM BERMULA ****************
$Bayaran_Pendahuluan='1000/019';
$GL_CODE='1000/010';
$KOD_PINJAMAN='1000/017';
$KOD_UT='1000/211';
$KOD_US='2000/007';
$Untung_Semasa='5000/017';
$KOD_ANS='5000/511';
$jumlahBayaran_ansuran=Http::get(config('api.url').'/api/ansuranByrKaunter/'.$request->kodcaw.'/'.$request->norujukan)->json();
$jumlah_telah_bayaransuran=$jumlahBayaran_ansuran[0]['cash_in'];
$jumbayaran=$request->bayaran;
$Transaksi_keuntungan=Http::get(config('api.url').'/api/transaksi_keuntungan/'.$request->norujukan)->json();
$bayaran_keuntungan=$Transaksi_keuntungan[0]['bayaran_keuntungan'];
$bayaran_pembiayaan=$Transaksi_keuntungan[0]['bayaran_pembiayaan'];
$tarikh_bayaran=$Transaksi_keuntungan[0]['tarikh_bayaran'];
//tahun gadaian
$tahun_gadai=substr($tarikhgadai,0,4);
$month_gadai=substr($tarikhgadai, 5,2);
// bulan gadaian
$year_bayar=substr($tarikh_bayaran, 0, 4);
$month_bayar=substr($tarikh_bayaran, 5,2);
$get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan)->json();
$bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
$bayaran_latest_pendahuluan=$get_latest_bayarUntung[0]['bayaran_pembiayaan'];
$hargajualan=$gadaidetail[0]['hargajualan'];
//ansuran tawaruq
//check sama ada jumlah bayaran melebihi keuntungan semasa..kalau lebih dia akan masuk dalam bayaran pendahuluan...
if($jumbayaran<$bayaran_keuntungan)
{
$LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $GL_CODE])->json();
$hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
$kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
$jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
$debit_Tunai=$LejerTunaiDitangan[0]['debit'];
$recno_Tunai=$LejerTunaiDitangan[0]['recno'];
$kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
$debit_Tunai=$debit_Tunai+$jumbayaran;
$hariIni_Tunai=$debit_Tunai-$kredit_Tunai;
$kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai;
$update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
'recno'=>$recno_Tunai,
'debit'=>$debit_Tunai,
'kredit'=>$kredit_Tunai,
'hariini'=>$hariIni_Tunai,
'kelmarin'=>$kelmarin_Tunai,
]);
$get_lejerBP=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $Bayaran_Pendahuluan])->json();
$hariini_BP=$get_lejerBP[0]['hariini'];
$kelmarin_BP=$get_lejerBP[0]['kelmarin'];
$jumlah_BP=$get_lejerBP[0]['jumlah'];
$debit_BP= $get_lejerBP[0]['debit'];
$recno_BP= $get_lejerBP[0]['recno'];
$kredit_BP= $get_lejerBP[0]['kredit'];
$kredit_BP=$kredit_BP+$bayaran_latest_pendahuluan;
$hariini_BP=$debit_BP-$kredit_BP;
$kelmarin_BP=$jumlah_BP-$hariini_BP;
$updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
'recno'=>$recno_BP,
'debit'=>$debit_BP,
'kredit'=>$kredit_BP,
'hariini'=>$hariini_BP,
'kelmarin' =>$kelmarin_BP,
]);
$get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan)->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();
$hariini_untung=$get_lejer_Untung[0]['hariini'];
$kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
$jumlah_untung=$get_lejer_Untung[0]['jumlah'];
$debit_untung=$get_lejer_Untung [0]['debit'];
$recno_untung=$get_lejer_Untung [0]['recno'];
$kredit_untung=$get_lejer_Untung [0]['kredit'];
$kredit_untung=$kredit_untung+$bayaran_latest_untung;
$hariini_untung=$debit_untung-$kredit_untung;
$kelmarin_untung=$jumlah_untung-$hariini_untung;
$updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
'recno'=>$recno_untung,
'debit'=>$debit_untung,
'kredit'=>$kredit_untung,
'hariini'=>$hariini_untung,
'kelmarin' =>$kelmarin_untung,
]);
}
else
{
$LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $GL_CODE])->json();
$hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
$kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
$jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
$debit_Tunai=$LejerTunaiDitangan[0]['debit'];
$recno_Tunai=$LejerTunaiDitangan[0]['recno'];
$kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
$debit_Tunai=$debit_Tunai+$jumbayaran;
$hariini_Tunai=$debit_Tunai-$kredit_Tunai;
$kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
$update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
'recno'=>$recno_Tunai,
'debit'=>$debit_Tunai,
'kredit'=>$kredit_Tunai,
'hariini'=>$hariini_Tunai,
'kelmarin'=>$kelmarin_Tunai,
]);
$get_lejerBP=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $Bayaran_Pendahuluan])->json();
$hariini_BP=$get_lejerBP[0]['hariini'];
$kelmarin_BP=$get_lejerBP[0]['kelmarin'];
$jumlah_BP=$get_lejerBP[0]['jumlah'];
$debit_BP= $get_lejerBP[0]['debit'];
$recno_BP= $get_lejerBP[0]['recno'];
$kredit_BP= $get_lejerBP[0]['kredit'];
$kredit_BP=$kredit_BP+$bayaran_latest_pendahuluan;
$hariini_BP=$debit_BP-$kredit_BP;
$kelmarin_BP=$jumlah_BP-$hariini_BP;
$updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
'recno'=>$recno_BP,
'debit'=>$debit_BP,
'kredit'=>$kredit_BP,
'hariini'=>$hariini_BP,
'kelmarin' =>$kelmarin_BP,
]);
$get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan)->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();
$hariini_untung=$get_lejer_Untung[0]['hariini'];
$kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
$jumlah_untung=$get_lejer_Untung[0]['jumlah'];
$debit_untung=$get_lejer_Untung [0]['debit'];
$recno_untung=$get_lejer_Untung [0]['recno'];
$kredit_untung=$get_lejer_Untung [0]['kredit'];
$kredit_untung=$kredit_untung+$bayaran_latest_untung;
$hariini_untung=$debit_untung-$kredit_untung;
$kelmarin_untung=$jumlah_untung-$hariini_untung;
$updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
'recno'=>$recno_untung,
'debit'=>$debit_untung,
'kredit'=>$kredit_untung,
'hariini'=>$hariini_untung,
'kelmarin' =>$kelmarin_untung,
]);
}
// end kiraan lejer am untuk tawaruq
//***************KIRAAN LEJER AM TAMAT*******************************
return response()->json($updateTunai,200);
}
app/Http/Controllers/UserController.php
+5 -1
View File
@@ -18,6 +18,10 @@ class UserController extends Controller
$api_url = config('api.url');
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('user.index',compact('cawangan_info','api_url'));
if($auth_user->roles == 'teller' || $auth_user->roles == 'ppc' || $auth_user->roles == 'pc'){
return view('user.index',compact('cawangan_info','api_url','auth_user'));
}else{
return view('user.index_operasi',compact('cawangan_info','api_url','auth_user'));
}
}
}