upah baru

This commit is contained in:
afiq
2021-02-22 14:31:28 +08:00
parent 11b9a37928
commit 1a02cd4b9f
8 changed files with 248 additions and 165 deletions
@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Http;
use PDF;
class KomuditiController extends Controller
{
@@ -18,4 +20,15 @@ class KomuditiController extends Controller
$user_name = $auth_user['name'];
return view('operasi.komuditi.index',compact('user_name','api_url'));
}
public function cetakRekodKomoditi(){
$rekod = Http::get(config('api.url') . '/api/komuditi/rekodkomuditi')->json();
return view('print.laporan_komoditi',compact('rekod'));
// $pdf=PDF::loadView('print.laporan_komoditi',compact('rekod'))->setPaper('A4','landscape');
// $today_date=date('Y-m-d');
// $filename="laporan_komoditi_";
// return $pdf->download($filename.$today_date.'.pdf');
}
}
+1
View File
@@ -332,6 +332,7 @@
total_nilai_marhun = 0;
total_berat = 0;
var marhun_details = '';
jumlah_nilai_marhun = 0;
tablemarhun.clear().draw();
$.each(data,function(index,marhun){
$.each(marhun,function(index,marhun_detail){
@@ -11,7 +11,7 @@
<a href="{{ route('operasi.kelulusan') }}" class="btn btn-info btn-lg">Kelulusan</a>
<a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Daftar Kakitangan</a>
<a href="{{ route('parameter') }}" class="btn btn-info btn-lg">Parameter</a>
<a href="{{ route('komuditi') }}" class="btn btn-info btn-lg">Komuditi</a>
<a href="{{ route('komuditi') }}" class="btn btn-info btn-lg">Komoditi</a>
</div>
</div>
</div>
@@ -58,6 +58,9 @@
<div class="card-header">{{ __('Rekod Pembelian/Penjualan Komoditi') }}</div>
<div class="card-body text-center">
<div class="row">
<div class="col-md-12 text-right mb-3">
<a href="{{ route('laporan.komoditi') }}" target="_blank" class="btn btn-primary" title="Cetak Rekod Jual/Beli Komoditi"><i class="fa fa-print" aria-hidden="true"></i></a>
</div>
<div class="col-md-12">
<table id="rekod_komuditi">
<thead>
@@ -74,7 +77,6 @@
</table>
</div>
</div>
</div>
</div>
</div>
+124 -162
View File
@@ -172,7 +172,7 @@
<div class="col-6">
<div class="form-group row">
<div class="col-4">
JUMLAH KEUNTUNGAN(RM)
JUMLAH KEUNTUNGAN
</div>
<div class="col-8">
<input type="text" id="jumlahupah" class="form-control" readonly/>
@@ -240,10 +240,13 @@
<div class="col-4">
PINJAMAN BARU(RM)
</div>
@php
$percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
@endphp
<div class="col-8 input-group mb-3">
<input type="text" id="pinjamanbaru" value="{{ number_format($gadai['pinjaman'],2) }}" class="form-control" aria-describedby="basic-addon2" readonly/>
<input type="text" id="pinjamanbaru" value="{{ number_format($gadai['bakipjm'],2) }}" class="form-control" aria-describedby="basic-addon2" readonly/>
<div class="input-group-append">
<span class="input-group-text" id="basic-addon2">{{ $gadai['percentpinj'] }}</span>
<span class="input-group-text" id="basic-addon2">{{ number_format($percent_asal,2) }}</span>
</div>
</div>
</diV>
@@ -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') }}",
@@ -0,0 +1,105 @@
<style>
#header {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#header td{
padding:4px;
font-size:10px;
}
#header tr:nth-child(even){background-color: #ffffff;}
#header tr:hover {background-color: #ddd;}
#header th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#scan {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#scan td, #scan th {
padding: 8px;
font-size:11px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#sign {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#sign td, #sign th {
padding: 8px;
font-size:11px;
text-align: center;
}
</style>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script>
$(document).ready(function () {
window.print();
window.onfocus=function(){ window.close();}
});
</script>
<table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
<th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
</tr>
</table>
<table id="scan">
<tr>
<th colspan ="5"><b>LAPORAN JUAL BELI KOMODITI</b></th>
</tr>
</table>
<table id="sign">
<thead>
<th>Bil</th>
<th>No Sijil</th>
<th>Tarikh</th>
<th>Masa</th>
<th>Nilai Komoditi</th>
<th>Transaksi Oleh</th>
<th>Transaksi</th>
</thead>
<tbody>
@foreach($rekod as $index=>$komoditi)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $komoditi['nosijil'] }}</td>
<td>{{ $komoditi['date_purchase'] }}</td>
<td>{{ $komoditi['time_purchase'] }}</td>
<td>{{ $komoditi['unit_komuditi'] }}</td>
<td>{{ $komoditi['transaction_by'] }}</td>
<td>{{ $komoditi['transaction_type'] }}</td>
</tr>
@endforeach
</tbody>
</table>
@@ -118,7 +118,6 @@
}
#sign td, #sign th {
padding: 8px;
font-size:11px;
text-align: center;
+1
View File
@@ -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');