diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index 9ce50575..4a15013e 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -34,6 +34,7 @@ use App\Models\FailedJob;
 use Carbon\Carbon;
 use PDF;
 use DateTime;
+use IntlCalendar;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Excel;
 use App\Models\LelongCawangan;
@@ -259,7 +260,6 @@ class NotisController extends Controller
         ->where('cawangan_lelong.lelong_id', $lelong_id)
         ->get(); 
   
-
         $pdf = PDF::loadView('pdf.jananotis',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag'))
         ->setPaper('a4', 'potrait');
        
@@ -288,7 +288,7 @@ class NotisController extends Controller
 
         $arraynorujukan = LelongBid::where('lelong_id', $lelong_id)->where('kodcaw', $caw->caw_code)->pluck('norujukan');
 
-        $marhuns = Gadai::on($caw->caw_code)->whereIn('norujukan', $arraynorujukan)->select('nokp', 'norujukan')->orderBy('nokp', 'asc')->get();
+        $marhuns = Gadai::on($caw->caw_code)->whereIn('norujukan', $arraynorujukan)->select('nokp', 'norujukan','bakipjm')->orderBy('nokp', 'asc')->get();
 
         $marhuns_pluck_nokp = $marhuns->pluck('nokp');
 
@@ -311,8 +311,19 @@ class NotisController extends Controller
             if ($customers_keyBy_noKp[$marhun->nokp]) {
                 $marhuns[$index]['nama'] = $customers_keyBy_noKp[$marhun->nokp];
             }
-        }
+            //apigetkeuntungan
+            $getkeuntungansemasa = Http::get(config('app.api_url'). 'kiraUpahTawarruq',[
+                'kodcaw' => $user->kodcaw,
+                'norujukan' => $marhun->norujukan,
+            ])->json();
 
+            $marhuns[$index]['keuntungan'] = $getkeuntungansemasa;
+            $nilaips = (float) $getkeuntungansemasa['keuntungan'] + (float) $getkeuntungansemasa['bakipjm'];
+            $nilaitebus = (float) $getkeuntungansemasa['keuntunganrebet'] + (float) $getkeuntungansemasa['bakipjm'];
+            // dd($nilaips);
+            $marhuns[$index]['nilaitebus'] = $nilaitebus;
+            $marhuns[$index]['nilaips'] = $nilaips;
+        }
         $pdf = PDF::loadView('pdf.jananotis', compact('marhuns', 'lelongid', 'caw', 'tarikh_cetak'))
         ->setPaper('a4', 'potrait');
 
@@ -574,63 +585,59 @@ class NotisController extends Controller
 
         $user =  Auth::user();
 
-        $caw = Cawangan::where('caw_code','=',$user->kodcaw)
-        ->first();
+        $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
 
-        $lelong_id = $lelong_id;
+        $currentdate = Carbon::now();
+        $tarikh_cetak = $currentdate->toDateString();
 
-        $current = Carbon::now();
-        $current = new Carbon();
-        $tarikh_cetak = $current->toDateString();
+        $current_date_time = $currentdate->toDateTimeString();
 
-        $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
-        ->where('lelong_id','=',$lelong_id)
-        ->where('lelongbid.kodcaw','=',$user->kodcaw);
+        Log::info("Jana notis fasa 1: " . $user->kodcaw . ", " . $user->name);
+        NotifyJanaNotis::dispatch($user->id, $user->kodcaw, $user->name, 'Jana Notis Fasa 1', $current_date_time);
 
-        $arraynorujukan = $marhun->pluck('norujukan')->toArray();
-        $datalelong = $marhun->get();
-        $marhuns = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
-        ->select('nokp','norujukan')
-        ->get();
-        // dd($marhuns); 
-        $arraysag = [];
-       
-        $current_date_time = $current->toDateTimeString();
+        $lelongid = Lelong::find($lelong_id);
 
