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

fix gadai teller

Browse Source
This commit is contained in:
LAPTOP-DGCU80CH\user1
2020-12-02 11:43:12 +08:00
parent 3eb90e2c89
commit f0cb6e3312
11 changed files with 428 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/LoginController.php
+5 -4
View File
@@ -59,22 +59,23 @@ class LoginController extends Controller
if (Auth::attempt($credentials)) {
$auth_user = Auth::user();
$api_url = config('api.url');
if($auth_user['roles'] == 'teller'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}elseif($auth_user['roles'] == 'penilai'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json();
$gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah'));
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
}
elseif($auth_user['roles'] == 'khazanah'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}
elseif($auth_user['roles'] == 'operasi'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}
}
app/Http/Controllers/CustomersController.php
+21 -6
View File
@@ -14,6 +14,7 @@ use Illuminate\Support\Facades\Auth;
class CustomersController extends Controller
{
private $customer_ic;
public function __construct()
{
$this->middleware('auth');
@@ -24,24 +25,36 @@ class CustomersController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function index()
{
$search = false;
$api_url = config('api.url');
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$bank = Http::get(config('api.url') . '/api/bank')->json();
return view('customers.index',compact('search','cawangan_info','bank'));
return view('customers.index',compact('search','cawangan_info','bank','api_url'));
}
public function info(){
public function info(Request $request){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('customers.info',compact('cawangan_info'));
$customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json();
if($customers_info){
$customer_info = $customers_info[0];
}else{
$customer_info = $customers_info;
}
$request->session()->forget('page_reload');
$request->session()->forget('norujukan');
return view('customers.info',compact('cawangan_info','api_url','customer_info'));
}
public function search(Request $request){
$noic = $request->noic;
Session::put('noic', $noic);
$api_url = config('api.url');
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$bank = Http::get(config('api.url') . '/api/bank')->json();
@@ -51,13 +64,15 @@ class CustomersController extends Controller
}else{
$customer_info = $customers_info;
}
$request->session()->forget('page_reload');
$request->session()->forget('norujukan');
$search = true;
if($customer_info){
Session::put('customer_info',$customer_info);
return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info]);
return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
}else{
return view('customers.index',compact('customer_info','search','noic','cawangan_info','bank'));
return view('customers.index',compact('customer_info','search','noic','cawangan_info','bank','api_url'));
}
}
app/Http/Controllers/GadaianController.php
+65 -11
View File
@@ -17,8 +17,9 @@ class GadaianController extends Controller
$this->customerService = New CustomerService();
}
public function index(Request $request)
{
public function index(Request $request){
$api_url = config('api.url');
$current = Carbon::now();
$current = new Carbon();
$curent_year = substr($current->year,2,2);
@@ -31,15 +32,68 @@ class GadaianController extends Controller
// $limit_pinjaman_semasa = $customer_info['limit_pinjaman'] - $customer_info['pinjaman_semasa'];
$limit_pinjaman_semasa = 0;
$auth_user = Auth::user();
$gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
$new_transaction = sprintf("%04d",$gadai_transaction+1);
$norujukan = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
$gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
'norujukan' => $norujukan,
'nopelanggan' => $customer_info['nopelanggan'],
'nokp' => $noic
]);
// dd($request->session()->get('page_reload'));
if($request->session()->get('page_reload') == null){
$gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
if($gadai_transaction){
$new_sirig = $gadai_transaction['sirig'] + 1;
}else{
$new_sirig = 1;
}
$new_transaction = sprintf("%04d",$new_sirig);
$norujukan = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
$request->session()->put('norujukan',$norujukan);
$request->session()->put('page_reload',true);
$gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
'norujukan' => $norujukan,
'nopelanggan' => $customer_info['nopelanggan'],
'nokp' => $noic,
'sirig' => $new_sirig
]);
}else{
$norujukan = $request->session()->get('norujukan');
}
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('gadaian.index',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan'));
return view('gadaian.index',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan','api_url'));
}
public function store(Request $request){
$auth_user = Auth::user();
// dd($request);
$margin_pinjaman = $request->pinjaman / $request->total_nilai_marhun;
$kadarupah = $request->kadarkeuntungan * 100;
$keuntungan6bulan = $request->keuntungan_6bln;
$keuntungan12bulan = $request->keuntungan_sebulan*12;
$hargajualan = $request->pinjaman + $keuntungan12bulan;
$gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $request->norujukan_gadai,[
'kodcaw' => $auth_user['cawangan'],
'nilaimarhun' => round($request->total_nilai_marhun, 2),
'berat' => round($request->total_berat, 2),
'pinjaman' => round($request->pinjaman, 2),
'kadarupah' => round($kadarupah, 2),
'marhun' => $request->marhun_detail,
'percentpinj' => $margin_pinjaman,
'teller'=> $auth_user['name'],
'upah6' => $keuntungan6bulan,
'upah12' => $keuntungan12bulan,
'hargajualan' => $hargajualan,
'kuantiti_marhun' => $request->kuantiti_marhun
])->json();
$request->session()->forget('page_reload');
$request->session()->forget('norujukan');
return redirect()->route('customer_info');
}
public function batal(Request $request){
$norujukan = $request->norujukan;
$auth_user = Auth::user();
Http::delete(config('api.url').'/api/gadai/batal/'. $auth_user['cawangan'] .'/' . $norujukan);
$request->session()->forget('page_reload');
$request->session()->forget('norujukan');
return redirect()->route('customer_info');
}
}
app/Http/Controllers/HomeController.php
+5 -4
View File
@@ -28,22 +28,23 @@ class HomeController extends Controller
public function index()
{
$auth_user = Auth::user();
$api_url = config('api.url');
if($auth_user['roles'] == 'teller'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}elseif($auth_user['roles'] == 'penilai'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json();
$gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah'));
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
}
elseif($auth_user['roles'] == 'khazanah'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}
elseif($auth_user['roles'] == 'operasi'){
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
}
}
}