Ability for unlimited consumables & prices to plans

composer.json

@@ -17,8 +17,8 @@
         }
     ],
     "require": {
-        "php": "^8.0|^8.1|^8.2",
-        "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0"
+        "php": "^8.0|^8.1|^8.2|^8.3|^8.4",
+        "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "orchestra/testbench": "^6.22|^7.0|^8.0|^9.0",

database/factories/FeatureConsumptionFactory.php

@@ -2,8 +2,8 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\Feature;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Models\Feature;
 use LucasDotVin\Soulbscription\Models\FeatureConsumption;
 
 class FeatureConsumptionFactory extends Factory
@@ -18,10 +18,10 @@ class FeatureConsumptionFactory extends Factory
     public function definition()
     {
         return [
-            'feature_id'      => Feature::factory(),
-            'consumption'     => $this->faker->randomFloat(),
-            'expired_at'      => $this->faker->dateTime(),
-            'subscriber_id'   => $this->faker->randomNumber(),
+            'feature_id' => Feature::factory(),
+            'consumption' => $this->faker->randomFloat(),
+            'expired_at' => $this->faker->dateTime(),
+            'subscriber_id' => $this->faker->randomNumber(),
             'subscriber_type' => $this->faker->word(),
         ];
     }

database/factories/FeatureFactory.php

@@ -2,8 +2,8 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use LucasDotVin\Soulbscription\Models\Feature;
 
 class FeatureFactory extends Factory
@@ -18,17 +18,17 @@ class FeatureFactory extends Factory
     public function definition()
     {
         return [
-            'consumable'       => $this->faker->boolean(),
-            'name'             => $this->faker->words(asText: true),
-            'periodicity'      => $this->faker->randomDigitNotNull(),
+            'consumable' => $this->faker->boolean(),
+            'name' => $this->faker->words(asText: true),
+            'periodicity' => $this->faker->randomDigitNotNull(),
             'periodicity_type' => $this->faker->randomElement([
                 PeriodicityType::Year,
                 PeriodicityType::Month,
                 PeriodicityType::Week,
                 PeriodicityType::Day,
             ]),
-            'quota'            => false,
-            'postpaid'         => false,
+            'quota' => false,
+            'postpaid' => false,
         ];
     }
 

database/factories/PlanFactory.php

@@ -2,8 +2,8 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Enums\PeriodicityType;
 use LucasDotVin\Soulbscription\Models\Plan;
 
 class PlanFactory extends Factory
@@ -18,9 +18,9 @@ class PlanFactory extends Factory
     public function definition()
     {
         return [
-            'grace_days'       => 0,
-            'name'             => $this->faker->words(asText: true),
-            'periodicity'      => $this->faker->randomDigitNotNull(),
+            'grace_days' => 0,
+            'name' => $this->faker->words(asText: true),
+            'periodicity' => $this->faker->randomDigitNotNull(),
             'periodicity_type' => $this->faker->randomElement([
                 PeriodicityType::Year,
                 PeriodicityType::Month,

database/factories/SubscriptionFactory.php

@@ -2,8 +2,8 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\Plan;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Models\Plan;
 use LucasDotVin\Soulbscription\Models\Subscription;
 
 class SubscriptionFactory extends Factory
@@ -18,13 +18,13 @@ class SubscriptionFactory extends Factory
     public function definition()
     {
         return [
-            'plan_id'         => Plan::factory(),
-            'canceled_at'     => null,
-            'started_at'      => $this->faker->dateTime(),
-            'suppressed_at'   => null,
-            'expired_at'      => $this->faker->dateTime(),
-            'was_switched'    => false,
-            'subscriber_id'   => $this->faker->randomNumber(),
+            'plan_id' => Plan::factory(),
+            'canceled_at' => null,
+            'started_at' => $this->faker->dateTime(),
+            'suppressed_at' => null,
+            'expired_at' => $this->faker->dateTime(),
+            'was_switched' => false,
+            'subscriber_id' => $this->faker->randomNumber(),
             'subscriber_type' => $this->faker->word(),
         ];
     }

database/factories/SubscriptionRenewalFactory.php

@@ -2,8 +2,9 @@
 
 namespace LucasDotVin\Soulbscription\Database\Factories;
 
-use LucasDotVin\Soulbscription\Models\{Subscription, SubscriptionRenewal};
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LucasDotVin\Soulbscription\Models\Subscription;
+use LucasDotVin\Soulbscription\Models\SubscriptionRenewal;
 
 class SubscriptionRenewalFactory extends Factory
 {
@@ -18,8 +19,8 @@ public function definition()
     {
         return [
             'subscription_id' => Subscription::factory(),
-            'overdue'         => $this->faker->boolean(),
-            'renewal'         => $this->faker->boolean(),
+            'overdue' => $this->faker->boolean(),
+            'renewal' => $this->faker->boolean(),
         ];
     }
 }

database/migrations/2022_02_01_233701_create_plans_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
@@ -16,8 +17,12 @@ public function up()
             $table->id();
             $table->integer('grace_days')->default(0);
             $table->string('name');
+            $table->string('display_name')->nullable();
             $table->integer('periodicity')->unsigned()->nullable();
             $table->string('periodicity_type')->nullable();
+            $table->decimal('price')->default('0.0');
+            $table->string('price_id')->nullable();
+            $table->string('currency')->nullable();
             $table->softDeletes();
             $table->timestamps();
         });

database/migrations/2022_02_01_235539_create_subscriptions_table.php

@@ -2,10 +2,10 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/2022_02_01_235540_create_features_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
@@ -15,7 +16,8 @@ public function up()
         Schema::create('features', function (Blueprint $table) {
             $table->id();
             $table->string('name');
-            $table->boolean('consumable');
+            $table->string('display_name')->nullable();
+            $table->boolean('consumable')->default(false);
             $table->boolean('quota')->default(false);
             $table->boolean('postpaid')->default(false);
             $table->integer('periodicity')->unsigned()->nullable();

database/migrations/2022_02_02_000527_create_feature_consumptions_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/2022_02_03_001206_create_subscription_renewals_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/2022_02_04_001622_create_feature_plan_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/2022_02_25_001622_create_feature_tickets_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/upgrades/1.x-2.x/2022_04_22_002342_add_grace_days_column_to_plans_table_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/upgrades/1.x-2.x/2022_04_22_002342_add_grace_ended_at_column_to_subscriptions_table_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/upgrades/2.1-2.2/2022_05_19_0000_add_quota_column_to_features_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/upgrades/2.4-2.5/2022_05_19_0000_add_postpaid_column_to_features_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/upgrades/2.5-2.6/2022_10_10_0000_make_expired_at_column_nullable_on_tickets_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

database/migrations/upgrades/4.0-4.1/2023_10_01_0000_make_periodicity_columns_nullable_on_plans_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

src/Enums/PeriodicityType.php

@@ -19,7 +19,7 @@ public static function getDateDifference(Carbon $from, Carbon $to, string $unit)
     {
         $unitInPlural = Str::plural($unit);
 
-        $differenceMethodName = 'diffIn' . $unitInPlural;
+        $differenceMethodName = 'diffIn'.$unitInPlural;
 
         return $from->{$differenceMethodName}($to);
     }

src/Models/Concerns/Expires.php

@@ -8,7 +8,7 @@ trait Expires
 {
     public static function bootExpires()
     {
-        static::addGlobalScope(new ExpiringScope());
+        static::addGlobalScope(new ExpiringScope);
     }
 
     public function initializeExpires()

src/Models/Concerns/ExpiresAndHasGraceDays.php

@@ -8,7 +8,7 @@ trait ExpiresAndHasGraceDays
 {
     public static function bootExpiresAndHasGraceDays()
     {
-        static::addGlobalScope(new ExpiringWithGraceDaysScope());
+        static::addGlobalScope(new ExpiringWithGraceDaysScope);
     }
 
     public function initializeExpiresAndHasGraceDays()

src/Models/Concerns/HandlesRecurrence.php

@@ -7,7 +7,7 @@
 
 trait HandlesRecurrence
 {
-    public function calculateNextRecurrenceEnd(Carbon|string $start = null): Carbon
+    public function calculateNextRecurrenceEnd(Carbon|string|null $start = null): Carbon
     {
         if (empty($start)) {
             $start = now();

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),