KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Merged in ain-putatanv2 (pull request #279)

Browse Source 
naming di resit
This commit is contained in:
Ain Izazi Aziz
2025-05-11 03:28:39 +00:00
parent 80f51caa24 5a1995e5d8
commit d9732f9ef7
5 changed files with 103 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+10 -5
View File
@@ -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)
resources/views/print/resit/tambah_pinjaman.blade.php
+21 -6
View File
@@ -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>
resources/views/print/resitansuran_ujrah.blade.php
+24 -8
View File
@@ -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>
resources/views/print/resittebus_ujrah.blade.php
+22 -6
View File
@@ -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>
resources/views/print/resittebusautotawarruq.blade.php
+26 -10
View File
@@ -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>