diff --git a/app/Http/Controllers/CallCenterController.php b/app/Http/Controllers/CallCenterController.php
index 98861eb..a0ddbe3 100644
--- a/app/Http/Controllers/CallCenterController.php
+++ b/app/Http/Controllers/CallCenterController.php
@@ -51,7 +51,11 @@ class CallCenterController extends Controller
         $daritempoh = $request->daritempoh;
         $hinggatempoh = $request->hinggatempoh;
 
-        $cawangan_all = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/arcc/cawangan')->json();
+        $cawangan_all = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/arcc/cawangan',[
+            'daritempoh' => $daritempoh,
+            'hinggatempoh' => $hinggatempoh,
+        ])->json();
+
         $senarai = [];
         foreach($cawangan_all as $cawangan){
                     $kodcaw = $cawangan['kodcaw'];
@@ -126,16 +130,6 @@ class CallCenterController extends Controller
 
     }
 
-    // public function rekodnotisperingatan(Request $request){
-    //     $auth_user = Auth::user();
-    //     $api_url = config('api.url');
-
-
-    //     $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-    //     $rekodblast = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/rekodblast/'. $auth_user['cawangan'])->json();
-    //     return view('callcenter.rekodnotisperingatan',compact('cawangan_info','api_url','rekodblast'));
-    // }
-
     public function rekodnotisperingatan()
     {
         $auth_user = Auth::user();
@@ -166,7 +160,6 @@ class CallCenterController extends Controller
         $senarai = [];
 
         $detailnotis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/arcc/getcawnotis/'.$notisid)->json();
-        // dd($detailnotis[0]);
         foreach($detailnotis as $info)
         {
             $getcawnotisbycaw = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/arcc/getcawnotisbycaw', [
@@ -175,14 +168,62 @@ class CallCenterController extends Controller
             ])->json();
 
             $data = [
-                'kodcaw'=>$info[0]['kodcaw'],
-                'caw_name'=>$info[0]['details_caw'],
+                'detailnotis' => $info ? $info : '',
                 'getcawnotisbycaw' => $getcawnotisbycaw ? $getcawnotisbycaw : '',
             ];
 
-            array_push($senarai,$info,$data, ['info'=> $info, 'data'=>$data]);
+            array_push($senarai,$data);
         }
-        return view('callcenter.detailnotisperingatan',compact('detailnotis','senarai'));
+        return view('callcenter.detailnotisperingatan',compact('detailnotis','senarai','notisid'));
+    }
+
+    public function bycawnotisperingatan($kodcaw,$notisid, Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $kodcaw)->json();
+        $bycawnotisperingatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/arcc/bycawnotisperingatan/'.$kodcaw.'/'.$notisid)->json();
+        
+        if($request->type == 'whatsapp')
+        {
+
+            $blastwhatsapp = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/arcc/blastwasapbysag/'.$auth_user['cawangan'],
+            ['kodcaw' => $kodcaw,'notisid' => $notisid, 'namapengguna' => $auth_user['name'],])->json();
+            if($blastwhatsapp == 'success'){
+                return redirect()->route('arcc.bycawnotisperingatan',['kodcaw' => $kodcaw, 'notisid' => $notisid])
+                ->with('success','Blast Whatsapp Dalam Proses.');
+            }
+            elseif($blastwhatsapp == 'failed'){
+                return redirect()->route('arcc.bycawnotisperingatan',['kodcaw' => $kodcaw, 'notisid' => $notisid])
+                ->with('failed','Blast Whatsapp Tidak Berjaya, Sila Semak Semula Rekod Blasted.');
+            }
+            
+        }
+        return view('callcenter.bycawdetailnotisperingatan',compact('cawangan_info','bycawnotisperingatan','kodcaw','notisid'));
+    }
+
+    public function blastpertama($kodcaw,$notisid,Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $kodcaw)->json();
+        $bycawnotisperingatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/arcc/bycawnotisperingatan/'.$kodcaw.'/'.$notisid)->json();        
+        if($request->type == 'whatsapp')
+        {
+
+            $blastwhatsapp = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/arcc/blastwasapbysag',
+            ['kodcaw' => $kodcaw,'notisid' => $notisid, 'namapengguna' => $auth_user['name'],])->json();
+            if($blastwhatsapp == 'success'){
+                return redirect()->route('arcc.bycawnotisperingatan',['kodcaw' => $kodcaw, 'notisid' => $notisid])
+                ->with('success','Blast Whatsapp Dalam Proses.');
+            }
+            elseif($blastwhatsapp == 'failed'){
+                return redirect()->route('arcc.bycawnotisperingatan',['kodcaw' => $kodcaw, 'notisid' => $notisid])
+                ->with('failed','Blast Whatsapp Tidak Berjaya, Sila Semak Semula Rekod Blasted.');
+            }
+            
+        }
+        return view('callcenter.bycawdetailnotisperingatan',compact('cawangan_info','bycawnotisperingatan','kodcaw','notisid'));
     }
 
 
