Add Queue Pro billing, renewal, and scheduler.
Deploy Ladill Queue / deploy (push) Successful in 42s

Organizations can upgrade from wallet with plan expiry enforcement and nightly qms:pro-renew charges.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
isaacclad
2026-06-30 01:07:24 +00:00
co-authored by Cursor
parent 1d50f10c3f
commit 0770faaa9f
11 changed files with 411 additions and 5 deletions
@@ -0,0 +1,22 @@
<?php
namespace App\Console\Commands;
use App\Services\Qms\ProRenewalService;
use Illuminate\Console\Command;
class RenewProSubscriptionsCommand extends Command
{
protected $signature = 'qms:pro-renew';
protected $description = 'Charge the Ladill wallet for due Queue Pro subscriptions (and downgrade after the grace window).';
public function handle(ProRenewalService $renewals): int
{
$due = $renewals->dueOrganizations();
$this->info("Renewing {$due->count()} due organization(s).");
$due->each(fn ($organization) => $renewals->renewIfDue($organization));
return self::SUCCESS;
}
}
@@ -0,0 +1,92 @@
<?php
namespace App\Http\Controllers\Qms;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Qms\Concerns\ScopesToAccount;
use App\Services\Billing\BillingClient;
use App\Services\Qms\PlanService;
use App\Services\Qms\QmsPermissions;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Illuminate\View\View;
class ProController extends Controller
{
use ScopesToAccount;
public function index(Request $request, PlanService $plans): View
{
$organization = $this->organization($request);
$canManage = app(QmsPermissions::class)->can($this->member($request), 'settings.manage');
$settings = $organization->settings ?? [];
$expiresAt = ! empty($settings['plan_expires_at'])
? Carbon::parse($settings['plan_expires_at'])
: null;
return view('qms.pro.index', [
'organization' => $organization,
'isPro' => $plans->isPro($organization),
'canManage' => $canManage,
'priceMinor' => $plans->proPriceMinor(),
'currency' => (string) config('billing.currency', 'GHS'),
'planExpiresAt' => $expiresAt,
'proFeatures' => [
'Unlimited branches & queues',
'Advanced routing rules',
'Digital displays & kiosk devices',
'Appointment reminders',
'Analytics & report exports',
],
]);
}
public function subscribe(Request $request, PlanService $plans, BillingClient $billing): RedirectResponse
{
$this->authorizeAbility($request, 'settings.manage');
$organization = $this->organization($request);
if ($plans->isPro($organization)) {
return redirect()->route('qms.pro.index')
->with('success', 'Your organization is already on Queue Pro.');
}
$priceMinor = $plans->proPriceMinor();
try {
if (! $billing->canAfford($organization->owner_ref, $priceMinor)) {
return redirect()->route('qms.pro.index')
->with('error', 'Insufficient wallet balance. Top up your Ladill wallet to upgrade to Pro.');
}
$charged = $billing->debit(
$organization->owner_ref,
$priceMinor,
'queue_pro',
'queue-pro-'.$organization->id.'-'.now()->format('Y-m-d-His'),
'Ladill Queue Pro — monthly subscription',
);
} catch (\Throwable) {
return redirect()->route('qms.pro.index')
->with('error', 'Could not process upgrade. Please try again.');
}
if (! $charged) {
return redirect()->route('qms.pro.index')
->with('error', 'Insufficient wallet balance. Top up your Ladill wallet to upgrade to Pro.');
}
$settings = $organization->settings ?? [];
$settings['plan'] = 'pro';
$settings['auto_renew'] = true;
$settings['plan_expires_at'] = now()
->addDays((int) config('qms.pro.period_days', 30))
->toIso8601String();
unset($settings['plan_renewal_error']);
$organization->update(['settings' => $settings]);
return redirect()->route('qms.pro.index')
->with('success', 'Welcome to Queue Pro — active for one month.');
}
}
+18
View File
@@ -4,6 +4,9 @@ namespace App\Providers;
use App\Events\ServiceEventOccurred;
use App\Listeners\PlatformServiceEventListener;
use App\Models\User;
use App\Services\Qms\OrganizationResolver;
use App\Services\Qms\PlanService;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Event;
@@ -28,6 +31,21 @@ class AppServiceProvider extends ServiceProvider
return Limit::perMinute(30)->by((string) $key);
});
View::composer('partials.sidebar', function ($view) {
/** @var User|null $user */
$user = auth()->user();
$isPro = false;
if ($user) {
$organization = app(OrganizationResolver::class)->resolveForUser($user);
if ($organization) {
$isPro = app(PlanService::class)->isPro($organization);
}
}
$view->with('isPro', $isPro);
});
View::composer(['partials.topbar'], function ($view) {
$view->with(\App\Support\MobileTopbar::resolve());
});
+24 -4
View File
@@ -3,27 +3,42 @@
namespace App\Services\Qms;
use App\Models\Organization;
use Carbon\Carbon;
class PlanService
{
public function planKey(Organization $organization): string
{
$settings = $organization->settings ?? [];
$plan = (string) ($settings['plan'] ?? 'free');
if ($plan === 'pro' && ! empty($settings['plan_expires_at'])) {
if (Carbon::parse($settings['plan_expires_at'])->isPast()) {
return 'free';
}
}
return array_key_exists($plan, config('qms.plans', [])) ? $plan : 'free';
}
public function plan(Organization $organization): string
{
return (string) data_get($organization->settings, 'plan', 'free');
return $this->planKey($organization);
}
public function isPro(Organization $organization): bool
{
return $this->plan($organization) === 'pro';
return $this->planKey($organization) === 'pro';
}
public function maxBranches(Organization $organization): ?int
{
return config('qms.plans.'.$this->plan($organization).'.max_branches');
return config('qms.plans.'.$this->planKey($organization).'.max_branches');
}
public function maxQueues(Organization $organization): ?int
{
return config('qms.plans.'.$this->plan($organization).'.max_queues');
return config('qms.plans.'.$this->planKey($organization).'.max_queues');
}
public function canAddBranch(Organization $organization, int $currentCount): bool
@@ -39,4 +54,9 @@ class PlanService
return $max === null || $currentCount < $max;
}
public function proPriceMinor(): int
{
return (int) config('qms.plans.pro.price_minor', 9900);
}
}
+89
View File
@@ -0,0 +1,89 @@
<?php
namespace App\Services\Qms;
use App\Models\Organization;
use App\Services\Billing\BillingClient;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
class ProRenewalService
{
public function __construct(
private readonly BillingClient $billing,
private readonly PlanService $plans,
) {}
/** @return Collection<int, Organization> */
public function dueOrganizations(): Collection
{
return Organization::query()
->where('settings->plan', 'pro')
->whereNotNull('settings->plan_expires_at')
->get()
->filter(fn (Organization $organization) => $this->isDue($organization));
}
public function isDue(Organization $organization): bool
{
$settings = $organization->settings ?? [];
if (($settings['plan'] ?? '') !== 'pro') {
return false;
}
if (array_key_exists('auto_renew', $settings) && $settings['auto_renew'] === false) {
return false;
}
if (empty($settings['plan_expires_at'])) {
return false;
}
return Carbon::parse($settings['plan_expires_at'])->lte(now());
}
public function renewIfDue(Organization $organization): void
{
if (! $this->isDue($organization)) {
return;
}
$settings = $organization->settings ?? [];
$price = $this->plans->proPriceMinor();
$reference = 'queue-pro-'.$organization->id.'-'.now()->format('YmdHis');
try {
$charged = $this->billing->debit(
$organization->owner_ref,
$price,
'queue_pro_renewal',
$reference,
'Ladill Queue Pro — monthly renewal',
);
} catch (\Throwable) {
$charged = false;
}
if ($charged) {
$settings['plan'] = 'pro';
$settings['auto_renew'] = true;
$settings['plan_expires_at'] = now()
->addDays((int) config('qms.pro.period_days', 30))
->toIso8601String();
unset($settings['plan_renewal_error']);
$organization->update(['settings' => $settings]);
return;
}
$expires = Carbon::parse($settings['plan_expires_at']);
$graceEnd = $expires->copy()->addDays((int) config('qms.pro.grace_days', 3));
if ($graceEnd->isPast()) {
$settings['plan'] = 'free';
unset($settings['plan_expires_at']);
$settings['plan_renewal_error'] = 'Suspended after failed renewal.';
} else {
$settings['plan_renewal_error'] = 'Renewal failed — top up your wallet.';
}
$organization->update(['settings' => $settings]);
}
}