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

update simulasi cajlelong dan baki lelong

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2023-03-23 11:34:24 +08:00
parent b77ebb9c3a
commit 391f6f81fa
4 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportController.php
+12 -4
View File
@@ -678,6 +678,8 @@ class ReportController extends Controller
$total_rugilelong = 0; $total_rugilelong = 0;
$total_baki = 0; $total_baki = 0;
$simulasilel = Simulasi::with('cawangan')->find($simulasi_id);
$marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id') $marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
// ->join('gadai','simulasibid.norujukan','=','gadai.norujukan') // ->join('gadai','simulasibid.norujukan','=','gadai.norujukan')
->where('simulasi_id','=',$simulasi_id) ->where('simulasi_id','=',$simulasi_id)
@@ -721,6 +723,12 @@ class ReportController extends Controller
// dd($customer); // dd($customer);
// $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
$sumcajlelong = $cal['hargaasas'] * ($simulasilel->cajlelong/100);
$cajlelongnew = round($sumcajlelong,1,1);
$baki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
$marhuns[$index1]['cajlelong'] = $cal['cajlelong'];
$marhuns[$index1]['baki'] = $baki;
$marhuns[$index1]['keuntungan'] = $keuntungan; $marhuns[$index1]['keuntungan'] = $keuntungan;
$marhuns[$index1]['nama'] = $customer; $marhuns[$index1]['nama'] = $customer;
@@ -735,8 +743,8 @@ class ReportController extends Controller
'hargaasas' => $cal['hargaasas'], 'hargaasas' => $cal['hargaasas'],
'pinjaman' => $cal['pinjaman'], 'pinjaman' => $cal['pinjaman'],
'bakiupah' => $cal['bakiupah'], 'bakiupah' => $cal['bakiupah'],
'cajlelong' => $cal['cajlelong'], 'cajlelong' => $cajlelongnew,
'baki' => $cal['baki'], 'baki' => $baki,
]); ]);
if($cal['baki'] > 0) if($cal['baki'] > 0)
@@ -753,8 +761,8 @@ class ReportController extends Controller
$total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah']; $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cajlelong = $total_cajlelong + $cal['cajlelong']; $total_cajlelong = $total_cajlelong + $cajlelongnew;
$total_baki = $total_baki + $cal['baki']; $total_baki = $total_baki + $baki;
$datacaw = Cawangan::where('id','=',$cawid) $datacaw = Cawangan::where('id','=',$cawid)
->get(); ->get();
app/Http/Controllers/SimulasiController.php
+7 -6
View File
@@ -980,7 +980,7 @@ class SimulasiController extends Controller
$cajlelongnew = round($sumcajlelong, 1, 1); $cajlelongnew = round($sumcajlelong, 1, 1);
// $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$cajlelong = $cajlelong + $cajlelongnew; $cajlelong = $cajlelong + $cajlelongnew;
$totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - $sim_bid['cajlelong']; $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - $cajlelongnew;
if(strpos($totalbaki, '-') !== false) if(strpos($totalbaki, '-') !== false)
{ {
$rugi = -$totalbaki; $rugi = -$totalbaki;
@@ -1599,7 +1599,8 @@ class SimulasiController extends Controller
// $simulasilel = Simulasi::where('id',$simulasi_id)->get(); // $simulasilel = Simulasi::where('id',$simulasi_id)->get();
$sumcajlelong = $cal['hargaasas'] * ($simulasilel->cajlelong/100); $sumcajlelong = $cal['hargaasas'] * ($simulasilel->cajlelong/100);
$baki = $cal['baki']; $cajlelongnew = round($sumcajlelong,1,1);
$baki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
$marhuns[$index1]['cajlelong'] = $cal['cajlelong']; $marhuns[$index1]['cajlelong'] = $cal['cajlelong'];
$marhuns[$index1]['baki'] = $baki; $marhuns[$index1]['baki'] = $baki;
@@ -1608,8 +1609,8 @@ class SimulasiController extends Controller
$total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah']; $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_baki = $total_baki + $cal['baki']; $total_baki = $total_baki + $baki;
$total_cazlelong = $total_cazlelong + $cal['cajlelong']; $total_cazlelong = $total_cazlelong + $cajlelongnew;
array_push($arraymarhun,[ array_push($arraymarhun,[
@@ -1621,8 +1622,8 @@ class SimulasiController extends Controller
'hargaasas' => $cal['hargaasas'], 'hargaasas' => $cal['hargaasas'],
'pinjaman' => $cal['pinjaman'], 'pinjaman' => $cal['pinjaman'],
'bakiupah' => $cal['bakiupah'], 'bakiupah' => $cal['bakiupah'],
'cajlelong' => $cal['cajlelong'], 'cajlelong' => $cajlelongnew,
'baki' => $cal['baki'], 'baki' => $baki,
]); ]);
} }
resources/views/lelong/showlelongdone.blade.php
+1 -1
View File
@@ -157,7 +157,7 @@
<div class="input-group-prepend"> <div class="input-group-prepend">
<div class="input-group-text">RM</div> <div class="input-group-text">RM</div>
</div> </div>
<input type="text" readonly class="form-control bg-light" value="(RM{{ number_format($total_rugilelong, 2, '.', ',') }})"> <input type="text" readonly class="form-control bg-light" value="({{ number_format($total_rugilelong, 2, '.', ',') }})">
</div> </div>
</div> </div>
</div> </div>
resources/views/simulasi/senaraimarhunlel.blade.php
+10 -10
View File
@@ -125,19 +125,19 @@
<tfoot class="bg-light"> <tfoot class="bg-light">
<tr> <tr>
<td colspan="3" class="text-center"><b>JUMLAH KESELURUHAN</b></td> <td colspan="3" class="text-center"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td> <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td> <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
{{--<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>--}} {{--<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>--}}
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td> <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td> <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td> <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td> <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
{{--<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>--}} {{--<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>--}}
<td>@if($total_baki > 0) <td align = 'right'><b>@if($bakilelong > 0)
{{ number_format($total_baki, 2, '.', ',') }} {{ number_format($bakilelong, 2, '.', ',') }}
@else @else
({{number_format(-($total_baki), 2, '.', ',')}}) ({{number_format(-($bakilelong), 2, '.', ',')}})
@endif</td> @endif</b></td>
<td></td> <td></td>
</tr> </tr>
</tfoot> </tfoot>