Use operator-facing copy and merchant email so Card/MoMo checkout is for staff handing the screen to a customer, not self-serve buyers.
This commit is contained in:
@@ -186,7 +186,7 @@ class RegisterController extends Controller
|
|||||||
return redirect()
|
return redirect()
|
||||||
->route('pos.sales.show', $sale)
|
->route('pos.sales.show', $sale)
|
||||||
->with('checkout_url', $result['checkout_url'])
|
->with('checkout_url', $result['checkout_url'])
|
||||||
->with('success', 'Complete the payment to finish this sale.');
|
->with('success', 'Payment sheet ready — hand the device to the customer for card or MoMo.');
|
||||||
} catch (RuntimeException $e) {
|
} catch (RuntimeException $e) {
|
||||||
return back()->withInput()->with('error', $e->getMessage());
|
return back()->withInput()->with('error', $e->getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ class TicketController extends Controller
|
|||||||
return redirect()
|
return redirect()
|
||||||
->route('pos.tickets.show', $sale)
|
->route('pos.tickets.show', $sale)
|
||||||
->with('checkout_url', $result['checkout_url'])
|
->with('checkout_url', $result['checkout_url'])
|
||||||
->with('success', 'Complete the payment to settle this ticket.');
|
->with('success', 'Payment sheet ready — hand the device to the customer for card or MoMo.');
|
||||||
} catch (RuntimeException $e) {
|
} catch (RuntimeException $e) {
|
||||||
return back()->with('error', $e->getMessage());
|
return back()->with('error', $e->getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -300,15 +300,22 @@ class PosSaleService
|
|||||||
'status' => PosPayment::STATUS_PENDING,
|
'status' => PosPayment::STATUS_PENDING,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Till-operator checkout: gateways require an email; use the merchant
|
||||||
|
// account (not a walk-up customer) so the register can complete Card/MoMo.
|
||||||
|
$operatorEmail = trim((string) ($merchant->email ?? ''));
|
||||||
|
if ($operatorEmail === '' || ! str_contains($operatorEmail, '@')) {
|
||||||
|
$operatorEmail = 'seller+'.($merchant->public_id ?? 'pos').'@checkout.ladill.local';
|
||||||
|
}
|
||||||
|
|
||||||
$reference = 'POSP-'.strtoupper(Str::random(16));
|
$reference = 'POSP-'.strtoupper(Str::random(16));
|
||||||
$checkout = $this->gateway->initializeCheckout(
|
$checkout = $this->gateway->initializeCheckout(
|
||||||
$merchant,
|
$merchant,
|
||||||
$amount,
|
$amount,
|
||||||
(string) ($sale->currency ?? 'GHS'),
|
(string) ($sale->currency ?? 'GHS'),
|
||||||
(string) (trim((string) ($merchant->email ?? '')) !== '' ? $merchant->email : ('seller+'.($merchant->public_id ?? 'pos').'@checkout.ladill.local')),
|
$operatorEmail,
|
||||||
route('pos.payments.callback'),
|
route('pos.payments.callback'),
|
||||||
$reference,
|
$reference,
|
||||||
['title' => 'Ticket '.$sale->reference.' payment', 'pos_sale_id' => $sale->id, 'pos_payment_id' => $payment->id],
|
['title' => 'Ticket '.$sale->reference.' payment', 'pos_sale_id' => $sale->id, 'pos_payment_id' => $payment->id, 'channel' => 'pos_till'],
|
||||||
);
|
);
|
||||||
|
|
||||||
$payment->forceFill([
|
$payment->forceFill([
|
||||||
@@ -502,14 +509,20 @@ class PosSaleService
|
|||||||
$amount = (int) $sale->total_minor;
|
$amount = (int) $sale->total_minor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Till-operator checkout: use merchant email (register staff), not a guest.
|
||||||
|
$operatorEmail = trim((string) ($merchant->email ?? ''));
|
||||||
|
if ($operatorEmail === '' || ! str_contains($operatorEmail, '@')) {
|
||||||
|
$operatorEmail = 'seller+'.($merchant->public_id ?? 'pos').'@checkout.ladill.local';
|
||||||
|
}
|
||||||
|
|
||||||
$checkout = $this->gateway->initializeCheckout(
|
$checkout = $this->gateway->initializeCheckout(
|
||||||
$merchant,
|
$merchant,
|
||||||
$amount,
|
$amount,
|
||||||
(string) ($sale->currency ?? 'GHS'),
|
(string) ($sale->currency ?? 'GHS'),
|
||||||
(string) (trim((string) ($merchant->email ?? '')) !== '' ? $merchant->email : ('seller+'.($merchant->public_id ?? 'pos').'@checkout.ladill.local')),
|
$operatorEmail,
|
||||||
$callbackUrl,
|
$callbackUrl,
|
||||||
$reference,
|
$reference,
|
||||||
['title' => 'POS '.$sale->reference, 'pos_sale_id' => $sale->id, 'pos_reference' => $sale->reference],
|
['title' => 'POS '.$sale->reference, 'pos_sale_id' => $sale->id, 'pos_reference' => $sale->reference, 'channel' => 'pos_till'],
|
||||||
);
|
);
|
||||||
|
|
||||||
$checkoutUrl = $checkout['checkout_url'];
|
$checkoutUrl = $checkout['checkout_url'];
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
{{-- Global host for till-operator Card/MoMo sheets (register + open tickets). --}}
|
||||||
<div x-data
|
<div x-data
|
||||||
x-init="
|
x-init="
|
||||||
const url = @js(session('checkout_url'));
|
const url = @js(session('checkout_url'));
|
||||||
|
|||||||
@@ -1,14 +1,21 @@
|
|||||||
{{--
|
{{--
|
||||||
Payment checkout shell: bottomsheet on mobile, centered modal on desktop.
|
POS checkout shell for till operators: bottomsheet on mobile, modal on desktop.
|
||||||
|
Audience is staff at the register — not the end customer browsing alone.
|
||||||
Requires Alpine ancestor with: showSheet (bool), checkoutUrl (string).
|
Requires Alpine ancestor with: showSheet (bool), checkoutUrl (string).
|
||||||
--}}
|
--}}
|
||||||
|
@php
|
||||||
|
$sheetTitle = $sheetTitle ?? 'Customer payment';
|
||||||
|
$sheetSubtitle = $sheetSubtitle ?? 'Hand this screen to the customer for card or mobile money.';
|
||||||
|
$sheetAria = $sheetAria ?? $sheetTitle;
|
||||||
|
$iframeTitle = $iframeTitle ?? 'Customer card or mobile money checkout';
|
||||||
|
@endphp
|
||||||
<template x-teleport="body">
|
<template x-teleport="body">
|
||||||
<div x-show="showSheet"
|
<div x-show="showSheet"
|
||||||
x-cloak
|
x-cloak
|
||||||
class="fixed inset-0 z-[9999] flex items-end justify-center md:items-center md:p-6"
|
class="fixed inset-0 z-[9999] flex items-end justify-center md:items-center md:p-6"
|
||||||
role="dialog"
|
role="dialog"
|
||||||
aria-modal="true"
|
aria-modal="true"
|
||||||
aria-label="Complete payment">
|
aria-label="{{ $sheetAria }}">
|
||||||
|
|
||||||
<div class="absolute inset-0 bg-black/60"
|
<div class="absolute inset-0 bg-black/60"
|
||||||
x-show="showSheet"
|
x-show="showSheet"
|
||||||
@@ -32,21 +39,31 @@
|
|||||||
x-transition:leave-start="translate-y-0"
|
x-transition:leave-start="translate-y-0"
|
||||||
x-transition:leave-end="translate-y-full"
|
x-transition:leave-end="translate-y-full"
|
||||||
@click.stop>
|
@click.stop>
|
||||||
<div class="relative flex shrink-0 items-center justify-between border-b border-slate-100 px-4 py-3">
|
<div class="relative flex shrink-0 flex-col gap-0.5 border-b border-slate-100 px-4 pb-3 pt-5">
|
||||||
<div class="absolute left-1/2 top-2 h-1 w-10 -translate-x-1/2 rounded-full bg-slate-200"></div>
|
<div class="absolute left-1/2 top-2 h-1 w-10 -translate-x-1/2 rounded-full bg-slate-200"></div>
|
||||||
<p class="text-sm font-semibold text-slate-800">Complete payment</p>
|
<div class="flex items-start justify-between gap-3">
|
||||||
<button type="button" @click="showSheet = false"
|
<div class="min-w-0">
|
||||||
class="rounded-full p-1.5 text-slate-400 transition hover:bg-slate-100 hover:text-slate-700"
|
<p class="text-sm font-semibold text-slate-800">{{ $sheetTitle }}</p>
|
||||||
aria-label="Close">
|
@if ($sheetSubtitle)
|
||||||
<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
|
<p class="mt-0.5 text-xs leading-snug text-slate-500">{{ $sheetSubtitle }}</p>
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
|
@endif
|
||||||
</svg>
|
</div>
|
||||||
</button>
|
<button type="button" @click="showSheet = false"
|
||||||
|
class="shrink-0 rounded-full p-1.5 text-slate-400 transition hover:bg-slate-100 hover:text-slate-700"
|
||||||
|
aria-label="Close payment sheet">
|
||||||
|
<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<iframe :src="showSheet ? checkoutUrl : ''"
|
<iframe :src="showSheet ? checkoutUrl : ''"
|
||||||
class="h-full w-full flex-1 border-0"
|
class="h-full w-full flex-1 border-0"
|
||||||
allow="payment *"
|
allow="payment *"
|
||||||
title="Payment checkout"></iframe>
|
title="{{ $iframeTitle }}"></iframe>
|
||||||
|
<p class="shrink-0 border-t border-slate-100 bg-slate-50 px-4 py-2 text-center text-[11px] text-slate-500">
|
||||||
|
Stay on this screen until the customer finishes. Closing only hides the sheet.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{-- Desktop modal --}}
|
{{-- Desktop modal --}}
|
||||||
@@ -59,11 +76,16 @@
|
|||||||
x-transition:leave-start="opacity-100 scale-100"
|
x-transition:leave-start="opacity-100 scale-100"
|
||||||
x-transition:leave-end="opacity-0 scale-95"
|
x-transition:leave-end="opacity-0 scale-95"
|
||||||
@click.stop>
|
@click.stop>
|
||||||
<div class="flex shrink-0 items-center justify-between border-b border-slate-100 px-5 py-3">
|
<div class="flex shrink-0 items-start justify-between gap-3 border-b border-slate-100 px-5 py-3">
|
||||||
<p class="text-sm font-semibold text-slate-800">Complete payment</p>
|
<div class="min-w-0">
|
||||||
|
<p class="text-sm font-semibold text-slate-800">{{ $sheetTitle }}</p>
|
||||||
|
@if ($sheetSubtitle)
|
||||||
|
<p class="mt-0.5 text-xs leading-snug text-slate-500">{{ $sheetSubtitle }}</p>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
<button type="button" @click="showSheet = false"
|
<button type="button" @click="showSheet = false"
|
||||||
class="rounded-full p-1.5 text-slate-400 transition hover:bg-slate-100 hover:text-slate-700"
|
class="shrink-0 rounded-full p-1.5 text-slate-400 transition hover:bg-slate-100 hover:text-slate-700"
|
||||||
aria-label="Close">
|
aria-label="Close payment sheet">
|
||||||
<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
|
<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
|
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -72,7 +94,10 @@
|
|||||||
<iframe :src="showSheet ? checkoutUrl : ''"
|
<iframe :src="showSheet ? checkoutUrl : ''"
|
||||||
class="min-h-0 w-full flex-1 border-0"
|
class="min-h-0 w-full flex-1 border-0"
|
||||||
allow="payment *"
|
allow="payment *"
|
||||||
title="Payment checkout"></iframe>
|
title="{{ $iframeTitle }}"></iframe>
|
||||||
|
<p class="shrink-0 border-t border-slate-100 bg-slate-50 px-5 py-2 text-center text-[11px] text-slate-500">
|
||||||
|
Stay on this screen until the customer finishes. Closing only hides the sheet.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -3,14 +3,14 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>Payment complete</title>
|
<title>Customer payment</title>
|
||||||
<style>
|
<style>
|
||||||
body { font-family: system-ui, sans-serif; background: #f8fafc; color: #0f172a; display: grid; place-items: center; min-height: 100vh; margin: 0; }
|
body { font-family: system-ui, sans-serif; background: #f8fafc; color: #0f172a; display: grid; place-items: center; min-height: 100vh; margin: 0; }
|
||||||
p { font-size: 0.95rem; color: #475569; }
|
p { font-size: 0.95rem; color: #475569; }
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<p>Finishing payment…</p>
|
<p>Confirming customer payment…</p>
|
||||||
<script>
|
<script>
|
||||||
(function () {
|
(function () {
|
||||||
var url = @json($redirect);
|
var url = @json($redirect);
|
||||||
|
|||||||
Reference in New Issue
Block a user