Merge branch 'nisha' into 'main'

update detail senarai simulasi fasa2

See merge request online-sistem1/lelong!176

app/Http/Controllers/SimulasiController.php

@@ -959,13 +959,14 @@ class SimulasiController extends Controller
                 $cawangan_all = Cawangan::all();
                 $senarai = [];
                 $total_bil_lelong = 0;
+                //dd($jbgadai);
                 foreach($cawangan_all as $cawangan){
                     $getsurat = Gadai::on($cawangan->caw_code)->where('t_gadai','<=',$jbgadai)
                         ->where('sttebus','=','')
                         ->where('tagpalsu','=',0)
                         ->where('tagpalsu2','=',0)
                         ->where('taglel','=',0)
-                        ->where('lelong_tawarruq','=',1)
+                        // ->where('lelong_tawarruq','=',1)
                         ->whereNotNull('upah12');
 
                     $cawangan_simulasi = CawanganSimulasi::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count();
@@ -1024,6 +1025,7 @@ class SimulasiController extends Controller
         $jbgadai = $t_gadai1;
         //$fasa = $request->fasa;
         // dd($details);
+
         if($fasa == '1'){
             $getsurat = Gadai::on($details)
                                 ->where('t_gadai', '<=', $jbgadai)
@@ -1074,7 +1076,7 @@ class SimulasiController extends Controller
        // $t_lelongdisplay = $tarikh_lelong->format('d-m-Y');
         //$t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
         //$t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
-
+//dd($getsurat);
 
         foreach($getsurat as $index1=>$surats)
         {
@@ -1082,7 +1084,6 @@ class SimulasiController extends Controller
             ->where('norujukan', $surats['norujukan'])
             ->get();
             // dd($surats['tempoh']);
-           
 
 
             $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('keuntungan_rebet');

resources/views/simulasi/senaraitempsimulasi.blade.php

@@ -35,8 +35,9 @@
                             }else{
                                 $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong2 );
                                 $tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y');
-                                $t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d');
+                                //$t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d');
                                 //$t_gadai = $myDateTime->modify('-12 month')->format('Y-m-d');
+                                $t_gadai1 =  $myDateTime->format('Y-m-d');
                                 echo($tarikhlelong);
                                 }
                                 @endphp</p>
@@ -83,7 +84,7 @@
                                 <a href=" {{ route('analisa.tempbycawsimulasi', [$send['kodcaw'],$t_gadai1,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
-                        @endif       
+                         @endif       
                     @endforeach
                 </tbody>
             </table>