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

Merge remote-tracking branch 'origin/new-super' into afiqhamzah-feat-mykad-reader-registration

Browse Source
This commit is contained in:
afiq.hamzah
2022-12-26 11:56:00 +08:00
parent 6c40b6eec6 c744e23288
commit 18c066c2f1
24 changed files with 1278 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+61 -3
View File
@@ -2,6 +2,8 @@
namespace App\Http\Controllers;
use App\Services\ImbangdugaServices as ImbanganDuga;
//Events
use App\Events\StatusLiked;
use App\Events\NotifikasiPembayaran;
@@ -1149,7 +1151,7 @@ class KhazanahController extends Controller
]);
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan']));
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan'],$request->teller));
$updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
'kodlaluan' => $request->teller,
@@ -1229,7 +1231,7 @@ class KhazanahController extends Controller
]);
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan']));
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan'],$request->teller));
$updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
'kodlaluan' => $request->teller,
@@ -3079,7 +3081,7 @@ class KhazanahController extends Controller
'kodlaluan'=>$kodlaluan
]);
event(new PendahuluanSerahan("Batal",$auth_user['cawangan']));
event(new PendahuluanSerahan("Batal",$auth_user['cawangan'],$kodlaluan));
return response('Berjaya');
}
@@ -4109,4 +4111,60 @@ class KhazanahController extends Controller
return view('print.laporan_serahmarhun', compact('cawangan_detail','api_url','serahmarhun','cawangan_info','datemula','datehingga','tarikh_cetak'));
}
public function ImbangDugaAkru(){
$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();
return view('khazanah.laporan.imbangduga_akru', compact('cawangan_info','api_url'));
}
public function cetakimbangdugaAkru(Request $request){
$auth_user = Auth::user();
$api_url = config('api.url');
$current = Carbon::now();
$current = new Carbon();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $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];
$tarikh_cetak = $current->toDateString();
$tarikh_imbangan= $current->toDateString();
$tarikh_imbangan2= $current->toDateString();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker2 == null){
$tarikh_cetak = $current->toDateString();
}else{
$split_date = explode('-',$request->datetimepicker2);
$tarikh_imbangan2 = $request->datetimepicker2;
}
if($tarikh_imbangan2 < $current->toDateString()){
$response = (new ImbanganDuga())->GetImbangDugaBackup($auth_user['cawangan'],$request->datetimepicker2);
}else{
$response = (new ImbanganDuga())->ViewImbangDugaAROS($auth_user['cawangan'],$tarikh_imbangan2);
}
if($response->getContent() == 'notfound')
{
return redirect()->route('laporan.imbangdugaakru')->with('error','Tiada Rekod Dijumpai Dalam Imbang Duga Backup!');
}
$array_ig = json_decode($response->getContent());
$hartasemasa = $array_ig->array_harta;
$tanggungansemasa = $array_ig->array_tanggungan;
$totalhartasemasa = $array_ig->sum_harta;
$totaltanggungansemasa = $array_ig->sum_tanggungan;
return view('print.laporan_imbangduga-akru',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
}
}
app/Http/Controllers/UserController.php
+31
View File
@@ -24,4 +24,35 @@ class UserController extends Controller
return view('user.index_operasi',compact('cawangan_info','api_url','auth_user'));
}
}
public function edit(){
$api_url = config('api.url');
$auth_user = Auth::user();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
if($auth_user->roles == 'teller' || $auth_user->roles == 'ppc' || $auth_user->roles == 'pc'){
return view('user.edit',compact('cawangan_info','api_url','auth_user'));
}else{
return view('user.edit_operasi',compact('cawangan_info','api_url','auth_user'));
}
}
public function editStore(Request $request){
$validated = $request->validate([
'nama' => 'required|max:255',
'notel' => 'required|numeric|min:10',
]);
$auth_user = Auth::user();
$user = User::find($auth_user->id);
$user->name = $request->nama;
$user->no_telefon = $request->notel;
$user->save();
return redirect()->route('profile')->with('success', 'Perubahan Maklumat Pengguna Telah Dikemaskini.');
}
}