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

Merge branch 'production' of bitbucket.org:arrahn-pkb/kaunter into hotfix/tunai-add-timestamp

Browse Source
This commit is contained in:
hafifierahman
2024-12-31 00:29:33 +08:00
parent f59e0a4d4e 0511b3e7c5
commit fbae8567ad
16 changed files with 365 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/DailyImbangDuga.php
+1 -1
View File
@@ -54,7 +54,7 @@ class DailyImbangDuga extends Command
foreach($array_cawangan as $caw)
{
if($caw['zone'] == $zone)
if($caw['version'] == 'v2')
{
$response = $this->imbangduga->OperationImbangDuga($caw['kodcaw']);
}
app/Console/Commands/generateAkruProblem.php
+1 -1
View File
@@ -63,7 +63,7 @@ class generateAkruProblem extends Command
$updateIG = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/updateImbangDuga',[
'zone' => $zone,
'tarikh' => $previousmonth,
'tarikh' => $previousmonth->toDateString(),
])->json();
$this->info('sucess');
app/Http/Controllers/PenebusanController.php
+77 -127
View File
@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\AliranTunaiController;
use Illuminate\Support\Facades\Log;
use Carbon\Carbon;
@@ -257,7 +258,8 @@ class PenebusanController extends Controller
'karat' => $array1['karat'],
'berat_emas' => $array1['berat'],
'harga' => $array1['harga'],
'nilai_marhun' => $array1['n_marhun']
'nilai_marhun' => $array1['n_marhun'],
'kuantiti' => $array1['bil']
])->json();
}
@@ -300,6 +302,10 @@ class PenebusanController extends Controller
"bakipelanggan" => $request->bakipelanggan,
])->json();
if($updatetebus == 'duplicate'){
return response()->json('duplicate');
}
//////////////////////
/// MAKING NEW SAG////
/////////////////////
@@ -339,7 +345,7 @@ class PenebusanController extends Controller
$nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
}
foreach($arraymarhunbaru as $array1){
@@ -350,7 +356,9 @@ class PenebusanController extends Controller
'karat' => $array1['karat'],
'berat_emas' => $array1['berat'],
'harga' => $array1['harga'],
'nilai_marhun' => $array1['n_marhun']
'tag_permata' => $array1['tag_permata'],
'berat_batu_permata' => $array1['berat_batu_permata'],
'kuantiti' => $array1['bil']
])->json();
}
@@ -419,7 +427,7 @@ class PenebusanController extends Controller
}
public function tebusautotawarruq(Request $request)
public function tambahpinjaman_latest(Request $request)
{
$api_url = config('api.url');
$current = Carbon::now();
@@ -430,16 +438,64 @@ class PenebusanController extends Controller
$auth_user = Auth::user();
////////////////////////
/// UPDATE TEBUS API////
///////////////////////
$updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updateautotawarruq/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
$updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetambahpinjaman/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
"nopelanggan" => $request->nopelanggan,
"jenistebus" => $request->jenistebus,
"jbg" => $request->jbg,
"kadarupah" => $request->kadarupah,
"nilai_marhun" => $request->nilai_marhun,
"pinjamanbaru" => $request->pinjaman,
"pinjaman" => $request->pinjaman_lama,
"ansuran" => $request->ansuran,
"addpinjaman" => $request->addpinjaman,
"bakipinjaman" => $request->bakipinjaman,
"bakiupah" => $request->bakiupah,
"historygadaian" => $request->historygadaian,
"marhun" => $request->marhun,
"kuantiti_marhun" => $request->kuantiti_marhun,
"total_berat" => $request->total_berat,
"kadarkeuntungan" => $request->kadarkeuntungan,
"keuntungan_6bln" => $request->keuntungan_6bln,
"keuntungan_sebulan" => $request->keuntungan_sebulan,
"noic" => $request->noic,
"norujukan" => $request->norujukan,
"jenisbayarantebus" => $request->jenisbayarantebus,
"jeniskeuntungan" => $request->jeniskeuntungan,
"teller" => $request->teller,
"bayaran" => $request->bayaran,
"bakipelanggan" => $request->bakipelanggan,
"nowakil" => isset($request->nowakil) ? $request->nowakil : 0
])->json();
if($updatetebus['result'] == 'success'){
event(new TebusNotify('lulus',Auth::user()->cawangan));
event(new GadaiNotify('lulus',Auth::user()->cawangan));
$this->AliranTunaiController->alirantunaiTebus($request);
}
return response()->json($updatetebus['result'],200);
}
public function tebusautotawarruq(Request $request)
{
$auth_user = Auth::user();
////////////////////////
/// UPDATE TEBUS API////
///////////////////////
$updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updateautotawarruq/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
'nopelanggan' => $request->nopelanggan,
'jenistebus' => $request->jenistebus,
'jbg' => $request->jbg,
'kadarupah' => $request->kadarupah,
'nilai_marhun' => $request->nilai_marhun,
'pinjaman' => $request->pinjaman_lama,
'pinjamanbaru' => $request->pinjaman,
'ansuran' => $request->ansuran,
'addpinjaman'=> $request->addpinjaman,
'bakipinjaman' => $request->bakipinjaman,
@@ -453,128 +509,16 @@ class PenebusanController extends Controller
'totalbayaran' => $request->totalbayaran,
"duitpelanggan" => $request->bayaran,
"bakipelanggan" => $request->bakipelanggan,
"noic" => $request->noic,
"jenisAT" => $request->jenisAT,
])->json();
//////////////////////
/// MAKING NEW SAG////
/////////////////////
$gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
if($gadai_transaction){
$new_sirig = $gadai_transaction['sirig'] + 1;
}else{
$new_sirig = 1;
if($updatetebus['result'] == 'success'){
$alirantunai = new AliranTunaiController();
event(new TebusNotify('lulus',Auth::user()->cawangan));
event(new GadaiNotify('lulus',Auth::user()->cawangan));
$alirantunai->alirantunaiTebusAutoTawarruq($request);
}
$new_transaction = sprintf("%04d",$new_sirig);
$norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
'norujukan' => $norujukanbaru,
'nopelanggan' => $request->nopelanggan,
'nokp' => $request->noic,
'sirig' => $new_sirig
]);
///////////////////////////
/// MARHUN UPDATE TABLE////
//////////////////////////
$arraymarhunbaru = [];
$marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
$marhunyangdiambil = $marhunsediada[0];
foreach($marhunyangdiambil as $index=>$marhunloop)
{
$karatbaru = str_replace('.','-',$marhunloop['karat']);
$hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
$harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
$nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
}
foreach($arraymarhunbaru as $array1){
$updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
'norujukan' => $norujukanbaru,
'marhun' => $array1['marhun'],
'nota' => $array1['nota'],
'karat' => $array1['karat'],
'berat_emas' => $array1['berat'],
'harga' => $array1['harga'],
'nilai_marhun' => $array1['n_marhun'],
'jenisAT' => $request->jenisAT
])->json();
}
//////////////////////
////Update SAG BARU///
/////////////////////
$total_nilai_marhun = $request->total_nilai_marhun;
$margin_pinjaman = ($request->pinjaman / $total_nilai_marhun);
$onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
'pembiayaan' => $request->pinjaman,
'nilaimarhun' => $total_nilai_marhun,
'kadarujrah' => $request->kadarkeuntungan,
'margin' => ($margin_pinjaman*100),
'kodcaw' => Auth::user()->cawangan
])->json();
$keuntungan_sebln = $onepercent['keuntungan'];
$keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
$kadarupah = $request->kadarkeuntungan * 100;
$keuntungan6bulan = $keuntungan_sebln * 6;
$keuntungan12bulan = $keuntungan_sebln * 12;
$hargajualan = $request->pinjaman + $keuntungan12bulan;
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
'kodcaw' => $auth_user['cawangan'],
'nilaimarhun' => round($total_nilai_marhun, 2),
'berat' => round($request->total_berat, 2),
'pinjaman' => round($request->pinjaman, 2),
'kadarupah' => round($kadarupah, 2),
'marhun' => $request->marhun_detail,
'percentpinj' => $margin_pinjaman,
'teller'=> $auth_user['name'],
'upah6' => $keuntungan6bulan,
'upah12' => $keuntungan12bulan,
'hargajualan' => $hargajualan,
'kuantiti_marhun' => $request->kuantiti_marhun,
]);
$komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
'unit_komuditi' => round($request->pinjaman, 2),
'norujukan' => $norujukanbaru,
'kodcaw' => $auth_user['cawangan'],
'teller' => $auth_user['name']
]);
////////////////////////////
////Update History Gadaian///
////////////////////////////
$updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
'historygadaian' => $request->norujukan,
'jenistebus' => $request->jenistebus,
])->json();
$alirantunai = new AliranTunaiController();
event(new TebusNotify('lulus',Auth::user()->cawangan));
event(new GadaiNotify('lulus',Auth::user()->cawangan));
$alirantunai->alirantunaiTebusAutoTawarruq($request);
return response()->json($updatemarhun,200);
return response()->json($updatetebus['result'],200);
}
public function tebusseparuh(Request $request)
@@ -612,6 +556,9 @@ class PenebusanController extends Controller
"bakipelanggan" => $request->bakipelanggan,
])->json();
if($updatetebus == 'duplicate'){
return response()->json('duplicate');
}
//////////////////////
/// MAKING NEW SAG////
@@ -655,7 +602,7 @@ class PenebusanController extends Controller
$nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
}
}
@@ -668,7 +615,10 @@ class PenebusanController extends Controller
'karat' => $array1['karat'],
'berat_emas' => $array1['berat'],
'harga' => $array1['harga'],
'nilai_marhun' => $array1['n_marhun']
'tag_permata' => $array1['tag_permata'],
'berat_batu_permata' => $array1['berat_batu_permata'],
'nilai_marhun' => $array1['n_marhun'],
'kuantiti' => $array1['bil']
])->json();
}
app/Services/ImbangdugaServices.php
+7 -2
View File
@@ -56,7 +56,7 @@ class ImbangdugaServices
if($kodcaw == '010219')
if($tarikh >= '2022-11-24')
$data = $value - 78379.9;
$data = $value;
else $data = $value;
else $data = $value;
break;
@@ -64,7 +64,12 @@ class ImbangdugaServices
if($kodcaw == '010219')
if($tarikh < '2022-11-24')
$data = $value - 78379.9;
else $data = $value;
else if($tarikh >= '2023-02-16'){
$hutang = Http::get(config('api.url').'/admin/ig/penghutang' ,['kodcaw' => $kodcaw, 'tarikh' => $tarikh])->json();
$bayaran_hutang = Http::get(config('api.url').'/admin/ig/bayaran_penghutang' ,['kodcaw' => $kodcaw, 'tarikh' => $tarikh])->json();
$data = $hutang['bakihutang'] - $bayaran_hutang;
}else $data = $value;
//else $data = $value;
else $data = $value;
break;
case 'jualan1stop':
config/redeemoption.php
+4 -2
View File
@@ -2,6 +2,8 @@
return [
'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',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),
'cawangan_block' => explode(',', env('CAWANGAN_BLOCK', '1STOP,010915,010219,011013,011412,010621,010620,010617,010618')),
];
?>
?>
resources/views/callcenter/v2/info.blade.php
+24 -17
View File
@@ -9,7 +9,7 @@
@section('content')
@include('modal.historytebus')
@include('modal.wakil')
<div class="container">
<div class="container-fluid">
<div class="row justify-content-center">
<div class="col-md-12 col-lg-12">
@@ -118,26 +118,25 @@
<input type="text" class="form-control" name="rugilelong" id="rugilelong" readonly value="{{ number_format($rugilelong,2) }}">
</div>
</div>
<div class="col-md-12 d-flex justify-content-end mt-3">
<button class="btn btn-primary" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
<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>Pembiayaan Belum Selesai.
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
</label>
<label class="btn btn-primary">
<label class="btn btn-secondary">
<input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
</label>
<label class="btn btn-primary">
<label class="btn btn-secondary">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
</label>
</div>
<div class='col-md-3'>
{{-- <button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> --}}
</div>
<div class="col-md-3 text-right">
<button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
</div>
<div class="card">
@@ -175,6 +174,7 @@
<th>Tempoh</th>
<th>Keuntungan</th>
<th>Lelong</th>
<th>Pembayaran Terakhir</th>
</tr>
</thead>
</table>
@@ -203,6 +203,7 @@
<th>Tempoh</th>
<th>Keuntungan</th>
<th>Lelong</th>
<th>Pembayaran Terakhir</th>
</tr>
</thead>
</table>
@@ -758,6 +759,7 @@
if(gadai_detail["tagbaru"] == 0){
$('#textnavsag').addClass('text-danger');
var taglel = '';
var lastbayar = '';
if(gadai_detail['taglel'] == 1){
if(tagarrahnbid == 1){
$.ajax({
@@ -767,6 +769,7 @@
success: function(data){
taglel = data.lelong.t_lelong;
lastbayar = data.lelong.lastbayar;
}
});
} else {
@@ -791,18 +794,20 @@
if(gadai_detail["percentpinj"] != 0)
xtawarruq.row.add([
'<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
'<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
'<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'],
tarikh_matang,
'RM '+ formatter.format(gadai_detail['bakihargajualan']),
'RM '+formatter.format(gadai_detail['bakipjm']),
'RM'+ formatter.format(gadai_detail['bakihargajualan']),
'RM'+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
'RM '+ upahsemasa,
'RM'+ upahsemasa,
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + lastbayar + '</div>',
]).draw();
}else{
var taglel = '';
var lastbayar = '';
if(gadai_detail['taglel'] == 1){
if(tagarrahnbid == 1){
$.ajax({
@@ -812,6 +817,7 @@
success: function(data){
taglel = data.lelong.t_lelong;
lastbayar = data.lelong.lastbayar;
}
});
} else {
@@ -837,12 +843,13 @@
'<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'],
tarikh_matang,
'RM '+ formatter.format(gadai_detail['bakihargajualan']),
'RM '+formatter.format(gadai_detail['bakipjm']),
'RM'+ formatter.format(gadai_detail['bakihargajualan']),
'RM'+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
'RM '+ formatter.format(upahsemasa['pendapatan']),
'RM'+ formatter.format(upahsemasa['pendapatan']),
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + lastbayar + '</div>',
]).draw();
}
}else if(jenistebus == "sudah_tebus"){
resources/views/customers/v2/info.blade.php
+65 -29
View File
@@ -12,7 +12,7 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12 col-lg-12">
<div class="card">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
@@ -89,10 +89,8 @@
</div>
</div>
<div class="col-md-6">
<div class="form-group row">
<div class="form-group row">
<div class="col-md-4">
<b>No Telefon</b>
</div>
@@ -119,30 +117,50 @@
</div>
</div>
</div>
<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>Pembiayaan Belum Selesai
</label>
<label class="btn btn-primary">
<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
</label>
</div>
<div class='col-md-3'>
<button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
<div class="col-md-3 text-right">
<a class="btn btn-primary" style="margin-right:-50px" id="daftar_gadai">Daftar Pembiayaan</a>
</div>
</div>
</div>
<div class="card">
<!-- footer card -->
<div class="mr-4 form-group d-flex justify-content-end">
<button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
</div>
<!-- button -->
<div class="col-md-10 mt-md-2 justify-content-between form-group row">
<div class="btn-group btn-group-toggle d-flex flex-fill" data-toggle="buttons">
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>
Pembiayaan Belum Selesai
</label>
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">
Pembiayaan Sudah Selesai
</label>
<label class="btn btn-secondary flex-fill">
<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">
<nav class="mb-3">
<!-- button -->
<div class="mr-2 form-group d-flex justify-content-end">
@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 class="nav nav-tabs" id="nav-tab" role="tablist">
@php
$activate_tab = request()->session()->pull('activate_tab', 'SAG_lama');
@@ -254,6 +272,7 @@
</div>
</div>
</div>
</div>
<!-- Modal -->
<div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
@@ -581,6 +600,13 @@
var pinjaman = $(data).data("pinjaman");
var hargajualan = $(data).data("hargajualan");
let array_tempblock = ['011237240808-0003','011237240719-0015','011237240806-0011','011237240828-0001',
'011237240904-0007','011237240904-0008','011237240904-0009','011237240719-0023','011237240719-0024',
'011237240719-0025','011237240618-0026','011237240719-0027','011237240719-0028','011237240618-0020',
'011237240719-0030','011237240618-0029','011237240731-0026','011237240715-0027','011237240912-0009',
];
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
@@ -590,6 +616,16 @@
}
});
if (array_tempblock.includes(norujukan)) {
Swal.close();
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Surat Pembiayaan Mengalami Masalah Sila Hubungi IT'
});
return false;
}
if(hargajualan == pinjaman){
Swal.fire({
icon: 'error',
@@ -1617,7 +1653,7 @@
});
}
function ubahPembiayaanSemulaErrorHandling()
async function ubahPembiayaanSemulaErrorHandling()
{
let selected = document.querySelector('#navtawarruqdannottawarruq input[type="radio"][name="belum"]:checked')
@@ -1638,7 +1674,7 @@
return true;
}
let isPS = checkPS(selected.value)
let isPS = await checkPS(selected.value)
if(isPS === true){
Swal.fire({
@@ -1653,9 +1689,9 @@
return false;
}
function ubahfunc(e){
async function ubahfunc(e){
let isError = ubahPembiayaanSemulaErrorHandling()
let isError = await ubahPembiayaanSemulaErrorHandling()
if(isError){
return;
}
resources/views/khazanah/index.blade.php
+31 -12
View File
@@ -812,20 +812,39 @@
var nokp = $('#noic').val();
if(id_type=='nokp'){
if($.isNumeric(nokp) == false){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan'
});
event.preventDefault();
return false;
// Swal.fire({
// icon: 'error',
// title: 'Amaran!',
// text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan'
// });
// event.preventDefault();
// return false;
if(nokp.substr(-1) != '*'){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan'
});
event.preventDefault();
return false;
}
}
if(nokp.length != 12){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Periksa No KP Pelanggan'
});
// Swal.fire({
// icon: 'error',
// title: 'Amaran!',
// text: 'Sila Periksa No KP Pelanggan'
// });
if(nokp.substr(-1) != '*')
{
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Periksa No KP Pelanggan'
});
event.preventDefault();
return false;
}
event.preventDefault();
return false;
}
resources/views/khazanah/v2/info.blade.php
+38 -22
View File
@@ -1,5 +1,11 @@
@extends('layouts.app')
<style>
#daftar_gadai{
color:#fff !important;
}
</style>
@section('content')
@include('modal.historytebus')
@@ -10,7 +16,7 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12 col-lg-12">
<div class="card">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
@@ -85,7 +91,7 @@
<div class="col-md-6">
<div class="form-group row">
<div class="form-group row">
<div class="col-md-4">
<b>No Telefon</b>
</div>
@@ -112,27 +118,37 @@
</div>
</div>
</div>
<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>Pembiayaan Belum Selesai
</label>
<label class="btn btn-primary">
<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
</label>
</div>
<div class='col-md-3 text-right'>
</div>
<div class="col-md-3 text-right">
<button class='btn btn-primary' data-toggle="modal" style="margin-right:-50px" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
</div>
<!-- footer card -->
<div class="mr-4 form-group d-flex justify-content-end">
<button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
</div>
<!-- button -->
<div class="col-md-10 mt-md-2 justify-content-between form-group row">
<div class="btn-group btn-group-toggle d-flex flex-fill" data-toggle="buttons">
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
</label>
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
</label>
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
</label>
</div>
</div>
</div>
<div class="card">
<div class="card-body">
<nav class="mb-3">
resources/views/operasi/daftar_kakitangan.blade.php
+2 -2
View File
@@ -124,12 +124,12 @@
<td>{{ $staff->name }}</td>
<td>{{ strtoupper($staff->roles) }}</td>
<td>
@if($staff->cawangan == 'operasi')
@if($staff->cawangan == 'operasi' || $staff->cawangan == 'callcenter' || $staff->cawangan == 'admin')
{{ ucwords($staff->cawangan) }}
@else
@php
$cawangan_staff = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json();
echo ($cawangan_staff) ? ucwords($cawangan_staff['details_caw']) : 'test';
echo (isset($cawangan_staff['details_caw'])) ? ucwords($cawangan_staff['details_caw']) : 'test';
@endphp
@endif
</td>
resources/views/penebusan/v1/index.blade.php
+18 -8
View File
@@ -2402,14 +2402,24 @@
var urlroute = '{{ route("resit.autotawarruq", ":id") }}';
urlroute = urlroute.replace(':id', norujukan);
Swal.fire(
'Berjaya!',
'Tebus Auto Tawarruq Berjaya',
'success'
) .then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ route('customer_info') }}");
})
if(success_data == 'success'){
Swal.fire(
'Berjaya!',
'Penyelesaian Pembiayaan Semula Berjaya',
'success'
) .then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ route('customer_info') }}");
})
}else{
Swal.fire(
'Tidak Berjaya!',
'Penyelesaian Pembiayaan Semula Tidak Berjaya!',
'error'
).then(function(){
window.location.replace("{{ route('customer_info') }}");
});
}
},error: function (request, status, error) {
console.log(request.responseText);
}
resources/views/penebusan/v2/index-khazanah.blade.php
+19 -11
View File
@@ -2660,17 +2660,25 @@
},
success:function(success_data){
var urlroute = '{{ route("resit.autotawarruq", ":id") }}';
urlroute = urlroute.replace(':id', norujukan);
Swal.fire(
'Berjaya!',
'Penyelesaian Pembiayaan Semula Berjaya',
'success'
) .then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ route('customer_info') }}");
})
if(success_data == 'success'){
var urlroute = '{{ route("resit.autotawarruq", ":id") }}';
urlroute = urlroute.replace(':id', norujukan);
Swal.fire(
'Berjaya!',
'Penyelesaian Pembiayaan Semula Berjaya',
'success'
) .then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ route('customer_info') }}");
})
}else{
Swal.fire(
'Tidak Berjaya!',
'Penyelesaian Pembiayaan Semula Tidak Berjaya!',
'error'
);
}
},error: function (request, status, error) {
console.log(request.responseText);
}
resources/views/penebusan/v2/index.blade.php
+41 -11
View File
@@ -91,16 +91,24 @@
<select class="form-control" id="sltjenistebus">
<option value="T">T = Penyelesaian Pembiayaan</option>
@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(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
<option value="S">S = Sebahagian</option>
@endif
@endif
@if(config('redeemoption.enable_tambahpinjam') == 1)
@if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
<option value="P">P = Tambah Pembiayaan</option>
@endif
@endif
@endif
@if(config('redeemoption.enable_pembiayaansemula') == 1)
@if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
<option value="AT">PS = Pembiayaan Semula</option>
@endif
@endif
<option value="" disabled hidden>Pilih Jenis Penyelesaian Pembiayaan</option>
</select>
@@ -3201,6 +3209,15 @@
function gadaiautotawarruq()
{
var jenisbayarantebus = '';
if(hargajualan == '')
{
jenisbayarantebus = "nottawarruq";
}
else if (hargajualan != ''){
jenisbayarantebus = "tawarruq";
}
let jeniskeuntungan = (tagbaru == 1) ? 'onepercent' : 'asal';
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jenistebus = 'AT';
@@ -3274,7 +3291,7 @@
"historygadaian" : historygadaian,
"marhun" : marhun,
"nowakil" : nowakil,
"jenisbayarantebus" : "nottawarruq",
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller,
"jeniskeuntungan" : jeniskeuntungan,
@@ -3298,14 +3315,25 @@
var urlroute = '{{ route("resit.autotawarruq", ":id") }}';
urlroute = urlroute.replace(':id', norujukan);
Swal.fire(
'Berjaya!',
'Penyelesaian Pembiayaan Semula Berjaya',
'success'
) .then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ route('customer_info') }}");
})
if(success_data == 'success'){
Swal.fire(
'Berjaya!',
'Penyelesaian Pembiayaan Semula Berjaya',
'success'
) .then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ route('customer_info') }}");
})
}else{
Swal.fire(
'Tidak Berjaya!',
'Penyelesaian Pembiayaan Semula Tidak Berjaya!',
'error'
).then(function(){
window.location.replace("{{ route('customer_info') }}");
});
}
},error: function (request, status, error) {
console.log(request.responseText);
}
@@ -3506,7 +3534,8 @@
var total_berat = parseFloat("{{ $gadai['berat'] }}");
var kuantiti_marhun = Number("{{sizeof($marhun)}}");
var noic = "{{ $gadai['nokp'] }}";
var nowakil = nw;
var duitpelanggan = $('#duitPelanggan').val().replace(/[^0-9.-]+/g,"");
var bakipelanggan = $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,"");
@@ -3568,6 +3597,7 @@
"teller" : teller,
"bayaran" : duitpelanggan,
"bakipelanggan" : bakipelanggan,
"nowakil" : nowakil,
},
success:function(success_data){
resources/views/print/resittebusautotawarruq.blade.php
+22 -26
View File
@@ -452,24 +452,22 @@ hr.new5 {
<table id="payment">
<tr>
<td style="width:10px">Pembiayaan</td>
<td style="width:10px">B. Pembiayaan + Keuntungan</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
@php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
<td style="width:10px">: RM {{ number_format($temp_loan,2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Bayaran Pembiayaan</td>
<td style="width:10px">(-) Bayaran Pelanggan</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
@php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
<td style="width:10px">: RM {{ number_format($temp_totalpay,2) }} </td>
</tr>
<tr>
<td style="width:10px">Keuntungan</td>
<td style="width:10px;">Jumlah Bayaran</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
</tr>
<tr>
<td style="width:10px">Pembiayaan Baru</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
@php $total = $temp_loan - $temp_totalpay; @endphp
<td style="width:10px;">: RM {{ number_format($total,2) }}</td>
</tr>
<tr>
<td></td>
@@ -481,9 +479,9 @@ hr.new5 {
<td></td>
</tr>
<tr>
<td style="width:10px; font-size:17px"><b>Jumlah Bayaran</b></td>
<td style="width:10px; font-size:17px"><b>Pembiayaan Baru</b></td>
<td style="width:5px"> </td>
<td style="width:10px; font-size: 17px">: <b>RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</b></td>
<td style="width:10px; font-size: 17px">: <b>RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}</b></td>
</tr>
</table>
<table id="payment" style="border: none; margin-top:20px; width:55%">
@@ -599,24 +597,22 @@ hr.new5 {
<table id="payment">
<tr>
<td style="width:10px">Pembiayaan</td>
<td style="width:10px">B. Pembiayaan + Keuntungan</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
@php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
<td style="width:10px">: RM {{ number_format($temp_loan,2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Bayaran Pembiayaan</td>
<td style="width:10px">(-) Bayaran Pelanggan</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
@php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
<td style="width:10px">: RM {{ number_format($temp_totalpay,2) }} </td>
</tr>
<tr>
<td style="width:10px">Keuntungan</td>
<td style="width:10px;">Jumlah Bayaran</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
</tr>
<tr>
<td style="width:10px">Pembiayaan Baru</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
@php $total = $temp_loan - $temp_totalpay; @endphp
<td style="width:10px;">: RM {{ number_format($total,2) }}</td>
</tr>
<tr>
<td></td>
@@ -628,9 +624,9 @@ hr.new5 {
<td></td>
</tr>
<tr>
<td style="width:10px; font-size:17px"><b>Jumlah Bayaran</b></td>
<td style="width:10px; font-size:17px"><b>Pembiayaan Baru</b></td>
<td style="width:5px"> </td>
<td style="width:10px; font-size: 17px">: <b>RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</b></td>
<td style="width:10px; font-size: 17px">: <b>RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}</b></td>
</tr>
</table>
<table id="payment" style="border: none; margin-top:20px; width:55%">
resources/views/print/sag_ujrah_3.blade.php
+4 -4
View File
@@ -231,13 +231,13 @@
display: flex;
justify-content: center;
align-items: center;
margin-top: -140px;
margin-top: -135px;
}
.main-kaki-sag {
border: 1px solid black;
padding: 10px;
width: 200px;
width: 245px;
transform: rotate(-90deg);
font-size: 9px;
}
@@ -1644,7 +1644,7 @@
'" alt="barcode" />';
@endphp
</div>
<div class="percent-text">{{ $gadai_detail['percentpinj'] }}%</div>
{{-- <div class="percent-text">{{ $gadai_detail['percentpinj'] }}%</div> --}}
</div>
<div class="detail-kaki-sag">
<div class="ps-positioning {{ $is_pembiayaan_semula == false ? 'hidden' : '' }}">
@@ -1768,4 +1768,4 @@
</div>
</body>
</html>
</html>
resources/views/print/surat_wakil.blade.php
+11 -17
View File
@@ -152,21 +152,18 @@
<table id="details" style="margin-top:20px;">
<tr>
<td colspan="2">Saya seperti nama di atas, ingin memaklumkan kepada Ar-Rahn Koperasi Permodalan Kelantan Berhad
bagi Cawangan {{ $cawangan_detail['namacaw'] }}, bahawa saya tidak dapat hadir untuk melakukan transaksi:
</td>
<td colspan="2">
Saya seperti nama di atas, ingin memaklumkan kepada Ar-Rahn Koperasi Permodalan Kelantan Berhad
bagi Cawangan {{ $cawangan_detail['namacaw'] }}, bahawa saya tidak dapat hadir untuk melakukan transaksi:
</td>
</tr>
<tr>
<td>
Penyelesaian Penuh
</td>
<td>
<input type="checkbox"><strong>Penyelesaian Penuh</strong>
</td>
</tr>
<tr>
<td>
Penyelesaian Penuh dan Permohonan Pembiayaan Baru
</td>
</tr>
</table>
</table>
<table id="details" style="margin-top:20px;">
<tr>
@@ -200,11 +197,8 @@
</tr>
</table>
<table id="details" style="margin-top:20px;">
<tr>
<td colspan="2">2. Saya mengaku tidak akan membuat apa-apa <b>TUNTUTAN @ GANTI RUGI</b> atas kebarangkalian @
kerugian yang berlaku disebabkan perlantikan wakil bagi menyelesaikan pembiayaan saya.</td>
</tr>
<br>
<br>
</table>