diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index a1df40c8..9c004adc 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Http;
 use App\Models\User;
 use App\Models\Cawangan;
 use App\Models\LelongBidder;
@@ -19,9 +20,13 @@ use App\Models\Daerah;
 use App\Models\Negeri;
 use App\Models\Tetapan;
 use App\Models\Customer;
-// use App\Models\NotisBid;
-// use App\Models\Notis;
-// use App\Models\CawanganNotis;
+use App\Models\NotisBid;
+use App\Models\Notis;
+use App\Models\CawanganNotis;
+use App\Models\TransaksiKeuntungan;
+use App\Models\LelongTebus;
+use App\Models\LogUser;
+use Illuminate\Support\Facades\Log;
 
 
 use Carbon\Carbon;
@@ -646,515 +651,994 @@ class NotisController extends Controller
      
     }
 
-//     public function jananotisperingatan()
-//     {
-//         $currentDate = Carbon::now();
-//         $currentDate = $currentDate->toDateString();
-//         $caw = Cawangan::all();
-//         $tetapan = Tetapan::where('id','=',1)->first();
-//         return view('notisperingatan.jananotisperingatan',compact('caw','tetapan', 'currentDate'));
-//     }
+    public function jananotisperingatan()
+    {
+        $currentDate = Carbon::now();
+        $currentDate = $currentDate->toDateString();
+        $caw = Cawangan::all();
+        $tetapan = Tetapan::where('id','=',1)->first();
+        return view('notisperingatan.jananotisperingatan',compact('caw','tetapan', 'currentDate'));
+    }
 
-//     public function senaraitempnotisperingatan(Request $request)
-//     {
-//         $fasa = $request->fasa;
-//         $jbg = $request->jbg;
-//         $jbg2 = $request->jbg2;
+    public function senaraitempnotisperingatan(Request $request)
+    {
+        $fasa = $request->fasa;
+        $jbg = $request->jbg;
+        $jbg2 = $request->jbg2;
            
-//             if($request->fasa == '1'){
-//                 $cawangan_all = Cawangan::orderBy('caw_name')->get();
-//                 // dd($cawangan_all);
-//                 $senarai = [];
-//                 $total_bil_lelong = 0;
-//                 foreach($cawangan_all as $cawangan){
-//                     $getsurat1 = NotisBid::where('kodcaw', $cawangan->caw_code)->get();
-//                     $sag_pluck_norujukan = $getsurat1->pluck('norujukan');
-//                     // dd($sag_pluck_norujukan);
-//                     $getsurat = Gadai::on($cawangan->caw_code)
-//                         ->whereNotIn('norujukan', $sag_pluck_norujukan)
-//                         ->where('tempoh', '>=', $jbg)
-//                         ->where('tempoh', '<=', $jbg2)
-//                         ->where('sttebus','=','')
-//                         ->where('tagpalsu','=',0)
-//                         ->where('tagpalsu2','=',0)
-//                         ->where('taglel','=',0)
-//                         ->where('lelong_tawarruq','=',1)
-//                         ->whereNotNull('upah12');
+            if($request->fasa == '1'){
+                $cawangan_all = Cawangan::orderBy('caw_name')->get();
+                // dd($cawangan_all);
+                $senarai = [];
+                $total_bil_lelong = 0;
+                foreach($cawangan_all as $cawangan){
+                    $getsurat1 = NotisBid::where('kodcaw', $cawangan->caw_code)->get();
+                    $sag_pluck_norujukan = $getsurat1->pluck('norujukan');
+                    // dd($sag_pluck_norujukan);
+                    $getsurat = Gadai::on($cawangan->caw_code)
+                        ->whereNotIn('norujukan', $sag_pluck_norujukan)
+                        ->where('tempoh', '>=', $jbg)
+                        ->where('tempoh', '<=', $jbg2)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        ->where('lelong_tawarruq','=',1)
+                        ->whereNotNull('upah12');
 
-//                         $bil_lelong = $getsurat->count('norujukan');
-//                         $total_bil_lelong += $bil_lelong;
-//                         $total_berat = $getsurat->sum('berat');
-//                         $total_nilaimarhun = $getsurat->sum('nilaimarhun');
-//                         $total_pembiayaan = $getsurat->sum('pinjaman');
-//                         // $total_bakipjm = $getsurat->sum('bakipjm');
-//                         $data = [
-//                             'bil_lelong'=>$bil_lelong,
-//                             'total_berat'=>$total_berat,
-//                             'total_nilaimarhun'=>$total_nilaimarhun,
-//                             'total_pembiayaan'=>$total_pembiayaan,
-//                             // 'total_bakipjm'=>$total_bakipjm,
-//                             'kodcaw'=>$cawangan->caw_code,
-//                             'caw_name'=>$cawangan->caw_name];
-//                         array_push($senarai,$data);
-//                         // dump($data);
-//                 }
-//             }
+                        $bil_lelong = $getsurat->count('norujukan');
+                        $total_bil_lelong += $bil_lelong;
+                        $total_berat = $getsurat->sum('berat');
+                        $total_nilaimarhun = $getsurat->sum('nilaimarhun');
+                        $total_pembiayaan = $getsurat->sum('pinjaman');
+                        // $total_bakipjm = $getsurat->sum('bakipjm');
+                        $data = [
+                            'bil_lelong'=>$bil_lelong,
+                            'total_berat'=>$total_berat,
+                            'total_nilaimarhun'=>$total_nilaimarhun,
+                            'total_pembiayaan'=>$total_pembiayaan,
+                            // 'total_bakipjm'=>$total_bakipjm,
+                            'kodcaw'=>$cawangan->caw_code,
+                            'caw_name'=>$cawangan->caw_name];
+                        array_push($senarai,$data);
+                        // dump($data);
+                }
+            }
 
-//             else if($request->fasa == '2'){
-//                 $cawangan_all = Cawangan::all();
-//                 $senarai = [];
-//                 $total_bil_lelong = 0;
-//                 //dd($jbgadai);
-//                 foreach($cawangan_all as $cawangan){
-//                     $getsurat1 = NotisBid::where('kodcaw', $cawangan->caw_code)->get();
-//                     $sag_pluck_norujukan = $getsurat1->pluck('norujukan');
-//                     // dd($sag_pluck_norujukan);
-//                     $getsurat = Gadai::on($cawangan->caw_code)
-//                         ->whereNotIn('norujukan', $sag_pluck_norujukan)
-//                         ->where('tempoh', '>=', $jbg)
-//                         // ->where('tempoh', '<=', $jbg2)
-//                         ->where('sttebus','=','')
-//                         ->where('tagpalsu','=',0)
-//                         ->where('tagpalsu2','=',0)
-//                         ->where('taglel','=',0)
-//                         // ->where('lelong_tawarruq','=',1)
-//                         ->whereNotNull('upah12');
+            else if($request->fasa == '2'){
+                $cawangan_all = Cawangan::all();
+                $senarai = [];
+                $total_bil_lelong = 0;
+                //dd($jbgadai);
+                foreach($cawangan_all as $cawangan){
+                    $getsurat1 = NotisBid::where('kodcaw', $cawangan->caw_code)->get();
+                    $sag_pluck_norujukan = $getsurat1->pluck('norujukan');
+                    // dd($sag_pluck_norujukan);
+                    $getsurat = Gadai::on($cawangan->caw_code)
+                        ->whereNotIn('norujukan', $sag_pluck_norujukan)
+                        ->where('tempoh', '>=', $jbg)
+                        // ->where('tempoh', '<=', $jbg2)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        // ->where('lelong_tawarruq','=',1)
+                        ->whereNotNull('upah12');
 
-//                     // $cawangan_simulasi = CawanganLelong::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count();
-//                     // if($cawangan_simulasi == 0){
-//                         $bil_lelong = $getsurat->count('norujukan');
-//                         $total_bil_lelong += $bil_lelong;
-//                         $total_berat = $getsurat->sum('berat');
-//                         $total_nilaimarhun = $getsurat->sum('nilaimarhun');
-//                         $total_pembiayaan = $getsurat->sum('pinjaman');
-//                         $total_bakipjm = $getsurat->sum('bakipjm');
-//                         $data = [
-//                             'bil_lelong'=>$bil_lelong,
-//                             'total_berat'=>$total_berat,
-//                             'total_nilaimarhun'=>$total_nilaimarhun,
-//                             'total_pembiayaan'=>$total_pembiayaan,
-//                             'total_bakipjm'=>$total_bakipjm,
-//                             'kodcaw'=>$cawangan->caw_code,
-//                             'caw_name'=>$cawangan->caw_name];
-//                         array_push($senarai,$data);
-//                         // dd($data);
-//                     // }
-//                 }
-//             }
-//             // dd($data);
+                    // $cawangan_simulasi = CawanganLelong::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count();
+                    // if($cawangan_simulasi == 0){
+                        $bil_lelong = $getsurat->count('norujukan');
+                        $total_bil_lelong += $bil_lelong;
+                        $total_berat = $getsurat->sum('berat');
+                        $total_nilaimarhun = $getsurat->sum('nilaimarhun');
+                        $total_pembiayaan = $getsurat->sum('pinjaman');
+                        $total_bakipjm = $getsurat->sum('bakipjm');
+                        $data = [
+                            'bil_lelong'=>$bil_lelong,
+                            'total_berat'=>$total_berat,
+                            'total_nilaimarhun'=>$total_nilaimarhun,
+                            'total_pembiayaan'=>$total_pembiayaan,
+                            'total_bakipjm'=>$total_bakipjm,
+                            'kodcaw'=>$cawangan->caw_code,
+                            'caw_name'=>$cawangan->caw_name];
+                        array_push($senarai,$data);
+                        // dd($data);
+                    // }
+                }
+            }
+            // dd($data);
 
-//             if($total_bil_lelong == 0)
-//             {
-//             return redirect()->route('notisperingatan.jananotisperingatan')
-//                     ->with('failed','Tiada surat untuk di dijana');
-//             }
+            if($total_bil_lelong == 0)
+            {
+            return redirect()->route('notisperingatan.jananotisperingatan')
+                    ->with('failed','Tiada surat untuk di dijana');
+            }
 
            
-//             return view('notisperingatan.senaraitempnotisperingatan', compact( 
-//                                                         'getsurat',
-//                                                         'senarai',
-//                                                         'fasa',
-//                                                         'jbg',
-//                                                         'jbg2'
+            return view('notisperingatan.senaraitempnotisperingatan', compact( 
+                                                        'getsurat',
+                                                        'senarai',
+                                                        'fasa',
+                                                        'jbg',
+                                                        'jbg2'
 
-//                                                     ));
-//     }
+                                                    ));
+    }
 
-//     public function tempbycawnotisperingatan(Request $request)
-//     {
-//         $fasa = $request->fasa;
-//         $jbg = $request->jbg;
-//         $jbg2 = $request->jbg2;
-//         $details = $request->kodcaw;
-//         // dd($jbg);
-//         if($fasa == '1'){
-//             $getsurat = Gadai::on($details)
-//                                 ->where('tempoh', '>=', $jbg)
-//                                 ->where('tempoh', '<=', $jbg2)
-//                                 ->where('kodcaw', $details)
-//                                 ->where('sttebus', '=', '')
-//                                 ->where('lelong_tawarruq','=',1)
-//                                 ->where('taglel', '=', 0)
-//                                 ->where('tagpalsu', '=', 0)
-//                                 ->where('tagpalsu2', '=', 0)
-//                                 ->whereNotNull('upah12')
-//                                 ->get();
+    public function tempbycawnotisperingatan(Request $request)
+    {
+        $fasa = $request->fasa;
+        $jbg = $request->jbg;
+        $jbg2 = $request->jbg2;
+        $details = $request->kodcaw;
+        // dd($jbg);
+        if($fasa == '1'){
+            $getsurat = Gadai::on($details)
+                                ->where('tempoh', '>=', $jbg)
+                                ->where('tempoh', '<=', $jbg2)
+                                ->where('kodcaw', $details)
+                                ->where('sttebus', '=', '')
+                                ->where('lelong_tawarruq','=',1)
+                                ->where('taglel', '=', 0)
+                                ->where('tagpalsu', '=', 0)
+                                ->where('tagpalsu2', '=', 0)
+                                ->whereNotNull('upah12')
+                                ->get();
+                                // dd($getsurat);
+            $gadai_data_pluck_norujukan =  $getsurat->pluck('norujukan')->toArray();
+            // dd($gadai_data_pluck_norujukan);
+            $t_gadais = Gadai::on($details)
+                                ->where('tempoh', '>=', $jbg)
+                                ->where('tempoh', '<=', $jbg2)
+                                ->where('sttebus', '=', '')
+                                ->where('taglel', '=', 0)
+                                ->where('tagpalsu', '=', 0)
+                                ->where('tagpalsu2', '=', 0)
+                                ->whereNotNull('upah12')
+                                ->orderBy('t_gadai')
+                                ->select('t_gadai')
+                                ->first();
+        }else{
+            $getsurat = Gadai::on($details)
+                            ->where('tempoh', '>=', $jbg)
+                            // ->where('tempoh', '<=', $jbg2)
+                            ->where('kodcaw', $details)
+                            ->where('sttebus', '=', '')
+                            ->where('taglel', '=', 0)
+                            ->where('tagpalsu', '=', 0)
+                            ->where('tagpalsu2', '=', 0)
+                            ->whereNotNull('upah12')
+                            ->get();
+           
+            $gadai_data_pluck_norujukan =  $getsurat->pluck('norujukan')->toArray();
 
-//             $t_gadais = Gadai::on($details)
-//                                 ->where('tempoh', '>=', $jbg)
-//                                 ->where('tempoh', '<=', $jbg2)
-//                                 ->where('sttebus', '=', '')
-//                                 ->where('taglel', '=', 0)
-//                                 ->where('tagpalsu', '=', 0)
-//                                 ->where('tagpalsu2', '=', 0)
-//                                 ->whereNotNull('upah12')
-//                                 ->orderBy('t_gadai')
-//                                 ->select('t_gadai')
-//                                 ->first();
-//         }else{
-//             $getsurat = Gadai::on($details)
-//                             ->where('tempoh', '>=', $jbg)
-//                             // ->where('tempoh', '<=', $jbg2)
-//                             ->where('kodcaw', $details)
-//                             ->where('sttebus', '=', '')
-//                             ->where('taglel', '=', 0)
-//                             ->where('tagpalsu', '=', 0)
-//                             ->where('tagpalsu2', '=', 0)
-//                             ->whereNotNull('upah12')
-//                             ->get();
+            $t_gadais = Gadai::on($details)
+                            ->where('tempoh', '>=', $jbg)
+                            // ->where('tempoh', '<=', $jbg2)
+                            ->where('sttebus', '=', '')
+                            ->where('taglel', '=', 0)
+                            ->where('tagpalsu', '=', 0)
+                            ->where('tagpalsu2', '=', 0)
+                            ->whereNotNull('upah12')
+                            ->orderBy('t_gadai')
+                            ->select('t_gadai')
+                            ->first();
+        }
+        $gadai_all_keyBy_norujukan = $getsurat->keyBy('norujukan');
+        // $gadai_all = Gadai::on($details)->whereIn('norujukan', $gadai_data_pluck_norujukan)
+        // ->select('kadarupah','nokp','tempoh','tempohbayar','norujukan','berat','nilaimarhun','pinjaman','bakipjm','bakiupah','hargajualan','bakihargajualan')
+        // ->orderBy('norujukan','ASC')
+        // ->get();
+        // dd($gadai_all);
 
-//             $t_gadais = Gadai::on($details)
-//                             ->where('tempoh', '>=', $jbg)
-//                             // ->where('tempoh', '<=', $jbg2)
-//                             ->where('sttebus', '=', '')
-//                             ->where('taglel', '=', 0)
-//                             ->where('tagpalsu', '=', 0)
-//                             ->where('tagpalsu2', '=', 0)
-//                             ->whereNotNull('upah12')
-//                             ->orderBy('t_gadai')
-//                             ->select('t_gadai')
-//                             ->first();
-//         }
+        $transaksi_all = TransaksiKeuntungan::on('main')->whereIn('norujukan', $gadai_data_pluck_norujukan)
+        ->select('keuntungan_rebet','bayaran_keuntungan','norujukan')
+        ->get();
+        $transaksi_all_groupby_norujukan = $transaksi_all->groupBy('norujukan');
 
-//        // $tarikh_lelong = Carbon::parse($t_lelong);
-//         // $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
-//        // $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($transaksi_all_groupby_norujukan as $index7=>$transaksi){
+            if($gadai_all_keyBy_norujukan[$index7]){
+                $gadai_true = $gadai_all_keyBy_norujukan[$index7];
+                $gadai_true['data_transaksi'] = $transaksi;
+            }
+        }
+        
+        
+        foreach($getsurat as $index1=>$surats)
+        {
+        //    dd($surats['data_transaksi']);
+            if(isset($surats['data_transaksi'])){
+                $data_transaksi = $transaksi_all_groupby_norujukan[$surats->norujukan];
+                $total_untung_rebet = $data_transaksi->sum('keuntungan_rebet');
+                $total_untung_asal = $data_transaksi->sum('bayaran_keuntungan');
+                $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                // dd($beza_keuntungan);
+                // dd(true);
+                $jbg = $surats->tempoh - $surats->tempohbayar;
+                $jbg2 = 12 - $surats->tempohbayar;
+                if($surats->tempoh <= '12.00'){
+                    $keuntungan = bcdiv(($jbg)*$surats->kadarupah/100*$surats->bakipjm,1,1)-$beza_keuntungan;
+                }else{
+                    $keuntungan = bcdiv(($jbg2)*$surats->kadarupah/100*$surats->bakipjm,1,1)-$beza_keuntungan;
+                }
+            }
+            else{
+            //    dd(false);
+                $jbg = $surats->tempoh - $surats->tempohbayar;
+                $jbg2 = 12 - $surats->tempohbayar;
+                $beza_keuntungan = 0.00;
+                // dd($beza_keuntungan);
+                if($surats->tempoh <= '12.00'){
+                    // dd($jbg,$datagadai->kadarupah, $datagadai->bakipjm);
+                    $keuntungan = bcdiv(($jbg)*$surats->kadarupah/100*$surats->bakipjm,1,1)-$beza_keuntungan;
+                }else{
+                    // dd(false);
+                    $keuntungan = bcdiv(($jbg2)*$surats->kadarupah/100*$surats->bakipjm,1,1)-$beza_keuntungan;
+                }
+            }
+            // dd($keuntungan);
+            $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];
+            // dd($ktlhbyr);
+            // $getsurat[$index1]['list_norujukan'] = $senarai;
+            $getsurat[$index1]['keuntungan'] = $keuntungan;
+            $getsurat[$index1]['ktlhbyr'] = $ktlhbyr;
+        }
 
-//         foreach($getsurat as $index1=>$surats)
-//         {
-//             $senarai = Gadai::on($details)
-//             ->where('norujukan', $surats['norujukan'])
-//             ->get();
-//             // dd($surats['tempoh']);
+        // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
+        //                                         ->sum('bayaran_keuntungan');
 
