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

admin page

Browse Source
This commit is contained in:
afiq
2021-08-08 01:44:43 +08:00
parent 78841016d8
commit 67e39f5086
16 changed files with 385 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KakitanganController.php
+65 -9
View File
@@ -23,11 +23,11 @@ class KakitanganController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$role = Role::get();
$kakitangan = User::all();
return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role','kakitangan'));
return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role','kakitangan','auth_user'));
}
public function registerStaff(Request $request){
$auth_user = Auth::user();
$validated = $request->validate([
'nama' => 'required',
'email' => 'required|email',
@@ -38,7 +38,7 @@ class KakitanganController extends Controller
if($request->role == 'operasi'){
$new_dashboard = Dashboard::create([
'name' => $request->nama,
'name' => strtoupper($request->nama),
'email' => $request->email,
'password' => Hash::make($request->nokp),
'no_kp' => $request->nokp,
@@ -48,7 +48,7 @@ class KakitanganController extends Controller
}
$new_staff = User::create([
'name' => $request->nama,
'name' => strtoupper($request->nama),
'email' => $request->email,
'password' => Hash::make($request->nokp),
'no_kp' => $request->nokp,
@@ -57,7 +57,11 @@ class KakitanganController extends Controller
'cawangan' => $request->cawangan
]);
return redirect()->route('daftar.kakitangan');
if($auth_user->roles == 'operasi'){
return redirect()->route('daftar.kakitangan');
}else if($auth_user->roles == 'admin'){
return redirect()->route('admin.daftar.kakitangan');
}
}
public function kakitanganHarian(Request $request){
@@ -126,7 +130,8 @@ class KakitanganController extends Controller
$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'));
return view('operasi.tukar_taraf',compact('cawangan_info','api_url','role','user','auth_user'));
}
public function tukartarafUpdate(Request $request){
@@ -144,7 +149,13 @@ class KakitanganController extends Controller
}
}
return redirect()->route('daftar.kakitangan');
$auth_user = Auth::user();
if($auth_user->roles == 'operasi'){
return redirect()->route('daftar.kakitangan');
}else if($auth_user->roles == 'admin'){
return redirect()->route('admin.daftar.kakitangan');
}
}
public function tukarcawangan(Request $request){
@@ -153,7 +164,8 @@ class KakitanganController extends Controller
$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'));
return view('operasi.tukar_cawangan',compact('cawangan_info','api_url','role','user','auth_user'));
}
public function tukarcawanganUpdate(Request $request){
@@ -162,7 +174,51 @@ class KakitanganController extends Controller
$user->roles = $request->role;
$user->role_harian = $request->role;
$user->save();
$auth_user = Auth::user();
return redirect()->route('daftar.kakitangan');
if($auth_user->roles == 'operasi'){
return redirect()->route('daftar.kakitangan');
}else if($auth_user->roles == 'admin'){
return redirect()->route('admin.daftar.kakitangan');
}
}
public function deleteKakitangan(Request $request){
// dd($request->all());
$user = User::find($request->staff_id);
$user->delete();
// dd($user_delete);
return redirect()->route('admin.daftar.kakitangan');
}
public function editKakitangan(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.edit_kakitangan',compact('cawangan_info','api_url','role','user','auth_user'));
}
public function editStoreKakitangan(Request $request){
// dd($request->all());
$user = User::find($request->user_id);
$user->name = strtoupper($request->nama);
$user->email = $request->email;
$user->no_kp = $request->nokp;
$user->no_telefon = $request->telefon;
$user->perubatan = $request->perubatan;
$user->password = Hash::make($request->nokp);
$user->save();
return redirect()->route('admin.daftar.kakitangan');
}
public function resetCredentials(Request $request){
$user = User::find($request->id);
$user->password = Hash::make(config('app.reset_password'));
$user->save();
return redirect()->route('admin.daftar.kakitangan');
}
}
app/Http/Controllers/KhazanahController.php
+29 -109
View File
@@ -347,68 +347,57 @@ class KhazanahController extends Controller
$jum_bayaran=Http::get(config('api.url').'/api/transaction/one/'.$request->norujukan_barcode)->json();
$jumlah_bayaran=$jum_bayaran['duit_masuk'];
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
if($tebus_detail['jenistebus'] == 'P')
if($update == 'success'){
if($tebus_detail['jenistebus'] == 'P')
{
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$keluar,
'masuk'=>$totalmasuk,
'bakiakhir'=>$bakiakhir
]);
if($updateTunai)
{
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
}
else
{
if(empty($updateTunai)){
dd('x masuk aliran tunai');
}
}else{
if($tebus_detail['jenistebus'] == 'S')
{
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$keluar,
'masuk'=>$totalmasuk,
'bakiakhir'=>$bakiakhir
]);
if($updateTunai)
{
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
}
else
{
dd('x masuk aliran tunai');
}
}else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$keluar,
'masuk'=>$totalmasuk,
'bakiakhir'=>$bakiakhir
]);
]);
if(empty($updateTunai)){
dd('x masuk aliran tunai');
}
}else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$keluar,
'masuk'=>$totalmasuk,
'bakiakhir'=>$bakiakhir
]);
if($updateTunai)
{
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
}
else
{
dd('x masuk aliran tunai');
}
if(empty($updateTunai)){
dd('x masuk aliran tunai');
}
}
}
}
return redirect()->route('khazanah.tebus');
}
@@ -1053,7 +1042,7 @@ class KhazanahController extends Controller
public function barcodescanned(Request $request){
$auth_user = Auth::user();
$gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json();
$scan_barcode = 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];
@@ -1616,29 +1605,6 @@ class KhazanahController extends Controller
}
public function cetakLaporanPenebusan(Request $request){
<<<<<<< HEAD
// dd($request);
$api_url = config('api.url');
$auth_user = Auth::user();
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datetarikh == null){
$tebus_date = $current->toDateString();
}else{
$split_date = explode('-',$request->datetarikh);
$tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
$tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
$upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
// dd($gadai);
return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama'));
=======
// dd($request);
$api_url = config('api.url');
$auth_user = Auth::user();
@@ -1660,7 +1626,6 @@ class KhazanahController extends Controller
$cawangan_detail=$cawangan[0];
// dd($gadai);
return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','ansuran','api_url','upahlama'));
>>>>>>> 27fa6fea0b75fd362cd3b571579fc9ce77c8d5ca
}
public function laporanLelongan(){
@@ -1854,22 +1819,6 @@ class KhazanahController extends Controller
}
public function laporanStokAudit(){
$auth_user = Auth::user();
$api_url = config('api.url');
@@ -2051,15 +2000,6 @@ class KhazanahController extends Controller
return view('khazanah.laporan.ringkasanharian',compact('cawangan_info','api_url'));
}
public function laporanRingkasanTerkumpul(){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.laporan.ringkasanterkumpul',compact('cawangan_info','api_url'));
}
public function cetakLaporanRingkasanHarian(Request $request){
$api_url = config('api.url');
@@ -2643,12 +2583,8 @@ class KhazanahController extends Controller
$upahsimpanxtra = $xtra['upahsimpan'];
$bakilelongxtra = $xtra['bakilelong'];
$utgterkumpulxtra = $xtra['untungrugiterkumpul'];
<<<<<<< HEAD
$rugilelongxtra = -($xtra['kerugianlelong']);
=======
$rugilelongxtra = -($xtra['kerugianlelong']);
$peruntukanhapuskira = ($xtra['phapuskira']);
>>>>>>> 27fa6fea0b75fd362cd3b571579fc9ce77c8d5ca
}
//Terkumpul
@@ -2764,23 +2700,7 @@ class KhazanahController extends Controller
else{
$split_date = explode('-',$request->datetimepicker2);
$tarikh_akhir = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
<<<<<<< HEAD
}
//KIRAAN UNTUK LEJER_AM BAYARAN ONLINE & TRANSAKSI BAYARAN UPAH
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$debit=Http::get(config('api.url').'/api/glejer/sumDebit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
$kredit=Http::get(config('api.url').'/api/glejer/sumKredit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
$data=Http::get(config('api.url').'/api/glejer/getdata/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
=======
}
>>>>>>> 27fa6fea0b75fd362cd3b571579fc9ce77c8d5ca
//Calculation Imbang Duga
$imbangduga = Http::get(config('api.url').'/api/PendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();