diff --git a/public/img/success.png b/public/img/success.png
new file mode 100644
index 0000000..c0bf7ad
Binary files /dev/null and b/public/img/success.png differ
diff --git a/resources/views/callcenter/bycawdetailnotisperingatan.blade.php b/resources/views/callcenter/bycawdetailnotisperingatan.blade.php
new file mode 100644
index 0000000..f188f76
--- /dev/null
+++ b/resources/views/callcenter/bycawdetailnotisperingatan.blade.php
@@ -0,0 +1,255 @@
+@extends('layouts.app_operasi')
+<style>
+
+.radiostyle .radio-green {
+            background-color: #27ae60;
+            color:white;
+            box-shadow: 5px 10px #888888;
+            width:200px;
+            margin-right:5px;
+            transition: 0.5s ease;
+        }
+
+        .radiostyle .radio-red {
+            background-color: #e74c3c;
+            color:white;
+            width:200px;
+            margin-right:5px;
+            box-shadow: 5px 10px #888888;
+            transition: 0.5s ease;
+        }
+
+        .radiostyle .radio-yellow {
+            background-color: #3498db;
+            color:white;
+            width:200px;
+            margin-right:5px;
+            box-shadow: 5px 10px #888888;
+            transition: 0.5s ease;
+        }
+
+        .radiostyle .radio-green:hover {
+            box-shadow: 5px 5px #888888;
+
+
+        }
+
+        .radiostyle .radio-red:hover {
+            box-shadow: 5px 5px #888888;
+
+        }
+
+        .radiostyle .radio-yellow:hover {
+            box-shadow: 5px 5px #888888;
+
+        }
+
+        .radiostyle .radio-green input[type="radio"]:checked{
+            box-shadow: 5px 10px #888888;
+        }
+
+        .radiostyle .radio-yellow input[type="radio"]:checked{
+            box-shadow: 5px 10px #888888;
+        }
+
+        .radiostyle .radio-red input[type="radio"]:checked{
+            box-shadow: 5px 10px #888888;
+        }
+
+
+</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;
+    }
+</style>
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('arcc.notisperingatan') }}">Notis Peringatan</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('arcc.rekodnotisperingatan') }}">Rekod Notis Peringatan</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('arcc.detailnotisperingatan',['notisid' =>$notisid]) }}">Mengikut Cawangan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">{{$cawangan_info['details_caw']}}</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        <p>{{ $message }}</p>
+                    </div>
+                    @elseif ($message = Session::get('failed'))
+                            <div class="alert alert-danger">
+                                <p>{{ $message }}</p>
+                            </div>
+                    @endif
+
+                    <div class="container">
+                        
+                        <form id="exportpdf" action="{{route('arcc.blastpertama',['kodcaw' => $kodcaw, 'notisid' => $notisid])}}" target="_blank" method="POST">
+                            @csrf
+                            <input type="hidden" name="type" id="typedonwload" value="">
+                            <input type='hidden' name="radaktif" value="aktif">
+                            <input type='hidden' name="notisid" value="{{$notisid}}" >
+                            <input type='hidden' name="kodcaw" value="{{$kodcaw}}">
+                            <table class="table table-striped table-hover" id="details">
+                            <thead>
+                                <th>Bil</th>
+                                <th>No.Rujukan</th>
+                                <th>Nama</th>
+                                <th>No.KP</th>
+                                <th>No.Telefon</th>
+                                <th>Tempoh</th>
+                                <th>Baki Pembiayaan (RM)</th>
+                                <th>Tarikh Blast</th>
+
+
+                            </thead>
+                            @foreach ($bycawnotisperingatan as $index => $item)
+                                <tr>
+                                    <td>{{ $loop->iteration }}</td>
+                                    <td style="white-space: nowrap;">{{$item['norujukan']}}</td>
+                                    <td style="white-space: nowrap;">{{$item['namacust']['nama'] ?? ''}}</td>
+                                    <td style="white-space: nowrap;">{{$item['nokp']}}</td>
+                                    <td style="white-space: nowrap;">{{$item['namacust']['telefon'] ?? ''}}</td>
+                                    <td align = 'right' style="white-space: nowrap;">{{$item['jbg']}}</td>
+                                    <td align = 'right' style="white-space: nowrap;">{{number_format($item['pinjaman'], 2, '.', ',')}}</td>
+                                    <td align = 'right' style="white-space: nowrap;"><b> 
+                                        @if($item['tarikhnotis1'] == null)
+                                            
+                                        @else
+                                             @php
+                                                $myDateTime = DateTime::createFromFormat('Y-m-d', $item['tarikhnotis1']);
+                                                $formattedweddingdate = $myDateTime->format('d-m-Y');
+                                                echo($formattedweddingdate);
+                                            @endphp</b></td>
+                                        @endif
+                                    {{-- <td style="white-space: nowrap;"><a href="{{ route('arcc.bycawnotisperingatan', [ 'kodcaw' => $item['namacaw'][$index]['kodcaw'] ]) }}" class="btn btn-info text-white">Lihat</a></td> --}}
+                                </tr>
+                            @endforeach
+                        </table>
+                    </form>
+                    </div>
+
+                  
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<script>        
+        
+    var tablelelongbid= $('#details').DataTable( {
+        "columnDefs": [ 
+            {
+            "targets": 0,
+            "target": '_blank',
+            "orderable": false
+            }, 
+            {
+            "targets": 5,
+            "orderable": false
+            }
+        ],
+        // order: [[1, 'asc']],
+        // // "ordering": false,
+        "info": false,
+        "lengthChange": false,
+        "pageLength": 9999999,
+        dom: 'Bfrtip',
+        buttons: [
+         
+        //   {
+        //       className: 'btn btn-outline-success pl-4 pr-4 btn-sm  export',
+        //       target: "_blank",
+        //       titleAttr: 'Export to Excel',
+        //       text: '<h8><b>EXCEL</b></h8>',
+        //       action: function ( e, dt, node, config ) {
+        //           $('#typedonwload').val('excel');
+        //           $("#exportpdf").submit();
+        //           // window.open("_blank");
+        //       }
+        //   },
+        //   {
+        //       className: 'btn btn-outline-danger pl-4 pr-4 btn-sm  export',
+        //       titleAttr: 'Export to PDF',
+        //       text: '<h8><b>PDF</b></h8>',
+        //       action: function ( e, dt, node, config ) {
+        //           $('#typedonwload').val('pdf');
+        //           $("#exportpdf").submit();
+        //         }
+                
+        //     },
+            {
+                className: 'btn btn-outline-info pl-4 pr-4 btn-sm  export',
+                target: "_blank",
+                titleAttr: 'Blast Whatsapp',
+                text: '<h8><b>WHATSAPP & SMS</b></h8>',
+                action: function ( e, dt, node, config ) {
+                    // $('#typedonwload').val('whatsapp');
+                    // $("#exportpdf").submit();
+                    $("#exportpdf").click(function() {
+                    $('[data-toggle="tooltip"]').tooltip()
+                     alert("ADAKAH ANDA PASTI?");
+                     $('#typedonwload').val('whatsapp');
+                     $("#exportpdf").submit();
+});
+                }
+            }
+            
+            
+          
+      ]
+        
+    });
+  
+    $('.export').tooltip();
+    $( '.export').removeClass('dt-button');
+  
+  
+  </script>
+  
+@endsection
+
diff --git a/resources/views/callcenter/detailnotisperingatan.blade.php b/resources/views/callcenter/detailnotisperingatan.blade.php
index 771d123..a226878 100644
--- a/resources/views/callcenter/detailnotisperingatan.blade.php
+++ b/resources/views/callcenter/detailnotisperingatan.blade.php
@@ -100,7 +100,8 @@
                     <ol class="breadcrumb pb-3">
                       <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
                       <li class="breadcrumb-item"><a href="{{ route('arcc.notisperingatan') }}">Notis Peringatan</a></li>