-//             $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('keuntungan_rebet');
-//             $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('bayaran_keuntungan');
-//             $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
-            
-//             // dd($beza_keuntungan);
-//             // $keuntungan = bcdiv(($surats['tempoh']-$surats['tempohbayar'])*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan;
-//             $jbg = $surats['tempoh']-$surats['tempohbayar'];
-//             $jbg2 = 12- $surats['tempohbayar'];
-//             if($surats['tempoh'] <= '12.00'){
-//                 $keuntungan = bcdiv(($jbg)*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan;
-//             }else{
-//                 $keuntungan = bcdiv(($jbg2)*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan;
-//             }
-//             // dd($surats['hargajualan']);
-//             $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];
-//             // dd($ktlhbyr);
-//             $getsurat[$index1]['list_norujukan'] = $senarai;
-//             $getsurat[$index1]['keuntungan'] = $keuntungan;
-//             $getsurat[$index1]['ktlhbyr'] = $ktlhbyr;
-//         }
+        return view('notisperingatan.tempbycawnotisperingatan', compact( 'getsurat',
+                                           'details',
+                                            'keuntungan',
+                                           't_gadais',
+                                           'ktlhbyr'
 
-//         // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
-//         //                                         ->sum('bayaran_keuntungan');
+                                           ));
+    }
 
-//         return view('notisperingatan.tempbycawnotisperingatan', compact( 'getsurat',
-//                                            'details',
-//                                            'senarai',
-//                                             'keuntungan',
-//                                            't_gadais',
-//                                            'ktlhbyr'
+    public function janadatanotisperingatan(Request $request)
+    {
+        $fasa = $request->fasa;
+        $jbg = $request->jbg;
+        $jbg2 = $request->jbg2;
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_notis = $current->toDateString();
+        $selected_caw = $request->caw;
+        if(!empty($selected_caw))
+        {
+            $caws = Cawangan::whereIn('caw_code',$selected_caw)->get();
+            $bil_surat = 0;
+            $sag_cawangans = [];
+            foreach($caws as $caw){
+                if($fasa == '1'){
+                    $surat = Gadai::on($caw->caw_code)
+                        ->where('tempoh', '>=', $jbg)
+                        ->where('tempoh', '<=', $jbg2)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        ->where('lelong_tawarruq','=',1);
+                        // ->count('norujukan');
 
-//                                            ));
-//     }
+                }
+                else if($fasa == '2'){
+                    $surat = Gadai::on($caw->caw_code)
+                        ->where('tempoh', '>=', $jbg)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0);
+                        // ->count('norujukan');
+                }
+                $bil_sag_cawangan = $surat->count('norujukan');
+                array_push($sag_cawangans,['cawangan'=>$caw,'data'=>$surat->get()]);
+                $bil_surat += $bil_sag_cawangan;
+            }
 
-//     public function janadatanotisperingatan(Request $request)
-//     {
-//         $fasa = $request->fasa;
-//         $jbg = $request->jbg;
-//         $jbg2 = $request->jbg2;
-//         $current = Carbon::now();
-//         $current = new Carbon();
-//         $tarikh_notis = $current->toDateString();
-//         $selected_caw = $request->caw;
-//         if(!empty($selected_caw))
-//         {
-//             $caws = Cawangan::whereIn('caw_code',$selected_caw)->get();
-//             $bil_surat = 0;
-//             $sag_cawangans = [];
-//             foreach($caws as $caw){
-//                 if($fasa == '1'){
-//                     $surat = Gadai::on($caw->caw_code)
-//                         ->where('tempoh', '>=', $jbg)
-//                         ->where('tempoh', '<=', $jbg2)
-//                         ->where('sttebus','=','')
-//                         ->where('tagpalsu','=',0)
-//                         ->where('tagpalsu2','=',0)
-//                         ->where('taglel','=',0)
-//                         ->where('lelong_tawarruq','=',1);
-//                         // ->count('norujukan');
+            if($bil_surat == 0)
+            {
+                return redirect()->route('notisperingatan.jananotisperingatan')
+                            ->with('failed','Tiada surat untuk di jana');
+            }
 
-//                 }
-//                 else if($fasa == '2'){
-//                     $surat = Gadai::on($caw->caw_code)
-//                         ->where('tempoh', '>=', $jbg)
-//                         ->where('sttebus','=','')
-//                         ->where('tagpalsu','=',0)
-//                         ->where('tagpalsu2','=',0)
-//                         ->where('taglel','=',0);
-//                         // ->count('norujukan');
-//                 }
-//                 $bil_sag_cawangan = $surat->count('norujukan');
-//                 array_push($sag_cawangans,['cawangan'=>$caw,'data'=>$surat->get()]);
-//                 $bil_surat += $bil_sag_cawangan;
-//             }
+            //create notis
+            $notis = Notis::create([
+                'tarikh_notis' => $tarikh_notis,
+                'daritempoh' => $jbg,
+                'hinggatempoh' => $jbg2,
+                'sts_notis' => 1,
+                'fasa' => $fasa
+            ]);
 
-//             if($bil_surat == 0)
-//             {
-//                 return redirect()->route('notisperingatan.jananotisperingatan')
-//                             ->with('failed','Tiada surat untuk di jana');
-//             }
+            foreach($sag_cawangans as $index=>$cawnotis){
 
-//             //create notis
-//             $notis = Notis::create([
-//                 'tarikh_notis' => $tarikh_notis,
-//                 'daritempoh' => $jbg,
-//                 'hinggatempoh' => $jbg2,
-//                 'sts_notis' => 1,
-//                 'fasa' => $fasa
-//             ]);
+                $caw_notis = new CawanganNotis;
+                $caw_notis->notis_id = $notis->id;
+                $caw_notis->caw_id = $cawnotis['cawangan']->id;
+                $caw_notis->fasa = $request->fasa;
+                $caw_notis->daritempoh = $request->jbg;
+                $caw_notis->hinggatempoh = $request->jbg2;
+                $caw_notis->status = 1;
+                $caw_notis->save();
 
-//             foreach($sag_cawangans as $index=>$cawnotis){
+                $suratcaw = $cawnotis['data'];
 
-//                 $caw_notis = new CawanganNotis;
-//                 $caw_notis->notis_id = $notis->id;
-//                 $caw_notis->caw_id = $cawnotis['cawangan']->id;
-//                 $caw_notis->fasa = $request->fasa;
-//                 $caw_notis->daritempoh = $request->jbg;
-//                 $caw_notis->hinggatempoh = $request->jbg2;
-//                 $caw_notis->status = 1;
-//                 $caw_notis->save();
+                $notis_bid_arr = [];
+                $now = Carbon::now();
+                foreach($suratcaw as $surat)
+                {
+                    $notis_to_be_inserted = new NotisBid();
+                    $notis_to_be_inserted->notis_id = $notis->id;
+                    $notis_to_be_inserted->tarikh_notis = $tarikh_notis;
+                    $notis_to_be_inserted->caw_id = $cawnotis['cawangan']->id;
+                    $notis_to_be_inserted->kodcaw = $surat->kodcaw;
+                    $notis_to_be_inserted->norujukan = $surat->norujukan;
+                    $notis_to_be_inserted->nokp = $surat->nokp;
+                    $notis_to_be_inserted->jbg = $surat->tempoh;
+                    $notis_to_be_inserted->kadarupah = $surat->kadarupah;
+                    $notis_to_be_inserted->nilaimarhun = $surat->nilaimarhun;
+                    $notis_to_be_inserted->pinjaman = $surat->bakipjm;
+                    $notis_to_be_inserted->bakiupah = $surat->bakiupah;
+                    $notis_to_be_inserted->berat = $surat->berat;
+                    $notis_to_be_inserted->marhun = $surat->marhun;
+                    $notis_to_be_inserted->percent = $surat->percentpinj;
+                    $notis_to_be_inserted->fasa = $request->fasa;
+                    $notis_bid_arr[] = $notis_to_be_inserted->attributesToArray();
+                }
 
-//                 $suratcaw = $cawnotis['data'];
+                $notis_bid_collection = collect($notis_bid_arr);
 
-//                 $notis_bid_arr = [];
-//                 $now = Carbon::now();
-//                 foreach($suratcaw as $surat)
-//                 {
-//                     $notis_to_be_inserted = new NotisBid();
-//                     $notis_to_be_inserted->notis_id = $notis->id;
-//                     $notis_to_be_inserted->caw_id = $cawnotis['cawangan']->id;
-//                     $notis_to_be_inserted->kodcaw = $surat->kodcaw;
-//                     $notis_to_be_inserted->norujukan = $surat->norujukan;
-//                     $notis_to_be_inserted->nokp = $surat->nokp;
-//                     $notis_to_be_inserted->jbg = $surat->tempoh;
-//                     $notis_to_be_inserted->kadarupah = $surat->kadarupah;
-//                     $notis_to_be_inserted->nilaimarhun = $surat->nilaimarhun;
-//                     $notis_to_be_inserted->pinjaman = $surat->bakipjm;
-//                     $notis_to_be_inserted->bakiupah = $surat->bakiupah;
-//                     $notis_to_be_inserted->berat = $surat->berat;
-//                     $notis_to_be_inserted->marhun = $surat->marhun;
-//                     $notis_to_be_inserted->percent = $surat->percentpinj;
-//                     $notis_to_be_inserted->fasa = $request->fasa;
-//                     $notis_bid_arr[] = $notis_to_be_inserted->attributesToArray();
-//                 }
-
-//                 $notis_bid_collection = collect($notis_bid_arr);
-
-//                 NotisBid::insert($notis_bid_arr);
+                NotisBid::insert($notis_bid_arr);
           
-//             }
+            }
 
-//         }
-//         else
-//         {
-//             return redirect()->route('notisperingatan.jananotisperingatan')->with('failed','Tiada surat untuk di jana');
-//         }
+        }
+        else
+        {
+            return redirect()->route('notisperingatan.jananotisperingatan')->with('failed','Tiada surat untuk di jana');
+        }
 
-//         return redirect()->route('notisperingatan.shownotisperingatan',$notis->id);
-//         // return redirect()->route('analisa.senaraisimulasi')->with('success',"Success daftar simulasi!");
+        return redirect()->route('notisperingatan.shownotisperingatan',$notis->id);
+        // return redirect()->route('analisa.senaraisimulasi')->with('success',"Success daftar simulasi!");
 
-//     }
+    }
 
-//     public function shownotisperingatan($id)
-//     {
-//         $notis_id = $id;
-//         $notis = Notis::with(['cawangan', 'notisBid'])->find($id);
-//         $data = $notis;
+    public function shownotisperingatan($id)
+    {
+        $notis_id = $id;
+        $notis = Notis::with(['cawangan', 'notisBid'])->find($id);
+        $data = $notis;
 
-//         $cawanganAll = $notis->cawangan;
-//         $notisBidGroupByCawId = $notis->notisBid->groupBy('caw_id');
+        $cawanganAll = $notis->cawangan;
+        $notisBidGroupByCawId = $notis->notisBid->groupBy('caw_id');
 
-//         foreach($cawanganAll as $caw_key_by_id)
-//         {
-//             if($notisBidGroupByCawId[$caw_key_by_id['id']]);
-//             {
-//                 $caw_key_by_id['notisBid'] = $notisBidGroupByCawId[$caw_key_by_id['id']];
-//             }
-//         }
+        foreach($cawanganAll as $caw_key_by_id)
+        {
+            if($notisBidGroupByCawId[$caw_key_by_id['id']]);
+            {
+                $caw_key_by_id['notisBid'] = $notisBidGroupByCawId[$caw_key_by_id['id']];
+            }
+        }
 
-//         $total_marhun = 0;
-//         $total_nilaimarhun = 0;
-//         $total_pinjaman = 0;
-//         $total_bakiupah = 0;
-//         $total_berat = 0;
-//         $arraycaw = [];
+        $total_marhun = 0;
+        $total_nilaimarhun = 0;
+        $total_pinjaman = 0;
+        $total_bakiupah = 0;
+        $total_berat = 0;
+        $arraycaw = [];
 
-//         foreach ($cawanganAll as $caw) {
-//             $berat = 0;
-//             $nilai_marhun = 0;
-//             $pinjaman = 0;
-//             $bakiupah = 0;
-//             foreach ($caw['notisBid'] as $notis_bid) {
-//                 $total_marhun += 1;
-//                 $nilai_marhun += $notis_bid->nilaimarhun;
-//                 $pinjaman += $notis_bid->pinjaman;
-//                 $bakiupah += $notis_bid->bakiupah;
-//                 $berat += $notis_bid->berat;
+        foreach ($cawanganAll as $caw) {
+            $berat = 0;
+            $nilai_marhun = 0;
+            $pinjaman = 0;
+            $bakiupah = 0;
+            foreach ($caw['notisBid'] as $notis_bid) {
+                $total_marhun += 1;
+                $nilai_marhun += $notis_bid->nilaimarhun;
+                $pinjaman += $notis_bid->pinjaman;
+                $bakiupah += $notis_bid->bakiupah;
+                $berat += $notis_bid->berat;
 
-//             }
+            }
 
-//             array_push($arraycaw, [
-//                 'id_cawangan' => $caw['id'],
-//                 'cawangan' => $caw->caw_name,
-//                 'bil_marhun' => count($caw['notisBid']),
-//                 'berat' => $berat,
-//                 'n_marhun' => $nilai_marhun,
-//                 'pinjaman' => $pinjaman,
-//                 'upahsimpan' => $bakiupah,
-//                 'bakiupah' => $bakiupah,
-//             ]);
+            array_push($arraycaw, [
+                'id_cawangan' => $caw['id'],
+                'cawangan' => $caw->caw_name,
+                'bil_marhun' => count($caw['notisBid']),
+                'berat' => $berat,
+                'n_marhun' => $nilai_marhun,
+                'pinjaman' => $pinjaman,
+                'upahsimpan' => $bakiupah,
+                'bakiupah' => $bakiupah,
+            ]);
 
-//             $total_nilaimarhun += $nilai_marhun;
-//             $total_pinjaman += $pinjaman;
-//             $total_bakiupah += $bakiupah;
-//             $total_berat += $berat;
-//         }
+            $total_nilaimarhun += $nilai_marhun;
+            $total_pinjaman += $pinjaman;
+            $total_bakiupah += $bakiupah;
+            $total_berat += $berat;
+        }
 
-//         return view('notisperingatan.shownotisperingatan', compact(
-//             'data',
-//             'arraycaw',
-//             'total_marhun',
-//             'total_berat',
-//             'total_pinjaman',
-//             'notis_id',
-//             'total_bakiupah',
-//             'total_nilaimarhun',
-//             'notis'
-//         ));
-//     }
+        return view('notisperingatan.shownotisperingatan', compact(
+            'data',
+            'arraycaw',
+            'total_marhun',
+            'total_berat',
+            'total_pinjaman',
+            'notis_id',
+            'total_bakiupah',
+            'total_nilaimarhun',
+            'notis'
+        ));
+    }
 
-//     public function senarainotisall()
-//     {
+    public function senarainotisall()
+    {
 
-//         $arrayinfo = [];
+        $arrayinfo = [];
 
-//         $notis = Notis::select('tarikh_notis')
-//         ->groupBy('tarikh_notis')
-//         ->get();
-//         // ->toArray();
-//         // dd($notis);
+        $notis = Notis::select('tarikh_notis','id')
+        ->groupBy('tarikh_notis')
+        ->get();
+        // ->toArray();
+        // dd($notis);
 
-//         foreach($notis as $info)
-//         {
-//             $detailsinfo = CawanganNotis::join('cawangan','cawangan_notis.caw_id','=','cawangan.id')
-//             // ->where('kali',$info->kali)
-//             ->get()
-//             ->toArray();
-//             // dd($detailsinfo);
+        foreach($notis as $info)
+        {
+            $detailsinfo = CawanganNotis::join('cawangan','cawangan_notis.caw_id','=','cawangan.id')
+            // ->where('kali',$info->kali)
+            ->get()
+            ->toArray();
+            // dd($detailsinfo);
 
-//             array_push($arrayinfo, ['info'=> $info, 'detailsinfo'=>$detailsinfo]);
+            array_push($arrayinfo, ['info'=> $info, 'detailsinfo'=>$detailsinfo]);
 
-//         }
+        }
 
-//         return view('notisperingatan.senarainotisall',compact('notis','arrayinfo'));
-//     }
+        return view('notisperingatan.senarainotisall',compact('notis','arrayinfo'));
+    }
 
-//     public function shownotisperingatanall(Request $request, $tarikhnotis)
-//     {
-//         $tarikhnotis = $tarikhnotis;
-//         $notis = Notis::where('tarikh_notis','=',$tarikhnotis)->first();
+    public function shownotisperingatanall(Request $request)
+    {
+        $arraydata = [];
+        $arraycaw = [];
+        $data = [];
 
-//         $cawangannotis = CawanganNotis::where('created_at','like', '%'.$tarikhnotis.'%')->get();
-//         // dd($cawangannotis);
+        $total_marhun = 0;
+        $total_berat = 0;
+        $total_nmarhun = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
 
-//         $arraydata = [];
-//         $arraycaw = [];
-//         $data = [];
+        $tarikhnotis = $request->tarikhnotis;
+        $notisid = $request->notisid;
+        $notis = Notis::with(['cawangan', 'notisBid','cawanganNotis'])->where('tarikh_notis',$tarikhnotis)->get();
+       
+        foreach ($notis as $not) {
+            // dd($not);
+            $cawanganAll = $not->cawangan;
+            // dd($not->cawanganNotis);
+            $notBidGroupByCawId = $not->notisBid->groupBy('caw_id');
+            $notBidGroupByCawnotis = $not->cawanganNotis->groupBy('caw_id');
 
-//         $total_marhun = 0;
-//         $total_berat = 0;
-//         $total_nmarhun = 0;
-//         $total_pinjaman = 0;
-//         $total_upah = 0;
-//         $total_bakiupah = 0;
-//         $total_nilaimarhun = 0;
+            foreach ($cawanganAll as $caw_key_by_id) {
+                // dd($caw_key_by_id);
+                if ($notBidGroupByCawId[$caw_key_by_id['id']]); {
+                    $caw_key_by_id['notisBid'] = $notBidGroupByCawId[$caw_key_by_id['id']];
+                    $caw_key_by_id['status'] = $notBidGroupByCawnotis[$caw_key_by_id['id']];
+                }
+            }
 
-//         foreach($cawangannotis as $cawlel)
-//         {
-//             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
-//             // $databid = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
+            foreach($cawanganAll as $cawnot)
+            {
+                $berat = 0;
+                $nilai_marhun = 0;
+                $pinjaman = 0;
+                $bakiupah = 0;
+                foreach ($cawnot['notisBid'] as $not_bid) {
+                    $berat += $not_bid->berat;
+                    $nilai_marhun += $not_bid->nilaimarhun;
+                    $pinjaman += $not_bid->pinjaman;
+                    $bakiupah += $not_bid->bakiupah;
+                    
+                    $total_marhun += 1;
+                    $total_berat = $total_berat + $berat;
+                    $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+                    $total_pinjaman = $total_pinjaman + $pinjaman;
+                    $total_bakiupah = $total_bakiupah + $bakiupah;
+                }
 
-//             $databid = NotisBid::   join('cawangan_notis', function ($join) {
-//                 $join->on('cawangan_notis.caw_id', '=', 'notisbid.caw_id')
-//                      ->on('cawangan_notis.notis_id', '=', 'notisbid.notis_id');
-//             })
-//             ->select('notisbid.id','notisbid.berat','notisbid.marhun','notisbid.nilaimarhun','notisbid.pinjaman','notisbid.bakiupah')
-//             ->where('cawangan_notis.caw_id','=', $cawlel->caw_id)
-//             ->where('cawangan_notis.notis_id','=', $cawlel->notis_id)
-//             ->get();
+                foreach ($cawnot['status'] as $not_bid_status) {
+                    $statusnotis= $not_bid_status->status;
+                }
+                    array_push($arraycaw,[
+                        'id_cawangan'=> $cawnot['id'],
+                        'cawangan'=>$cawnot['caw_name'],
+                        't_notis'=>$tarikhnotis,
+                        'notis_id'=>$not->id,
+                        'bil_marhun'=>count($cawnot['notisBid']),
+                        'berat'=>$berat,
+                        'n_marhun'=>$nilai_marhun,
+                        'pinjaman'=>$pinjaman,
+                        'bakiupah'=>$bakiupah,
+                        'daritempoh'=>$not->daritempoh,
+                        'hinggatempoh'=>$not->hinggatempoh,
+                        'fasa'=>$not->fasa,
+                        'status'=>$statusnotis,
+                    ]);
 
-//             $t_notis = Notis::join('cawangan_notis','cawangan_notis.notis_id','=','notis.id')
-//             ->where('cawangan_notis.notis_id','=', $cawlel->notis_id)
-//             ->first();
 
-//             $packet = 0;
-//             $berat = 0;
-//             $nilai_marhun = 0;
-//             $pinjaman =0;
-//             $bakiupah = 0;
-//             $id = $cawlel->notis_id;
+                }
+            
+        }
+        // dd($arraycaw);
 
-//             foreach($databid as $index1=>$bid)
-//             {
-//                 $berat = $berat + $bid['berat'];
-//                 $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
-//                 $pinjaman =$pinjaman + $bid['pinjaman'];
-//                 $bakiupah = $bakiupah + $bid['bakiupah'];
-//             }
+        return view('notisperingatan.shownotisperingatanall',compact(
+                                                'notisid',
+                                                'arraycaw',
+                                                'total_marhun',
+                                                'total_berat',
+                                                'total_nmarhun',
+                                                'total_pinjaman',
+                                                'total_upah',
+                                                'data',
+                                                'tarikhnotis',
+                                                'total_bakiupah',
+                                                'total_nilaimarhun'
+                                            ));
+    }
 
