From e792cf43795f222e0666d2b6705d064f1efcb700 Mon Sep 17 00:00:00 2001
From: unknown <ain55645@gmail.com>
Date: Thu, 19 Sep 2024 15:18:07 +0800
Subject: [PATCH] update column dan naming typo

---
 resources/views/callcenter/v1/info.blade.php  |   4 +-
 resources/views/callcenter/v2/info.blade.php  |   4 +-
 resources/views/customers/v1/info.blade.php   |   4 +-
 resources/views/customers/v2/info.blade.php   |   6 +-
 .../views/khazanah/alirantunai.blade.php      |   2 +-
 resources/views/khazanah/dashboard.blade.php  |   4 +-
 resources/views/khazanah/info.blade.php       |   4 +-
 resources/views/khazanah/kelulusan.blade.php  |   2 +-
 .../views/khazanah/laporan/ansuran.blade.php  |   2 +-
 .../views/khazanah/laporan/index.blade.php    | 138 +++++++++---------
 .../laporanujrah/ansuranujrah.blade.php       |   2 +-
 .../laporanujrah/gadaianujrah.blade.php       |   2 +-
 .../ringkasanharianujrah.blade.php            |   2 +-
 .../laporanujrah/tebusujrah.blade.php         |   2 +-
 resources/views/khazanah/v1/info.blade.php    |   4 +-
 resources/views/khazanah/v2/info.blade.php    |   4 +-
 resources/views/operasi/kelulusan.blade.php   |   2 +-
 .../views/print/laporan_ansuran.blade.php     |   4 +-
 .../print/laporan_ansuran_ujrah.blade.php     |   2 +-
 .../print/laporan_gadaian_ujrah.blade.php     |   2 +-
 .../views/print/laporan_stokaudit.blade.php   |   2 +-
 .../print/laporan_stokauditcombine.blade.php  |   2 +-
 .../views/print/laporan_tebus_ujrah.blade.php |   4 +-
 resources/views/print/notisrugi.blade.php     |   4 +-
 .../views/print/notistuntutbaki.blade.php     |   2 +-
 .../print/resit/tambah_pinjaman.blade.php     |   8 +-
 .../views/print/resit/tebus_separuh.blade.php |   8 +-
 .../views/print/resitansuran_ujrah.blade.php  |   4 +-
 .../views/print/resittebus_ujrah.blade.php    |   8 +-
 resources/views/print/sag_ujrah_2.blade.php   |   4 +-
 resources/views/print/sag_ujrah_3.blade.php   |  24 +--
 31 files changed, 129 insertions(+), 137 deletions(-)

diff --git a/resources/views/callcenter/v1/info.blade.php b/resources/views/callcenter/v1/info.blade.php
index d9cad8a..219b21e 100644
--- a/resources/views/callcenter/v1/info.blade.php
+++ b/resources/views/callcenter/v1/info.blade.php
@@ -116,10 +116,10 @@
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">
                     <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Selesai Pembiayaan
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
                         </label>
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Selesai Pembiayaan
+                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
                         </label>
                         <label class="btn btn-primary">
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
diff --git a/resources/views/callcenter/v2/info.blade.php b/resources/views/callcenter/v2/info.blade.php
index 5979a08..46f5b4c 100644
--- a/resources/views/callcenter/v2/info.blade.php
+++ b/resources/views/callcenter/v2/info.blade.php
@@ -123,10 +123,10 @@
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">
                     <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Selesai Pembiayaan.
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai.
                         </label>
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Selesai Pembiayaan
+                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
                         </label>
                         <label class="btn btn-primary">
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
diff --git a/resources/views/customers/v1/info.blade.php b/resources/views/customers/v1/info.blade.php
index 30bd517..3dbe9d5 100644
--- a/resources/views/customers/v1/info.blade.php
+++ b/resources/views/customers/v1/info.blade.php
@@ -123,10 +123,10 @@
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">
                     <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Selesai Pembiayaan
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
                         </label>
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Selesai Pembiayaan
+                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
                         </label>
                         <label class="btn btn-primary">
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index a0eaf76..dd761e1 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -123,10 +123,10 @@
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">
                     <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Selesai Pembiayaan
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
                         </label>
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Selesai Pembiayaan
+                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
                         </label>
                         <label class="btn btn-primary">
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
@@ -2667,7 +2667,7 @@
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran',
-                text: 'Ansuran untuk Belum Selesai Pembiayaan Sahaja!'
+                text: 'Ansuran untuk Pembiayaan Belum Selesai Sahaja!'
             });
 
             return false;            
diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php
index d9d1ab5..f05b5ad 100644
--- a/resources/views/khazanah/alirantunai.blade.php
+++ b/resources/views/khazanah/alirantunai.blade.php
@@ -208,7 +208,7 @@
                                           <div class="inner">
                                             <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
                       
-                                            <p>Pennyelesaian Pembiayaan</p>
+                                            <p>Penyelesaian Pembiayaan</p>
                                           </div>
                                           <div class="icon">
                                           </div>
diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php
index d602e32..2798140 100644
--- a/resources/views/khazanah/dashboard.blade.php
+++ b/resources/views/khazanah/dashboard.blade.php
@@ -38,7 +38,7 @@
                               <div class="inner">
                                 <h3>RM {{ ($ringkasanharian['gadai'][0]['jumlahpinjaman']) ? number_format($ringkasanharian['gadai'][0]['jumlahpinjaman'],2) : "0.00"  }}</h3>
           
-                                <p style="font-weight:bold;">Pembiayaan Hari Ini</p>
+                                <p >Pembiayaan Hari Ini</p>
                               </div>
                               <div class="icon">
                               </div>
@@ -97,7 +97,7 @@
                           <div class="col-lg-6 col-xl-4 col-12">
                           
                             <div class="card bg-light mb-3" style="max-width: 20rem;">
-                              <div class="card-header font-weight-bold">Penyelesaian Pem. Terkumpul</div>
+                              <div class="card-header font-weight-bold">Penyelesaian Pembiayaan Terkumpul</div>
                               <div class="card-body mx-auto">
                                 <div class="row text-justify">
                                   <h5 class="card-title font-weight-bold">Tawarruq : </h5>
diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php
index 84e3702..b929e67 100644
--- a/resources/views/khazanah/info.blade.php
+++ b/resources/views/khazanah/info.blade.php
@@ -116,10 +116,10 @@
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">
                     <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Selesai Pembiayaan
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
                         </label>
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Selesai Pembiayaan
+                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
                         </label>
                         <label class="btn btn-primary">
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php
index bb5f031..695213b 100644
--- a/resources/views/khazanah/kelulusan.blade.php
+++ b/resources/views/khazanah/kelulusan.blade.php
@@ -45,7 +45,7 @@
             <div class="small-box bg-success">
               <div class="inner">
                 <h4 id="bilaktif"></h4>
-                <p>Belum Selesai Pembiayaan</p>
+                <p>Pembiayaan Belum Selesai</p>
               </div>
               <div class="icon">
                 <i class="fas fa-thumbs-up"></i>
diff --git a/resources/views/khazanah/laporan/ansuran.blade.php b/resources/views/khazanah/laporan/ansuran.blade.php
index a656272..200ac96 100644
--- a/resources/views/khazanah/laporan/ansuran.blade.php
+++ b/resources/views/khazanah/laporan/ansuran.blade.php
@@ -46,7 +46,7 @@
                                         <th>Tempoh</th>
                                         <th width="40%">Baki Pembiayaan (RM)</th>
                                         <th>Bayaran (RM)</th>
-                                        <th width="60%">Caj-caj Lain (RM)</th> 
+                                        <th width="60%">Lain-lain Caj (RM)</th> 
                                         <th>Keuntungan 1% (RM)</th>
                                         <th>Keuntungan (RM)</th>
                                     </tr>
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php
index 0a9e0ba..97632aa 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -1,8 +1,16 @@
 @extends('layouts.app')
 
+<style>
+    <style>
+    .custom-btn {
+        width: 10px; 
+    }
+</style>
+</style>
+
 @section('content')
-<div class="container">
-    <div class="row justify-content-center">
+<div class="container-fluid">
+    <div class="row">
         <div class="col-md-12">
             <div class="card">
                 <nav aria-label="breadcrumb">
@@ -19,136 +27,120 @@
                 @endphp
 
                 <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
 
-                    <div class="row form-group justify-content-center">
-                        <div class="col-3 mx-1" >
+                    <div class="row form-group justify-content-center col-12 mx-12 ">
+                        <div class="col-md-3 ">
                             <div class="row">
                                 @if($version == 'v1')
-                                    <a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3">Pembiayaan</a>
+                                    <a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Pembiayaan</a>
                                 @else
-                                    <a href="{{ route('laporan.gadaianujrah') }}" class="btn btn-dark btn-lg btn-block mb-3">Pembiayaan</a>
+                                    <a href="{{ route('laporan.gadaianujrah') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Pembiayaan</a>
                                 @endif
                             </div>
                             <div class="row d-none">
