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

Merged in release/staging-putatan-v2 (pull request #284)

Browse Source 
Release/staging putatan v2
This commit is contained in:
Aiman Mazlan
2025-05-14 16:33:01 +00:00
committed by Muhd hafifie
parent a5e8621dcc b6e252789a
commit 58d61a32f9
8 changed files with 180 additions and 41 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)
config/redeemoption.php
+1
View File
@@ -5,5 +5,6 @@ return [
'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1),
// 'enable_specific_block' => env('ENABLE_BLOCK',0),
'cawangan_block' => explode(',', env('CAWANGAN_BLOCK', '1STOP,010915,010219,011013,011412,010621,010620,010617,010618')),
'ansuran_block' => explode(',', env('ANSURAN_BLOCK', '')),
];
?>
resources/views/layouts/app.blade.php
+83 -13
View File
@@ -8,7 +8,15 @@
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>SISTEM AR-RAHN</title>
<title>
@if (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan')
v2 Putatan Lama
@elseif (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2')
v2 Putatan Baru
@else
SISTEM AR-RAHN
@endif
</title>
<!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script>
@@ -114,6 +122,10 @@
border-bottom:none;
}
.text-gold {
color: gold !important;
}
</style>
</head>
@@ -131,21 +143,49 @@
@endphp
<div id="app">
<div id="page_loader" class="not-loading"></div>
<nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
<nav class="navbar navbar-expand-md navbar-light shadow-sm"
style="height:100px;
background-color:
{{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'red' :
(isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? '#FF6961' : 'white') }};">
<div class="container">
<a class="navbar-brand" href="#" style="cursor:not-allowed;">
<img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
<img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
<span style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : 'white' }}; font-weight: bold;">
@if (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan')
arOS v2
@elseif (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2')
arOS v2
@endif
</span>
</a>
<!-- Display Time -->
<div class="col-2">
<div style="color:#eb2f06;font-weight:bold;" id="displaytime"></div>
<div
id="displaytime"
style="color: {{ isset($cawangan_info['details_caw']) && ($cawangan_info['details_caw'] == 'Putatan' || $cawangan_info['details_caw'] == 'Putatan 2') ? 'gold' : '#eb2f06' }}; font-weight:bold;">
</div>
</div>
<div class="navbar-brand ml-3">
<b class="text-secondary">Cawangan : </b><span style="color:#1abc9c;font-weight:bold;">{{ $cawangan_info["details_caw"] }}</span>
</div>
<div class="navbar-brand ml-md-3">
<b class="text-secondary">Kod Cawangan : </b><span style="color:#1abc9c;font-weight:bold;">{{ $cawangan_info['kodcaw'] }}</span>
<input type="text" hidden name="kodcaw" id="kodcaw" value="{{ $cawangan_info['kodcaw'] }}">
<b class="{{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'text-black' :
(isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'text-gold' : 'text-secondary') }}">
Cawangan :
</b>
<span style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' :
(isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'white' : '#1abc9c') }}; font-weight:bold;">
{{ $cawangan_info["details_caw"] }}
</span>
@if (isset($cawangan_info['details_caw']) && ($cawangan_info['details_caw'] == 'Putatan' || $cawangan_info['details_caw'] == 'Putatan 2'))
<span class="badge badge-info">
@if ($cawangan_info['details_caw'] == 'Putatan')
Lama
@elseif ($cawangan_info['details_caw'] == 'Putatan 2')
Baru
@endif
</span>
@endif
</div>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
<span class="navbar-toggler-icon"></span>
</button>
@@ -164,7 +204,15 @@
@php $auth_user = Auth::user(); @endphp
@if ($auth_user['roles'] == 'ppc' || $auth_user['roles'] == 'pc')
<li class="nav-item dropdown" style="margin-right:10px;">
<a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
<a id="navbarDropdown"
class="nav-link"
href="#"
role="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
v-pre
style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : '#1abc9c' }};">
<i id="bell" class="fa fa-bell"></i>
</a>
@@ -235,7 +283,15 @@
</script>
@elseif($auth_user['role_harian'] == 'teller')
<li class="nav-item dropdown" style="margin-right:10px;">
<a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
<a id="navbarDropdown"
class="nav-link"
href="#"
role="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
v-pre
style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'white' : (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : '#1abc9c') }};">
<i id="bell" class="fa fa-bell"></i>
</a>
@@ -307,7 +363,17 @@
@endif
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" style="color:#1abc9c;font-weight:bold;" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
<!-- User Name at Top Right Corner -->
<a id="navbarDropdown"
class="nav-link dropdown-toggle"
href="#"
role="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
v-pre
style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'white' :
(isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : '#1abc9c') }}; font-weight:bold;">
{{ Auth::user()->name }}
</a>
@@ -342,7 +408,11 @@
<div class="col-12 pl-5">
<div class="row">
<h5 class="pr-3">G : <span class="text-success">' .$gadaiNumber. '</span></h5>
<h5>T : <span class="text-danger">' .$listSerahNumber. '</span></h5>
<h5>T :
<span style="color: '.(isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'white' : 'red').';">
'.$listSerahNumber.'
</span>
</h5>
</div>
</div>
</div>';
resources/views/penebusan/v2/index.blade.php
+1 -1
View File
@@ -91,7 +91,7 @@
<select class="form-control" id="sltjenistebus">
<option value="T">T = Penyelesaian Pembiayaan</option>
@if($gadai['tagbaru'] == 1)
@if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
@if(!in_array(Auth::user()->cawangan, config('redeemoption.ansuran_block', [])))
<option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran Pembiayaan</option>
@endif
@if(config('redeemoption.enable_separuh') == 1)
resources/views/print/resit/tambah_pinjaman.blade.php
+19 -4
View File
@@ -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
+22 -6
View File
@@ -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
+20 -4
View File
@@ -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
+24 -8
View File
@@ -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>