diff --git a/app/Events/NotifikasiUbahHapus.php b/app/Events/NotifikasiUbahHapus.php new file mode 100644 index 0000000..897c489 --- /dev/null +++ b/app/Events/NotifikasiUbahHapus.php @@ -0,0 +1,32 @@ +norujukan = $norujukan; + $this->kelulusan = $kelulusan; + $this->komen = $komen; + } + + public function broadcastOn() + { + return ['notice-ubahhapus']; + } + + public function broadcastAs() + { + return 'my-ubahhapus'; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 72b738a..83a3da5 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -127,8 +127,9 @@ class GadaianController extends Controller } public function ubahmarhun(Request $request){ - dd($request); + $api_url = config('api.url'); + $auth_user = Auth::user(); $gadaiannorujukan = Http::put(config('api.url') . '/api/gadai/ubah/marhun/'. $auth_user['cawangan'] . '/' . $request->norujukedit,[ @@ -136,9 +137,8 @@ class GadaianController extends Controller 'karat' => $request->sltkarat, 'berat' => $request->berat, 'harga' => $request->harga1, - 'n_marhun' => $request->nilaimarhun, - 'marhun' => $request->marhun_edit, - 'nota' => $request->nota_edit + 'n_marhun' => $request->nilaimarhun + ])->json(); return redirect()->back(); @@ -532,6 +532,8 @@ class GadaianController extends Controller } + + /// KELULUSAN/// public function getkelulusan(Request $request) @@ -583,19 +585,16 @@ class GadaianController extends Controller $gadai_info = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); - dd($gadai_info); + $pinjaman = ($gadai_info[0][0]['pinjaman']) ? $gadai_info[0][0]['pinjaman'] : '-'; + $nilaimarhun = ($gadai_info[0][0]['nilaimarhun']) ? $gadai_info[0][0]['nilaimarhun'] : '-'; + $berat = ($gadai_info[0][0]['berat']) ? $gadai_info[0][0]['berat'] : '-'; + $percentpinj = ($gadai_info[0][0]['percentpinj']) ? $gadai_info[0][0]['percentpinj'] : '-'; - $pinjaman = $gadai_info['pinjaman']; - - - $nilaimarhun = $gadai_info['nilaimarhun']; - $berat = $gadai_info['berat']; - $margin = $gadai_info['percentpinj']; - - $messagemohon = $request->mohon . '|' . $pinjaman . '|' . $nilaimarhun . '|' . $berat . '|' . $margin . '|'; + $message = $pinjaman . '|' . $nilaimarhun . '|' . $berat . '|' . $percentpinj . '|'; $createlulus = Http::post(config('api.url') . '/api/CreateLulus/' . $auth_user['cawangan'] . '/' . $norujukan, [ - 'mohon' => $messagemohon, + 'mohon' => $request->mohon, + 'message' => $message, 'teller' => $auth_user['name'] ])->json(); @@ -606,5 +605,4 @@ class GadaianController extends Controller ///END KELULUSAN/// - } diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index aa14ae1..0ce4298 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -8,6 +8,8 @@ use App\Events\NotifikasiPembayaran; use App\Events\OperasiNotice; use App\Events\PendahuluanSerahan; use App\Events\NotifikasiKelulusan; +use App\Events\NotifikasiUbahHapus; + use App\User; @@ -62,8 +64,34 @@ class KhazanahController extends Controller $gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json(); $listserah = Http::get(config('api.url').'/api/listSerahMarhunController/'.$auth_user['cawangan'])->json(); + $array_reqteller = []; + + $reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'])->json(); + + // dd($reqTeller); + $countmodal = 0;$countserahan = 0; + foreach($reqTeller as $index=>$req) + { + if($req['modal'] != 0) + $countmodal++; + else if($req['serahan'] != 0) + $countserahan++; + } + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('khazanah.menu',compact('cawangan_info','api_url','gadai','listserah')); + return view('khazanah.menu',compact('cawangan_info','api_url','gadai','listserah','countmodal','countserahan')); + } + + public function pendahuluanserahandaftar() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $listgldetail = Http::get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json(); + + return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail')); } public function dashboard() @@ -89,7 +117,16 @@ class KhazanahController extends Controller //Peti Besi Cawangan $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); - $getVault = $getVault[0]['bakiakhir']; + if(sizeof($getVault) == 0) + { + $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); + $getVault = $peti_besi_terkini['bakiakhir']; + + }else{ + $getVault = $getVault[0]['bakiakhir']; + } + + //Dashboardall $dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json(); @@ -315,9 +352,12 @@ class KhazanahController extends Controller //declare array baru $arraykelulusan = []; + $arraykelulusanmohonid = []; $kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json(); $kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json(); + + foreach($kelulusan as $index=>$k) { @@ -331,7 +371,19 @@ class KhazanahController extends Controller array_push($arraykelulusan,['norujukan' => $k['norujukan'],'siri' => $k['siri'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]); } - return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','kelulusanmohonid')); + foreach($kelulusanmohonid as $index=>$km) + { + $komen = explode("|",$km['katalaluan']); + + $results=array_search("",$komen,true); + if($results !== false) { + unset($komen[$results]); + } + + array_push($arraykelulusanmohonid,['norujukan' => $km['norujukan'], 'teller' => $km['teller'], 'mohon' => $km['mohon'], 'pinjaman' => ($komen[0] ?? '-'), 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'), 'margin' => ($komen[3] ?? '-')]); + } + + return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','arraykelulusanmohonid')); } @@ -416,9 +468,29 @@ class KhazanahController extends Controller if($request->khazanah != null) { - $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[ - "khazanah" => $request->khazanah - ])->json(); + if($request->batal != null) + { + + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[ + "pembatalan" => $request->batal, + "khazanah" => $request->khazanah + ])->json(); + + if($updatelulus) + { + event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus)); + } + + }else{ + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[ + "khazanah" => $request->khazanah + ])->json(); + + if($updatelulus) + { + event(new NotifikasiUbahHapus($norujukan,"lulus","tiada")); + } + } } else { @@ -438,7 +510,6 @@ class KhazanahController extends Controller } }else{ - $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "khazanah", 'siri' => $request->siri, @@ -1550,7 +1621,6 @@ class KhazanahController extends Controller public function cetaklaporang_Aging(Request $request) //added by fariz 2021-01-19 { - $auth_user = Auth::user(); $api_url = config('api.url'); $tarikh_aging=$request; @@ -1615,4 +1685,138 @@ class KhazanahController extends Controller 'data_6','data7','data_8','data_9','data_10','data_11','data_12','data_13','tarikh_aging')); } + + public function pendahuluanserahanHQ(Request $request) + { + $auth_user = Auth::user(); + + $gldetail = Http::post(config('api.url').'/api/gldetailkaunter/'. $auth_user['cawangan'],[ + 'amaun' => $request->amaun, + 'jenisgldetail' => $request->jenisgldetail, + 'keterangan' => $request->keterangan, + 'kodcaw' => $request->kodcaw, + 'teller' => $request->teller, + 'dtacct' => $request->dtacct, + 'ktacct' => $request->ktacct + ])->json(); + + $peti_besi_terkini=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); + + if(sizeof($peti_besi_terkini) == 0){ + $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); + + $pendahuluanserahan = Http::put(config('api.url').'/api/UpdateVaultPendahuluanSerahan/'. $auth_user['cawangan'],[ + 'jenispendahuluanserahan' => $request->jenisgldetail, + 'amaun' => $request->amaun, + ])->json(); + + }else{ + $pendahuluanserahan = Http::put(config('api.url').'/api/UpdateVaultPendahuluanSerahan/'. $auth_user['cawangan'],[ + 'jenispendahuluanserahan' => $request->jenisgldetail, + 'amaun' => $request->amaun, + ])->json(); + } + + + + + return $this->denominasipendahuluanserahan($request); + } + + public function denominasipendahuluanserahan($request) + { + $auth_user = Auth::user(); + + $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json(); + + //bundle initialize + $rekodb1 = $denominasilist[0]['bd1']; $rekodb5 = $denominasilist[0]['bd5']; $rekodb10 = $denominasilist[0]['bd10']; $rekodb20 = $denominasilist[0]['bd20']; + $rekodb50 = $denominasilist[0]['bd50']; $rekodb100 = $denominasilist[0]['bd100']; + + //wang Syilling Initialize + $rekodsen1 = $denominasilist[0]['txtsen1']; $rekodsen5 = $denominasilist[0]['txtsen5']; $rekodsen10 = $denominasilist[0]['txtsen10']; + $rekodsen20 = $denominasilist[0]['txtsen20']; $rekodsen50 = $denominasilist[0]['txtsen50']; + + //Wang Ringgit Initialize + $rekodring1 = $denominasilist[0]['txtring1']; $rekodring5 = $denominasilist[0]['txtring5']; $rekodring10 = $denominasilist[0]['txtring10']; + $rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100']; + + if($request->jenisgldetail == 'pendahuluan') + { + $rekodb1 += intval($request->bundle1); + $rekodb5 += intval($request->bundle5); + $rekodb10 += intval($request->bundle10); + $rekodb20 += intval($request->bundle20); + $rekodb50 += intval($request->bundle50); + $rekodb100 += intval($request->bundle100); + + $denominasiupdate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ + + 'bd1' => $rekodb1, + 'bd5'=> $rekodb5, + 'bd10'=> $rekodb10, + 'bd20'=> $rekodb20, + 'bd50'=> $rekodb50, + 'bd100'=> $rekodb100, + 'txtring1'=> $rekodring1, + 'txtring5'=> $rekodring5, + 'txtsen1'=> $rekodsen1, + 'txtsen5'=> $rekodsen5, + 'txtsen10'=> $rekodsen10, + 'txtsen20'=> $rekodsen20, + 'txtsen50'=> $rekodsen50, + 'txtring10'=> $rekodring10, + 'txtring20'=> $rekodring20, + 'txtring50'=> $rekodring50, + 'txtring100'=> $rekodring100, + 'txtring1000'=> "0", + 'jumlahbundle'=> "0", + 'txtjumlah'=> "0", + 'jumlahkeping' => "0" + + ]); + + }else if($request->jenisgldetail == 'serahan') + { + $rekodb1 -= intval($request->bundle1); + $rekodb5 -= intval($request->bundle5); + $rekodb10 -= intval($request->bundle10); + $rekodb20 -= intval($request->bundle20); + $rekodb50 -= intval($request->bundle50); + $rekodb100 -= intval($request->bundle100); + + + $denominasiupdate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ + + 'bd1' => $rekodb1, + 'bd5'=> $rekodb5, + 'bd10'=> $rekodb10, + 'bd20'=> $rekodb20, + 'bd50'=> $rekodb50, + 'bd100'=> $rekodb100, + 'txtring1'=> $rekodring1, + 'txtring5'=> $rekodring5, + 'txtsen1'=> $rekodsen1, + 'txtsen5'=> $rekodsen5, + 'txtsen10'=> $rekodsen10, + 'txtsen20'=> $rekodsen20, + 'txtsen50'=> $rekodsen50, + 'txtring10'=> $rekodring10, + 'txtring20'=> $rekodring20, + 'txtring50'=> $rekodring50, + 'txtring100'=> $rekodring100, + 'txtring1000'=> "0", + 'jumlahbundle'=> "0", + 'txtjumlah'=> "0", + 'jumlahkeping' => "0" + + ]); + } + + if($denominasiupdate) + return "LULUS"; + else + return "GAGAL"; + } + } \ No newline at end of file diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index b885e0a..9c8cc63 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -630,27 +630,27 @@ if($("input[name='options']:checked").val() == 'belum_tebus'){ let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0); - if(+harini !== +tarikhgadai2){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Ubah Gadai Tidak Dibenarkan' - }); - return false; - } + // if(+harini !== +tarikhgadai2){ + // Swal.fire({ + // icon: 'error', + // title: 'Amaran', + // text: 'Ubah Gadai Tidak Dibenarkan' + // }); + // return false; + // } }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0); - if(+harini !== +tarikhgadai1){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Ubah Gadai Tidak Dibenarkan' - }); - return false; - } + // if(+harini !== +tarikhgadai1){ + // Swal.fire({ + // icon: 'error', + // title: 'Amaran', + // text: 'Ubah Gadai Tidak Dibenarkan' + // }); + // return false; + // } } if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ @@ -723,22 +723,22 @@ } }); - //TIME INTERVAL - let timerInterval; - timerInterval = setInterval(function(){ - $.ajax({ - method:'get', - url: "{{ route('teller.getkelulusan') }}", - data: { - "norujukan" : ubahid - }, - success:function(data){ - console.log(data); - - if(data != 0){ - console.log('berjaya'); - clearInterval(timerInterval); + var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + cluster: 'ap1', + encrypted: true + }); + + var channel = pusher.subscribe('notice-ubahhapus'); + channel.bind('my-ubahhapus', function(data) { + + console.log(data); + + + if(data.norujukan == ubahid) + { + if(data.kelulusan == 'lulus') + { Swal.fire({ icon: 'success', title: 'Telah Disahkan' @@ -746,20 +746,28 @@ var urlroute = '{{ route("gadaian.edit", ":id") }}'; urlroute = urlroute.replace(':id', ubahid); - window.location.replace(urlroute); - return true; - }); } - },error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); + else if(data.kelulusan == 'batal') + { + Swal.fire({ + icon: 'warning', + title: 'Telah Dibatalkan', + text: `Komen : ${data.komen}` + }).then(function(){ + // $("#terima_gadai").prop('disabled', false); + return false; + }); + } } + + + }); - }, 3000); + }else if (result.dismiss === Swal.DismissReason.cancel){ swalWithBootstrapButtons.fire( 'Batal', diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index dc717d9..30bddbe 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -35,6 +35,9 @@
Khazanah
+
+ Pendahuluan - Serahan +
diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index e1e6434..8e1c056 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -29,11 +29,11 @@ @if($index1 == 0)
  • - {{ $ls->name }} + {{ $ls->name }}
    • @else
  • - {{ $ls->name }} + {{ $ls->name }}
    • {{--
  • Contact @@ -43,15 +43,12 @@ @endforeach - -
    @foreach($listUser as $index1=>$ls) - {{-- {{ dd(empty($arraytunai[1])) }} --}} @if($index1 == 0) -
    +
    @@ -64,7 +61,6 @@
    - {{-- More info --}}
    @@ -78,7 +74,6 @@
    - {{-- More info --}}
    • @@ -92,7 +87,6 @@
    - {{-- More info --}} @@ -108,7 +102,6 @@
    - {{-- More info --}} @@ -122,7 +115,6 @@
    - {{-- More info --}} @@ -136,14 +128,13 @@
    - {{-- More info --}}
    - +
    @@ -176,9 +167,7 @@ @else -
    - -
    +
    @@ -191,7 +180,6 @@
    - {{-- More info --}}
    @@ -205,7 +193,6 @@
    - {{-- More info --}}
    @@ -219,7 +206,6 @@
    - {{-- More info --}} @@ -235,7 +221,6 @@
    - {{-- More info --}} @@ -249,7 +234,6 @@
    - {{-- More info --}} @@ -263,15 +247,14 @@
    - {{-- More info --}}
    - -
    bil
    + +
    @@ -285,7 +268,9 @@ + {{-- {{ dd($arraytunai) }} --}} @foreach ($arraytunai[$index1] as $tunai) + {{-- {{ dd($tunai) }} --}} @@ -302,16 +287,12 @@ - - - @endif @endforeach - {{--
    ...
    --}} @@ -324,12 +305,16 @@ + @endsection diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 1010337..37c4217 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -30,7 +30,7 @@
    -

    RM {{ ($ringkasanharian['gadai'][0]['jumlahpinjaman']) ? $ringkasanharian['gadai'][0]['jumlahpinjaman'] : "0.00" }}

    +

    RM {{ ($ringkasanharian['gadai'][0]['jumlahpinjaman']) ? number_format($ringkasanharian['gadai'][0]['jumlahpinjaman'],2) : "0.00" }}

    Gadai Hari Ini

    @@ -44,7 +44,7 @@
    -

    RM {{ ($ringkasanharian['tebus'][0]['jumlahpinjaman']) ? $ringkasanharian['tebus'][0]['jumlahpinjaman'] : "0.00" }}

    +

    RM {{ ($ringkasanharian['tebus'][0]['jumlahpinjaman']) ? number_format($ringkasanharian['tebus'][0]['jumlahpinjaman'],2) : "0.00" }}

    Tebus Hari Ini

    diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index 5f1ddd6..49b85e0 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -127,17 +127,18 @@
    @endforeach - @foreach($kelulusanmohonid as $index=>$km) + @foreach($arraykelulusanmohonid as $index=>$km) - + - - - - - + + + + + @endforeach @@ -425,7 +426,7 @@ { const { value: katalaluan } = await Swal.fire({ - title: 'Masukkan Katalaluan Semula', + title: 'Masukkan Katalaluan', input: 'password', inputPlaceholder: 'Katalaluan', confirmButtonText: 'Hantar', @@ -463,6 +464,7 @@ let norujukan = $(e).data('norujukan'); let namakhazanah = "{{ $auth_user = Auth::user()->name }}"; + $.ajax({ method:'put', url: "{{ route('khazanah.updatekelulusan') }}", @@ -487,5 +489,86 @@ }); } + + async function updatebatalmohon(e) + { + const { value: katalaluan } = await Swal.fire({ + title: 'Masukkan Katalaluan Semula', + input: 'password', + inputPlaceholder: 'Katalaluan', + confirmButtonText: 'Hantar', + showCancelButton:true, + cancelButtonText:'Batal', + allowOutsideClick: true + }) + + let dataminta = ''; + + $.ajax({ + method:'get', + url: "{{ route('khazanah.getmintasemulakelulusan') }}", + async:false, + data:{ passsemula : katalaluan }, + success:function(data) + { + if(data == "False") + { + dataminta = data; + } + } + }); + + if(dataminta == 'False') + { + Swal.fire({ + icon: 'error', + title: 'Pengesahan Katalaluan Tidak Berjaya' + }) + event.preventDefault(); + return false; + } + + const { value: komenkelulusan } = await Swal.fire({ + title: 'Masukkan Komen Daripada Khazanah', + input: 'text', + inputPlaceholder: 'Komen', + confirmButtonText: 'Hantar', + showCancelButton:false, + allowOutsideClick: false + }) + + let norujukan = $(e).data('norujukan'); + let namakhazanah = "{{ $auth_user = Auth::user()->name }}"; + + $.ajax({ + method:'put', + url: "{{ route('khazanah.updatekelulusan') }}", + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : norujukan, + "khazanah" : namakhazanah, + "komenubahhapus" : komenkelulusan, + "batal" : 'batal' + }, + success:function(data){ + + console.log(data); + + Swal.fire({ + icon: 'success', + title: 'Pengesahan Berjaya' + }).then(function(){ + location.reload(); + }); + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + + + } + @endsection diff --git a/resources/views/khazanah/menu.blade.php b/resources/views/khazanah/menu.blade.php index 06ef095..cedf9c4 100644 --- a/resources/views/khazanah/menu.blade.php +++ b/resources/views/khazanah/menu.blade.php @@ -11,8 +11,8 @@ Gadai {{ count($gadai) }}Tebus {{ count($listserah) }} - Pendahuluan - Serahan + Pendahuluan {{ $countmodal }} + Serahan {{ $countserahan }} diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php new file mode 100644 index 0000000..b3682f6 --- /dev/null +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -0,0 +1,229 @@ +@extends('layouts.app') + +@section('content') + +@include('modal.pendahuluanserahan') +@include('modal.denominasimodalpendahuluanserahan') + + +
    +
    +
    +
    +
    {{ __('Pendahuluan Serahan') }}
    + +
    + +
    Senarai Pendahuluan Serahan
    + +
    + +
    bil
    {{ $loop->iteration }} {{ $tunai['tarikh'] }}
    {{ $km['norujukan'] }}{{ $km['norujukan'] }} {{ $km['teller'] }} {{ $km['mohon'] }}{{ $km['tarikh'] }}{{ $cawangan_info['details_caw'] }}{{ $km['norujukan'] }}{{ $km['norujukan'] }}{{ $km['pinjaman'] }}{{ $km['nilaimarhun'] }}{{ $km['berat'] }}{{ $km['margin'] }} +
    + + + + + + + + + + @foreach ($listgldetail as $gldetail) + + + + + + + @endforeach + +
    TarikhDescriptionPendahuluan (RM)Serahan (RM)
    {{ $gldetail['tarikh'] }}{{ $gldetail['descpt'] }}{{ $gldetail['pendahuluan'] }}{{ $gldetail['serahan'] }}
    + +
    + + + + + + + + + + + + + +@endsection diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php new file mode 100644 index 0000000..23aa649 --- /dev/null +++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php @@ -0,0 +1,77 @@ + + + + diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php new file mode 100644 index 0000000..031fc0a --- /dev/null +++ b/resources/views/modal/pendahuluanserahan.blade.php @@ -0,0 +1,49 @@ + + diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index cdacce2..2b91646 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -849,29 +849,29 @@ } $.ajax({ - method:'get', - url: "{{ route('bayaran.ansuranstawarruq') }}", - data:{ - "bayaran" : bayar, - "kodcaw" : kodcaw, - "norujukan" : norujukan, - "teller" : teller - }, - success:function(success_data){ + method:'get', + url: "{{ route('bayaran.ansuranstawarruq') }}", + data:{ + "bayaran" : bayar, + "kodcaw" : kodcaw, + "norujukan" : norujukan, + "teller" : teller + }, + success:function(success_data){ - var urlroute = '{{ route("resit.ansurans", ":id") }}'; - urlroute = urlroute.replace(':id', norujukan); + var urlroute = '{{ route("resit.ansurans", ":id") }}'; + urlroute = urlroute.replace(':id', norujukan); - Swal.fire( - 'Berjaya!', - 'Bayaran Ansuran Berjaya', - 'success' - ).then(function() { - window.open(urlroute, '_blank'); - window.location.replace("{{ url()->previous() }}"); - }) - } - }); + Swal.fire( + 'Berjaya!', + 'Bayaran Ansuran Berjaya', + 'success' + ).then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ url()->previous() }}"); + }) + } + }); } else if(tarikhgadai < tarikhtawarruq) @@ -1065,7 +1065,7 @@ var kadarupah = "{{ $gadai['kadarupah'] }}"; var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}"); var nilai_marhun = parseFloat("{{ $gadai['nilaimarhun'] }}") - sumnilaimarhun; - var pinjamanbaru = $('#bakipinjaman').val(); + var pinjamanbaru = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,""); var ansuran = 0; var addpinjaman = 0; var bakipinjaman = $('#perludibayar').val(); @@ -1078,6 +1078,7 @@ var marhun_detail = marhun_baru; var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length; var nowakil = nw; + var kadarupahbaru = 0; @@ -1209,7 +1210,7 @@ allowEscapeKey: false, allowEnterKey: false }) - + let siricreated = 0; $.ajax({ method:'post', url: "{{ route('khazanah.createkelulusan') }}", @@ -1222,6 +1223,7 @@ }, success:function(data){ console.log(data); + siricreated = data; }, error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); @@ -1229,37 +1231,46 @@ } }); - //TIME INTERVAL - let timerInterval; - - timerInterval = setInterval(function(){ - $.ajax({ - method:'get', - url: "{{ route('khazanah.getkelulusan') }}", - data: { - "norujukan" : norujukan - }, - success:function(data){ - - if(data != '') - { - clearInterval(timerInterval); - Swal.fire({ - icon: 'success', - title: 'Telah Disahkan' - }).then(function(){ - - tambahpinjamanfunc(); - + var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + cluster: 'ap1', + encrypted: true }); - } - },error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); + var channel = pusher.subscribe('notice-kelulusan'); + channel.bind('my-kelulusan', function(data) { + + + if(data.norujukan == norujukan && data.siri == siricreated) + { + if(data.kelulusan == 'lulus') + { + Swal.fire({ + icon: 'success', + title: 'Telah Disahkan', + text: `Komen : ${data.komen}` + }).then(function(){ + tambahpinjamanfunc(); + }); + } - }); - }, 3000); + else if(data.kelulusan == 'batal') + { + Swal.fire({ + icon: 'warning', + title: 'Telah Dibatalkan', + text: `Komen : ${data.komen}` + }).then(function(){ + // $("#terima_gadai").prop('disabled', false); + return false; + }); + } + } + + + + }); + + } else if (result.dismiss === Swal.DismissReason.cancel) { swalWithBootstrapButtons.fire( 'Gagal', @@ -1309,7 +1320,7 @@ allowEscapeKey: false, allowEnterKey: false }) - + let siricreated = 0; $.ajax({ method:'post', url: "{{ route('operasi.createkelulusan') }}", @@ -1322,6 +1333,7 @@ }, success:function(data){ console.log(data); + siricreated = data; }, error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); @@ -1329,36 +1341,79 @@ } }); - //TIME INTERVAL - let timerInterval; - - timerInterval = setInterval(function(){ - $.ajax({ - method:'get', - url: "{{ route('operasi.getkelulusan') }}", - data: { - "norujukan" : norujukan - - }, - success:function(data){ - if(data != ''){ - clearInterval(timerInterval); - Swal.fire({ - icon: 'success', - title: 'Telah Disahkan' - }).then(function(){ - $(func).attr("onSubmit","return true;"); - $(func).submit(); - return true; - }); - } - }, - error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); + + var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + cluster: 'ap1', + encrypted: true + }); + + var channel = pusher.subscribe('notice-kelulusan'); + channel.bind('my-kelulusan', function(data) { + + + if(data.norujukan == norujukan && data.siri == siricreated) + { + if(data.kelulusan == 'lulus') + { + Swal.fire({ + icon: 'success', + title: 'Telah Disahkan', + text: `Komen : ${data.komen}` + }).then(function(){ + $(func).attr("onSubmit","return true;"); + $(func).submit(); + return true; + }); + } - }); - }, 3000); + else if(data.kelulusan == 'batal') + { + Swal.fire({ + icon: 'warning', + title: 'Telah Dibatalkan', + text: `Komen : ${data.komen}` + }).then(function(){ + $("#terima_gadai").prop('disabled', false); + return false; + }); + } + } + + + + }); + + //TIME INTERVAL + // let timerInterval; + + // timerInterval = setInterval(function(){ + // $.ajax({ + // method:'get', + // url: "{{ route('operasi.getkelulusan') }}", + // data: { + // "norujukan" : norujukan + + // }, + // success:function(data){ + // if(data != ''){ + // clearInterval(timerInterval); + // Swal.fire({ + // icon: 'success', + // title: 'Telah Disahkan' + // }).then(function(){ + // $(func).attr("onSubmit","return true;"); + // $(func).submit(); + // return true; + // }); + // } + // }, + // error: function(xhr, status, error) { + // var err = eval("(" + xhr.responseText + ")"); + // alert(xhr.responseText); + // } + // }); + // }, 3000); + }else if (result.dismiss === Swal.DismissReason.cancel){ swalWithBootstrapButtons.fire( 'Gagal', @@ -1403,7 +1458,7 @@ var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val()); var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val()); var bakipinjaman = maxpinjaman - parseFloat($('#tambahpinjam').val()); - var bakiupah = 0; + var bakiupah = $('#bayaranditerima').val(); var historygadaian = "{{ $gadai['norujukan'] }}"; var marhun = "{{ $gadai['marhun'] }}"; var total_berat = parseFloat("{{ $gadai['berat'] }}"); diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php index e55acbd..b57d4f1 100644 --- a/resources/views/print/resittambahpinjam.blade.php +++ b/resources/views/print/resittambahpinjam.blade.php @@ -424,13 +424,16 @@ hr.new5 { Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp -Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }} +Pembiayaan : RM {{ number_format($gadai['bakipjm'],2) }} (+) Tambah Pembiayaan : RM {{ number_format($penebusan['addpinjaman'],2) }} -Pembiayaan Baru : RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }} +Pembiayaan Baru : RM {{ number_format($gadai['bakipjm'] + $penebusan['addpinjaman'],2) }} + + + Bayaran Keuntungan : RM {{ number_format($penebusan['bakiupah'],2) }} @@ -516,13 +519,16 @@ hr.new5 { Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp -Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }} +Pembiayaan : RM {{ number_format($gadai['bakipjm'],2) }} (+) Tambah Pembiayaan : RM {{ number_format($penebusan['addpinjaman'],2) }} -Pembiayaan Baru : RM {{ number_format($gadai['pinjaman'] + $penebusan['addpinjaman'],2) }} +Pembiayaan Baru : RM {{ number_format($gadai['bakipjm'] + $penebusan['addpinjaman'],2) }} + + + Bayaran Keuntungan : RM {{ number_format($penebusan['bakiupah'],2) }} diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php new file mode 100644 index 0000000..181413c --- /dev/null +++ b/resources/views/print/resittebusseparuh.blade.php @@ -0,0 +1,576 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    User Image User Image
    + + + + + + + + + + +
    Salinan Pelanggan
    RESIT BAYARAN
    + +
    + + + + + + + + + + + + + + + + + + + + + +
    Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
    Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
    No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
    Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
    No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
    Harga Jualan : RM {{ number_format(($gadai['hargajualan']),2) }}
    (-) Bayaran Pelanggan : RM {{ number_format($totaltransaction,2) }}
    Baki Harga Jualan : RM {{ number_format($gadai['bakihargajualan'],2) }}
    (-) Rebate : RM {{ number_format($penebusan['rebate'],2) }}
    Bayaran : RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    .................................................... .................................................... .................................................... ....................................................
    DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
    +
    +
    +
    + +
    +
    + + + + + + + + + + + + + +
    Salinan Pejabat
    RESIT BAYARAN
    + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
    Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
    No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
    Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
    No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
    Harga Jualan : RM {{ number_format(($gadai['hargajualan']),2) }}
    (-) Bayaran Pelanggan : RM {{ number_format($totaltransaction,2) }}
    Baki Harga Jualan : RM {{ number_format($gadai['bakihargajualan'],2) }}
    (-) Rebate : RM {{ number_format($penebusan['rebate'],2) }}
    Bayaran : RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    .................................................... .................................................... .................................................... ....................................................
    DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
    +
    \ No newline at end of file diff --git a/resources/views/print/resittebusseparuhbelum.blade.php b/resources/views/print/resittebusseparuhbelum.blade.php new file mode 100644 index 0000000..c566ee6 --- /dev/null +++ b/resources/views/print/resittebusseparuhbelum.blade.php @@ -0,0 +1,564 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    User Image User Image
    + + + + + + + + + + +
    Salinan Pelanggan
    RESIT BAYARAN
    + +
    + + + + + + + + + + + + + + + + + + + + + +
    Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
    Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
    No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg'] }}
    Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
    No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
    +
    + + + + + + + + + + + + + + + + + + +
    Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
    Pembiayaan : RM {{ number_format(($gadai['pinjaman']),2) }}
    Jumlah Upah : RM {{ number_format($penebusan['bakiupah'],2) }}
    Tebus Keseluruhan : RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    .................................................... .................................................... .................................................... ....................................................
    DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
    +
    +
    +
    + +
    +
    + + + + + + + + + + + + + +
    Salinan Pejabat
    RESIT BAYARAN
    + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
    Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
    No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan: {{ $gadai['jbg`'] }}
    Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
    No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
    +
    + + + + + + + + + + + + + + + + + +
    Tarikh Bayaran : @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
    Pembiayaan : RM {{ number_format(($gadai['pinjaman']),2) }}
    Jumlah Upah : RM {{ number_format($penebusan['bakiupah'],2) }}
    Tebus Keseluruhan : RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    .................................................... .................................................... .................................................... ....................................................
    DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
    +
    \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index d227b5c..fff1a3b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -97,6 +97,7 @@ Route::post('/printsag',['as'=>'printsag','uses'=>'GadaianController@printSAG']) //Khazanah Route::get('/menu','KhazanahController@menu')->middleware('auth','khazanah'); +Route::get('/pendahuluanserahan','KhazanahController@pendahuluanserahandaftar')->middleware('auth','khazanah'); Route::get('/khazanahgadaian',['as'=>'khazanah.gadaian','uses'=>'KhazanahController@gadaian'])->middleware('auth','khazanah'); Route::get('/khazanahtebus','KhazanahController@tebus')->middleware('auth','khazanah'); Route::get('/kelulusan','KhazanahController@kelulusan')->middleware('auth','khazanah'); @@ -111,6 +112,7 @@ Route::get('/laporan/tebus',['as'=>'laporan.tebus','uses'=>'KhazanahController@l Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahController@cetakLaporanPenebusan'])->middleware('auth','khazanah'); Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah'); Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah'); +Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah'); Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian']); Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);