Skip to content

Commit 90d2741

Browse files
HDVinnieHDVinnie
authored
Merge pull request #4444 from HDInnovations/revert-4422-add-revive-invites
Revert "(Add) Allow Modo users to 'Revive' Deleted Invites & Expired Invites."
2 parents eed0fbd + 85fd77b commit 90d2741

File tree

6 files changed

+14
-70
lines changed

6 files changed

+14
-70
lines changed

Diff for: ‎app/Http/Controllers/User/InviteController.php

-26
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,6 @@ public function send(Request $request, User $user, Invite $sentInvite): \Illumin
167167
->withErrors(trans('user.invite-already-used'));
168168
}
169169

170-
if ($sentInvite->deleted_at !== null) {
171-
return to_route('users.invites.index', ['user' => $user])
172-
->withErrors(trans('user.invite-deleted'));
173-
}
174-
175170
if ($sentInvite->expires_on < now()) {
176171
return to_route('users.invites.index', ['user' => $user])
177172
->withErrors(trans('user.invite-expired'));
@@ -182,25 +177,4 @@ public function send(Request $request, User $user, Invite $sentInvite): \Illumin
182177
return to_route('users.invites.index', ['user' => $user])
183178
->withSuccess(trans('user.invite-resent-success'));
184179
}
185-
186-
public function revive(Request $request, User $user, Invite $sentInvite): \Illuminate\Http\RedirectResponse
187-
{
188-
abort_unless($request->user()->group->is_modo && (config('other.modo_revive_expired_invites') || config('other.modo_revive_deleted_invites')), 403);
189-
190-
if (($sentInvite->deleted_at !== null && config('other.modo_revive_deleted_invites')) ||
191-
($sentInvite->expires_on < now() && config('other.modo_revive_expired_invites'))) {
192-
$sentInvite->update(
193-
[
194-
'expires_on' => now()->addDays(config('other.invite_expire')),
195-
'deleted_at' => null,
196-
]
197-
);
198-
} else {
199-
return to_route('users.invites.index', ['user' => $user])
200-
->withErrors(trans('user.invite-revive-failed'));
201-
}
202-
203-
return to_route('users.invites.index', ['user' => $user])
204-
->withSuccess(trans('user.invite-revive-success'));
205-
}
206180
}

Diff for: ‎config/other.php

-5
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@
125125
'invite-only' => true,
126126
'invite_expire' => 14,
127127

128-
/* Allow Modo Staff to Revive (Restore & Renew) Deleted Invites */
129-
'modo_revive_deleted_invites' => true,
130-
/* Allow Modo Staff to Revive (Restore & Renew) Expired Invites */
131-
'modo_revive_expired_invites' => true,
132-
133128
'invites_restriced' => false,
134129
'invite_groups' => [
135130
'Administrator',

Diff for: ‎lang/en/common.php

-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@
172172
'remove' => 'Remove',
173173
'report' => 'Report',
174174
'resend' => 'Resend',
175-
'revive' => 'Revive',
176175
'resolution' => 'Resolution',
177176
'resolutions' => 'Resolutions',
178177
'reporter' => 'Reporter',

Diff for: ‎lang/en/user.php

-3
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,9 @@
152152
'invited-by' => 'Invited By',
153153
'invite-already-sent' => 'The email address your trying to send a invite to has already been sent one.',
154154
'invite-already-used' => 'The invite you are trying to resend has already been used.',
155-
'invite-deleted' => 'The invite you are trying to resend has been deleted.',
156155
'invite-expired' => 'The invite you are trying to resend has expired.',
157156
'invite-friend' => 'Invite your friend (Email + Message Required)',
158157
'invite-resent-success' => 'Invite was resent successfully!',
159-
'invite-revive-success' => 'Invite was revived successfully!',
160-
'invite-revive-failed' => 'Invite was not able to be revived.',
161158
'invite-sent-success' => 'Invite was sent successfully!',
162159
'invite-tree' => 'Invite Tree',
163160
'invites' => 'Invites',

Diff for: ‎resources/views/user/invite/index.blade.php

+14-34
Original file line numberDiff line numberDiff line change
@@ -107,41 +107,21 @@ class="form__button form__button--text"
107107
<td>
108108
<menu class="data-table__actions">
109109
<li class="data-table__action">
110-
@if ($invite->accepted_at === null &&
111-
(($invite->deleted_at !== null && config('other.modo_revive_deleted_invites')) ||
112-
($invite->expires_on < now() && config('other.modo_revive_expired_invites'))) &&
113-
auth()->user()->group->is_modo)
114-
<form
115-
action="{{ route('users.invites.revive', ['user' => $user, 'sentInvite' => $invite]) }}"
116-
method="POST"
117-
x-data="confirmation"
118-
>
119-
@csrf
120-
<button
121-
x-on:click.prevent="confirmAction"
122-
data-b64-deletion-message="{{ base64_encode('Are you sure you want to revive the invite for ' . $invite->email . '?') }}"
123-
class="form__button form__button--text"
124-
>
125-
{{ __('common.revive') }}
126-
</button>
127-
</form>
128-
@else
129-
<form
130-
action="{{ route('users.invites.send', ['user' => $user, 'sentInvite' => $invite]) }}"
131-
method="POST"
132-
x-data="confirmation"
110+
<form
111+
action="{{ route('users.invites.send', ['user' => $user, 'sentInvite' => $invite]) }}"
112+
method="POST"
113+
x-data="confirmation"
114+
>
115+
@csrf
116+
<button
117+
x-on:click.prevent="confirmAction"
118+
data-b64-deletion-message="{{ base64_encode('Are you sure you want to resend the email to: ' . $invite->email . '?') }}"
119+
class="form__button form__button--text"
120+
@disabled($invite->accepted_at !== null || $invite->expires_on < now())
133121
>
134-
@csrf
135-
<button
136-
x-on:click.prevent="confirmAction"
137-
data-b64-deletion-message="{{ base64_encode('Are you sure you want to resend the invite email to ' . $invite->email . '?') }}"
138-
class="form__button form__button--text"
139-
@disabled($invite->accepted_at !== null || $invite->expires_on < now() || $invite->deleted_at !== null)
140-
>
141-
{{ __('common.resend') }}
142-
</button>
143-
</form>
144-
@endif
122+
{{ __('common.resend') }}
123+
</button>
124+
</form>
145125
</li>
146126
<li class="data-table__action">
147127
<form

Diff for: ‎routes/web.php

-1
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@
512512
Route::get('/create', [App\Http\Controllers\User\InviteController::class, 'create'])->name('create');
513513
Route::post('/store', [App\Http\Controllers\User\InviteController::class, 'store'])->name('store');
514514
Route::post('/{sentInvite}/send', [App\Http\Controllers\User\InviteController::class, 'send'])->name('send');
515-
Route::post('/{sentInvite}/revive', [App\Http\Controllers\User\InviteController::class, 'revive'])->name('revive')->withTrashed();
516515
Route::delete('/{sentInvite}', [App\Http\Controllers\User\InviteController::class, 'destroy'])->name('destroy')->withTrashed();
517516
Route::get('/', [App\Http\Controllers\User\InviteController::class, 'index'])->name('index')->withTrashed();
518517
});

0 commit comments

Comments
 (0)