mirror of
https://github.com/myronblair/tomsjavajive
synced 2026-07-27 16:52:36 -05:00
Myron Blair
11edf3394f
Consolidates payment processing onto the same Square account already used by tomtomgames.com and parkerslingshotrentals.com. Collapses the two prior parallel Stripe flows (hosted Checkout + embedded Elements) into a single Square Web Payments SDK flow, since Payments API is synchronous and removes the original reason for two paths. - includes/square.php: squareApi() cURL helper (mirrors the pattern already used on parkerslingshotrentals.com), markSquarePaymentResult() as the single source of truth for order completion shared by the sync response, webhook, and reconciliation poll - fixes a pre-existing bug where loyalty points were only ever awarded from the polling endpoint, never from the webhook. - api/create-square-payment.php replaces api/create-payment-intent.php; api/create-checkout-session.php deleted (no Square equivalent - single flow). - api/webhook.php rewritten for Squares signature scheme and event types. - api/payment-status.php repurposed to reconciliation-only fallback. - payment.php branches on PAYMENT_PROCESSOR so Stripe and Square code coexist deployed while dormant - flipping one config constant is the cutover/rollback. - admin/payments.php: added a Square settings card alongside the existing (now legacy-labeled) Stripe card. - db/schema.sql + live DB: added square_payment_id/square_order_id columns, stripe_* columns kept for historical orders. Not yet cut over - PAYMENT_PROCESSOR still defaults to stripe in config-secrets.php (outside this repo). Sandbox testing still needed before flipping to square/production.
94 lines
2.9 KiB
PHP
94 lines
2.9 KiB
PHP
<?php
|
|
/**
|
|
* Tom's Java Jive - Check Payment Status API
|
|
* Reconciliation-only fallback: Square payments complete synchronously in
|
|
* create-square-payment.php, so this endpoint only matters if the browser
|
|
* lost that response after Square had already accepted the charge. It shares
|
|
* markSquarePaymentResult() with the webhook and the synchronous path so
|
|
* loyalty points/emails are never duplicated no matter which path resolves first.
|
|
*/
|
|
|
|
require_once __DIR__ . '/../includes/functions.php';
|
|
require_once __DIR__ . '/../includes/square.php';
|
|
require_once __DIR__ . '/../includes/loyalty.php';
|
|
require_once __DIR__ . '/../includes/email.php';
|
|
|
|
header('Content-Type: application/json');
|
|
|
|
if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
|
|
jsonResponse(['error' => 'Method not allowed'], 405);
|
|
}
|
|
|
|
$orderId = $_GET['order_id'] ?? '';
|
|
|
|
if (empty($orderId)) {
|
|
jsonResponse(['error' => 'Order ID required'], 400);
|
|
}
|
|
|
|
$order = db()->fetch(
|
|
"SELECT * FROM orders WHERE order_id = :id",
|
|
['id' => $orderId]
|
|
);
|
|
|
|
if (!$order) {
|
|
jsonResponse(['error' => 'Order not found'], 404);
|
|
}
|
|
|
|
if ($order['payment_status'] === 'paid') {
|
|
jsonResponse([
|
|
'status' => 'complete',
|
|
'payment_status' => 'paid',
|
|
'order_id' => $order['order_id'],
|
|
'order_number' => $order['order_number'],
|
|
'redirect' => '/order-confirmation.php?order=' . $order['order_id']
|
|
]);
|
|
}
|
|
|
|
if (!isSquareConfigured()) {
|
|
jsonResponse([
|
|
'status' => 'demo_mode',
|
|
'payment_status' => $order['payment_status'],
|
|
'message' => 'Square not configured - running in demo mode'
|
|
]);
|
|
}
|
|
|
|
if (empty($order['square_payment_id'])) {
|
|
jsonResponse([
|
|
'status' => 'pending',
|
|
'payment_status' => $order['payment_status']
|
|
]);
|
|
}
|
|
|
|
try {
|
|
$result = squareGetPayment($order['square_payment_id']);
|
|
$payment = $result['payment'] ?? [];
|
|
$status = $payment['status'] ?? '';
|
|
|
|
markSquarePaymentResult($order['square_payment_id'], $order['order_id'], $status);
|
|
|
|
$updated = db()->fetch("SELECT * FROM orders WHERE order_id = :id", ['id' => $order['order_id']]);
|
|
|
|
if ($updated['payment_status'] === 'paid') {
|
|
jsonResponse([
|
|
'status' => 'complete',
|
|
'payment_status' => 'paid',
|
|
'order_id' => $updated['order_id'],
|
|
'order_number' => $updated['order_number'],
|
|
'redirect' => '/order-confirmation.php?order=' . $updated['order_id']
|
|
]);
|
|
}
|
|
|
|
jsonResponse([
|
|
'status' => $status,
|
|
'payment_status' => $updated['payment_status']
|
|
]);
|
|
|
|
} catch (Exception $e) {
|
|
error_log('Square payment status check error: ' . $e->getMessage());
|
|
jsonResponse([
|
|
'status' => 'error',
|
|
'payment_status' => $order['payment_status'],
|
|
'error' => 'Failed to check payment status'
|
|
]);
|
|
}
|