Implemented requested changes.

owlchester · Feb 8, 2024 · 7c156ba · 7c156ba
1 parent 5cdcf0f
commit 7c156ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/app/Http/Controllers/Settings/SubscriptionController.php b/app/Http/Controllers/Settings/SubscriptionController.php
@@ -97,8 +97,10 @@ public function change(Request $request, Tier $tier)
         }
         $upgrade = $this->subscriptionUpgrade->user($user)->tier($tier)->upgradePrice($period);
         $currency = $user->currencySymbol();
-
-        $this->emailValidation->user($user)->requiresEmail();
+        $validationService = false;
+        if ($user->isFrauding()) {
+            $validationService = $this->emailValidation;
+        }
 
         return view('settings.subscription.change', compact(
             'tier',
@@ -114,6 +116,7 @@ public function change(Request $request, Tier $tier)
             'hasPromo',
             'limited',
             'isYearly',
+            'validationService',
         ));
     }
 

diff --git a/app/User.php b/app/User.php
@@ -426,7 +426,7 @@ public function hasUnread(): bool
     public function isFrauding(): bool
     {
         // Fraud detection can be turned on or off
-        if (config('subscription.fraud_detection')) {
+        if (!config('subscription.fraud_detection')) {
             return false;
         }
         // Someone with a provider (twitter, fb) login is always considered safe

diff --git a/resources/views/settings/subscription/change.blade.php b/resources/views/settings/subscription/change.blade.php
@@ -5,7 +5,10 @@
 <article class="text-center max-w-xl container">
 
     <x-grid type="1/1">
-    @if (!$user->isFrauding())
+    @if ($validationService)
+        @php
+            $validationService->user($user)->requiresEmail();
+        @endphp
         <x-alert type="warning">
             {{ __('emails/validation.modal') }}
         </x-alert></div><?php return; ?>