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

fix kelulusan

Browse Source
This commit is contained in:
hafifierahman
2021-02-25 09:21:09 +08:00
parent 21a026e6b3
commit 348f337bbf
7 changed files with 113 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+65 -12
View File
@@ -381,6 +381,45 @@ class GadaianController extends Controller
return view('print.resitansuransebelum',compact('gadai','customers_info','wakil','penebusan'));
}
public function resittebusseparuh($id)
{
$auth_user = Auth::user();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
foreach($transaction as $trans)
{
$totaltransaction += $trans['duit_masuk'];
}
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
if(sizeof($customers_info) != 0)
$customers_info = $customers_info[0];
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
}
public function resittebus($id)
{
@@ -506,34 +545,48 @@ class GadaianController extends Controller
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $request->norujukan)->json();
if(sizeof($gadai) > 0)
{
$history = $gadai[0][0]['historygadaian'];
$dahtebus = $gadai[0][0]['sttebus'];
$norujukan = $gadai[0][0]['norujukan'];
}
$count = 0;
$arrayhist = [];
while($history != "0" && $history != '')
while($history != "0" && $history != '' || $dahtebus == 'T')
{
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $history)->json();
$tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],[
"norujukan" => $history
])->json();
if($history != "0" && $history != '')
{
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $history)->json();
$tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],[
"norujukan" => $history
])->json();
array_push($arrayhist,["norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
array_push($arrayhist,["norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
if(sizeof($gadai) > 0)
if(sizeof($gadai) > 0)
$history = $gadai[0][0]['historygadaian'];
$count++;
}
else{
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json();
$tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],[
"norujukan" => $norujukan
])->json();
array_push($arrayhist,["norujukan" => $norujukan,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
break;
}
}
return response()->json($arrayhist,200);
}
/// KELULUSAN///
public function getkelulusan(Request $request)
app/Http/Controllers/KhazanahController.php
+9 -6
View File
@@ -211,7 +211,7 @@ class KhazanahController extends Controller
$tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan_barcode])->json();
//dd($tebus);
$tebus_detail = $tebus[0];
//dd($tebus_detail);
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json();
@@ -227,18 +227,22 @@ class KhazanahController extends Controller
if($tebus_detail['jenistebus'] == 'P')
{
$totalkeluar = $tebus_detail['addpinjaman'] + $keluar;
$totalmasuk = $tebus_detail['bakiupah'] + $masuk;
// dd($tebus_detail['addpinjaman'],$keluar,$totalkeluar);
$bakiakhir = $bakiawal-$totalkeluar+$masuk+$pendahuluan-$serahan;
$bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$totalkeluar,
'masuk'=>$masuk,
'masuk'=>$totalmasuk,
'bakiakhir'=>$bakiakhir
]);
}else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
@@ -532,10 +536,9 @@ class KhazanahController extends Controller
if($request->pembatalan == null)
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi",
'siri' => $request->siri
'siri' => $request->siri,
])->json();
}else{
resources/views/aliran_tunai/index.blade.php
-1
View File
@@ -112,7 +112,6 @@
<div class="col-md-12 text-center">
<input type="button" class="btn btn-lg btn-primary" value="TAMBAH MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="tambahmodal" onclick="openuptambahdanserah(this)">
<input type="button" class="btn btn-lg btn-primary" value="SERAHAN MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="serahanmodal" onclick="openuptambahdanserah(this)">
<input type="button" class="btn btn-lg btn-primary" value="KEMASKINI" onclick="location.reload();">
</div>
</div>
<div class="row mt-3">
resources/views/customers/info.blade.php
+27 -1
View File
@@ -606,13 +606,34 @@
historytebusbayaran.clear().draw();
$.each(data,function(index,tebusaz){
switch(tebusaz['jenistebus']) {
case 'P':
var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'T':
console.log("tebusan" + tebusaz['norujukan']);
var urlroute = '{{ route("resit.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'A':
var urlroute = '{{ route("resit.belumansurans", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'S':
var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
}
historytebusbayaran.row.add([
counter,
tebusaz['norujukan'],
tebusaz['jenistebus'],
tebusaz['jbg'],
tebusaz['t_tebus'],
'<a class="btn btn-info" target="_blank">Cetak</a>'
'<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
]).draw();
counter = counter + 1;
});
@@ -893,10 +914,14 @@
icon: 'success',
title: 'Telah Disahkan'
}).then(function(){
let teller = "{{ Auth::user()->name }}";
if($("input[name='options']:checked").val() == 'belum_tebus'){
$.ajax({
method:'put',
url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + hapusid,
data: { 'kodlaluan' : teller },
success:function(data){
$.ajax({
method:'put',
@@ -924,6 +949,7 @@
$.ajax({
method:'put',
url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + hapusidsudah,
data: { 'kodlaluan' : teller },
success:function(data){
if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire(
resources/views/khazanah/kelulusan.blade.php
+2 -1
View File
@@ -115,6 +115,7 @@
</thead>
<tbody>
@foreach($arraykelulusan as $index=>$k)
{{-- {{ dd($k) }} --}}
<tr>
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
<td>{{ $k['namateller'] }}</td>
@@ -405,7 +406,7 @@
success:function(data){
Swal.fire({
icon: 'success',
title: 'Pengesahan Berjaya'
title: 'Pengesahan Berjaya Dibatalkan'
}).then(function(){
location.reload();
resources/views/penebusan/index.blade.php
+7 -39
View File
@@ -770,8 +770,8 @@
var pinjaman = "{{ $gadai['pinjaman']}}";
var ansuran = 0;
var addpinjaman = 0;
var bakipinjaman = $('#perludibayar').val();
var bakiupah = $('#jumlahupah').val();
var bakipinjaman = $('#perludibayar').val().replace(/[^0-9.-]+/g,"");
var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,"");
var historygadaian = 0;
var marhun = "{{ $gadai['marhun'] }}";
var nowakil = nw;
@@ -1238,7 +1238,6 @@
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
// $("#terima_gadai").prop('disabled', false);
return false;
});
}
@@ -1338,8 +1337,7 @@
title: 'Telah Disahkan',
text: `Komen : ${data.komen}`
}).then(function(){
$(func).attr("onSubmit","return true;");
$(func).submit();
tambahpinjamanfunc();
return true;
});
@@ -1361,36 +1359,6 @@
});
//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){
$("#terima_transaksi").prop('disabled', false);
@@ -1432,12 +1400,12 @@
var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}";
var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
var pinjaman = parseFloat($('#pinjamanbaru').val());
var pinjaman = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
var ansuran = 0;
var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val());
var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val());
var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val().replace(/[^0-9.-]+/g,""));
var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val().replace(/[^0-9.-]+/g,""));
var bakipinjaman = maxpinjaman - parseFloat($('#tambahpinjam').val());
var bakiupah = $('#bayaranditerima').val();
var bakiupah = $('#bayaranditerima').val().replace(/[^0-9.-]+/g,"");
var historygadaian = "{{ $gadai['norujukan'] }}";
var marhun = "{{ $gadai['marhun'] }}";
var total_berat = parseFloat("{{ $gadai['berat'] }}");
routes/web.php
+3
View File
@@ -83,6 +83,8 @@ Route::get('/firstwakil',['as'=>'wakil.first','uses'=>'PenebusanController@getfi
Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'])->middleware('auth','teller');
//MAINTENANCE
Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller');
Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller');
@@ -174,6 +176,7 @@ Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'GadaianController@resit
Route::get('/resitansurans/{id}',['as'=>'resit.ansurans','uses'=>'GadaianController@resitansurans'])->middleware('auth','teller');
Route::get('/resitbelumansurans/{id}',['as'=>'resit.belumansurans','uses'=>'GadaianController@resitbelumansurans'])->middleware('auth','teller');
Route::get('/resit/tebus/{id}',['as'=>'resit.tebus','uses'=>'GadaianController@resittebus'])->middleware('auth','teller');
Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'GadaianController@resittebusseparuh'])->middleware('auth','teller');
Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'GadaianController@resitbelumtebus'])->middleware('auth','teller');
Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'GadaianController@resittambahpinjam'])->middleware('auth','teller');