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

add feature search name and middleware changes to fix the resit for khazanah

Browse Source
This commit is contained in:
Hafifie PKB
2024-04-02 01:43:20 +08:00
parent 86e16ec1d4
commit 3180b0b10b
21 changed files with 4769 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
+1
View File
@@ -20,6 +20,7 @@ use Carbon\Carbon;
class CustomersController extends Controller
{
private $customer_ic;
private $customerService;
public function __construct()
{
$this->middleware('auth');
app/Http/Controllers/GadaianController.php
+13 -2
View File
@@ -467,6 +467,7 @@ class GadaianController extends Controller
$auth_user = Auth::user();
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
$transaction_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json();
$totaltransaction = 0;
@@ -497,7 +498,12 @@ class GadaianController extends Controller
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
$totalBayaranAnsuran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
$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.tebus_separuh',compact('totalrebate','khazanah_user','totalBayaranAnsuran','transaction_tebus','gadai','customers_info','penebusan','wakil'));
}
public function resitautotawarruq($id)
@@ -678,6 +684,7 @@ class GadaianController extends Controller
$auth_user = Auth::user();
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
$transaction_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json();
if(sizeof($gadai) != 0)
@@ -708,7 +715,11 @@ class GadaianController extends Controller
$wakil = [];
}
return view('print.resittambahpinjam',compact('gadai','customers_info','penebusan','wakil'));
$totalBayaranAnsuran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
$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'));
}
public function history(Request $request)
app/Http/Controllers/PenebusanController.php
+9 -3
View File
@@ -294,7 +294,10 @@ class PenebusanController extends Controller
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun,
'jenisbayarantebus' => $request->jenisbayarantebus,
'teller' => $request->teller
'jeniskeuntungan' => $request->jeniskeuntungan,
'teller' => $request->teller,
"duitpelanggan" => $request->bayaran,
"bakipelanggan" => $request->bakipelanggan,
])->json();
//////////////////////
@@ -448,7 +451,7 @@ class PenebusanController extends Controller
'teller' => $request->teller,
'jeniskeuntungan' => $request->jeniskeuntungan,
'totalbayaran' => $request->totalbayaran,
"bayaranpelanggan" => $request->bayaran,
"duitpelanggan" => $request->bayaran,
"bakipelanggan" => $request->bakipelanggan,
])->json();
@@ -603,7 +606,10 @@ class PenebusanController extends Controller
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun,
'jenisbayarantebus' => $request->jenisbayarantebus,
'teller' => $request->teller
'jeniskeuntungan' => $request->jeniskeuntungan,
'teller' => $request->teller,
"duitpelanggan" => $request->bayaran,
"bakipelanggan" => $request->bakipelanggan,
])->json();
app/Http/Middleware/Khazanah.php
+12 -1
View File
@@ -15,7 +15,18 @@ class Khazanah
*/
public function handle($request, Closure $next)
{
if(Auth::check() && (Auth::user()->roles == 'pc' || Auth::user()->roles == 'ppc')){
$Roles = ["teller","admin","penilai","khazanah"];
$routeMiddleware = $request->route()->middleware();
$filteredMiddleware = array_intersect($routeMiddleware, $Roles);
$filtered = array_map(function($res){
switch($res){
case 'teller' : return 'teller';
case 'khazanah' : return 'pc';
}
},$filteredMiddleware);
if(Auth::check() && (Auth::user()->roles == 'pc' || Auth::user()->roles == 'ppc' || in_array(Auth::user()->roles,$filtered))){
return $next($request);
}
app/Http/Middleware/Teller.php
+17 -1
View File
@@ -15,9 +15,25 @@ class Teller
*/
public function handle($request, Closure $next)
{
if(Auth::check() && Auth::user()->role_harian == 'teller'){
$Roles = ["teller","admin","penilai","khazanah"];
$routeMiddleware = $request->route()->middleware();
$filteredMiddleware = array_intersect($routeMiddleware, $Roles);
$filtered = array_map(function($res){
switch($res){
case 'teller' : return 'teller';
case 'khazanah' : return 'pc';
}
},$filteredMiddleware);
// dd(in_array(Auth::user()->roles,$filtered));
if(Auth::check() && (Auth::user()->role_harian == 'teller' || in_array(Auth::user()->roles,$filtered))){
return $next($request);
}else{
dd(Auth::user()->role_harian == 'teller',in_array(Auth::user()->roles,$filtered));
dd('not allowed');
}
dd('test');
return redirect('/login');
}
app/Services/ImbangdugaServices.php
+11 -7
View File
@@ -7,7 +7,7 @@ use App\ImbangDuga;
use Illuminate\Support\Facades\Http;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class ImbangdugaServices
{
@@ -212,10 +212,9 @@ class ImbangdugaServices
}
public function ViewImbangDugaAROS($kodcaw,$tarikh){
$current = Carbon::now();
$current = new Carbon();
$tarikh = $current->toDateString();
$tarikh = new Carbon($tarikh);
$tarikh = $tarikh->toDateString();
$imbangdugadata = ImbangDuga::orderBy('glcode')->get();
$array_harta = [];
@@ -322,11 +321,16 @@ class ImbangdugaServices
foreach($imbangdugadata as $index => $imbangdugaiteration){
if($imbangdugaiteration->api_redirect != null){
if($imbangdugaiteration['variable'] == 'untungrugiterkumpul' || $imbangdugaiteration['variable'] == 'keun_sebenar' || $imbangdugaiteration['variable'] == 'pend_terakru' || $imbangdugaiteration['variable'] == 'keun_penggadai'){
if($imbangdugaiteration['variable'] == 'untungrugiterkumpul' || $imbangdugaiteration['variable'] == 'keun_sebenar' || $imbangdugaiteration['variable'] == 'pend_terakru'){
if($imbangdugaiteration['variable'] == 'keun_sebenar' || $imbangdugaiteration['variable'] == 'keun_penggadai'){
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'],['tarikh' => $tarikh,'kodcaw' => $kodcaw])->json();
}else
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). '/admin/laporan/akrual/getImbangDugaBackupData',['tarikh' => $tarikh,'kodcaw' => $kodcaw,'data_name' => $imbangdugaiteration['variable']])->json();
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). '/admin/laporan/akrual/getImbangDugaBackupData',['tarikh' => $tarikh,'kodcaw' => $kodcaw,'data_name' => $imbangdugaiteration['variable']])->json();
}elseif($imbangdugaiteration['variable'] == 'onepercent' || $imbangdugaiteration['variable'] == 'ujrah'){
${$imbangdugaiteration['variable']} = 0;
// ${$imbangdugaiteration['variable']} = 0;
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json();
}else{
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json();
}