-//             array_push($arraycaw,[
-//                 'id_cawangan'=> $cawangan['id'],
-//                 'cawangan'=>$cawangan['caw_name'],
-//                 't_notis'=>$notis['tarikh_notis'],
-//                 'bil_marhun'=>sizeof($databid),
-//                 'berat'=>$berat,
-//                 'n_marhun'=>$nilai_marhun,
-//                 'pinjaman'=>$pinjaman,
-//                 'bakiupah'=>$bakiupah,
-//                 'daritempoh'=>$t_notis['daritempoh'],
-//                 'hinggatempoh'=>$t_notis['hinggatempoh'],
-//                 'fasa'=>$t_notis['fasa'],
-//             ]);
+    public function senaraimarhunnotis($notisid, $cawid)
+    {
+        $total_berat = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
+        $total_cazlelong = 0;
+        $rugilelong = 0;
+        $bakilelong = 0;
+        $keuntungan = 0;
+        $total_baki = 0;
+        $total_ktlhbyr = 0;
+        $total_bakipjm = 0;
+        $notis_id = $notisid;
 
-//             $total_marhun = $total_marhun + sizeof($databid);
-//             $total_berat = $total_berat + $berat;
-//             $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
-//             $total_pinjaman = $total_pinjaman + $pinjaman;
-//             $total_bakiupah = $total_bakiupah + $bakiupah;
+        $notislel = Notis::with('cawangan')->find($notis_id);
 
-//             $data = Notis::where('tarikh_notis','=',$tarikhnotis)->first();
-//         }
+        $cawanganDetail = $notislel->cawangan->find($cawid);
+        
+        $caw = Cawangan::with(["notisBid" => function($q) use ($notis_id){
+            $q->where('notis_id', '=', $notis_id)->select('id','caw_id','kodcaw','norujukan','nokp','pinjaman','bakiupah');
+        }])
+        ->where('caw_code','=',$cawanganDetail->caw_code)->first();
+        
+        $notisbid_data_pluck_norujukan = $caw->notisBid->pluck('norujukan')->toArray();
+        $notisbid_keyby_norujukan = $caw->notisBid->keyBy('norujukan');
 
-//         return view('notisperingatan.shownotisperingatanall',compact(
-//                                                 'arraycaw',
-//                                                 'total_marhun',
-//                                                 'total_berat',
-//                                                 'total_nmarhun',
-//                                                 'total_pinjaman',
-//                                                 'total_upah',
-//                                                 'data',
-//                                                 'tarikhnotis',
-//                                                 'total_bakiupah',
-//                                                 'total_nilaimarhun'
-//                                             ));
-//     }
+        $notis_all = Gadai::on($cawanganDetail->caw_code)->whereIn('norujukan', $notisbid_data_pluck_norujukan)
+        ->select('nokp','jbg','norujukan','berat','nilaimarhun','pinjaman','bakiupah','kadarupah','bakipjm','tempoh','tempohbayar','sttebus')
+        ->orderBy('norujukan','ASC')
+        ->get();
+        $transaksi_all = TransaksiKeuntungan::on('main')->whereIn('norujukan', $notisbid_data_pluck_norujukan)
+        ->select('keuntungan_rebet','bayaran_keuntungan','norujukan')
+        ->get();
+        $transaksi_all_groupby_norujukan = $transaksi_all->groupBy('norujukan');
+
+        $notis_all_keyBy_norujukan = $notis_all->keyBy('norujukan');
+        foreach($transaksi_all_groupby_norujukan as $index7=>$transaksi){
+            // dd($notis_all_keyBy_norujukan);
+            if($notis_all_keyBy_norujukan[$index7]){
+               
+                $gadai_true = $notis_all_keyBy_norujukan[$index7];
+                $gadai_true['data_transaksi'] = $transaksi;
+            }
+            // dd($transaksi);
+        }
+
+        $notis_all_data_pluck_nokp = $caw->notisBid->pluck('nokp')->toArray();
+
+        $customers = Customer::whereIn('kpbaru', $notis_all_data_pluck_nokp)
+        ->orWhereIn('kplama', $notis_all_data_pluck_nokp)
+        ->select('nama','telefon','kpbaru', 'kplama','alamat1','alamat2','alamat3')
+        ->get();
+        $customers_keyBy_noKp = $customers->keyBy(function ($item) {
+            if ($item->kpbaru != '') {
+                return $item->kpbaru;
+            } else if ($item->kplama != '') {
+                return $item->kplama;
+            }
+        });
+        foreach($notis_all as $index1=>$gadai){
+            if(isset($gadai['data_transaksi'])){
+                $data_transaksi = $transaksi_all_groupby_norujukan[$gadai->norujukan];
+                $total_untung_rebet = $data_transaksi->sum('keuntungan_rebet');
+                $total_untung_asal = $data_transaksi->sum('bayaran_keuntungan');
+                $total_bayaran_pembiayaan = $data_transaksi->sum('bayaran_pembiayaan');
+                $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                // dd($beza_keuntungan);
+                // dd(true);
+                $jbg = $gadai->tempoh - $gadai->tempohbayar;
+                $jbg2 = 12 - $gadai->tempohbayar;
+                if($gadai->tempoh <= '12.00'){
+                    $keuntungan = bcdiv(($jbg)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
+                }else{
+                    $keuntungan = bcdiv(($jbg2)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
+                }
+
+                $ktlhbyr = $total_untung_asal;
+                $total_ktlhbyr = $total_ktlhbyr + $ktlhbyr;
+                $notis_all[$index1]['ktlhbyr'] = $ktlhbyr ? $ktlhbyr : 0.00;
+            }
+            else{
+            //    dd(false);
+                $jbg = $gadai->tempoh - $gadai->tempohbayar;
+                $jbg2 = 12 - $gadai->tempohbayar;
+                $beza_keuntungan = 0.00;
+                // dd($gadai->kadarupah);
+                if($gadai->tempoh <= '12.00'){
+                    // dd($jbg,$gadai->kadarupah, $gadai->bakipjm);
+                    $keuntungan = bcdiv(($jbg)*$gadai->kadarupah/100*$gadai->pinjaman,1,1)-$beza_keuntungan;
+                }else{
+                    // dd(false);
+                    $keuntungan = bcdiv(($jbg2)*$gadai->kadarupah/100*$gadai->pinjaman,1,1)-$beza_keuntungan;
+                }
+            }
+            // dd($gadai->pinjaman);
+            if($customers_keyBy_noKp[$gadai->nokp]){
+                $notis_all[$index1]["cust_info"] = $customers_keyBy_noKp[$gadai->nokp];
+            }
+            $total_berat = $total_berat + $gadai['berat'];
+            $total_pinjaman = $total_pinjaman + $gadai['[pinjaman]'];
+            $total_bakipjm = $total_bakipjm + $gadai['bakipjm'];
+            $total_nilaimarhun = $total_nilaimarhun + $gadai['nilaimarhun'];
+            $total_bakiupah = $total_bakiupah + $gadai['bakiupah'];
+            
+            $notis_all[$index1]['keuntungan'] = $keuntungan;
+        }
+
+        return view('notisperingatan.senaraimarhunnotis',compact('notis_all','total_berat',
+        'total_nilaimarhun',
+        'total_pinjaman',
+        'total_bakipjm',
+        'total_bakiupah',
+        'total_ktlhbyr',
+        'notislel',
+        'notis_id',
+        'cawid',
+        'cawanganDetail'));
+    }
+
+    public function kemaskinidatanotis($tarikhnotis)
+    {
+        $user = Auth::user();
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateTimeString();
+        $data = [];
+
+        $notis_all = Notis::with(['cawangan', 'notisBid'])->where('tarikh_notis',$tarikhnotis)->get();
+        
+        foreach ($notis_all as $notisall) {
+            $cawanganAll = $notisall->cawangan;
+            // dump($notisall['id']);
+            $notisBidGroupByCawId = $notisall->notisBid->groupBy('caw_id');
+            $notisbid_pluck_by_norujukan = $notisall->notisBid->pluck('norujukan')->toArray();
+            $notisbid_keyby_norujukan = $notisall->notisBid->keyBy('norujukan');
+           
+            foreach ($cawanganAll as $caw_key_by_id) {
+                $cawanganDetail = $cawanganAll->find($caw_key_by_id['id']);
+                $gadai_all = Gadai::on($cawanganDetail['caw_code'])->whereIn('norujukan', $notisbid_pluck_by_norujukan)
+                ->select('sttebus','kadarupah','nokp','tempoh','tempohbayar','norujukan','berat','nilaimarhun','pinjaman','bakipjm','bakiupah','hargajualan','bakihargajualan')
+                ->orderBy('norujukan','ASC')
+                ->get();
+
+                $transaksi_all = TransaksiKeuntungan::on('main')->whereIn('norujukan', $notisbid_pluck_by_norujukan)
+                ->select('keuntungan_rebet','bayaran_keuntungan','norujukan')
+                ->get();
+                // dd($transaksi_all);
+                $transaksi_all_groupby_norujukan = $transaksi_all->groupBy('norujukan');
+
+                if ($notisBidGroupByCawId[$caw_key_by_id['id']]); {
+                    $caw_key_by_id['notisBid'] = $notisBidGroupByCawId[$caw_key_by_id['id']];
+                    
+                }
+
+                foreach($gadai_all as $data)
+                {   
+                    if($data['sttebus'] == "T" || $data['sttebus'] == "L")
+                    {
+                        $lelongtebus = new LelongTebus;
+                        $lelongtebus->tarikh = $currentdate;
+                        $lelongtebus->kodcaw = $cawanganDetail['caw_code'];
+                        $lelongtebus->teller = $user->name;
+                        $lelongtebus->norujukan = $data['norujukan'];
+                        $lelongtebus->batch_no = $notisall['id'];
+                        $lelongtebus->nilaimarhun = $data['nilaimarhun'];
+                        $lelongtebus->pinjaman = $data['pinjaman'];
+                        $lelongtebus->upah = $data['bakiupah'];
+                        $lelongtebus->jbg = $data['tempoh'];
+                        if($data['sttebus'] == "T"){
+                            $lelongtebus->jenis_tebus = 'T';
+                        }
+                        else if($data['sttebus'] == "L"){
+                            $lelongtebus->jenis_tebus = 'L';
+                        }
+                        $lelongtebus->save();
+
+                        //insert loguser
+                        $loguser = new LogUser;
+                        $loguser->user_id = $user->id;
+                        $loguser->date = $currentdate;
+                        $loguser->username = $user->username;
+                        $loguser->nama_user = $user->name;
+                        $loguser->norujukan = $data['norujukan'];
+                        if($data['sttebus'] == "T"){
+                            $loguser->nota = 'OUT NOTIS TEBUS '.$notisall['id'];
+                        }
+                        else if($data['sttebus'] == "L"){
+                            $loguser->nota = 'OUT NOTIS LELONG '.$notisall['id'];
+                        }
+                        
+                        $loguser->save();
+                        //hapus notisbid
+                        $updatelelong = NotisBid::where('norujukan','=',$data['norujukan'])->first();
+                        $updatelelong->delete();
+                        
+                        $checksag = NotisBid::where('kodcaw',$cawanganDetail['caw_code'])
+                        ->where('notis_id',$notisall['id'])
+                        ->first();
+                        // dd($checksag);
+            
+                        if(empty($checksag))
+                        {
+                            $notisbatch =  CawanganNotis::where('caw_id','=',$cawanganDetail['id'])->first();
+                            $notisbatch->delete();
+            
+                              //insert loguser
+                              $loguser = new LogUser;
+                              $loguser->user_id = $user->id;
+                              $loguser->date = $currentdate;
+                              $loguser->username = $user->username;
+                              $loguser->nama_user = $user->name;
+                              $loguser->nota = 'HAPUS CAW NOTIS '.$notisall['id'];
+                              $loguser->save();
+                        }
+                    }
+                }
+        } 
+        return redirect()->route('notisperingatan.shownotisperingatanall',[$tarikhnotis,$notisall['id']])
+            ->with('success','Kemaskini Berjaya');
+    }
+}
+
+public function jananotisperingatan2($notisid,$cawid)
+    {
+        $user =  Auth::user();
+        $caw = Cawangan::where('id', '=', $cawid)->first();
+
+        $currentdate = Carbon::now();
+        $tarikh_cetak = $currentdate->toDateString();
+
+        $notis = Notis::find($notisid);
+        // dd($notisid);
+
+        $arraynorujukan = NotisBid::where('notis_id', $notisid)->where('kodcaw', $caw->caw_code)->pluck('norujukan');
+        // dd($arraynorujukan);
+
+        $marhuns = Gadai::on($caw->caw_code)->whereIn('norujukan', $arraynorujukan)->select('nokp', 'norujukan','bakipjm','t_matang','tempoh')->orderBy('nokp', 'asc')->get();
+
+        $marhuns_pluck_nokp = $marhuns->pluck('nokp');
+
+        $customers = Customer::whereIn('kpbaru', $marhuns_pluck_nokp)
+            ->orWhereIn('kplama', $marhuns_pluck_nokp)
+            ->join('poskod', 'customer.poskod', '=', 'poskod.poskod')
+            ->join('daerah', 'poskod.koddaerah', '=', 'daerah.koddaerah')
+            ->join('negeri', 'poskod.kodnegeri', '=', 'negeri.kodnegeri')
+            ->get();
+
+        $customers_keyBy_noKp = $customers->keyBy(function ($item) {
+            if ($item->kpbaru != '') {
+                return $item->kpbaru;
+            } else if ($item->kplama != '') {
+                return $item->kplama;
+            }
+        });
+
+        foreach ($marhuns as $index => $marhun) {
+            if ($customers_keyBy_noKp[$marhun->nokp]) {
+                $marhuns[$index]['nama'] = $customers_keyBy_noKp[$marhun->nokp];
+                $marhuns[$index]['notis'] = $notis;
+            }
+        }
+        //update status cetak
+        $updatestatus = CawanganNotis::where('notis_id', '=', $notisid)->where('caw_id', '=', $cawid)->first();
+        $updatestatus->status = '2';
+        $updatestatus->save();
+
+        $pdf = PDF::loadView('pdf.jananotisperingatan', compact('marhuns','notis', 'notisid', 'caw', 'tarikh_cetak'))
+        ->setPaper('a4', 'potrait');
+
+        return $pdf->download('Penjanaan Notis Peringatan Fasa 1 ' . $notisid . '.pdf');
+    }
+
+    public function jananotisperingatan2fasa2($notisid,$cawid)
+    {
+        $user =  Auth::user();
+        $caw = Cawangan::where('id', '=', $cawid)->first();
+
+        $currentdate = Carbon::now();
+        $tarikh_cetak = $currentdate->toDateString();
+
+        $notis = Notis::find($notisid);
+        // dd($notisid);
+
+        $arraynorujukan = NotisBid::where('notis_id', $notisid)->where('kodcaw', $caw->caw_code)->pluck('norujukan');
+        // dd($arraynorujukan);
+
+        $marhuns = Gadai::on($caw->caw_code)->whereIn('norujukan', $arraynorujukan)->select('nokp', 'norujukan','bakipjm','t_matang1','tempoh')->orderBy('nokp', 'asc')->get();
+
+        $marhuns_pluck_nokp = $marhuns->pluck('nokp');
+
+        $customers = Customer::whereIn('kpbaru', $marhuns_pluck_nokp)
+            ->orWhereIn('kplama', $marhuns_pluck_nokp)
+            ->join('poskod', 'customer.poskod', '=', 'poskod.poskod')
+            ->join('daerah', 'poskod.koddaerah', '=', 'daerah.koddaerah')
+            ->join('negeri', 'poskod.kodnegeri', '=', 'negeri.kodnegeri')
+            ->get();
+
+        $customers_keyBy_noKp = $customers->keyBy(function ($item) {
+            if ($item->kpbaru != '') {
+
+                return $item->kpbaru;
+            } else if ($item->kplama != '') {
+                return $item->kplama;
+            }
+        });
+
+        foreach ($marhuns as $index => $marhun) {
+            if ($customers_keyBy_noKp[$marhun->nokp]) {
+                $marhuns[$index]['nama'] = $customers_keyBy_noKp[$marhun->nokp];
+                $marhuns[$index]['notis'] = $notis;
+            }
+        }
+        //update status cetak
+        $updatestatus = CawanganNotis::where('notis_id', '=', $notisid)->where('caw_id', '=', $cawid)->first();
+        $updatestatus->status = '2';
+        $updatestatus->save();
+
+        $pdf = PDF::loadView('pdf.jananotisperingatan2', compact('marhuns','notis', 'notisid', 'caw', 'tarikh_cetak'))
+        ->setPaper('a4', 'potrait');
+
+        return $pdf->download('Penjanaan Notis Peringatan Fasa 2 ' . $notisid . '.pdf');
+    }
+
+    public function blastnotisperingatan($notisid,$cawid)
+    {
+        $user =  Auth::user();
+        $caw = Cawangan::where('id', '=', $cawid)->first();
+
+        $currentdate = Carbon::now();
+        $tarikh_cetak = $currentdate->toDateString();
+
+        $notis = Notis::find($notisid);
+        // dd($notis->tarikh_notis);
+        $notis_bid_all = NotisBid::select('id','nokp','norujukan','jbg','pinjaman','fasa')->where('notis_id', $notisid)->where('kodcaw', $caw->caw_code)->get();
+        $arraynorujukan_notis_bid_all = NotisBid::where('notis_id', $notisid)->where('kodcaw', $caw->caw_code)->pluck('norujukan');
+        
+        $arraynorujukan = NotisBid::where('notis_id', $notisid)->where('kodcaw', $caw->caw_code)->pluck('norujukan');
+        $gadai_all = Gadai::on($caw->caw_code)->whereIn('norujukan', $arraynorujukan)->select('nokp', 'norujukan','bakipjm','t_matang','t_matang1','tempoh')->orderBy('nokp', 'asc')->get();
+ 
+        $customers_list = $gadai_all->pluck('nokp')->unique();
+        $customers = Customer::whereIn('kpbaru', $customers_list)
+        ->orWhereIn('kplama', $customers_list)
+        ->select('id','kpbaru','kplama' ,'nama', 'telefon')
+        ->get()->keyBy('id');
+        
+        $customers_keyBy_noKp = $customers->keyBy(function ($item) {
+            if ($item->kpbaru != '') {
+                return $item->kpbaru;
+            } else if ($item->kplama != '') {
+                return $item->kplama;
+            }
+        });
+       
+        $customers_pluck_notel = $customers_keyBy_noKp->pluck('telefon');
+        // dd($customers_pluck_notel);
+        foreach($customers_pluck_notel as $index1 =>$custphone) {
+            // dd($custphone);
+            $special = preg_match('/[\'^£$%&*()}{@#~?><>,|=_+¬-]/', $custphone);
+                // dump($special);
+                if($special == 0){
+                    if($custphone == ''){
+                        $newtel = '';
+                    }elseif($custphone <> ''){
+                        $newtel = '6'.$custphone;
+                    }
+                }
+                elseif($special == 1){
+                    if($custphone == ''){
+                        $newtel = '';
+                    }elseif($custphone <> ''){
+                    $newtel = '6'.str_replace( array( '-' ), '', $custphone);
+                    }
+                }
+                // dump($newtel);
+                
+        }
+        $notis_bid_all_groupby_norujukan = $notis_bid_all->groupBy('norujukan');
+        $notis_all_keyBy_norujukan = $gadai_all->keyBy('norujukan');
+        foreach($notis_bid_all_groupby_norujukan as $index7=>$notisbid){
+            // dd($notis_all_keyBy_norujukan);
+            if($notis_all_keyBy_norujukan[$index7]){
+               
+                $gadai_true = $notis_all_keyBy_norujukan[$index7];
+                $gadai_true['data_notisbid'] = $notisbid;
+            }
+            
+        }
+        // dd($gadai_all);
+        foreach ($gadai_all as $index => $suratnotis) {
+            $datanotisbid = $suratnotis['data_notisbid'][0]->fasa;
+            // dd($suratnotis);
+            if($customers_keyBy_noKp[$suratnotis->nokp])
+            {
+                $mobile_no = '60178916936';
+                // $mobile_no = $newtel;
+                $user_true = $customers_keyBy_noKp[$suratnotis->nokp];
+                $nama = $user_true->nama;
+                $bakipjm = number_format($suratnotis->bakipjm, 2, '.', ',');
+                $t_matang = Carbon::parse($suratnotis->t_matang);
+                $t_matang1 = Carbon::parse($suratnotis->t_matang1);
+                $t_matangf1 = $t_matang->format('d-m-Y');
+                $t_matangf2 = $t_matang1->format('d-m-Y');
+                $cawname = $caw->caw_name;
+                // dd($t_matang1);
+                if( $datanotisbid == '1'){
+                    $message = 'Kepada *'.$nama.'* ('.$suratnotis->nokp.'),'.' Dengan hormatnya dimaklumkan gadaian tuan/puan bernombor *'.$suratnotis->norujukan.'* dengan jumlah baki pembiayaan sebanyak *RM'.$bakipjm.'*'.' akan/telah tamat tarikh matang gadaiannya pada *'.$t_matangf1.'* yang telah mencecah *'.$suratnotis->tempoh.' bulan*. Tuan/puan atau wakil adalah dikehendaki menebus/membayar *KOS KEUNTUNGAN* tersebut secepat mungkin. Jika pihak tuan/puan menghadapi sebarang masalah, sila hubungi kami sebagaimana alamat di dalam *Surat Akaun Gadaian* ATAU datang sendiri ke *'.$cawname.'* dengan membawa bersama salinan asal Surat Akaun Gadaian tuan/puan. Sekian, terima kasih.';
+                }
+                else if( $datanotisbid == '2'){
+                    $message = 'Kepada *'.$nama.'* ('.$suratnotis->nokp.'),'.' Dengan hormatnya dimaklumkan gadaian tuan/puan bernombor *'.$suratnotis->norujukan.'* dengan jumlah baki pembiayaan sebanyak *RM'.$bakipjm.'*'.' akan/telah tamat kontrak gadaiannya pada *'.$t_matangf2.'* yang telah mencecah *'.$suratnotis->tempoh.' bulan*. Tuan/puan atau wakil adalah dikehendaki menebus/membayar *KOS KEUNTUNGAN* tersebut secepat mungkin. Jika pihak tuan/puan menghadapi sebarang masalah,  sila hubungi kami sebagaimana alamat di dalam *Surat Akaun Gadaian* ATAU datang sendiri ke *'.$cawname.'* dengan membawa bersama salinan asal Surat Akaun Gadaian tuan/puan. Sekian, terima kasih.';
+                }
+                // dd($message);
+                // $message = 'Hello%20Nadine%0Ahow%20are%20you%0A';
+                $response = Http::get(env('WABOT_API'), [
+                'number' => $mobile_no,
+                'type' => 'text',
+                'message' =>  $message,
+                'instance_id' => env('WABOT_INSTANCES_ID'),
+                'access_token' => env('WABOT_TOKEN_KEYS')
+                ]);
+
+                $res_json = $response->json();
+                if ($res_json['status'] == "error") {
+                    $message = "WABOT: " . $res_json['message'] . " - " . $res_json['data'];
+                    Log::error($message);
+                } else {
+                    $message = "WABOT: Success " . $res_json['data']['key']['remoteJid'] . " - " . $res_json['data']['message']['extendedTextMessage']['text'];
+                    Log::info($message);
+                }
+            }
+            // dd($suratnotis['data_notisbid'][$index]);
+        }
+        
+        $updatestatus = CawanganNotis::where('notis_id', '=', $notisid)->where('caw_id', '=', $cawid)->first();
+        $updatestatus->status = '3'; //blastwabot
+        $updatestatus->save();
+
+        return redirect()->route('notisperingatan.shownotisperingatanall',[$notis->tarikh_notis,$notisid])
+        ->with('success','Kemaskini Berjaya');
+    }
+                
+
+
+              
+
+        
+            
     
 
 
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index ca0c9cbe..d29f3852 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -247,6 +247,11 @@ class ReportController extends Controller
 
     public function senarailapbidaan ($lelong_id, $kodcaw){
 
+        $lel = Lelong::with('cawangan')->find($lelong_id);
+
+        $cawname = Cawangan::where('caw_code','=',$kodcaw)->first();
+        // dd($cawname->id);
+        $cawanganDetail = $lel->cawangan->find($cawname->id);
     
         $arraydetails = [];
         $arrayinfocaw = [];
@@ -304,7 +309,7 @@ class ReportController extends Controller
             
         // return $pdf->download('Senarai Nama Bidaan Pembida.pdf');
 
-        return view('lelong.senarailapbidaanpembida',compact('kodcaw','lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw','total_hargaasas','total_hargabida'));
+        return view('lelong.senarailapbidaanpembida',compact('cawanganDetail','kodcaw','lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw','total_hargaasas','total_hargabida'));
 
 
         
diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php
index 02b14463..0fa172dd 100644
--- a/app/Models/Cawangan.php
+++ b/app/Models/Cawangan.php
@@ -70,4 +70,9 @@ class Cawangan extends Model
     {
         return $this->belongsTo(User::class, 'kodcaw', 'caw_code');
     }
+
+    public function notisBid()
+    {
+        return $this->hasMany(NotisBid::class, 'caw_id', 'id');
+    }
 }
diff --git a/app/Models/CawanganNotis.php b/app/Models/CawanganNotis.php
new file mode 100644
index 00000000..19947509
--- /dev/null
+++ b/app/Models/CawanganNotis.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CawanganNotis extends Model
+{
+    use HasFactory;
+
+    protected $table = 'cawangan_notis';
+
+    protected $fillable = [
+        'batchnotis',
+        'notis_id',
+        'caw_id',
+        'fasa',
+        'status'
+    ];
+
+    // public function lelongBid()
+    // {
+    //     return $this->hasMany(LelongBid::class, 'caw_id', 'caw_id');
+    // }
+
+    public function cawangan()
+    {
+        return $this->belongsTo(Cawangan::class, 'caw_id', 'id');
+    }
+
+    public function notis()
+    {
+        return $this->belongsTo(Notis::class, 'notis_id', 'id');
+    }
+}
+
+
diff --git a/app/Models/Notis.php b/app/Models/Notis.php
new file mode 100644
index 00000000..93bdcec2
--- /dev/null
+++ b/app/Models/Notis.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Notis extends Model
+{
+    use HasFactory;
+
+    protected $table = 'notis';
+
+    protected $fillable = [
+        'tarikh_notis',
+        'daritempoh',
+        'hinggatempoh',
+        'sts_notis',
+        'fasa'
+    ];
+
+    public function cawangan()
+    {
+        return $this->belongsToMany(Cawangan::class, 'cawangan_notis', 'notis_id', 'caw_id')->withPivot('status');
+    }
+
+    public function cawanganNotis()
+    {
+        return $this->hasMany(cawanganNotis::class, 'notis_id');
+    }
+
+    public function notisBid() 
+    {   
+        return $this->hasMany(NotisBid::class, 'notis_id', 'id');
+    }
+
+    // public function lelongBidJual() 
+    // {   
+    //     return $this->hasMany(LelongBid::class, 'lelong_id', 'id')->where('status_jual', 1);
+    // }
+
+    // public function lelongBidBelumSemak() 
+    // {   
+    //     return $this->hasMany(LelongBid::class, 'lelong_id', 'id')->where('status_semak', 0);
+    // }
+
+    // public function lelKarat()
+    // {
+    //     return $this->hasMany(LelKarat::class, 'lelong_id', 'id');
+    // }
+
+    // public function pengesahan()
+    // {
+    //     return $this->hasMany(Pengesahan::class, 'lelong_id', 'id');
+    // }
+
+    // public function pengesahanTelahSah()
+    // {
+    //     return $this->hasMany(Pengesahan::class, 'lelong_id', 'id')->whereNotNull('disahkan_oleh');
+    // }
+}
diff --git a/app/Models/NotisBid.php b/app/Models/NotisBid.php
new file mode 100644
index 00000000..c17c6160
--- /dev/null
+++ b/app/Models/NotisBid.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class NotisBid extends Model
+{
+    use HasFactory;
+
+    protected $table = 'notisbid';
+
+    protected $fillable = [
+        'notis_id',
+        'caw_id',
+        'kodcaw',
+        'norujukan',
+        'nokp',
+        'jbg',
+        'kadarupah',
+        'nilaimarhun',
+        'pinjaman',
+        'bakiupah',
+        'berat',
+        'marhun',
+        'percent',
+        'fasa',
+    ];
+
+    public function cawangan()
+    {
+        return $this->belongsTo(Cawangan::class, 'caw_id', 'id');
+    }
+
+    public function notis()
+    {
+        return $this->belongsTo(Notis::class, 'notis_id', 'id');
+    }
+
+    public function cawanganNotis(){
+        return $this->hasOne(CawanganNotis::class, 'caw_id','caw_id');
+    }
+
+}
diff --git a/database/migrations/2023_01_10_112549_seed_system_user.php b/database/migrations/2023_01_10_112549_seed_system_user.php
index ebed371f..bbe73b04 100644
--- a/database/migrations/2023_01_10_112549_seed_system_user.php
+++ b/database/migrations/2023_01_10_112549_seed_system_user.php
@@ -34,6 +34,6 @@ class SeedSystemUser extends Migration
      */
     public function down()
     {
-        //
+        Schema::dropIfExists('users');        
     }
 }
diff --git a/database/migrations/2023_04_04_083509_create_notis_table.php b/database/migrations/2023_04_04_083509_create_notis_table.php
new file mode 100644
index 00000000..5788de16
--- /dev/null
+++ b/database/migrations/2023_04_04_083509_create_notis_table.php
@@ -0,0 +1,89 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateNotisTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        
+        Schema::create('notis', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('tarikh_notis')->nullable();
+            $table->string('daritempoh')->nullable();
+            $table->string('hinggatempoh')->nullable();
+            $table->integer('sts_notis')->nullable();
+            $table->integer('fasa')->nullable();
+            $table->timestamps();
+        });
+
+        Schema::create('notisbid', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('notis_id')->unsigned();
+            $table->string('tarikh_notis');
+            $table->unsignedBigInteger('caw_id')->unsigned();
+            $table->string('kodcaw');
+            $table->string('norujukan');
+            $table->string('nokp');
+            $table->decimal('jbg', $precision = 7, $scale = 2);
+            $table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable();
+            $table->decimal('nilaimarhun', $precision = 9, $scale = 2);
+            $table->decimal('pinjaman', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('bakiupah', $precision = 7, $scale = 2);
+            $table->decimal('berat', $precision = 7, $scale = 2);
+            $table->string('marhun');
+            $table->decimal('percent', $precision = 7, $scale = 2);
+            $table->integer('fasa')->default(0);
+            $table->date('tarikhnotis1')->nullable();
+            $table->date('tarikhnotis2')->nullable();
+            $table->timestamps();
+
+            $table->foreign('caw_id')
+                ->references('id')->on('cawangan')
+                ->onDelete('cascade');
+                
+            $table->foreign('notis_id')
+                ->references('id')->on('notis')
+                ->onDelete('cascade');
+        });
+
+        Schema::create('cawangan_notis', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('notis_id')->unsigned();
+            $table->unsignedBigInteger('caw_id')->unsigned();
+            $table->integer('fasa')->default(0);
+            $table->string('daritempoh')->nullable();
+            $table->string('hinggatempoh')->nullable();
+            $table->integer('status')->nullable();
+            $table->timestamps();
+
+            $table->foreign('caw_id')
+                ->references('id')->on('cawangan')
+                ->onDelete('cascade');
+            
+            $table->foreign('notis_id')
+                ->references('id')->on('notis')
+                ->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('notis');
+        Schema::dropIfExists('notisbid');
+        Schema::dropIfExists('cawangan_notis');
+        
+    }
+}
diff --git a/resources/views/excel/gadaibycawnotisfasa1excel.blade.php b/resources/views/excel/gadaibycawnotisfasa1excel.blade.php
new file mode 100644
index 00000000..bbf08915
--- /dev/null
+++ b/resources/views/excel/gadaibycawnotisfasa1excel.blade.php
@@ -0,0 +1,118 @@
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<script src="{{ asset('js/table2excel.js') }}"></script>
+<style>
+
+.letter{
+    font-family:'Times New Roman', Times, serif;
+    
+}
+ 
+.row::after {
+  content: "";
+  clear: both;
+  display: table;
+   
+}
+
+.first-prgph{
+  
+    float: left;
+    width: 10%;
+    padding: 2px;
+}
+.first-prgph1{
+  
+  float: left;
+  width: 30%;
+  padding-left: 50px;
+}
+.page-break {
+    page-break-before: always;
+}
+.name{
+    padding-top: 40px;
+}
+
+</style>
+
+
+<body>
+
+    
+        <table width="100%" height="168" id="customers">
+            <thead>
+                <tr>
+                    <th>Bil</th>
+                    <th>No Rujukan</th>
+                    <th>Nama</th>
+                    <th>No.KP</th>
+                    <th>No.Telefon</th>
+                    <th>Marhun</th>
+                    <th>Berat (gm)</th>
+                    <th>Tempoh</th>
+                    <th>Pembiayaan (RM)</th>
+                    <th>Baki Pembiayaan (RM)</th>
+                    <th>Keuntungan 6 Bulan (RM)</th>
+                    <th>Keuntungan Telah Bayar (RM)</th>
+                </tr>
+            </thead>
+            @foreach($getsurat as $index1=> $notis)
+         
+            <tr>
+                <td>{{ $loop->iteration }}</td>
+                <td style='word-wrap'>{{ $notis['list_norujukan'][0]['norujukan'] }}</td>
+                <td>{{ $notis['nama'][0]['nama'] ?? NULL}}</td>
+                <td>{{ $notis['list_norujukan'][0]['nokp'] }}</td>
+                <td>6{{ $notis['nama'][0]['telefon'] ?? NULL}}</td>
+                <td>{{ $notis['list_norujukan'][0]['marhun'] }}</td>
+                <td align="right">{{ $notis['list_norujukan'][0]['berat'] }}</td>    
+                <td>{{ $notis['list_norujukan'][0]['tempoh'] }}</td>
+                <td align="right">{{ $notis['list_norujukan'][0]['pinjaman'] }}</td>
+                <td align="right">{{ $notis['list_norujukan'][0]['bakipjm'] }}</td>
+                <td align="right">{{ $notis['list_norujukan'][0]['bakiupah'] }}</td>
+                <td>{{ number_format($notis['ktlhbyr'] , 2, '.', ',')}}</td>
+
+              
+              </tr>
+
+    @endforeach
+
+    {{-- @foreach($getsurat as $surat)
+    <tr>
+        <td>{{ $loop->iteration }}</td>
+        <td>{{ $surat['list_norujukan'][0]['norujukan'] }}</td>
+        <td>{{ $surat['list_norujukan'][0]['nokp'] }}</td>
+        <td>60{{ $surat['list_norujukan'][0]['telefon'] }}</td>
+        <td>{{ $surat['list_norujukan'][0]['tempoh'] }}</td>
+        <td>{{ $surat['list_norujukan'][0]['berat'] }}</td>
+        <td>{{ $surat['list_norujukan'][0]['pinjaman'] }}</td>
+        <td>{{ $surat['list_norujukan'][0]['bakipjm'] }}</td>
+        <td>{{ $surat['list_norujukan'][0]['bakiupah'] }}</td>
+
+        <td>{{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}</td>
+
+    
+    </tr>
+@endforeach --}}
+
+            </div>
+
+            </div>
+
+
+</body>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script>
+
+    $(document).ready(function () {
+        
+        var table2excel = new Table2Excel();
+        table2excel.export(document.querySelectorAll("#customers"),'senarai_notis');
+        setTimeout(function(){ window.close() }, 10);
+        
+        
+      });
+      
+    </script>
+    
\ No newline at end of file
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 584b75d0..da065f6f 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -711,7 +711,35 @@
         </li>
       </ul>
     </li>
-    <li class="{{ (request()->is('reportkali/')) ? 'active' : '' }}">
+    <li class="{{ (request()->is('reportbycaw/')) ? 'active' : '' }}">
+      <a href="#reportallcawSubmenu" data-toggle="collapse" aria-expanded="false">
+        <div class="sidebar-menu">
+          <div class="sidebar-menu-main-title">
+            <span class="material-symbols-rounded sidebar-menu-item-main">
+              flag
+            </span>
+            By Cawangan
+          </div>
+          <span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
+        </div>
+      </a>
+      {{-- <ul class="list-unstyled collapse {{ (request()->is('reportbycaw/*')) ? 'show' : '' }}" id="reportallcawSubmenu">
+        <li class="{{ (request()->is('reportbycaw/lapbrglelongindexall/*') || request()->is('reportbycaw/lapbrglelongindexall') ) ? 'active' : '' }}">
+          <a href="{{url('reportbycaw/lapbrglelongindexall')}}">Barang Lelong by Batch</a>
+        </li>
+      </ul>
+      <ul class="list-unstyled collapse {{ (request()->is('reportbycaw/*')) ? 'show' : '' }}" id="reportallcawSubmenu">
+        <li class="{{ (request()->is('reportbycaw/lapbidaanpembidaindexall/*') || request()->is('reportbycaw/lapbidaanpembidaindexall') ) ? 'active' : '' }}">
+          <a href="{{url('reportbycaw/lapbidaanpembidaindexall')}}">Senarai Lelong Pembida by Batch</a>
+        </li>
+      </ul> --}}
+      <ul class="list-unstyled collapse {{ (request()->is('reportbycaw/*')) ? 'show' : '' }}" id="reportallcawSubmenu">
+        <li class="{{ (request()->is('reportbycaw/laporanlelongbycaw/*') || request()->is('reportbycaw/laporanlelongbycaw') ) ? 'active' : '' }}">
+          <a href="{{url('reportbycaw/laporanlelongbycaw')}}">Lelong Keseluruhan</a>
+        </li>
+      </ul>
+    </li>
+    {{-- <li class="{{ (request()->is('reportkali/')) ? 'active' : '' }}">
       <a href="#reportallSubmenu" data-toggle="collapse" aria-expanded="false">
         <div class="sidebar-menu">
           <div class="sidebar-menu-main-title">
@@ -738,7 +766,7 @@
           <a href="{{url('reportkali/laplelongindexall')}}">Lelong Keseluruhan by Batch</a>
         </li>
       </ul>
-    </li>
+    </li> --}}
     <li class="{{ (request()->is('backdate/')) ? 'active' : '' }}">
       <a href="#reportBackdateSubmenu" data-toggle="collapse" aria-expanded="false">
         <div class="sidebar-menu">
diff --git a/resources/views/jananotis/gadaibycawnotisfasa1.blade.php b/resources/views/jananotis/gadaibycawnotisfasa1.blade.php
new file mode 100644
index 00000000..a48b5b52
--- /dev/null
+++ b/resources/views/jananotis/gadaibycawnotisfasa1.blade.php
@@ -0,0 +1,162 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="row">
+            <div class="col">
+                <div class="card">
+                    <div class="card-header header-style">
+                        <a href="{{ route('jananotis.notisfasa1') }}" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                        <div class="header-style-title">
+                           
+                            SENARAI NOTIS PERINGATAN FASA 1 CAWANGAN {{ $user->kodcaw }}
+                        </div>
+                    </div>
+                    <div class="card-body">
+            {{-- <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Cawangan {{ $user->kodcaw }}</h3> --}}
+            
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+
+                <div class="container">
+                    <div class="row">
+                        {{-- <div class="col-md-6 col-lg"> --}}
+                        <div class="col-md-6">
+                            
+                            <div class="form-group row">
+                                <label class="col-3 col-form-label"> <b>Bilangan Surat : </b></label>
+                                <div class="col-3">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ $bil_lelongcaw[0]['bil_lelong'] }}">
+                                    </div>
+                                </div>
+                            </div>
+                            {{-- <p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p> --}}
+                            {{-- <p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p> --}}
+                            {{-- <p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
+                            <p> <b>Bilangan Surat : </b>{{ $bil_lelongcaw[0]['bil_lelong'] }}</p> --}}
+                        </div>
+                    </div>
+                </div>
+
+                <div class="text-left pt-4">
+                    <a href=" {{ route('jananotis.gadaibycawnotisfasa1pdf',[$tempoh,$tempoh2]) }}" class="btn btn-success">Senarai PDF</a>
+                    <a href=" {{ route('jananotis.gadaibycawnotisfasa1excel',[$tempoh,$tempoh2]) }}" class="btn btn-success">Senarai EXCEL</a>
+                    <a href=" {{ route('jananotis.jananotisperingatanfasa1',[$tempoh,$tempoh2]) }}" class="btn btn-success">Surat Notis</a>
+
+                    </div>
+                <table class="table text-right table-bordered"  id="butirangadai">
+                    <thead class="bg-primary text-white">
+                            <tr>
+                                <th>Bil</th>
+                                <th>No Rujukan</th>
+                                <th>Nama</th>
+                                <th>No.KP</th>
+                                <th>No.Telefon</th>
+                                <th>Marhun</th>
+                                <th>Berat (gm)</th>
+                                <th>Tempoh</th>
+                                <th>Pembiayaan (RM)</th>
+                                <th>Baki Pembiayaan (RM)</th>
+                                <th>Keuntungan 6 Bulan (RM)</th>
+                                <th>Keuntungan Telah Bayar (RM)</th>
+                            </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($getsurat as $surat)
+                            <tr>
+                                <td>{{ $loop->iteration }}</td>
+                                <td style='word-wrap'>{{ $surat['list_norujukan'][0]['norujukan'] }}</td>
+                                <td>{{ $surat['nama'][0]['nama'] ?? NULL}}</td>
+                                <td>{{ $surat['list_norujukan'][0]['nokp'] }}</td>
+                                <td>6{{ $surat['nama'][0]['telefon'] ?? NULL}}</td>
+                                <td>{{ $surat['list_norujukan'][0]['marhun'] }}</td>
+                                <td>{{ $surat['list_norujukan'][0]['berat'] }}</td>    
+                                <td>{{ $surat['list_norujukan'][0]['tempoh'] }}</td>
+                                <td>{{ $surat['list_norujukan'][0]['pinjaman'] }}</td>
+
+                                <td>{{ $surat['list_norujukan'][0]['bakipjm'] }}</td>
+                                <td>{{ $surat['list_norujukan'][0]['bakiupah'] }}</td>
+
+                                <td>{{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}</td>
+
+                            
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+                <div class="modal-footer">
+                    <a  href="{{ route('jananotis.notistamatkontrak') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
+                </div>
+        </div>
+    </div>
+</div>
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablebutirangadai = $('#butirangadai').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 8,
+                "orderable": true
+                }
+            ],
+            order: [[1, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 9999,
+            dom: 'Bfrtip',
+            buttons: [
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Cawangan',
+            //         action: function ( e, dt, node, config ) {
+            //             // alert( 'Button activated' );
+            //             // console.log('hye');
+                        
+            //             $('#myModal').modal("show");
+            //             $('#myModal').on('shown.bs.modal', function () {
+            //                 $('#rolename').trigger('focus')
+            //             })
+            //         }
+            //     },
+                // {
+                //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+                //     titleAttr: 'Senarai Gadaian Excel',
+                //     text: '<i class="fas fa-download"></i>',
+                //     action: function ( e, dt, node, config ) {
+                //         $("#exportform").submit();
+                //     }
+                // },
+                // {
+                //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+                //     titleAttr: 'Senarai Gadaian PDF',
+                //     text: '<i class="fas fa-download"></i>',
+                //     action: function ( e, dt, node, config ) {
+                //         $("#exportform").submit();
+                //     }
+                // }
+            ]
+    });
+
+        $('.addcaw').tooltip();
+        $('.export').tooltip();
+        // $( '.dt-buttons').addClass('btn-group');
+        $( '.addcaw').removeClass('dt-button');
+        $( '.export').removeClass('dt-button');
+</script>
+     
+@endsection
diff --git a/resources/views/jananotis/notisfasa1.blade.php b/resources/views/jananotis/notisfasa1.blade.php
new file mode 100644
index 00000000..4ada230c
--- /dev/null
+++ b/resources/views/jananotis/notisfasa1.blade.php
@@ -0,0 +1,47 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-12 mx-auto card">
+          @if ($message = Session::get('failed'))
+              <div class="alert alert-danger" style="margin-top:1%;">
+                  <p>{{ $message }}</p>
+              </div>
+          @endif
+            <h3 class="pt-3" style="margin-left:2%;">Notis Peringatan Fasa 1</h3>
+            
+            <form action="{{route('jananotis.gadaibycawnotisfasa1')}}" method="POST" id="formsenarai">
+              @csrf
+                <div class="form-group row" style="margin-top:1%; margin-left:1%;">
+                  {{-- <label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Tamat Kontrak</label> --}}
+                  {{-- <div>
+                    <input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh">
+                  </div> --}}
+                  <label for="tempoh" class="col-sm-1 col-form-label" style="margin-left:3%;">Dari Tempoh</label>
+                  <div>
+                    <input type="text" class="form-control" id="tempoh" name="tempoh" placeholder="" >
+                  </div>
+                  <label for="tempoh" class="col-sm-1 col-form-label" style="margin-left:3%;">Hingga Tempoh</label>
+                  <div>
+                    <input type="text" class="form-control" id="tempoh2" name="tempoh2" placeholder="" >
+                  </div>
+                  
+                </div>
+                
+                <div class="form-group row" style="margin-top:2%;">
+                  <div class="col-sm-10">
+                    <button type="button" class="btn btn-primary" onclick="carian()" style="margin-left:2%; width:9%;">Carian</button>                  
+                  </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script>
+    function carian() {  
+       $("#formsenarai").submit();
+    }
+</script>
+     
+@endsection
diff --git a/resources/views/lelong/senarailapbidaanpembida.blade.php b/resources/views/lelong/senarailapbidaanpembida.blade.php
index 782fce23..b8323ff2 100644
--- a/resources/views/lelong/senarailapbidaanpembida.blade.php
+++ b/resources/views/lelong/senarailapbidaanpembida.blade.php
@@ -18,7 +18,7 @@
                     <i class="fas fa-arrow-left"></i>
                 </a>
                 <div class="header-style-title">
