diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 4d5af294..bb27120c 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -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
}
-
\ No newline at end of file
+
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 5dfdd098..008d6546 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -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)
{
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
index e47316af..e2cce136 100644
--- a/resources/views/simulasi/senaraimarhunlel.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -71,10 +71,11 @@
Tempoh |
Berat (gm) |
Nilai Marhun (RM) |
- Harga Asas (RM) |
+ {{--Harga Asas (RM) | --}}
Pembiayaan (RM) |
Keuntungan (RM) |
Caj Lelong (RM) |
+ Harga Asas (RM) |
Baki Lelong (RM) |
Tindakan |
@@ -91,10 +92,12 @@
{{ $marhun['tempoh']}} |
{{ $marhun['berat'] }} |
{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} |
- {{ number_format($marhun['hargaasas'], 2, '.', ',') }} |
+ {{--{{ number_format($marhun['hargaasas'], 2, '.', ',') }} | --}}
{{ number_format($marhun['pinjaman'] , 2, '.', ',') }} |
- {{ number_format($marhun['cajlelong'], 2, '.', ',') }} |
- {{ number_format($marhun['bakiupah'], 2, '.', ',') }} |
+ {{ number_format($marhun['bakiupah'], 2, '.', ',') }} |
+ {{ number_format($marhun['cajlelong'], 2, '.', ',') }} |
+ {{ number_format($marhun['hargaasas'], 2, '.', ',') }} |
+ {{-- {{ number_format($marhun['bakiupah'], 2, '.', ',') }} | --}}
@php
$rugi = 0;
$baki = 0;
@@ -124,10 +127,12 @@
JUMLAH KESELURUHAN |
{{ number_format($total_berat, 2, '.', ',') }} |
{{ number_format($total_nilaimarhun, 2, '.', ',') }} |
- {{ number_format($total_hargaasas, 2, '.', ',') }} |
+ {{--{{ number_format($total_hargaasas, 2, '.', ',') }} | --}}
{{ number_format($total_pinjaman, 2, '.', ',') }} |
- {{ number_format($total_cazlelong, 2, '.', ',') }} |
- {{ number_format($total_bakiupah, 2, '.', ',') }} |
+ {{ number_format($total_bakiupah, 2, '.', ',') }} |
+ {{ number_format($total_cazlelong, 2, '.', ',') }} |
+ {{ number_format($total_hargaasas, 2, '.', ',') }} |
+ {{--{{ number_format($total_bakiupah, 2, '.', ',') }} | --}}
{{ number_format($bakilelong, 2, '.', ',') }} |
|
@@ -205,4 +210,4 @@
"pageLength": 500,
});
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/simulasi/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php
index fbdfddc4..68a56478 100644
--- a/resources/views/simulasi/senaraitempsimulasi.blade.php
+++ b/resources/views/simulasi/senaraitempsimulasi.blade.php
@@ -60,7 +60,8 @@
|
- Kod Cawangan |
+ Bil |
+ Kod Cawangan |
Cawangan |
Bil Lelong |
Berat (gm) |
@@ -76,7 +77,8 @@
|
- {{ $send['kodcaw'] }} |
+ {{ $loop->iteration }} |
+ {{ $send['kodcaw'] }} |
{{ $send['caw_name'] }} |
{{ $send['bil_lelong'] }} |
{{ number_format($send['total_berat'], 2) }} |
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index 871f59e7..95d82c21 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -179,11 +179,12 @@
Cawangan |
Bil SAG |
Berat (gm) |
- Nilai Marhun (RM) |
+ Nilai Marhun Asal (RM) |
Pembiayaan (RM) |
Keuntungan (RM) |
- Harga Asas (RM) |
+ {{--Harga Asas (RM) | --}}
Caj (RM) |
+ Harga Asas (RM) |
Baki (RM) |
Rugi (RM) |
@@ -199,8 +200,9 @@
{{ number_format($caw['n_marhun'], 2, '.', ',') }} |
{{ number_format($caw['pinjaman'], 2, '.', ',') }} |
{{ number_format($caw['upahsimpan'], 2, '.', ',') }} |
- {{ number_format($caw['hargaasas'], 2, '.', ',') }} |
+ {{--{{ number_format($caw['hargaasas'], 2, '.', ',') }} | --}}
{{ number_format($caw['cajlelong'], 2, '.', ',') }} |
+ {{ number_format($caw['hargaasas'], 2, '.', ',') }} |
{{ number_format($caw['bakilelong'], 2, '.', ',') }} |
({{ number_format($caw['rugilelong'], 2, '.', ',') }}) |
@@ -214,8 +216,9 @@
{{ number_format($total_nilaimarhun, 2, '.', ',') }} |
{{ number_format($total_pinjaman, 2, '.', ',') }} |
{{ number_format($total_bakiupah, 2, '.', ',') }} |
+ {{ number_format($total_cazlelong, 2, '.', ',') }} |
{{ number_format($total_hargaasas, 2, '.', ',') }} |
- {{ number_format($total_cazlelong, 2, '.', ',') }} |
+ {{--{{ number_format($total_cazlelong, 2, '.', ',') }} | --}}
{{ number_format($total_bakilelong, 2, '.', ',') }} |
({{ number_format($total_rugilelong, 2, '.', ',') }}) |
@@ -504,4 +507,4 @@
}
-@endsection
\ No newline at end of file
+@endsection