-                      <li class="breadcrumb-item active" aria-current="page">Rekod Notis Peringatan</li>
+                      <li class="breadcrumb-item"><a href="{{ route('arcc.rekodnotisperingatan') }}">Rekod Notis Peringatan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Mengikut Cawangan</li>
                     </ol>
                   </nav>
 
@@ -127,21 +128,27 @@
                             @csrf
                             <input type="hidden" name="type" id="typedonwload" value="">
                             <input type='hidden' name="radaktif" value="aktif">
+                            <input type='hidden' name="notisid" value="{{$notisid}}" >
                             <table class="table table-striped table-hover" id="myTable">
                             <thead>
                                 <th>Bil</th>
                                 <th>Cawangan</th>
                                 <th>Bilangan Surat</th>
+                                <th>Baki Pembiayaan (RM)</th>
                                 <th>Maklumat Lanjut</th>
 
                             </thead>
-                            {{dd($senarai[0])}}
-                            @foreach ($senarai[0] as $index => $item)
+                            @foreach ($senarai[0]['getcawnotisbycaw'] as $index => $item)
+                            {{-- {{dd($item['namacaw'][$index]['status'])}} --}}
                                 <tr>
                                     <td>{{ $loop->iteration }}</td>
-                                    <td style="white-space: nowrap;">{{$item['details_caw']}}</td>
-                                    <td style="white-space: nowrap;">{{$item['getcawnotisbycaw']['totalsag']}}</td>
-                                    {{-- <td style="white-space: nowrap;"><a href="{{ route('arcc.detailnotisperingatan', [ 'notisid' => $item['info']['id']] ) }}" class="btn btn-info text-white">Lihat</a></td> --}}
+                                    <td style="white-space: nowrap;"> @if($item['namacaw'][$index]['status'] == 2)
+                                        <img src="{{ asset('img/success.png') }}" style="width:20px"></img>
+                                        @endif{{$item['namacaw'][$index]['details_caw']}}</td>
+                                    <td align="center" style="white-space: nowrap;">{{count($item['detailbycaw'])}}</td>
+                                    <td style="white-space: nowrap;">{{number_format($item['totalbakipjm'],2)}}</td>
+                                    <td style="white-space: nowrap;"><a href="{{ route('arcc.bycawnotisperingatan', [ 'kodcaw' => $item['namacaw'][$index]['kodcaw'], 'notisid' => $notisid ]) }}" class="btn btn-info text-white">Lihat</a>
+                                    </td>
                                 </tr>
                             @endforeach
                         </table>