-                    SENARAI BIDAAN PEMBIDA
+                    SENARAI BIDAAN PEMBIDA : {{$cawanganDetail->caw_name}}
                 </div>
             </div>
         
diff --git a/resources/views/lelong/senaraiubahrugilelongnew.blade.php b/resources/views/lelong/senaraiubahrugilelongnew.blade.php
index f085a3ed..0d627cfc 100644
--- a/resources/views/lelong/senaraiubahrugilelongnew.blade.php
+++ b/resources/views/lelong/senaraiubahrugilelongnew.blade.php
@@ -107,7 +107,7 @@
                             <th style="background-color: crimson">Caj Lelong Asal (RM)</th>
                             <th style="background-color: crimson">Baki/(Rugi) Asal (RM)</th>
                             <th style="background-color: rgb(17, 31, 94)">Caj Lelong Ubah (RM)</th>
-                            <th style="background-color: rgb(17, 31, 94p)">Baki/(Rugi) Ubah (RM)</th>
+                            <th style="background-color: rgb(17, 31, 94)">Baki/(Rugi) Ubah (RM)</th>
                             <th style="background-color: rgb(20, 220, 20)">Caj Lelong Baru (RM)</th>
                             <th style="background-color: rgb(20, 220, 20)">Baki/(Rugi) Baru (RM)</th>
                             {{-- <th>Tindakan</th> --}}