-        Log::info("Jana notis fasa 2: " . $user->kodcaw . ", " . $user->name);
-        NotifyJanaNotis::dispatch($user->id, $user->kodcaw, $user->name, 'Jana Notis Fasa 2', $current_date_time);
+        $arraynorujukan = LelongBid::where('lelong_id', $lelong_id)->where('kodcaw', $caw->caw_code)->pluck('norujukan');
 
-        foreach($marhuns as $index1=>$cal){
-            $customer =  Customer::where('kpbaru','=',$cal['nokp'])
-            ->orWhere('kplama','=',$cal['nokp'])
-            ->join('poskod','customer.poskod','=','poskod.poskod')  
-            ->join('daerah','poskod.koddaerah','=','daerah.koddaerah')
-            ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri')
-            ->first();
+        $marhuns = Gadai::on($caw->caw_code)->whereIn('norujukan', $arraynorujukan)->select('nokp', 'norujukan','bakipjm')->orderBy('nokp', 'asc')->get();
 
-            $listsag = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
-            ->where('nokp','=',$cal['nokp'])
+        $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();
-            // dd($listsag);
-            foreach($listsag as $index=>$listing){
-
-                $bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
 
+        $customers_keyBy_noKp = $customers->keyBy(function ($item) {
+            if ($item->kpbaru != '') {
+                return $item->kpbaru;
+            } else if ($item->kplama != '') {
+                return $item->kplama;
             }
-            $marhuns[$index1]['nama'] = ($customer) ? $customer : dd($cal['nokp']);
-            $marhuns[$index1]['listsag'] = $listsag;
+        });
 
-            
+        foreach ($marhuns as $index => $marhun) {
+            if ($customers_keyBy_noKp[$marhun->nokp]) {
+                $marhuns[$index]['nama'] = $customers_keyBy_noKp[$marhun->nokp];
+            }
+            //apigetkeuntungan
+            $getkeuntungansemasa = Http::get(config('app.api_url'). 'kiraUpahTawarruq',[
+                'kodcaw' => $user->kodcaw,
+                'norujukan' => $marhun->norujukan,
+            ])->json();
+
+            $marhuns[$index]['keuntungan'] = $getkeuntungansemasa;
+            $nilaips = (float) $getkeuntungansemasa['keuntungan'] + (float) $getkeuntungansemasa['bakipjm'];
+            $nilaitebus = (float) $getkeuntungansemasa['keuntunganrebet'] + (float) $getkeuntungansemasa['bakipjm'];
+            // dd($nilaips);
+            $marhuns[$index]['nilaitebus'] = $nilaitebus;
+            $marhuns[$index]['nilaips'] = $nilaips;
         }
-
-        $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-        ->where('cawangan.caw_code','=',$user->kodcaw)
-        ->where('cawangan_lelong.lelong_id', $lelong_id)
-        ->get(); 
   
         // return view('pdf.jananotisfasa2',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag'));
-        $pdf = PDF::loadView('pdf.jananotisfasa2',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag'))
+        $pdf = PDF::loadView('pdf.jananotisfasa2',compact('marhuns', 'lelongid', 'caw', 'tarikh_cetak'))
         ->setPaper('a4', 'potrait');
        
        return $pdf->download('Penjanaan Notis Fasa 2:Batch Lelong '.$lelong_id.'.pdf');
diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php
index 6d4fcc1b..f23a79d2 100644
--- a/resources/views/pdf/jananotis.blade.php
+++ b/resources/views/pdf/jananotis.blade.php
@@ -155,13 +155,24 @@
     <div>
       <table class="tablestyle">
         <tr>
-          <td width="15%">TARIKH CETAK 
+          <td width="15%">TARIKH 
           </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);
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+                $datez = $myDateTime->format('d M Y');
+                // echo($datez);
+
+                $fmt = datefmt_create(
+                        'ms_MY',
+                        IntlDateFormatter::LONG,
+                        IntlDateFormatter::NONE,
+                        'Asia/Kuala_Lumpur',
+                        IntlDateFormatter::GREGORIAN
+                    );
+                    $cal = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+
+                    echo '' . strtoupper($fmt->format($cal));
             @endphp
             <td colspan="3"></td>
   </td>
@@ -170,14 +181,14 @@
           <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>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td width="14%"></td>
+          <td width="1%"></td>
+          <td></td>
   
         </tr>
         <tr>
@@ -190,15 +201,15 @@
           
           <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>
+          <td style="vertical-align:top;"></td>
+          <td style="vertical-align:top;"></td>
+          <td style="vertical-align:top;"></td>
         </tr>
       </table>
 
   
       <p>Tuan/Puan,</p>
-      <h4>LELONGAN AWAM BARANG GADAIAN
+      <h4>NOTIS LELONGAN AWAM BARANG GADAIAN
         {{-- @php 
         $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
             $datez = $myDateTime->format('d-m-Y');
@@ -206,7 +217,7 @@
   
         @endphp --}}
         </h4>
-      <p>Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas akan dilelong.</p>
+      <p>Dengan hormatnya kami ingin memaklumkan bahawa barang-barang gadaian tuan/puan yang dicagar di cawangan seperti di atas akan dilelong.</p>
   
       <p>Butiran lelongan adalah seperti berikut :-</p>
       
@@ -217,7 +228,17 @@
           <td> @php     
             $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
             $datez = $myDateTime->format('d-m-Y');
-            echo($datez);
+            //echo($datez);
+             $fmttlelong = datefmt_create(
+                        'ms_MY',
+                        IntlDateFormatter::LONG,
+                        IntlDateFormatter::NONE,
+                        'Asia/Kuala_Lumpur',
+                        IntlDateFormatter::GREGORIAN
+                    );
+                    $tlelong = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
+
+                    echo '' . strtoupper($fmttlelong->format($tlelong));
             @endphp</td>
         </tr>
         <tr>
@@ -231,6 +252,11 @@
           {{-- <td>{{ date('H:i',strtotime($notis['masa'])). ' pagi' }}</td> --}}
           <td>{{ '10.30 pagi' }}</td>
         </tr>
+        <tr>
+          <td>No.Akuan Pembiayaan</td>
+          <td>:</td>
+          <td>{{$notis['norujukan']}}</td>
+        </tr>
       </table>
   
   
@@ -238,28 +264,57 @@
         @php 
         $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong );
             $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
-            echo($datez);
-        
+           //echo($datez);
+           $fmtsblm = datefmt_create(
+                        'ms_MY',
+                        IntlDateFormatter::LONG,
+                        IntlDateFormatter::NONE,
+                        'Asia/Kuala_Lumpur',
+                        IntlDateFormatter::GREGORIAN
+                    );
+                    $tlelong = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
+                    $datez = $tlelong->modify('-3 day');
+                    echo '' . strtoupper($fmtsblm->format($datez));
+        @endphp
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong );
+            $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
+           //echo($datez);
+           $fmtsblm = datefmt_create(
+                        'ms_MY',
+                        IntlDateFormatter::FULL,
+                        IntlDateFormatter::FULL,
+                        'Asia/Kuala_Lumpur',
+                        IntlDateFormatter::GREGORIAN
+                    );
+                    $tlelong = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
+                    $datez = $tlelong->modify('-3 day');
+                    $fmtsblm->setPattern('EEEE');
+                    echo '(' . strtoupper($fmtsblm->format($datez).')');
         @endphp:-</b></p>
   
 
