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

Merge branch 'pipi' into 'master'

Browse Source 
change notifikasi dan hapus gadai dan history

See merge request online-sistem1/kaunter!33
This commit is contained in:
hafifie rahman
2021-01-09 18:20:09 +00:00
parent cb545eb387 f9463f308c
commit e20de6278f
8 changed files with 118 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+1 -3
View File
@@ -276,9 +276,7 @@ class KhazanahController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan, [
'pelulus' => $auth_user['name']
])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
return response()->json($updatelulus,200);
}
app/Http/Controllers/OperasiController.php
+24 -3
View File
@@ -28,6 +28,29 @@ class OperasiController extends Controller
return view('operasi.kelulusan',compact('cawangan_info','api_url','kelulusan'));
}
public function getkelulusan(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$norujukan = $request->norujukan;
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$kelulusan = Http::get(config('api.url') . '/api/SenaraiDahLulus/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
if(sizeof($kelulusan) > 0)
{
$kelulusan = $kelulusan[0]['masalulus'];
}
else
{
$kelulusan = '';
}
return response($kelulusan);
}
public function updatekelulusan(Request $request)
{
$auth_user = Auth::user();
@@ -38,9 +61,7 @@ class OperasiController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan, [
'peloperasi' => $auth_user['name']
])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
return response()->json($updatelulus,200);
}
app/Http/Controllers/PenebusanController.php
+3 -3
View File
@@ -59,6 +59,7 @@ class PenebusanController extends Controller
'addpinjaman'=> $request->addpinjaman,
'bakipinjaman' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
'nowakil' => $request->nowakil,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun
])->json();
@@ -175,6 +176,7 @@ class PenebusanController extends Controller
'nilai_marhun' => $request->nilai_marhun,
'pinjaman' => $request->pinjaman_lama,
'ansuran' => $request->ansuran,
'nowakil' => $request->nowakil,
'addpinjaman'=> $request->addpinjaman,
'bakipinjaman' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
@@ -298,6 +300,7 @@ class PenebusanController extends Controller
'addpinjaman'=> $request->addpinjaman,
'bakipinjaman' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
'nowakil' => $request->nowakil,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun
])->json();
@@ -359,9 +362,6 @@ class PenebusanController extends Controller
$updatehistorygadaian = Http::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
'historygadaian' => $request->norujukan
])->json();
dd($updatehistorygadaian);
///////////////////////////
/// MARHUN UPDATE TABLE////
resources/views/customers/info.blade.php
+62 -15
View File
@@ -289,7 +289,7 @@
</table>
<div class="text-center">
<button class="btn btn-primary" onclick="ubahfunc()">Ubah</button>
<button class="btn btn-primary" onclick="ubahfunc(this)">Ubah</button>
<button class="btn btn-primary" onclick="hapusfunc()">Hapus</button>
<button class="btn btn-primary" onclick="histfunc()">History</button>
</div>
@@ -493,9 +493,10 @@
}
function ubahfunc()
function ubahfunc(e)
{
if($("input[name='options']:checked").val() == 'belum_tebus'){
let ubahid = $('input[name="belum"]:checked').val();
if(ubahid == null)
@@ -515,8 +516,7 @@
data:{ "norujukan" : ubahid},
success:function(data)
{
$('#historytebusModal').modal();
historytebustable(data);
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
@@ -526,13 +526,19 @@
}
else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let ubahid = $('input[name="sudahtebus"]:checked').val();
Swal.fire({
icon: 'error',
title: 'Oops...',
text: 'Ubah hanya untuk belum tebus sahaja!',
footer: '<a href>Why do I have this issue?</a>'
});
}
}
function hapusfunc()
{
let kodcaw = "{{ $cawangan_info['kodcaw'] }}";
if($("input[name='options']:checked").val() == 'belum_tebus'){
let hapusid = $('input[name="belum"]:checked').val();
@@ -554,11 +560,27 @@
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
swalWithBootstrapButtons.fire(
'Deleted!',
'Your file has been deleted.',
'success'
)
$.ajax({
method:'put',
url:'http://localhost:8000/api/gadai/hapus/' + kodcaw + '/' + hapusid,
success:function(data)
{
console.log(data);
swalWithBootstrapButtons.fire(
'Deleted!',
'Your file has been deleted.',
'success'
).then(function () {
location.reload();
});
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
} else if (
/* Read more about handling dismissals below */
result.dismiss === Swal.DismissReason.cancel
@@ -593,11 +615,36 @@
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
swalWithBootstrapButtons.fire(
'Deleted!',
'Your file has been deleted.',
'success'
)
$.ajax({
method:'put',
url:'http://localhost:8000/api/tebus/hapus/' + kodcaw + '/' + hapusid,
success:function(data)
{
if(data != "Bukan-Tebus")
{
swalWithBootstrapButtons.fire(
'Deleted!',
'Your file has been deleted.',
'success'
).then(function () {
location.reload();
});
}
else
{
swalWithBootstrapButtons.fire(
'Amaran!',
'Hapus Hanya Untuk Jenis Tebus Sahaja!',
'error'
)
}
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
} else if (
/* Read more about handling dismissals below */
result.dismiss === Swal.DismissReason.cancel
resources/views/gadaian/index.blade.php
+1 -1
View File
@@ -630,7 +630,7 @@
{
$.ajax({
method:'get',
url: "{{ route('khazanah.getkelulusan') }}",
url: "{{ route('operasi.getkelulusan') }}",
data: {
"norujukan" : norujukan
},
resources/views/layouts/app.blade.php
+9 -4
View File
@@ -103,8 +103,8 @@
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<div id="divbiasa">
<a class="dropdown-item" href="#">
{{ __('BlaBla') }}
<a class="dropdown-item" id="linkz" href="#">
Tiada Data
</a>
</div>
</div>
@@ -125,6 +125,8 @@
let message = JSON.stringify(data);
$('#bell').css("color", "red");
$('#linkz').text("Teller Pohon Kelulusan");
$("#linkz").attr("href", "{{ url('kelulusan') }}");
const Toast = Swal.mixin({
toast: true,
@@ -144,6 +146,7 @@
})
});
$("#navbarDropdown").click(function(){
$('#bell').css("color", "grey");
});
@@ -157,8 +160,8 @@
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<div id="divbiasa">
<a class="dropdown-item" href="#">
{{ __('BlaBla') }}
<a class="dropdown-item" id="gadailinkz" href="#">
Tiada Data
</a>
</div>
</div>
@@ -179,6 +182,8 @@
let message = JSON.stringify(data);
$('#bell').css("color", "red");
$('#gadailinkz').text("Khazanah Serah Marhun Teller");
// $("#gadailinkz").attr("href", "{{ url('kelulusan') }}");
const Toast = Swal.mixin({
toast: true,
resources/views/penebusan/index.blade.php
+17 -52
View File
@@ -181,7 +181,7 @@
BAYARAN PEMBIAYAAN(RM)
</div>
<div class="col-8">
<input type="text" id="bayaran" onkeyup="bayarkey(this)" placeholder="0.00" class="form-control" disabled/>
<input type="text" id="bayaran" placeholder="0.00" class="form-control" disabled/>
</div>
</diV>
<div class="form-group row" id="divtambahpinjaman">
@@ -207,7 +207,7 @@
PEMBIAYAAN BARU(RM)
</div>
<div class="col-8">
<input type="text" id="bakipinjaman" class="form-control" readonly/>
<input type="text" placeholder="0.00" id="bakipinjaman" class="form-control" readonly/>
</div>
</div>
</div>
@@ -218,7 +218,7 @@
PERLU DIBAYAR(RM)
</div>
<div class="col-8">
<input type="text" id="perludibayar" class="form-control" readonly/>
<input type="text" id="perludibayar" onkeyup="bayarkey(this)" class="form-control" readonly/>
</div>
</div>
</div>
@@ -318,7 +318,7 @@ function tebusan()
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json',
success:function(data){
$('#jumlahupah').val(data);
$('#jumlahupah').val(data.toFixed(2));
$('#bayaranditerima').val(data);
}
});
@@ -330,7 +330,7 @@ function tebusan()
url: api + '/api/tebustawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json',
success:function(data){
$('#perludibayar').val(data);
$('#perludibayar').val(data.toFixed(2));
}
});
@@ -440,7 +440,8 @@ if(tarikhgadai >= tarikhtawarruq)
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
$('#bakipinjaman').val(parseFloat($('#pinjaman').val()) - success);
let totalbakipinjam = parseFloat($('#pinjaman').val()) - success;
$('#bakipinjaman').val(totalbakipinjam.toFixed(2));
}
});
@@ -583,7 +584,8 @@ $("#sltjenistebus").change(function(){
$('input[type="checkbox"]').show();
$('span.spannar').hide();
$("#bayaran").prop("disabled", false);
$("#bayaran").prop("disabled", true);
$("#perludibayar").prop("readonly", false);
$("#bayaran").val(0);
$('#divtambahpinjaman').hide();
@@ -624,27 +626,6 @@ function bayarkey(e)
{
if($('#sltjenistebus').find(":selected").val() == 'A')
{
// var keyinbayar = parseFloat($(e).val());
// var jumlahkesemua = parseFloat($('#perludibayar').val());
// var jumupah = parseFloat($('#jumlahupah').val());
// var bakipinjam = parseFloat($('#pinjaman').val());
// //max bayar
// var max_bayaran = bakipinjam - (bakipinjam*0.1);
// if(parseFloat(e.value) >= max_bayaran+0.01){
// $(e).val(max_bayaran.toFixed(2));
// }else if(parseFloat(e.value) < 0){
// $(e).val(0);
// }
// var total=0;
// total = jumupah + keyinbayar;
// $(e).val() == '' ? $('#perludibayar').val(jumupah.toFixed(2)) : $('#perludibayar').val(total.toFixed(2));
}
else if($('#sltjenistebus').find(":selected").val() == 'S')
@@ -654,9 +635,9 @@ function bayarkey(e)
let pdbyr = 0;
pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
total = $('#pinjaman').val() - byr;
total = $('#pinjaman').val() - pdbyr;
$('#perludibayar').val(pdbyr);
// $('#perludibayar').val(pdbyr);
$('#bakipinjaman').val(total);
}
}
@@ -853,7 +834,7 @@ function bayaransemua()
}
else if($('#sltjenistebus').find(":selected").val() == 'S')
{
if($('#bayaran').val() < $('#perludibayar').val())
if($('#perludibayar').val() < $('#bayaran').val())
{
Swal.fire(
'Amaran!',
@@ -901,7 +882,7 @@ function bayaransemua()
sumberat += parseFloat(value);
});
var lebihan = parseFloat($('#bayaran').val()) - parseFloat($('#perludibayar').val());
// var lebihan = parseFloat($('#bayaran').val()) - parseFloat($('#perludibayar').val());
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jenistebus = $('#sltjenistebus').find(":selected").val();
@@ -912,7 +893,7 @@ function bayaransemua()
var pinjamanbaru = $('#bakipinjaman').val();
var ansuran = 0;
var addpinjaman = 0;
var bakipinjaman = parseFloat("{{ $gadai['pinjaman'] }}");
var bakipinjaman = $('#bakipinjaman').val();
var bakiupah = 0;
var historygadaian = "{{ $gadai['norujukan'] }}";
var marhun = "{{ $gadai['marhun'] }}";
@@ -921,6 +902,7 @@ function bayaransemua()
var pinjaman = parseFloat("{{ $gadai['pinjaman']}}");
var marhun_detail = marhun_baru;
var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length;
var nowakil = '';
console.log("Pinjaman Baru Sekali Lagi: " + pinjamanbaru);
// console.log('lebihan : ' + lebihan + ' ');
@@ -930,7 +912,7 @@ function bayaransemua()
console.log("marhun_detail: " + marhun_detail + "kuantiti_marhun: " + kuantiti_marhun);
return;
// return;
var kadarupahbaru = 0;
@@ -963,6 +945,7 @@ function bayaransemua()
"bakiupah" : bakiupah,
"historygadaian" : historygadaian,
"marhun" : marhun,
"nowakil" : nowakil,
"arrayrecno" : array_recno,
@@ -1262,19 +1245,6 @@ function ubahwakil(e)
function historybayaran()
{
// $.ajax({
// method: 'get',
// url: 'http://localhost:8000/api/listpenebusanhistory/ALS',
// data: {
// "norujukan" : norujukan
// },
// success:function(data)
// {
// alert(data);
// $('#historybayaranModal').modal();
// }
// });
$.ajax({
method: 'get',
url: 'http://localhost:8000/api/transaction/' + norujukan,
@@ -1303,11 +1273,6 @@ function historybayaran()
bayaran['created_at'],
"RM " + bayaran['duit_masuk'],
'<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
// marhun_detail['marhun'],
// 'RM ' + formatter.format(marhun_detail['n_marhun']),
// marhun_detail['karat'],
// formatter.format(marhun_detail['berat']),
// marhun_detail['nota']
]).draw();
counter = counter + 1;
});
routes/web.php
+1
View File
@@ -152,4 +152,5 @@ Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahControll
//Operasi
Route::get('/operasi/kelulusan','OperasiController@kelulusan')->name('operasi.kelulusan')->middleware('auth','operasi');
Route::post('/operasi/createkelulusan',['as'=>'operasi.createkelulusan','uses'=>'OperasiController@createkelulusan'])->middleware('auth','teller');
Route::get('/operasi/getkelulusan',['as'=>'operasi.getkelulusan','uses'=>'OperasiController@getkelulusan'])->middleware('auth','teller');
Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi');