@teincfood/core 0.10.10 → 0.10.12

package/dist/domain/orders/service.js

@@ -198,9 +198,26 @@ export async function transitionLocalOrder(businessId, orderId, action) {
         throw new TransitionError(TRANSITION_ERROR_CODES.INVALID_TRANSITION, `Cannot ${action} from ${order.status}`);
     }
     const map = { accept: "accepted", reject: "cancelled", start_preparing: "preparing", mark_ready: "ready", complete_pickup: "delivered", cancel: "cancelled", assign_rider: "assigned", confirm_handover: "delivered", confirm_cash: order.status, pay: order.status };
-    const toStatus = map[action] ?? order.status;
+    let toStatus = map[action] ?? order.status;
     if (action === "confirm_cash" || action === "pay") {
+        // A paid :awaiting_payment order must leave the payment queue locally too,
+        // using the same promotion the backend applies: buyer order → pending,
+        // POS staged → accepted, POS direct → delivered. Previously this local
+        // write only set payment fields, so the row stayed "awaiting payment"
+        // until a later pull even after the cash/payment was recorded.
+        if (order.status === "awaiting_payment") {
+            if (!order.is_pos) {
+                toStatus = "pending";
+            }
+            else {
+                const flowMode = await getBusinessOrderFlowMode(businessId, db);
+                toStatus = flowMode === "direct" ? "delivered" : "accepted";
+            }
+        }
         await updateOrderPayment(db, businessId, orderId, { is_paid: true, paid_at: new Date().toISOString() });
+        if (toStatus !== order.status) {
+            await updateOrderStatus(db, businessId, orderId, toStatus);
+        }
     }
     else if (toStatus !== order.status) {
         await updateOrderStatus(db, businessId, orderId, toStatus);

package/dist/sync/rate-limit.js

@@ -18,13 +18,21 @@ let rateLimitHitsInWindow = 0;
 /** Record a 429: pause all sync until retryAfterMs (default 60s). */
 export function noteRateLimited(retryAfterMs) {
     const delay = retryAfterMs && retryAfterMs > 0 ? retryAfterMs : DEFAULT_RETRY_AFTER_MS;
-    const until = Date.now() + delay;
+    const now = Date.now();
+    const until = now + delay;
     if (until > rateLimitedUntil)
         rateLimitedUntil = until;
-    if (until > reportedWindowUntil) {
+    // A new reporting window starts only after the previous one has expired.
+    // Extending an active window (another 429, a longer Retry-After, or a
+    // synthesized gate rejection) must not reset the counter, otherwise every
+    // request reports another toast.
+    if (now >= reportedWindowUntil) {
         reportedWindowUntil = until;
         rateLimitHitsInWindow = 0;
     }
+    else if (until > reportedWindowUntil) {
+        reportedWindowUntil = until;
+    }
     rateLimitHitsInWindow += 1;
 }
 /** Milliseconds remaining in the current cooldown (0 when not throttled). */

package/dist/sync/sync-jobs.service.js

@@ -536,6 +536,23 @@ export async function drainOne(businessId, entityId) {
         // exact (no message matching).
         const isBusinessClosed = rest.code === "BUSINESS_CLOSED" || rest.code === "HOURS_NOT_SYNCED";
         const is4xx = !!rest.status && rest.status >= 400 && rest.status < 500;
+        // ALREADY_PAID is a settled payment, not a failed transition. The backend
+        // may have stamped paid_at before the status promotion (legacy cash flow)
+        // or another terminal may have collected the money. Pull the server row,
+        // apply it over the local intent, and complete the job so the terminal
+        // stops showing a Pay action and retrying forever.
+        if (rest.status === 409 && rest.code === "ALREADY_PAID" && isOrderTransition(row.command_type)) {
+            try {
+                await pullRemoteOrders(businessId);
+                await db.runAsync(`UPDATE sync_jobs SET status='completed', updated_at=? WHERE id=?;`, new Date().toISOString(), row.id);
+                syncLogger.info("SyncJobs", "ALREADY_PAID — reconciled server order and completed job", { businessId, entityId, command_type: row.command_type });
+                clearRetry(businessId);
+                return;
+            }
+            catch (error) {
+                syncLogger.warn("SyncJobs", "ALREADY_PAID reconciliation failed", { businessId, entityId, error: String(error) });
+            }
+        }
         // Already-applied absorb for transitions: the server already moved the
         // order (duplicate tap, earlier drain won the race) — complete the job
         // instead of failing it. Server truth only (hlc-guarded pull), never the

package/dist/sync/transition-endpoints.js

@@ -18,6 +18,10 @@ const ORDER_ENDPOINTS = {
     "order:cancel": "cancel",
     "order:confirm_cash": "confirm-cash-payment",
     "order:pay": "confirm-cash-payment",
+    // Repository/queue alias. The domain transition queues `order:confirm_cash`,
+    // but an offline repository command is enqueued as `payment:confirm_cash`;
+    // both must resolve to the same backend route.
+    "payment:confirm_cash": "confirm-cash-payment",
 };
 /** Command types fulfilled by the delivery endpoints (strictly online). */
 export const DELIVERY_COMMANDS = new Set([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teincfood/core",
-  "version": "0.10.10",
+  "version": "0.10.12",
   "description": "TeincFood shared offline-first core — types, sync engine, local DB, reference data, and repositories for mobile + desktop",
   "type": "module",
   "main": "dist/index.js",