-      @php echo $caw['para2']; @endphp
+      {{-- @php $upah = $notis['keuntungan']['keuntunganrebet']+$notis['keuntungan']['bakipjm'] @endphp --}}
+      {{-- {{dd($notis['nilaips'])}} --}}
+      <ol>
+        <li>Bayar Keuntungan (upah) Semasa RM{{number_format($notis['keuntungan']['keuntungan'], 2, '.', ',') }}</li>
+        <li>Pembayaran Semula (tebus gadai semula) RM{{number_format($notis['nilaitebus'], 2, '.', ',') }}</li>
+        <li>Penyelesaian Penuh (tebus sepenuhnya) RM{{number_format($notis['nilaitebus'], 2, '.', ',')}}</li>
+      </ol>
+      <p>Tuan/Puan juga boleh membuat bayaran secara atas talian melalui portal arrahnPay di<a href="https://pay.arrahn.com.my">https://pay.arrahn.com.my</a>. 
+        Pembayaran terakhir atas talian adalah (3)hari sebelum tarikh lelongan. 
+        Untuk sebarang pertanyaan, Tuan/Puan boleh menghubungi nombor tertera.</p>
 
-      {{-- <p>Bayaran kini boleh dibuat secara atas talian melalui https://pay.arrahn.com.my  <b>sebelum
-        @php 
-        $myDateTime2 = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong );
-            $datez2 = $myDateTime2->modify('-3 day')->format('d-m-Y');
-            echo($datez2);        
-        @endphp:-</b> 
-      </p> --}}
+      <p>Sekiranya tuan/puan masih tidak berurusan sehingga tarikh dinyatakan, maka pihak kami berhak menjual secara lelongan awam barang gadaian tersebut.<br />
+      Sekian, terima kasih.</p>
 
