diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index b0b83381..0fe76145 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -446,9 +446,9 @@ class LelongController extends Controller
         
         foreach($lelongbid as $bid)
         {
-            $gadai = Gadai::where('norujukan', $bid['norujukan'])->first();
-            $gadai->taglel = 0;
-            $gadai->update();    
+            // $gadai = Gadai::where('norujukan', $bid['norujukan'])->first();
+            // $gadai->taglel = 0;
+            // $gadai->update();    
             
                //insert loguser
                $loguser = new LogUser;
diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index c0be590b..94fedd2d 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -172,22 +172,67 @@ class NotisController extends Controller
         return view('jananotis.kemaskininotis',compact('tetapan'));
         
     }
+    public function storeall(Request $request)    {           
 
-    public function store(Request $request)
-    {
-       
-
-       //create tetapan
-       $tetapan = Tetapan::find(1);
      
-       $tetapan->para2 = $request->para2;
-       $tetapan->update();    
+        // dd($request->all());
+        $tetapan = Tetapan::find(1);
+        
+        $tetapan->para2 = $request->para2;
+        $tetapan->update();    
 
+        $cawangan = Cawangan::all();
+
+        foreach($cawangan as $updatecaw){
+
+            $update = Cawangan::where('id', $updatecaw['id'])
+            ->update(['para2'=>$request->para2]);
+            // $update->para2 = $request->para2;
+            // $update->update();
+
+        }
+        
        return redirect()->route('jananotis.kemaskininotis')
        ->with('success','Kemaskini Berjaya');
 
      
     }
+
+    public function store(Request $request)
+    {           
+
+        // dd($request->all());
+        $tetapan = Tetapan::find(1);
+        
+        $tetapan->para2 = $request->para2;
+        $tetapan->update();    
+
+        $cawangan = Cawangan::all();
+
+        foreach($cawangan as $updatecaw){
+
+            $update = Cawangan::where('id', $updatecaw['id'])
+            ->where('caw_code', $request->kodcaw)
+            ->update(['para2'=>$request->para2]);
+            // $update->para2 = $request->para2;
+            // $update->update();
+
+        }
+        
+       return redirect()->route('jananotis.kemaskininotisbycaw')
+       ->with('success','Kemaskini Berjaya');
+
+     
+    }
+
+    Public function kemaskininotisbycaw (Request $request){
+
+        $caw = Cawangan::all();
+        
+        return view('jananotis.kemaskininotisbycaw',compact('caw'));
+
+
+    }
     
 }
        
\ No newline at end of file
diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php
index aa45d064..c1492b33 100644
--- a/app/Models/Cawangan.php
+++ b/app/Models/Cawangan.php
@@ -27,5 +27,6 @@ class Cawangan extends Model
         'nofaks',
         'lokasi',
         'pkb_jmc',
+        'para2',
     ];
 }
diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php
index ab91f002..7b37c59d 100644
--- a/database/migrations/2021_12_14_041557_create_lelongs_table.php
+++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php
@@ -173,6 +173,8 @@ class CreateLelongsTable extends Migration
             $table->string('kali')->nullable();
             $table->integer('cajlelong')->nullable();
             $table->timestamps();
+            $table->string('para2')->nullable(); 
+
 
             // $table->foreign('norujukan')
             //     ->references('norujukan')->on('gadai')
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 777b7d4b..c3e9539a 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -256,9 +256,21 @@
       {{-- end laporan --}}
 
         {{-- Kemaskini Notis --}}
-        <li class="{{ (request()->is('jananotis/*')) ? 'active' : '' }}">
-          <a href="{{url('jananotis/kemaskininotis')}}">Kemaskini Notis Lelong</a>
-        </li>
+        
+      <li class="{{ (request()->is('report/')) ? 'active' : '' }}">
+        <a href="#kemaskiniSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Kemaskini Notis Lelong</a>
+        <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="kemaskiniSubmenu" >
+          <li class="{{ (request()->is('jananotis/kemaskininotis/*') || request()->is('jananotis/kemaskininotis') ) ? 'active' : '' }}">
+            <a href="{{url('jananotis/kemaskininotis')}}">Semua Cawangan</a>
+          </li>
+        </ul>    
+        <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="kemaskiniSubmenu" >
+          <li class="{{ (request()->is('jananotis/kemaskininotisbycaw/*') || request()->is('jananotis/kemaskininotisbycaw') ) ? 'active' : '' }}">
+            <a href="{{url('jananotis/kemaskininotisbycaw')}}">By Cawangan</a>
+          </li>
+        </ul>  
+     
+      </li>
         {{-- end Kemaskini Notis --}}
         
       
diff --git a/resources/views/jananotis/kemaskininotis.blade.php b/resources/views/jananotis/kemaskininotis.blade.php
index 989744ce..d68f88a9 100644
--- a/resources/views/jananotis/kemaskininotis.blade.php
+++ b/resources/views/jananotis/kemaskininotis.blade.php
@@ -16,18 +16,18 @@
                     <p>{{ $message }}</p>
                 </div>
             @endif
-            <form action="{{route('jananotis.store')}}" method="POST" enctype="multipart/form-data">
+            <form action="{{route('jananotis.storeall')}}" method="POST" enctype="multipart/form-data">
               @csrf
          
              
                   <div class="form-group row">
