From 548489f520ddd942babea8c40edc8170b975d1f0 Mon Sep 17 00:00:00 2001
From: root <root@bida.arrahn>
Date: Thu, 24 Nov 2022 17:44:22 +0800
Subject: [PATCH] Fix at server

---
 app/Http/Controllers/LelongController.php     |  4 ++--
 app/Http/Controllers/SimulasiController.php   |  6 +++---
 .../views/simulasi/senaraimarhunlel.blade.php | 21 ++++++++++++-------
 .../simulasi/senaraitempsimulasi.blade.php    |  6 ++++--
 .../views/simulasi/showsimulasi.blade.php     | 13 +++++++-----
 5 files changed, 30 insertions(+), 20 deletions(-)

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 @@
                                     <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
\ 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 @@
                 <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>
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 @@
                                             <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
\ No newline at end of file
+@endsection