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

changes from server 2025/05/15

Browse Source
This commit is contained in:
root
2025-05-15 00:45:13 +08:00
parent 61ff6d2538
commit 38b89ef2c6
7 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+6 -3
View File
@@ -717,12 +717,15 @@ class GadaianController extends Controller
// dd($penebusan['nowakil']);
$surat_wakil = [];
if($penebusan['nowakil'] != 0)
{
$wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
if(sizeof($wakil) != 0){
$wakil = $wakil[0];
$surat_wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getsuratwakil/' . $auth_user['cawangan'] . '/' . $id)->json();
}
}
else
{
@@ -733,7 +736,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','cawangan_info'));
return view('print.resit.tambah_pinjaman',compact('surat_wakil','totalrebate','khazanah_user','totalBayaranAnsuran','transaction_tebus','gadai','customers_info','penebusan','wakil','cawangan_info'));
}
public function history(Request $request)
app/Http/Controllers/KhazanahController.php
+17 -5
View File
@@ -4296,12 +4296,18 @@ class KhazanahController extends Controller
public function AutoSerahan(Request $request)
{
if(isset($request->do_delete) && $request->do_delete == true){
$call_approval_v3 = Http::withOptions(['verify' => config('app.api_verify')])
$teller = $request->teller;
if ($teller !== html_entity_decode($teller, ENT_QUOTES | ENT_HTML5, 'UTF-8'))
$teller = html_entity_decode($teller, ENT_QUOTES | ENT_HTML5, 'UTF-8');
$call_approval_v3 = Http::withOptions(['verify' => config('app.api_verify')])
->post(config('api.url_koop') . '/api/autoserahan/delete', [
'recno' => $request->recno,
'version' => 'v3',
'kodcaw' => $request->kodcaw,
'teller' => $request->teller,
'teller' => $teller,
'amaun' => $request->amaun,
])->json();
@@ -4313,11 +4319,17 @@ class KhazanahController extends Controller
}
$teller = $request->arraysend['teller'];
if ($teller !== html_entity_decode($teller, ENT_QUOTES | ENT_HTML5, 'UTF-8'))
$teller = html_entity_decode($teller, ENT_QUOTES | ENT_HTML5, 'UTF-8');
// Step 1: Call API v3 First
$call_approval_v3 = Http::withOptions(['verify' => config('app.api_verify')])
->post(config('api.url_koop') . '/api/autoserahan/create', [
'kodcaw' => $request->arraysend['kodcaw'],
'teller' => $request->arraysend['teller'],
'teller' => $teller,
'amaun' => $request->arraysend['amaun'],
'txtring1' => $request->arraysend['ambilanring1'],
'txtring5' => $request->arraysend['ambilanring5'],
@@ -4349,7 +4361,7 @@ class KhazanahController extends Controller
->post(config('api.url_pkb') . '/api/autoserahan/create', [
'id' => $call_approval_v3['id'], // Use ID from API v3 response
'kodcaw' => $request->arraysend['kodcaw'],
'teller' => $request->arraysend['teller'],
'teller' => $teller,
'amaun' => $request->arraysend['amaun'],
'txtring1' => $request->arraysend['ambilanring1'],
'txtring5' => $request->arraysend['ambilanring5'],
@@ -4376,7 +4388,7 @@ class KhazanahController extends Controller
// Step 3: Check if both API v3 and API v2 were successful
if ($call_approval_v2['status'] === 'success' && $call_approval_v3['status'] === 'success' && $call_set_approval_v3['status'] === 'success') {
event(new AutoSerahan("Operasi",$call_approval_v3['id'],$request->arraysend['kodcaw'],$request->arraysend['teller']));
event(new AutoSerahan("Operasi",$call_approval_v3['id'],$request->arraysend['kodcaw'],$teller));
return response()->json([
'status' => 'success',
app/Services/ImbangdugaServices.php
+6 -1
View File
@@ -287,7 +287,12 @@ class ImbangdugaServices
foreach($response as $variable=>$res)
{
if($variable !== 'recno' && $variable !== 'kodcaw' && $variable !== 'tarikh' && $variable !== 'totalharta' && $variable !== 'totaltanggungan' && $variable !== 'tagtally' && $variable !== 'created_at' && $variable !== 'updated_at'){
$imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray();
//$imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray();
if($variable == 'bakilelong'){
$imbangdugadata = ImbangDuga::orderBy('glcode')->where([['single_var',$variable],['variable',$variable]])->first()->toArray();
}else{
$imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray();
}
if($imbangdugadata['jenis'] == 'harta'){
array_push($array_harta,['glcode' => $imbangdugadata['glcode'],'descpt' => $imbangdugadata['descpt'],'amaun' => $res]);
}else{