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 lapfix

Browse Source
This commit is contained in:
hafifierahman
2022-01-25 22:47:53 +08:00
parent eefa30d73a 56e835f6c7
commit 28b02f2946
11 changed files with 236 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/LoginController.php
+1 -1
View File
@@ -67,7 +67,7 @@ class LoginController extends Controller
$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 redirect()->route('home');
}elseif($auth_user['role_harian'] == 'penilai'){
}elseif($auth_user['role_harian'] == 'penilai' || $auth_user['role_harian'] == 'penilai2'){
$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();
app/Http/Controllers/ChangePasswordController.php
+53
View File
@@ -0,0 +1,53 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Rules\MatchOldPassword;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Http;
use App\User;
class ChangePasswordController extends Controller
{
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
}
/**
* Show the application dashboard.
*
* @return \Illuminate\Contracts\Support\Renderable
*/
public function index()
{
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('user.update_password',compact('cawangan_info'));
}
/**
* Show the application dashboard.
*
* @return \Illuminate\Contracts\Support\Renderable
*/
public function store(Request $request)
{
$request->validate([
'current_password' => ['required', new MatchOldPassword],
'new_password' => ['required'],
'new_confirm_password' => ['same:new_password'],
]);
User::find(auth()->user()->id)->update(['password'=> Hash::make($request->new_password)]);
return redirect()->route('profile');
}
}
app/Http/Controllers/HomeController.php
+2 -2
View File
@@ -33,11 +33,11 @@ class HomeController extends Controller
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'));
}elseif($auth_user['role_harian'] == 'penilai'){
}elseif($auth_user['role_harian'] == 'penilai' || $auth_user['role_harian'] == 'penilai2'){
$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.penilai.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
}
else{
return view('not_assign');
app/Http/Controllers/KakitanganController.php
+3 -1
View File
@@ -66,12 +66,14 @@ class KakitanganController extends Controller
public function kakitanganHarian(Request $request){
$auth_user = Auth::user();
$user_cawangan = User::where('cawangan','=',$auth_user['cawangan'])->get();
$user_cawangan = User::whereIn('roles',['pc','ppc','teller'])->where('cawangan','=',$auth_user['cawangan'])->get();
foreach($user_cawangan as $index=>$user){
if($user['roles'] == 'teller'){
if($user['id'] == $request->penilai){
$role_harian = 'penilai';
}elseif($user['id'] == $request->penilai2){
$role_harian = 'penilai2';
}else{
$role_harian = 'teller';
}
app/Http/Controllers/KhazanahController.php
+1 -1
View File
@@ -2693,7 +2693,7 @@ class KhazanahController extends Controller
if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'Wang Tak Dituntut','amaun' => $wtd]);
if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
if($untungrugiterkumpul != 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]);
if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]);