cief/izyim
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim.git synced 2026-08-19 04:24:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Account' into 'master'

Browse Source 
user invitations fix

See merge request CIEFWorldwideSdnBhd/izyim!9
This commit is contained in:
omair saleh
2019-03-20 10:23:59 +00:00
parent d94eaee693 9ccc9617a2
commit bcc5e6733e
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/ControllersLogic/Accounts/CreateAccountInvitationLogic.php
-1
View File
@@ -49,7 +49,6 @@ class CreateAccountInvitationLogic
$invitation = $this->createUserInvitation->execute($object);
event(new UserInvited($invitation));
return new JsonResponse("Invitation have been sent!", HttpStatus::RESOURCE_CREATED);
app/Events/Accounts/UserHasRegistered.php
+1 -1
View File
@@ -21,7 +21,7 @@ class UserHasRegistered implements UserEvent {
/**
* @return User
*/
public function getUser(): User {
public function getData(): User {
return $this->user;
}
}
app/Listeners/Accounts/UserEventHandler.php
+4 -4
View File
@@ -17,17 +17,17 @@ class UserEventHandler {
public function handle(UserEvent $event): void {
if ($event instanceof UserHasRegistered) {
$attempts = UserEmailVerification::where('email', $event->getUser()->email);
$attempts = UserEmailVerification::where('email', $event->getData()->email);
if ($attempts !== null && !$event->getUser()->hasVerifiedEmail()) {
$event->getUser()->notify(new VerifyEmail($attempts->first()));
if ($attempts !== null && !$event->getData()->hasVerifiedEmail()) {
$event->getData()->notify(new VerifyEmail($attempts->first()));
$attempts->first()->update(['is_sent' => true]);
}
}
if ($event instanceof UserInvited) {
$event->getInvitation()->notify(new InvitationEmail($event));
$event->getData()->notify(new InvitationEmail($event));
}
}
app/Notifications/InvitationEmail.php
+3 -3
View File
@@ -14,7 +14,7 @@ class InvitationEmail extends AbstractEmail
/**
* InvitationEmail constructor.
* @param UserInvited $invitationt
* @param UserInvited $invitation
*/
public function __construct(UserInvited $invitation) {
$this->invitation = $invitation;
@@ -29,11 +29,11 @@ class InvitationEmail extends AbstractEmail
}
private function invitationUrl(){
return url(route('auth.registration', ['email' => $this->invitation->getInvitation()->email, 'hash' => $this->invitation->getInvitation()->hash]));
return url(route('auth.registration', ['email' => $this->invitation->getData()->email, 'hash' => $this->invitation->getData()->hash]));
}
private function senderName(){
$sender = $this->invitation->getInvitation()->sender;
$sender = $this->invitation->getData()->sender;
return $sender->first_name.' '.$sender->last_name;
}
resources/assets/vue/app.js
Vendored
+2
View File
@@ -35,6 +35,7 @@ Vue.component('address-component', require('./components/form_elements/AddressCo
//lists
Vue.component('accounts-list-component', require('./components/account/lists/AccountsListComponent.vue'));
Vue.component('invite-account-list-component', require('./components/account/lists/AccountsInviteListComponent.vue'));
Vue.component('companies-list-component', require('./components/company/lists/CompaniesListComponenet.vue'));
@@ -49,6 +50,7 @@ Vue.component('orders-list-component', require('./components/order/lists/OrdersL
//elements
Vue.component('account-component', require('./components/account/elements/AccountComponent.vue'));
Vue.component('invite-account-component', require('./components/account/elements/AccountInviteComponent.vue'));
Vue.component('company-profile-component', require('./components/company/elements/CompanyProfileComponenet.vue'));
Vue.component('company-summary-component', require('./components/company/elements/CompanySummaryComponenet.vue'));