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

update new pada lelong

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2022-11-25 17:39:03 +08:00
parent 57c4f01f84
commit e2bf6f4270
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+9 -6
View File
@@ -250,8 +250,10 @@ class LelongController extends Controller
//$cajlelong += $lel_bid->cajlelong;
$sumcajlelong = $lel_bid['hargaasas'] * ($lelong->cajlelong / 100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
$totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - bcdiv($sumcajlelong, 1, 1);
$cajlelongnew = round($sumcajlelong, 1, 1);
// $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
$cajlelong = $cajlelong + $cajlelongnew;
$totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - $cajlelongnew;
if (strpos($totalbaki, '-') !== false) {
$rugi = -$totalbaki;
$rugilelong += $rugi;
@@ -1304,8 +1306,9 @@ class LelongController extends Controller
$arraymarhun = [];
foreach ($marhuns as $index1=> $cal) {
$sumcajlelong = $cal['hargaasas'] * ($lelonglel->cajlelong/100);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
$cajlelongnew = round($sumcajlelong,1,1);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
$marhuns[$index1]['cajlelong'] = $cajlelongnew;
$marhuns[$index1]['baki'] = $totalbaki;
$marhuns[$index1]['keuntungan'] = $keuntungan;
@@ -1314,7 +1317,7 @@ class LelongController extends Controller
$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);
$total_cazlelong = $total_cazlelong + $cajlelongnew;
array_push($arraymarhun,[
'norujukan' => $cal['norujukan'],
@@ -1324,7 +1327,7 @@ class LelongController extends Controller
'hargaasas' => $cal['hargaasas'],
'pinjaman' => $cal['pinjaman'],
'bakiupah' => $cal['bakiupah'],
'cajlelong' => $cal['cajlelong'],
'cajlelong' => $cajlelongnew,
'baki' => $cal['baki'],
]);
}
app/Http/Controllers/ReportController.php
+4 -3
View File
@@ -797,8 +797,9 @@ class ReportController extends Controller
// 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);
$cajlelongnew = round($sumcajlelong,1,1);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
$marhuns[$index1]['cajlelong'] = $cajlelongnew;
$marhuns[$index1]['baki'] = $totalbaki;
@@ -828,7 +829,7 @@ class ReportController extends Controller
$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);
$total_cazlelong = $total_cazlelong + $cajlelongnew;
}
resources/views/lelong/senaraimarhun.blade.php
+5 -1
View File
@@ -132,7 +132,11 @@
<td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>@if($bakilelong > 0)
{{ number_format($bakilelong, 2, '.', ',') }}
@else
({{number_format(-($bakilelong), 2, '.', ',')}})
@endif</b></td>
<td align = 'right'></td>
</tr>
</tfoot>
resources/views/pdf/pdflelongreport.blade.php
+5 -1
View File
@@ -214,7 +214,11 @@
<td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>@if($bakilelong > 0)
{{ number_format($bakilelong, 2, '.', ',') }}
@else
({{number_format(-($bakilelong), 2, '.', ',')}})
@endif</b></td>
</tr>
</tfoot>