Resume Subscription button

app/Enums/Permission.php

@@ -24,4 +24,3 @@ enum Permission: int
     case PostTemplates = 18;
     case Bookmarks = 19;
 }
-

app/Http/Controllers/CrudController.php

@@ -111,8 +111,8 @@
             return redirect()->route('dashboard', $this->campaign)->with(
                 'error_raw',
                 __('campaigns/modules.errors.disabled', [
                     'name' => $this->getEntityType()->plural(),
                     'fix' => '<a href="' . route('campaign.modules', [$this->campaign, '#' . $this->getEntityType()->code]) . '">' . __('crud.fix-this-issue') . '</a>',
                 ])
             );
         }
@@ -300,7 +300,7 @@
     }
     public function crudCreate($params = [])
     {
         $this->authorize('create', [$this->getEntityType(), $this->campaign]);
 
         if ($this->hasLimitCheck) {
             // @phpstan-ignore-next-line
@@ -357,7 +357,7 @@
      */
     public function crudStore(Request $request, bool $redirectToCreated = false)
     {
         $this->authorize('create', [$this->getEntityType(), $this->campaign]);
 
 
         // For ajax requests, send back that the validation succeeded, so we can really send the form to be saved.
@@ -478,7 +478,7 @@
      */
     public function crudEdit(Model|MiscModel $model)
     {
         $this->authorize('update', $model->entity);
 
         /** @var MiscModel $model */
         $editingUsers = null;
@@ -519,7 +519,7 @@
      */
     public function crudUpdate(Request $request, Model|MiscModel $model)
     {
         $this->authorize('update', $model->entity);
 
         // For ajax requests, send back that the validation succeeded, so we can really send the form to be saved.
         if (request()->ajax()) {
@@ -696,7 +696,6 @@
 
     /**
      * Load a list of templates the user can create new entities from
-     * @param MiscModel $model
      */
     protected function loadTemplates(EntityType $entityType): Collection
     {

app/Http/Controllers/Settings/SubscriptionController.php

@@ -15,6 +15,7 @@
 use App\Services\Users\CurrencyService;
 use App\Services\Users\EmailValidationService;
 use App\Models\User;
+use App\Models\UserLog;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
@@ -115,6 +116,10 @@ public function change(Request $request, Tier $tier)
 
         // If the user has a cancelled sub still ending
         if ($user->subscribed('kanka') && $user->subscription('kanka')->onGracePeriod() && !$user->hasPayPal()) {
+            if ($tier->isCurrent($user)) {
+                return view('settings.subscription.renew')
+                    ->with('user', $user);
+            }
             return view('settings.subscription.change_blocked')
                 ->with('user', $user);
         }
@@ -169,6 +174,44 @@ public function change(Request $request, Tier $tier)
         ));
     }
 
+    public function renew(Request $request)
+    {
+        if ($request->ajax()) {
+            return response()->json([]);
+        }
+        try {
+            $this->subscription
+                ->user($request->user())
+                ->renew();
+            $request->user()->log(UserLog::TYPE_SUB_RENEW);
+
+            $routeOptions = [];
+
+            return redirect()
+                ->route('settings.subscription', $routeOptions)
+                ->withSuccess(__('subscriptions.renew.success'))
+            ;
+        } catch (IncompletePayment $exception) {
+            session()->put('subscription_callback', $request->get('payment_id'));
+            return redirect()->route(
+                'cashier.payment',
+                // @phpstan-ignore-next-line
+                [$exception->payment->id, 'redirect' => route('settings.subscription.callback')]
+            );
+        } catch (TranslatableException $e) {
+            return redirect()
+                ->route('settings.subscription')
+                ->with('error_raw', $e->getTranslatedMessage())
+            ;
+        } catch (Exception $e) {
+            // Error? json
+            return response()->json([
+                'error' => true,
+                'message' => $e->getMessage(),
+            ]);
+        }
+    }
+
     /**
      * Subscribe
      */

app/Jobs/SubscriptionEndJob.php

@@ -47,8 +47,8 @@ public function handle()
     {
         /** @var ?User $user */
         $user = User::find($this->userId);
-        if (empty($user) || $this->userId == 27078) {
-            // User deleted their account already.
+        if (empty($user) || $this->userId == 27078 || $user->subscribed('kanka')) {
+            // User deleted their account already or renewed their subscription.
             return;
         }
 

app/Models/Scopes/AclScope.php

@@ -5,7 +5,6 @@
 use App\Enums\Permission;
 use App\Facades\CampaignLocalization;
 use App\Facades\Permissions;
-use App\Models\CampaignPermission;
 use App\Models\Entity;
 use App\Models\Post;
 use App\Models\MiscModel;

app/Models/UserLog.php

@@ -33,6 +33,7 @@ class UserLog extends Model
     public const TYPE_SUB_DOWNGRADE = 13;
     public const TYPE_SUB_FAIL = 15;
     public const TYPE_SUB_PAYPAL = 16;
+    public const TYPE_SUB_RENEW = 17;
 
     public const TYPE_CAMPAIGN_NEW = 20;
     public const TYPE_CAMPAIGN_JOIN = 21;

app/Policies/MiscPolicy.php

@@ -2,17 +2,12 @@
 
 namespace App\Policies;
 
-use App\Facades\CampaignLocalization;
-use App\Facades\UserCache;
 use App\Models\Campaign;
 use App\Facades\EntityPermission;
-use App\Models\CampaignPermission;
 use App\Models\Entity;
 use App\Models\MiscModel;
-use App\Models\Post;
 use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
-use Illuminate\Support\Facades\Auth;
 
 class MiscPolicy
 {

app/Services/Entity/PrivacyService.php

@@ -3,7 +3,6 @@
 namespace App\Services\Entity;
 
 use App\Enums\Permission;
-use App\Models\CampaignPermission;
 use App\Models\CampaignRole;
 use App\Models\Entity;
 use App\Models\User;

app/Services/Permissions/EntityPermission.php

@@ -18,10 +18,10 @@
 
 class EntityPermission
 {
-    use UserAware;
+    use CampaignAware;
     use EntityAware;
     use EntityTypeAware;
-    use CampaignAware;
+    use UserAware;
 
     protected array $cached = [];
 
@@ -64,18 +64,18 @@ public function can(Permission $permission): bool
             $perm = $this->cached[$key];
         }
 
-//        dump('module permission');
-//        dump($key);
-//        dump($this->cached);
+        //        dump('module permission');
+        //        dump($key);
+        //        dump($this->cached);
         if (!isset($this->entity)) {
-//            dd('no entity');
+            //            dd('no entity');
             return $perm;
         }
 
         // Search for entity
         $entityKey = '_' . $permission->value . '_' . $this->entity->id;
-//        dump('check entity');
-//        dd($entityKey);
+        //        dump('check entity');
+        //        dd($entityKey);
         if (isset($this->cached[$entityKey])) {
             return $this->cached[$entityKey];
         }
@@ -106,6 +106,7 @@ public function hasPermission(
         }
         $key = $entityType . '_' . $action;
 
+
 //        if ($action === Permission::Bookmarks->value) {
 //            dump($key = $entityType . '_' . $action);
 //            dump($this->cached);
@@ -118,8 +119,8 @@ public function hasPermission(
 
         // Check if we have permission to do this action for exactly this entity
         if (!empty($entity)) {
-//            dump('i have an entity?');
-//            dump($entity);
+            //            dump('i have an entity?');
+            //            dump($entity);
 
             //Check if $entity is an entity type.
             if (isset($entity->type_id)) {
@@ -128,7 +129,7 @@ public function hasPermission(
                 //dump('misc object');
                 $entityKey = '_' . $action . '_' . $entity->id;
             }
-//            dump('entity key ' . $entityKey);
+            //            dump('entity key ' . $entityKey);
             if (isset($this->cached[$entityKey])) {
                 $perm = $this->cached[$entityKey];
             }

app/Services/SearchService.php

@@ -4,15 +4,13 @@
 
 use App\Facades\Avatar;
 use App\Facades\Mentions;
-use App\Facades\Module;
 use App\Models\Calendar;
 use App\Models\Entity;
 use App\Models\EntityAsset;
 use App\Models\EntityType;
 use App\Models\MiscModel;
 use App\Services\Entity\NewService;
 use App\Traits\CampaignAware;
-use App\Traits\EntityTypeAware;
 use App\Traits\UserAware;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;

app/Services/SubscriptionService.php

@@ -195,6 +195,12 @@ public function subscribe(string $paymentID): self
         return $this;
     }
 
+    public function renew(): void
+    {
+        $this->user->subscription('kanka')->resume();
+    }
+
+
     /**
      * Setup the user's pledge, role, discord
      * @return $this

app/Traits/GuestAuthTrait.php

@@ -5,7 +5,6 @@
 use App\Enums\Permission;
 use App\Facades\CampaignLocalization;
 use App\Facades\EntityPermission;
-use App\Models\CampaignPermission;
 use App\Models\Entity;
 
 trait GuestAuthTrait

lang/en/subscriptions/renew.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'title' => 'Subscription renewal',
+    'helper' => 'However, you can choose to renew your subscription to enjoy the benefits without interruptions.',
+    'success' => '',
+    'actions' => [
+        'renew' => 'Renew subscription',
+    ],
+];

resources/views/settings/subscription/index.blade.php

@@ -115,9 +115,15 @@
                     </div>
                     @if (!$tier->isFree() && $tier->isCurrent($user) && $user->subscribed('kanka') && !$hasManual)
                         <div class="self-bottom">
-                            <a class="btn2 btn-block btn-sm btn-error " data-toggle="dialog" data-target="subscribe-confirm" data-url="{{ route('settings.subscription.unsubscribe') }}">
-                                {{ __('settings.subscription.subscription.actions.cancel') }}
-                            </a>
+                            @if ($user->subscription('kanka')?->onGracePeriod())
+                                <a class="btn2 btn-block btn-sm btn-primary " data-toggle="dialog" data-target="subscribe-confirm" data-url="{{ route('settings.subscription.change', [$tier]) }}">
+                                    {{ __('subscriptions/renew.actions.renew') }}
+                                </a>
+                            @else
+                                <a class="btn2 btn-block btn-sm btn-error " data-toggle="dialog" data-target="subscribe-confirm" data-url="{{ route('settings.subscription.unsubscribe') }}">
+                                    {{ __('settings.subscription.subscription.actions.cancel') }}
+                                </a>
+                            @endif
                         </div>
                     @endif
                 </div>

resources/views/settings/subscription/renew.blade.php

@@ -0,0 +1,32 @@
+<?php /** @var \App\Models\User $user */ ?>
+@php
+    $endDate = $user->subscription('kanka')->ends_at->isoFormat('MMMM D, Y');
+@endphp
+<x-dialog.header>
+    {{ __('subscriptions/renew.title') }}
+</x-dialog.header>
+
+<article class="text-center max-w-xl container">
+    <x-grid type="1/1">
+        <x-helper>
+            <p class="text-left">
+                {!! __('settings.subscription.cancel.grace.text', ['date' => '<span class="text-error">' . $endDate . '</span>'])!!}
+            </p>
+        </x-helper>
+        <x-helper>
+            <p class="text-left">
+                {!! __('subscriptions/renew.helper')!!}
+            </p>
+        </x-helper>
+    </x-grid>
+
+    <x-form :action="['settings.subscription.renew']">
+
+        <x-buttons.confirm type="primary">
+            <x-icon class="fa-solid fa-repeat" />
+            <span>
+                {{ __('subscriptions/renew.actions.renew') }}
+            </span>
+        </x-buttons.confirm>
+    </x-form>
+</article>

routes/settings.php

@@ -62,6 +62,7 @@
 
 Route::get('/subscription', [SubscriptionController::class, 'index'])->name('settings.subscription');
 Route::get('/subscription/change/{tier}', [SubscriptionController::class, 'change'])->name('settings.subscription.change');
+Route::post('/subscription/renew', [SubscriptionController::class, 'renew'])->name('settings.subscription.renew');
 Route::get('/subscription/callback', [SubscriptionController::class, 'callback'])->name('settings.subscription.callback');
 Route::post('/subscription/change/{tier}', [SubscriptionController::class, 'subscribe'])->name('settings.subscription.subscribe');
 Route::get('/subscription/unsubscribe', [CancellationController::class, 'index'])->name('settings.subscription.unsubscribe');