Fix bug #3 and #8

oanhnn · Aug 7, 2018 · 32ee324 · 32ee324
1 parent 1a0411a
commit 32ee324
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/src/Models/Concerns/BelongsToPlanModel.php b/src/Models/Concerns/BelongsToPlanModel.php
@@ -15,7 +15,6 @@ public function plan()
     {
         return $this->belongsTo(
             Config::get('plans.models.Plan'),
-            Config::get('plans.tables.plans'),
             'plan_id',
             'id'
         );

diff --git a/src/Models/PlanFeature.php b/src/Models/PlanFeature.php
@@ -47,7 +47,6 @@ public function feature()
     {
         return $this->belongsTo(
             Config::get('plans.models.Feature'),
-            Config::get('plans.tables.features'),
             'feature_id',
             'id'
         );

diff --git a/src/Models/PlanSubscriptionUsage.php b/src/Models/PlanSubscriptionUsage.php
@@ -26,7 +26,8 @@ class PlanSubscriptionUsage extends Model
      */
     protected $fillable = [
         'valid_until',
-        'used'
+        'used',
+        'feature_code',
     ];
 
     /**

diff --git a/src/SubscriptionAbility.php b/src/SubscriptionAbility.php
@@ -66,7 +66,7 @@ public function consumed(string $featureCode): int
     {
         /** @var \Laravel\PricingPlans\Models\PlanSubscriptionUsage $usage */
         foreach ($this->subscription->usage as $usage) {
-            if ($usage->feature_code === $featureCode && $usage->isExpired()) {
+            if ($usage->feature_code === $featureCode && !$usage->isExpired()) {
                 return (int) $usage->used;
             }
         }

diff --git a/src/SubscriptionUsageManager.php b/src/SubscriptionUsageManager.php
@@ -38,7 +38,7 @@ public function __construct(PlanSubscription $subscription)
     public function record(string $featureCode, $uses = 1, $incremental = true)
     {
         /** @var \Laravel\PricingPlans\Models\Feature $feature */
-        $feature = Feature::findByCode($featureCode);
+        $feature = Feature::code($featureCode)->first();
 
         $usage = $this->subscription->usage()->firstOrNew([
             'feature_code' => $feature->code,