diff --git a/resources/views/callcenter/listcariansag.blade.php b/resources/views/callcenter/listcariansag.blade.php
index 6d0af95..36f4a57 100644
--- a/resources/views/callcenter/listcariansag.blade.php
+++ b/resources/views/callcenter/listcariansag.blade.php
@@ -151,6 +151,7 @@
                         <tbody>
                             @php $count = 1; $totalsagall = 0; $totalberatall = 0; $totalpembiayaanall = 0; $totalbakipjmall = 0; $totaltunggakanall = 0;    @endphp
                             @foreach($senarai as $send)    
+                            @if($send['datagadai']['totalsag'] > 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>
@@ -168,7 +169,8 @@
                                 $totalpembiayaanall += $send['datagadai']['totalpembiayaan'];
                                 $totalbakipjmall += $send['datagadai']['totalbakipjm'];
                                 $totaltunggakanall += $send['datagadai']['totaltunggakan'];
-                            @endphp
+                                @endphp
+                            @endif
                             @endforeach
                         </tbody>
                         <tfoot>
diff --git a/resources/views/callcenter/rekodnotisperingatan.blade.php b/resources/views/callcenter/rekodnotisperingatan.blade.php
index 4994b37..9a41ade 100644
--- a/resources/views/callcenter/rekodnotisperingatan.blade.php
+++ b/resources/views/callcenter/rekodnotisperingatan.blade.php
@@ -149,6 +149,9 @@
                                     <td style="white-space: nowrap;"> {{$datez}}</td>
                                     <td style="white-space: nowrap;">@foreach($item['cawnotis'] as $item1)
                                                                         @foreach($item1 as $item2)
+                                                                        @if($item2['status'] == 2)
+                                                                        <img src="{{ asset('img/success.png') }}" style="width:20px"></img>
+                                                                        @endif
                                                                         {{ $item2['details_caw']}}<br>
                                                                         @endforeach
                                                                      @endforeach</td>
diff --git a/routes/web.php b/routes/web.php
index e5a9f58..177561c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -403,6 +403,8 @@ Route::get('/cariansag',['as'=>'arcc.cariansag','uses'=>'CallCenterController@ca
 Route::post('/janadatanotisperingatan',['as'=>'arcc.janadatanotisperingatan','uses'=>'CallCenterController@janadatanotisperingatan'])->middleware('auth','callcenter');
 Route::get('/rekodnotisperingatan',['as'=>'arcc.rekodnotisperingatan','uses'=>'CallCenterController@rekodnotisperingatan'])->middleware('auth','callcenter');
 Route::get('/detailnotisperingatan/{notisid}',['as'=>'arcc.detailnotisperingatan','uses'=>'CallCenterController@detailnotisperingatan'])->middleware('auth','callcenter');
+Route::get('/bycawnotisperingatan/{kodcaw}/{notisid}',['as'=>'arcc.bycawnotisperingatan','uses'=>'CallCenterController@bycawnotisperingatan'])->middleware('auth','callcenter');
+Route::post('/blastpertama/{kodcaw}/{notisid}',['as'=>'arcc.blastpertama','uses'=>'CallCenterController@blastpertama'])->middleware('auth','callcenter');