-      <p>Notis:</p>
+      <p>Nota:</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>
+      <p>Surat ini adalah cetakan komputer dan tiada tandatangan diperlukan.</p>
   
     </div>
   </div>
diff --git a/resources/views/pdf/jananotis_backup.blade.php b/resources/views/pdf/jananotis_backup.blade.php
new file mode 100644
index 00000000..6d4fcc1b
--- /dev/null
+++ b/resources/views/pdf/jananotis_backup.blade.php
@@ -0,0 +1,266 @@
+<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'] }}</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>LELONGAN AWAM BARANG GADAIAN
+        {{-- @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
+            $datez = $myDateTime->format('d-m-Y');
+            echo($datez);
+  
+        @endphp --}}
+        </h4>
+      <p>Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas akan dilelong.</p>
+  
+      <p>Butiran lelongan adalah seperti berikut :-</p>
+      
+      <table>
+        <tr>
+          <td>Tarikh</td>
+          <td>:</td>
+          <td> @php     
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
+            $datez = $myDateTime->format('d-m-Y');
+            echo($datez);
+            @endphp</td>
+        </tr>
+        <tr>
+          <td>Cawangan</td>
+          <td>:</td>
+          <td>{{ $caw['caw_name'] }}</td>
+        </tr>
+        <tr>
+          <td>Waktu</td>
+          <td>:</td>
+          {{-- <td>{{ date('H:i',strtotime($notis['masa'])). ' pagi' }}</td> --}}
+          <td>{{ '10.30 pagi' }}</td>
+        </tr>
+      </table>
+  
+  
+      <p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut dikaunter cawangan <b>pada atau sebelum 
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong );
+            $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
+            echo($datez);
+        
+        @endphp:-</b></p>
+  
+
+      @php echo $caw['para2']; @endphp
+
+      {{-- <p>Bayaran kini boleh dibuat secara atas talian melalui https://pay.arrahn.com.my  <b>sebelum
+        @php 
+        $myDateTime2 = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong );
+            $datez2 = $myDateTime2->modify('-3 day')->format('d-m-Y');
+            echo($datez2);        
+        @endphp:-</b> 
+      </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/resources/views/pdf/jananotisfasa2.blade.php b/resources/views/pdf/jananotisfasa2.blade.php
index ec0f540a..014e9e1e 100644
--- a/resources/views/pdf/jananotisfasa2.blade.php
+++ b/resources/views/pdf/jananotisfasa2.blade.php
@@ -155,13 +155,23 @@
     <div>
       <table class="tablestyle">
         <tr>
-          <td width="15%">TARIKH CETAK 
+          <td width="15%">TARIKH 
           </td>
           <td width="1%">:</td>
           <td width="43%">@php 
             $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
                 $datez = $myDateTime->format('d-m-Y');
-                echo($datez);
+                //echo($datez);
+                $fmt = datefmt_create(
+                        'ms_MY',
+                        IntlDateFormatter::LONG,
+                        IntlDateFormatter::NONE,
+                        'Asia/Kuala_Lumpur',
+                        IntlDateFormatter::GREGORIAN
+                    );
+                    $cal = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+
+                    echo '' . strtoupper($fmt->format($cal));
             @endphp
             <td colspan="3"></td>
   </td>
@@ -170,13 +180,13 @@
           <td><br></td>
         </tr>
         <tr>
-          <td>NO RUJUKAN</td>
-          <td>:</td>
-          <td>{{ $notis['norujukan']}}</td>
           <td></td>
-          <td width="14%">NO TELEFON</td>
-          <td width="1%">:</td>
-          <td>{{ $notis['nama']['telefon'] }}</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td width="14%"></td>
+          <td width="1%"></td>
+          <td></td>
   
         </tr>
         <tr>
@@ -188,18 +198,17 @@
           {{-- {!! ($notis['nama']['alamat2'] === null || $notis['nama']['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat2']) !!} <br>  --}}
           {{ ' ' . $notis['nama']['poskod'] . ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}}</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>
+          <td style="vertical-align:top;"></td>
+          <td style="vertical-align:top;"></td>
+          <td style="vertical-align:top;"></td>
         </tr>
       </table>
 
-      @foreach ($lelongid as $bid)
   
       <p>Tuan/Puan,</p>
-      <h4>LELONGAN AWAM BARANG GADAIAN
+      <h4>NOTIS LELONGAN AWAM BARANG GADAIAN
         {{-- @php 
-        $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
             $datez = $myDateTime->format('d-m-Y');
             echo($datez);
   
@@ -214,9 +223,19 @@
           <td>Tarikh</td>
           <td>:</td>
           <td> @php     
-            $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
             $datez = $myDateTime->format('d-m-Y');
-            echo($datez);
+            //echo($datez);
+            $fmttlelong = datefmt_create(
+                        'ms_MY',
+                        IntlDateFormatter::LONG,
+                        IntlDateFormatter::NONE,
+                        'Asia/Kuala_Lumpur',
+                        IntlDateFormatter::GREGORIAN
+                    );
+                    $tlelong = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
+
+                    echo '' . strtoupper($fmttlelong->format($tlelong));
             @endphp</td>
         </tr>
         <tr>
@@ -230,27 +249,66 @@
           {{-- <td>{{ date('H:i',strtotime($notis['masa'])). ' pagi' }}</td> --}}
           <td>{{ '10.30 pagi' }}</td>
         </tr>
+        <tr>
+          <td>No.Akuan Pembiayaan</td>
+          <td>:</td>
+          <td>{{$notis['norujukan']}}</td>
+        </tr>
       </table>
   
   
       <p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut <b>pada atau sebelum 
         @php 
-        $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong );
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong );
             $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
-            echo($datez);
-        
+            //echo($datez);
+            $fmtsblm = datefmt_create(
+                        'ms_MY',
+                        IntlDateFormatter::LONG,
+                        IntlDateFormatter::NONE,
+                        'Asia/Kuala_Lumpur',
+                        IntlDateFormatter::GREGORIAN
+                    );
+                    $tlelong = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
+                    $datez = $tlelong->modify('-3 day');
+                    echo '' . strtoupper($fmtsblm->format($datez));
+        @endphp
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong );
+            $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
+           //echo($datez);
+           $fmtsblm = datefmt_create(
+                        'ms_MY',
+                        IntlDateFormatter::FULL,
+                        IntlDateFormatter::FULL,
+                        'Asia/Kuala_Lumpur',
+                        IntlDateFormatter::GREGORIAN
+                    );
+                    $tlelong = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong);
+                    $datez = $tlelong->modify('-3 day');
+                    $fmtsblm->setPattern('EEEE');
+                    echo '(' . strtoupper($fmtsblm->format($datez).')');
         @endphp:-</b></p>
   
 
