gitkwesi/click-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added sender ID to the clients Tab in Show view plus bug fixes

Browse Source
This commit is contained in:
Kwesi Banson
2024-08-26 10:23:49 +00:00
parent 4a0248e40d
commit 6cede6d980
54 changed files with 1948 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/LoginController.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models;
use Spatie\Activitylog\Models\Activity;
class LoginController extends Controller
{
@@ -19,7 +20,7 @@ class LoginController extends Controller
$this->validate($request, ['email' => 'required', 'password' => 'required']);
//system user : $table = "auth_users";
$logged_in = Models\SystemUser::with('designation_info')->where('email', $request->email)->where('password', md5($request->password))->first();
if(empty($logged_in)){
return redirect("/")->withErrors(array("Incorrect Email/Password. Check and try again!"))->withInput();
}
@@ -32,12 +33,14 @@ class LoginController extends Controller
$request->session()->put('current_user.designation', $logged_in->designation_info->name);
\Log::info($logged_in->name . ' Successfully logged in at : ' . date('Y-m-d H:i:s'));
$content = $logged_in->name . " Successfully Logged In";
activity()->log($logged_in->name . ' Successfully logged in at : ' . date('Y-m-d H:i:s'));
$this->logUsersActivity($type = 'staff', $content, $logged_in->id);
$this->deleteLoggedUser();
$this->storeLoggedUser();
switch ($logged_in->designation_info->name) {
case 'Administrator':
return redirect(url('finance')); // change it to a combined dashboard
@@ -45,11 +48,11 @@ class LoginController extends Controller
case 'Accounts & Finance':
return redirect(url('finance'));
break;
default:
return redirect(url('/'));
break;
}
}
}
public function handle_logout(Request $request) {
@@ -62,7 +65,8 @@ class LoginController extends Controller
$request->session()->flush();
$request->session()->regenerate(true);
$this->logUsersActivity($type = 'staff', $content, $user_id);
activity()->log($username . " Logged Out : " . date('Y-m-d H:i:s'));
// $this->logUsersActivity($type = 'staff', $content, $user_id);
return redirect("/");
}
@@ -75,7 +79,7 @@ class LoginController extends Controller
'email' => 'required',
'phone' => 'required',
'password' => 'required',
'confirm_password' => 'same:password',
'confirm_password' => 'same:password',
]);
$make_account = [