Bill Frontdesk Pro and Enterprise per branch.
Deploy Ladill Frontdesk / deploy (push) Successful in 47s
Deploy Ladill Frontdesk / deploy (push) Successful in 47s
Pro is GHS 990/branch/mo and Enterprise is GHS 1990/branch/mo, with the Care-style branch selector UI, self-serve Enterprise checkout, and renewal charges scaled to billed branches.
This commit is contained in:
@@ -26,6 +26,7 @@ class ProController extends Controller
|
||||
? Carbon::parse($settings['plan_expires_at'])
|
||||
: null;
|
||||
$planKey = $plans->planKey($organization);
|
||||
$branchCount = max(1, $plans->activeBranchCount($organization));
|
||||
|
||||
return view('frontdesk.pro.index', [
|
||||
'organization' => $organization,
|
||||
@@ -34,10 +35,17 @@ class ProController extends Controller
|
||||
'isEnterprise' => $planKey === 'enterprise',
|
||||
'hasPaidPlan' => $plans->hasPaidPlan($organization),
|
||||
'canManage' => $canManage,
|
||||
'proPriceMinor' => $plans->proPriceMinor(),
|
||||
'proPricePerBranchMinor' => $plans->proPricePerBranchMinor(),
|
||||
'proPriceMinor' => $plans->proPriceTotalMinor($organization),
|
||||
'enterprisePricePerBranchMinor' => $plans->enterprisePricePerBranchMinor(),
|
||||
'enterprisePriceMinor' => $plans->enterprisePriceMinor($organization),
|
||||
'branchCount' => $branchCount,
|
||||
'canSubscribeEnterprise' => $plans->canSubscribeEnterprise($organization),
|
||||
'enterpriseMinBranches' => (int) config('frontdesk.enterprise.min_branches', 1),
|
||||
'prepaidMonths' => (array) config('frontdesk.prepaid_months', [6, 12, 24]),
|
||||
'currency' => (string) config('billing.currency', 'GHS'),
|
||||
'planExpiresAt' => $expiresAt,
|
||||
'billedBranches' => (int) ($settings['billed_branches'] ?? $branchCount),
|
||||
'salesUrl' => ladill_platform_url('contact-sales'),
|
||||
]);
|
||||
}
|
||||
@@ -52,20 +60,60 @@ class ProController extends Controller
|
||||
->with('success', 'Your organization already has an active paid plan.');
|
||||
}
|
||||
|
||||
if ($plans->isEnterprise($organization)) {
|
||||
return redirect()->route('frontdesk.pro.index')
|
||||
->with('success', 'Your organization is on Frontdesk Enterprise.');
|
||||
}
|
||||
$validated = $request->validate([
|
||||
'branches' => ['required', 'integer', 'min:1', 'max:999'],
|
||||
]);
|
||||
|
||||
$branches = $plans->resolveCheckoutBranches($organization, (int) $validated['branches']);
|
||||
$amountMinor = $plans->priceForBranches('pro', $branches);
|
||||
|
||||
return $this->chargeMonthlyWallet(
|
||||
$organization,
|
||||
$billing,
|
||||
$plans->proPriceMinor(),
|
||||
$amountMinor,
|
||||
'pro',
|
||||
'frontdesk_pro',
|
||||
'frontdesk-pro-'.$organization->id.'-'.now()->format('Y-m-d-His'),
|
||||
'Ladill Frontdesk Pro — monthly subscription',
|
||||
'Ladill Frontdesk Pro — '.$branches.' branch(es) monthly',
|
||||
'Welcome to Frontdesk Pro — active for one month.',
|
||||
$branches,
|
||||
);
|
||||
}
|
||||
|
||||
public function subscribeEnterprise(Request $request, PlanService $plans, BillingClient $billing): RedirectResponse
|
||||
{
|
||||
$this->authorizeAbility($request, 'settings.manage');
|
||||
$organization = $this->organization($request);
|
||||
|
||||
if ($plans->hasPaidPlan($organization)) {
|
||||
return redirect()->route('frontdesk.pro.index')
|
||||
->with('success', 'Your organization already has an active paid plan.');
|
||||
}
|
||||
|
||||
if (! $plans->canSubscribeEnterprise($organization)) {
|
||||
$min = (int) config('frontdesk.enterprise.min_branches', 1);
|
||||
|
||||
return redirect()->route('frontdesk.pro.index')
|
||||
->with('error', "Enterprise requires at least {$min} active branch. Add a branch or contact sales.");
|
||||
}
|
||||
|
||||
$validated = $request->validate([
|
||||
'branches' => ['required', 'integer', 'min:1', 'max:999'],
|
||||
]);
|
||||
|
||||
$branches = $plans->resolveCheckoutBranches($organization, (int) $validated['branches']);
|
||||
$amountMinor = $plans->priceForBranches('enterprise', $branches);
|
||||
|
||||
return $this->chargeMonthlyWallet(
|
||||
$organization,
|
||||
$billing,
|
||||
$amountMinor,
|
||||
'enterprise',
|
||||
'frontdesk_enterprise',
|
||||
'frontdesk-enterprise-'.$organization->id.'-'.now()->format('Y-m-d-His'),
|
||||
'Ladill Frontdesk Enterprise — '.$branches.' branch(es) monthly',
|
||||
'Welcome to Frontdesk Enterprise — active for one month.',
|
||||
$branches,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -73,27 +121,41 @@ class ProController extends Controller
|
||||
{
|
||||
$this->authorizeAbility($request, 'settings.manage');
|
||||
$validated = $request->validate([
|
||||
'plan' => ['required', 'in:pro'],
|
||||
'plan' => ['required', 'in:pro,enterprise'],
|
||||
'months' => ['required', 'integer', 'in:6,12,24'],
|
||||
'branches' => ['required', 'integer', 'min:1', 'max:999'],
|
||||
]);
|
||||
|
||||
$organization = $this->organization($request);
|
||||
if ($plans->hasPaidPlan($organization) || $plans->isEnterprise($organization)) {
|
||||
if ($plans->hasPaidPlan($organization)) {
|
||||
return redirect()->route('frontdesk.pro.index')
|
||||
->with('success', 'Your organization already has an active plan.');
|
||||
}
|
||||
|
||||
$plan = $validated['plan'];
|
||||
$months = (int) $validated['months'];
|
||||
$amountMinor = $plans->proPriceMinor() * $months;
|
||||
|
||||
if ($plan === 'enterprise' && ! $plans->canSubscribeEnterprise($organization)) {
|
||||
$min = (int) config('frontdesk.enterprise.min_branches', 1);
|
||||
|
||||
return redirect()->route('frontdesk.pro.index')
|
||||
->with('error', "Enterprise requires at least {$min} active branch.");
|
||||
}
|
||||
|
||||
$branches = $plans->resolveCheckoutBranches($organization, (int) $validated['branches']);
|
||||
$amountMinor = $plans->priceForBranches($plan, $branches) * $months;
|
||||
|
||||
try {
|
||||
$checkout = $billing->initiatePlanCheckout(
|
||||
$organization->owner_ref,
|
||||
'pro',
|
||||
$plan,
|
||||
$months,
|
||||
$amountMinor,
|
||||
route('frontdesk.pro.paystack.callback'),
|
||||
['organization_id' => $organization->id],
|
||||
[
|
||||
'organization_id' => $organization->id,
|
||||
'billed_branches' => $branches,
|
||||
],
|
||||
);
|
||||
} catch (\Throwable) {
|
||||
return redirect()->route('frontdesk.pro.index')
|
||||
@@ -140,11 +202,18 @@ class ProController extends Controller
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$plan = (string) ($result['plan'] ?? 'pro');
|
||||
$months = (int) ($result['months'] ?? 0);
|
||||
$this->activatePrepaidPlan($organization, 'pro', $months);
|
||||
$branches = isset($metadata['billed_branches'])
|
||||
? (int) $metadata['billed_branches']
|
||||
: max(1, $plans->activeBranchCount($organization));
|
||||
|
||||
$this->activatePrepaidPlan($organization, $plan, $months, $branches);
|
||||
|
||||
$label = $plan === 'enterprise' ? 'Frontdesk Enterprise' : 'Frontdesk Pro';
|
||||
|
||||
return redirect()->route('frontdesk.pro.index')
|
||||
->with('success', "Frontdesk Pro is active for {$months} months.");
|
||||
->with('success', "{$label} is active for {$months} months.");
|
||||
}
|
||||
|
||||
private function chargeMonthlyWallet(
|
||||
@@ -156,6 +225,7 @@ class ProController extends Controller
|
||||
string $reference,
|
||||
string $description,
|
||||
string $successMessage,
|
||||
int $billedBranches,
|
||||
): RedirectResponse {
|
||||
try {
|
||||
if (! $billing->canAfford($organization->owner_ref, $priceMinor)) {
|
||||
@@ -184,23 +254,29 @@ class ProController extends Controller
|
||||
$settings['plan'] = $plan;
|
||||
$settings['auto_renew'] = true;
|
||||
$settings['billing_method'] = 'wallet_monthly';
|
||||
$settings['billed_branches'] = $billedBranches;
|
||||
$settings['plan_expires_at'] = now()
|
||||
->addDays((int) config('frontdesk.pro.period_days', 30))
|
||||
->toIso8601String();
|
||||
unset($settings['plan_renewal_error']);
|
||||
unset($settings['plan_renewal_error'], $settings['enterprise_billed_branches']);
|
||||
$organization->update(['settings' => $settings]);
|
||||
|
||||
return redirect()->route('frontdesk.pro.index')->with('success', $successMessage);
|
||||
}
|
||||
|
||||
private function activatePrepaidPlan(Organization $organization, string $plan, int $months): void
|
||||
{
|
||||
private function activatePrepaidPlan(
|
||||
Organization $organization,
|
||||
string $plan,
|
||||
int $months,
|
||||
int $billedBranches,
|
||||
): void {
|
||||
$settings = $organization->settings ?? [];
|
||||
$settings['plan'] = $plan;
|
||||
$settings['auto_renew'] = false;
|
||||
$settings['billing_method'] = 'paystack_prepaid';
|
||||
$settings['billed_branches'] = $billedBranches;
|
||||
$settings['plan_expires_at'] = now()->addMonths($months)->toIso8601String();
|
||||
unset($settings['plan_renewal_error']);
|
||||
unset($settings['plan_renewal_error'], $settings['enterprise_billed_branches']);
|
||||
$organization->update(['settings' => $settings]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Services\Frontdesk;
|
||||
|
||||
use App\Models\Branch;
|
||||
use App\Models\Device;
|
||||
use App\Models\Organization;
|
||||
use Carbon\Carbon;
|
||||
@@ -32,10 +33,9 @@ class PlanService
|
||||
return $this->planKey($organization) === 'enterprise';
|
||||
}
|
||||
|
||||
/** Self-serve paid plans only — enterprise is sales-led. */
|
||||
public function hasPaidPlan(Organization $organization): bool
|
||||
{
|
||||
return $this->planKey($organization) === 'pro';
|
||||
return in_array($this->planKey($organization), ['pro', 'enterprise'], true);
|
||||
}
|
||||
|
||||
/** @return array<string, mixed> */
|
||||
@@ -49,7 +49,7 @@ class PlanService
|
||||
];
|
||||
}
|
||||
|
||||
/** Null means unlimited included host emails (Pro). */
|
||||
/** Null means unlimited included host emails (Pro / Enterprise). */
|
||||
public function freeEmailsPerMonth(Organization $organization): ?int
|
||||
{
|
||||
$value = config('frontdesk.plans.'.$this->planKey($organization).'.free_emails_per_month', 100);
|
||||
@@ -57,6 +57,14 @@ class PlanService
|
||||
return $value === null ? null : (int) $value;
|
||||
}
|
||||
|
||||
public function activeBranchCount(Organization $organization): int
|
||||
{
|
||||
return Branch::query()
|
||||
->where('organization_id', $organization->id)
|
||||
->where('is_active', true)
|
||||
->count();
|
||||
}
|
||||
|
||||
public function canAddBranch(Organization $organization, int $currentCount): bool
|
||||
{
|
||||
$limit = config('frontdesk.plans.'.$this->planKey($organization).'.max_branches');
|
||||
@@ -86,8 +94,59 @@ class PlanService
|
||||
return in_array($feature, $features, true);
|
||||
}
|
||||
|
||||
public function proPricePerBranchMinor(): int
|
||||
{
|
||||
return (int) config(
|
||||
'frontdesk.plans.pro.price_minor_per_branch',
|
||||
config('frontdesk.plans.pro.price_minor', 99000),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Per-branch rate (legacy callers treated this as a flat monthly fee).
|
||||
*
|
||||
* @deprecated Prefer proPricePerBranchMinor() / priceForBranches().
|
||||
*/
|
||||
public function proPriceMinor(): int
|
||||
{
|
||||
return (int) config('frontdesk.plans.pro.price_minor', 7900);
|
||||
return $this->proPricePerBranchMinor();
|
||||
}
|
||||
|
||||
public function enterprisePricePerBranchMinor(): int
|
||||
{
|
||||
return (int) config('frontdesk.plans.enterprise.price_minor_per_branch', 199000);
|
||||
}
|
||||
|
||||
public function proPriceTotalMinor(Organization $organization): int
|
||||
{
|
||||
return $this->priceForBranches('pro', $this->activeBranchCount($organization));
|
||||
}
|
||||
|
||||
public function enterprisePriceMinor(Organization $organization): int
|
||||
{
|
||||
return $this->priceForBranches('enterprise', $this->activeBranchCount($organization));
|
||||
}
|
||||
|
||||
public function priceForBranches(string $plan, int $branches): int
|
||||
{
|
||||
$branches = max(1, $branches);
|
||||
$rate = $plan === 'enterprise'
|
||||
? $this->enterprisePricePerBranchMinor()
|
||||
: $this->proPricePerBranchMinor();
|
||||
|
||||
return $branches * $rate;
|
||||
}
|
||||
|
||||
public function resolveCheckoutBranches(Organization $organization, int $requested): int
|
||||
{
|
||||
$branches = max(1, $requested);
|
||||
$active = max(1, $this->activeBranchCount($organization));
|
||||
|
||||
return max($branches, $active);
|
||||
}
|
||||
|
||||
public function canSubscribeEnterprise(Organization $organization): bool
|
||||
{
|
||||
return $this->activeBranchCount($organization) >= (int) config('frontdesk.enterprise.min_branches', 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ class ProRenewalService
|
||||
public function dueOrganizations(): Collection
|
||||
{
|
||||
return Organization::query()
|
||||
->where('settings->plan', 'pro')
|
||||
->whereIn('settings->plan', ['pro', 'enterprise'])
|
||||
->whereNotNull('settings->plan_expires_at')
|
||||
->get()
|
||||
->filter(fn (Organization $organization) => $this->isDue($organization));
|
||||
@@ -27,7 +27,7 @@ class ProRenewalService
|
||||
public function isDue(Organization $organization): bool
|
||||
{
|
||||
$settings = $organization->settings ?? [];
|
||||
if (($settings['plan'] ?? '') !== 'pro') {
|
||||
if (! in_array($settings['plan'] ?? '', ['pro', 'enterprise'], true)) {
|
||||
return false;
|
||||
}
|
||||
if (array_key_exists('auto_renew', $settings) && $settings['auto_renew'] === false) {
|
||||
@@ -47,24 +47,32 @@ class ProRenewalService
|
||||
}
|
||||
|
||||
$settings = $organization->settings ?? [];
|
||||
$price = $this->plans->proPriceMinor();
|
||||
$reference = 'frontdesk-pro-'.$organization->id.'-'.now()->format('YmdHis');
|
||||
$plan = (string) ($settings['plan'] ?? 'pro');
|
||||
$branches = max(
|
||||
1,
|
||||
(int) ($settings['billed_branches'] ?? 0),
|
||||
$this->plans->activeBranchCount($organization),
|
||||
);
|
||||
$price = $this->plans->priceForBranches($plan, $branches);
|
||||
$reference = 'frontdesk-'.$plan.'-'.$organization->id.'-'.now()->format('YmdHis');
|
||||
$label = $plan === 'enterprise' ? 'Enterprise' : 'Pro';
|
||||
|
||||
try {
|
||||
$charged = $this->billing->debit(
|
||||
$organization->owner_ref,
|
||||
$price,
|
||||
'frontdesk_pro_renewal',
|
||||
'frontdesk_'.$plan.'_renewal',
|
||||
$reference,
|
||||
'Ladill Frontdesk Pro — monthly renewal',
|
||||
'Ladill Frontdesk '.$label.' — '.$branches.' branch(es) monthly renewal',
|
||||
);
|
||||
} catch (\Throwable) {
|
||||
$charged = false;
|
||||
}
|
||||
|
||||
if ($charged) {
|
||||
$settings['plan'] = 'pro';
|
||||
$settings['plan'] = $plan;
|
||||
$settings['auto_renew'] = true;
|
||||
$settings['billed_branches'] = $branches;
|
||||
$settings['plan_expires_at'] = now()
|
||||
->addDays((int) config('frontdesk.pro.period_days', 30))
|
||||
->toIso8601String();
|
||||
@@ -78,7 +86,7 @@ class ProRenewalService
|
||||
$graceEnd = $expires->copy()->addDays((int) config('frontdesk.pro.grace_days', 3));
|
||||
if ($graceEnd->isPast()) {
|
||||
$settings['plan'] = 'free';
|
||||
unset($settings['plan_expires_at']);
|
||||
unset($settings['plan_expires_at'], $settings['billed_branches']);
|
||||
$settings['plan_renewal_error'] = 'Suspended after failed renewal.';
|
||||
} else {
|
||||
$settings['plan_renewal_error'] = 'Renewal failed — top up your wallet.';
|
||||
|
||||
Reference in New Issue
Block a user