-                                {{-- <a href="{{ route('laporan.lelongan') }}" class="btn btn-dark btn-lg btn-block mb-3">Lelongan</a> --}}
-                                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Lelongan</a>
+                                <a href="#" class="btn btn-danger btn-lg btn-block mb-3 custom-btn">Lelongan</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.pelangganbaru') }}" class="btn btn-dark btn-lg btn-block  mb-3">Pelanggan Baru</a>
+                                <a href="{{ route('laporan.pelangganbaru') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Pelanggan Baru</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.ringkasanterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Terkumpul</a>
+                                <a href="{{ route('laporan.ringkasanterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">
+                                    <span>Ringkasan Terkumpul</a></span>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.agingbulanan')}}" class="btn btn-dark btn-lg btn-block mb-3">Aging Bulan</a>
+                                <a href="{{route('laporan.agingbulanan')}}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Aging Bulan</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.pendserahan') }}" class="btn btn-dark btn-lg btn-block mb-3">Laporan HQ</a>
+                                <a href="{{ route('laporan.pendserahan') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Laporan HQ</a>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.tuntutbaki')}}" class="btn btn-dark btn-lg btn-block mb-3">Tuntut Baki</a>
-                            </div>
-                             <div class="row">
-                                <a href="{{ route('laporan.hargaemas') }}" class="btn btn-dark btn-lg btn-block mb-3">Harga Emas</a>
+                                <a href="{{route('laporan.tuntutbaki')}}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Tuntut Baki</a>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.wakil')}}" class="btn btn-dark btn-lg btn-block mb-3">Senarai Wakil</a>
+                                <a href="{{ route('laporan.hargaemas') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Harga Emas</a>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.stokauditbackdate')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Backdate</a>
+                                <a href="{{route('laporan.wakil')}}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Senarai Wakil</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.stokauditkhas') }}" class="btn btn-dark btn-lg btn-block mb-3">SA(Whatsapp & SMS)</a>
+                                <a href="{{route('laporan.stokauditbackdate')}}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Stok Audit Backdate</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.stokauditkhas') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">SA(Whatsapp & SMS)</a>
                             </div>
                         </div>
-                        <div class="col-3 mx-1">
+                        <div class="col-4 mx-1">
                             <div class="row">
                                 @if($version == 'v1')
-                                    <a href="{{ route('laporan.tebus') }}" class="btn btn-dark btn-lg btn-block mb-3">Penyelesaian Penuh</a>
+                                    <a href="{{ route('laporan.tebus') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Penyelesaian Penuh</a>
                                 @else
-                                    <a href="{{ route('laporan.tebusujrah') }}" class="btn btn-dark btn-lg btn-block mb-3">Penyelesaian Penuh</a>
+                                    <a href="{{ route('laporan.tebusujrah') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Penyelesaian Penuh</a>
                                 @endif
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.kawalanstok') }}" class="btn btn-dark btn-lg btn-block mb-3">Kawalan Stok Produk</a>
-                            </div>                            
-                            <div class="row">
-                                <a href="{{ route('laporan.ringkasanharianujrah') }}" class="btn btn-dark btn-lg btn-block mb-3">
-                                    <span style="font-size: 14px;">Ringkasan Harian (Caj-caj Lain)</span>
-                                </a>
+                                <a href="{{ route('laporan.kawalanstok') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Kawalan Stok Produk</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.batalsuratgadai') }}" class="btn btn-dark btn-lg btn-block mb-3" >
-                                    <span style="font-size: 14px;">Batal Surat Pembiayaan</span>
-                                </a>
+                                <a href="{{ route('laporan.ringkasanharianujrah') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Ringkasan Harian (Lain-lain Caj)</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.marhunharian') }}" class="btn btn-dark btn-lg btn-block mb-3">
-                                    <span style="font-size: 14px;">Marhun Harian</span>
-                                </a>
+                                <a href="{{ route('laporan.batalsuratgadai') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Batal Surat Pembiayaan</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.senaraipetibesi') }}" class="btn btn-dark btn-lg btn-block mb-3">Senarai Peti Besi</a>
+                                <a href="{{ route('laporan.marhunharian') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Marhun Harian</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.datalejer_am') }}" class="btn btn-dark btn-lg btn-block mb-3">Lejer Am</a>
+                                <a href="{{ route('laporan.senaraipetibesi') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Senarai Peti Besi</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.denominasi') }}" class="btn btn-dark btn-lg btn-block mb-3">Denominasi</a>
-                            </div>
-                            {{-- <div class="row">
-                                <a href="{{ route('laporan.hapushq') }}" class="btn btn-dark btn-lg btn-block mb-3">Hapus S/P HQ</a>
-                            </div> --}}
-                            <div class="row">
-                                <a href="{{ route('laporan.saghilang') }}" class="btn btn-dark btn-lg btn-block mb-3">SAG Hilang</a>
+                                <a href="{{ route('laporan.datalejer_am') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Lejer Am</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.serahmarhuntebus') }}" class="btn btn-dark btn-lg btn-block mb-3">
-                                    <span style="font-size: 13px;">Serah Marhun (Penyelesaian Pembiayaan)</span>
-                                </a>
+                                <a href="{{ route('laporan.denominasi') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Denominasi</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.saghilang') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">SAG Hilang</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.serahmarhuntebus') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Serah Marhun (Penyelesaian Pembiayaan)</a>
                             </div>
-                            
-
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">
-                                <a href="{{ route('laporan.ansuran') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran Pembiayaan</a>
-                            </div>
-                            {{-- <div class="row">
-                                <a href="{{ route('laporan.stokaudit') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
-                            </div> --}}
-                            <div class="row">
-                                <a href="{{ route('laporan.stokauditcombine') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
+                                <a href="{{ route('laporan.ansuran') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Ansuran Pembiayaan</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.ringkasanharian') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Harian</a>
+                                <a href="{{ route('laporan.stokauditcombine') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Stok Audit</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.marhunterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3">Marhun Terkumpul</a>
+                                <a href="{{ route('laporan.ringkasanharian') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Ringkasan Harian</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.audittrail') }}" class="btn btn-dark btn-lg btn-block mb-3">Audit Trail</a>
-                            </div>
-                            {{-- <div class="row">
-                               <a href="{{route('laporan.imbangduga')}}" class="btn btn-dark btn-lg btn-block mb-3">Imbang Duga</a>
-                            </div> --}}
-                            <div class="row">
-                                <a href="{{ route('laporan.serahmarhungadai') }}" class="btn btn-dark btn-lg btn-block mb-3">Serah Marhun Pembiayaan</a>
+                                <a href="{{ route('laporan.marhunterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Marhun Terkumpul</a>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.petibesi')}}" class="btn btn-dark btn-lg btn-block mb-3">Peti Besi</a>
+                                <a href="{{ route('laporan.audittrail') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Audit Trail</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Perbelanjaan</a>
-                            </div>
-                            {{-- <div class="row">
-                                <a href="{{ route('laporan.auditcustomer') }}" class="btn btn-dark btn-lg btn-block mb-3">Audit Customer</a>
-                            </div> --}}
-                            <div class="row">
-                                <a href="{{ route('laporan.imbangdugaakru') }}" class="btn btn-dark btn-lg btn-block mb-3">Imbang Duga Akru</a>
+                                <a href="{{ route('laporan.serahmarhungadai') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Serah Marhun Pembiayaan</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.notisperingatan') }}" class="btn btn-dark btn-lg btn-block mb-3">Notis Peringatan</a>
+                                <a href="{{route('laporan.petibesi')}}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Peti Besi</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Perbelanjaan</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.imbangdugaakru') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Imbang Duga Akru</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.notisperingatan') }}" class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Notis Peringatan</a>
                             </div>
                         </div>
                     </div>
diff --git a/resources/views/khazanah/laporanujrah/ansuranujrah.blade.php b/resources/views/khazanah/laporanujrah/ansuranujrah.blade.php
index bd6e7e8..98b7255 100644
--- a/resources/views/khazanah/laporanujrah/ansuranujrah.blade.php
+++ b/resources/views/khazanah/laporanujrah/ansuranujrah.blade.php
@@ -55,7 +55,7 @@
                                         <th>Tempoh</th>
                                         <th>Baki Pembiayaan (RM)</th>
                                         <th>Bayaran (RM)</th>
-                                        <th>Caj-caj Lain (RM)</th>
+                                        <th>Lain-lain Caj (RM)</th>
                                         <th>Keuntungan 1% (RM)</th>
                                         <th>Keuntungan (RM)</th>
                                     </tr>
diff --git a/resources/views/khazanah/laporanujrah/gadaianujrah.blade.php b/resources/views/khazanah/laporanujrah/gadaianujrah.blade.php
index 0f1800c..548de45 100644
--- a/resources/views/khazanah/laporanujrah/gadaianujrah.blade.php
+++ b/resources/views/khazanah/laporanujrah/gadaianujrah.blade.php
@@ -53,7 +53,7 @@
                                         <th>Tarikh Pembiayaan</th>
                                         <th>No Rujukan</th>
                                         <th>Pembiayaan (RM)</th>
-                                        <th>Keuntungan Caj-caj Lain (RM) </th>
+                                        <th>Keuntungan Lain-lain Caj (RM) </th>
                                         <th>Keuntungan 1% (RM)</th>
                                         <th>Jumlah Keuntungan (RM)</th>
                                         <th>Nilai Marhun (RM)</th>
diff --git a/resources/views/khazanah/laporanujrah/ringkasanharianujrah.blade.php b/resources/views/khazanah/laporanujrah/ringkasanharianujrah.blade.php
index ac9c32b..75b134e 100644
--- a/resources/views/khazanah/laporanujrah/ringkasanharianujrah.blade.php
+++ b/resources/views/khazanah/laporanujrah/ringkasanharianujrah.blade.php
@@ -9,7 +9,7 @@
                     <ol class="breadcrumb pb-3">
                       <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
                       <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
-                      <li class="breadcrumb-item active" aria-current="page">Ringkasan Harian Caj-caj Lain</li>
+                      <li class="breadcrumb-item active" aria-current="page">Ringkasan Harian Lain-lain Caj</li>
                     </ol>
                   </nav>
 
diff --git a/resources/views/khazanah/laporanujrah/tebusujrah.blade.php b/resources/views/khazanah/laporanujrah/tebusujrah.blade.php
index 23cb0c8..16da28b 100644
--- a/resources/views/khazanah/laporanujrah/tebusujrah.blade.php
+++ b/resources/views/khazanah/laporanujrah/tebusujrah.blade.php
@@ -59,7 +59,7 @@
                                             <th>Tarikh<br>Penyelesaian Pem.</th>
                                             <th>No<br>Rujukan</th>
                                             <th>Pembiayaan<br>(RM)</th>
-                                            <th>Caj-caj Lain<br>(RM)</th>
+                                            <th>Lain-lain Caj<br>(RM)</th>
                                             <th>Keuntungan 1% <br>(RM)</th>
                                             <th>Keuntungan<br>(RM)</th>
                                             <th>Bayaran<br>(RM)</th>
diff --git a/resources/views/khazanah/v1/info.blade.php b/resources/views/khazanah/v1/info.blade.php
index 3074f9b..12dcda7 100644
--- a/resources/views/khazanah/v1/info.blade.php
+++ b/resources/views/khazanah/v1/info.blade.php
@@ -116,10 +116,10 @@
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">
                     <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Selesai Pembiayaan
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
                         </label>
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Selesai Pembiayaan
+                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
                         </label>
                         <label class="btn btn-primary">
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
diff --git a/resources/views/khazanah/v2/info.blade.php b/resources/views/khazanah/v2/info.blade.php
index 12d5bbd..8ca5338 100644
--- a/resources/views/khazanah/v2/info.blade.php
+++ b/resources/views/khazanah/v2/info.blade.php
@@ -116,10 +116,10 @@
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">
                     <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Selesai Pembiayaan
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
                         </label>
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Sudah Selesai Pembiayaan
+                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
                         </label>
                         <label class="btn btn-primary">
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index d8fdb1c..defa3ff 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -45,7 +45,7 @@
             <div class="small-box bg-success">
               <div class="inner">
                 <h4 id="bilaktif"></h4>
-                <p>Belum Selesai Pembiayaan</p>
+                <p>Pembiayaan Belum Selesai</p>
               </div>
               <div class="icon">
                 <i class="fas fa-thumbs-up"></i>
diff --git a/resources/views/print/laporan_ansuran.blade.php b/resources/views/print/laporan_ansuran.blade.php
index 7e46768..c85a617 100644
--- a/resources/views/print/laporan_ansuran.blade.php
+++ b/resources/views/print/laporan_ansuran.blade.php
@@ -207,7 +207,7 @@
     <th>Tempoh</th>
     <th>Baki Pembiayaan (RM)</th>
     <th>Bayaran Pemb. (RM)</th>
-    <th>Caj-caj Lain (RM)</th>
+    <th>Lain-lain Caj (RM)</th>
     <th>Keuntungan 1% (RM)</th>
     <th>Keuntungan (RM)</th>
     <th>Bayaran (RM)</th>
@@ -316,7 +316,7 @@
 <tr>
 <th colspan="9"></th>
 <th style="text-align:center;">Bayaran Pemb. (RM)</th>
-<th style="text-align:center;">Caj-caj Lain (RM)</th>
+<th style="text-align:center;">Lain-lain Caj (RM)</th>
 <th style="text-align:center;">Keuntungan 1% (RM)</th>
 <th style="text-align:center;">Keuntungan (RM)</th>
 <th style="text-align:center;">Bayaran (RM)</th>
diff --git a/resources/views/print/laporan_ansuran_ujrah.blade.php b/resources/views/print/laporan_ansuran_ujrah.blade.php
index 0b4b077..dbfcc7b 100644
--- a/resources/views/print/laporan_ansuran_ujrah.blade.php
+++ b/resources/views/print/laporan_ansuran_ujrah.blade.php
@@ -318,7 +318,7 @@
       <tr>
         <th colspan="9"></th>
         <th style="text-align:center;">Bayaran Pemb. (RM)</th>
-        <th style="text-align:center;">Caj-caj Lain (RM)</th>
+        <th style="text-align:center;">Lain-lain Caj (RM)</th>
         <th style="text-align:center;">Keuntungan 1% (RM)</th>
         <th style="text-align:center;">Keuntungan (RM)</th>
         <th style="text-align:center;">Bayaran (RM)</th>
diff --git a/resources/views/print/laporan_gadaian_ujrah.blade.php b/resources/views/print/laporan_gadaian_ujrah.blade.php
index 9bd1ccf..dba8dd8 100644
--- a/resources/views/print/laporan_gadaian_ujrah.blade.php
+++ b/resources/views/print/laporan_gadaian_ujrah.blade.php
@@ -227,7 +227,7 @@
         <th>Berat</th>
         <th>N Marhun</th>
         <th>Pembiayaan</th>
-        <th>Caj-caj Lain (RM)</th>
+        <th>Lain-lain Caj (RM)</th>
         <th>Keuntungan 1% (RM)</th>
         <th>Keuntungan</th>
         <th>Peratus (%)</th>
diff --git a/resources/views/print/laporan_stokaudit.blade.php b/resources/views/print/laporan_stokaudit.blade.php
index 3f7e935..7948578 100644
--- a/resources/views/print/laporan_stokaudit.blade.php
+++ b/resources/views/print/laporan_stokaudit.blade.php
@@ -210,7 +210,7 @@
     <th>Kadar Upah</th>
     <th>Tempoh Belum Bayar</th>
     <th>Keuntungan Belum Bayar (RM)</th>
-    <th>Caj-caj Lain (RM)</th>
+    <th>Lain-lain Caj (RM)</th>
     <th>Keuntungan 1% (RM)</th>
     <th>Lanjutan</th>
   </thead>
diff --git a/resources/views/print/laporan_stokauditcombine.blade.php b/resources/views/print/laporan_stokauditcombine.blade.php
index 611f838..9d12b6c 100644
--- a/resources/views/print/laporan_stokauditcombine.blade.php
+++ b/resources/views/print/laporan_stokauditcombine.blade.php
@@ -225,7 +225,7 @@
             <th>Kadar Upah</th>
             <th>Tempoh Belum Bayar</th>
             <th>Keuntungan Belum Bayar (RM)</th>
-            <th>Caj-caj Lain (RM)</th>
+            <th>Lain-lain Caj (RM)</th>
             <th>Keuntungan 1% (RM)</th>
             <th>Lanjutan</th>
         </thead>
diff --git a/resources/views/print/laporan_tebus_ujrah.blade.php b/resources/views/print/laporan_tebus_ujrah.blade.php
index c9304c9..3ed4f6d 100644
--- a/resources/views/print/laporan_tebus_ujrah.blade.php
+++ b/resources/views/print/laporan_tebus_ujrah.blade.php
@@ -239,7 +239,7 @@
         <th>Nilai Marhun(RM)</th>
         <th>P. Asal(RM)</th>
         <th>B.Pembiayaan(RM)</th>
-        <th>Caj-caj Lain (RM)</th>
+        <th>Lain-lain Caj (RM)</th>
         <th>Untung 1% (RM)</th>
         <th>Pendapatan(RM)</th>
         <th>Bayaran(RM)</th>
@@ -460,7 +460,7 @@
         <th>Bil</th>
         <th>Jenis</th>
         <th>Penyelesaian Pem.(RM)</th>
-        <th>Caj-caj Lain (RM)</th>
+        <th>Lain-lain Caj (RM)</th>
         <th>Untung 1% (RM)</th>
         <th>Pendapatan(RM)</th>
         <th>Rebate(RM)</th>
diff --git a/resources/views/print/notisrugi.blade.php b/resources/views/print/notisrugi.blade.php
index ba510e6..745a1a4 100644
--- a/resources/views/print/notisrugi.blade.php
+++ b/resources/views/print/notisrugi.blade.php
@@ -182,7 +182,7 @@
           $datez = $myDateTime->format('d-m-Y');
           echo($datez);
 
-      @endphp dan didapati nilai jualan lelongan barangan pembiayaan tuan/puan tidak dapat menampung jumlah pembiayaan termasuk upah simpan dan Caj-caj Lain berjumlah RM({{ number_format($lel['baki'],2) }}) seperti dibawah:-</p>
+      @endphp dan didapati nilai jualan lelongan barangan pembiayaan tuan/puan tidak dapat menampung jumlah pembiayaan termasuk upah simpan dan Lain-lain Caj berjumlah RM({{ number_format($lel['baki'],2) }}) seperti dibawah:-</p>
 
     <table>
       <tr>
@@ -235,7 +235,7 @@
             </tr>
             @endif
             <tr>
-              <td>Caj-caj Lain</td>
+              <td>Lain-lain Caj</td>
               <td>:</td>
               <td>{{ ($lel['cajlain']) ? number_format($lel['cajlain'],2) : number_format(0,2) }}</td>
             </tr>
diff --git a/resources/views/print/notistuntutbaki.blade.php b/resources/views/print/notistuntutbaki.blade.php
index a05fe84..361f94c 100644
--- a/resources/views/print/notistuntutbaki.blade.php
+++ b/resources/views/print/notistuntutbaki.blade.php
@@ -237,7 +237,7 @@
             </tr>
             <tr>
             @endif
-              <td>Caj-caj Lain</td>
+              <td>Lain-lain Caj</td>
               <td>:</td>
               <td>{{ ($lel['cajlain']) ? number_format($lel['cajlain'],2) : number_format(0,2) }}</td>
             </tr>
diff --git a/resources/views/print/resit/tambah_pinjaman.blade.php b/resources/views/print/resit/tambah_pinjaman.blade.php
index ded3b94..3a5a35f 100644
--- a/resources/views/print/resit/tambah_pinjaman.blade.php
+++ b/resources/views/print/resit/tambah_pinjaman.blade.php
@@ -627,11 +627,11 @@
                 </td>
             </tr>
             <tr>
-                <td style="width:10px">Caj-caj Lain</td>
+                <td style="width:10px">Lain-lain Caj</td>
                 <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
-                <td style="width:10px">(-) Rebat Caj-caj Lain</td>
+                <td style="width:10px">(-) Rebat Lain-lain Caj</td>
                 <td style="width:10px">: RM
                     {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
@@ -853,11 +853,11 @@
                 </td>
             </tr>
             <tr>
-                <td style="width:10px">>Caj-caj Lain</td>
+                <td style="width:10px">>Lain-lain Caj</td>
                 <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
-                <td style="width:10px">(-) Rebat Caj-caj Lain</td>
+                <td style="width:10px">(-) Rebat Lain-lain Caj</td>
                 <td style="width:10px">: RM
                     {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
diff --git a/resources/views/print/resit/tebus_separuh.blade.php b/resources/views/print/resit/tebus_separuh.blade.php
index 33be07c..9483ee2 100644
--- a/resources/views/print/resit/tebus_separuh.blade.php
+++ b/resources/views/print/resit/tebus_separuh.blade.php
@@ -627,11 +627,11 @@
                 </td>
             </tr>
             <tr>
-                <td style="width:10px">Caj-caj Lain</td>
+                <td style="width:10px">Lain-lain Caj</td>
                 <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
-                <td style="width:10px">(-) Rebat Caj-caj Lain</td>
+                <td style="width:10px">(-) Rebat Lain-lain Caj</td>
                 <td style="width:10px">: RM
                     {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
@@ -853,11 +853,11 @@
                 </td>
             </tr>
             <tr>
-                <td style="width:10px">>Caj-caj Lain</td>
+                <td style="width:10px">>Lain-lain Caj</td>
                 <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
-                <td style="width:10px">(-) Rebat Caj-caj Lain</td>
+                <td style="width:10px">(-) Rebat Lain-lain Caj</td>
                 <td style="width:10px">: RM
                     {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php
index 4c73d31..225ee2f 100644
--- a/resources/views/print/resitansuran_ujrah.blade.php
+++ b/resources/views/print/resitansuran_ujrah.blade.php
@@ -498,7 +498,7 @@
             <td>: RM {{ number_format($transaction['onepercent'], 2) }}</td>
         </tr>
         <tr>
-            <td>Caj-caj Lain</td>
+            <td>Lain-lain Caj</td>
             <td>: RM {{ number_format($transaction['ujrah'], 2) }}</td>
         </tr>
         <tr>
@@ -616,7 +616,7 @@
             <td>: RM {{ number_format($transaction['onepercent'], 2) }}</td>
         </tr>
         <tr>
-            <td>Caj-caj Lain</td>
+            <td>Lain-lain Caj</td>
             <td>: RM {{ number_format($transaction['ujrah'], 2) }}</td>
         </tr>
         <tr>
diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php
index 8dee7d2..31964b7 100644
--- a/resources/views/print/resittebus_ujrah.blade.php
+++ b/resources/views/print/resittebus_ujrah.blade.php
@@ -627,11 +627,11 @@
                 </td>
             </tr>
             <tr>
-                <td style="width:10px">Caj-caj Lain</td>
+                <td style="width:10px">Lain-lain Caj</td>
                 <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
-                <td style="width:10px">(-) Rebat Caj-caj Lain</td>
+                <td style="width:10px">(-) Rebat Lain-lain Caj</td>
                 <td style="width:10px">: RM
                     {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
@@ -852,11 +852,11 @@
                 </td>
             </tr>
             <tr>
-                <td style="width:10px">Caj-caj Lain</td>
+                <td style="width:10px">Lain-lain Caj</td>
                 <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
-                <td style="width:10px">(-) Rebat Caj-caj Lain</td>
+                <td style="width:10px">(-) Rebat Lain-lain Caj</td>
                 <td style="width:10px">: RM
                     {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
diff --git a/resources/views/print/sag_ujrah_2.blade.php b/resources/views/print/sag_ujrah_2.blade.php
index 22054d6..489bd37 100644
--- a/resources/views/print/sag_ujrah_2.blade.php
+++ b/resources/views/print/sag_ujrah_2.blade.php
@@ -1250,7 +1250,7 @@
                         <td colspan="1"></td>
                         <td colspan="1">a.</td>
                         <td colspan="2">Pelanggan gagal dan/ingkar menjelaskan Pembiayaan,
-                            Keuntungan dan Caj-caj Lain pada tarikh yang ditetapkan;
+                            Keuntungan dan Lain-lain Caj pada tarikh yang ditetapkan;
                         </td>
                     </tr>
                     <tr>
@@ -1340,7 +1340,7 @@
                     echo '<img src="data:image/png;base64,' . DNS1D::getBarcodePNG($gadai_detail['nokp'], 'C128', 1, 20) . '" alt="barcode"   />';
                 @endphp
             </th>
-            <th colspan="2">PERJANJIAN PEMBIAYAAN AR-RAHN TAWARRUQ DAN<br>PENYIMPANAN EMAS (Caj-caj Lain)</th>
+            <th colspan="2">PERJANJIAN PEMBIAYAAN AR-RAHN TAWARRUQ DAN<br>PENYIMPANAN EMAS (Lain-lain Caj)</th>
             <th>
                 @php
                     echo '<img src="data:image/png;base64,' . DNS1D::getBarcodePNG($gadai_detail['norujukan'], 'C128', 1, 20) . '" alt="barcode"   />';
diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php
index 271191c..b954d36 100644
--- a/resources/views/print/sag_ujrah_3.blade.php
+++ b/resources/views/print/sag_ujrah_3.blade.php
@@ -479,7 +479,7 @@
                 </div>
             </div>
             
-            <table class="main-table mt-10 uppercase no-border">
+            <table class="main-table mt-5 uppercase no-border">
                 <tr>
                     <th colspan="6" class="centered-header">
                         <strong>KETERANGAN MARHUN</strong>
@@ -602,13 +602,13 @@
                     <td>{{ $formatted_t_matang_1 }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN DAN CAJ- CAJ LAIN YANG PERLU DIBAYAR</th>
+                    <th class="text-left">JUMLAH KEUNTUNGAN DAN LAIN - LAIN CAJ YANG PERLU DIBAYAR</th>
                     <td style="font-size:12px"><b>RM {{ number_format($gadai_detail['bakiupah'] / 6, 2) }}</b></td>
                     <td style="font-size:12px"><b>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</b></td>
                     <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN DAN CAJ- CAJ LAIN TERKUMPUL<br> SEPANJANG TEMPOH PEMBIAYAAN
+                    <th class="text-left">JUMLAH KEUNTUNGAN DAN LAIN - LAIN CAJ TERKUMPUL<br> SEPANJANG TEMPOH PEMBIAYAAN
                     </th>
                     <td>-</td>
                     <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
@@ -858,7 +858,7 @@
                                 <td colspan="1"></td>
                                 <td colspan="1">f.</td>
                                 <td colspan="2">Tertakluk kepada pembayaran penuh Jumlah Pembiayaan termasuk Jumlah
-                                    Keuntungan dan Caj-caj Lain Terkumpul, Pelanggan perlu
+                                    Keuntungan dan Lain-lain Caj Terkumpul, Pelanggan perlu
                                     hadir
                                     sendiri menyelesaikan pembiayaan;
                                 </td>
@@ -974,7 +974,7 @@
                                 <td colspan="1">n.</td>
                                 <td colspan="2">KoPKB berhak menuntut Jumlah Pembiayaan termaskk Jumlah Keuntungan
                                     dan
-                                    Caj-caj Lain Terkumpul setelah tamat tempoh yang dinyatakan pada notis berkaitan;
+                                    Lain-lain Caj Terkumpul setelah tamat tempoh yang dinyatakan pada notis berkaitan;
                                 </td>
                             </tr>
                             <tr>
@@ -1118,7 +1118,7 @@
                                 <td><b>2. </b></td>
                                 <td colspan="2"><b>Jika Pelanggan gagal membayar Jumlah Pembiayaan, Jumlah
                                         Keuntungan dan
-                                        Caj-caj Lain Terkumpul:</b></td>
+                                        Lain-lain Caj Terkumpul:</b></td>
                             </tr>
                             <tr>
                                 <td colspan="1"></td>
@@ -1145,7 +1145,7 @@
                                 <td colspan="1">c.</td>
                                 <td colspan="2">Sebarang lebihan hasil lelongan atau jualan (jika ada) setelah
                                     ditolak
-                                    Jumlah Pembiayaan termasuk Jumlah Keuntungan dan Caj-caj Lain Terkumpul
+                                    Jumlah Pembiayaan termasuk Jumlah Keuntungan dan Lain-lain Caj Terkumpul
                                     yang tertunggak dan kos-kos berkaitan akan
                                     dikembalikan
                                     kepada Pelanggan;</td>
@@ -1178,7 +1178,7 @@
                                         <hr style="margin: 0">MAKSIMUM MARGIN
                                     </b></td>
                                 <td>X</td>
-                                <td><b>CAJ-CAJ LAIN</b></td>
+                                <td><b>Lain-lain Caj</b></td>
                             </tr>
                         </table>
                         <br>
@@ -1194,7 +1194,7 @@
                                 <td colspan="1"></td>
                                 <td colspan="1">a.</td>
                                 <td colspan="2">Pelanggan gagal dan/ingkar menjelaskan Jumlah Pembiayaan,
-                                    Jumlah Keuntungan dan Caj-caj Lain Terkumpul pada tarikh yang ditetapkan;
+                                    Jumlah Keuntungan dan Lain-lain Caj Terkumpul pada tarikh yang ditetapkan;
                                 </td>
                             </tr>
                             <tr>
@@ -1285,9 +1285,9 @@
                 </div>
                 <div class="header-right">
                     <div>
-                        <div class="header-ps"><span class="{{ $is_pembiayaan_semula == false ? 'hidden' : '' }}">
+                        {{-- <div class="header-ps"><span class="{{ $is_pembiayaan_semula == false ? 'hidden' : '' }}">
                                 {{ $jenisAT != 'AT' ? $jenisAT : '(PS)' }}</span><span>{{ $gadai_detail['percentpinj'] }}%</span>
-                        </div>
+                        </div> --}}
                         <div class="bolder-10 mt-5">UNTUK KEGUNAAN PEJABAT</div>
                     </div>
                 </div>
@@ -1528,7 +1528,7 @@
                     <td>{{ $formatted_t_matang_1 }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN DAN CAJ-CAJ LAIN YANG PERLU DIBAYAR</th>
+                    <th class="text-left">JUMLAH KEUNTUNGAN DAN Lain-lain Caj YANG PERLU DIBAYAR</th>
                     <td style="font-size:12px"><b>RM {{ number_format($gadai_detail['bakiupah'] / 6, 2) }}</b></td>
                     <td style="font-size:12px"><b>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</b></td>
                     <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>