- Implemented the full order lifecycle, secure customer tracker, automatic acceptance emails, configurable status templates, and guest/account CRM management.

Key areas: [OrderStatusService.php](/Users/tyemeclifford/Documents/GH/fatbottomgrille/app/Services/OrderStatusService.php), [AdminController.php](/Users/tyemeclifford/Documents/GH/fatbottomgrille/app/Controllers/AdminController.php), and [Database.php](/Users/tyemeclifford/Documents/GH/fatbottomgrille/app/Core/Database.php). SQLite migration applied successfully. PHP/JS syntax, integration workflows, rendered pages, database integrity, and tracker authorization all passed. Invalid tracker tokens correctly return 403.
2026-06-14 13:35:31 -04:00
parent 3417589a7c
commit 03348cad79
24 changed files with 1218 additions and 72 deletions
@@ -16,6 +16,7 @@ use FatBottom\Services\MenuPdfExporter;
 use FatBottom\Services\MySqlMigrator;
 use FatBottom\Services\PaymentGateway;
 use FatBottom\Services\StatsService;
+use FatBottom\Services\OrderStatusService;

 final class AdminController extends BaseController
 {
@@ -26,7 +27,8 @@ final class AdminController extends BaseController
        private readonly Database $db,
        private readonly StatsService $stats,
        private readonly PaymentGateway $payments,
-        private readonly Mailer $mailer
+        private readonly Mailer $mailer,
+        private readonly OrderStatusService $orderStatuses
    ) {
        parent::__construct($config, $auth, $cart);
    }
@@ -132,6 +134,9 @@ final class AdminController extends BaseController
                 WHERE r.order_id = ? ORDER BY r.created_at DESC',
                [$orderId]
            ),
+            'customer' => !empty($order['customer_id'])
+                ? $this->db->fetch('SELECT * FROM customers WHERE id = ?', [(int) $order['customer_id']])
+                : null,
        ]));
    }

@@ -141,24 +146,124 @@ final class AdminController extends BaseController
        $staff = $this->auth->requireStaff();
        $orderId = (int) ($_POST['order_id'] ?? 0);
        $status = Security::clean((string) ($_POST['status'] ?? ''));
-        $allowed = ['paid', 'preparing', 'ready', 'completed', 'cancelled'];
-        if (!in_array($status, $allowed, true)) {
-            Http::flash('error', 'Choose a valid order status.');
-            Http::redirect('/admin/orders');
+        $note = Security::clean((string) ($_POST['status_note'] ?? ''));
+        try {
+            $result = $this->orderStatuses->update(
+                $orderId,
+                $status,
+                $note,
+                isset($_POST['customer_visible']),
+                isset($_POST['send_email']),
+                (int) $staff['id']
+            );
+            if ($result['email_error'] !== null) {
+                Http::flash('warning', 'Status updated, but the email could not be sent: ' . $result['email_error']);
+            } else {
+                Http::flash(
+                    'success',
+                    'Order status updated' . ($result['email_requested'] ? ' and the customer was emailed.' : '.')
+                );
+            }
+        } catch (\Throwable $error) {
+            Http::flash('error', $error->getMessage());
        }
-        $notes = Security::clean((string) ($_POST['staff_note'] ?? ''));
-        $this->db->execute(
-            'UPDATE orders SET status = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?',
-            [$status, $orderId]
-        );
-        $this->db->execute(
-            'INSERT INTO order_events (order_id, user_id, event_type, details) VALUES (?, ?, ?, ?)',
-            [$orderId, (int) $staff['id'], 'status_changed', 'Status changed to ' . $status . ($notes ? '. ' . $notes : '.')]
-        );
-        Http::flash('success', 'Order status updated.');
        Http::redirect('/admin/order?id=' . $orderId);
    }

