Merge branch 'atie' into 'main'

update simulasi sama dengan simulasi lelong

See merge request online-sistem1/lelong!48

app/Http/Controllers/LelongController.php

@@ -55,7 +55,7 @@ class LelongController extends Controller
         $arrayinfo = [];
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('fasa','lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->groupBy('lelong_id')
         ->get()
         ->toArray();
@@ -1422,7 +1422,7 @@ class LelongController extends Controller
                 $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
                 $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
                 $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
-                
+                //dd($sumcajlelong);
                 if($totalbaki > 0)
                 {
                     $bakilelong = $bakilelong + $totalbaki;  
@@ -1495,7 +1495,7 @@ class LelongController extends Controller
                 'rugilelong'=>$rugilelong,
                 'bakilelong'=>$bakilelong,
             ]);
-
+            //dd($bakilelong);
             $total_upahkeuntungan2 = $total_upahkeuntungan2 + $total_upahkeuntungan;
             $total_marhun = $total_marhun + sizeof($databid);
             $total_berat = $total_berat + $berat;
@@ -1507,6 +1507,7 @@ class LelongController extends Controller
             $total_bakilelong = $total_bakilelong + $bakilelong;
             $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
             $totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan;
+            
 
 
             $data = Lelong::where('lelong.id','=',$lelong_id)

app/Http/Controllers/SimulasiController.php

@@ -82,7 +82,7 @@ class SimulasiController extends Controller
                         ->where('taglel','=',0)
                         ->where('lelong_tawarruq','=',1)
                         ->select('kodcaw','norujukan','t_lelong','tempoh','kadarupah','upahSim','ansuran','nilaimarhun','pinjaman','bakiupah','cajlain',
-                        'berat','marhun','percentpinj')
+                        'berat','marhun','percentpinj','bakipjm')
                         ->get();   
         }
         else if($request->fasa == '2'){
@@ -92,7 +92,7 @@ class SimulasiController extends Controller
                         ->where('tagpalsu2','=',0)
                         ->where('taglel','=',0)
                         ->select('kodcaw','norujukan','t_lelong','tempoh','kadarupah','upahSim','ansuran','nilaimarhun','pinjaman','bakiupah','cajlain',
-                        'berat','marhun','percentpinj')
+                        'berat','marhun','percentpinj','bakipjm')
                         ->get();   
           
         } 
@@ -158,7 +158,7 @@ class SimulasiController extends Controller
                         "upahsimpan" => $data->upahSim,
                         "ansuran" => $data->ansuran,
                         "nilaimarhun" => $data->nilaimarhun,
-                        "pinjaman" => $data->pinjaman,
+                        "pinjaman" => $data->bakipjm,
                         "bakiupah" => $data->bakiupah,
                         "cajlain" =>  $data->cajlain,
                         "cajlelong" => 0.00,

resources/views/lelong/senarailelong.blade.php

@@ -18,6 +18,7 @@
                             <th>No</th>
                             <th>Lelong ID</th>
                             <th>Tarikh Lelong</th>
+                            <th>Fasa</th>
                             <th>Cawangan</th>
                             <th>Masa Tamat Lelong</th>
                             <th>Harga Emas Asas</th>
@@ -37,6 +38,7 @@
                                 $t_lelong =  $myDateTime->format('d-m-Y');
                                 echo($t_lelong);
                             @endphp</td>
+                            <td>{{$lel['info']['fasa']}}</td>
                             <td align = 'left'>
                                 @foreach($lel['detailsinfo'] as $details)
                                 <span class="m-2">{{$details['caw_name']}}</span><br>

resources/views/lelong/showsimulasi.blade.php

@@ -369,7 +369,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             // "ordering": false,
             "searching":false,
             "info": false,