miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: Next major version - AthenaHR v2 #1

Draft
miguel456 wants to merge 46 commits from develop into main
pull from: develop
merge into: miguel456:main
Conversation 0 Commits 46 Files Changed 792 +5547 -3916
792 changed files with 5547 additions and 3916 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3981bee8f7 - Show all commits

2
app/Http/Controllers/InvitationController.php
View File

@@ -38,7 +38,6 @@ class InvitationController extends Controller
$invitation->requestor_email = $request->input('email'); $invitation->requestor_email = $request->input('email');
$invitation->requestor_ip_address = $request->ip(); $invitation->requestor_ip_address = $request->ip();
$invitation->status = $guest ? 'pending' : 'approved'; $invitation->status = $guest ? 'pending' : 'approved';
$invitation->notified = !$guest; // confirmation msg doesn't count
$invitation->invitation_code = bin2hex(random_bytes(64)); $invitation->invitation_code = bin2hex(random_bytes(64));
$invitation->expiration = now()->addDays(2); $invitation->expiration = now()->addDays(2);
@@ -78,7 +77,6 @@ class InvitationController extends Controller
if ($invitation->expiration && now()->lessThanOrEqualTo($invitation->expiration) && in_array($invitation->status, $approvableStates)) if ($invitation->expiration && now()->lessThanOrEqualTo($invitation->expiration) && in_array($invitation->status, $approvableStates))
{ {
$invitation->status = 'approved'; $invitation->status = 'approved';
$invitation->notified = true;
$invitation->save(); $invitation->save();
Mail::to($invitation->requestor_email)->send(new InviteApprovedMail($invitation)); Mail::to($invitation->requestor_email)->send(new InviteApprovedMail($invitation));