- JUMLAH KEUNTUNGAN(RM)
+ JUMLAH KEUNTUNGAN
@@ -240,10 +240,13 @@
PINJAMAN BARU(RM)
+ @php
+ $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
+ @endphp
@@ -348,7 +351,7 @@
function tebusan(){
if(tarikhgadai >= tarikhtawarruq){
- let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['bakipjm'] }}";
+ let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}";
$('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));
@@ -363,7 +366,8 @@
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json',
success:function(data){
- $('#jumlahupah').val(formatter.format(data.toFixed(2)));
+ console.log(data);
+ $('#jumlahupah').val(formatter.format(data));
$('#bayaranditerima').val(data);
}
});
@@ -374,13 +378,13 @@
url: api + '/api/tebustawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json',
success:function(harga_tebus){
- $('#perludibayar').val(formatter.format(harga_tebus.toFixed(2)));
+ $('#perludibayar').val(formatter.format(harga_tebus));
}
});
}else if(tarikhgadai < tarikhtawarruq){
- let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['pinjaman'] }}";
+ let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['pinjaman'] }}";
$('#tambahpinjamsebenar').val(formatter.format(Number(maxgadaila).toFixed(2)));
@@ -432,7 +436,7 @@
totaltelahdibayar += parseFloat(transaksi.duit_masuk);
});
- $('#jumlahtelahdibayar').val(totaltelahdibayar);
+ $('#jumlahtelahdibayar').val(formatter.format(totaltelahdibayar));
}
}
@@ -465,9 +469,6 @@
totalmarhun = totalmarhun - parseFloat(nilaimarhun);
- console.log("Nilai Marhun: " + nilaimarhun);
- console.log("Max Bayaran Marhun: " + totalmarhun);
- console.table(array_recno);
}else{
var rm = array_recno.findIndex(x => x === recno);
@@ -493,16 +494,16 @@
"array_recno" : array_recno
},
success:function(success){
- let bayarz = $('#bayaran').val(formatter.format(Number(success.toFixed(2))));
+ let bayarz = $('#bayaran').val(formatter.format(success));
- bayaranseparuhasal = Number(success.toFixed(2));
+ bayaranseparuhasal = Number(success);
let bakihargajual = $('#bakihargajualan').val().replace(/[^0-9.-]+/g,"");
- $('#perludibayar').val(formatter.format(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val())));
+ $('#perludibayar').val(formatter.format(Number(success) + parseFloat($('#jumlahupah').val())));
let totalbakipinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) - success;
- $('#bakipinjaman').val(formatter.format(totalbakipinjam.toFixed(2)));
+ $('#bakipinjaman').val(formatter.format(totalbakipinjam));
},error:function(xhr, textStatus, errorThrown){
console.log(xhr.responseText);
@@ -628,7 +629,7 @@
$('#divbayaran').show();
$('#divperludibayar').show();
- $('#perludibayar').val(jumupah);
+ $('#perludibayar').val(formatter.format(jumupah));
break;
@@ -649,7 +650,7 @@
$('#divbayaran').show();
$('#divperludibayar').show();
- $('#perludibayar').val(jumupah);
+ $('#perludibayar').val(formatter.format(jumupah));
break;
case "P":
@@ -726,10 +727,10 @@
function bayarpinjam(e){
var maxpinjam = parseFloat($('#tambahpinjamsebenar').val());
- var pinjambaru = parseFloat($('#pinjamanbaru').val());
- var pinjam = parseFloat($('#pinjaman').val());
+ var pinjambaru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
+ var pinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,""));
var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
- const percentpinj = parseFloat("{{ $gadai['percentpinj'] }}");
+ const percentpinj = parseFloat("{{ $percent_asal }}");
var totalpinjbaru=0;
@@ -742,7 +743,7 @@
var total = totalpinjbaru/nm * 100;
- $(e).val() == '' ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2)); ;
+ $(e).val() == '' ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));
}
let teller = "{{ Auth::user()->name }}";
@@ -991,9 +992,6 @@
jenisbayarantebus = "tawarruq";
}
- console.log("perlu dibayar: " + $('#perludibayar').val());
- console.log("bayaran : " + (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())));
-
if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())))
{
Swal.fire('Amaran!','Jumlah bayaran kurang daripada jumlah yang perlu dibayar!','error');
@@ -1055,31 +1053,17 @@
return false;
}
- // else
- // {
- // console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]);
- // marhunlama.splice(index,1);
- // }
}
});
var marhun_baru = test.join(", ");
- // var marhun_lama = marhunlama.join(", ");
-
-
- // console.table(marhun_baru);
- // console.table(marhun_lama);
-
- // return;
$.each( array_berat, function( index, value ) {
sumberat += parseFloat(value);
});
- // var lebihan = parseFloat($('#bayaran').val()) - parseFloat($('#perludibayar').val());
-
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jenistebus = $('#sltjenistebus').find(":selected").val();
var jbg = "{{ $gadai['tempoh'] }}";
@@ -1099,15 +1083,6 @@
var marhun_detail = marhun_baru;
var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length;
var nowakil = nw;
-
-
- console.log("Pinjaman Baru Sekali Lagi: " + pinjamanbaru);
- // console.log('lebihan : ' + lebihan + ' ');
- console.log("No Pelanggan:" + nopelanggan + " " + "jenistebus:" + jenistebus + " " + "jbg:" + jbg + " " + "kadarupah:" + kadarupah + " ");
- console.log("nilai_marhun_lama:" + nilai_marhun_lama + " " + "nilai_marhun:" + nilai_marhun + " " + "pinjamanbaru:" + pinjamanbaru + " " + "bakipinjaman:" + bakipinjaman + " ");
- console.log("historygadaian:" + historygadaian + " " + "marhun:" + marhun + " " + "total_berat:" + total_berat + " " + "pinjaman:" + pinjaman + " ");
- console.log("marhun_detail: " + marhun_detail + "kuantiti_marhun: " + kuantiti_marhun);
- console.log(nowakil);
var kadarupahbaru = 0;
@@ -1184,20 +1159,16 @@
///////////
}
- else if($('#sltjenistebus').find(":selected").val() == 'P')
- {
+ else if($('#sltjenistebus').find(":selected").val() == 'P'){
let pinjamanbaru = $('#pinjamanbaru').val();
let jenisbayarantebus = '';
- if(tarikhgadai < tarikhtawarruq)
- {
+ if(tarikhgadai < tarikhtawarruq){
jenisbayarantebus = "nottawarruq";
- }
- else if (tarikhgadai >= tarikhtawarruq){
+ }else if (tarikhgadai >= tarikhtawarruq){
jenisbayarantebus = "tawarruq";
}
- if( $('#tambahpinjam').val() <= 0 && $('#tambahpinjam').val() === '')
- {
+ if( $('#tambahpinjam').val() <= 0 && $('#tambahpinjam').val() === ''){
Swal.fire(
'Amaran!',
'Amaun hendaklah melebihi daripada 0',
@@ -1206,8 +1177,7 @@
return false;
}
- if(parseFloat($('#basic-addon2').text()) > 70 && parseFloat($('#basic-addon2').text()) <= 75)
- {
+ if(parseFloat($('#basic-addon2').text()) > 70 && parseFloat($('#basic-addon2').text()) <= 75){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
@@ -1308,120 +1278,126 @@
}else if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80) || pinjamanbaru >= 10000){
- const swalWithBootstrapButtons = Swal.mixin({
- customClass: {
- confirmButton: 'btn btn-success',
- cancelButton: 'btn btn-danger'
- },
- buttonsStyling: false
- });
+ const swalWithBootstrapButtons = Swal.mixin({
+ customClass: {
+ confirmButton: 'btn btn-success',
+ cancelButton: 'btn btn-danger'
+ },
+ buttonsStyling: false
+ });
- swalWithBootstrapButtons.fire({
- title: 'Dapatkan Pengesahan Operasi',
- text: "Tetapan margin melebihi 75% untuk Operasi!",
- icon: 'info',
- showCancelButton: true,
- confirmButtonText: 'Hantar',
- cancelButtonText: 'Batal',
- reverseButtons: true
- }).then((result) => {
- if (result.isConfirmed) {
+ swalWithBootstrapButtons.fire({
+ title: 'Dapatkan Pengesahan Operasi',
+ text: "Tetapan margin melebihi 75% untuk Operasi!",
+ icon: 'info',
+ showCancelButton: true,
+ confirmButtonText: 'Hantar',
+ cancelButtonText: 'Batal',
+ reverseButtons: true
+ }).then((result) => {
+ if (result.isConfirmed) {
- let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text();
- let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
- let jumpinjam = $('#pinjamanbaru').val();
- let teller = "{{ Auth::user()->name }}";
+ let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text();
+ let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
+ let jumpinjam = $('#pinjamanbaru').val();
+ let teller = "{{ Auth::user()->name }}";
- Swal.fire({
- title: 'Tunggu Pengesahan Daripada Operasi.',
- icon: 'info',
- width: 600,
- padding: '3em',
- background: '#fffff',
- showCancelButton: false,
- showConfirmButton: false,
- allowOutsideClick: false,
- allowEscapeKey: false,
- allowEnterKey: false
- })
+ Swal.fire({
+ title: 'Tunggu Pengesahan Daripada Operasi.',
+ icon: 'info',
+ width: 600,
+ padding: '3em',
+ background: '#fffff',
+ showCancelButton: false,
+ showConfirmButton: false,
+ allowOutsideClick: false,
+ allowEscapeKey: false,
+ allowEnterKey: false
+ })
- $.ajax({
- method:'post',
- url: "{{ route('operasi.createkelulusan') }}",
- data: {
- "_token": "{{ csrf_token() }}",
- "norujukan" : norujukan,
- "komen" : komen,
- "jumpinjam" : jumpinjam,
- "teller" : teller
- },
- success:function(data){
- console.log(data);
- },
- error: function(xhr, status, error) {
- var err = eval("(" + xhr.responseText + ")");
- alert(xhr.responseText);
- }
- });
-
- //TIME INTERVAL
- let timerInterval;
-
- timerInterval = setInterval(function(){
$.ajax({
- method:'get',
- url: "{{ route('operasi.getkelulusan') }}",
+ method:'post',
+ url: "{{ route('operasi.createkelulusan') }}",
data: {
- "norujukan" : norujukan
-
+ "_token": "{{ csrf_token() }}",
+ "norujukan" : norujukan,
+ "komen" : komen,
+ "jumpinjam" : jumpinjam,
+ "teller" : teller
},
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;
- });
- }
+ console.log(data);
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
- });
- }, 3000);
- }else if (result.dismiss === Swal.DismissReason.cancel){
- swalWithBootstrapButtons.fire(
- 'Gagal',
- 'Gagal mendapatkan kelulusan operasi',
- 'error'
- )
- }
- });
- event.preventDefault();
- return false;
+ });
+
+ //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){
+ swalWithBootstrapButtons.fire(
+ 'Gagal',
+ 'Gagal mendapatkan kelulusan operasi',
+ 'error'
+ )
+ }
+ });
+ event.preventDefault();
+ return false;
}else if(parseFloat($('#basic-addon2').text()) > 80){
- Swal.fire(
- 'Amaran!',
- 'Pinjaman Haruslah Dalam Lingkungan 80%!',
- 'error'
- )
- return false;
+ Swal.fire(
+ 'Amaran!',
+ 'Pinjaman Haruslah Dalam Lingkungan 80%!',
+ 'error'
+ )
+ return false;
+ }
+ tambahpinjamanfunc();
}
}
-}
-
function tambahpinjamanfunc()
{
+ let jenisbayarantebus = '';
+ if(tarikhgadai < tarikhtawarruq){
+ jenisbayarantebus = "nottawarruq";
+ }else if (tarikhgadai >= tarikhtawarruq){
+ jenisbayarantebus = "tawarruq";
+ }
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jenistebus = $('#sltjenistebus').find(":selected").val();
@@ -1453,20 +1429,6 @@
var keuntungan_sebulan = pinjaman * kadarupahbaru;
var keuntungan_6bln = keuntungan_sebulan * 6;
- console.log("No. Pelanggan : " + nopelanggan + " Jenistebus : " + jenistebus);
- console.log(" jbg : " + jbg + " kadarupah : " + kadarupah);
- console.log("nilai_marhun : " + nilai_marhun + " pinjaman : " + pinjaman);
- console.log("ansuran : " + ansuran + " addpinjaman : " + addpinjaman);
- console.log("bakipinjaman : " + bakipinjaman + " bakiupah : " + bakiupah);
- console.log("historygadaian : " + historygadaian + " marhun : " + marhun);
- console.log("total_berat : " + total_berat + " kuantiti_marhun : " + kuantiti_marhun);
- console.log("noic :" + noic);
-
-
- console.log(keuntungan_sebulan + " " + pinjaman);
-
- // return;
-
$.ajax({
method:'GET',
url: "{{ route('tambah.pinjaman') }}",
diff --git a/resources/views/print/laporan_komoditi.blade.php b/resources/views/print/laporan_komoditi.blade.php
new file mode 100644
index 0000000..fe7d619
--- /dev/null
+++ b/resources/views/print/laporan_komoditi.blade.php
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+ | LAPORAN JUAL BELI KOMODITI |
+
+
+
+
+
+ | Bil |
+ No Sijil |
+ Tarikh |
+ Masa |
+ Nilai Komoditi |
+ Transaksi Oleh |
+ Transaksi |
+
+
+ @foreach($rekod as $index=>$komoditi)
+
+ | {{ $loop->iteration }} |
+ {{ $komoditi['nosijil'] }} |
+ {{ $komoditi['date_purchase'] }} |
+ {{ $komoditi['time_purchase'] }} |
+ {{ $komoditi['unit_komuditi'] }} |
+ {{ $komoditi['transaction_by'] }} |
+ {{ $komoditi['transaction_type'] }} |
+
+ @endforeach
+
+
\ No newline at end of file
diff --git a/resources/views/print/laporan_lelongan.blade.php b/resources/views/print/laporan_lelongan.blade.php
index a42c6e7..7905ca0 100644
--- a/resources/views/print/laporan_lelongan.blade.php
+++ b/resources/views/print/laporan_lelongan.blade.php
@@ -118,7 +118,6 @@
}
#sign td, #sign th {
-
padding: 8px;
font-size:11px;
text-align: center;
diff --git a/routes/web.php b/routes/web.php
index e4d4a83..394ca3d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -164,6 +164,7 @@ Route::get('laporan/ringkasanharian/cetak',['as'=>'ringkasanharian.laporancetak'
Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanTerkumpul'])->middleware('auth','khazanah');
Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
+Route::get('/laporan/komoditi',['as'=>'laporan.komoditi','uses'=>'KomuditiController@cetakRekodKomoditi']);
//Resit Ansurans
Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'GadaianController@resit'])->middleware('auth','teller');