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

Merge branch 'new-super' into afiqhamzah-feat-mykad-reader-registration

Browse Source
This commit is contained in:
afiq.hamzah
2022-10-20 12:29:07 +08:00
parent 34331e09fc bb9719138c
commit 3052785a94
24 changed files with 2450 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+5 -1
View File
@@ -112,7 +112,11 @@ class AliranTunaiController extends Controller
$tunaipast = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai','tunaipast'));
$proses_modal = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/requestTeller/checkproses',['kodlaluan' => Auth::user()->name,'kodcaw' => $auth_user['cawangan']])->json();
$countproses = sizeof($proses_modal);
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai','tunaipast','countproses'));
}
public function alirantunaiGadai(Request $request,$teller){
app/Http/Controllers/HomeController.php
+18 -1
View File
@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Auth;
use App\Services\CustomerService;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Hash;
class HomeController extends Controller
{
@@ -29,6 +30,16 @@ class HomeController extends Controller
{
$auth_user = Auth::user();
$api_url = config('api.url');
if(session()->has('iklan') && session()->get('iklan') == 0)
{
session()->put('iklan', 1);
}else{
if (Hash::check(config('app.reset_password'), $auth_user['password']) || Hash::check($auth_user['no_kp'], $auth_user['password'])) {
session()->put('iklan', 0);
}
}
if($auth_user['roles'] == 'teller'){
if($auth_user['role_harian'] == 'teller'){
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
@@ -45,7 +56,13 @@ class HomeController extends Controller
}
elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
$listserah = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/listSerahMarhunController/'.$auth_user['cawangan'])->json();
$countkhazanah = sizeof($gadai) + sizeof($listserah);
return view('homepage.khazanah.home',compact('cawangan_info','api_url','countkhazanah'));
}
else{
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
app/Http/Controllers/KhazanahController.php
+192 -11
View File
@@ -383,7 +383,15 @@ class KhazanahController extends Controller
$update=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
return redirect()->route('khazanah.tebus');
if($update == 'success')
{
return redirect()->route('khazanah.tebus');
}else if($update == 'unavailable'){
return redirect()->route('khazanah.tebus')->with(['type' => 'unavailable', 'message' => 'Norujukan Tidak Wujud!', 'norujukan' => $request->norujukan_barcode]);
}else{
return redirect()->route('khazanah.tebus')->with(['type' => 'scanned', 'message' => 'Norujukan Dah Discan!', 'norujukan' => $request->norujukan_barcode]);
}
}
public function pendahuluanserah($id)
@@ -1026,7 +1034,14 @@ class KhazanahController extends Controller
event(new NotifikasiPembayaran('TellerkepadaKhazanah'));
return redirect()->route('khazanah.gadaian');
if($scan_barcode == 'success')
{
return redirect()->route('khazanah.gadaian');
}else if($scan_barcode == 'unavailable'){
return redirect()->route('khazanah.gadaian')->with(['type' => 'unavailable', 'message' => 'Norujukan Tidak Wujud!', 'norujukan' => $request->norujukan_barcode]);
}else{
return redirect()->route('khazanah.gadaian')->with(['type' => 'scanned', 'message' => 'Norujukan Dah Discan!', 'norujukan' => $request->norujukan_barcode]);
}
}
public function LaporanSemakBarcode(){
@@ -3077,10 +3092,10 @@ class KhazanahController extends Controller
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/gadai/norujukan/'.$request->norujukanhidden)->json();
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/gadai/norujukan/' . $auth_user['cawangan'] . '/' . $request->norujukanhidden)->json();
foreach($gadai as $index1=>$gad)
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad['nokp'])->json();
// $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
@@ -3134,10 +3149,10 @@ class KhazanahController extends Controller
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/gadai/norujukan/'.$request->norujukanhidden)->json();
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/gadai/norujukan/' . $auth_user['cawangan'] . '/' . $request->norujukanhidden)->json();
foreach($gadai as $index1=>$gad)
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad['nokp'])->json();
// $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
@@ -3184,11 +3199,12 @@ class KhazanahController extends Controller
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/gadai/norujukan/'.$norujukan)->json();
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/gadai/norujukan/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
foreach($gadai as $index1=>$gad)
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
{
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad['nokp'])->json();
}
$polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan']])->json();
@@ -3927,5 +3943,170 @@ class KhazanahController extends Controller
}
}
public function Laporan_SerahPetiBesiGadai()
{
$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();
// $lookwakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/lookupwakil/')->json();
return view('khazanah.laporan.serahgadai', compact('cawangan_info','api_url'));
}
public function cetak_serahBarcodeGadai(Request $request)
{
$api_url = config('api.url');
$auth_user = Auth::user();
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datemula == null){
$datemula = $current->toDateString();
}else{
$split_date = explode('-', $request->datemula);
$datemula = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
if($request->datehingga == null){
$datehingga = $current->toDateString();
}else{
$split_date = explode('-', $request->datehingga);
$datehingga = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$serahbarcode = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/admin/laporan/serahgadai/',[
'kodcaw' => $auth_user['cawangan'],
'mula' => $datemula,
'hingga' => $datehingga,
])->json();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
return view('print.laporan_serahpetibesigadai', compact('cawangan_detail','api_url','serahbarcode','cawangan_info','datemula','datehingga','tarikh_cetak'));
}
public function Laporan_SerahMarhunTebus()
{
$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();
// $lookwakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/lookupwakil/')->json();
return view('khazanah.laporan.serahmarhun', compact('cawangan_info','api_url'));
}
public function cetak_serahMarhunTebus(Request $request)
{
$api_url = config('api.url');
$auth_user = Auth::user();
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datemula == null){
$datemula = $current->toDateString();
}else{
$split_date = explode('-', $request->datemula);
$datemula = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
if($request->datehingga == null){
$datehingga = $current->toDateString();
}else{
$split_date = explode('-', $request->datehingga);
$datehingga = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$serahmarhun = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/admin/laporan/serahmarhuntebus/',[
'kodcaw' => $auth_user['cawangan'],
'mula' => $datemula,
'hingga' => $datehingga,
])->json();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
return view('print.laporan_serahmarhun', compact('cawangan_detail','api_url','serahmarhun','cawangan_info','datemula','datehingga','tarikh_cetak'));
}
public function Laporan_AuditCustomer()
{
$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();
return view('khazanah.laporan.auditcustomer', compact('cawangan_info','api_url'));
}
public function cetak_AuditCustomer(Request $request)
{
$api_url = config('api.url');
$auth_user = Auth::user();
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datemula == null){
$datemula = $current->toDateString();
}else{
$split_date = explode('-', $request->datemula);
$datemula = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
if($request->datehingga == null){
$datehingga = $current->toDateString();
}else{
$split_date = explode('-', $request->datehingga);
$datehingga = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$auditcustomer = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/admin/laporan/auditcustomer/',[
'kodcaw' => $auth_user['cawangan'],
'mula' => $datemula,
'hingga' => $datehingga
])->json();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
return view('print.laporan_auditcustomer', compact('cawangan_detail','api_url','auditcustomer','cawangan_info','datemula','datehingga','tarikh_cetak'));
}
public function LaporanTebusBarcode(){
$auth_user=Auth::user();
$current = Carbon::now();
$current = new Carbon();
$api_url = config('api.url');
$tarikh_cetak = $current->toDateString();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$datemula = $current->toDateString();
$datehingga = $current->toDateString();
$serahmarhun = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/admin/laporan/serahmarhuntebus/',[
'kodcaw' => $auth_user['cawangan'],
'mula' => $datemula,
'hingga' => $datehingga,
])->json();
return view('print.laporan_serahmarhun', compact('cawangan_detail','api_url','serahmarhun','cawangan_info','datemula','datehingga','tarikh_cetak'));
}
}
app/Http/Controllers/LelongController.php
+3 -3
View File
@@ -20,8 +20,8 @@ class LelongController extends Controller
$api_url = config('api.url');
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$gadaidetail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json();
$noic = $gadaidetail[0][0]['nokp'];
$gadaidetail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
$noic = $gadaidetail[0]['nokp'];
$customerdetail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $noic)->json();
$nama = $customerdetail['nama'];
@@ -32,7 +32,7 @@ class LelongController extends Controller
$lelong = $lelong[0];
}
$gadai = $gadaidetail[0][0];
$gadai = $gadaidetail[0];
return view('lelongan.index',compact('cawangan_info','api_url','gadai','nama','lelong'));
}