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

Merge branch 'branch_fix_2' into 'new-super'

Browse Source 
issues fix bugs production

See merge request online-sistem1/kaunter!207
This commit is contained in:
hafifie rahman
2022-12-05 17:07:29 +00:00
parent 6959b9637f e88832912f
commit eb512aa31c
11 changed files with 165 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/PendahuluanSerahan.php
+3 -1
View File
@@ -13,11 +13,13 @@ class PendahuluanSerahan implements ShouldBroadcast
public $pengesahan;
public $cawangan;
public $kodlaluan;
public function __construct($pengesahan,$cawangan)
public function __construct($pengesahan,$cawangan,$kodlaluan)
{
$this->pengesahan = $pengesahan;
$this->cawangan = $cawangan;
$this->kodlaluan = $kodlaluan;
}
public function broadcastOn()
app/Http/Controllers/KhazanahController.php
+3 -3
View File
@@ -1149,7 +1149,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 +1229,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 +3079,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');
}
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.');
}
}
public/js/main.js
Vendored
+2 -4
View File
@@ -465,8 +465,7 @@ async function openuptambahdanserah(e)
var channel = pusher.subscribe('pendahuluanserahan-notice');
channel.bind('penserahan-event', function(data) {
console.log(data);
if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw)
if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw && data.kodlaluan == teller)
{
Swal.fire({
icon: 'success',
@@ -630,9 +629,8 @@ function tambahdanserahanfunc(e)
var channel = pusher.subscribe('pendahuluanserahan-notice');
channel.bind('penserahan-event', function(data) {
// let message = JSON.stringify(data);
console.log(data);
if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw)
if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw && data.kodlaluan == teller)
{
Swal.fire({
icon: 'success',
resources/views/aliran_tunai/index.blade.php
+11 -8
View File
@@ -8,13 +8,17 @@
@if($countproses > 0)
<script>
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey: false,
title: 'Tunggu Pengesahan Daripada Khazanah.',
icon: 'info',
width: 600,
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
didOpen: () => {
Swal.showLoading()
}
});
allowEscapeKey: false,
allowEnterKey: false
})
</script>
@endif
@@ -31,7 +35,7 @@
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item active" aria-current="page">Aliran Tunai</li>
</ol>
</nav>
</nav>
<div class="row justify-content-center">
@@ -561,7 +565,6 @@
function cetakserahankeseluruhan()
{
console.log('ets');
let urlroute = '{{ route("laporan.serahanteller") }}';
window.open(urlroute, '_blank');
resources/views/user/edit.blade.php
+53
View File
@@ -0,0 +1,53 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item"><a href="{{ route('profile') }}">Maklumat Pengguna</a></li>
<li class="breadcrumb-item active" aria-current="page">Ubah Maklumat Pengguna</li>
</ol>
</nav>
<div class="card">
<form method="post" name="frmedit" action="{{ route('profile.editstore') }}">
@csrf
<div class="card-body text-center">
<div class="col-md-12" style="margin-right:auto;margin-left:auto">
<div class="row form-group">
<div class="col-md-6">
<div class="row form-group">
<div class="col-md-6">Nama</div>
<div class="col-md-6"><input type="text" name="nama" class="form-control @error('nama') is-invalid @enderror" value="{{ strtoupper($auth_user->name) }}">
@error('nama') <span class="text-danger">{{ $message }}</span> @enderror
</div>
<div class="col-md-6">No Telefon</div>
<div class="col-md-6"><input type="text" name="notel" class="form-control @error('notel') is-invalid @enderror" value="{{ $auth_user->no_telefon }}">
@error('notel') <span class="text-danger">{{ $message }}</span> @enderror
</div>
<div class="col-md-6">Email</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->email }}"></div>
</div>
</div>
<div class="col-md-6">
<div class="row form-group">
<div class="col-md-6">No Kad Pengenalan</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
<div class="col-md-6">Jawatan</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ strtoupper($auth_user->role_harian) }}"></div>
<div class="col-md-6">Baki Perubatan</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ 'RM '. number_format($auth_user->perubatan,2) }}"></div>
</div>
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">Kemaskini Profil</button>
</div>
</form>
</div>
</div>
</div>
</div>
@endsection
resources/views/user/edit_operasi.blade.php
+49
View File
@@ -0,0 +1,49 @@
@extends('layouts.app_operasi')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item"><a href="{{ route('profile') }}">Maklumat Pengguna</a></li>
<li class="breadcrumb-item active" aria-current="page">Ubah Maklumat Pengguna</li>
</ol>
</nav>
<div class="card">
<div class="card-body text-center">
<div class="col-md-12" style="margin-right:auto;margin-left:auto">
<form action="{{ route('profile.editstore') }}" method="post">
@csrf
<div class="row form-group">
<div class="col-md-12">
<div class="row form-group">
<div class="col-md-6">NAMA</div>
<div class="col-md-6"><input type="text" name="nama" class="form-control @error('nama') is-invalid @enderror" value="{{ $auth_user->name }}">
@error('nama') <span class="text-danger">{{ $message }}</span> @enderror
</div>
<div class="col-md-6">NO TELEFON</div>
<div class="col-md-6"><input type="text" name="notel" class="form-control @error('notel') is-invalid @enderror" value="{{ $auth_user->no_telefon }}">
@error('notel') <span class="text-danger">{{ $message }}</span> @enderror
</div>
</div>
</div>
<div class="col-md-12">
<div class="row form-group">
<div class="col-md-6">NO KP</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
<div class="col-md-6">JAWATAN</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->roles }}"></div>
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">Kemaskini Profil</button>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
resources/views/user/index.blade.php
+5
View File
@@ -13,6 +13,10 @@
<div class="card">
<div class="card-body text-center">
<div class="col-md-12" style="margin-right:auto;margin-left:auto">
@if(Session::has('success'))
<div class="alert alert-success mt-2">{{ Session::get('success') }} </div>
@endif
<div class="row form-group">
<div class="col-md-6">
<div class="row form-group">
@@ -36,6 +40,7 @@
</div>
</div>
</div>
<a href="{{ route('profile.edit') }}" class="btn btn-primary">Kemaskini Profil</a>
<a href="{{ route('user.password') }}" class="btn btn-primary">Kemaskini Katalaluan</a>
</div>
</div>
resources/views/user/index_operasi.blade.php
+2
View File
@@ -32,6 +32,8 @@
</div>
</div>
</div>
<a href="{{ route('profile.edit') }}" class="btn btn-primary">Kemaskini Profil</a>
<a href="{{ route('user.password') }}" class="btn btn-primary">Kemaskini Katalaluan</a>
</div>
</div>
</div>
resources/views/user/update_password.blade.php
+4 -4
View File
@@ -1,4 +1,4 @@
@extends('layouts.app')
@extends('layouts.app_operasi')
@section('content')
<div class="container">
<div class="row justify-content-center">
@@ -23,7 +23,7 @@
@endforeach
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">Current Password</label>
<label for="password" class="col-md-4 col-form-label text-md-right">Kata Laluan Semasa</label>
<div class="col-md-6">
<input id="password" type="password" class="form-control" name="current_password" autocomplete="current-password">
@@ -31,7 +31,7 @@
</div>
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">New Password</label>
<label for="password" class="col-md-4 col-form-label text-md-right">Kata Laluan Baru</label>
<div class="col-md-6">
<input id="new_password" type="password" class="form-control" name="new_password" autocomplete="current-password">
@@ -39,7 +39,7 @@
</div>
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">New Confirm Password</label>
<label for="password" class="col-md-4 col-form-label text-md-right">Sahkan Kata Laluan Baru</label>
<div class="col-md-6">
<input id="new_confirm_password" type="password" class="form-control" name="new_confirm_password" autocomplete="current-password">
routes/web.php
+2
View File
@@ -82,6 +82,8 @@ Route::put('/aliran_tunai/Tebusan',['as'=>'alirantunai.tebus','uses' => 'AliranT
Route::put('/aliran_tunai/advansur',['as'=>'alirantunai.advansur','uses' => 'AliranTunaiController@alirantunaiUpahBknTawarruq'])->middleware('auth','teller');
Route::get('/harga_emas','HargaEmasController@index')->middleware('auth','teller');
Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth');
Route::get('/profile/edit',['as'=>'profile.edit','uses'=>'UserController@edit'])->middleware('auth');
Route::post('/profile/edit/store',['as'=>'profile.editstore','uses'=>'UserController@editStore'])->middleware('auth');
Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller');
Route::post('/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store'])->middleware('auth','teller');
Route::post('/gadai/store',['as'=>'gadai.store','uses'=>'GadaianController@store'])->middleware('auth','teller');