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

fix skit2

Browse Source
This commit is contained in:
hafifierahman
2021-02-28 10:03:26 +08:00
parent c3b2c027cc
commit dfcf7c2e4a
10 changed files with 214 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+89
View File
@@ -105,4 +105,93 @@ class AliranTunaiController extends Controller
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus')); return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus'));
} }
public function alirantunaiGadai(Request $request){
$auth_user = Auth::user();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan)->json();
$gadai_detail = $gadai[0];
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json();
$keluar = $getTunai2['keluar'];
$baki = $getTunai2['baki'];
$masuk = $getTunai2['masuk'];
$bakiawal = $getTunai2['bakiawal'];
$pendahuluan = $getTunai2['tambah'];
$serahan = $getTunai2['kurang'];
$totalkeluar = 0;
$bakiakhir = 0;
$totalkeluar = $request->pinjaman + $keluar;
$bakiakhir = $bakiawal-$totalkeluar+$masuk+$pendahuluan-$serahan;
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $request->teller,
'keluar' => $keluar,
'masuk' => $masuk,
'bakiakhir' => $bakiakhir
]);
return response()->json($updateTunai,201);
}
public function alirantunaiTebus(Request $request){
$auth_user = Auth::user();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan)->json();
$gadai_detail = $gadai[0];
$tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan])->json();
$tebus_detail = $tebus[0];
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json();
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk'];
$bakiawal=$getTunai2['bakiawal'];
$pendahuluan=$getTunai2['tambah'];
$serahan=$getTunai2['kurang'];
$totalmasuk = 0;
$bakiakhir = 0;
$totalkeluar = 0;
if($tebus_detail['jenistebus'] == 'P')
{
$totalkeluar = $tebus_detail['addpinjaman'] + $keluar;
$totalmasuk = $tebus_detail['bakiupah'] + $masuk;
$bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$keluar,
'masuk'=>$masuk,
'bakiakhir'=>$bakiakhir
]);
}else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
$bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$keluar,
'masuk'=>$masuk,
'bakiakhir'=>$bakiakhir
]);
}
}
} }
app/Http/Controllers/GadaianController.php
+2 -2
View File
@@ -565,7 +565,7 @@ class GadaianController extends Controller
"norujukan" => $history "norujukan" => $history
])->json(); ])->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,["pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"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']; $history = $gadai[0][0]['historygadaian'];
@@ -580,7 +580,7 @@ class GadaianController extends Controller
])->json(); ])->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)]); array_push($arrayhist,["pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"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; break;
} }
} }
app/Http/Controllers/KhazanahController.php
+5 -8
View File
@@ -223,7 +223,7 @@ class KhazanahController extends Controller
$pendahuluan=$getTunai2['tambah']; $pendahuluan=$getTunai2['tambah'];
$serahan=$getTunai2['kurang']; $serahan=$getTunai2['kurang'];
$totalmasuk = 0; $totalmasuk = 0;
$bakiakhir = 0; $bakiakhir = $getTunai2['baki'];
$totalkeluar = 0; $totalkeluar = 0;
if($tebus_detail['jenistebus'] == 'P') if($tebus_detail['jenistebus'] == 'P')
@@ -242,8 +242,6 @@ class KhazanahController extends Controller
'bakiakhir'=>$bakiakhir 'bakiakhir'=>$bakiakhir
]); ]);
}else{ }else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk; $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
@@ -688,6 +686,7 @@ class KhazanahController extends Controller
} }
public function barcodescanned(Request $request){ public function barcodescanned(Request $request){
$auth_user = Auth::user(); $auth_user = Auth::user();
$gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json(); $gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json();
@@ -699,17 +698,15 @@ class KhazanahController extends Controller
$keluar=$getTunai2['keluar']; $keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki']; $baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk']; $masuk=$getTunai2['masuk'];
$bakiawal=$getTunai2['bakiawal']; $bakiawal = $getTunai2['bakiawal'];
$pendahuluan=$getTunai2['tambah']; $pendahuluan=$getTunai2['tambah'];
$serahan=$getTunai2['kurang']; $serahan=$getTunai2['kurang'];
$totalmasuk = 0;
$bakiakhir = $getTunai2['baki'];
$totalkeluar = 0; $totalkeluar = 0;
$bakiakhir = 0;
$totalkeluar = $gadai_detail['pinjaman'] + $keluar; $totalkeluar = $gadai_detail['pinjaman'] + $keluar;
$bakiakhir = $bakiawal-$totalkeluar+$masuk+$pendahuluan-$serahan;
//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' => $gadai_detail['teller'], 'kodlaluan' => $gadai_detail['teller'],
public/js/main.js
Vendored
-2
View File
@@ -405,8 +405,6 @@ async function openuptambahdanserah(e)
} }
} }
} }
resources/views/aliran_tunai/index.blade.php
+3 -1
View File
@@ -155,8 +155,9 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> @if(is_object($gadai_tebus) && is_array($gadai_tebus))
@foreach($gadai_tebus as $gt) @foreach($gadai_tebus as $gt)
<tr>
<td> {{ $loop->iteration }} </td> <td> {{ $loop->iteration }} </td>
<td> {{ $gt['norujukan'] }} </td> <td> {{ $gt['norujukan'] }} </td>
<td> {{ $gt['pinjaman'] }} </td> <td> {{ $gt['pinjaman'] }} </td>
@@ -169,6 +170,7 @@
@endphp </td> @endphp </td>
</tr> </tr>
@endforeach @endforeach
@endif
</tbody> </tbody>
</table> </table>
resources/views/customers/info.blade.php
+3
View File
@@ -611,6 +611,8 @@
var counter = 1; var counter = 1;
historytebusbayaran.clear().draw(); historytebusbayaran.clear().draw();
console.table(data);
$.each(data,function(index,tebusaz){ $.each(data,function(index,tebusaz){
switch(tebusaz['jenistebus']) { switch(tebusaz['jenistebus']) {
@@ -637,6 +639,7 @@
counter, counter,
tebusaz['norujukan'], tebusaz['norujukan'],
tebusaz['jenistebus'], tebusaz['jenistebus'],
tebusaz['pinjaman'],
tebusaz['jbg'], tebusaz['jbg'],
tebusaz['t_tebus'], tebusaz['t_tebus'],
'<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>' '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
resources/views/gadaian/index.blade.php
+56
View File
@@ -802,6 +802,25 @@
title: 'Telah Disahkan', title: 'Telah Disahkan',
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;
@@ -918,6 +937,24 @@
icon: 'success', icon: 'success',
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();
@@ -961,6 +998,25 @@
title: 'Berjaya!', title: 'Berjaya!',
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/modal/historytebus.blade.php
+1
View File
@@ -54,6 +54,7 @@
<th>Bil</th> <th>Bil</th>
<th>No Rujukan</th> <th>No Rujukan</th>
<th>Jenis Tebus</th> <th>Jenis Tebus</th>
<th>Pembiayaan Asal</th>
<th>JBG</th> <th>JBG</th>
<th>Tarikh Tebus</th> <th>Tarikh Tebus</th>
<th>Action</th> <th>Action</th>
resources/views/penebusan/index.blade.php
+53 -4
View File
@@ -803,11 +803,26 @@
}, },
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){
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("{{ url()->previous() }}"); window.location.replace("{{ url()->previous() }}");
@@ -1118,6 +1133,23 @@
}, },
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){
console.log(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(
@@ -1227,9 +1259,9 @@
if(data.kelulusan == 'lulus') if(data.kelulusan == 'lulus')
{ {
Swal.fire({ Swal.fire({
icon: 'success', icon: 'success',
title: 'Telah Disahkan', title: 'Telah Disahkan',
text: `Komen : ${data.komen}` text: `Komen : ${data.komen}`
}).then(function(){ }).then(function(){
tambahpinjamanfunc(); tambahpinjamanfunc();
}); });
@@ -1386,6 +1418,7 @@
return false; return false;
} }
tambahpinjamanfunc(); tambahpinjamanfunc();
} }
} }
@@ -1460,6 +1493,22 @@
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!',
routes/web.php
+2
View File
@@ -69,6 +69,8 @@ Route::get('/gadaian',['as'=>'gadaian','uses'=>'GadaianController@index'])->midd
Route::get('/daftar_marhun',['as'=>'daftar_marhun','uses'=>'MarhunController@index'])->middleware('auth','teller'); Route::get('/daftar_marhun',['as'=>'daftar_marhun','uses'=>'MarhunController@index'])->middleware('auth','teller');
Route::get('/penebusan/{norujukan}',['as'=>'penebusan','uses' => 'PenebusanController@index'])->middleware('auth','teller'); Route::get('/penebusan/{norujukan}',['as'=>'penebusan','uses' => 'PenebusanController@index'])->middleware('auth','teller');
Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller'); Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller');
Route::put('/aliran_tunai/Gadaian',['as'=>'alirantunai.gadai','uses' => 'AliranTunaiController@alirantunaiGadai'])->middleware('auth','teller');
Route::put('/aliran_tunai/Tebusan',['as'=>'alirantunai.tebus','uses' => 'AliranTunaiController@alirantunaiTebus'])->middleware('auth','teller');
Route::get('/harga_emas','HargaEmasController@index')->middleware('auth','teller'); Route::get('/harga_emas','HargaEmasController@index')->middleware('auth','teller');
Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth'); Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth');
Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller'); Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller');