From 5a1995e5d8f84d8c4db51b6514692677f1f2f27b Mon Sep 17 00:00:00 2001
From: Ain Izazi <ain55645@gmail.com>
Date: Sun, 11 May 2025 11:08:04 +0800
Subject: [PATCH] naming di resit

---
 app/Http/Controllers/GadaianController.php    | 15 +++++---
 .../print/resit/tambah_pinjaman.blade.php     | 27 ++++++++++----
 .../views/print/resitansuran_ujrah.blade.php  | 32 ++++++++++++-----
 .../views/print/resittebus_ujrah.blade.php    | 28 +++++++++++----
 .../print/resittebusautotawarruq.blade.php    | 36 +++++++++++++------
 5 files changed, 103 insertions(+), 35 deletions(-)

diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 16dd910..ff94002 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -410,7 +410,7 @@ class GadaianController extends Controller
         $totaltransaction = 0;
 
         $transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json();
-
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
         $gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
 
@@ -430,9 +430,9 @@ class GadaianController extends Controller
             $wakil = $wakil[0];
 
         if($gadai['tagbaru'] == 1) {
-            return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil'));
+            return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil','cawangan_info'));
         } else {
-            return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
+            return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil','cawangan_info'));
             // return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
         }
     }
@@ -536,6 +536,8 @@ class GadaianController extends Controller
 
         $customers_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
 
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
         $transaction_keuntungan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json();
         // if(sizeof($customers_info) != 0)
         //     $customers_info = $customers_info[0];
@@ -555,7 +557,7 @@ class GadaianController extends Controller
 
         $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
 
-        return view('print.resittebusautotawarruq',compact('transaction_tebus', 'transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan', 'khazanah_user'));
+        return view('print.resittebusautotawarruq',compact('transaction_tebus', 'transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan', 'khazanah_user','cawangan_info'));
     }
 
     public function resittebus($id)
@@ -701,6 +703,9 @@ class GadaianController extends Controller
 
         $customers_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'.  $gadai['nokp'])->json();
 
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+
         // if(sizeof($customers_info) != 0)
         //     $customers_info = $customers_info[0];
 
@@ -728,7 +733,7 @@ class GadaianController extends Controller
         $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
         $totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json();
 
-        return view('print.resit.tambah_pinjaman',compact('totalrebate','khazanah_user','totalBayaranAnsuran','transaction_tebus','gadai','customers_info','penebusan','wakil'));
+        return view('print.resit.tambah_pinjaman',compact('totalrebate','khazanah_user','totalBayaranAnsuran','transaction_tebus','gadai','customers_info','penebusan','wakil','cawangan_info'));
     }
 
     public function history(Request $request)
diff --git a/resources/views/print/resit/tambah_pinjaman.blade.php b/resources/views/print/resit/tambah_pinjaman.blade.php
index 41e4728..2a2292f 100644
--- a/resources/views/print/resit/tambah_pinjaman.blade.php
+++ b/resources/views/print/resit/tambah_pinjaman.blade.php
@@ -5,14 +5,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    <script>
+    {{-- <script>
         $(document).ready(function() {
             window.print();
             window.onfocus = function() {
                 window.close();
             }
         });
-    </script>
+    </script> --}}
 </head>
 
 <body>
@@ -464,11 +464,21 @@
         }
     </style>
     <div class="header-style">
-        <div style="display: flex; align-items:center">
-            <img src="{{ asset('img/kopkb.png') }}" style="width:80px; margin-right: 10px" alt="User Image" class="center">
-            <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
+        <!-- Logo Section -->
+        <div style="display: flex; align-items: center;">
+            <img src="{{ asset('img/kopkb.png') }}" style="width: 80px; margin-right: 10px;" alt="KOPKB Logo" class="center">
+            <img src="{{ asset('img/ARRAHN1.png') }}" style="width: 50px;" alt="ARRAHN Logo" class="center">
         </div>
-        <div>
+    
+        <!-- Cawangan Info -->
+        <div style="display: flex; align-items: center; margin-top: 10px;">
+            <span style="color: #0a0b0b; font-weight: bold;">
+                <strong>{{ $cawangan_info["details_caw"] }}</strong>
+            </span>
+        </div>
+    
+        <!-- Notice Section -->
+        <div style="margin-top: 10px;">
             <span><strong>UNTUK KEGUNAAN PELANGGAN</strong></span>
         </div>
     </div>
@@ -695,6 +705,11 @@
                 class="center">
             <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
         </div>
+        <div style="display: flex; align-items: center;">
+            <span style="color: #0a0b0b; font-weight: bold;">
+              <strong>{{ $cawangan_info["details_caw"] }} (arOS V2)</strong>
+            </span>
+          </div>          
         <div>
             <span><strong>UNTUK KEGUNAAN PEJABAT</strong></span>
         </div>
diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php
index fec6863..f180162 100644
--- a/resources/views/print/resitansuran_ujrah.blade.php
+++ b/resources/views/print/resitansuran_ujrah.blade.php
@@ -5,14 +5,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    <script>
+    {{-- <script>
         $(document).ready(function() {
             window.print();
             window.onfocus = function() {
                 window.close();
             }
         });
-    </script>
+    </script> --}}
 </head>
 
 <body>
@@ -430,11 +430,21 @@
         }
     </style>
     <div class="header-style">
-        <div style="display: flex; align-items:center">
-            <img src="{{ asset('img/kopkb.png') }}" style="width:80px; margin-right: 10px" alt="User Image" class="center" >
-            <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >
+        <!-- Logo Section -->
+        <div style="display: flex; align-items: center;">
+            <img src="{{ asset('img/kopkb.png') }}" style="width: 80px; margin-right: 10px;" alt="KOPKB Logo" class="center">
+            <img src="{{ asset('img/ARRAHN1.png') }}" style="width: 50px;" alt="ARRAHN Logo" class="center">
         </div>
-        <div>
+    
+        <!-- Cawangan Info -->
+        <div style="display: flex; align-items: center; margin-top: 10px;">
+            <span style="color: #0a0b0b; font-weight: bold;">
+                <strong>{{ $cawangan_info["details_caw"] }}</strong>
+            </span>
+        </div>
+    
+        <!-- Notice Section -->
+        <div style="margin-top: 10px;">
             <span><strong>UNTUK KEGUNAAN PELANGGAN</strong></span>
         </div>
     </div>
@@ -548,9 +558,15 @@
     </table>
     <div class="header-style">
         <div style="display: flex; align-items:center">
-            <img src="{{ asset('img/kopkb.png') }}" style="width:80px; margin-right: 10px" alt="User Image" class="center" >
-            <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >
+            <img src="{{ asset('img/kopkb.png') }}" style="width:80px; margin-right: 10px" alt="User Image"
+                class="center">
+            <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
         </div>
+        <div style="display: flex; align-items: center;">
+            <span style="color: #0a0b0b; font-weight: bold;">
+              <strong>{{ $cawangan_info["details_caw"] }} (arOS V2)</strong>
+            </span>
+          </div>          
         <div>
             <span><strong>UNTUK KEGUNAAN PEJABAT</strong></span>
         </div>
diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php
index 341436e..b75b427 100644
--- a/resources/views/print/resittebus_ujrah.blade.php
+++ b/resources/views/print/resittebus_ujrah.blade.php
@@ -5,14 +5,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    <script>
+    {{-- <script>
         $(document).ready(function() {
             window.print();
             window.onfocus = function() {
                 window.close();
             }
         });
-    </script>
+    </script> --}}
 </head>
 
 <body>
@@ -464,14 +464,25 @@
         }
     </style>
     <div class="header-style">
