expiring tickets

[nick-potts]

Not really sure how to explain this.

I want a fully prepaid system where there's no subscribing, simply tickets that can expire.

I tried modifying a few things but got stuck. The first problem was:

laravel-soulbscription/src/Models/Concerns/HasSubscriptions.php

Line 287 in 6cf16a5

? $feature->calculateNextRecurrenceEnd($this->subscription->started_at)

Here it assumes you have a subscription.

I tried adding this:

$hasSubscription = $this->subscription()->exists();

        $consumptionCounter = 0;
        $consumptionRequired = $this->getCurrentConsumption($feature->name) + $consumption;
        $chargableTicket = null;
        foreach (
            $this->loadedTicketFeatures
                     ->find($feature)
                     ->tickets
                     ->sortBy('expired_at') as $ticket
        ) {
            $consumptionCounter += $ticket->charges;
            if ($consumptionCounter >= $consumptionRequired) {
                $chargableTicket = $ticket;
                break;
            }
        }
        
        $consumptionExpiration = match ($hasSubscription) {
            true => $feature->consumable ?
                $feature->calculateNextRecurrenceEnd($this->subscription->started_at)
                : null,
            false => $chargableTicket?->expired_at ?? $this->calculateNextRecurrenceEnd($this->subscription->started_at),
        };

also added ->where('expired_at', '>', now()) to:

laravel-soulbscription/src/Models/Concerns/HasSubscriptions.php

Line 341 in 6cf16a5

->sum('charges');

This works ok, but for some reason when adding more tickets in the future, it doesn't get added correctly. Or at least loadedTicketFeatures is returning an array of tickets that doesn't contain the newest added tickets.

The test case I was using:

$feature = Feature::factory()->consumable()->createOne();

$subscriber = User::factory()->createOne();

config()->set('soulbscription.feature_tickets', true);

$subscriber->giveTicketFor($feature->name, now()->addDays(2), 2);

$subscriber->giveTicketFor($feature->name, now()->addDay(), 2);

$subscriber->consume($feature->name, 3);

$this->assertEquals(1, $subscriber->getRemainingCharges($feature->name));

$this->travel(2)->days();

$this->assertEquals(0, $subscriber->getRemainingCharges($feature->name));

$subscriber->giveTicketFor($feature->name, now()->addWeek(), 2);

$this->assertEquals(2, $subscriber->getRemainingCharges($feature->name));