feat: move pelelong berlesen functions to operasi and update login and reports
This commit is contained in:
@@ -40,6 +40,13 @@ class LoginController extends Controller
|
||||
$this->middleware('guest')->except('logout');
|
||||
}
|
||||
|
||||
protected function credentials(\Illuminate\Http\Request $request)
|
||||
{
|
||||
return array_merge($request->only($this->username(), 'password'), [
|
||||
'status' => 'active',
|
||||
]);
|
||||
}
|
||||
|
||||
public function username()
|
||||
{
|
||||
return 'username';
|
||||
|
||||
@@ -155,7 +155,7 @@ class HomeController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
} else { //operasi,jurulelong
|
||||
} else { //operasi
|
||||
$sag = LelongBid::where('status_semak', 0) //belum disemak
|
||||
->get();
|
||||
}
|
||||
@@ -608,7 +608,7 @@ class HomeController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
if ($user->hasAnyRole('operasi', 'pengurus-operasi', 'jurulelong')) {
|
||||
if ($user->hasAnyRole('operasi', 'pengurus-operasi')) {
|
||||
|
||||
$arrayinfo = [];
|
||||
|
||||
|
||||
@@ -1948,7 +1948,7 @@ class LelongController extends Controller
|
||||
|
||||
public function stopcawangan($id,$cawid)
|
||||
{
|
||||
event(new LelongNotify('start'));
|
||||
event(new LelongNotify('stop'));
|
||||
$currentdate = Carbon::now();
|
||||
$currenttime = $currentdate->toTimeString();
|
||||
$endtime = $currentdate->addHours(2);
|
||||
@@ -1965,7 +1965,7 @@ class LelongController extends Controller
|
||||
$lelong->save();
|
||||
|
||||
return redirect()->route('home')
|
||||
->with('success','Lelongan bermula');
|
||||
->with('success','Lelongan ditamatkan');
|
||||
}
|
||||
|
||||
public function startall($id)
|
||||
|
||||
@@ -843,6 +843,8 @@ class ReportController extends Controller
|
||||
|
||||
$pdf = PDF::loadView('pdf.simulasireportbycust',compact('simulasilel','cawanganDetail','marhuns','simulasi_id','cawid','ktlhbyr','cawname'))
|
||||
->setPaper('a4','potrait');
|
||||
|
||||
$pdf->setPaper('a4', 'landscape');
|
||||
|
||||
return $pdf->download('Laporan Simulasi Cawangan by Pelanggan.pdf');
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ class Kernel extends HttpKernel
|
||||
\Illuminate\Session\Middleware\StartSession::class,
|
||||
// \Illuminate\Session\Middleware\AuthenticateSession::class,
|
||||
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
||||
\App\Http\Middleware\EnsureActiveAccount::class,
|
||||
\App\Http\Middleware\VerifyCsrfToken::class,
|
||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
],
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class EnsureActiveAccount
|
||||
{
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
$guard = Auth::guard('web');
|
||||
$user = $guard->user();
|
||||
|
||||
if ($user && $user->status !== 'active') {
|
||||
$guard->logout();
|
||||
$request->session()->invalidate();
|
||||
$request->session()->regenerateToken();
|
||||
|
||||
$message = 'Akaun anda tidak aktif. Sila hubungi pentadbir.';
|
||||
if ($request->expectsJson()) {
|
||||
return response()->json(['message' => $message], 403);
|
||||
}
|
||||
|
||||
return redirect()->route('login')->withErrors(['username' => $message]);
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user