+    public function customers(): void
+    {
+        $this->auth->requireStaff();
+        $query = Security::clean((string) ($_GET['q'] ?? ''));
+        $active = Security::clean((string) ($_GET['active'] ?? ''));
+        $where = ['1 = 1'];
+        $parameters = [];
+        if ($query !== '') {
+            $where[] = '(c.full_name LIKE ? OR c.email LIKE ? OR c.phone LIKE ?)';
+            $parameters = ['%' . $query . '%', '%' . $query . '%', '%' . $query . '%'];
+        }
+        if ($active === '1' || $active === '0') {
+            $where[] = 'c.active = ?';
+            $parameters[] = (int) $active;
+        }
+        View::render('admin/customers', $this->shared([
+            'title' => 'Customers',
+            'adminPage' => 'customers',
+            'customers' => $this->db->fetchAll(
+                'SELECT c.*, u.email AS account_email
+                 FROM customers c LEFT JOIN users u ON u.id = c.user_id
+                 WHERE ' . implode(' AND ', $where) . '
+                 ORDER BY c.last_order_at DESC, c.full_name',
+                $parameters
+            ),
+            'query' => $query,
+            'activeFilter' => $active,
+        ]));
+    }
+
+    public function customerDetail(): void
+    {
+        $this->auth->requireStaff();
+        $customerId = (int) ($_GET['id'] ?? 0);
+        $customer = $this->db->fetch(
+            'SELECT c.*, u.email AS account_email, u.active AS account_active
+             FROM customers c LEFT JOIN users u ON u.id = c.user_id
+             WHERE c.id = ?',
+            [$customerId]
+        );
+        if ($customer === null) {
+            Http::abort(404, 'Customer not found.');
+        }
+        View::render('admin/customer-detail', $this->shared([
+            'title' => $customer['full_name'],
+            'adminPage' => 'customers',
+            'customer' => $customer,
+            'orders' => $this->db->fetchAll(
+                'SELECT * FROM orders WHERE customer_id = ? ORDER BY placed_at DESC',
+                [$customerId]
+            ),
+        ]));
+    }
+
+    public function saveCustomer(): void
+    {
+        Security::verifyCsrf();
+        $this->auth->requireStaff();
+        $customerId = (int) ($_POST['customer_id'] ?? 0);
+        $customer = $this->db->fetch('SELECT * FROM customers WHERE id = ?', [$customerId]);
+        if ($customer === null) {
+            Http::abort(404, 'Customer not found.');
+        }
+        $name = Security::clean((string) ($_POST['full_name'] ?? ''));
+        if ($name === '') {
+            Http::flash('error', 'Customer name is required.');
+            Http::redirect('/admin/customer?id=' . $customerId);
+        }
+        $this->db->execute(
+            'UPDATE customers SET full_name = ?, phone = ?, active = ?, internal_notes = ?,
+                updated_at = CURRENT_TIMESTAMP WHERE id = ?',
+            [
+                $name,
+                Security::clean((string) ($_POST['phone'] ?? '')),
+                isset($_POST['active']) ? 1 : 0,
+                Security::clean((string) ($_POST['internal_notes'] ?? '')),
+                $customerId,
+            ]
+        );
+        Http::flash('success', 'Customer record saved.');
+        Http::redirect('/admin/customer?id=' . $customerId);
+    }
+
+    public function deleteCustomer(): void
+    {
+        Security::verifyCsrf();
+        $this->auth->requireStaff();
+        $customerId = (int) ($_POST['customer_id'] ?? 0);
+        $this->db->execute('UPDATE orders SET customer_id = NULL WHERE customer_id = ?', [$customerId]);
+        $this->db->execute('DELETE FROM customers WHERE id = ?', [$customerId]);
+        Http::flash('success', 'Customer record deleted. Historical orders were kept.');
+        Http::redirect('/admin/customers');
+    }
+
    public function refundOrder(): void
    {
        Security::verifyCsrf();
@@ -478,6 +583,22 @@ final class AdminController extends BaseController
                $this->config->set($key, trim((string) $_POST[$group][$field]));
            }
        }
+        $emailTemplates = isset($_POST['order_emails']) && is_array($_POST['order_emails'])
+            ? $_POST['order_emails']
+            : [];
+        foreach (OrderStatusService::STATUSES as $status) {
+            if (!isset($emailTemplates[$status]) || !is_array($emailTemplates[$status])) {
+                continue;
+            }
+            $this->config->set(
+                'order_emails.' . $status . '.subject',
+                trim((string) ($emailTemplates[$status]['subject'] ?? ''))
+            );
+            $this->config->set(
+                'order_emails.' . $status . '.body',
+                trim((string) ($emailTemplates[$status]['body'] ?? ''))
+            );
+        }
        foreach (['square.access_token', 'mailgun.api_key', 'database.mysql_password'] as $secretKey) {
            [$group, $field] = explode('.', $secretKey, 2);
            $secret = isset($_POST[$group]) && is_array($_POST[$group])
@@ -154,6 +154,14 @@ final class AuthController extends BaseController
            Http::flash('error', 'Your account could not be loaded after registration.');
            Http::redirect('/login');
        }
