Merge branch 'main' into develop

owlchester · Dec 11, 2023 · 0c94f9e · 0c94f9e
2 parents d562ccf + f7cc643
commit 0c94f9e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/app/Http/Controllers/Settings/SubscriptionController.php b/app/Http/Controllers/Settings/SubscriptionController.php
@@ -20,6 +20,7 @@
 class SubscriptionController extends Controller
 {
     protected SubscriptionService $subscription;
+
     protected SubscriptionUpgradeService $subscriptionUpgrade;
 
     /**
@@ -32,9 +33,6 @@ public function __construct(SubscriptionService $service, SubscriptionUpgradeSer
         $this->subscriptionUpgrade = $subscriptionUpgradeService;
     }
 
-    /**
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
     public function index()
     {
         /** @var User $user */
@@ -71,12 +69,6 @@ public function index()
         ));
     }
 
-    /**
-     * Change subscription modal
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     * @throws \Exception
-     */
     public function change(Request $request)
     {
         $user = $request->user();
@@ -92,7 +84,7 @@ public function change(Request $request)
         $cancel = $tier == Pledge::KOBOLD;
         $isDowngrading = $this->subscription->downgrading();
         $isYearly = $period === 'yearly';
-        $hasPromo = \Carbon\Carbon::create(2023, 11, 28)->isFuture();
+        $hasPromo = false; //\Carbon\Carbon::create(2023, 11, 28)->isFuture();
         $limited = $this->subscription->isLimited();
         if ($user->hasPayPal()) {
             $limited = true;

diff --git a/app/Http/Requests/StoreMap.php b/app/Http/Requests/StoreMap.php
@@ -3,6 +3,7 @@
 namespace App\Http\Requests;
 
 use App\Facades\Limit;
+use App\Models\Map;
 use App\Traits\ApiRequest;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -38,6 +39,9 @@ public function rules()
             'template_id' => 'nullable',
             'center_x' => 'nullable|numeric',
             'center_y' => 'nullable|numeric',
+            'max_zoom' => 'nullable|numeric|min:1|max:' . Map::MAX_ZOOM,
+            'min_zoom' => 'nullable|numeric|min:' . Map::MIN_ZOOM . '|max:' . Map::MAX_ZOOM_REAL,
+            'initial_zoom' => 'nullable|numeric|min:' . MAP::MIN_ZOOM . '|max:' . Map::MAX_ZOOM_REAL,
         ];
 
         $self = request()->route('map');

diff --git a/resources/views/maps/form/_settings.blade.php b/resources/views/maps/form/_settings.blade.php
@@ -47,8 +47,6 @@
         [
         'placeholder' => 5,
         'class' => '',
-        'min' => 1,
-        'max' => Map::MAX_ZOOM,
         ]
         ) !!}
     </x-forms.field>
@@ -64,8 +62,6 @@
         [
         'placeholder' => -2,
         'class' => '',
-        'min' => Map::MIN_ZOOM,
-        'max' => Map::MAX_ZOOM_REAL,
         ]
         ) !!}
     </x-forms.field>
@@ -81,8 +77,6 @@
         [
         'placeholder' => 5,
         'class' => '',
-        'min' => $minInitial,
-        'max' => $maxInitial,
         ]
         ) !!}
     </x-forms.field>