Merge branch 'new-super' into afiqhamzah-feat-mykad-reader-registration
This commit is contained in:
afiq.hamzah
@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
|
|||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
|
|
||||||
use App\Dashboard;
|
use App\Dashboard;
|
||||||
|
use App\User;
|
||||||
|
|
||||||
class LoginController extends Controller
|
class LoginController extends Controller
|
||||||
{
|
{
|
||||||
@@ -149,4 +150,23 @@ class LoginController extends Controller
|
|||||||
Session::flush();
|
Session::flush();
|
||||||
return Redirect::to('/');
|
return Redirect::to('/');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function GetRolesHarian(Request $request, $kodcaw){
|
||||||
|
|
||||||
|
if($request->role_harian == 'teller'){
|
||||||
|
$kakitangan = User::where([['role_harian','teller'],['cawangan',$kodcaw]])->get();
|
||||||
|
}else if($request->role_harian == 'khazanah'){
|
||||||
|
$kakitangan = User::where([['role_harian','khazanah'],['cawangan',$kodcaw]])->get();
|
||||||
|
}else if($request->role_harian == 'pc'){
|
||||||
|
$kakitangan = User::where([['role_harian','pc'],['cawangan',$kodcaw]])->get();
|
||||||
|
}else if($request->role_harian == 'penilai'){
|
||||||
|
$kakitangan = User::where([['role_harian','penilai'],['cawangan',$kodcaw]])->get();
|
||||||
|
}else if($request->role_harian == 'ppc'){
|
||||||
|
$kakitangan = User::where([['role_harian','ppc'],['cawangan',$kodcaw]])->get();
|
||||||
|
}else{
|
||||||
|
$kakitangan = User::all();
|
||||||
|
}
|
||||||
|
|
||||||
|
return response()->json($kakitangan,200);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,64 +69,15 @@ class LelongController extends Controller
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// public function transaksituntutbaki(Request $request){
|
|
||||||
|
|
||||||
// $auth_user = Auth::user();
|
|
||||||
|
|
||||||
// $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [
|
|
||||||
// 'batchno' => $request->batchno,
|
|
||||||
// 'jenis' => $request->jenis,
|
|
||||||
// 'norujukan' => $request->norujukan,
|
|
||||||
// 'teller' => $request->teller,
|
|
||||||
// 'bakipjm' => $request->bakipjm,
|
|
||||||
// 'bakiupah' => $request->bakiupah,
|
|
||||||
// 'cajlain' => $request->cajlain,
|
|
||||||
// 'cajlelong' => $request->cajlelong,
|
|
||||||
// 'jumlah' => $request->jumlah,
|
|
||||||
// 'nowakil' => $request->nowakil,
|
|
||||||
// 'hargajual' => $request->hargajual
|
|
||||||
// ])->json();
|
|
||||||
|
|
||||||
// $updatetuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/tuntutbakiupdate/' . $auth_user['cawangan'] . '/' . $request->norujukan);
|
|
||||||
|
|
||||||
// $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json();
|
|
||||||
|
|
||||||
// $keluar = $getTunai2['keluar'];
|
|
||||||
// $baki = $getTunai2['baki'];
|
|
||||||
// $masuk = $getTunai2['masuk'];
|
|
||||||
// $bakiawal = $getTunai2['bakiawal'];
|
|
||||||
// $pendahuluan = $getTunai2['tambah'];
|
|
||||||
// $serahan = $getTunai2['kurang'];
|
|
||||||
|
|
||||||
// $bakiakhir = $baki;
|
|
||||||
|
|
||||||
// if($request->jenis == 'T'){
|
|
||||||
// $bakiakhir -= $request->jumlah;
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// $bakiakhir += -($request->jumlah);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// //masuk dalam tunai aliran
|
|
||||||
// $updateTunai=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
|
|
||||||
// 'kodlaluan' => $request->teller,
|
|
||||||
// 'keluar' => $keluar,
|
|
||||||
// 'masuk' => $masuk,
|
|
||||||
// 'bakiakhir' => $bakiakhir
|
|
||||||
// ]);
|
|
||||||
|
|
||||||
// if($updatetuntutbaki)
|
|
||||||
// {
|
|
||||||
// return response('Berjaya');
|
|
||||||
// }else{
|
|
||||||
// return response('Gagal');
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
public function transaksituntutbaki(Request $request){
|
public function transaksituntutbaki(Request $request){
|
||||||
|
|
||||||
$auth_user = Auth::user();
|
$auth_user = Auth::user();
|
||||||
|
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $request->norujukan)->json();
|
||||||
|
|
||||||
|
if($lelong)
|
||||||
|
{
|
||||||
|
return response('Berjaya');
|
||||||
|
}
|
||||||
|
|
||||||
$tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [
|
$tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [
|
||||||
'batchno' => $request->batchno,
|
'batchno' => $request->batchno,
|
||||||
@@ -149,9 +100,6 @@ class LelongController extends Controller
|
|||||||
$keluar = $getTunai2['keluar'];
|
$keluar = $getTunai2['keluar'];
|
||||||
$baki = $getTunai2['baki'];
|
$baki = $getTunai2['baki'];
|
||||||
$masuk = $getTunai2['masuk'];
|
$masuk = $getTunai2['masuk'];
|
||||||
$bakiawal = $getTunai2['bakiawal'];
|
|
||||||
$pendahuluan = $getTunai2['tambah'];
|
|
||||||
$serahan = $getTunai2['kurang'];
|
|
||||||
|
|
||||||
$bakiakhir = $baki;
|
$bakiakhir = $baki;
|
||||||
|
|
||||||
|
|||||||
@@ -2231,6 +2231,7 @@
|
|||||||
method:"put",
|
method:"put",
|
||||||
url: api_url + "/api/customers/update/kaunter/" + nokp,
|
url: api_url + "/api/customers/update/kaunter/" + nokp,
|
||||||
data:{
|
data:{
|
||||||
|
"namateller" : "{{ Auth::user()->name }}",
|
||||||
"telefon1": telefon1,
|
"telefon1": telefon1,
|
||||||
"telefon2": telefon2,
|
"telefon2": telefon2,
|
||||||
"kodbank":kodbank,
|
"kodbank":kodbank,
|
||||||
|
|||||||
@@ -589,155 +589,6 @@ function ubahwakil(e)
|
|||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
const swalWithBootstrapButtons = Swal.mixin({
|
|
||||||
customClass: {
|
|
||||||
confirmButton: 'btn btn-success',
|
|
||||||
cancelButton: 'btn btn-danger'
|
|
||||||
},
|
|
||||||
buttonsStyling: false
|
|
||||||
});
|
|
||||||
|
|
||||||
//let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
|
|
||||||
|
|
||||||
swalWithBootstrapButtons.fire({
|
|
||||||
title: 'Dapatkan Pengesahan Khazanah',
|
|
||||||
text: "Tuntutan Baki Pelanggan!",
|
|
||||||
icon: 'info',
|
|
||||||
showCancelButton: true,
|
|
||||||
confirmButtonText: 'Hantar',
|
|
||||||
cancelButtonText: 'Batal',
|
|
||||||
reverseButtons: true
|
|
||||||
}).then((result) => {
|
|
||||||
if(result.isConfirmed) {
|
|
||||||
Swal.fire({
|
|
||||||
title: 'Tunggu Pengesahan Daripada Khazanah.',
|
|
||||||
icon: 'info',
|
|
||||||
width: 600,
|
|
||||||
padding: '3em',
|
|
||||||
background: '#fffff',
|
|
||||||
showCancelButton: false,
|
|
||||||
showConfirmButton: false,
|
|
||||||
allowOutsideClick: false,
|
|
||||||
allowEscapeKey: false,
|
|
||||||
allowEnterKey: false
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
let norujukan = $('#norujukan').val();
|
|
||||||
let api = "{{ config('api.url') }}";
|
|
||||||
let nowakil = 0;
|
|
||||||
let jenis = '';
|
|
||||||
let mohon = '';
|
|
||||||
|
|
||||||
if($("input[name='radlelong']:checked").val() == 'baki')
|
|
||||||
{
|
|
||||||
jenis = 'T';
|
|
||||||
mohon = "Tuntut Baki Lelongan";
|
|
||||||
}else{
|
|
||||||
jenis = 'B';
|
|
||||||
mohon = "Bayar Baki Lelongan";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val();
|
|
||||||
let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
|
|
||||||
let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");
|
|
||||||
|
|
||||||
$.ajax({
|
|
||||||
method:'post',
|
|
||||||
url: '{{ route("teller.createkelulusan") }}',
|
|
||||||
data: {
|
|
||||||
"_token": "{{ csrf_token() }}",
|
|
||||||
"norujukan" : norujukan,
|
|
||||||
"mohon" : mohon
|
|
||||||
},
|
|
||||||
success:function(data){
|
|
||||||
},error: function(xhr, status, error) {
|
|
||||||
var err = eval("(" + xhr.responseText + ")");
|
|
||||||
alert(xhr.responseText);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
|
|
||||||
cluster: 'ap1',
|
|
||||||
encrypted: true
|
|
||||||
});
|
|
||||||
|
|
||||||
var channel = pusher.subscribe('notice-ubahhapus');
|
|
||||||
channel.bind('my-ubahhapus', function(data) {
|
|
||||||
|
|
||||||
|
|
||||||
if(data.norujukan == norujukan && data.teller == teller)
|
|
||||||
{
|
|
||||||
if(data.kelulusan == 'lulus')
|
|
||||||
{
|
|
||||||
Swal.fire({
|
|
||||||
icon: 'success',
|
|
||||||
title: 'Telah Disahkan'
|
|
||||||
}).then(function(){
|
|
||||||
|
|
||||||
$.ajax({
|
|
||||||
method: 'put',
|
|
||||||
url: "{{ route('lelong.tuntutbaki') }}",
|
|
||||||
data: {
|
|
||||||
"_token": "{{ csrf_token() }}",
|
|
||||||
'batchno' : batchno,
|
|
||||||
'jenis' : jenis,
|
|
||||||
'norujukan' : norujukan,
|
|
||||||
'teller' : teller,
|
|
||||||
'bakipjm' : bakipjm,
|
|
||||||
'bakiupah' : bakiupah,
|
|
||||||
'cajlain' : cajlain,
|
|
||||||
'cajlelong' : cajlelong,
|
|
||||||
'jumlah' : jumlah,
|
|
||||||
'nowakil' : nowakil,
|
|
||||||
'hargajual' : hargajual
|
|
||||||
},
|
|
||||||
success:function(data){
|
|
||||||
let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
|
|
||||||
urlroute = urlroute.replace(':id', norujukan);
|
|
||||||
Swal.fire(
|
|
||||||
'Berjaya!',
|
|
||||||
'Tuntut Baki Berjaya',
|
|
||||||
'success'
|
|
||||||
) .then(function() {
|
|
||||||
window.open(urlroute, '_blank');
|
|
||||||
window.location.replace("{{ route('customer_info') }}");
|
|
||||||
})
|
|
||||||
},error: function(xhr, status, error) {
|
|
||||||
var err = eval("(" + xhr.responseText + ")");
|
|
||||||
alert(xhr.responseText);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
else if(data.kelulusan == 'batal')
|
|
||||||
{
|
|
||||||
Swal.fire({
|
|
||||||
icon: 'warning',
|
|
||||||
title: 'Telah Dibatalkan',
|
|
||||||
text: `Komen : ${data.komen}`
|
|
||||||
}).then(function(){
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
}else if (result.dismiss === Swal.DismissReason.cancel){
|
|
||||||
swalWithBootstrapButtons.fire(
|
|
||||||
'Batal',
|
|
||||||
'Tidak Berjaya Mendaptkan Pengesahan Khazanah',
|
|
||||||
'error'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
+4
-1
@@ -23,4 +23,7 @@ Route::post('/chat-bot', 'CustomersController@listenToReplies');
|
|||||||
Route::group(['prefix' => 'dashboard'], function () {
|
Route::group(['prefix' => 'dashboard'], function () {
|
||||||
Route::post('/login', 'Auth\LoginController@loginDashboard');
|
Route::post('/login', 'Auth\LoginController@loginDashboard');
|
||||||
Route::post('/logout', 'Auth\LoginController@logoutDashboard');
|
Route::post('/logout', 'Auth\LoginController@logoutDashboard');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Route::get('/roles_harian/{kodcaw}', 'Auth\LoginController@GetRolesHarian');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user