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

Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into new-super

Browse Source
This commit is contained in:
Zakwan Hamdan
2023-02-05 11:01:48 +08:00
parent bf299e5f47 06c02d2402
commit d12b88c9f8
16 changed files with 1177 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KakitanganController.php
+18 -4
View File
@@ -214,11 +214,19 @@ class KakitanganController extends Controller
}
public function deleteKakitangan(Request $request){
// dd($request->all());
$auth_user = Auth::user();
$user = User::find($request->staff_id);
$user->delete();
// dd($user_delete);
return redirect()->route('admin.daftar.kakitangan');
// if($auth_user->roles == 'operasi'){
// // return redirect()->route('daftar.kakitangan');
// return "route('daftar.kakitangan')";
// }else if($auth_user->roles == 'admin'){
// // return redirect()->route('admin.daftar.kakitangan');
// return "route('admin.daftar.kakitangan')";
// }
return response()->json('success');
}
public function editKakitangan(Request $request){
@@ -233,6 +241,7 @@ class KakitanganController extends Controller
public function editStoreKakitangan(Request $request){
// dd($request->all());
$auth_user = Auth::user();
$user = User::find($request->user_id);
$user->name = strtoupper($request->nama);
$user->email = $request->email;
@@ -242,7 +251,12 @@ class KakitanganController extends Controller
$user->password = Hash::make($request->nokp);
$user->save();
return redirect()->route('admin.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 resetCredentials(Request $request){
app/Http/Controllers/KhazanahController.php
+58
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;
@@ -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'));
}
}