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

fix all the bug

Browse Source
This commit is contained in:
hafifierahman
2021-01-31 08:39:15 +08:00
parent c58c0dbc39
commit 86758cfbe1
18 changed files with 1209 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+30 -5
View File
@@ -136,7 +136,7 @@ class GadaianController extends Controller
'recno' => $request->recno,
'karat' => $request->sltkarat,
'berat' => $request->berat,
'harga' => $request->harga,
'harga' => $request->harga1,
'n_marhun' => $request->nilaimarhun
])->json();
@@ -186,7 +186,7 @@ class GadaianController extends Controller
public function editstore(Request $request){
$auth_user = Auth::user();
// dd($request);
$total_nilai_marhun = $request->total_nilai_marhun;
$total_nilai_marhun = str_replace(',','',$total_nilai_marhun);
@@ -270,12 +270,37 @@ class GadaianController extends Controller
$norujukan = $request->norujukan_modal;
$auth_user = Auth::user();
$api_url = config('api.url');
$cetak_sag = Http::put(config('api.url').'/api/gadai/norujukan/cetak/'.$auth_user['cawangan'].'/'.$norujukan,[
'penilai' => $auth_user['name']
]);
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$norujukan)->json();
$gadai_detail = $gadai[0];
if(isset($request->jenisprint))
{
$cetak_sag = Http::put(config('api.url').'/api/gadai/norujukan/cetak/'.$auth_user['cawangan'].'/'.$norujukan,[
'penilai' => $auth_user['name']
]);
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $gadai_detail['teller'])->json();
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk'];
$totalkeluar = 0;
$bakiakhir = 0;
$totalkeluar = $gadai_detail['pinjaman'] + $keluar;
$bakiakhir = $baki - $gadai_detail['pinjaman'];
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'].'/'.$gadai_detail['teller'], [
'keluar'=>$totalkeluar,
'masuk'=>$masuk,
'bakiakhir'=>$bakiakhir
]);
}
$customer = Http::get(config('api.url') . '/api/customers/'. $gadai_detail['nokp'])->json();
$customer_detail = $customer[0];
app/Http/Controllers/KhazanahController.php
+135 -11
View File
@@ -251,10 +251,53 @@ class KhazanahController extends Controller
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
//declare array baru
$arraykelulusan = [];
$kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json();
$kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json();
return view('khazanah.kelulusan',compact('cawangan_info','api_url','kelulusan','kelulusanmohonid'));
foreach($kelulusan as $index=>$k)
{
$komen = explode("|",$k['komen']);
$results=array_search("",$komen,true);
if($results !== false) {
unset($komen[$results]);
}
array_push($arraykelulusan,['norujukan' => $k['norujukan'], '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'));
}
public function kelulusanrekodlepas()
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
//declare array baru
$arraykelulusan = [];
$kelulusan = Http::get(config('api.url') . '/api/RekodDahLepas/' . $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']);
$results=array_search("",$komen,true);
if($results !== false) {
unset($komen[$results]);
}
array_push($arraykelulusan,['norujukan' => $k['norujukan'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus'],]);
}
return view('khazanah.rekodtelahlulus',compact('cawangan_info','api_url','arraykelulusan','kelulusanmohonid'));
}
@@ -328,24 +371,21 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$current = Carbon::now();
$current = new Carbon();
$norujukan = $request->norujukan;
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/khazanah', [
'komen' => "Pembiayaan Melebihi Margin 70%",
'dategadai' => "2020-12-12",
'komen' => $request->komen,
'dategadai' => $current->toDateString(),
'bilgadai' => 1,
'jumpinjam' => 1020,
'jumpinjam' => $request->jumpinjam,
'jenistebus' => "G",
'teller' => "dsaas",
'teller' => $request->teller,
'pelulus' => "khazanah"
// 'komen' => $request->komen,
// 'dategadai' => $dategadai,
// 'bilgadai' => $bilgadai,
// 'jumpinjam' => $request->jumpinjam,
// 'jenistebus' => "G",
// 'teller' => $request->teller
])->json();
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
@@ -449,7 +489,9 @@ class KhazanahController extends Controller
public function barcodescanned(Request $request){
$auth_user = Auth::user();
$gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json();
event(new NotifikasiPembayaran('TellerkepadaKhazanah'));
return redirect()->route('khazanah.gadaian');
@@ -1335,4 +1377,86 @@ class KhazanahController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.unjuran',compact('cawangan_info','api_url'));
}
public function laporanAging_Bulanan()//added by fariz 2021-01-19
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.laporan.agingbulanan',compact('cawangan_info','api_url'));
}
public function cetaklaporang_Aging(Request $request) //added by fariz 2021-01-19
{
$auth_user = Auth::user();
$api_url = config('api.url');
$tarikh_aging=$request;
// dd($tarikh_aging);
$num=$request->num;
$current = Carbon::now();
$current = new Carbon();
if($request->datetimepicker1 == null){
$tebus_date = $current->toDateString();
}else
{
$split_date = explode('-',$request->datetimepicker1);
$tarikh_aging = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$num1=$request->num1;
$num2=$request->num2;
$num3=$request->num3;
$num4=$request->num4;
$num5=$request->num5;
$num6=$request->num6;
$num7=$request->num7;
$num8=$request->num8;
$num9=$request->num9;
$num10=$request->num10;
$num11=$request->num11;
$num12=$request->num12;
$num13=$request->num13;
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$data=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num1)->json();
$data_2=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num2)->json();
$data_3=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num3)->json();
$data_4=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num4)->json();
$data_5=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num5)->json();
$data_6=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num6)->json();
$data7=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num7)->json();
$data_8=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num8)->json();
$data_9=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num9)->json();
$data_10=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num10)->json();
$data_11=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num11)->json();
$data_12=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num12)->json();
$data_13=Http::get(config('api.url').'/api/gadai/aging/lebih12bulan/'.$auth_user['cawangan'].'/'.$tarikh_aging)->json();
$data2=Http::get(config('api.url').'/api/gadai/JumlahagingBulanan/test/'.$auth_user['cawangan'].'/'.$tarikh_aging)->json();
return view('print.laporan_aging_bulanan', compact('cawangan_info', 'api_url','cawangan_detail','data','data2','data_2','data_3','data_4','data_5',
'data_6','data7','data_8','data_9','data_10','data_11','data_12','data_13','tarikh_aging'));
}
}
app/Http/Controllers/OperasiController.php
+26 -14
View File
@@ -11,6 +11,8 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Carbon\Carbon;
class OperasiController extends Controller
{
public function __construct()
@@ -24,14 +26,26 @@ class OperasiController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$kelulusan = Http::get(config('api.url') . '/api/ListOperasi/')->json();
$arraykelulusan = [];
if(sizeof($kelulusan) != 0)
foreach($kelulusan as $index=>$lulus)
{
$kelulusan = $kelulusan[0];
foreach($lulus['kelulusanall'] as $index=>$kel)
{
$komen = explode("|",$kel['komen']);
$results=array_search("",$komen,true);
if($results !== false) {
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']]);
}
}
return view('operasi.kelulusan',compact('cawangan_info','api_url','kelulusan'));
return view('operasi.kelulusan',compact('cawangan_info','api_url','arraykelulusan'));
}
public function getkelulusan(Request $request)
@@ -80,24 +94,22 @@ class OperasiController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$current = Carbon::now();
$current = new Carbon();
$norujukan = $request->norujukan;
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/operasi', [
'komen' => "Pembiayaan Melebihi Margin 75%",
'dategadai' => "2020-12-12",
'komen' => $request->komen,
'dategadai' => $current->toDateString(),
'bilgadai' => 1,
'jumpinjam' => 1020,
'jumpinjam' => $request->jumpinjam,
'jenistebus' => "G",
'teller' => "dsaas",
'teller' => $request->teller,
'peloperasi' => "operasi"
// 'komen' => $request->komen,
// 'dategadai' => $dategadai,
// 'bilgadai' => $bilgadai,
// 'jumpinjam' => $request->jumpinjam,
// 'jenistebus' => "G",
// 'teller' => $request->teller
])->json();
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
app/Http/Controllers/PenebusanController.php
+2 -3
View File
@@ -405,7 +405,7 @@ class PenebusanController extends Controller
}
//Wakil Function - Jangan kacau saya nak makan kacang ni!!!!!!
//Wakil Function - Jangan kacau saya nak makan kacang ni!!
public function getfirstWakil()
{
@@ -438,8 +438,7 @@ class PenebusanController extends Controller
$auth_user = Auth::user();
$createwakil = Http::post(config('api.url') . '/api/createwakil/'. $auth_user['cawangan'] . '/' . $request->icno,[
'nopelanggan' => $request->nopelanggan,
'nowakil' => $request->nowakil,
'nama' => $request->nama,