diff --git a/resources/views/notisperingatan/jananotisperingatan.blade.php b/resources/views/notisperingatan/jananotisperingatan.blade.php
new file mode 100644
index 00000000..66bc4353
--- /dev/null
+++ b/resources/views/notisperingatan/jananotisperingatan.blade.php
@@ -0,0 +1,130 @@
+@extends('layouts.app')
+
+@section('content')
+<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet"/>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/js/select2.min.js"></script>
+<div class="container">
+    <div class="row ">
+        <div class="col-10 mx-auto">
+          <div class="card">
+            <div class="card-header header-style">
+                <div class="header-style-title">
+                  Jana Notis Peringatan
+                </div>
+            </div>
+            <div class="card-body">
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    {{ $message }}
+                </div>
+            @endif
+            <form action="{{route('notisperingatan.senaraitempnotisperingatan')}}" method="POST" enctype="multipart/form-data">
+              @csrf
+              <div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
+                {{-- <div class="form-group row">
+                  <label for="tarikh_lelong" class="col-sm-2 col-form-label">Tarikh Lelong</label>
+                  <div class="col-sm-3">
+                    <input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong"  value = "{{$tetapan->tetap_tarikh_lelong}}">
+                  </div>
+                </div> --}}
+                <div class="form-group row">
+                  <label for="fasa" class="col-sm-2 col-form-label">Fasa Lelong</label>
+                  <div class="col-sm-4">
+                  <input type="radio" value='1' id="fasa1" name="fasa" checked>
+                    <label for="1">Fasa 1</label>
+                    <input type="radio" value='2'  id="fasa2" name="fasa">
+                    <label for="2">Fasa 2</label>  
+                  </div>
+                  <!-- <label for="cajlelong" class="col-sm-1 col-form-label">Caj Lelong</label>
+                    <div class="col-sm-4">
+                      <input type="text" class="form-control" id="cajlelong" name="cajlelong" placeholder="%">
+                    </div> -->
+                </div>
+             
+                  <div class="form-group row">
+                  <label for="jbg" class="col-sm-2 col-form-label">Dari Tempoh</label>
+                  <div class="col-sm-2" id="fasa_1">
+                    <input type="text" class="form-control" id="jbg" name="jbg" required>
+                  </div>
+                  <label for="jbg2" id="hinggatempoh" class="col-sm-2 col-form-label">Hingga Tempoh</label>
+                  <div class="col-sm-2" id="fasa_1">
+                    <input type="text" class="form-control" id="jbg2" name="jbg2">
+                  </div>
+                  
+                  
+                  <!-- <label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
+                  <div class="col-sm-4">
+                    <select class="selectpicker" multiple name="caw[]" id="caw">
+                      @foreach ($caw as $item)
+                      <option value="{{$item->id}}">{{$item->caw_name}}</option>
+                      @endforeach
+  
+                    </select>
+                  </div> -->
+                </div>
+                {{-- <div class="form-group row">
+                 
+                  <label for="cajlelong" class="col-sm-2 col-form-label">Caj Lelong</label>
+                    <div class="col-sm-4">
+                      <input type="text" class="form-control" id="cajlelong" name="cajlelong"  value = "{{$tetapan->cajlelong}}" readonly>
+                    </div>
+                </div> --}}
+
+                {{-- <div class="form-group row">
+                 
+                  <label for="cajlelong" class="col-sm-2 col-form-label">Kali</label>
+                    <div class="col-sm-4">
+                      <input type="text" class="form-control" id="kali" name="kali"  value = "{{$tetapan->kali}}" readonly>
+                    </div>
+                </div> --}}
+                <div class="form-group row">
+                  <div class="col-sm-10">
+                    <button type="submit" class="btn btn-primary">Carian</button>
+                  </div>
+                </div>
+            </form>
+            </div>
+          </div>
+        </div>
+        
+    </div>
+</div>
+<script>
+  var date = '<?php echo $currentDate; ?>';
+
+  $('#caw').select2({
+    width: '100%',
+    placeholder: "Pilih Cawangan",
+    allowClear: true
+  });
+
+  $(document).ready(function () {
+    // document.getElementById('tarikh_lelong').setAttribute("min", date);
+     $("input[name=fasa]").change(function(){
+
+        if($("#fasa1").is(':checked')){
+            $("#jbg").val('').prop("readonly", false);
+            document.getElementById("hinggatempoh").style.visibility = "visible";
+            document.getElementById("jbg2").style.visibility = "visible";
+        }
+        if($("#fasa2").is(':checked')){
+          $("#jbg").val('12').prop("readonly", true);
+          // $("#jbg2").val('12').prop("readonly", true);
+          document.getElementById("hinggatempoh").style.visibility = "hidden";
+          document.getElementById("jbg2").style.visibility = "hidden";
+        }
+    });
+ });
+</script>
+
+<script>
+$(function() {
+    $( "form" ).submit(function() {
+        $('#loader').show();
+        
+    });
+});
+</script>
+     
+@endsection
diff --git a/resources/views/notisperingatan/senaraimarhunnotis.blade.php b/resources/views/notisperingatan/senaraimarhunnotis.blade.php
new file mode 100644
index 00000000..21896b94
--- /dev/null
+++ b/resources/views/notisperingatan/senaraimarhunnotis.blade.php
@@ -0,0 +1,211 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="card-header header-style">
+                        <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                    <div class="header-style-title">
+                        senarai Sag : {{ $cawanganDetail->caw_name }}
+                    </div>
+                </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+                    @php
+                    $myDateTime = DateTime::createFromFormat('Y-m-d', $notislel->tarikh_notis );
+                    $t_notis = $myDateTime->format('d-m-Y');
+                    @endphp
+                      <div class="tab-content" id="nav-tabContent">
+                        <div class="tab-pane fade show active" id="nav-notis" role="tabpanel" aria-labelledby="nav-notis-tab">
+                        <br>
+                    <div class="col-6">
+                        <div class="form-group row">
+                            <label class="col-6 col-form-label text-left">Tarikh Notis</label>
+                            <div class="col-6">
+                                <div class="input-group">
+                                    <input type="text" readonly class="form-control bg-light" value="{{$t_notis}}">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-6">
+                        <div class="form-group row">
+                            <label class="col-6 col-form-label text-left">Dari Tempoh</label>
+                            <div class="col-6">
+                                <div class="input-group">
+                                    <input type="text" readonly class="form-control bg-light" value="{{$notislel->daritempoh}}">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-6 col-form-label text-left">Hingga Tempoh</label>
+                            <div class="col-6">
+                                <div class="input-group">
+                                    <input type="text" readonly class="form-control bg-light" value="{{$notislel->hinggatempoh}}">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-6">
+                        <div class="form-group row">
+                            <label class="col-6 col-form-label text-left">Bil SAG Cawangan</label>
+                            <div class="col-6">
+                                <div class="input-group">
+                                    <input type="text" readonly class="form-control bg-light" value="{{sizeof($notis_all)}}">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="mb-3">
+                        <a href=" {{ route('report.simulasireport',[$notis_id,$cawid]) }}" class="btn btn-outline-success">Surat Notis</a>
+                        <!-- <a href="{{ route('analisa.senaraimarhunlel',[$notis_id,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a> -->
+                        {{-- <a href="{{ route('analisa.listsagbycust',[$notis_id,'cawid'=>$cawid]) }}" class="btn btn-primary">Senarai Mengikut Nama Pelanggan</a> --}}
+                    </div>
+                  
+                    <form id="deletesag" action="" method="POST">
+                        @csrf
+                        <input type="hidden" name="notis_id" value="{{$notis_id}}">
+                        <input type="hidden" name="cawid" value="{{$cawid}}">
+                        <div style="overflow-x:auto">
+                        <table class="table table-bordered" id="marhun" style="width:100%">
+                            <thead class="bg-primary text-white">
+                                <tr class="text-center"> 
+                                    <th>No</th>
+                                    <th>No Rujukan</th>
+                                    <th>Nama</th>
+                                    <th>No.KP</th>
+                                    <th>Telefon</th>
+                                    <th>Tempoh</th>
+                                    <th>Berat (gm)</th>
+                                    <th>Nilai Marhun Asal (RM)</th>
+                                    <th>Pembiayaan Asal(RM)</th>
+                                    <th>Baki Pembiayaan (RM)</th>
+                                    <th>Keuntungan Telah Bayar (RM)</th>
+                                    <th>Keuntungan Semasa (RM)</th>
+                                    <th>Sttebus</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @php $rugilelong = 0;
+                                $bakilelong = 0;
+
+                                @endphp
+                                @foreach ($notis_all as $index=> $marhun)
+                                <tr>
+                                    <td>{{$loop->iteration}}</td>
+                                    <td style="white-space: nowrap;">{{ $marhun->norujukan}}</td>
+                                    <td>{{ $marhun->cust_info->nama}}</td>
+                                    <td>{{ $marhun->nokp}}</td>
+                                    <td>{{ $marhun->cust_info->telefon ? '6'.$marhun->cust_info->telefon : ''}}</td>
+                                    <td>{{ $marhun->jbg}}</td>
+                                    <td align="center">{{ $marhun->berat}}</td>
+                                    <td align="right">{{ number_format($marhun->nilaimarhun, 2, '.', ',') }}</td>
+                                    <td align="right">{{ number_format($marhun->pinjaman , 2, '.', ',') }}</td>
+                                    <td align="right">{{ number_format($marhun->bakipjm , 2, '.', ',') }}</td>
+                                    <td align="right">{{ number_format($marhun->ktlhbyr, 2, '.', ',') }}</td>  
+				                    <td align="right">{{ number_format($marhun->keuntungan, 2, '.', ',') }}</td>   
+                                    <td align="right">{{ $marhun->sttebus }}</td>                                   
+                                    {{-- <td class="text-center">
+                                        <input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
+                                    </td> --}}
+
+                                </tr>
+                                @endforeach
+                            </tbody>
+                            <tfoot class="bg-light">
+                                <tr>
+                                    <td colspan="6" class="text-center"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td align="center"><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td align="right"><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td align="right"><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td align="right"><b>{{ number_format($total_bakipjm, 2, '.', ',') }}</b></td>
+                                    <td align="right"><b>{{ number_format($total_ktlhbyr, 2, '.', ',') }}</b></td>
+                                    <td align="right"><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>                                    
+                                    <td align="right"></td>
+                                </tr>
+                            </tfoot>
+
+                        </table>
+                        </div>
+                        {{-- <div class="text-right pt-4">
+                            <!-- <a href="{{ route('analisa.show',$notis_id) }}" class="btn btn-primary">Kembali</a> -->
+                            <button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Hapus</button>
+                        </div> --}}
+                        {{-- <a href="{{url('simulasi/showsimulasi')}}" class="btn btn-primary">Kembali</a> --}}
+
+                    </form>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
+<script>
+    $("#btndelete").prop("enabled", true);
+
+    function btnDelete(e) {
+        var count = 0;
+        tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function() {
+            if ($(this).prop('checked') === true) {
+                count = count + 1;
+            }
+            // $(this).prop('checked', e.checked);
+        })
+        if (count != 0) {
+            $("#btndelete").prop("disabled", false);
+        } else {
+            $("#btndelete").prop("disabled", true);
+        }
+        // let checkbox = $('#checkboxdata').val();
+        // console.log(checkbox)
+        // $("#btndelete").prop("disabled", checkboxdata.length === 0);
+    }
+
+    function confirm() {
+        $.confirm({
+            title: 'Padam SAG',
+            content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
+            icon: 'fa fa-exclamation-triangle',
+            type: 'red',
+            boxWidth: '500px',
+            useBootstrap: false,
+            typeAnimated: true,
+            buttons: {
+                Batal: {
+                    btnClass: 'btn-default',
+                    action: function() {}
+                },
+                Padam: {
+                    btnClass: 'btn-danger',
+                    action: function() {
+                        $("#deletesag").submit();
+                        $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                    }
+                },
+            }
+        });
+    }
+
+    var tableMarhun = $('#marhun').DataTable({
+        "scrollX": true,
+        "pageLength": 500,
+    });
+</script>
+@endsection
diff --git a/resources/views/notisperingatan/senarainotisall.blade.php b/resources/views/notisperingatan/senarainotisall.blade.php
new file mode 100644
index 00000000..1a98106b
--- /dev/null
+++ b/resources/views/notisperingatan/senarainotisall.blade.php
@@ -0,0 +1,143 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                   
+                    <div class="header-style-title">
+                      
+                        butiran Notis Peringatan
+                    </div>
+                </div>
+                <div class="card-body">
+            @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <form id="exportform" action="" method="POST">
+                <input type="hidden" name="type" value="User">
+                <div style="overflow-x:auto">
+                    <table class="table text-center table-bordered" id="simulasi" style="width:100%">
+                        <thead class="bg-primary text-white">
+                            <tr>
+                                <th>No</th>
+                                <th>Tarikh Notis</th>
+                                {{-- <th>Tarikh Lelong</th> --}}
+                                {{-- <th>Fasa</th>
+                                <th align='left'>Cawangan</th> --}}
+                                {{-- <th>Harga Asas (RM)</th> --}}
+                                <th class="text-center">Tindakan</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+
+                            @forelse ($arrayinfo as $info)
+                            <tr>
+                                <td>{{$loop->iteration}}</td>
+                                <td> @php 
+                                    $myDateTime = DateTime::createFromFormat('Y-m-d', $info['info']['tarikh_notis']);
+                                    $datez = $myDateTime->format('d-m-Y');
+                                @endphp
+                                {{$datez}}</td>
+                                <td class="text-center">
+                                    <a class="btn m-1 btn-primary" href="{{ route('notisperingatan.shownotisperingatanall',[ 'tarikhnotis' => $info['info']['tarikh_notis'], 'notisid'=>$info['info']['id']]) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Lelong Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
+                                    {{-- <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Hapus"><i class="far fa-trash-alt"></i></a> --}}
+
+
+                                    </td>
+
+                            </tr>
+                            @empty
+                            <td colspan = '3'>Tiada Data</td>
+                            @endforelse
+                        </tbody>
+
+                    </table>
+                </div>
+            </form>
+        </div>
+
+    </div>
+</div>
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    $('a.confirmdel').confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'orange',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-warning',
+                action: function () {
+                    location.href = this.$target.attr('href');
+                }
+            },
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+
+        var tablesimulasi = $('#simulasi').DataTable( {
+            "columnDefs": [
+                {
+                "targets": 0,
+                "orderable": false
+                },
+                {
+                "targets": 4,
+                "orderable": false
+                }
+            ],
+            order: [[1, 'asc']],
+            // "ordering": false,
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            // buttons: [
+            //     // 'copy', 'excel', 'pdf'
+            //     // { text: 'copy', className: 'btn btn-primary' },
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Simulasi',
+            //         action: function ( e, dt, node, config ) {
+            //             alert( 'Button activated' );
+            //         }
+            //     },
+            //     {
+            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //         titleAttr: 'Export to CSV',
+            //         text: '<i class="fas fa-download"></i>',
+            //         action: function ( e, dt, node, config ) {
+            //             $("#exportform").submit();
+            //         }
+            //     }
+            // ]
+        });
+
+        $('.addsim').tooltip();
+        $('.export').tooltip();
+        // $( '.dt-buttons').addClass('btn-group');
+        $( '.addsim').removeClass('dt-button');
+        $( '.export').removeClass('dt-button');
+
+
+    function selectall(cb) {
+        tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+
+@endsection
diff --git a/resources/views/notisperingatan/senaraitempnotisperingatan.blade.php b/resources/views/notisperingatan/senaraitempnotisperingatan.blade.php
new file mode 100644
index 00000000..05ede1fe
--- /dev/null
+++ b/resources/views/notisperingatan/senaraitempnotisperingatan.blade.php
@@ -0,0 +1,188 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                   <div class="header-style-title">
+                        Butiran Gadaian Mengikut Cawangan Notis Peringatan Fasa {{$fasa}}
+                    </div>
+                </div>
+                <div class="card-body">
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger" style="margin-top:1%;">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+
+            {{-- @if (Session::has('message'))
+                <div class="alert alert-info">{{ Session::get('message') }}</div>
+            @endif --}}
+
+            {{-- <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}</h3> --}}
+            <!-- <form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data"> -->
+            <form action="{{route('notisperingatan.janadatanotisperingatan')}}" method="POST" enctype="multipart/form-data">
+            <!-- <form action="{{route('analisa.importgadaifrommaster')}}" method="POST" enctype="multipart/form-data"> -->
+
+            @csrf
+          
+           <input type="hidden" class="form-control" id="fasa" name="fasa" value="{{$fasa}}">
+             <div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
+
+            <div class="container">
+                <div>
+                    <div style="margin-top:2%; margin-bottom:2%;">
+                            
+                            <input type="hidden" class="form-control" id="jbg" name="jbg" value="{{$jbg}}">
+                            <input type="hidden" class="form-control" id="jbg2" name="jbg2" value="{{$jbg2}}">
+                            {{-- <input type="hidden" class="form-control" id="cajlelong" name="cajlelong" value="{{$cajlelong}}">
+                            <input type="hidden" class="form-control" id="kali" name="kali" value="{{$tetapan->kali}}">
+                             --}}
+
+                    </div>
+                </div>
+             </div>
+             <table class="table text-right table-bordered" id="senaraitemp" style="width:100%">
+                <thead class="bg-primary text-white">
+                        <tr>
+                            <th><input type="checkbox" aria-label="Checkbox for following text input" id="checkall"></th>
+                            <th>Bil</th>
+			                <th>Kod Cawangan</th>
+                            <th>Cawangan</th>
+                            <th>Bil Lelong</th>
+                            <th>Berat (gm)</th>
+                            <th>Nilai Marhun</th>
+                            {{-- <th>Pembiayaan (RM)</th> --}}
+                            <th>Baki Pembiayaan (RM)</th>
+                            <th class="text-center">Tindakan</th>
+                        </tr>
+                </thead>
+                <tbody>
+                    @php $count = 1; @endphp
+                    @foreach($senarai as $send)
+                        @if($send['bil_lelong'] > 0)
+                                
+                        <tr>
+                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}" class="checkbox"></td>
+                            <td>{{ $count++ }}</td>
+			                <td>{{ $send['kodcaw'] }}</td>
+                            <td>{{ $send['caw_name'] }}</td>
+                            <td>{{ $send['bil_lelong'] }} </td>
+                            <td>{{ number_format($send['total_berat'], 2) }} </td>
+                            <td>{{ number_format($send['total_nilaimarhun'], 2) }} </td>
+                            <td>{{ number_format($send['total_pembiayaan'] , 2) }} </td>
+                            {{-- <td>{{ number_format($send['total_bakipjm'] , 2) }} </td> --}}
+                            <td>
+                                @if($fasa == '1')
+                                <a href=" {{ route('notisperingatan.tempbycawnotisperingatan', ['kodcaw' => $send['kodcaw'],$jbg,$jbg2,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
+                                @else
+                                <a href=" {{ route('notisperingatan.tempbycawnotisperingatan2', ['kodcaw' => $send['kodcaw'],$jbg,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
+                                @endif
+                            </td>
+                        </tr>
+                         @endif       
+                    @endforeach
+                </tbody>
+            </table>
+           
+            <div class="modal-footer; text-center" style="margin-top:2%; margin-bottom:2%;">
+                <a  href="{{ route('notisperingatan.jananotisperingatan') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
+                <button type="submit" class="btn btn-success">Jana Notis</button>
+            </div> 
+        </form>
+        </div>
+    </div>
+</div>
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablesenaraitemp = $('#senaraitempsimulasi').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 8,
+                "orderable": false
+                }
+            ],
+            order: [[1, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            // buttons: [
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Cawangan',
+            //         action: function ( e, dt, node, config ) {
+            //             // alert( 'Button activated' );
+            //             // console.log('hye');
+                        
+            //             $('#myModal').modal("show");
+            //             $('#myModal').on('shown.bs.modal', function () {
+            //                 $('#rolename').trigger('focus')
+            //             })
+            //         }
+            //     },
+            //     {
+            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //         titleAttr: 'Export to CSV',
+            //         text: '<i class="fas fa-download"></i>',
+            //         action: function ( e, dt, node, config ) {
+            //             $("#exportform").submit();
+            //         }
+            //     }
+            // ]
+    });
+
+        // $('.addcaw').tooltip();
+        // $('.export').tooltip();
+        // // $( '.dt-buttons').addClass('btn-group');
+        // $( '.addcaw').removeClass('dt-button');
+        // $( '.export').removeClass('dt-button');
+</script>
+<script type='text/javascript'>
+    $(document).ready(function(){
+      // Check or Uncheck All checkboxes
+      $("#checkall").change(function(){
+        var checked = $(this).is(':checked');
+        if(checked){
+          $(".checkbox").each(function(){
+            $(this).prop("checked",true);
+          });
+        }else{
+          $(".checkbox").each(function(){
+            $(this).prop("checked",false);
+          });
+        }
+      });
+    
+     // Changing state of CheckAll checkbox 
+     $(".checkbox").click(function(){
+    
+       if($(".checkbox").length == $(".checkbox:checked").length) {
+         $("#checkall").prop("checked", true);
+       } else {
+         $("#checkall").prop("checked", false);
+       }
+   
+     });
+   });
+   </script>
+<script>
+$(function() {
+    $( "form" ).submit(function() {
+        $('#loader').show();
+        
+    });
+});
+</script>
+     
+@endsection
diff --git a/resources/views/notisperingatan/shownotisperingatan.blade.php b/resources/views/notisperingatan/shownotisperingatan.blade.php
new file mode 100644
index 00000000..9cfddc6a
--- /dev/null
+++ b/resources/views/notisperingatan/shownotisperingatan.blade.php
@@ -0,0 +1,331 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('notisperingatan.jananotisperingatan') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+
+                    </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+                    <nav>
+                        <div class="nav mb-3 nav-tabs" id="nav-tab" role="tablist">
+                            <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Notis Peringatan</a>
+                            {{-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> --}}
+                        </div>
+                    </nav>
+                    <div class="tab-content" id="nav-tabContent">
+                        <div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
+                            <form id="exportform" action="{{route('analisa.export')}}" method="POST">
+                                @csrf
+                                <input type="hidden" name="type" value="User">
+                                <input type="hidden" name="notisid" value="{{ $notis_id }}">
+                                <div class="row">
+                                    <div class="col-md-12 col-lg">
+                                        <div class="form-group row">
+                                            <label class="col-6 col-form-label">Tarikh Notis</label>
+                                            <div class="col-6">
+                                                <div class="input-group">
+                                                    @php 
+                                                        $myDateTime = DateTime::createFromFormat('Y-m-d', $notis->tarikh_notis);
+                                                        $datez = $myDateTime->format('d-m-Y');
+                                                    @endphp
+                                                    <input type="text" readonly class="form-control bg-light" value="{{$datez}}">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="form-group row">
+                                            <label class="col-6 col-form-label">Bilangan SAG</label>
+                                            <div class="col-6">
+                                                <div class="input-group">
+                                                    <input type="text" readonly class="form-control bg-light" value="{{$total_marhun}}">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        
+                                        <div class="form-group row">
+                                            <label class="col-6 col-form-label">Nilai Marhun Keseluruhan</label>
+                                            <div class="col-6">
+                                                <div class="input-group">
+                                                    <div class="input-group-prepend">
+                                                        <div class="input-group-text">RM</div>
+                                                    </div>
+                                                    <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_nilaimarhun, 2, '.', ',') }}">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-1"></div>
+                                    <div class="col-md-12 col-lg">
+                                        <div class="form-group row">
+                                            <label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
+                                            <div class="col-6">
+                                                <div class="input-group">
+                                                    <div class="input-group-prepend">
+                                                        <div class="input-group-text">RM</div>
+                                                    </div>
+                                                    <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakiupah, 2, '.', ',') }}">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="form-group row">
+                                            <label class="col-6 col-form-label">Pembiayaan Keseluruhan</label>
+                                            <div class="col-6">
+                                                <div class="input-group">
+                                                    <div class="input-group-prepend">
+                                                        <div class="input-group-text">RM</div>
+                                                    </div>
+                                                    <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_pinjaman, 2, '.', ',') }}">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                {{-- <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button> --}}
+
+                                <div style="overflow-x: auto;">
+                                <table class="table text-right table-bordered" id="simulasi">
+                                    <thead class="bg-primary text-center text-white">
+                                        <tr>
+                                            <th>No</th>
+                                            <th>Cawangan</th>
+                                            <th>Bil SAG</th>
+                                            <th>Berat (gm)</th>
+                                            <th>Nilai Marhun Asal (RM)</th>
+                                            <th>Pembiayaan (RM)</th>
+                                            <th>Keuntungan (RM)</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+
+                                        @foreach ($arraycaw as $index=>$caw)
+                                        <tr>
+                                            <td>{{$index+1}}</td>
+                                            <td style="white-space: nowrap;"><a href="" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                            <td>{{ $caw['bil_marhun'] }}</td>
+                                            <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                            <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                            <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                            <td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
+                                        </tr>
+                                        @endforeach
+                                    </tbody>
+                                    <tfoot class="bg-light">
+                                        <tr>
+                                            <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                            <td><b>{{ $total_marhun }}</b></td>
+                                            <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                            <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>
+                                        </tr>
+                                    </tfoot>
+
+                                </table>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="modal fade" tabindex="-1" id="modalfilter">
+                        <div class="modal-dialog modal-lg">
+                            <div class="modal-body">
+                                <form action="{{ route('analisa.filter') }}" method="POST" id="formfilter">
+                                    @csrf
+                                    <div class="row justify-content-center">
+                                        <div class="col-md-8">
+                                            <div class="form-group row">
+                                                <input type="hidden" name="idmarhun" id="idmarhun">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
+                                <button type="button" class="btn btn-primary" onclick="">Jana Semula Simulasi</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    $("#hideform").hide();
+    $('#btnsimpan').prop('disabled', true)
+
+    function kemaskini() {
+        var inputdata = $("td.input").find("input");
+        if (inputdata.length == 0) {
+            $("td.input").each(function(index) {
+                // console.log(index)
+                var la = $(this).html();
+                // if(index%2 ==0 ) //even-0-2-4
+                // {
+                $(this).html("<input type='text' name='harga2[]' id=harga2" + index + " value=" + la + " />");
+                // }
+                // else //odd-1-3-5-7
+                // {
+                //     $(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
+                // }
+            })
+            $("#hideform").show();
+            $("#btnkemaskini").hide();
+        } else {
+            $("td.input").each(function() {
+                var la = $(this).html();
+                $(this).html($(la).val());
+            })
+            $("#hideform").hide();
+            $("#btnkemaskini").show();
+        }
+    }
+
+    function calculate(e) {
+        let hargaasasbaru = $('#txthargaasas').val();
+
+        let jeniskarat = $(e).data('jeniskarat');
+
+        // let maxcolumn = 2;
+        let count = 0;
+        let indexarray = 0;
+        $("td.input").each(function(index) {
+            if (hargaasasbaru) {
+                $('#btnsimpan').prop('disabled', false)
+                // if(index%2 == 0)
+                // {
+                let harga1 = parseFloat(hargaasasbaru);
+                let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
+                let newhargaasas = harga1 + (harga2);
+                count++;
+                $('#harga2' + index).val(newhargaasas.toFixed(2));
+                // }
+                // else
+                // {
+                //     let harga1 = parseInt(hargaasasbaru);
+                //     let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']);
+                //     let newhargaasas = (harga1 + (harga2))/2.72;;
+                //     count++;
+                //     $('#harga'+index).val(newhargaasas.toFixed(2));
+                // }
+
+                // if(count == maxcolumn)
+                // {
+                //     count = 0;
+                indexarray++;
+                // }
+            } else {
+                $('#btnsimpan').prop('disabled', true)
+                let dummy = 0;
+                // if(index%2 == 0)
+                // {
+                $('#harga2' + index).val(dummy.toFixed(2));
+                // }
+                // else
+                // {
+
+                //     $('#harga'+index).val(dummy.toFixed(2));
+                // }
+            }
+        })
+
+    }
+
+    $('a.confirmDaftar').confirm({
+        title: 'Daftar Lelong',
+        content: 'Adakah anda pasti? Tindakan ini akan mengambil sedikit masa.',
+        icon: 'fa fa-exclamation-triangle',
+        type: 'blue',
+        boxWidth: '500px',
+        useBootstrap: false,
+        typeAnimated: true,
+        buttons: {
+            Batal: {
+                btnClass: 'btn-default',
+                action: function() {}
+            },
+            Daftar: {
+                btnClass: 'btn-blue',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                    $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                }
+            },
+        }
+    });
+
+    function save() {
+        $('#formhargaasas').submit();
+        $.dialog({
+            icon: 'fa fa-spinner fa-spin',
+            title: 'Dalam Proses !',
+            content: 'Halaman akan dikemaskini selepas proses selesai.',
+            closeIcon: false,
+            boxWidth: '500px',
+            useBootstrap: false,
+        });
+    }
+    $('a.confirmdel').confirm({
+        title: 'Pengesahan',
+        content: 'Anda pasti?',
+        type: 'orange',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-warning',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                }
+            },
+            Batal: {
+                btnClass: 'btn-default',
+                action: function() {}
+            }
+        }
+    });
+
+    var tablesimulasi = $('#simulasi').DataTable({
+        "pageLength": 50,
+    });
+
+    var tableJumlahBerat = $('#jumlahberat').DataTable({
+        "info": false,
+        "paging": false,
+        "searching": false,
+        "ordering": false
+    });
+
+    $('.addsim').tooltip();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    $('.addsim').removeClass('dt-button');
+    $('.export').removeClass('dt-button');
+
+
+    function selectall(cb) {
+        tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function() {
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+
+@endsection
diff --git a/resources/views/notisperingatan/shownotisperingatanall.blade.php b/resources/views/notisperingatan/shownotisperingatanall.blade.php
new file mode 100644
index 00000000..b0c98515
--- /dev/null
+++ b/resources/views/notisperingatan/shownotisperingatanall.blade.php
@@ -0,0 +1,372 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('notisperingatan.senarainotisall') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                       
+                        butiran Notis Peringatan
+                    </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+
+          
+              <div class="tab-content" id="nav-tabContent">
+                <div class="tab-pane fade show active" id="nav-notis" role="tabpanel" aria-labelledby="nav-notis-tab">
+                <br>
+                    <form id="exportform" action="{{route('lelong.exportkali')}}" method="POST">
+                        @csrf
+                        <input type="hidden" name="type" value="User">
+                        {{-- {{dd($tarikhnotis)}} --}}
+                        <input type="hidden" name="tarikhnotis" value="{{ $tarikhnotis }}">
+                        <input type="hidden" name="notisid" value="{{ $notisid }}">
+                        <div class="row">
+                            <div class="col-md-12 col-lg">
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Tarikh Notis</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value=" @php
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikhnotis );
+                                            $t_lelong =  $myDateTime->format('d-m-Y');
+                                            echo($t_lelong);
+                                        @endphp">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Bilangan Lelong</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value=" {{$total_marhun}}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Nilai Marhun Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_nilaimarhun, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Pembiayaan Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_pinjaman, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakiupah, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                               
+                            </div>
+                            <div class="col-md-2"></div>
+                           
+                        </div>
+                        <div class="mb-3">
+                            <a href=" {{ route('notisperingatan.kemaskinidatanotis',$tarikhnotis) }}" class="btn btn-outline-success">Kemaskini Data</a>
+                        </div>
+                        {{-- <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button> --}}
+                        <div style="overflow-x:auto">
+                        <table class="table text-right table-bordered" id="notis" style="width:100%">
+                            <thead class="bg-primary text-white">
+                                <tr class="text-center">
+                                    <th>No</th>
+                                    {{-- <th>T.Notis</th> --}}
+                                    <th>Cawangan</th>
+                                    <th>Bil SAG</th>
+                                    <th>Fasa</th>
+                                    <th>Dari JBG</th>
+                                    <th>Hingga JBG</th>
+                                    <th>Berat (gm)</th>
+                                    <th>Nilai Marhun Asal(RM)</th>
+                                    <th>Pembiayaan (RM)</th>
+                                    {{-- <th>Keuntungan (RM)</th> --}}
+                                    <th>Status</th>
+                                    <th>Surat Notis</th>
+                                    <th>Blast Whatsapp</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+
+                                @foreach ($arraycaw as $index=>$caw)
+                                <tr>
+                                    <td>{{$index+1}}</td>
+                                    {{-- <td style='white-space:nowrap;'>@php
+                                        $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_notis'] );
+                                        $t_lelong =  $myDateTime->format('d-m-Y');
+                                        echo($t_lelong);
+                                    @endphp</td> --}}
+                                    <td style='white-space:nowrap;'><a href=" {{ route('notisperingatan.senaraimarhunnotis',['notisid'=>$caw['notis_id'],'cawid'=>$caw['id_cawangan']]) }} " style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td>{{ $caw['bil_marhun'] }}</td>
+                                    <td>{{ $caw['fasa'] }}</td>
+                                    <td>{{ $caw['daritempoh'] }}</td>
+                                    <td>{{ $caw['hinggatempoh'] }}</td>
+                                    <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                    {{-- <td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td> --}}
+                                    {{-- {{dd($caw)}} --}}
+                                    <td>@if($caw['status'] == 1)
+                                        <span class="badge badge-pill badge-warning">
+                                        {{ 'Baru Daftar' }}
+                                        </span>
+                                        @elseif($caw['status'] == 2)
+                                        <span class="badge badge-pill badge-primary">
+                                        {{ 'Surat Notis' }}
+                                        </span>
+                                        @elseif($caw['status'] == 3)
+                                        <span class="badge badge-pill badge-success">
+                                        {{ 'Blast Whatsapp' }}
+                                        </span>
+                                        @endif
+
+                                        </td>
+                                    <td  class="text-center">
+                                        @if($caw['fasa'] == 1)
+                                        <a class="confirmrefresh btn m-1 btn-info" href="{{ route('notisperingatan.jananotisperingatan2',['notisid'=>$caw['notis_id'],'cawid'=>$caw['id_cawangan']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Notis Peringatan Fasa 1" style="margin-right:40px" ><i class="fas fa-download"></i></a>
+                                        @elseif($caw['fasa'] == 2)
+                                        <a class="confirmrefresh btn m-1 btn-info" href="{{ route('notisperingatan.jananotisperingatan2fasa2',['notisid'=>$caw['notis_id'],'cawid'=>$caw['id_cawangan']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Notis Peringatan Fasa 2" style="margin-right:40px" ><i class="fas fa-download"></i></a>
+                                        @endif
+                                    </td>
+                                    <td  class="text-center">
+                                        @if($caw['status'] == 2)
+                                        <a class="confirmrefresh btn m-1 btn-success" href="{{ route('notisperingatan.blastnotisperingatan',['notisid'=>$caw['notis_id'],'cawid'=>$caw['id_cawangan']]) }}" data-toggle="tooltip" data-placement="top" title="Blast Whatsapp" style="margin-right:40px" ><i class="fas fa-phone"></i></a>
+                                        @elseif($caw['status'] == 3)
+                                        SELESAI
+                                        @elseif($caw['status'] == 1)
+                                        BELUM POS DAFTAR
+                                        @endif
+                                    </td>
+                                </tr>
+                                @endforeach
+                            </tbody>
+                            <tfoot>
+                                <tr>
+                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td><b>{{ $total_marhun }}</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                </tr>
+                            </tfoot>
+
+                        </table>
+                        </div>
+                    </form>
+                </div>
+              
+        </div>
+        <div class="modal fade" tabindex="-1" id="modalfilter">
+            <div class="modal-dialog modal-lg">
+                {{-- <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Filter By</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div> --}}
+                    <div class="modal-body">
+                        <form action="{{ route('analisa.filter') }}" method="POST" id="formfilter">
+                            @csrf
+                            <div class="row justify-content-center">
+                                <div class="col-md-8">
+                                    <div class="form-group row">
+                                        <input type="hidden" name="idmarhun" id="idmarhun" >
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
+                        <button type="button" class="btn btn-primary" onclick="">Jana Semula notis</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    $("#hideform").hide();
+    $('#btnsimpan').prop('disabled', true)
+    function kemaskini() {
+       var inputdata =  $("td.input").find("input");
+       if(inputdata.length ==0)
+       {
+        $("td.input").each(function(index) {
+            // console.log(index)
+            var la = $(this).html();
+            // if(index%2 ==0 ) //even-0-2-4
+            // {
+                $(this).html("<input type='text' name='harga2[]' id=harga2"+index+" value="+la+" />");
+            // }
+            // else //odd-1-3-5-7
+            // {
+            //     $(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
+            // }
+        })
+        $("#hideform").show();
+        $("#btnkemaskini").hide();
+       }
+       else
+       {
+            $("td.input").each(function() {
+                var la = $(this).html();
+                $(this).html($(la).val());
+            })
+            $("#hideform").hide();
+            $("#btnkemaskini").show();
+       }
+    }
+    function calculate(e)
+    {
+        let hargaasasbaru = $('#txthargaasas').val();
+
+        let jeniskarat = $(e).data('jeniskarat');
+
+        // let maxcolumn = 2;
+        let count = 0;
+        let indexarray = 0;
+        $("td.input").each(function(index) {
+            if(hargaasasbaru)
+            {
+                $('#btnsimpan').prop('disabled', false)
+                // if(index%2 == 0)
+                // {
+                    let harga1 = parseFloat(hargaasasbaru);
+                    let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
+                    let newhargaasas = harga1 + (harga2);
+                    count++;
+                    $('#harga2'+index).val(newhargaasas.toFixed(2));
+                // }
+                // else
+                // {
+                //     let harga1 = parseInt(hargaasasbaru);
+                //     let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']);
+                //     let newhargaasas = (harga1 + (harga2))/2.72;;
+                //     count++;
+                //     $('#harga'+index).val(newhargaasas.toFixed(2));
+                // }
+
+                // if(count == maxcolumn)
+                // {
+                //     count = 0;
+                    indexarray++;
+                // }
+            }
+            else
+            {
+                $('#btnsimpan').prop('disabled', true)
+                let dummy =0;
+                // if(index%2 == 0)
+                // {
+                    $('#harga2'+index).val(dummy.toFixed(2));
+                // }
+                // else
+                // {
+
+                //     $('#harga'+index).val(dummy.toFixed(2));
+                // }
+            }
+        })
+
+    }
+    function save(){
+        $('#formhargaasas').submit();
+    }
+    $('a.confirmdel').confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'orange',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-warning',
+                action: function () {
+                    location.href = this.$target.attr('href');
+                }
+            },
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+
+    var tablenotis = $('#notis').DataTable( {
+        "columnDefs": [
+            {
+            "targets": 0,
+            "orderable": false
+            }
+        ],
+        order: [[0, 'asc']],
+        // "ordering": false,
+        "searching":false,
+        "info": false,
+        "lengthChange": false,
+        "pageLength": 15,
+        dom: 'Bfrtip',
+        buttons: [
+
+            // {
+            //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //     titleAttr: 'Download to PDF',
+            //     text: '<i class="fas fa-download"></i>',
+            //     action: function ( e, dt, node, config ) {
+            //         $("#exportform").submit();
+            //     }
+            // }
+        ]
+    });
+
+    $('.addsim').tooltip();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    $( '.addsim').removeClass('dt-button');
+    $( '.export').removeClass('dt-button');
+
+
+    function selectall(cb) {
+        tablenotis.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+
+@endsection
diff --git a/resources/views/notisperingatan/tempbycawnotisperingatan.blade.php b/resources/views/notisperingatan/tempbycawnotisperingatan.blade.php
new file mode 100644
index 00000000..0241fa69
--- /dev/null
+++ b/resources/views/notisperingatan/tempbycawnotisperingatan.blade.php
@@ -0,0 +1,137 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                        Butiran Gadaian Cawangan {{ $details }}
+                    </div>
+                </div>
+                <div class="card-body">
+            {{-- <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+           
+            <h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3> --}}
+            
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <form action="{{route('notisperingatan.senaraitempnotisperingatan')}}" id="formtlelong" method="POST">
+                   
+                    @csrf
+                <table class="table text-right table-bordered" id="detailsgadai" style="width:100%; margin-top:1%;">
+                    <thead class="bg-primary text-white">
+                            <tr>
+                                <th>Bil</th>
+                                <th>No Rujukan</th>
+                                <th>No Kad Pengenalan</th>
+                                <th>Tempoh</th>
+                                <th>Berat (gm)</th>
+                                <th>Nilai Marhun Asal (RM)</th>
+                                <th>Pembiayaan (RM)</th>
+                                <th>Baki Pembiayaan (RM)</th>
+                                <th>Jumlah Bayaran (RM)</th>
+                                <th>Keuntungan 6 Bulan (RM)</th>
+                                <th>Keuntungan Semasa (RM)</th>
+                                <th>Tamat Kontrak</th>
+                                
+                            </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($getsurat as $surat)
+                        {{-- {{dd($surat)}} --}}
+                            <tr>
+                                <td>{{ $loop->iteration }}</td>
+                                <td style='white-space:nowrap;'>{{ $surat->norujukan }}</td>
+                                <td>{{ $surat->nokp }}</td>
+                                <td>{{ $surat->tempoh }}</td>
+                                <td>{{ number_format($surat->berat , 2, '.', ',') }}</td>
+                                <td>{{ number_format($surat->nilaimarhun, 2, '.', ',') }}</td>
+                                <td>{{ number_format($surat->pinjaman , 2, '.', ',') }}</td>
+                                <td>{{ number_format($surat->bakipjm , 2, '.', ',') }}</td>
+                                <td>{{ number_format($surat->ktlhbyr , 2, '.', ',')}}</td>
+                                <td>{{ number_format($surat->bakiupah, 2, '.', ',') }}</td>
+                                <td>{{ number_format($surat->keuntungan , 2, '.', ',') }}</td>
+                                <td style='white-space:nowrap;'>{{ $surat->t_matang1 }}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+               
+            </form>
+        </div>
+    </div>
+</div>
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    function kembali() {  
+       $("#formtlelong").submit();
+    }
+    var tabledetailsgadai = $('#detailsgadai').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                },
+                {
+                "targets": 8,
+                "orderable": true
+                }
+            ],
+            order: [[0, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 1000,
+            dom: 'Bfrtip',
+            buttons: [
+                // {
+                //     className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+                //     text: '<i class="fas fa-plus" id="test"></i>',
+                //     titleAttr: 'PDF Senarai Gadaian',
+                //     action: function ( e, dt, node, config ) {
+                //         // alert( 'Button activated' );
+                //         // console.log('hye');
+                        
+                //         $('#myModal').modal("show");
+                //         $('#myModal').on('shown.bs.modal', function () {
+                //             $('#rolename').trigger('focus')
+                //         })
+                //     }
+                // },
+                // {
+                //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+                //     titleAttr: 'Senarai Gadaian Excel',
+                //     text: '<i class="fas fa-download"></i>',
+                //     action: function ( e, dt, node, config ) {
+                //         $("#exportform").submit();
+                //     }
+                // },
+                // {
+                //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+                //     titleAttr: 'Senarai Gadaian PDF',
+                //     text: '<i class="fas fa-download"></i>',
+                //     action: function ( e, dt, node, config ) {
+                //         $("#exportform").submit();
+                //     }
+                // }
+            ]
+    });
+
+        $('.addcaw').tooltip();
+        $('.export').tooltip();
+        // $( '.dt-buttons').addClass('btn-group');
+        $( '.addcaw').removeClass('dt-button');
+        $( '.export').removeClass('dt-button');
+</script>
+     
+@endsection
diff --git a/resources/views/pdf/gadaibycawnotisfasa1pdf.blade.php b/resources/views/pdf/gadaibycawnotisfasa1pdf.blade.php
new file mode 100644
index 00000000..db49931c
--- /dev/null
+++ b/resources/views/pdf/gadaibycawnotisfasa1pdf.blade.php
@@ -0,0 +1,197 @@
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    /* border-collapse: collapse; */
+      width: 100%;
+  }
+  
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      /* border: 1px solid; */
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim2 {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    /* border-collapse: collapse; */
+      width: 100%;
+  }
+  
+  #sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim2 th {
+      /* border: 1px solid; */
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim2 tr:nth-child(even){}
+  
+  #sim2 tr:hover {}
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 0px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+  }
+  
+  tr:nth-child(even) {
+  }
+
+  .font{
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:12px;
+  }
+
+
+  
+  </style>
+  
+  <style>
+    /** Define now the real margins of every page in the PDF **/
+    body {
+        margin-top: 1cm;
+        /* margin-left: 2cm; */
+        /* margin-right: 2cm; */
+        margin-bottom: 2cm;
+    }
+    
+    /** Define the header rules **/
+    header {
+        position: fixed;
+        top: -1cm;
+        left: 0cm;
+        right: 0cm;
+        height: 0cm;
+        /** Extra personal styles **/
+        /* background-color: #eaeaea; */
+        color: black;
+        text-align: center;
+        line-height: 1.5cm;
+        font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:15px;
+    }
+    
+    /** Define the footer rules **/
+    footer {
+        position: fixed;
+        bottom: 0cm;
+        left: 0cm;
+        right: 0cm;
+        height: 2cm;
+    
+        /** Extra personal styles **/
+        /* background-color: #eaeaea; */
+        color: black;
+        text-align: center;
+        line-height: 1.5cm;
+    }
+    footer .pagenum:before {
+        content: counter(page);
+    }
+    </style>
+
+  <div class="row">
+    {{-- <div class="first-prgph"><img src="http://lelong.test/img/icon_pkb.png" alt="PKB LOGO" width="100" height="100"><br></div>      --}}
+    <body>
+    <header>
+      <div class="font"><u><b><h5>SENARAI NOTIS PERINGATAN FASA 1</h5></b></u></div>
+      </header>
+                            <table align="left" id="sim2">
+                                <thead>
+                                    <th>Cawangan : </b>{{ $cawanganDetail['caw_name'] }}</th>  
+                                    <th>Bilangan Surat : </b>{{ $bil_lelongcaw[0]['bil_lelong'] }}</th>     
+                                </thead>
+                              </table>
+
+  </div>
+                            <br>
+                            <table  cellspacing="0" cellpadding="5" style="float:right;" border="1" width="100%" height="80" align="left" id="sim">                        
+                                <thead>
+                                  <th>Bil</th>
+                                  <th>No Rujukan</th>
+                                  {{-- <th>Nama</th> --}}
+                                  <th>No.KP</th>
+                                  <th>No.Telefon</th>
+                                  <th>Marhun</th>
+                                  <th>Berat (gm)</th>
+                                  <th>Tempoh</th>
+                                  <th>Pembiayaan (RM)</th>
+                                  <th>Baki Pembiayaan (RM)</th>
+                                  <th>Keuntungan 6 Bulan (RM)</th>
+                                  <th>Keuntungan Telah Bayar (RM)</th>
+                                </thead>
+                                @foreach($getsurat as $surat)
+                                <tr>
+                                  <td>{{ $loop->iteration }}</td>
+                                  <td style='word-wrap'>{{ $surat['list_norujukan'][0]['norujukan'] }}</td>
+                                  {{-- <td>{{ $surat['nama'][0]['nama'] ?? NULL}}</td> --}}
+                                  <td>{{ $surat['list_norujukan'][0]['nokp'] }}</td>
+                                  <td>6{{ $surat['nama'][0]['telefon'] ?? NULL}}</td>
+                                  <td>{{ $surat['list_norujukan'][0]['marhun'] }}</td>
+                                  <td align="right">{{ $surat['list_norujukan'][0]['berat'] }}</td>    
+                                  <td>{{ $surat['list_norujukan'][0]['tempoh'] }}</td>
+                                  <td align="right">{{ $surat['list_norujukan'][0]['pinjaman'] }}</td>
+                                  <td align="right">{{ $surat['list_norujukan'][0]['bakipjm'] }}</td>
+                                  <td align="right">{{ $surat['list_norujukan'][0]['bakiupah'] }}</td>
+                                  <td>{{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}</td>
+    
+                                
+                                </tr>
+                            @endforeach
+                        </table>
+  
+                        </div>
+  
+                              
+                              
+                       
+                             
+                            </tbody>
+                          </table>
+                        </body>
+    
+                      
+    
+                      
\ No newline at end of file
diff --git a/resources/views/pdf/jananotisperingatan.blade.php b/resources/views/pdf/jananotisperingatan.blade.php
new file mode 100644
index 00000000..fe68d64c
--- /dev/null
+++ b/resources/views/pdf/jananotisperingatan.blade.php
@@ -0,0 +1,228 @@
+<style>
+  #header {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #header td, #customers th {
+   
+    padding-left:4px;
+    font-size:12px;
+  }
+  
+  #header tr:nth-child(even){background-color: #ffffff;}
+  
+  #header tr:hover {background-color: #ddd;}
+  
+  #header th {
+    /* padding-top: 12px;
+    padding-bottom: 12px; */
+    text-align: left;
+    /* padding:4px; */
+    color:black;
+  }
+  </style>
+  
+  
+  
+  
+  <style>
+  #scan {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #scan td, #scan th {
+   
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #scan tr:nth-child(even){background-color: #ffffff;}
+  
+  #scan tr:hover {background-color: #ddd;}
+  
+  #scan th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  <style>
+  #scan {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #scan td, #scan th {
+    border-collapse: collapse;
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #scan tr:nth-child(even){background-color: #ffffff;}
+  
+  #scan tr:hover {background-color: #ddd;}
+  
+  #scan th {
+    border-collapse: collapse;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  
+  <style>
+  #details {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #details td, #details th {
+   
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #details tr:nth-child(even){background-color: #ffffff;}
+  
+  #details tr:hover {background-color: #ddd;}
+  
+  #details th {
+    padding-top: 12px;
+   font-style:bold;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  .container{
+    page-break-after:always;
+    padding: 20px 20px 20px 20px;
+  }
+  .tablestyle{
+    font-size:12px;
+  }
+  .tablestyle td, .tablestyle th{
+    /* padding-top: 12px; */
+    /* border:1px solid black; */
+  
+  }
+  .page-break {
+      page-break-before: always;
+  }
+  </style>
+@foreach($marhuns as $index1=> $notis)
+{{-- {{dd($notis['nama']['alamat1'])}} --}}
+
+
+
+
+  <div class="container">
+    <table id="header">
+      <tr>
+        {{-- <th rowspan="4"style="width:100px"><br><img src="{{ asset('img/icon_pkb.png') }}" style="width:70px"></img></th> --}}
+        <th colspan="1">{{ $caw['caw_name'] }}</th>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ $caw['alamat1'] }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ $caw['alamat2'] }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ ' No Tel : '. $caw['notel'] . ' No Faks : '. $caw['nofaks'] }}</td>
+        <td></td>
+      </tr>
+    </table>
+    <br>
+  
+  
+    <div>
+      <table class="tablestyle">
+        <tr>
+          <td width="15%">TARIKH CETAK 
+          </td>
+          <td width="1%">:</td>
+          <td width="50%">@php 
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+                $datez = $myDateTime->format('d-m-Y');
+                echo($datez);
+            @endphp
+            @php 
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $notis->t_matang);
+                $datez1 = $myDateTime->format('d-m-Y');
+                // echo($datez);
+            @endphp
+            <td colspan="3"></td>
+  </td>
+        </tr>
+        <tr>
+          <td><br></td>
+        </tr>
+        <tr>
+          <td>NO RUJUKAN</td>
+          <td>:</td>
+          <td>{{ $notis['norujukan']}}</td>
+          <td></td>
+          <td></td>
+          <td width="14%">NO TELEFON</td>
+          <td width="1%">:</td>
+          <td>{{ $notis['nama']['telefon'] }}</td>
+  
+        </tr>
+        <tr>
+          <td style="vertical-align:top;">KEPADA</td>
+          <td style="vertical-align:top;">:</td>
+          <td style="vertical-align:top;">{{ $notis['nama']['nama']}}
+            <br> {{ strtoupper($notis['nama']['alamat1']) }} 
+            {{-- {!! ($notis['nama']['alamat1'] === null || $notis['nama']['alamat1'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat1']) !!} <br>  --}} <br>
+          {{ ' ' . $notis['nama']['poskod'] . ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}}</td>
+          
+          <td></td>
+          <td></td>
+          <td style="vertical-align:top;">NO K/P</td>
+          <td style="vertical-align:top;">:</td>
+          <td style="vertical-align:top;"> {{ $notis['nokp'] }}</td>
+        </tr>
+      </table>
+
+  
+      <p>Tuan/Puan,</p>
+      <h4><u>NOTIS PEMBERITAHUAN</u></h4>
+      <p>Dengan hormatnya dimaklumkan gadaian tuan/puan bernombor <b>{{$notis->norujukan}}</b> dengan jumlah pembiayaan
+        sebanyak <b>RM{{number_format($notis->bakipjm, 2, '.', ',')}}</b> akan/telah tamat tarikh matang gadaiannya pada <b>{{$datez1}}</b> yang telah mencecah <b>{{$notis->tempoh}}</b> bulan.
+        Tuan/puan atau wakil adalah dikehendaki menebus/membayar <b>KOS KEUNTUNGAN</b> tersebut secepat mungkin.
+        Jika pihak tuan/puan menghadapi sebarang masalah, sila hubungi kami sebagaimana alamat di atas ATAU
+        datang sendiri ke AR-RAHN dengan membawa bersama salinan asal Surat Akaun Gadaian tuan/puan.</p>
+      
+    
+  
+      <p>Sekian, terima kasih.</p>
+  
+
+
+
+      <p>Nota:</p>
+      <i>Sila abaikan notis ini sekiranya pihak tuan/puan telah membuat urusan di atas.</i>
+      <br>
+
+      <i>Notis ini adalah cetakan berkomputer dan tiada tandatangan diperlukan</i>
+    
+    </div>
+  </div>
+  @endforeach
\ No newline at end of file
diff --git a/resources/views/pdf/jananotisperingatan2.blade.php b/resources/views/pdf/jananotisperingatan2.blade.php
new file mode 100644
index 00000000..7809d07f
--- /dev/null
+++ b/resources/views/pdf/jananotisperingatan2.blade.php
@@ -0,0 +1,228 @@
+<style>
+  #header {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #header td, #customers th {
+   
+    padding-left:4px;
+    font-size:12px;
+  }
+  
+  #header tr:nth-child(even){background-color: #ffffff;}
+  
+  #header tr:hover {background-color: #ddd;}
+  
+  #header th {
+    /* padding-top: 12px;
+    padding-bottom: 12px; */
+    text-align: left;
+    /* padding:4px; */
+    color:black;
+  }
+  </style>
+  
+  
+  
+  
+  <style>
+  #scan {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #scan td, #scan th {
+   
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #scan tr:nth-child(even){background-color: #ffffff;}
+  
+  #scan tr:hover {background-color: #ddd;}
+  
+  #scan th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  <style>
+  #scan {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #scan td, #scan th {
+    border-collapse: collapse;
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #scan tr:nth-child(even){background-color: #ffffff;}
+  
+  #scan tr:hover {background-color: #ddd;}
+  
+  #scan th {
+    border-collapse: collapse;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  
+  <style>
+  #details {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #details td, #details th {
+   
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #details tr:nth-child(even){background-color: #ffffff;}
+  
+  #details tr:hover {background-color: #ddd;}
+  
+  #details th {
+    padding-top: 12px;
+   font-style:bold;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  .container{
+    page-break-after:always;
+    padding: 20px 20px 20px 20px;
+  }
+  .tablestyle{
+    font-size:12px;
+  }
+  .tablestyle td, .tablestyle th{
+    /* padding-top: 12px; */
+    /* border:1px solid black; */
+  
+  }
+  .page-break {
+      page-break-before: always;
+  }
+  </style>
+@foreach($marhuns as $index1=> $notis)
+{{-- {{dd($notis['nama']['alamat1'])}} --}}
+
+
+
+
+  <div class="container">
+    <table id="header">
+      <tr>
+        {{-- <th rowspan="4"style="width:100px"><br><img src="{{ asset('img/icon_pkb.png') }}" style="width:70px"></img></th> --}}
+        <th colspan="1">{{ $caw['caw_name'] }}</th>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ $caw['alamat1'] }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ $caw['alamat2'] }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ ' No Tel : '. $caw['notel'] . ' No Faks : '. $caw['nofaks'] }}</td>
+        <td></td>
+      </tr>
+    </table>
+    <br>
+  
+  
+    <div>
+      <table class="tablestyle">
+        <tr>
+          <td width="15%">TARIKH CETAK 
+          </td>
+          <td width="1%">:</td>
+          <td width="50%">@php 
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+                $datez = $myDateTime->format('d-m-Y');
+                echo($datez);
+            @endphp
+            @php 
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $notis->t_matang1);
+                $datez1 = $myDateTime->format('d-m-Y');
+                // echo($datez);
+            @endphp
+            <td colspan="3"></td>
+  </td>
+        </tr>
+        <tr>
+          <td><br></td>
+        </tr>
+        <tr>
+          <td>NO RUJUKAN</td>
+          <td>:</td>
+          <td>{{ $notis['norujukan']}}</td>
+          <td></td>
+          <td></td>
+          <td width="14%">NO TELEFON</td>
+          <td width="1%">:</td>
+          <td>{{ $notis['nama']['telefon'] }}</td>
+  
+        </tr>
+        <tr>
+          <td style="vertical-align:top;">KEPADA</td>
+          <td style="vertical-align:top;">:</td>
+          <td style="vertical-align:top;">{{ $notis['nama']['nama']}}
+            <br> {{ strtoupper($notis['nama']['alamat1']) }} 
+            {{-- {!! ($notis['nama']['alamat1'] === null || $notis['nama']['alamat1'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat1']) !!} <br>  --}} <br>
+          {{ ' ' . $notis['nama']['poskod'] . ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}}</td>
+          
+          <td></td>
+          <td></td>
+          <td style="vertical-align:top;">NO K/P</td>
+          <td style="vertical-align:top;">:</td>
+          <td style="vertical-align:top;"> {{ $notis['nokp'] }}</td>
+        </tr>
+      </table>
+
+  
+      <p>Tuan/Puan,</p>
+      <h4><u>NOTIS PEMBERITAHUAN</u></h4>
+      <p>Dengan hormatnya dimaklumkan gadaian tuan/puan bernombor <b>{{$notis->norujukan}}</b> dengan jumlah pembiayaan
+        sebanyak <b>RM{{number_format($notis->bakipjm, 2, '.', ',')}}</b> akan/telah tamat kontrak gadaiannya pada <b>{{$datez1}}</b> yang telah mencecah <b>{{$notis->tempoh}}</b> bulan.
+        Tuan/puan atau wakil adalah dikehendaki menebus/membayar <b>KOS KEUNTUNGAN</b> tersebut secepat mungkin.
+        Jika pihak tuan/puan menghadapi sebarang masalah, sila hubungi kami sebagaimana alamat di atas ATAU
+        datang sendiri ke AR-RAHN dengan membawa bersama salinan asal Surat Akaun Gadaian tuan/puan.</p>
+      
+    
+  
+      <p>Sekian, terima kasih.</p>
+  
+
+
+
+      <p>Nota:</p>
+      <i>Sila abaikan notis ini sekiranya pihak tuan/puan telah membuat urusan di atas.</i>
+      <br>
+
+      <i>Notis ini adalah cetakan berkomputer dan tiada tandatangan diperlukan</i>
+    
+    </div>
+  </div>
+  @endforeach
\ No newline at end of file
diff --git a/resources/views/pdf/jananotisperingatanfasa1.blade.php b/resources/views/pdf/jananotisperingatanfasa1.blade.php
new file mode 100644
index 00000000..7b0f62b2
--- /dev/null
+++ b/resources/views/pdf/jananotisperingatanfasa1.blade.php
@@ -0,0 +1,223 @@
+<style>
+  #header {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #header td, #customers th {
+   
+    padding-left:4px;
+    font-size:12px;
+  }
+  
+  #header tr:nth-child(even){background-color: #ffffff;}
+  
+  #header tr:hover {background-color: #ddd;}
+  
+  #header th {
+    /* padding-top: 12px;
+    padding-bottom: 12px; */
+    text-align: left;
+    /* padding:4px; */
+    color:black;
+  }
+  </style>
+  
+  
+  
+  
+  <style>
+  #scan {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #scan td, #scan th {
+   
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #scan tr:nth-child(even){background-color: #ffffff;}
+  
+  #scan tr:hover {background-color: #ddd;}
+  
+  #scan th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  <style>
+  #scan {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #scan td, #scan th {
+    border-collapse: collapse;
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #scan tr:nth-child(even){background-color: #ffffff;}
+  
+  #scan tr:hover {background-color: #ddd;}
+  
+  #scan th {
+    border-collapse: collapse;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  
+  <style>
+  #details {
+    /* font-family: Arial, Helvetica, sans-serif; */
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #details td, #details th {
+   
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #details tr:nth-child(even){background-color: #ffffff;}
+  
+  #details tr:hover {background-color: #ddd;}
+  
+  #details th {
+    padding-top: 12px;
+   font-style:bold;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  .container{
+    page-break-after:always;
+    padding: 20px 20px 20px 20px;
+  }
+  .tablestyle{
+    font-size:12px;
+  }
+  .tablestyle td, .tablestyle th{
+    /* padding-top: 12px; */
+    /* border:1px solid black; */
+  
+  }
+  .page-break {
+      page-break-before: always;
+  }
+  </style>
+@foreach($marhuns as $index1=> $notis)
+{{-- {{dd($notis['nama']['alamat1'])}} --}}
+
+
+
+
+  <div class="container">
+    <table id="header">
+      <tr>
+        {{-- <th rowspan="4"style="width:100px"><br><img src="{{ asset('img/icon_pkb.png') }}" style="width:70px"></img></th> --}}
+        <th colspan="1">{{ $caw['caw_name'] }}</th>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ $caw['alamat1'] }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ $caw['alamat2'] }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ ' No Tel : '. $caw['notel'] . ' No Faks : '. $caw['nofaks'] }}</td>
+        <td></td>
+      </tr>
+    </table>
+    <br>
+  
+  
+    <div>
+      <table class="tablestyle">
+        <tr>
+          <td width="15%">TARIKH CETAK 
+          </td>
+          <td width="1%">:</td>
+          <td width="50%">@php 
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+                $datez = $myDateTime->format('d-m-Y');
+                echo($datez);
+            @endphp
+            <td colspan="3"></td>
+  </td>
+        </tr>
+        <tr>
+          <td><br></td>
+        </tr>
+        <tr>
+          <td>NO RUJUKAN</td>
+          <td>:</td>
+          <td>{{ $notis['norujukan']}}</td>
+          <td></td>
+          <td></td>
+          <td width="14%">NO TELEFON</td>
+          <td width="1%">:</td>
+          <td>{{ $notis['nama']['telefon'] ?? NULLL }}</td>
+  
+        </tr>
+        <tr>
+          <td style="vertical-align:top;">KEPADA</td>
+
+          <td style="vertical-align:top;">:</td>
+          <td style="vertical-align:top;">{{ $notis['nama']['nama'] ?? NULL}}
+            <br> {{ strtoupper($notis['nama']['alamat1']  ?? NULL )  }} 
+            {{-- {!! ($notis['nama']['alamat1'] === null || $notis['nama']['alamat1'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat1']) !!} <br>  --}} <br>
+          {{ ' ' . $notis['nama']['poskod'] ?? NULL. ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}}</td>
+          
+          <td></td>
+          <td></td>
+          <td style="vertical-align:top;">NO K/P</td>
+          <td style="vertical-align:top;">:</td>
+          <td style="vertical-align:top;"> {{ $notis['nokp'] }}</td>
+        </tr>
+      </table>
+
+  
+      <p>Tuan/Puan,</p>
+      <h4><u>NOTIS PEMBERITAHUAN</u></h4>
+      <p>Dengan hormatnya dimaklumkan gadaian tuan/puan bernombor <b>{{ $notis['norujukan']}}</b> dengan jumlah baki pembiayaan sebanyak <b>RM {{ number_format($notis['bakipjm'] , 2, '.', ',')}}</b> telah tamat tempoh gadaiannya pada <b>@php 
+        $myDateTime1 = DateTime::createFromFormat('Y-m-d', $notis['t_matang']);
+            $datez1 = $myDateTime1->format('d-m-Y');
+            echo($datez1);
+        @endphp</b> dan telah mencecah <b>{{ $notis['tempoh']}}</b> bulan.
+      Tuan/puan atau wakil adalah dikehendaki menebus/membayar ANSURAN PEMBIAYAAN tersebut secepat mungkin. Jika pihak tuan/puan menghadapi sebarang masalah, sila hubungi kami sebagaimana alamat di atas ATAU datang sendiri ke premis AR-RAHN kami.</p>
+  
+     
+
+
+      <p>Notis:</p>
+      <i>Sila bawa bersama Surat Akaun Gadai (SAG) untuk sebarang urusan.</i>
+      <br>
+
+      <i>Sila abaikan notis ini sekiranya penebusan telah dibuat.</i>
+  
+      <p>Surat ini adalah cetakan komputer dan tiada tandatangan diperlukan</p>
+  
+    </div>
+  </div>
+  @endforeach
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index e802ec95..ad66262b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -653,6 +653,12 @@ Route::group(['middleware' => ['permission:notisperingatan'], 'prefix' => 'notis
     Route::post('/gadaibycawnotisfasa1',['as'=>'notisperingatan.gadaibycawnotisfasa1','uses'=>'NotisController@gadaibycawnotisfasa1']); 
     Route::get('/gadaibycawnotisfasa1pdf/{tempoh}/{tempoh2}',['as'=>'notisperingatan.gadaibycawnotisfasa1pdf','uses'=>'NotisController@gadaibycawnotisfasa1pdf']); 
     Route::get('/gadaibycawnotisfasa1excel/{tempoh}/{tempoh2}',['as'=>'notisperingatan.gadaibycawnotisfasa1excel','uses'=>'NotisController@gadaibycawnotisfasa1excel']); 
+
+    Route::get('/kemaskinidatanotis/{tarikhnotis}',['as'=>'notisperingatan.kemaskinidatanotis','uses'=>'NotisController@kemaskinidatanotis']);
+    Route::get('/jananotisperingatan2/{notisid}/{cawid}',['as'=>'notisperingatan.jananotisperingatan2','uses'=>'NotisController@jananotisperingatan2']); 
+    Route::get('/jananotisperingatan2fasa2/{notisid}/{cawid}',['as'=>'notisperingatan.jananotisperingatan2fasa2','uses'=>'NotisController@jananotisperingatan2fasa2']); 
+    Route::get('/blastnotisperingatan/{notisid}/{cawid}',['as'=>'notisperingatan.blastnotisperingatan','uses'=>'NotisController@blastnotisperingatan']); 
+
 });
 // Route::get('/sms', [SmsController::class, 'index']);