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

Merged in bugfix/auditTrail (pull request #224)

Browse Source 
Bugfix/auditTrail
This commit is contained in:
Ain Izazi Aziz
2024-12-31 05:04:03 +00:00
parent e09f0fb401 f9a43ac639
commit 1d87368d43
6 changed files with 121 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/LoginController.php
+17
View File
@@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Http;
use App\Dashboard;
use App\User;
use Carbon\Carbon;
class LoginController extends Controller
{
@@ -62,6 +63,7 @@ class LoginController extends Controller
$credentials = $request->only('email', 'password');
if (Auth::guard('web')->attempt($credentials)) {
$auth_user = Auth::guard('web')->user();
$api_url = config('api.url');
if($auth_user['roles'] == 'teller'){
@@ -147,8 +149,23 @@ class LoginController extends Controller
}
public function logout(){
$current = Carbon::now();
$current = new Carbon();
$current = $current->toDateString();
$auth_user = Auth::guard('web')->user();
Auth::logout();
Session::flush();
$session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logoutsession/' . $auth_user['cawangan'], [
'id' => $auth_user['id'],
'nama' => $auth_user['name'],
'nokp' => $auth_user['no_kp'],
'email' => $auth_user['email'],
'taraf' => $auth_user['role_harian'],
'tarikh' => $current,
]);
return Redirect::to('/');
}
app/Http/Controllers/ChangePasswordController.php
+11
View File
@@ -8,6 +8,7 @@ use App\Rules\MatchOldPassword;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Http;
use App\User;
use Carbon\Carbon;
class ChangePasswordController extends Controller
{
@@ -28,7 +29,10 @@ class ChangePasswordController extends Controller
*/
public function index()
{
$auth_user = Auth::user();
// dd($cawangan_info);
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('user.update_password',compact('cawangan_info'));
}
@@ -40,12 +44,19 @@ class ChangePasswordController extends Controller
*/
public function store(Request $request)
{
$auth_user = Auth::user();
$request->validate([
'current_password' => ['required', new MatchOldPassword],
'new_password' => ['required'],
'new_confirm_password' => ['same:new_password'],
]);
$id = auth()->user()->id;
// dd($auth_user['name']);
$auth_user = Http::withOptions(['verify' => config('app.api_verify')]) ->post(config('api.url') . '/api/changepassword/' . $auth_user['cawangan'] . '/' . $id, ['nama' => $auth_user['name']])->json();
User::find(auth()->user()->id)->update(['password'=> Hash::make($request->new_password)]);
return redirect()->route('profile');
app/Http/Controllers/HomeController.php
+22 -2
View File
@@ -35,13 +35,13 @@ class HomeController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$check_nokp = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/checknokp/' . $auth_user['cawangan'] . '/' . $auth_user['no_kp'] . '/' . $current) ->json();
if($check_nokp == $auth_user['no_kp']){
if(session()->has('iklan') && session()->get('iklan') == 0)
{
session()->put('iklan', 1);
@@ -75,10 +75,30 @@ class HomeController extends Controller
$countkhazanah = sizeof($gadai) + sizeof($listserah);
$session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logsession/' . $auth_user['cawangan'], [
'id' => $auth_user['id'],
'nama' => $auth_user['name'],
'nokp' => $auth_user['no_kp'],
'email' => $auth_user['email'],
'taraf' => $auth_user['role_harian'],
'tarikh' => $current,
]);
return view('homepage.khazanah.home',compact('cawangan_info','api_url','countkhazanah'));
}
else{
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logsession/' . $auth_user['cawangan'], [
'id' => $auth_user['id'],
'nama' => $auth_user['name'],
'nokp' => $auth_user['no_kp'],
'email' => $auth_user['email'],
'taraf' => $auth_user['role_harian'],
'tarikh' => $current,
]);
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}
app/Http/Controllers/KakitanganController.php
+11 -2
View File
@@ -199,12 +199,21 @@ class KakitanganController extends Controller
}
public function tukarcawanganUpdate(Request $request){
$auth_user = Auth::user();
$user = User::find($request->user_id);
$old_data = $user->toArray();
$user->cawangan = $request->cawangan;
$user->roles = $request->role;
$user->role_harian = $request->role;
$user->save();
$auth_user = Auth::user();
$new_data = $user->toArray();
$id = auth()->user()->id;
Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/tukarcawangan/'. $auth_user['cawangan'],['namaoperasi' => $auth_user['name'],'old_data' => $old_data,'new_data' => $new_data ])->json();
if($auth_user->roles == 'operasi'){
return redirect()->route('daftar.kakitangan');
@@ -221,7 +230,7 @@ class KakitanganController extends Controller
// if($auth_user->roles == 'operasi'){
// // return redirect()->route('daftar.kakitangan');
// return "route('daftar.kakitangan')";
// return "route('daftar.kakitangan')";
// }else if($auth_user->roles == 'admin'){
// // return redirect()->route('admin.daftar.kakitangan');
// return "route('admin.daftar.kakitangan')";
@@ -251,7 +260,7 @@ class KakitanganController extends Controller
$user->password = Hash::make($request->nokp);
$user->save();
if($auth_user->roles == 'operasi'){
return redirect()->route('daftar.kakitangan');
}else if($auth_user->roles == 'admin'){
app/Http/Controllers/KhazanahController.php
+54 -35
View File
@@ -389,7 +389,7 @@ class KhazanahController extends Controller
{
$auth_user = Auth::user();
$update=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
$update=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode,['nama' => Auth::user()->name])->json();
if($update == 'success')
{
@@ -951,7 +951,9 @@ class KhazanahController extends Controller
$updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
'kodlaluan' => $request->teller,
'no' => $request->no
'no' => $request->no,
'jenis' =>'pendahuluan',
'khazanah' => Auth::user()->name
]);
@@ -1031,8 +1033,9 @@ class KhazanahController extends Controller
$updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
'kodlaluan' => $request->teller,
'no' => $request->no
'no' => $request->no,
'jenis' => 'serahan',
'khazanah' => Auth::user()->name
]);
return redirect()->route('khazanah.serahan');
@@ -1740,7 +1743,7 @@ class KhazanahController extends Controller
$tarikh_cetak = $current->toDateString();
$kod_cawangan = $auth_user['cawangan'];
if($request->dateringkasanharian == null){
$startDate = $current->toDateString();
}else{
@@ -1754,22 +1757,22 @@ class KhazanahController extends Controller
$split_date = explode('-',$request->dateringkasanharian);
$endDate = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$laporan_ringkasan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/ringkasan-harian/' . $kod_cawangan,[
'startDate' => $startDate,
'endDate' => $endDate,
])->json();
])->json();
$laporan = $laporan_ringkasan[0];
$kawalanstok = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/reports/kawalan-stok/' . $kod_cawangan, [
'startDate' => $startDate,
'endDate' => $endDate,
])->json();
/* Kawalan Stok */
//Gadai
$totalbilgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadai3'][0]['bil'];
@@ -1936,6 +1939,22 @@ class KhazanahController extends Controller
$ppc = User::where([['roles','=','ppc'],['cawangan','=',$auth_user['cawangan']]])->first();
$pc = User::where([['roles','=','pc'],['cawangan','=',$auth_user['cawangan']]])->first();
$old_data = [
'teller' => $teller->pluck('name')->toArray(),
'khazanah' => $khazanah->pluck('name')->toArray(),
'pc'=> $pc ? $pc->name : null,
'ppc' => $ppc ? $ppc->name : null,
];
$new_data = [
'teller' => $teller->pluck('name')->toArray(),
'khazanah' => $khazanah->pluck('name')->toArray(),
'pc' => $pc ? $pc->name : null,
'ppc' => $ppc ? $ppc->name : null,
];
Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url'). '/api/kakitangan/'. $auth_user['cawangan'], ['namaoperasi' => $auth_user['name'],'new_data' => $new_data])->json();
return view('khazanah.kakitangan',compact('cawangan_info','api_url','teller','khazanah','pc','ppc'));
}
@@ -1983,11 +2002,11 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$data_sebenar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'sebenar'])->json();
$data_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'datalelong'])->json();
$data_filter = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'filter'])->json();
return view('khazanah.bajet',compact('cawangan_info','api_url','data_sebenar','data_lelong','data_filter'));
}
@@ -2694,34 +2713,34 @@ class KhazanahController extends Controller
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){
$gadai_date = $current->toDateString();
} else {
$split_date = explode('-', $request->datetimepicker1);
$gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
// Fetching the data from API
$tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])
->get(config('api.url') . '/api/TuntutBakiTarikh/' . $auth_user['cawangan'], ['tarikh' => $gadai_date])
->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])
->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan'])
->json();
// Check if $tuntutbaki is an array and not empty before sending it to the view
if (!is_array($tuntutbaki) || empty($tuntutbaki)) {
$tuntutbaki = []; // If not valid, set it to an empty array
}
$cawangan_detail = $cawangan[0] ?? null;
$cawangan_detail = $cawangan[0] ?? null;
return view('print.laporan_tuntutbaki', compact('tuntutbaki', 'cawangan_detail', 'tarikh_cetak', 'gadai_date', 'api_url'));
}
@@ -3874,12 +3893,12 @@ class KhazanahController extends Controller
if($request->datetimepicker2 == null){
$tarikh_cetak = $current->toDateString();
}else{
$split_date = explode('-',$request->datetimepicker2);
$tarikh_imbangan2 = $request->datetimepicker2;
$split_date = explode('-',$request->datetimepicker2);
$tarikh_imbangan2 = $request->datetimepicker2;
}
$tarikh_imbangan2 = new Carbon($tarikh_imbangan2);
// if($tarikh_imbangan2 < $current->toDateString()){
if($tarikh_imbangan2 < $current->toDateString()){
@@ -3933,12 +3952,12 @@ class KhazanahController extends Controller
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$stokaudit_aktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/aktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json();
$stokaudit_takaktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json();
$stokaudit_takaktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json();
// return view('print.laporan_stokauditbelumaktif', compact('stokaudit','cawangan_detail','tarikh_cetak','stokaudit_date','api_url'));
return view('print.laporan_stokauditcombine', compact('stokaudit_aktif','stokaudit_takaktif','cawangan_detail','tarikh_cetak','stokaudit_date','api_url'));
}
@@ -4025,7 +4044,7 @@ class KhazanahController extends Controller
$cawangan_detail=$cawangan[0];
return view('print.laporan_tebus_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran','totalkeuntunganrebet'));
}
public function laporanAnsuranUjrah(){
$auth_user = Auth::user();
$api_url = config('api.url');
@@ -4055,12 +4074,12 @@ class KhazanahController extends Controller
$split_date = explode('-', $request->datehingga);
$hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/ansuranujrah/laporan/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
return view('print.laporan_ansuran_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
}
}
public function laporanStokAuditKhas(){
$auth_user = Auth::user();
@@ -4108,7 +4127,7 @@ class KhazanahController extends Controller
$cawangan_detail=$cawangan[0];
$stokaudit = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokauditkhas/aktif/'. $auth_user['cawangan'],['daritempoh' => $daritempoh, 'hinggatempoh' => $hinggatempoh])->json();
if($request->type == 'excel')
{
return view('excel.excel_stokauditkhas', compact('stokaudit','cawangan_detail','tarikh_cetak','daritempoh','hinggatempoh','api_url','cawangan_info'));
@@ -4126,7 +4145,7 @@ class KhazanahController extends Controller
return redirect()->route('laporan.stokauditkhas')
->with('failed','Blast Whatsapp Tidak Berjaya, Sila Semak Semula Rekod Blasted.');
}
}
else
{
@@ -4252,7 +4271,7 @@ class KhazanahController extends Controller
$kodcaw = $auth_user['cawangan'];
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'.$auth_user['cawangan'])->json();
$bycawnotisperingatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/cawangan/bycawnotisperingatan/'.$auth_user['cawangan'].'/'.$notisid)->json();
return view('callcenter.khazanah.bycawdetailnotisperingatan',compact('cawangan_info','bycawnotisperingatan','kodcaw','notisid','api_url'));
}
app/Http/Controllers/WakilController.php
+6 -4
View File
@@ -121,13 +121,13 @@ class WakilController extends Controller
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/' . $norujukan)->json();
$gadai_details = $gadai[0][0];
$noic = $gadai_details['nokp'];
$customer_detail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/' . $noic)->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan'])->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan'])->json();
$cawangan_detail = $cawangan[0];
$nosiri = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/nosiri/wakil/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
// $nosiri = $getNoSiri[0];
@@ -166,6 +166,7 @@ class WakilController extends Controller
'no_surat' => $no_surat,
'norujukan' => $norujukan,
't_cetak' => $t_cetak,
'nama' => Auth::user()->name,
]);
@@ -257,6 +258,7 @@ class WakilController extends Controller
'no_surat' => $no_surat,
'norujukan' => $norujukan,
't_cetak' => $t_cetak,
'nama' => Auth::user()->name,
]);