From 2542ad3ef33bd2022499cfe0c461456fff512bf4 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 6 May 2021 14:01:49 +0800 Subject: [PATCH] fix aliran tunai --- .../Controllers/AliranTunaiController.php | 10 +-- app/Http/Controllers/GadaianController.php | 4 + app/Http/Controllers/PenebusanController.php | 8 ++ resources/views/gadaian/index.blade.php | 53 ----------- resources/views/penebusan/index.blade.php | 89 ++++++++----------- 5 files changed, 52 insertions(+), 112 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 62ee3fd..9f1bea6 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -1174,14 +1174,14 @@ class AliranTunaiController extends Controller return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur')); } - public function alirantunaiGadai(Request $request){ + public function alirantunaiGadai(Request $request,$teller){ $auth_user = Auth::user(); - $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan)->json(); + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_gadai)->json(); $gadai_detail = $gadai[0]; - $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json(); + $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $teller])->json(); $keluar = $getTunai2['keluar']; $baki = $getTunai2['baki']; @@ -1199,8 +1199,8 @@ class AliranTunaiController extends Controller //masuk dalam tunai aliran - $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ - 'kodlaluan' => $request->teller, + $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ + 'kodlaluan' => $teller, 'keluar' => $keluar, 'masuk' => $masuk, 'bakiakhir' => $bakiakhir diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index d9fd936..7d9bf97 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; use Carbon\Carbon; +use App\Http\Controllers\AliranTunaiController; class GadaianController extends Controller { @@ -19,6 +20,7 @@ class GadaianController extends Controller { $this->middleware('auth'); $this->customerService = New CustomerService(); + $this->AliranTunaiController = New AliranTunaiController(); } public function index(Request $request){ @@ -179,6 +181,8 @@ class GadaianController extends Controller 'teller' => $auth_user['name'] ]); + $this->AliranTunaiController->alirantunaiGadai($request,$auth_user['name']); + $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); return redirect()->route('customer_info'); diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index bad830c..da38505 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; +use App\Http\Controllers\AliranTunaiController; use Carbon\Carbon; @@ -13,6 +14,8 @@ class PenebusanController extends Controller public function __construct() { $this->middleware('auth'); + $this->AliranTunaiController = New AliranTunaiController(); + } public function index($norujukan){ @@ -659,6 +662,9 @@ class PenebusanController extends Controller 'nilai_marhun' => $array1['n_marhun'] ])->json(); } + + $this->AliranTunaiController->alirantunaiTebus($request); + } @@ -800,6 +806,8 @@ class PenebusanController extends Controller } + $this->AliranTunaiController->alirantunaiTebus($request); + return response()->json($updatemarhun,200); diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 220133f..8f2e6d1 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -854,24 +854,6 @@ text: `Komen : ${data.komen}` }).then(function(){ - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.gadai') }}", - async:false, - data:{ - 'norujukan' : norujukan, - 'teller' : teller, - 'pinjaman' : pinjaman, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - $(func).attr("onSubmit","return true;"); $(func).submit(); return true; @@ -989,23 +971,6 @@ title: 'Telah Disahkan' }).then(function(){ - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.gadai') }}", - async:false, - data:{ - 'norujukan' : norujukan, - 'teller' : teller, - 'pinjaman' : pinjaman, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); $(func).attr("onSubmit","return true;"); $(func).submit(); @@ -1050,24 +1015,6 @@ text: 'Gadaian Berjaya Disimpan' }); - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.gadai') }}", - async:false, - data:{ - 'norujukan' : norujukan, - 'teller' : teller, - 'pinjaman' : pinjaman, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - $(func).attr("onSubmit","return true;"); $(func).submit(); return true; diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index ca0b6ac..cdc7a04 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -948,33 +948,45 @@ }, success:function(success_data){ - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.tebus') }}", - async:false, - data:{ - 'norujukan' : norujukan, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); + + if(success_data == 1) + { + $.ajax({ + method: 'put', + url: "{{ route('alirantunai.tebus') }}", + async:false, + data:{ + 'norujukan' : norujukan, + "_token": "{{ csrf_token() }}" + }, + success:function(data){ + console.log(data); + }, error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); - Swal.fire({ - icon: 'success', - title: 'Berjaya!', - text: 'Penebusan Berjaya', - }).then(function() { - window.open(urlroute, '_blank'); - window.location.replace("{{ route('customer_info') }}"); - }) + Swal.fire({ + icon: 'success', + title: 'Berjaya!', + text: 'Penebusan Berjaya', + }).then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) + } + else{ + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!', + }); + } } }); + ///////////// //End File// /////////// @@ -1899,21 +1911,6 @@ }, success:function(success_data){ - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.tebus') }}", - async:false, - data:{ - 'norujukan' : norujukan, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - var urlroute = '{{ route("resit.tebusseparuh", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); Swal.fire( @@ -2004,22 +2001,6 @@ var urlroute = '{{ route("resit.tambahpinjam", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); - $.ajax({ - method: 'put', - url: "{{ route('alirantunai.tebus') }}", - async:false, - data:{ - 'norujukan' : norujukan, - "_token": "{{ csrf_token() }}" - }, - success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - Swal.fire( 'Berjaya!', 'Tambah Pinjaman Berjaya!',