+        $this->db->execute(
+            'UPDATE customers SET user_id = ?, updated_at = CURRENT_TIMESTAMP WHERE email = ?',
+            [(int) $user['id'], $clean['email']]
+        );
+        $this->db->execute(
+            'UPDATE orders SET user_id = ? WHERE user_id IS NULL AND customer_email = ?',
+            [(int) $user['id'], $clean['email']]
+        );
        $this->auth->login($user);
        Http::flash('success', 'Welcome, ' . $user['full_name'] . '. Your account is ready.');
        Http::redirect('/account');
@@ -11,8 +11,8 @@ use FatBottom\Core\Http;
 use FatBottom\Core\Security;
 use FatBottom\Core\View;
 use FatBottom\Services\CartService;
-use FatBottom\Services\Mailer;
 use FatBottom\Services\OrderService;
+use FatBottom\Services\OrderStatusService;

 final class StoreController extends BaseController
 {
@@ -22,7 +22,7 @@ final class StoreController extends BaseController
        CartService $cart,
        private readonly Database $db,
        private readonly OrderService $orders,
-        private readonly Mailer $mailer
+        private readonly OrderStatusService $orderStatuses
    ) {
        parent::__construct($config, $auth, $cart);
    }
@@ -169,13 +169,11 @@ final class StoreController extends BaseController
                $user ? (int) $user['id'] : null,
                (string) ($_POST['square_token'] ?? '')
            );
-            $this->mailer->send(
-                $input['customer_email'],
-                'We received order ' . $order['order_number'],
-                '<p>Thanks, ' . htmlspecialchars($input['customer_name'], ENT_QUOTES, 'UTF-8') . '.</p>'
-                . '<p>Your order <strong>' . htmlspecialchars((string) $order['order_number'], ENT_QUOTES, 'UTF-8')
-                . '</strong> has been paid and sent to the kitchen.</p>'
-            );
+            try {
+                $this->orderStatuses->sendStatusEmail($order, 'pending');
+            } catch (\Throwable) {
+                Http::flash('warning', 'Your order was placed, but the confirmation email could not be sent.');
+            }
            setcookie('fatbottom_cart', '', ['expires' => time() - 3600, 'path' => '/']);
            $_SESSION['last_order_id'] = (int) $order['id'];
            Http::redirect('/order/complete');
@@ -198,6 +196,44 @@ final class StoreController extends BaseController
            'title' => 'Order Received',
            'order' => $order,
            'items' => $items,
+            'trackingUrl' => $this->orderStatuses->trackingUrl($order),
+        ]));
+    }
+
+    public function orderTracker(): void
+    {
+        $orderNumber = Security::clean((string) ($_GET['order'] ?? ''));
+        $token = (string) ($_GET['token'] ?? '');
+        $order = $this->db->fetch('SELECT * FROM orders WHERE order_number = ?', [$orderNumber]);
+        if ($order === null) {
+            Http::abort(404, 'Order not found.');
+        }
+
+        $user = $this->auth->user();
+        $ownsOrder = $user !== null && (
+            (int) ($order['user_id'] ?? 0) === (int) $user['id']
+            || strtolower((string) $order['customer_email']) === strtolower((string) $user['email'])
+        );
+        $validToken = $token !== ''
+            && (string) $order['tracking_token'] !== ''
+            && hash_equals((string) $order['tracking_token'], $token);
+        if (!$ownsOrder && !$validToken) {
+            Http::abort(403, 'This tracking link is invalid.');
+        }
+
+        View::render('store/order-tracker', $this->shared([
+            'title' => 'Track ' . $order['order_number'],
+            'order' => $order,
+            'events' => $this->db->fetchAll(
+                "SELECT * FROM order_events
+                 WHERE order_id = ? AND (status <> '' OR customer_visible = 1)
+                 ORDER BY created_at, id",
+                [(int) $order['id']]
+            ),
+            'items' => $this->db->fetchAll(
+                'SELECT * FROM order_items WHERE order_id = ? ORDER BY id',
+                [(int) $order['id']]
+            ),
        ]));
    }

@@ -228,4 +264,3 @@ final class StoreController extends BaseController
        ));
    }
 }
-