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

merge dalam serve semuanya

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-07-15 12:45:04 +08:00
parent f7b26a0c47 c476811955
commit 3f9ca92dde
42 changed files with 1153 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/ResetRoleAsal.php
+50
View File
@@ -0,0 +1,50 @@
<?php
namespace App\Console\Commands;
use App\User;
use Illuminate\Console\Command;
class ResetRoleAsal extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'reset:roleasal';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Reset Role';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
$all_user = User::all();
foreach($all_user as $index=>$user_kaunter){
$user = User::find($user_kaunter->id);
if($user->cawangan != 'operasi'){
$user->roles = $user->role_asal;
$user->save();
}
}
}
}
app/Console/Kernel.php
+2
View File
@@ -16,6 +16,7 @@ class Kernel extends ConsoleKernel
Commands\resetRoleDaily::class,
Commands\updateJbg::class,
Commands\updateOnline::class,
Commands\ResetRoleAsal::class,
];
/**
@@ -28,6 +29,7 @@ class Kernel extends ConsoleKernel
{
$schedule->command('reset:dailyrole')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
$schedule->command('update:jbg')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
$schedule->command('reset:roleasal')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
$schedule->command('update:online')->daily()->timezone('Asia/Kuala_Lumpur')->everyFifteenMinutes();
}
app/Http/Controllers/AliranTunaiController.php
+15 -1
View File
@@ -349,6 +349,16 @@ class AliranTunaiController extends Controller
$tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] . '/teller/',['teller' => Auth::user()->name])->json();
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
$lelong = Http::get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json();
$lelongan = 0;
if(strtoupper($Auth::user()->name) === 'LELONG')
{
$lelongan = floatval($lelong);
}else{
$lelongan = 0;
}
$totalserahan = 0;
$totalpendahuluan = 0;
foreach($addtunai as $index1=>$at)
@@ -435,7 +445,11 @@ class AliranTunaiController extends Controller
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
$gadaian = floatval($totalgadai);
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
if(strtoupper($Auth::user()->name) === 'LELONG'){
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
}else{
$bakisemasa = $lelongan;
}
$errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
app/Http/Controllers/Auth/LoginController.php
+11 -5
View File
@@ -65,21 +65,27 @@ class LoginController extends Controller
if($auth_user['roles'] == 'teller'){
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'));
// return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url'));
return redirect()->route('home');
}elseif($auth_user['role_harian'] == 'penilai'){
$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.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
return redirect()->route('home');
}else{
return view('not_assign');
}
}
elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
// return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
return redirect()->route('home');
}
elseif($auth_user['roles'] == 'operasi'){
else{
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
// return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
return redirect()->route('home');
}
}
app/Http/Controllers/HomeController.php
+4 -1
View File
@@ -39,12 +39,15 @@ class HomeController extends Controller
$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'));
}
else{
return view('not_assign');
}
}
elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
}
elseif($auth_user['roles'] == 'operasi'){
else{
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}
app/Http/Controllers/KakitanganController.php
+48 -1
View File
@@ -22,7 +22,8 @@ class KakitanganController extends Controller
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$role = Role::get();
return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role'));
$kakitangan = User::all();
return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role','kakitangan'));
}
public function registerStaff(Request $request){
@@ -91,4 +92,50 @@ class KakitanganController extends Controller
return redirect()->route('home');
}
public function tukartaraf(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.tukar_taraf',compact('cawangan_info','api_url','role','user'));
}
public function tukartarafUpdate(Request $request){
$user = User::find($request->user_id);
if($user->role_harian == null){
if($user->role_asal == 'pc'){
$user->roles = $request->role;
$user->save();
}
}else{
if($user->role_asal == 'pc'){
$user->roles = $request->role;
$user->role_harian = $request->role;
$user->save();
}
}
return redirect()->route('daftar.kakitangan');
}
public function tukarcawangan(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.tukar_cawangan',compact('cawangan_info','api_url','role','user'));
}
public function tukarcawanganUpdate(Request $request){
$user = User::find($request->user_id);
$user->cawangan = $request->cawangan;
$user->roles = $request->role;
$user->role_harian = $request->role;
$user->save();
return redirect()->route('daftar.kakitangan');
}
}
app/Http/Controllers/KhazanahController.php
+2 -3
View File
@@ -2668,9 +2668,8 @@ class KhazanahController extends Controller
$TotalTunaiDebit = 0;
$TotalTunaiKredit = 0;
$TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
$TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
$TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
$TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]);
array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]);
app/Http/Controllers/OperasiController.php
+8
View File
@@ -187,4 +187,12 @@ class OperasiController extends Controller
return view('operasi.hargaemas',compact('cawangan_info','api_url','harga_emas'));
}
public function margin(){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$margin_pembiayaan = Http::get(config('api.url') . '/api/maxpinjaman')->json();
return view('operasi.margin_pembiayaan',compact('cawangan_info','api_url','margin_pembiayaan'));
}
}
app/Http/Controllers/UserController.php
+5 -1
View File
@@ -18,6 +18,10 @@ class UserController extends Controller
$api_url = config('api.url');
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('user.index',compact('cawangan_info','api_url'));
if($auth_user->roles == 'teller' || $auth_user->roles == 'ppc' || $auth_user->roles == 'pc'){
return view('user.index',compact('cawangan_info','api_url','auth_user'));
}else{
return view('user.index_operasi',compact('cawangan_info','api_url','auth_user'));
}
}
}