-        <div style="display: flex; align-items:center">
-            <img src="{{ asset('img/kopkb.png') }}" style="width:80px; margin-right: 10px" alt="User Image" class="center">
-            <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
+        <!-- Logo Section -->
+        <div style="display: flex; align-items: center;">
+            <img src="{{ asset('img/kopkb.png') }}" style="width: 80px; margin-right: 10px;" alt="KOPKB Logo" class="center">
+            <img src="{{ asset('img/ARRAHN1.png') }}" style="width: 50px;" alt="ARRAHN Logo" class="center">
         </div>
-        <div>
+    
+        <!-- Cawangan Info -->
+        <div style="display: flex; align-items: center; margin-top: 10px;">
+            <span style="color: #0a0b0b; font-weight: bold;">
+                <strong>{{ $cawangan_info["details_caw"] }}</strong>
+            </span>
+        </div>
+    
+        <!-- Notice Section -->
+        <div style="margin-top: 10px;">
             <span><strong>UNTUK KEGUNAAN PELANGGAN</strong></span>
         </div>
     </div>
+    
     <br>
 
     <div style="position: relative">
@@ -694,6 +705,11 @@
                 class="center">
             <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
         </div>
+        <div style="display: flex; align-items: center;">
+            <span style="color: #0a0b0b; font-weight: bold;">
+              <strong>{{ $cawangan_info["details_caw"] }} (arOS V2)</strong>
+            </span>
+          </div>          
         <div>
             <span><strong>UNTUK KEGUNAAN PEJABAT</strong></span>
         </div>
diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php
index 96e01fa..545ef6c 100644
--- a/resources/views/print/resittebusautotawarruq.blade.php
+++ b/resources/views/print/resittebusautotawarruq.blade.php
@@ -6,12 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-<script>
+{{-- <script>
     $(document).ready(function () {
       window.print();
       window.onfocus=function(){ window.close();}
     });
-</script>
+</script> --}}
 <style>
 /* Red border */
 hr.new1 {
@@ -376,12 +376,22 @@ hr.new5 {
 
 
 <div class="header-style">
-  <div style="display: flex; align-items:center">
-    <img src="{{ asset('img/kopkb.png') }}" style="width:80px; margin-right: 10px" alt="User Image" class="center" >
-    <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >
+  <!-- Logo Section -->
+  <div style="display: flex; align-items: center;">
+      <img src="{{ asset('img/kopkb.png') }}" style="width: 80px; margin-right: 10px;" alt="KOPKB Logo" class="center">
+      <img src="{{ asset('img/ARRAHN1.png') }}" style="width: 50px;" alt="ARRAHN Logo" class="center">
   </div>
-  <div>
-    <span><strong>UNTUK KEGUNAAN PELANGGAN</strong></span>
+
+  <!-- Cawangan Info -->
+  <div style="display: flex; align-items: center; margin-top: 10px;">
+      <span style="color: #0a0b0b; font-weight: bold;">
+          <strong>{{ $cawangan_info["details_caw"] }}</strong>
+      </span>
+  </div>
+
+  <!-- Notice Section -->
+  <div style="margin-top: 10px;">
+      <span><strong>UNTUK KEGUNAAN PELANGGAN</strong></span>
   </div>
 </div>
 
@@ -522,11 +532,17 @@ hr.new5 {
 
 <div class="header-style">
   <div style="display: flex; align-items:center">
-    <img src="{{ asset('img/kopkb.png') }}" style="width:80px; margin-right: 10px" alt="User Image" class="center" >
-    <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >
+      <img src="{{ asset('img/kopkb.png') }}" style="width:80px; margin-right: 10px" alt="User Image"
+          class="center">
+      <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center">
   </div>
+  <div style="display: flex; align-items: center;">
+      <span style="color: #0a0b0b; font-weight: bold;">
+        <strong>{{ $cawangan_info["details_caw"] }} (arOS V2)</strong>
+      </span>
+    </div>          
   <div>
-    <span><strong>UNTUK KEGUNAAN PEJABAT</strong></span>
+      <span><strong>UNTUK KEGUNAAN PEJABAT</strong></span>
   </div>
 </div>