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

Merged in feature/hapus-ansuran-v2 (pull request #308)

Browse Source 
Feature/hapus ansuran v2
This commit is contained in:
Muhd hafifie
2025-08-17 13:40:30 +00:00
parent 81701daa39 e25cb855fb
commit dec286b772
11 changed files with 326 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/NotifikasiKelulusan.php
+3 -2
View File
@@ -11,15 +11,16 @@ class NotifikasiKelulusan implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $norujukan,$kelulusan,$siri,$komen,$teller;
public $norujukan,$kelulusan,$siri,$komen,$teller,$tagoperasi;
public function __construct($norujukan,$kelulusan,$siri,$komen,$teller)
public function __construct($norujukan,$kelulusan,$siri,$komen,$teller,$tagoperasi = null)
{
$this->norujukan = $norujukan;
$this->kelulusan = $kelulusan;
$this->siri = $siri;
$this->komen = $komen;
$this->teller = $teller;
$this->tagoperasi = $tagoperasi;
}
public function broadcastOn()
app/Http/Controllers/CustomersController.php
+5 -1
View File
@@ -65,12 +65,16 @@ class CustomersController extends Controller
$customer_page = ($cawangan_info['version'] == 'v1') ? 'customers.v1.info' : 'customers.v2.info';
$getApprovalError = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getApproval',[
'kodcaw' => $auth_user['cawangan'],
'teller' => $auth_user['name'],
])->json();
if($request->tebus_auto_tawarruq_berjaya === 'true'){
$request->session()->flash('activate_tab', 'SAG_baru');
}
return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi','pekerjaan'));
return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi','pekerjaan','getApprovalError'));
}
public function search(Request $request){
app/Http/Controllers/GadaianController.php
+5 -1
View File
@@ -857,7 +857,11 @@ class GadaianController extends Controller
'nilaimarhun' => $nilaimarhun,
'berat' => $berat,
'margin' => $percentpinj,
'teller' => $auth_user['name']
'teller' => $auth_user['name'],
'komen' => $request->komen,
'status' => $request->status,
'ansuran' => $request->ansuran,
'tagoperasi' => ($request->tagoperasi) ? $request->tagoperasi : 0,
])->json();
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
app/Http/Controllers/HapusAnsuranController.php
+63
View File
@@ -0,0 +1,63 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Services\CustomerService;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
use PDO;
class HapusAnsuranController extends Controller
{
public function __construct()
{
$this->middleware('auth');
}
public function createApproval(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$norujukan = $request->norujukan;
$komen = $request->komen;
$marg = $request->margin;
$ber = $request->berat;
$nm = $request->nilaimarhun;
$status = $request->status;
$jumpinjam = $request->jumpinjam;
$teller = $request->teller;
$ansuran = $request->ansuran;
// Get the approval data
$approvalData = Http::withOptions(['verify' => config('app.api_verify')])
->get($api_url . '/api/hapusansuran/create', [
'cawangan' => $auth_user['cawangan'],
"norujukan" => $norujukan,
"komen" => $komen,
"margin" => $marg,
"berat" => $ber,
"nilaimarhun" => $nm,
"status" => $status,
"jumpinjam" => $jumpinjam,
"teller" => $teller,
"ansuran" => $ansuran,
])
->json();
if (isset($approvalData['status']) && $approvalData['status'] === 'success') {
Session::flash('success', 'Kelulusan berjaya dibuat.');
return redirect()->route('operasi.kelulusan');
} else {
Session::flash('error', 'Gagal membuat kelulusan. Sila cuba lagi.');
return redirect()->back();
}
}
}
app/Http/Controllers/KhazanahController.php
+14 -10
View File
@@ -575,15 +575,9 @@ class KhazanahController extends Controller
{
$auth_user = Auth::user();
$api_url = config('api.url');
$norujukan = $request->norujukan;
$pelulus = $request->pelulus;
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$getlulus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/GetLulus/'. $auth_user['cawangan'],['norujukan' => $norujukan])->json();
if($request->khazanah != null)
{
if($request->batal != null)
@@ -592,22 +586,32 @@ class KhazanahController extends Controller
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pembatalan" => $request->batal,
"komen" => $request->komenubahhapus,
"khazanah" => $request->khazanah
"khazanah" => $request->khazanah,
"recno" => isset($request->recno) ? $request->recno : null,
])->json();
if($updatelulus)
{
event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$request->teller));
if(isset($request->tagoperasi) && $request->tagoperasi == 1){
event(new NotifikasiKelulusan($norujukan,"batal",$request->recno,$request->komenubahhapus,$request->teller));
}else{
event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$request->teller));
}
}
}else{
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"khazanah" => $request->khazanah
"khazanah" => $request->khazanah,
"recno" => isset($request->recno) ? $request->recno : null,
])->json();
if($updatelulus)
{
event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
if(isset($request->tagoperasi) && $request->tagoperasi == 1){
event(new NotifikasiKelulusan($norujukan,"lulus",$request->recno,$request->komenubahhapus,$request->teller,1));
}else{
event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
}
}
}
}
app/Http/Controllers/OperasiController.php
+45 -18
View File
@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Hash;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class OperasiController extends Controller
{
@@ -40,6 +41,11 @@ class OperasiController extends Controller
{
array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'],'komen' => $kel['komen'], 'nilaimarhun' => ($kel['nilaimarhun'] ?? '-'), 'berat' => ($kel['berat'] ?? '-'),'margin' => ($kel['margin'] ?? '-'), 'status' => ($kel['status'] ?? '-'), 'pelulus' => $kel['pelulus']]);
}
foreach($lulus['kelulusanMohonid'] as $index=>$mohon)
{
array_push($arraykelulusan,["mohonid" => true,"ansuran" => $mohon['ansuran'],"cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $mohon['teller'], 'recno' => $mohon['recno'] , "norujukan" => $mohon['norujukan'], 'pinjaman' => $mohon['pinjaman'],'komen' => $mohon['katalaluan'], 'nilaimarhun' => ($mohon['nilaimarhun'] ?? '-'), 'berat' => ($mohon['berat'] ?? '-'),'margin' => ($mohon['margin'] ?? '-'), 'status' => ($mohon['mohon'] ?? '-')]);
}
}
@@ -80,16 +86,27 @@ class OperasiController extends Controller
if($request->pembatalan == null)
{
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
"komen" => $request->komenkelulusan,
'siri' => $request->siri
])->json();
if(!$request->taglulus){
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
"komen" => $request->komenkelulusan,
'siri' => $request->siri
])->json();
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
}else{
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateHapusAnsuran',[
'siri' => $request->siri,
"kodcaw" => $request->kodcaw,
"norujukan" => $request->norujukan,
'namaoperasi' => $request->namaoperasi,
'sahkan' => 1,
])->json();
}
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
if($updatelulus)
{
@@ -98,16 +115,26 @@ class OperasiController extends Controller
}
else
{
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
"komen" => $request->komenkelulusan,
'siri' => $request->siri
])->json();
if(!$request->taglulus){
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
"komen" => $request->komenkelulusan,
'siri' => $request->siri
])->json();
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 2,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 2,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
}else{
$updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateHapusAnsuran',[
'siri' => $request->siri,
"kodcaw" => $request->kodcaw,
"norujukan" => $request->norujukan,
'namaoperasi' => $request->namaoperasi,
'sahkan' => 2,
])->json();
}
if($updatelulus)
{