From 0a3e142f473e71e0b14f4beade93aa807345213b Mon Sep 17 00:00:00 2001
From: isaacclad <sense.corporate@gmail.com>
Date: Fri, 24 Jul 2026 14:15:39 +0000
Subject: [PATCH] Require Ladill Pay only for Merchant checkouts.

Remove custom/owner payment gateway option and always route customer payments through Ladill Pay with platform fees.
---
 .../Billing/PlanEntitlementService.php        |  4 ++-
 resources/views/merchant/settings.blade.php   | 22 ++-------------
 tests/Feature/PaymentGatewayPolicyTest.php    | 28 ++++---------------
 3 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/app/Services/Billing/PlanEntitlementService.php b/app/Services/Billing/PlanEntitlementService.php
index d318d40..a1c4b1a 100644
--- a/app/Services/Billing/PlanEntitlementService.php
+++ b/app/Services/Billing/PlanEntitlementService.php
@@ -22,6 +22,8 @@ class PlanEntitlementService
 
     public function canUseCustomPaymentGateway(User $owner): bool
     {
-        return $this->has($owner, self::CUSTOM_PAYMENT_GATEWAY);
+        // Custom / owner payment gateways are retired. All checkouts use Ladill Pay
+        // with platform fees (see config/pay.php fee_tiers on the platform).
+        return false;
     }
 }
diff --git a/resources/views/merchant/settings.blade.php b/resources/views/merchant/settings.blade.php
index 3d199ab..4d0b0d8 100644
--- a/resources/views/merchant/settings.blade.php
+++ b/resources/views/merchant/settings.blade.php
@@ -59,27 +59,9 @@
             <div class="rounded-2xl border border-slate-200 bg-white p-5 space-y-4">
                 <div>
                     <h2 class="text-sm font-semibold text-slate-900">Customer payment engine</h2>
-                    <p class="mt-1 text-xs text-slate-500">Ladill Pay is recommended, zero-config, and selected by default.</p>
+                    <p class="mt-1 text-xs text-slate-500">All customer checkouts use Ladill Pay — zero-config, no owner API keys.</p>
                 </div>
-                <p class="rounded-lg bg-emerald-50 px-3 py-2 text-sm text-emerald-800">Ladill Pay remains the safe fallback and requires no owner keys.</p>
-                @if ($canUsePaymentGateway ?? false)
-                    <select name="gateway_provider" class="w-full rounded-lg border-slate-200 text-sm">
-                        <option value="">Ladill Pay (recommended)</option>
-                        <option value="paystack" @selected(old('gateway_provider', $gateway?->is_active ? $gateway?->provider : '') === 'paystack')>My Paystack account</option>
-                    </select>
-                    <div class="grid gap-3 sm:grid-cols-2">
-                        <input name="gateway_public_key" placeholder="{{ $gateway?->public_key ? 'Public key saved — leave blank to keep' : 'pk_live_…' }}" class="rounded-lg border-slate-200 text-sm">
-                        <input type="password" name="gateway_secret_key" autocomplete="new-password" placeholder="{{ $gateway?->secret_key ? 'Secret saved — leave blank to keep' : 'sk_live_…' }}" class="rounded-lg border-slate-200 text-sm">
-                    </div>
-                    <label class="flex items-center gap-2 text-sm text-slate-700">
-                        <input type="hidden" name="gateway_is_active" value="0">
-                        <input type="checkbox" name="gateway_is_active" value="1" @checked(old('gateway_is_active', $gateway?->is_active ?? false)) class="rounded border-slate-300 text-indigo-600">
-                        Use my Paystack account
-                    </label>
-                    <p class="text-xs text-slate-500">Optional. Invalid or incomplete keys automatically fall back to Ladill Pay.</p>
-                @else
-                    <p class="rounded-lg bg-indigo-50 px-3 py-2 text-sm text-indigo-800">Free uses Ladill Pay only. Pro and higher plans may optionally connect owner Paystack.</p>
-                @endif
+                <p class="rounded-lg bg-emerald-50 px-3 py-2 text-sm text-emerald-800">Ladill Pay is the only payment option. Standard platform fees apply on paid orders and settle to your Ladill wallet.</p>
             </div>
 
             <button type="submit" class="btn-primary">
diff --git a/tests/Feature/PaymentGatewayPolicyTest.php b/tests/Feature/PaymentGatewayPolicyTest.php
index abb93d6..f0a38b3 100644
--- a/tests/Feature/PaymentGatewayPolicyTest.php
+++ b/tests/Feature/PaymentGatewayPolicyTest.php
@@ -4,6 +4,7 @@ namespace Tests\Feature;
 
 use App\Models\PaymentGatewaySetting;
 use App\Models\User;
+use App\Services\Billing\PlanEntitlementService;
 use App\Services\Payments\MerchantGatewayService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
@@ -13,39 +14,20 @@ class PaymentGatewayPolicyTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function test_free_cannot_activate_saved_owner_gateway_but_pro_can(): void
+    public function test_owner_gateway_is_never_used_even_with_saved_keys(): void
     {
         config(['billing.api_url' => 'https://ladill.com/api/billing', 'billing.api_key' => 'merchant-test']);
         $owner = User::factory()->create(['public_id' => 'usr_merchant_policy']);
-        $setting = PaymentGatewaySetting::create([
+        PaymentGatewaySetting::create([
             'owner_ref' => $owner->public_id, 'provider' => 'paystack',
             'public_key' => 'pk_test_saved', 'secret_key' => 'sk_test_saved', 'is_active' => true,
         ]);
 
-        Http::fakeSequence()
-            ->push(['data' => ['effective_plan' => 'free', 'features' => []]])
-            ->push(['data' => ['effective_plan' => 'pro', 'features' => ['custom_payment_gateway']]])
-            ->push(['data' => ['effective_plan' => 'pro', 'features' => ['custom_payment_gateway']]]);
-        $this->assertFalse(app(MerchantGatewayService::class)->shouldUseOwnerGateway($owner));
-
-        $setting->update(['is_active' => false]);
-        $this->assertFalse(app(MerchantGatewayService::class)->shouldUseOwnerGateway($owner));
-        $setting->update(['is_active' => true]);
-        $this->assertTrue(app(MerchantGatewayService::class)->shouldUseOwnerGateway($owner));
-    }
-
-    public function test_invalid_pro_credentials_fall_back_to_ladill_pay(): void
-    {
-        config(['billing.api_url' => 'https://ladill.com/api/billing', 'billing.api_key' => 'merchant-test']);
         Http::fake(['*/suite-entitlements*' => Http::response(['data' => [
-            'effective_plan' => 'business', 'features' => ['custom_payment_gateway'],
+            'effective_plan' => 'enterprise', 'features' => ['custom_payment_gateway'],
         ]])]);
-        $owner = User::factory()->create(['public_id' => 'usr_merchant_invalid']);
-        PaymentGatewaySetting::create([
-            'owner_ref' => $owner->public_id, 'provider' => 'paystack',
-            'public_key' => 'invalid', 'secret_key' => 'invalid', 'is_active' => true,
-        ]);
 
+        $this->assertFalse(app(PlanEntitlementService::class)->canUseCustomPaymentGateway($owner));
         $this->assertFalse(app(MerchantGatewayService::class)->shouldUseOwnerGateway($owner));
     }
 }