diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 3a4b455..ad081f8 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -192,20 +192,23 @@ class KhazanahController extends Controller
return view('khazanah.menu',compact('cawangan_info','api_url','gadai','listserah','countmodal','countserahan'));
}
- public function pendahuluanserahandaftar()
+ public function pendahuluanserahandaftar(Request $request)
{
$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();
- $listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json();
+ // $listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json();
+ $listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'],['name' => $auth_user['name']])->json();
+
$denominasi=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
-
+ // dd($denominasi);
if(sizeof($denominasi) == 0)
{
- $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
+ $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'],['name' => $auth_user['name']])->json();
+
}
else
{
@@ -215,6 +218,7 @@ class KhazanahController extends Controller
return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail','denominasi'));
}
+
public function dashboard()
{
$auth_user = Auth::user();
@@ -738,7 +742,8 @@ class KhazanahController extends Controller
$data_request = $request->except('_token');
$updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/createpanjar/'. $auth_user['cawangan'],$data_request)->json();
-
+ // $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/createpanjar/'. $auth_user['cawangan'],['name' => $auth_user['name']],$data_request)->json();
+ // dd($updatepanjar);
if($updatepanjar['result'] == 'success')
{
if($request->jenismodal === 'perubatan')
@@ -2103,7 +2108,7 @@ class KhazanahController extends Controller
'dtacct' => $request->dtacct,
'ktacct' => $request->ktacct
])->json();
-
+
$amaun=$request->amaun;
$peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
@@ -2833,7 +2838,8 @@ class KhazanahController extends Controller
// $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
- $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
+ // $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
+ $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan'],['name' => $auth_user['name']]])->json();
$daftar = 0;
if(sizeof($polis) > 0)
@@ -2869,7 +2875,7 @@ class KhazanahController extends Controller
}else{
event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name']));
- // return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
+ return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
}
return response($daftarpolis);
@@ -2940,7 +2946,7 @@ class KhazanahController extends Controller
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad['nokp'])->json();
}
$polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan']])->json();
-
+ $log_ulangcetakagh = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/polis/agh',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan'],'teller' => $auth_user['name']])->json();
return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
}
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 82f4b40..0f2f558 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -69,7 +69,10 @@ class LelongController extends Controller
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
- $lelong=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
+ // $lelong=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
+ $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan, [
+ 'name' => $auth_user['name']])->json();
+
$wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $lelong['nowakil'])->json();
diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php
index 9a10188..652b7e7 100644
--- a/app/Http/Controllers/PenebusanController.php
+++ b/app/Http/Controllers/PenebusanController.php
@@ -733,8 +733,9 @@ class PenebusanController extends Controller
'hubungan' => $request->hubungan,
'alamat' => $request->alamat,
'telefon' => $request->telefon,
- 'nota' => $request->nota
-
+ 'nota' => $request->nota,
+ 'teller' => $auth_user['name']
+
])->json();
if($createwakil)
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index ebef8f5..b91e22a 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -994,7 +994,7 @@
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
var tuntutan = 'Pelanggan';
-
+ console.log(gadai_detail['norujukan'],kodcaw,api_url);
$.ajax({
method:"GET",
async:false,
@@ -1004,6 +1004,7 @@
"kodcaw" : kodcaw
},
success: function(response){
+ console.log(response);
if(response[0].teller == 'DM')
{
tuntutan = 'WTD';
@@ -1562,7 +1563,7 @@
let nota = $('#notawakil').val();
let nokp = $('#nokpwakil').val();
let norujukan = $('#norujukanwakil').val();
-
+ let teller = "{{ Auth::user()->name }}";
$.ajax({
method:'POST',
@@ -1576,7 +1577,8 @@
"alamat" : alamat,
"telefon" : telefon,
"nota" : nota,
- "icno" : nokp
+ "icno" : nokp,
+ "teller" : teller
},
success:function(data){
@@ -2590,7 +2592,7 @@
$.ajax({
method:"put",
- url: api_url + "/api/customers/update/kaunter/" + nokp,
+ url: api_url + "/api/customers/update/kaunter/" + nokp+ "/" + kodcaw,
data:{
"namateller" : "{{ Auth::user()->name }}",
"telefon1": telefon1,
diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php
index 69f23c0..8ba7064 100644
--- a/resources/views/khazanah/pendahuluanserahanmain.blade.php
+++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php
@@ -236,65 +236,65 @@
let dtacct = $('#dtacct').val();
let ktacct = $('#ktacct').val();
- let boolamaun = false;let boolketerangan = false;let booljenis = false;
- if(!amaun)
- {
- $("[name='erroramaun']").show();
- $("[name='erroramaun']").text("*Isikan amaun dalam input!");
- $("[name='amaun']").addClass('is-invalid');
-
- boolamaun = true;
- }else{
- $("[name='erroramaun']").hide();
- $("[name='amaun']").removeClass('is-invalid');
-
- boolamaun = false;
- }
-
- if(!keterangan)
- {
- $("[name='errorketerangan']").show();
- $("[name='errorketerangan']").text("*Isikan keterangan dalam input!");
- $("[name='keterangan']").addClass('is-invalid');
-
- boolketerangan = true;
- }else{
- $("[name='errorketerangan']").hide();
- $("[name='keterangan']").removeClass('is-invalid');
-
- boolketerangan = false;
- }
-
- if(!jenis)
- {
- $(".invalid-feedback").show();
-
- booljenis = true;
- }else{
- $(".invalid-feedback").hide();
-
- booljenis = false;
- }
-
- if(boolamaun === false && boolketerangan === false && booljenis === false)
- {
- $('#amaundiminta').val(amaun);
- $('#denominasiHQModal').modal('show');
- $('#pendahuluanserahanModal').modal('hide');
- $('#jenisjenis').val(jenis);
-
- return true;
- }else{
-
- $("#terima_transaksi").prop('disabled', false);
-
- event.preventDefault();
- return false;
- }
-
-
+ // Validation for amaun
+ if (!amaun) {
+ $("[name='erroramaun']").show();
+ $("[name='erroramaun']").text("*Isikan amaun dalam input!");
+ $("[name='amaun']").addClass('is-invalid');
+ boolamaun = true;
+ } else {
+ $("[name='erroramaun']").hide();
+ $("[name='amaun']").removeClass('is-invalid');
+ boolamaun = false;
}
+ // Validation for keterangan
+ if (!keterangan) {
+ $("[name='errorketerangan']").show();
+ $("[name='errorketerangan']").text("*Isikan keterangan dalam input!");
+ $("[name='keterangan']").addClass('is-invalid');
+ boolketerangan = true;
+ } else {
+ $("[name='errorketerangan']").hide();
+ $("[name='keterangan']").removeClass('is-invalid');
+ boolketerangan = false;
+ }
+
+ // Validation for jenis
+ if (!jenis) {
+ $(".invalid-feedback").show();
+ booljenis = true;
+ } else {
+ $(".invalid-feedback").hide();
+ booljenis = false;
+ }
+
+ // If all validations pass
+ if (boolamaun === false && boolketerangan === false && booljenis === false) {
+ // Carry all validated values, including auth_user
+ console.log({
+ amaun,
+ keterangan,
+ jenis,
+ dtacct,
+ ktacct,
+ auth_user
+ });
+
+ $('#amaundiminta').val(amaun);
+ $('#denominasiHQModal').modal('show');
+ $('#pendahuluanserahanModal').modal('hide');
+ $('#jenisjenis').val(jenis);
+
+ return true;
+ } else {
+ $("#terima_transaksi").prop('disabled', false);
+ event.preventDefault();
+ return false;
+ }
+ }
+
+
$('#pendahuluanserahanModal').on('hidden.bs.modal', function (e) {
$(this).find("[name='erroramaun']").hide();
@@ -333,110 +333,111 @@
$('#amaunkiraan').val('');
}
- function terimapost()
- {
- $("#terima_transaksi").prop('disabled', true);
+ function terimapost() {
+ $("#terima_transaksi").prop('disabled', true);
- let amaun = $('#amaundiminta').val();
- let kiraan = $('#amaunkiraan').val();
- let keterangan = $('#keterangan').val();
- let jenis = $('#radiopendahuluanserahan:checked').val();
- let dtacct = $('#dtacct').val();
- let ktacct = $('#ktacct').val();
+ let amaun = $('#amaundiminta').val();
+ let kiraan = $('#amaunkiraan').val();
+ let keterangan = $('#keterangan').val();
+ let jenis = $('#radiopendahuluanserahan:checked').val();
+ let dtacct = $('#dtacct').val();
+ let ktacct = $('#ktacct').val();
+ let auth_user = $('#auth_user').val(); //letak user
- //denominasi bundle
- let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val();
- let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val();
+ // Denominasi bundle
+ let bundle1 = $('#bundle1').val();
+ let bundle5 = $('#bundle5').val();
+ let bundle10 = $('#bundle10').val();
+ let bundle20 = $('#bundle20').val();
+ let bundle50 = $('#bundle50').val();
+ let bundle100 = $('#bundle100').val();
- //denominasi keping
- let sen1 = $('#sen1').val();let sen5 = $('#sen5').val();let sen10 = $('#sen10').val();let sen20 = $('#sen20').val();let sen50 = $('#sen50').val();
- let ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val();
- let ringgit100 = $('#ringgit100').val();
-
- if(Number(amaun) !== Number(kiraan))
- {
- Swal.fire({
- icon: 'error',
- title: 'Sila Periksa Amaun dan Kiraan.'
- });
-
- return false;
- }
+ // Denominasi keping
+ let sen1 = $('#sen1').val();
+ let sen5 = $('#sen5').val();
+ let sen10 = $('#sen10').val();
+ let sen20 = $('#sen20').val();
+ let sen50 = $('#sen50').val();
+ let ringgit1 = $('#ringgit1').val();
+ let ringgit5 = $('#ringgit5').val();
+ let ringgit10 = $('#ringgit10').val();
+ let ringgit20 = $('#ringgit20').val();
+ let ringgit50 = $('#ringgit50').val();
+ let ringgit100 = $('#ringgit100').val();
+ if (Number(amaun) !== Number(kiraan)) {
Swal.fire({
+ icon: 'error',
+ title: 'Sila Periksa Amaun dan Kiraan.'
+ });
+ return false;
+ }
+
+ Swal.fire({
title: 'Memuatkan...',
- allowEscapeKey : false,
+ allowEscapeKey: false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
$('#denominasiHQModal').modal('hide');
}
- });
+ });
- $.ajax({
- method: 'post',
- url: '{{ route("khazanah.pendahuluanserahanHQ") }}',
- data: {
- "_token": "{{ csrf_token() }}",
- 'amaun' : amaun,
- 'jenisgldetail' : jenis,
- 'keterangan' : keterangan,
- 'kodcaw' : kodcaw,
- 'teller' : teller,
- 'dtacct' : dtacct,
- 'ktacct' : ktacct,
- 'ambilansen1' : sen1,
- 'ambilansen5' : sen5,
- 'ambilansen10' : sen10,
- 'ambilansen20' : sen20,
- 'ambilansen50' : sen50,
- 'ambilanring1' : ringgit1,
- 'ambilanring5' : ringgit5,
- 'ambilanring10' : ringgit10,
- 'ambilanring20' : ringgit20,
- 'ambilanring50' : ringgit50,
- 'ambilanring100' : ringgit100
- // 'bundle1' : bundle1,
- // 'bundle5' : bundle5,
- // 'bundle10' : bundle10,
- // 'bundle20' : bundle20,
- // 'bundle50' : bundle50,
- // 'bundle100' : bundle100
- },
- success:function(data){
- if(data == 'LULUS'){
-
- Swal.fire({
- icon: 'success',
- title: 'Transaksi Berjaya',
- allowEscapeKey : false,
- allowOutsideClick: false
- }).then(function(){
-
- $('#denominasiHQModal').modal('hide');
- $('#pendahuluanserahanModal').modal('hide');
- location.reload();
- });
-
- }else if(data == 'GAGAL'){
- Swal.fire({
- icon: 'error',
- title: 'Transaksi Gagal',
- allowEscapeKey : false,
- allowOutsideClick: false
- }).then(function(){
-
- $('#denominasiHQModal').modal('hide');
- $('#pendahuluanserahanModal').modal('hide');
- $("#terima_transaksi").prop('disabled', false);
-
- });
- }
- },error: function(jqXHR, textStatus, errorThrown) {
- console.log(textStatus, errorThrown);
+ $.ajax({
+ method: 'post',
+ url: '{{ route("khazanah.pendahuluanserahanHQ") }}',
+ data: {
+ "_token": "{{ csrf_token() }}",
+ 'amaun': amaun,
+ 'jenisgldetail': jenis,
+ 'keterangan': keterangan,
+ 'kodcaw': kodcaw,
+ 'teller': teller,
+ 'dtacct': dtacct,
+ 'ktacct': ktacct,
+ 'auth_user': auth_user, // mskkan auth_user
+ 'ambilansen1': sen1,
+ 'ambilansen5': sen5,
+ 'ambilansen10': sen10,
+ 'ambilansen20': sen20,
+ 'ambilansen50': sen50,
+ 'ambilanring1': ringgit1,
+ 'ambilanring5': ringgit5,
+ 'ambilanring10': ringgit10,
+ 'ambilanring20': ringgit20,
+ 'ambilanring50': ringgit50,
+ 'ambilanring100': ringgit100
+ },
+ success: function (data) {
+ if (data == 'LULUS') {
+ Swal.fire({
+ icon: 'success',
+ title: 'Transaksi Berjaya',
+ allowEscapeKey: false,
+ allowOutsideClick: false
+ }).then(function () {
+ $('#denominasiHQModal').modal('hide');
+ $('#pendahuluanserahanModal').modal('hide');
+ location.reload();
+ });
+ } else if (data == 'GAGAL') {
+ Swal.fire({
+ icon: 'error',
+ title: 'Transaksi Gagal',
+ allowEscapeKey: false,
+ allowOutsideClick: false
+ }).then(function () {
+ $('#denominasiHQModal').modal('hide');
+ $('#pendahuluanserahanModal').modal('hide');
+ $("#terima_transaksi").prop('disabled', false);
+ });
}
- });
- }
+ },
+ error: function (jqXHR, textStatus, errorThrown) {
+ console.log(textStatus, errorThrown);
+ }
+ });
+ }
@endsection
diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
index ae8f497..0ba0096 100644
--- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
+++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
@@ -132,6 +132,7 @@
+
+
+
+
+
+