Merge pull request #1 from nidhalkratos/master

Support for Laravel 8 and bug fixes

Author: dukenst2006

composer.json

@@ -21,8 +21,7 @@
         }
     ],
     "require": {
-        "doctrine/dbal": "^2.9.0",
-        "laravel/framework": "~5.8.0|~6.0|~6.2.0",
+        "laravel/framework": "~5.8.0|~6.0|~6.2.0|^8.22.2",
         "stripe/stripe-php": "^6.43.0"
     },
     "require-dev": {

src/Models/PlanSubscriptionModel.php

@@ -219,8 +219,8 @@ public function unconsumeFeature(string $featureCode, float $amount)
             ]));
         }
 
-        $used = (float) ($feature->isUnlimited()) ? ($usage->used - $amount < 0) ? 0 : ($usage->used - $amount) : ($usage->used - $amount);
-        $remaining = (float) ($feature->isUnlimited()) ? -1 : ($used > 0) ? ($feature->limit - $used) : $feature->limit;
+        $used = (float) max($usage->used - $amount, 0);
+        $remaining = (float) $feature->isUnlimited() ? -1 : $feature->limit - $used;
 
         event(new \Creatydev\Plans\Events\FeatureUnconsumed($this, $feature, $amount, $remaining));