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

Merge branch 'atie' into 'main'

Browse Source 
update bug komen 9/10

See merge request online-sistem1/lelong!267
This commit is contained in:
Nur Izzati Zulkifli
2022-11-09 16:14:52 +00:00
parent 1dc293a063 8642d97418
commit 19db2abe25
7 changed files with 335 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+27 -17
View File
@@ -1215,6 +1215,8 @@ class LelongController extends Controller
$total_bakiupah = 0;
$total_nilaimarhun = 0;
$keuntungan = 0;
$bakilelong = 0;
$total_cazlelong = 0;
// dd($cawid);
$marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
@@ -1250,31 +1252,38 @@ class LelongController extends Controller
->first();
// dd($customer);
$simulasilel = Lelong::where('id',$lelongid)->get();
$sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['baki'] = $totalbaki;
// $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
$marhuns[$index1]['keuntungan'] = $keuntungan;
$marhuns[$index1]['nama'] = $customer;
array_push($arraymarhun,[
'norujukan' => $cal['norujukan'],
'tempoh' => $gadai['tempoh'],
'nama' => $customer['nama'],
'berat' => $cal['berat'],
'nilaimarhun' => $cal['nilaimarhun'],
'hargaasas' => $cal['hargaasas'],
'hargajual' => $cal['hargajual'],
't_jual' => $cal['t_jual'],
'pinjaman' => $cal['pinjaman'],
'pinjasal' => $gadai['pinjaman'],
'bakiupah' => $cal['bakiupah'],
'cajlelong' => $cal['cajlelong'],
'baki' => $cal['baki'],
'upah6bulan' => $gadai['bakiupah']
]);
// array_push($arraymarhun,[
// 'norujukan' => $cal['norujukan'],
// 'tempoh' => $gadai['tempoh'],
// 'nama' => $customer['nama'],
// 'berat' => $cal['berat'],
// 'nilaimarhun' => $cal['nilaimarhun'],
// 'hargaasas' => $cal['hargaasas'],
// 'hargajual' => $cal['hargajual'],
// 't_jual' => $cal['t_jual'],
// 'pinjaman' => $cal['pinjaman'],
// 'pinjasal' => $gadai['pinjaman'],
// 'bakiupah' => $cal['bakiupah'],
// 'cajlelong' => $cal['cajlelong'],
// 'baki' => $cal['baki'],
// 'upah6bulan' => $gadai['bakiupah']
// ]);
$total_berat = $total_berat + $cal['berat'];
$total_pinjaman = $total_pinjaman + $cal['pinjaman'];
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cazlelong = $total_cazlelong + bcdiv($sumcajlelong,1,1);
}
$arrayinfo = [];
@@ -1300,7 +1309,8 @@ class LelongController extends Controller
'total_upah',
'total_hargaasas',
'total_bakiupah',
'total_nilaimarhun'));
'total_nilaimarhun',
'total_cazlelong'));
}
public function deletemarhun(Request $request){
app/Http/Controllers/ReportController.php
+27 -17
View File
@@ -663,6 +663,8 @@ class ReportController extends Controller
$total_bakiupah = 0;
$total_nilaimarhun = 0;
$keuntungan = 0;
$bakilelong = 0;
$total_cazlelong = 0;
$marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
->select(
@@ -696,33 +698,40 @@ class ReportController extends Controller
->orWhere('kplama','=',$gadai['nokp'])
->first();
// dd($customer);
$simulasilel = Lelong::where('id',$lelongid)->get();
$sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['baki'] = $totalbaki;
// $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
$marhuns[$index1]['keuntungan'] = $keuntungan;
$marhuns[$index1]['nama'] = $customer;
array_push($arraymarhun,[
'norujukan' => $cal['norujukan'],
'tempoh' => $gadai['tempoh'],
'nama' => $customer['nama'],
'berat' => $cal['berat'],
'nilaimarhun' => $cal['nilaimarhun'],
'hargaasas' => $cal['hargaasas'],
'hargajual' => $cal['hargajual'],
't_jual' => $cal['t_jual'],
'pinjaman' => $cal['pinjaman'],
'pinjasal' => $gadai['pinjaman'],
'bakiupah' => $cal['bakiupah'],
'cajlelong' => $cal['cajlelong'],
'baki' => $cal['baki'],
'upah6bulan' => $gadai['bakiupah']
]);
// array_push($arraymarhun,[
// 'norujukan' => $cal['norujukan'],
// 'tempoh' => $gadai['tempoh'],
// 'nama' => $customer['nama'],
// 'berat' => $cal['berat'],
// 'nilaimarhun' => $cal['nilaimarhun'],
// 'hargaasas' => $cal['hargaasas'],
// 'hargajual' => $cal['hargajual'],
// 't_jual' => $cal['t_jual'],
// 'pinjaman' => $cal['pinjaman'],
// 'pinjasal' => $gadai['pinjaman'],
// 'bakiupah' => $cal['bakiupah'],
// 'cajlelong' => $cal['cajlelong'],
// 'baki' => $cal['baki'],
// 'upah6bulan' => $gadai['bakiupah']
// ]);
$total_berat = $total_berat + $cal['berat'];
$total_pinjaman = $total_pinjaman + $cal['pinjaman'];
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cazlelong = $total_cazlelong + bcdiv($sumcajlelong,1,1);
}
@@ -750,7 +759,8 @@ class ReportController extends Controller
'total_upah',
'total_hargaasas',
'total_bakiupah',
'total_nilaimarhun'))
'total_nilaimarhun',
'total_cazlelong'))
->setPaper('a4','potrait');
return $pdf->download('Laporan Lelong Cawangan.pdf');
resources/views/lelong/senaraimarhun.blade.php
+37 -22
View File
@@ -56,43 +56,56 @@
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Nama Pelanggan</th>
{{-- <th>Nama Pelanggan</th> --}}
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
{{-- <th>Caj Lelong (%)</th>
<th>Rugi Lelong (RM)</th>
<th>Baki Lelong (RM)</th> --}}
<th>Caj Lelong (%)</th>
{{-- <th>Rugi Lelong (RM)</th> --}}
<th>Baki Lelong (RM)</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@foreach ($arraymarhun as $index=> $marhun)
@php
$rugilelong = 0;
$bakilelong = 0;
@endphp
@foreach ($marhuns as $index=> $marhun)
<tr>
<td>{{$loop->iteration}}</td>
<td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
<td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']}}</td>
<td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
{{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
<td>{{ number_format($marhun['jbg'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
{{-- <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
<?php
<td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
@php
$rugi = 0;
$baki = 0;
if (strpos($marhun['baki'], '-') !== false) {
$rugi = $marhun['baki'];
} else {
$baki = $marhun['baki'];
}
?>
<td>{{number_format($rugi, 2, '.', ',')}}</td>
<td>{{number_format($baki, 2, '.', ',')}}</td> --}}
$baki = 0;
if(strpos($marhun['baki'], '-') !== false)
{
$baki = -$marhun['baki'];
$bakilelong += $marhun['baki'];
}
else {
$baki = $marhun['baki'];
$bakilelong += $marhun['baki'];
}
@endphp
{{-- <td>{{number_format($rugi, 2, '.', ',')}}</td> --}}
<td align = 'right'>@if($marhun['baki'] > 0)
{{number_format($marhun['baki'], 2, '.', ',')}}
@elseif($marhun['baki'] < 0 )
({{number_format(-($marhun['baki']), 2, '.', ',')}})
@endif
</td>
<td class="text-center">
<input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
@@ -103,13 +116,15 @@
</tbody>
<tfoot>
<tr>
<td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
{{-- <td align = 'right'>({{ number_format($rugilelong, 2, '.', ',') }})</td> --}}
<td align = 'right'>{{ number_format($bakilelong, 2, '.', ',') }}</td>
</tr>
</tfoot>
@@ -130,12 +145,12 @@
function confirm() {
$.confirm({
title: 'Confirmation',
title: 'Hapus No.Rujukan',
content: 'Anda pasti?',
type: 'red',
typeAnimated: true,
buttons: {
Delete: {
Hapus: {
btnClass: 'btn-danger',
action: function() {
$("#deletesag").submit();
resources/views/marhun/scanbarcode.blade.php
+5 -4
View File
@@ -28,10 +28,10 @@
<ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">SAG Keluar Peti Besi</a>
<a class="nav-link active" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">Senarai SAG Akan Dilelong</a>
</li>
<li class="nav-item">
<a class="nav-link" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">SAG Masuk Peti Besi</a>
<a class="nav-link" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">Senarai SAG Keluar/Masuk Peti Besi</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
@@ -47,7 +47,7 @@
</form>
</div>
</div>
<div style="text-align: left;"> <a href="{{ route('marhun.cetakkeluarscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Keluar Peti Besi semasa</a><br></div>
<table class='table table-bordered table-hover' id='table-scan-keluar'>
<thead class="bg-primary text-white">
<tr>
@@ -82,7 +82,8 @@
</form>
</div>
</div>
<div style="text-align: left;"> <a href="{{ route('marhun.cetakmasukscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Masuk Peti Besi semasa</a><br></div>
<div style="text-align: left;"> <a href="{{ route('marhun.cetakkeluarscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Keluar Semasa</a>
<a href="{{ route('marhun.cetakmasukscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Masuk Semasa</a></div>
<table class="table table-bordered table-hover" id="table-scan-masuk" style="width: 100%;">
<thead class="bg-primary text-white">
<tr>
resources/views/pdf/pdflelongreport.blade.php
+34 -20
View File
@@ -111,42 +111,55 @@ tr:nth-child(even) {
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Nama Pelanggan</th>
{{-- <th>Nama Pelanggan</th> --}}
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
{{-- <th>Caj Lelong (%)</th>
<th>Rugi Lelong (RM)</th>
<th>Baki Lelong (RM)</th> --}}
<th>Caj Lelong (%)</th>
{{-- <th>Rugi Lelong (RM)</th> --}}
<th>Baki Lelong (RM)</th>
</tr>
</thead>
<tbody>
@foreach ($arraymarhun as $index=> $marhun)
@php
$rugilelong = 0;
$bakilelong = 0;
@endphp
@foreach ($marhuns as $index=> $marhun)
<tr>
<td>{{$loop->iteration}}</td>
<td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
<td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']}}</td>
<td >{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
{{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']}}</td> --}}
<td >{{ number_format($marhun['jbg'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
{{-- <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
<?php
<td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
@php
$rugi = 0;
$baki = 0;
if (strpos($marhun['baki'], '-') !== false) {
$rugi = $marhun['baki'];
} else {
$baki = $marhun['baki'];
}
?>
<td>{{number_format($rugi, 2, '.', ',')}}</td>
<td>{{number_format($baki, 2, '.', ',')}}</td> --}}
$baki = 0;
if(strpos($marhun['baki'], '-') !== false)
{
$baki = -$marhun['baki'];
$bakilelong += $marhun['baki'];
}
else {
$baki = $marhun['baki'];
$bakilelong += $marhun['baki'];
}
@endphp
{{-- <td>{{number_format($rugi, 2, '.', ',')}}</td> --}}
<td align = 'right'>@if($marhun['baki'] > 0)
{{number_format($marhun['baki'], 2, '.', ',')}}
@elseif($marhun['baki'] < 0 )
({{number_format(-($marhun['baki']), 2, '.', ',')}})
@endif
</td>
@@ -155,13 +168,14 @@ tr:nth-child(even) {
</tbody>
<tfoot>
<tr>
<td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($bakilelong, 2, '.', ',') }}</td>
</tr>
</tfoot>
resources/views/simulasi/senaraimarhunlel.blade copy.php
+193
View File
@@ -0,0 +1,193 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<div class="text-left pt-4">
<a href=" {{ route('report.simulasireport',[$simulasi_id,$cawid]) }}" class="btn btn-success">PDF</a>
<a href="{{ route('analisa.senaraimarhunlel',[$simulasi_id,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
<a href="{{ route('analisa.listsagbycust',[$simulasi_id,'cawid'=>$cawid]) }}" class="btn btn-success">Senarai Mengikut Nama Pelanggan</a>
</div>
<form id="deletesag" action="{{route('analisa.deletemarhunlel')}}" method="POST">
@csrf
<input type="hidden" name="simulasi_id" value="{{$simulasi_id}}">
<input type="hidden" name="cawid" value="{{$cawid}}">
<table class="table table-striped table-xl" id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>No Rujukan</th>
<!-- <th>Nama Pelanggan</th> -->
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Caj Lelong (%)</th>
{{-- <th>Rugi Lelong (RM)</th> --}}
<th>Baki Lelong (RM)</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@php $rugilelong = 0;
$bakilelong = 0;
@endphp
@foreach ($arraymarhun as $index=> $marhun)
<tr>
<td>{{$loop->iteration}}</td>
<td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
<td>{{ $marhun['tempoh']}}</td>
<td align = 'right'>{{ $marhun['berat'] }}</td>
<td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
{{-- {{dd($marhun['norujukan'])}} --}}
@php
$rugi = 0;
$baki = 0;
if(strpos($marhun['baki'], '-') !== false)
{
$baki = -$marhun['baki'];
$bakilelong += $rugi;
}
else {
$baki = $marhun['baki'];
$bakilelong += $baki;
}
@endphp
{{-- <td align = 'right'>({{number_format($rugi, 2, '.', ',')}})</td> --}}
<td align = 'right'>{{number_format($marhun['baki'], 2, '.', ',')}}</td>
<td class="text-center">
<input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
{{-- <td align = 'right'>({{ number_format($rugilelong, 2, '.', ',') }})</td> --}}
<td align = 'right'>{{ number_format($bakilelong, 2, '.', ',') }}</td>
</tr>
</tfoot>
</table>
<div class="text-right pt-4">
<a href="{{ route('analisa.show',$simulasi_id) }}" class="btn btn-primary">Kembali</a>
<button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Hapus</button>
</div>
{{-- <a href="{{url('simulasi/showsimulasi')}}" class="btn btn-primary">Kembali</a> --}}
</form>
</div>
</div>
</div>
<script>
$("#btndelete").prop("enabled", true);
function btnDelete(e) {
var count = 0;
tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
if($(this).prop('checked') === true)
{
count = count + 1;
}
// $(this).prop('checked', e.checked);
})
if(count != 0)
{
$("#btndelete").prop("disabled", false);
}
else
{
$("#btndelete").prop("disabled", true);
}
// let checkbox = $('#checkboxdata').val();
// console.log(checkbox)
// $("#btndelete").prop("disabled", checkboxdata.length === 0);
}
function confirm() {
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'red',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-danger',
action: function () {
$("#deletesag").submit();
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
}
var tablemarhun = $('#marhun').DataTable( {
"columnDefs": [
{
"targets": 13,
"orderable": false
},
// {
// "targets": 4,
// "orderable": false
// }
],
// order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 10000000,
dom: 'Bfrtip',
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm adduser',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Pengguna',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
</script>
@endsection
resources/views/simulasi/senaraimarhunlel.blade.php
+12 -7
View File
@@ -34,7 +34,7 @@
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Caj Lelong (%)</th>
<th>Rugi Lelong (RM)</th>
{{-- <th>Rugi Lelong (RM)</th> --}}
<th>Baki Lelong (RM)</th>
<th>Tindakan</th>
</tr>
@@ -61,16 +61,21 @@
$baki = 0;
if(strpos($marhun['baki'], '-') !== false)
{
$rugi = -$marhun['baki'];
$rugilelong += $rugi;
$baki = -$marhun['baki'];
$bakilelong += $marhun['baki'];
}
else {
$baki = $marhun['baki'];
$bakilelong += $baki;
$bakilelong += $marhun['baki'];
}
@endphp
<td align = 'right'>({{number_format($rugi, 2, '.', ',')}})</td>
<td align = 'right'>{{number_format($baki, 2, '.', ',')}}</td>
{{-- <td align = 'right'>({{number_format($rugi, 2, '.', ',')}})</td> --}}
<td align = 'right'>@if($marhun['baki'] > 0)
{{number_format($marhun['baki'], 2, '.', ',')}}
@elseif($marhun['baki'] < 0 )
({{number_format(-($marhun['baki']), 2, '.', ',')}})
@endif
</td>
<td class="text-center">
<input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
@@ -88,7 +93,7 @@
<td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td align = 'right'>({{ number_format($rugilelong, 2, '.', ',') }})</td>
{{-- <td align = 'right'>({{ number_format($rugilelong, 2, '.', ',') }})</td> --}}
<td align = 'right'>{{ number_format($bakilelong, 2, '.', ',') }}</td>
</tr>