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

latest server

Browse Source
This commit is contained in:
e.arrahn
2021-09-15 21:30:18 +08:00
parent ec95e83029
commit d4d47d2e24
10 changed files with 322 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+2 -2
View File
@@ -399,7 +399,7 @@ class AliranTunaiController extends Controller
if($teb['tagterima'] === 1){ if($teb['tagterima'] === 1){
if($teb['jenistebus'] === 'S') if($teb['jenistebus'] === 'S')
{ {
$totaltebusbarcodescanned += $teb['pinjaman'] + $teb['bakiupah']; $totaltebusbarcodescanned += $teb['gadaibakipjm'] + $teb['bakiupah'];
}else{ }else{
$totaltebusbarcodescanned += $teb['bakipjm']; $totaltebusbarcodescanned += $teb['bakipjm'];
} }
@@ -407,7 +407,7 @@ class AliranTunaiController extends Controller
if($teb['jenistebus'] === 'S') if($teb['jenistebus'] === 'S')
{ {
$totaltebus += $teb['pinjaman'] + $teb['bakiupah']; $totaltebus += $teb['gadaibakipjm'] + $teb['bakiupah'];
}else{ }else{
$totaltebus += $teb['bakipjm']; $totaltebus += $teb['bakipjm'];
} }
app/Http/Controllers/GadaianController.php
+2 -9
View File
@@ -304,7 +304,7 @@ class GadaianController extends Controller
$cawangan_detail = $cawangan[0]; $cawangan_detail = $cawangan[0];
$pembayaran_segera = "https://e-arrahn.com.my/pembayaransegeraqrreader?norujukan=".$norujukan; $pembayaran_segera = "https://spare.arrahn.com.my/pembayaransegera";
return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username')); return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username'));
} }
@@ -349,14 +349,7 @@ class GadaianController extends Controller
// if(sizeof($customers_info) != 0) // if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0]; // $customers_info = $customers_info[0];
if($penebusan['nowakil']) return view('print.resitansuran',compact('transaction','gadai','customers_info'));
{
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
}
return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
} }
public function resitbelumansurans($id) public function resitbelumansurans($id)
app/Http/Controllers/KhazanahController.php
+1 -1
View File
@@ -2739,7 +2739,7 @@ class KhazanahController extends Controller
$gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
} }
$tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] ,['tarikh' => $gadai_date])->json(); $tuntutbaki = Http::get(config('api.url'). '/api/TuntutBakiTarikh/'. $auth_user['cawangan'] ,['tarikh' => $gadai_date])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0]; $cawangan_detail=$cawangan[0];
resources/views/customers/info.blade.php
+5 -2
View File
@@ -462,7 +462,7 @@
}); });
var tablegadai = $('#myTable').DataTable({ var tablegadai = $('#myTable').DataTable({
"scrollX": true "scrollX": false
}); });
var xtawarruq = $('#xtawarruq').DataTable({ var xtawarruq = $('#xtawarruq').DataTable({
@@ -473,7 +473,7 @@
}); });
var tablelelong = $('#lelongTable').DataTable({ var tablelelong = $('#lelongTable').DataTable({
"scrollX": true "scrollX": false
}); });
var historybayarandatatable = $('#tablehistorybayaran').DataTable({ var historybayarandatatable = $('#tablehistorybayaran').DataTable({
@@ -1595,6 +1595,9 @@
} }
} }
else { else {
return false;
$.ajax({ $.ajax({
method:'get', method:'get',
url: api_url + '/api/upahlamatoday/' + kodcaw + '/' + hapusid, url: api_url + '/api/upahlamatoday/' + kodcaw + '/' + hapusid,
resources/views/homepage/khazanah/home.blade.php
+1 -1
View File
@@ -159,7 +159,7 @@
<div class="row form-group justify-content-center"> <div class="row form-group justify-content-center">
<div class="col-3 mx-1"> <div class="col-3 mx-1">
<div class="row"> <div class="row">
<a href="{{ url('dashboard') }}" class="btn btn-info btn-lg btn-block mb-3">Dashboard</a> <a href="#" disabled class="btn btn-info btn-lg btn-block mb-3">Dashboard</a>
</div> </div>
<div class="row"> <div class="row">
<a href="{{ url('kakitangan') }}" class="btn btn-info btn-lg btn-block mb-3">Kakitangan</a> <a href="{{ url('kakitangan') }}" class="btn btn-info btn-lg btn-block mb-3">Kakitangan</a>
resources/views/khazanah/laporan/index.blade.php
+1 -1
View File
@@ -20,7 +20,7 @@
<a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a> <a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a>
</div> </div>
<div class="row"> <div class="row">
<a href="{{ route('laporan.lelongan') }}" class="btn btn-dark btn-lg btn-block mb-3">Lelongan</a> <a href="#" class="btn btn-dark btn-lg btn-block mb-3">Lelongan</a>
</div> </div>
<div class="row"> <div class="row">
<a href="{{ route('laporan.pelangganbaru') }}" class="btn btn-dark btn-lg btn-block mb-3">Pelanggan Baru</a> <a href="{{ route('laporan.pelangganbaru') }}" class="btn btn-dark btn-lg btn-block mb-3">Pelanggan Baru</a>
resources/views/khazanah/laporan/tuntutbaki.blade.php
+2 -2
View File
@@ -85,7 +85,7 @@
var today_date = current_year + '-' +current_month+'-'+current_date; var today_date = current_year + '-' +current_month+'-'+current_date;
$.ajax({ $.ajax({
method:'get', method:'get',
url: api_url + '/api/TuntutBaki/'+kodcaw, url: api_url + '/api/TuntutBakiTarikh/'+kodcaw,
data:{'tarikh' : today_date }, data:{'tarikh' : today_date },
success: function(tuntutbaki){ success: function(tuntutbaki){
console.log(tuntutbaki); console.log(tuntutbaki);
@@ -100,7 +100,7 @@
var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
$.ajax({ $.ajax({
method:'get', method:'get',
url: api_url + '/api/TuntutBaki/'+kodcaw, url: api_url + '/api/TuntutBakiTarikh/'+kodcaw,
data:{'tarikh' : today_date }, data:{'tarikh' : today_date },
success: function(tuntutbaki){ success: function(tuntutbaki){
gadaitable(tuntutbaki); gadaitable(tuntutbaki);
resources/views/penebusan/index.blade.php
+281 -253
View File
@@ -768,7 +768,7 @@
break; break;
case "S": case "S":
$("#terima_transaksi").prop('disabled', false); $("#terima_transaksi").prop('disabled', true);
$('input[type="checkbox"]').show(); $('input[type="checkbox"]').show();
$('span.spannar').hide(); $('span.spannar').hide();
@@ -792,7 +792,7 @@
break; break;
case "P": case "P":
$("#terima_transaksi").prop('disabled', false); $("#terima_transaksi").prop('disabled', true);
$('input[type="checkbox"]').hide(); $('input[type="checkbox"]').hide();
$('span.spannar').show(); $('span.spannar').show();
@@ -835,7 +835,7 @@
$('#perludibayar').val(formatter.format(jumupah)); $('#perludibayar').val(formatter.format(jumupah));
break; break;
case "AT": case "AT":
$("#terima_transaksi").prop('disabled', true); $("#terima_transaksi").prop('disabled', false);
$('input[type="checkbox"]').hide(); $('input[type="checkbox"]').hide();
$('span.spannar').show(); $('span.spannar').show();
@@ -1846,270 +1846,298 @@
var marginsemasa = pinjaman_baru/nmsemasa * 100; var marginsemasa = pinjaman_baru/nmsemasa * 100;
if(marginsemasa < 10) $.ajax({
{ method:'get',
$("#terima_transaksi").prop('disabled', false); url: api + '/api/komuditi/check',
Swal.fire('Amaran!','Margin Pembiayaan kurang daripada 10%!','error'); success:function(komoditi){
return false; var check_komuditi = Object.keys(komoditi).length;
} if(check_komuditi == 0){
$("#terima_transaksi").prop('disabled', false);
if(marginsemasa > 80)
{
$("#terima_transaksi").prop('disabled', false);
Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error');
return false;
}
if(marginsemasa > 70 && marginsemasa <= 75){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
});
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Tetapan margin melebihi 70% untuk Khazanah!",
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 = marginsemasa;
let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
let teller = "{{ Auth::user()->name }}";
Swal.fire({ Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah.', icon: 'error',
icon: 'info', title: 'Unit Komuditi Berbaki Minumum',
width: 600, text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('khazanah.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : pinjaman_baru,
"teller" : teller
},
success:function(data){
siricreated = data;
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
}); });
event.preventDefault();
return false;
}else{
if(Number(komoditi['unit_komuditi']) < pinjaman_baru){
$("#terima_transaksi").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Baki Unit Komuditi Tidak Mencukupi',
text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
});
event.preventDefault();
return false;
}else{
if(marginsemasa < 10)
{
$("#terima_transaksi").prop('disabled', false);
Swal.fire('Amaran!','Margin Pembiayaan kurang daripada 10%!','error');
return false;
}
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { if(marginsemasa > 80)
{
$("#terima_transaksi").prop('disabled', false);
Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error');
return false;
}
if(marginsemasa > 70 && marginsemasa <= 75){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
});
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Tetapan margin melebihi 70% untuk Khazanah!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
let nm = nmsemasa;let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
let teller = "{{ Auth::user()->name }}";
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah.',
icon: 'info',
width: 600,
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('khazanah.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : pinjaman_baru,
"teller" : teller
},
success:function(data){
siricreated = data;
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan',
text: `Komen : ${data.komen}`
}).then(function(){
gadaiautotawarruq();
});
}
else if(data.kelulusan == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
return false;
});
}
}
});
} else if (result.dismiss === Swal.DismissReason.cancel) {
$("#terima_transaksi").prop('disabled', false);
swalWithBootstrapButtons.fire(
'Gagal',
'Gagal mendapatkan kelulusan khazanah',
'error'
)
}
});
event.preventDefault();
return false;
}else if((marginsemasa > 75 && marginsemasa <= 80) || pinjaman_baru >= 10000){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
});
let text = '';
if(marginsemasa > 75 && marginsemasa <= 80)
{
text = 'Tetapan margin melebihi 75% untuk Operasi!';
}else if(pinjaman_baru >= 10000)
{
text = 'Pembiayaan melebihi RM 10,000!';
}
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Operasi',
text: text,
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 = marginsemasa;
let komen = '';
if(marginsemasa > 75 && marginsemasa <= 80)
{
komen = "Pembiayaan Melebihi Margin 75%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
}else if(pinjamanbaru >= 10000)
{
komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
}
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
icon: 'info',
width: 600,
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('operasi.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : pinjaman_baru,
"teller" : teller
},
success:function(data){
siricreated = data;
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
var channel = pusher.subscribe('notice-kelulusan'); var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) { channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller) if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{ {
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(){
gadaiautotawarruq(); gadaiautotawarruq();
}); return true;
});
} }
else if(data.kelulusan == 'batal') else if(data.kelulusan == 'batal')
{ {
Swal.fire({ Swal.fire({
icon: 'warning', icon: 'warning',
title: 'Telah Dibatalkan', title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}` text: `Komen : ${data.komen}`
}).then(function(){ }).then(function(){
return false; $("#terima_gadai").prop('disabled', false);
}); return false;
} });
}
}
});
}else if (result.dismiss === Swal.DismissReason.cancel){
$("#terima_transaksi").prop('disabled', false);
swalWithBootstrapButtons.fire(
'Gagal',
'Gagal mendapatkan kelulusan operasi',
'error'
)
}
});
event.preventDefault();
return false;
}else if(marginsemasa > 80){
$("#terima_transaksi").prop('disabled', false);
Swal.fire(
'Amaran!',
'Pinjaman Haruslah Dalam Lingkungan 80%!',
'error'
)
return false;
} }
gadaiautotawarruq();
});
} else if (result.dismiss === Swal.DismissReason.cancel) {
$("#terima_transaksi").prop('disabled', false);
swalWithBootstrapButtons.fire(
'Gagal',
'Gagal mendapatkan kelulusan khazanah',
'error'
)
}
});
event.preventDefault();
return false;
}else if((marginsemasa > 75 && marginsemasa <= 80) || pinjaman_baru >= 10000){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
});
let text = '';
if(marginsemasa > 75 && marginsemasa <= 80)
{
text = 'Tetapan margin melebihi 75% untuk Operasi!';
}else if(pinjaman_baru >= 10000)
{
text = 'Pembiayaan melebihi RM 10,000!';
}
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Operasi',
text: text,
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 = marginsemasa;
let komen = '';
if(marginsemasa > 75 && marginsemasa <= 80)
{
komen = "Pembiayaan Melebihi Margin 75%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
}else if(pinjamanbaru >= 10000)
{
komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
} }
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
icon: 'info',
width: 600,
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('operasi.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : pinjaman_baru,
"teller" : teller
},
success:function(data){
siricreated = data;
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan',
text: `Komen : ${data.komen}`
}).then(function(){
gadaiautotawarruq();
return true;
});
}
else if(data.kelulusan == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
$("#terima_gadai").prop('disabled', false);
return false;
});
}
}
});
}else if (result.dismiss === Swal.DismissReason.cancel){
$("#terima_transaksi").prop('disabled', false);
swalWithBootstrapButtons.fire(
'Gagal',
'Gagal mendapatkan kelulusan operasi',
'error'
)
} }
});
event.preventDefault();
return false;
}else if(marginsemasa > 80){
$("#terima_transaksi").prop('disabled', false);
Swal.fire(
'Amaran!',
'Pinjaman Haruslah Dalam Lingkungan 80%!',
'error'
)
return false;
} }
});
gadaiautotawarruq();
///////////// /////////////
//End File// //End File//
@@ -2131,7 +2159,7 @@
var pinjamanbaru = $('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""); var pinjamanbaru = $('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"");
var ansuran = 0; var ansuran = 0;
var addpinjaman = 0; var addpinjaman = 0;
var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,""); var bakiupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
var bakipinjaman = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,"")) + bakiupah; var bakipinjaman = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,"")) + bakiupah;
var historygadaian = "{{ $gadai['norujukan'] }}"; var historygadaian = "{{ $gadai['norujukan'] }}";
resources/views/print/laporan_ansuran.blade.php
+6 -6
View File
@@ -206,8 +206,8 @@
<th>Tempoh</th> <th>Tempoh</th>
<th>Baki Pembiayaan (RM)</th> <th>Baki Pembiayaan (RM)</th>
<th>Bayaran Pemb. (RM)</th> <th>Bayaran Pemb. (RM)</th>
<th>Bayaran (RM)</th>
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>Bayaran (RM)</th>
</tr> </tr>
@php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; $totalpendahuluan = 0;@endphp @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; $totalpendahuluan = 0;@endphp
@foreach($tebus as $index=>$item) @foreach($tebus as $index=>$item)
@@ -233,8 +233,8 @@
<td>{{ $item['tempoh'] }}</td> <td>{{ $item['tempoh'] }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td> <td>{{ number_format($item['bakipjm'],2) }}</td>
<td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td> <td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td>
<td>{{ number_format($item['duit_masuk'],2) }}</td>
<td>{{ number_format($item['bayaran_keuntungan'],2) }}</td> <td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
<td>{{ number_format($item['duit_masuk'],2) }}</td>
</tr> </tr>
@php $counter++; @endphp @php $counter++; @endphp
@php $totaldmteller += $item['duit_masuk'];$totalupahteller += $item['bayaran_keuntungan'];$totalpendhteller += $item['bayaran_pembiayaan']; @endphp @php $totaldmteller += $item['duit_masuk'];$totalupahteller += $item['bayaran_keuntungan'];$totalpendhteller += $item['bayaran_pembiayaan']; @endphp
@@ -243,8 +243,8 @@
<tr> <tr>
<td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td> <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
<td><b>{{ number_format($totalpendhteller,2) }} </b></td> <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
<td><b>{{ number_format($totaldmteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td> <td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totaldmteller,2) }} </b></td>
</tr> </tr>
@php $counter = 1;$totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0;@endphp @php $counter = 1;$totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0;@endphp
@endif @endif
@@ -252,8 +252,8 @@
<tr> <tr>
<td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td> <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
<td><b>{{ number_format($totalpendhteller,2) }} </b></td> <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
<td><b>{{ number_format($totaldmteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td> <td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totaldmteller,2) }} </b></td>
</tr> </tr>
@endif @endif
@endforeach @endforeach
@@ -264,14 +264,14 @@
<tr> <tr>
<th colspan="9"></th> <th colspan="9"></th>
<th style="text-align:center;">Bayaran Pemb. (RM)</th> <th style="text-align:center;">Bayaran Pemb. (RM)</th>
<th style="text-align:center;">Bayaran (RM)</th>
<th style="text-align:center;">Keuntungan (RM)</th> <th style="text-align:center;">Keuntungan (RM)</th>
<th style="text-align:center;">Bayaran (RM)</th>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td> <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ number_format($totalpendahuluan,2) }}</td> <td>{{ number_format($totalpendahuluan,2) }}</td>
<td>{{ number_format($totalduitmasuk,2) }}</td>
<td>{{ number_format($totalkeuntungan,2) }}</td> <td>{{ number_format($totalkeuntungan,2) }}</td>
<td>{{ number_format($totalduitmasuk,2) }}</td>
</tr> </tr>
</table> </table>
resources/views/print/laporan_penebusan.blade.php
+20 -18
View File
@@ -202,27 +202,28 @@
<th>JBG</th> <th>JBG</th>
<th>J Tebus</th> <th>J Tebus</th>
<th width="6%;">Nilai Marhun(RM)</th> <th width="6%;">Nilai Marhun(RM)</th>
<th width="6%;">Pembiayaan(RM)</th> <th width="6%;">P. Asal(RM)</th>
<th width="6%;">B.Pembiayaan(RM)</th>
{{-- <th width="6%;">Baki Pembiayaan(RM)</th> --}} {{-- <th width="6%;">Baki Pembiayaan(RM)</th> --}}
<th width="6%;">Upah/Keuntungan(RM)</th> <th width="6%;">Keuntungan(RM)</th>
<th width="6%;">Bayaran(RM)</th> <th width="6%;">Bayaran(RM)</th>
<th width="6%;">Jumlah(RM)</th> <th width="6%;">Jumlah(RM)</th>
</tr> </tr>
@php $counter = 1;$totalnm = 0; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp @php $counter = 1;$totalnm = 0; $totalbayaran = 0;$totalpinjamanasal = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
@foreach($tebus as $index=>$item) @foreach($tebus as $index=>$item)
@php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman']; $totalupah += $item['bakiupah']; $totalnm += $item['nilaimarhun'];@endphp @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman']; $totalupah += $item['bakiupah'];$totalpinjamanasal += $item['pinjaman']; $totalnm += $item['nilaimarhun'];@endphp
@if($index > 0) @if($index > 0)
@if($item['teller'] != $tebus[$index - 1]['teller']) @if($item['teller'] != $tebus[$index - 1]['teller'])
<tr> <tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td> <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr> </tr>
@php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp @php $totalnmteller = 0;$totalpinjamanasalteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
@endif @endif
@else @else
<tr> <tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td> <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr> </tr>
@php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp @php $totalnmteller = 0;$totalpinjamanasalteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
@endif @endif
<tr> <tr>
<td>{{ $counter }}</td> <td>{{ $counter }}</td>
@@ -241,6 +242,7 @@
<td> <td>
{{ number_format($item['nilaimarhun'],2) }} {{ number_format($item['nilaimarhun'],2) }}
</td> </td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>@php <td>@php
if($item['hargajualan'] !== $item['bakihargajualan']) if($item['hargajualan'] !== $item['bakihargajualan'])
@@ -251,27 +253,29 @@
{{-- <td>{{ number_format($item['gadaibakipjm'],2) }}</td> --}} {{-- <td>{{ number_format($item['gadaibakipjm'],2) }}</td> --}}
<td>{{ number_format($item['bakiupah'],2) }}</td> <td>{{ number_format($item['bakiupah'],2) }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td> <td>{{ number_format($item['bakipjm'],2) }}</td>
<td>@php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td> <td>@php if($item['jenistebus'] == 'S'){ $total=($item['gadaibakipjm']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
</tr> </tr>
@php $counter++; @endphp @php $counter++; @endphp
@php $totalnmteller += $item['nilaimarhun']; $totalpinjamanteller += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp @php $totalnmteller += $item['nilaimarhun'];$totalpinjamanasalteller += $item['pinjaman']; $totalpinjamanteller += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
@php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp @php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm']; @endphp
@if($index+1 < sizeof($tebus)) @if($index+1 < sizeof($tebus))
@if($item['teller'] != $tebus[$index + 1]['teller']) @if($item['teller'] != $tebus[$index + 1]['teller'])
<tr class="new-page"> <tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td> <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td><b>{{ number_format($totalnmteller,2) }} </b></td> <td><b>{{ number_format($totalnmteller,2) }} </b></td>
<td><b>{{ number_format($totalpinjamanasalteller,2) }} </b></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td> <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td> <td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td> <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
<td><b>{{ number_format($totaljumlahteller,2) }} </b></td> <td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
</tr> </tr>
@php $counter = 1;$totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0;$totaljumlahteller = 0; @endphp @php $counter = 1;$totalpinjamanasalteller = 0;$totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0;$totaljumlahteller = 0; @endphp
@endif @endif
@else @else
<tr class="new-page"> <tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td> <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td><b>{{ number_format($totalnmteller,2) }}</b></td> <td><b>{{ number_format($totalnmteller,2) }}</b></td>
<td><b>{{ number_format($totalpinjamanasalteller,2) }} </b></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td> <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td> <td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td> <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -286,13 +290,15 @@
<tr> <tr>
<th colspan="9"></th> <th colspan="9"></th>
<th style="text-align:center;">Nilai Marhun (RM)</th> <th style="text-align:center;">Nilai Marhun (RM)</th>
<th style="text-align:center;">Pembiayaan (RM)</th> <th style="text-align:center;">Pembiayaan Asal(RM)</th>
<th style="text-align:center;">B. Pembiayaan (RM)</th>
<th style="text-align:center;">Upah/Keuntungan (RM)</th> <th style="text-align:center;">Upah/Keuntungan (RM)</th>
<th style="text-align:center;">Jumlah (RM)</th> <th style="text-align:center;">Jumlah (RM)</th>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td> <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ number_format($totalnm,2) }}</td> <td>{{ number_format($totalnm,2) }}</td>
<td>{{ number_format($totalpinjamanasal,2) }}</td>
<td>{{ number_format($totalpinjaman,2) }}</td> <td>{{ number_format($totalpinjaman,2) }}</td>
<td>{{ number_format($totalupah,2) }}</td> <td>{{ number_format($totalupah,2) }}</td>
<td>{{ number_format($totalbayaran,2) }}</td> <td>{{ number_format($totalbayaran,2) }}</td>
@@ -331,13 +337,6 @@
<td>{{ number_format($upahlama['total'],2) }}</td> <td>{{ number_format($upahlama['total'],2) }}</td>
<td> Not Applicable </td> <td> Not Applicable </td>
</tr> </tr>
</table>
{{-- <h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5> --}}
<br>
<br>
<table id="sign">
<tr> <tr>
<td>{{ $ansuran['bilangan'] }}</td> <td>{{ $ansuran['bilangan'] }}</td>
<td>Ansuran Pembiayaan</td> <td>Ansuran Pembiayaan</td>
@@ -347,6 +346,9 @@
</tr> </tr>
</table> </table>
{{-- <h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5> --}}
<br> <br>
<br> <br>
<table id="sign"> <table id="sign">