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

Merge branch 'pipiv2' into 'new-master'

Browse Source 
fix aliran tunai

See merge request online-sistem1/kaunter!122
This commit is contained in:
Zakwan Hamdan
2021-05-06 06:12:16 +00:00
parent 5156951bf8 2542ad3ef3
commit a3f7f54fb1
5 changed files with 52 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+5 -5
View File
@@ -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')); 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(); $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]; $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']; $keluar = $getTunai2['keluar'];
$baki = $getTunai2['baki']; $baki = $getTunai2['baki'];
@@ -1199,8 +1199,8 @@ class AliranTunaiController extends Controller
//masuk dalam tunai aliran //masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $request->teller, 'kodlaluan' => $teller,
'keluar' => $keluar, 'keluar' => $keluar,
'masuk' => $masuk, 'masuk' => $masuk,
'bakiakhir' => $bakiakhir 'bakiakhir' => $bakiakhir
app/Http/Controllers/GadaianController.php
+4
View File
@@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Carbon\Carbon; use Carbon\Carbon;
use App\Http\Controllers\AliranTunaiController;
class GadaianController extends Controller class GadaianController extends Controller
{ {
@@ -19,6 +20,7 @@ class GadaianController extends Controller
{ {
$this->middleware('auth'); $this->middleware('auth');
$this->customerService = New CustomerService(); $this->customerService = New CustomerService();
$this->AliranTunaiController = New AliranTunaiController();
} }
public function index(Request $request){ public function index(Request $request){
@@ -179,6 +181,8 @@ class GadaianController extends Controller
'teller' => $auth_user['name'] 'teller' => $auth_user['name']
]); ]);
$this->AliranTunaiController->alirantunaiGadai($request,$auth_user['name']);
$request->session()->forget('page_reload'); $request->session()->forget('page_reload');
$request->session()->forget('norujukan'); $request->session()->forget('norujukan');
return redirect()->route('customer_info'); return redirect()->route('customer_info');
app/Http/Controllers/PenebusanController.php
+8
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\AliranTunaiController;
use Carbon\Carbon; use Carbon\Carbon;
@@ -13,6 +14,8 @@ class PenebusanController extends Controller
public function __construct() public function __construct()
{ {
$this->middleware('auth'); $this->middleware('auth');
$this->AliranTunaiController = New AliranTunaiController();
} }
public function index($norujukan){ public function index($norujukan){
@@ -659,6 +662,9 @@ class PenebusanController extends Controller
'nilai_marhun' => $array1['n_marhun'] 'nilai_marhun' => $array1['n_marhun']
])->json(); ])->json();
} }
$this->AliranTunaiController->alirantunaiTebus($request);
} }
@@ -800,6 +806,8 @@ class PenebusanController extends Controller
} }
$this->AliranTunaiController->alirantunaiTebus($request);
return response()->json($updatemarhun,200); return response()->json($updatemarhun,200);
resources/views/gadaian/index.blade.php
-53
View File
@@ -854,24 +854,6 @@
text: `Komen : ${data.komen}` text: `Komen : ${data.komen}`
}).then(function(){ }).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).attr("onSubmit","return true;");
$(func).submit(); $(func).submit();
return true; return true;
@@ -989,23 +971,6 @@
title: 'Telah Disahkan' title: 'Telah Disahkan'
}).then(function(){ }).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).attr("onSubmit","return true;");
$(func).submit(); $(func).submit();
@@ -1050,24 +1015,6 @@
text: 'Gadaian Berjaya Disimpan' 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).attr("onSubmit","return true;");
$(func).submit(); $(func).submit();
return true; return true;
resources/views/penebusan/index.blade.php
+35 -54
View File
@@ -948,33 +948,45 @@
}, },
success:function(success_data){ success:function(success_data){
$.ajax({
method: 'put', if(success_data == 1)
url: "{{ route('alirantunai.tebus') }}", {
async:false, $.ajax({
data:{ method: 'put',
'norujukan' : norujukan, url: "{{ route('alirantunai.tebus') }}",
"_token": "{{ csrf_token() }}" async:false,
}, data:{
success:function(data){ 'norujukan' : norujukan,
console.log(data); "_token": "{{ csrf_token() }}"
}, error: function(xhr, status, error) { },
var err = eval("(" + xhr.responseText + ")"); success:function(data){
alert(xhr.responseText); console.log(data);
} }, error: function(xhr, status, error) {
}); var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
Swal.fire({ Swal.fire({
icon: 'success', icon: 'success',
title: 'Berjaya!', title: 'Berjaya!',
text: 'Penebusan Berjaya', text: 'Penebusan Berjaya',
}).then(function() { }).then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
window.location.replace("{{ route('customer_info') }}"); window.location.replace("{{ route('customer_info') }}");
}) })
}
else{
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!',
});
}
} }
}); });
///////////// /////////////
//End File// //End File//
/////////// ///////////
@@ -1899,21 +1911,6 @@
}, },
success:function(success_data){ 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") }}'; var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
urlroute = urlroute.replace(':id', norujukan); urlroute = urlroute.replace(':id', norujukan);
Swal.fire( Swal.fire(
@@ -2004,22 +2001,6 @@
var urlroute = '{{ route("resit.tambahpinjam", ":id") }}'; var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
urlroute = urlroute.replace(':id', norujukan); 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( Swal.fire(
'Berjaya!', 'Berjaya!',
'Tambah Pinjaman Berjaya!', 'Tambah Pinjaman Berjaya!',