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

Merge branch 'production' of https://bitbucket.org/arrahn-pkb/kaunter into annur-rebate

Browse Source
This commit is contained in:
nurafrinaalimi16
2025-02-05 12:18:49 +08:00
parent a0a50b42a0 e5bd3f1ab2
commit 4ed8067239
4 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PenebusanController.php
+4
View File
@@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\AliranTunaiController; use App\Http\Controllers\AliranTunaiController;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Log;
use Carbon\Carbon; use Carbon\Carbon;
@@ -811,6 +812,9 @@ class PenebusanController extends Controller
'nota' => $request->nota, 'nota' => $request->nota,
'teller' => $auth_user['name'] 'teller' => $auth_user['name']
'nota' => $request->nota,
'teller' => $auth_user['name']
])->json(); ])->json();
if($createwakil) if($createwakil)
config/redeemoption.php
+2 -2
View File
@@ -3,7 +3,7 @@ return [
'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',1), 'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',1),
'enable_separuh' => env('ENABLE_SEPARUH',1), 'enable_separuh' => env('ENABLE_SEPARUH',1),
'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1), 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1),
'enable_specific_block' => env('ENABLE_BLOCK',0), // 'enable_specific_block' => env('ENABLE_BLOCK',0),
'cawangan_block' => env('CAWANGAN_BLOCK','011227') 'cawangan_block' => explode(',', env('CAWANGAN_BLOCK', '1STOP,010915,010219,011013,011412,010621,010620,010617,010618')),
]; ];
?> ?>
resources/views/customers/v2/info.blade.php
+37 -24
View File
@@ -119,34 +119,47 @@
</div> </div>
</div> </div>
<div class="col-md-12 mt-md-3 justify-content-between form-group row"> <!-- footer card -->
<div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons"> <div class="mr-4 form-group d-flex justify-content-end">
<label class="btn btn-primary"> <button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai </div>
</label>
<label class="btn btn-primary"> </div>
<input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
</label> </div>
<label class="btn btn-primary">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong <!-- button -->
</label>
</div> <div class="col-md-10 mt-md-2 justify-content-between form-group row">
<div class='col-md-3'> <div class="btn-group btn-group-toggle d-flex flex-fill" data-toggle="buttons">
<button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> <label class="btn btn-secondary flex-fill">
</div> <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>
@if(config('redeemoption.enable_specific_block') == 0 || Auth::user()->cawangan !== config('redeemoption.cawangan_block')) Pembiayaan Belum Selesai
<div class="col-md-3 text-right"> </label>
<a class="btn btn-primary" style="margin-right:-50px" id="daftar_gadai">Daftar Pembiayaan</a> <label class="btn btn-secondary flex-fill">
</div> <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">
@endif Pembiayaan Sudah Selesai
</div> </label>
</div> <label class="btn btn-secondary flex-fill">
<div class="card"> <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">
Lelong
</label>
</div>
</div>
<!-- card -->
<div class="col-md-12 col-lg-12">
<div class="card">
<div class="card-body"> <div class="card-body">
<nav class="mb-3"> <nav class="mb-3">
<!-- button --> <!-- button -->
<div class="mr-2 form-group d-flex justify-content-end"> <div class="mr-2 form-group d-flex justify-content-end">
<a class="btn btn-primary button-spacing" id="daftar_gadai">Daftar Pembiayaan</a> @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
<a class="btn btn-primary button-spacing" id="daftar_gadai">Daftar Pembiayaan</a>
@endif
</div> </div>
<div class="nav nav-tabs" id="nav-tab" role="tablist"> <div class="nav nav-tabs" id="nav-tab" role="tablist">
@php @php
resources/views/penebusan/v2/index.blade.php
+6 -4
View File
@@ -91,20 +91,22 @@
<select class="form-control" id="sltjenistebus"> <select class="form-control" id="sltjenistebus">
<option value="T">T = Penyelesaian Pembiayaan</option> <option value="T">T = Penyelesaian Pembiayaan</option>
@if($gadai['tagbaru'] == 1) @if($gadai['tagbaru'] == 1)
<option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran Pembiayaan</option> @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
<option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran Pembiayaan</option>
@endif
@if(config('redeemoption.enable_separuh') == 1) @if(config('redeemoption.enable_separuh') == 1)
@if(config('redeemoption.enable_specific_block') == 0 || Auth::user()->cawangan !== config('redeemoption.cawangan_block')) @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
<option value="S">S = Sebahagian</option> <option value="S">S = Sebahagian</option>
@endif @endif
@endif @endif
@if(config('redeemoption.enable_tambahpinjam') == 1) @if(config('redeemoption.enable_tambahpinjam') == 1)
@if(config('redeemoption.enable_specific_block') == 0 || Auth::user()->cawangan !== config('redeemoption.cawangan_block')) @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
<option value="P">P = Tambah Pembiayaan</option> <option value="P">P = Tambah Pembiayaan</option>
@endif @endif
@endif @endif
@endif @endif
@if(config('redeemoption.enable_pembiayaansemula') == 1) @if(config('redeemoption.enable_pembiayaansemula') == 1)
@if(config('redeemoption.enable_specific_block') == 0 || Auth::user()->cawangan !== config('redeemoption.cawangan_block')) @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
<option value="AT">PS = Pembiayaan Semula</option> <option value="AT">PS = Pembiayaan Semula</option>
@endif @endif
@endif @endif