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

fixing

Browse Source
This commit is contained in:
hafifierahman
2021-02-22 15:06:09 +08:00
parent 1a02cd4b9f
commit 38e97fefcd
17 changed files with 1247 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+15 -8
View File
@@ -332,11 +332,7 @@ class GadaianController extends Controller
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
if(sizeof($transaction) != 0)
$transaction = $transaction[0];
$transaction = Http::get(config('api.url') . '/api/transaction/one/'. $id)->json();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
@@ -346,7 +342,7 @@ class GadaianController extends Controller
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
if(sizeof($customers_info) != 0)
$customers_info = $customers_info[0];
$customers_info = $customers_info[0];
return view('print.resitansuran',compact('transaction','gadai','customers_info'));
@@ -585,10 +581,21 @@ class GadaianController extends Controller
$norujukan = $request->norujukan;
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$gadai_info = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json();
dd($gadai_info);
$pinjaman = $gadai_info['pinjaman'];
$nilaimarhun = $gadai_info['nilaimarhun'];
$berat = $gadai_info['berat'];
$margin = $gadai_info['percentpinj'];
$messagemohon = $request->mohon . '|' . $pinjaman . '|' . $nilaimarhun . '|' . $berat . '|' . $margin . '|';
$createlulus = Http::post(config('api.url') . '/api/CreateLulus/' . $auth_user['cawangan'] . '/' . $norujukan, [
'mohon' => $request->mohon,
'mohon' => $messagemohon,
'teller' => $auth_user['name']
])->json();
app/Http/Controllers/KhazanahController.php
+53 -14
View File
@@ -7,6 +7,7 @@ use App\Events\StatusLiked;
use App\Events\NotifikasiPembayaran;
use App\Events\OperasiNotice;
use App\Events\PendahuluanSerahan;
use App\Events\NotifikasiKelulusan;
use App\User;
@@ -112,20 +113,25 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$tunai = Http::get( config('api.url') .'/api/TunaiController/'. $auth_user['cawangan'])->json();
$arraytunaiharini = [];
$arraytunai = [];
if(sizeof($tunai) > 0)
$tunai = $tunai[0];
$listUser = User::where([['cawangan', '=', $auth_user['cawangan']],['role_harian','=','teller']])->get();
$addtunai = Http::get( config('api.url') .'/api/getAddTunai/'. $auth_user['cawangan'])->json();
foreach($listUser as $index1 => $ls)
{
$tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json();
$tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json();
// if(sizeof($addtunai) > 0)
// $addtunai = $addtunai[0];
array_push($arraytunaiharini,$tunai);
array_push($arraytunai,$tunaipast);
}
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.alirantunai',compact('cawangan_info','api_url','tunai','addtunai'));
return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser'));
}
public function gadaian()
@@ -312,7 +318,7 @@ class KhazanahController extends Controller
$kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json();
$kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json();
foreach($kelulusan as $index=>$k)
{
$komen = explode("|",$k['komen']);
@@ -322,7 +328,7 @@ class KhazanahController extends Controller
unset($komen[$results]);
}
array_push($arraykelulusan,['norujukan' => $k['norujukan'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]);
array_push($arraykelulusan,['norujukan' => $k['norujukan'],'siri' => $k['siri'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]);
}
return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','kelulusanmohonid'));
@@ -422,24 +428,57 @@ class KhazanahController extends Controller
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "khazanah"
"pengesahan" => "khazanah",
'siri' => $request->siri
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
}
}else{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "khazanah",
'siri' => $request->siri,
"pembatalan" => "batal"
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
}
}
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi"
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $auth_user['cawangan'] . '/' . $norujukan,[
"komen" => $request->komen,
'siri' => $request->siri
])->json();
if($request->pembatalan == null)
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi",
'siri' => $request->siri
])->json();
}else{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi",
'siri' => $request->siri,
"pembatalan" => "batal"
])->json();
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
}
event(new OperasiNotice($auth_user['cawangan'],$auth_user['name']));
}
}
@@ -483,7 +522,7 @@ class KhazanahController extends Controller
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
return response()->json($createlulus,201);
return response()->json($siri,201);
}
///END KELULUSAN///
app/Http/Controllers/OperasiController.php
+57 -6
View File
@@ -6,9 +6,13 @@ namespace App\Http\Controllers;
//Events
use App\Events\OperasiNotice;
use App\Events\StatusLiked;
use App\Events\NotifikasiKelulusan;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Hash;
use Carbon\Carbon;
@@ -40,10 +44,11 @@ class OperasiController extends Controller
unset($komen[$results]);
}
array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'], "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $kel['pelulus']]);
array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $kel['pelulus']]);
}
}
return view('operasi.kelulusan',compact('cawangan_info','api_url','arraykelulusan'));
}
@@ -79,11 +84,33 @@ class OperasiController extends Controller
$norujukan = $request->norujukan;
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
if($request->pembatalan == null)
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1,
'siri' => $request->siri
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
}
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 2,
'siri' => $request->siri
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
}
}
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1
])->json();
return response()->json($updatelulus,200);
}
@@ -100,10 +127,20 @@ class OperasiController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$getsiri = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
if(isset($getsiri['siri']))
{
$siri = $getsiri['siri'] + 1;
}else{
$siri = 1;
}
$createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/operasi', [
'komen' => $request->komen,
'dategadai' => $current->toDateString(),
'bilgadai' => 1,
'siri' => $siri,
'jumpinjam' => $request->jumpinjam,
'jenistebus' => "G",
'teller' => $request->teller,
@@ -113,7 +150,21 @@ class OperasiController extends Controller
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
return response()->json($createlulus,201);
return response()->json($siri,201);
}
public function mintakatalaluansemula(Request $request)
{
if(Hash::check($request->passsemula, Auth::user()->password))
{
return "True";
}
else
{
return "False";
}
}
public function parameter()