add ability for unlimited usage on consumables

this can be achieved with -1
lucasdotvin · Nov 18, 2024 · 2ab4396 · 2ab4396
1 parent db139b0
commit 2ab4396
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/database/migrations/2022_02_01_235540_create_features_table.php b/database/migrations/2022_02_01_235540_create_features_table.php
@@ -15,7 +15,7 @@ public function up()
         Schema::create('features', function (Blueprint $table) {
             $table->id();
             $table->string('name');
-            $table->boolean('consumable');
+            $table->boolean('consumable')->default(false);
             $table->boolean('quota')->default(false);
             $table->boolean('postpaid')->default(false);
             $table->integer('periodicity')->unsigned()->nullable();

diff --git a/src/Models/Concerns/HasSubscriptions.php b/src/Models/Concerns/HasSubscriptions.php
@@ -293,13 +293,12 @@ protected function consumeNotQuotaFeature(Feature $feature, ?float $consumption
             : null;
 
         $featureConsumption = $this->featureConsumptions()
-            ->make([
-                'consumption' => $consumption,
-                'expired_at' => $consumptionExpiration,
-            ])
-            ->feature()
-            ->associate($feature);
+            ->whereFeatureId($feature->id)
+            ->firstOrNew();
 
+        $featureConsumption->feature()->associate($feature);
+        $featureConsumption->consumption += $consumption;
+        $featureConsumption->expired_at = $consumptionExpiration;
         $featureConsumption->save();
 
         return $featureConsumption;
@@ -327,9 +326,12 @@ protected function getSubscriptionChargesForAFeature(Model $feature): float
             return 0;
         }
 
-        return $subscriptionFeature
-            ->pivot
-            ->charges;
+        $charges = $subscriptionFeature->pivot->charges;
+        if ($charges == -1) {
+            return INF;
+        }
+
+        return $charges;
     }
 
     protected function getTicketChargesForAFeature(Model $feature): float
@@ -341,9 +343,12 @@ protected function getTicketChargesForAFeature(Model $feature): float
             return 0;
         }
 
-        return $ticketFeature
-            ->tickets
-            ->sum('charges');
+        $charges = $ticketFeature->tickets->sum('charges');
+        if ($charges === -1) {
+            return INF;
+        }
+
+        return $charges;
     }
 
     public function getFeature(string $featureName): ?Feature
@@ -387,8 +392,8 @@ protected function loadTicketFeatures(): Collection
         }
 
         return $this->loadedTicketFeatures = Feature::with([
-                'tickets' => fn (HasMany $query) => $query->withoutExpired()->whereMorphedTo('subscriber', $this),
-            ])
+            'tickets' => fn (HasMany $query) => $query->withoutExpired()->whereMorphedTo('subscriber', $this),
+        ])
             ->whereHas(
                 'tickets',
                 fn (Builder $query) => $query->withoutExpired()->whereMorphedTo('subscriber', $this),