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

Fix at server

Browse Source
This commit is contained in:
root
2022-11-24 17:44:22 +08:00
parent b71ffb3333
commit 548489f520
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+2 -2
View File
@@ -247,7 +247,7 @@ class LelongController extends Controller
$bakiupah += $lel_bid->bakiupah;
$berat += $lel_bid->berat;
$hargaasas += $lel_bid->hargaasas;
$cajlelong += $lel_bid->cajlelong;
//$cajlelong += $lel_bid->cajlelong;
$sumcajlelong = $lel_bid['hargaasas'] * ($lelong->cajlelong / 100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
@@ -5245,4 +5245,4 @@ class LelongController extends Controller
}
app/Http/Controllers/SimulasiController.php
+3 -3
View File
@@ -977,10 +977,10 @@ class SimulasiController extends Controller
$bakiupah += $sim_bid->bakiupah;
$berat += $sim_bid->berat;
$hargaasas += $sim_bid->hargaasas;
$cajlelong += $sim_bid->cajlelong;
$sumcajlelong = $sim_bid['hargaasas'] * ($simulasi['cajlelong']/100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$sumcajlelong = $sim_bid['hargaasas'] * ($simulasi['cajlelong']/100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
if(strpos($totalbaki, '-') !== false)
{
resources/views/simulasi/senaraimarhunlel.blade.php
+13 -8
View File
@@ -71,10 +71,11 @@
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
{{--<th>Harga Asas (RM)</th>--}}
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Caj Lelong (RM)</th>
<th>Harga Asas (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Tindakan</th>
</tr>
@@ -91,10 +92,12 @@
<td>{{ $marhun['tempoh']}}</td>
<td>{{ $marhun['berat'] }}</td>
<td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
{{--<td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>--}}
<td>{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}</td>
<td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
{{-- <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td> --}}
@php
$rugi = 0;
$baki = 0;
@@ -124,10 +127,12 @@
<td colspan="3" class="text-center"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
{{--<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>--}}
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
{{--<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>--}}
<td>{{ number_format($bakilelong, 2, '.', ',') }}</td>
<td></td>
</tr>
@@ -205,4 +210,4 @@
"pageLength": 500,
});
</script>
@endsection
@endsection
resources/views/simulasi/senaraitempsimulasi.blade.php
+4 -2
View File
@@ -60,7 +60,8 @@
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" class="check_all"></th>
<th>Kod Cawangan</th>
<th>Bil</th>
<th>Kod Cawangan</th>
<th>Cawangan</th>
<th>Bil Lelong</th>
<th>Berat (gm)</th>
@@ -76,7 +77,8 @@
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}" class="custom_name"></td>
<td>{{ $send['kodcaw'] }}</td>
<td>{{ $loop->iteration }}</td>
<td>{{ $send['kodcaw'] }}</td>
<td >{{ $send['caw_name'] }}</td>
<td>{{ $send['bil_lelong'] }} </td>
<td>{{ number_format($send['total_berat'], 2) }} </td>
resources/views/simulasi/showsimulasi.blade.php
+8 -5
View File
@@ -179,11 +179,12 @@
<th>Cawangan</th>
<th>Bil SAG</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Nilai Marhun Asal (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th>
{{--<th>Harga Asas (RM)</th>--}}
<th>Caj (RM)</th>
<th>Harga Asas (RM)</th>
<th>Baki (RM)</th>
<th>Rugi (RM)</th>
</tr>
@@ -199,8 +200,9 @@
<td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
{{--<td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>--}}
<td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
<td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
</tr>
@@ -214,8 +216,9 @@
<td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
<td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
<td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
<td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
<td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
{{--<td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>--}}
<td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
<td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
</tr>
@@ -504,4 +507,4 @@
}
</script>
@endsection
@endsection