-                  <label for="jbg" class="col-sm-2 col-form-label">Format Notis</label>
                   <div class="col-sm-4" id="para2">
                     <textarea name="para2" rows="10" cols="100" id="article-ckeditor" required>
-                        {{$tetapan->para2}}
+                       
                     </textarea>
                   </div>
-                </div>             
+                </div>    
+                         
                 <div class="form-group row">
                   <div class="col-sm-10">
                     <button type="submit" class="btn btn-primary">Simpan</button>
diff --git a/resources/views/jananotis/kemaskininotisbycaw.blade.php b/resources/views/jananotis/kemaskininotisbycaw.blade.php
new file mode 100644
index 00000000..a4b8cdca
--- /dev/null
+++ b/resources/views/jananotis/kemaskininotisbycaw.blade.php
@@ -0,0 +1,94 @@
+@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>
+  <script src="https://cdn.ckeditor.com/4.16.2/standard/ckeditor.js"></script>
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-12 mx-auto card">
+            <h3 class="pt-3">Kemaskini Notis Lelong by Cawangan</h3>
+            
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <form action="{{route('jananotis.store')}}" method="POST" enctype="multipart/form-data">
+              @csrf
+                
+              <label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
+              <div class="col-sm-4">
+                {{-- <select class="custom-select" name="caw" id="caw"> --}}
+                  <select  onchange="getSelectValue();" id="kodcaw" name="kodcaw">
+
+                  <option value="">Sila Pilih Cawangan</option>
+                  @foreach ($caw as $caws)
+                  <option value="{{$caws->caw_code}}">{{$caws->caw_name}}</option>
+                  @endforeach
+
+                </select>
+               </div>      
+               <br>
+                           
+                  <div class="form-group row">
+                  <div class="col-sm-4" id="list">
+                  <textarea onchange="getSelectValue();" name="para2" rows="10" cols="100" id="article-ckeditor" id="list" required>
+                  </textarea>  
+                  </div>   
+                  <br>
+    
+                  <div class="form-group row">
+                  <div class="col-sm-10">
+                    <button type="submit" class="btn btn-primary">Simpan</button>
+                  </div>
+                </div>
+            </form>
+        </div>
+        
+    </div>
+</div>
+<script>
+        
+        function getSelectValue()
+        {
+            var selectedValue = document.getElementById("list").value;
+            console.log(selectedValue);
+        }  
+        
+        function myFunction() 
+        {
+            document.getElementById("list").value = getElementById();
+        }
+
+
+        
+   
+        
+    
+  $('#caw').select2({
+    width: '100%',
+    placeholder: "Pilih Cawangan",
+    allowClear: true
+  });
+
+  $(document).ready(function () {
+     $("input[name=fasa]").change(function(){
+
+        if($("#fasa1").is(':checked')){
+            $("#jbg").val('').prop("readonly", false);
+        }
+        if($("#fasa2").is(':checked')){
+          $("#jbg").val('12').prop("readonly", true);
+        }
+    });
+ });
+</script>
+
+
+
+
+     
+@endsection
\ No newline at end of file
diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php
index 00be30e4..bba1ecf0 100644
--- a/resources/views/pdf/jananotis.blade.php
+++ b/resources/views/pdf/jananotis.blade.php
@@ -131,7 +131,7 @@
             <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 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>
diff --git a/resources/views/pdf/listnotis.blade.php b/resources/views/pdf/listnotis.blade.php
index c7c1f211..bfbd3c44 100644
--- a/resources/views/pdf/listnotis.blade.php
+++ b/resources/views/pdf/listnotis.blade.php
@@ -76,19 +76,17 @@ tr:nth-child(even) {
   
   <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>      --}}
-    
-                        <div class="first-prgph1">
-                            <p> {{$caw['caw_name']}}<br>
-                                {{$caw['alamat1']}}<br>
-                                {{$caw['alamat2']}}<br>
-                                No Tel: {{$caw['notel']}}<br>
-                                No Faks: {{$caw['nofaks']}}
-                            </p>
-                        </div>
-                            <br>
-                        </div>
+
+                               <div class="first-prgph1">
+                                 <h5> {{$caw['caw_name']}}<br>
+                                     {{$caw['alamat1']}}<br>
+                                     {{$caw['alamat2']}}<br>
+                                     No Tel: {{$caw['notel']}}<br>
+                                     No Faks: {{$caw['nofaks']}}
+                                 </h5>
+                             </div>
+                             </div>
                 
-                        </table> </div>
                             <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">                        
                                 <thead>
                                 <tr> 
diff --git a/routes/web.php b/routes/web.php
index d026112b..d1922185 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -324,7 +324,10 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f
     Route::get('/send-email',['as'=>'jananotis.email','uses'=>'MailController@sendEmail']); 
 
     Route::get('/kemaskininotis',['as'=>'jananotis.kemaskininotis','uses'=>'NotisController@kemaskininotis']); 
+    Route::post('/storeall',['as'=>'jananotis.storeall','uses'=>'NotisController@storeall']); 
+
     Route::post('/store',['as'=>'jananotis.store','uses'=>'NotisController@store']); 
+    Route::get('/kemaskininotisbycaw',['as'=>'jananotis.kemaskininotisbycaw','uses'=>'NotisController@kemaskininotisbycaw']); 
 
 
 });