-      @php echo $caw['para3']; @endphp
-      <p>Notis:</p>
+      {{-- @php echo $caw['para3']; @endphp --}}
+      <ol>
+        {{-- <li>Bayar Keuntungan (upah) Semasa RM{{number_format($notis['keuntungan']['keuntungan'], 2, '.', ',') }}</li> --}}
+        <li>Pembayaran Semula (tebus gadai semula) RM{{number_format($notis['nilaitebus'], 2, '.', ',') }}</li>
+        <li>Penyelesaian Penuh (tebus sepenuhnya) RM{{number_format($notis['nilaitebus'], 2, '.', ',')}}</li>
+      </ol>
+      <p>Sekiranya tuan/puan masih tidak berurusan sehingga tarikh dinyatakan, maka pihak kami berhak menjual secara lelongan awam barang gadaian tersebut. 
+        Untuk sebarang pertanyaan, Tuan/Puan boleh menghubungi nombor tertera.<br />
+      
+        Sekian, terima kasih.</p>
+
+      <p>Nota:</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>
+      <p>Surat ini adalah cetakan komputer dan tiada tandatangan diperlukan.</p>
   
     </div>
   </div>
-  @endforeach
   @endforeach
\ No newline at end of file
diff --git a/resources/views/pdf/jananotisfasa2_backup.blade.php b/resources/views/pdf/jananotisfasa2_backup.blade.php
new file mode 100644
index 00000000..eaf8e779
--- /dev/null
+++ b/resources/views/pdf/jananotisfasa2_backup.blade.php
@@ -0,0 +1,255 @@
+<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="43%">@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 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']) }} <br>
+            {{-- {!! ($notis['nama']['alamat1'] === null || $notis['nama']['alamat1'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat1']) !!} <br>  --}}
+          {{-- {!! ($notis['nama']['alamat2'] === null || $notis['nama']['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat2']) !!} <br>  --}}
+          {{ ' ' . $notis['nama']['poskod'] . ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}}</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>
+
+      @foreach ($lelongid as $bid)
+  
+      <p>Tuan/Puan,</p>
+      <h4>LELONGAN AWAM BARANG GADAIAN
+        {{-- @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
+            $datez = $myDateTime->format('d-m-Y');
+            echo($datez);
+  
+        @endphp --}}
+        </h4>
+      <p>Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas <strong>akan/telah tamat kontrak dan akan dilelong.</strong></p>
+  
+      <p>Butiran lelongan adalah seperti berikut :-</p>
+      
+      <table>
+        <tr>
+          <td>Tarikh</td>
+          <td>:</td>
+          <td> @php     
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
+            $datez = $myDateTime->format('d-m-Y');
+            echo($datez);
+            @endphp</td>
+        </tr>
+        <tr>
+          <td>Cawangan</td>
+          <td>:</td>
+          <td>{{ $caw['caw_name'] }}</td>
+        </tr>
+        <tr>
+          <td>Waktu</td>
+          <td>:</td>
+          {{-- <td>{{ date('H:i',strtotime($notis['masa'])). ' pagi' }}</td> --}}
+          <td>{{ '10.30 pagi' }}</td>
+        </tr>
+      </table>
+  
+  
+      <p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut <b>pada atau sebelum 
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong );
+            $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
+            echo($datez);
+        
+        @endphp:-</b></p>
+  
+
+      @php echo $caw['para3']; @endphp
+      <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