toyiyo · jdelgado2002 · Feb 11, 2026 · Feb 10, 2026 · Feb 10, 2026 · Feb 10, 2026
diff --git a/src/hooks/useAutoSaveTipSettings.ts b/src/hooks/useAutoSaveTipSettings.ts
@@ -30,15 +30,20 @@ export function useAutoSaveTipSettings({
   onSave,
 }: Params) {
   useEffect(() => {
-    if (!settings) return;
-
-    const hasChanges =
-      tipSource !== settings.tip_source ||
-      shareMethod !== settings.share_method ||
-      splitCadence !== settings.split_cadence ||
-      JSON.stringify(roleWeights) !== JSON.stringify(settings.role_weights) ||
-      JSON.stringify(Array.from(selectedEmployees).sort((a, b) => a.localeCompare(b))) !==
-        JSON.stringify((settings.enabled_employee_ids || []).sort((a, b) => a.localeCompare(b)));
+    // If no settings exist, this is first-time setup - save after user makes selections
+    const hasChanges = settings
+      ? // Compare with existing settings
+        tipSource !== settings.tip_source ||
+        shareMethod !== settings.share_method ||
+        splitCadence !== settings.split_cadence ||
+        JSON.stringify(roleWeights) !== JSON.stringify(settings.role_weights) ||
+        JSON.stringify(Array.from(selectedEmployees).sort((a, b) => a.localeCompare(b))) !==
+          JSON.stringify((settings.enabled_employee_ids || []).sort((a, b) => a.localeCompare(b)))
+      : // No settings exist - trigger save if any field differs from defaults
+        selectedEmployees.size > 0 ||
+        tipSource !== 'manual' ||
+        shareMethod !== 'hours' ||
+        splitCadence !== 'daily';
 
     if (!hasChanges) return;
 

diff --git a/supabase/functions/_shared/toastOrderProcessor.ts b/supabase/functions/_shared/toastOrderProcessor.ts
@@ -23,7 +23,21 @@ interface OrderDateTime {
   orderTime: string | null;
 }
 
+/** Convert Toast YYYYMMDD integer (e.g. 20260210) to ISO date string (2026-02-10) */
+function parseBusinessDate(bizDate: number | undefined): string | null {
+  if (!bizDate) return null;
+  const s = String(bizDate);
+  if (s.length !== 8) return null;
+  return `${s.slice(0, 4)}-${s.slice(4, 6)}-${s.slice(6, 8)}`;
+}
+
 function parseOrderDateTime(order: any): OrderDateTime {
+  // Prefer businessDate (restaurant's business day, YYYYMMDD integer) over UTC closedDate
+  const bizDate = parseBusinessDate(order.businessDate);
+  if (bizDate) {
+    return { orderDate: bizDate, orderTime: null };
+  }
+
   let closedDate = order.closedDate ? new Date(order.closedDate) : null;
 
   if (!closedDate && order.checks?.[0]?.closedDate) {
@@ -164,14 +178,18 @@ async function upsertPayment(
   restaurantId: string,
   orderDate: string
 ): Promise<void> {
+  // Use paidBusinessDate (restaurant's business day) when available,
+  // falling back to orderDate (UTC-derived) for older data
+  const paymentDate = parseBusinessDate(payment.paidBusinessDate) || orderDate;
+
   const { error: paymentError } = await supabase.from('toast_payments').upsert({
     restaurant_id: restaurantId,
     toast_payment_guid: payment.guid,
     toast_order_guid: orderGuid,
     payment_type: payment.type || null,
     amount: payment.amount ?? 0,
     tip_amount: payment.tipAmount ?? null,
-    payment_date: orderDate,
+    payment_date: paymentDate,
     payment_status: payment.paymentStatus || payment.status || null,
     raw_json: payment,
     synced_at: new Date().toISOString(),

diff --git a/supabase/migrations/20260210234900_fix_get_pos_tips_by_date.sql b/supabase/migrations/20260210234900_fix_get_pos_tips_by_date.sql
@@ -0,0 +1,98 @@
+-- Fix get_pos_tips_by_date to include uncategorized tips from unified_sales
+-- 
+-- ISSUE: The function only looked at unified_sales_splits (already categorized items),
+-- but POS systems like Toast sync tips directly to unified_sales with item_type='tip'
+-- BEFORE they are categorized. This caused "No POS tips found" message even when tips existed.
+--
+-- SOLUTION: Query both:
+-- 1. Categorized tips (unified_sales_splits with "tip" in account name/subtype)
+-- 2. Uncategorized tips (unified_sales where item_type='tip' OR adjustment_type='tip')
+
+CREATE OR REPLACE FUNCTION get_pos_tips_by_date(
+  p_restaurant_id UUID,
+  p_start_date DATE,
+  p_end_date DATE
+)
+RETURNS TABLE (
+  tip_date DATE,
+  total_amount_cents INTEGER,
+  transaction_count INTEGER,
+  pos_source TEXT
+)
+LANGUAGE plpgsql
+SECURITY INVOKER
+AS $$
+BEGIN
+  -- Authorization check
+  IF NOT EXISTS (
+    SELECT 1 FROM user_restaurants
+    WHERE restaurant_id = p_restaurant_id
+    AND user_id = auth.uid()
+  ) THEN
+    RAISE EXCEPTION 'Access denied: User does not have access to restaurant %', p_restaurant_id;
+  END IF;
+
+  RETURN QUERY
+  WITH categorized_tips AS (
+    SELECT
+      us.sale_date AS t_date,
+      SUM(uss.amount * 100)::INTEGER AS t_cents,
+      COUNT(DISTINCT us.external_order_id)::INTEGER AS t_count,
+      us.pos_system AS t_source
+    FROM unified_sales us
+    INNER JOIN unified_sales_splits uss ON us.id = uss.sale_id
+    INNER JOIN chart_of_accounts coa ON uss.category_id = coa.id
+    WHERE us.restaurant_id = p_restaurant_id
+      AND us.sale_date >= p_start_date
+      AND us.sale_date <= p_end_date
+      AND (
+        LOWER(COALESCE(coa.account_name, '')) LIKE '%tip%'
+        OR LOWER(COALESCE(coa.account_subtype::TEXT, '')) LIKE '%tip%'
+      )
+    GROUP BY us.sale_date, us.pos_system
+  ),
+  uncategorized_tips AS (
+    -- item_type='tip' or adjustment_type='tip' without a tip-account split
+    SELECT
+      us.sale_date AS t_date,
+      SUM(COALESCE(us.total_price, us.unit_price * us.quantity, 0) * 100)::INTEGER AS t_cents,
+      COUNT(DISTINCT us.external_order_id)::INTEGER AS t_count,
+      us.pos_system AS t_source
+    FROM unified_sales us
+    WHERE us.restaurant_id = p_restaurant_id
+      AND us.sale_date >= p_start_date
+      AND us.sale_date <= p_end_date
+      AND (us.item_type = 'tip' OR us.adjustment_type = 'tip')
+      AND NOT EXISTS (
+        SELECT 1 FROM unified_sales_splits uss
+        INNER JOIN chart_of_accounts coa ON uss.category_id = coa.id
+        WHERE uss.sale_id = us.id
+        AND (
+          LOWER(COALESCE(coa.account_name, '')) LIKE '%tip%'
+          OR LOWER(COALESCE(coa.account_subtype::TEXT, '')) LIKE '%tip%'
+        )
+      )
-      AND NOT EXISTS (
-        SELECT 1 FROM unified_sales_splits uss
-        WHERE uss.sale_id = us.id
-      )
+      AND NOT EXISTS (
+        SELECT 1 FROM unified_sales_splits uss
+        INNER JOIN chart_of_accounts coa ON uss.category_id = coa.id
+        WHERE uss.sale_id = us.id
+        AND (
+          LOWER(COALESCE(coa.account_name, '')) LIKE '%tip%'
+          OR LOWER(COALESCE(coa.account_subtype::TEXT, '')) LIKE '%tip%'
+        )
+      )
-      AND NOT EXISTS (
-        SELECT 1 FROM unified_sales_splits uss
-        WHERE uss.sale_id = us.id
-      )
+      AND NOT EXISTS (
+        SELECT 1 FROM unified_sales_splits uss
+        INNER JOIN chart_of_accounts coa ON uss.category_id = coa.id
+        WHERE uss.sale_id = us.id
+        AND (
+          LOWER(COALESCE(coa.account_name, '')) LIKE '%tip%'
+          OR LOWER(COALESCE(coa.account_subtype::TEXT, '')) LIKE '%tip%'
+        )
+      )
+    GROUP BY us.sale_date, us.pos_system
+  ),
+  combined_tips AS (
+    SELECT t_date, t_cents, t_count, t_source FROM categorized_tips
+    UNION ALL
+    SELECT t_date, t_cents, t_count, t_source FROM uncategorized_tips
+  )
+  SELECT
+    ct.t_date,
+    SUM(ct.t_cents)::INTEGER,
+    SUM(ct.t_count)::INTEGER,
+    ct.t_source
+  FROM combined_tips ct
+  GROUP BY ct.t_date, ct.t_source
+  ORDER BY ct.t_date DESC;
+END;
+$$;
+
+COMMENT ON FUNCTION get_pos_tips_by_date IS
+'Aggregates POS tips from both categorized (unified_sales_splits) and uncategorized (unified_sales) sources.
+Used by tip pooling system to display POS-imported tips.
+Returns daily totals for:
+1. Categorized tips (splits with account name/subtype containing ''tip'')
+2. Uncategorized tips (item_type=''tip'' or adjustment_type=''tip'')';
diff --git a/supabase/migrations/20260211200000_fix_toast_payment_dates_timezone.sql b/supabase/migrations/20260211200000_fix_toast_payment_dates_timezone.sql
@@ -0,0 +1,59 @@
+-- Fix Toast payment dates: use paidBusinessDate (restaurant business day) instead of UTC date
+--
+-- Toast provides paidBusinessDate as a YYYYMMDD integer representing the restaurant's
+-- actual business day. The sync was using the UTC date from paidDate/closedDate, causing
+-- late-night payments to appear on the next calendar day.
+
+-- Step 1: Fix toast_payments.payment_date from raw_json->>'paidBusinessDate'
+UPDATE toast_payments
+SET payment_date = CONCAT(
+  SUBSTRING(CAST((raw_json->>'paidBusinessDate')::BIGINT AS TEXT), 1, 4), '-',
+  SUBSTRING(CAST((raw_json->>'paidBusinessDate')::BIGINT AS TEXT), 5, 2), '-',
+  SUBSTRING(CAST((raw_json->>'paidBusinessDate')::BIGINT AS TEXT), 7, 2)
+)::DATE
+WHERE raw_json->>'paidBusinessDate' IS NOT NULL
+  AND LENGTH(CAST((raw_json->>'paidBusinessDate')::BIGINT AS TEXT)) = 8
+  AND payment_date != CONCAT(
+    SUBSTRING(CAST((raw_json->>'paidBusinessDate')::BIGINT AS TEXT), 1, 4), '-',
+    SUBSTRING(CAST((raw_json->>'paidBusinessDate')::BIGINT AS TEXT), 5, 2), '-',
+    SUBSTRING(CAST((raw_json->>'paidBusinessDate')::BIGINT AS TEXT), 7, 2)
+  )::DATE;
+
+-- Step 2: Fix unified_sales.sale_date for Toast tip entries
+-- These have external_item_id ending in '_tip' and reference toast_payments via external_order_id
+UPDATE unified_sales us
+SET sale_date = tp.payment_date
+FROM toast_payments tp
+WHERE us.pos_system = 'toast'
+  AND us.external_order_id = tp.toast_order_guid
+  AND us.external_item_id = tp.toast_payment_guid || '_tip'
+  AND us.sale_date != tp.payment_date;
+
+-- Step 3: Fix toast_orders.order_date from raw_json->>'businessDate'
+-- (order_date was also derived from UTC closedDate)
+UPDATE toast_orders
+SET order_date = CONCAT(
+  SUBSTRING(CAST((raw_json->>'businessDate')::BIGINT AS TEXT), 1, 4), '-',
+  SUBSTRING(CAST((raw_json->>'businessDate')::BIGINT AS TEXT), 5, 2), '-',
+  SUBSTRING(CAST((raw_json->>'businessDate')::BIGINT AS TEXT), 7, 2)
+)::DATE
+WHERE raw_json->>'businessDate' IS NOT NULL
+  AND LENGTH(CAST((raw_json->>'businessDate')::BIGINT AS TEXT)) = 8
+  AND order_date != CONCAT(
+    SUBSTRING(CAST((raw_json->>'businessDate')::BIGINT AS TEXT), 1, 4), '-',
+    SUBSTRING(CAST((raw_json->>'businessDate')::BIGINT AS TEXT), 5, 2), '-',
+    SUBSTRING(CAST((raw_json->>'businessDate')::BIGINT AS TEXT), 7, 2)
+  )::DATE;
+
+-- Step 4: Fix unified_sales.sale_date for regular Toast items using (now-corrected) toast_orders
+UPDATE unified_sales us
+SET sale_date = to_ord.order_date
+FROM toast_orders to_ord
+WHERE us.pos_system = 'toast'
+  AND us.external_order_id = to_ord.toast_order_guid
+  AND us.restaurant_id = to_ord.restaurant_id
+  AND us.item_type IS DISTINCT FROM 'tip'
+  AND us.adjustment_type IS DISTINCT FROM 'tip'
+  AND to_ord.raw_json->>'businessDate' IS NOT NULL
+  AND LENGTH(CAST((to_ord.raw_json->>'businessDate')::BIGINT AS TEXT)) = 8
+  AND us.sale_date != to_ord.order_date;
diff --git a/supabase/tests/26_get_pos_tips_by_date.sql b/supabase/tests/26_get_pos_tips_by_date.sql
@@ -1,7 +1,7 @@
 -- Tests for get_pos_tips_by_date function
 
 BEGIN;
-SELECT plan(12);
+SELECT plan(16);
 
 -- Disable RLS for test setup
 SET LOCAL role TO postgres;
@@ -157,5 +157,69 @@ SELECT ok(
   'First row should be most recent date (DESC order)'
 );
 
+-- Test 10: Uncategorized tips (item_type='tip', no splits) are included
+
+INSERT INTO unified_sales (id, restaurant_id, pos_system, external_order_id, item_name, quantity, total_price, sale_date, item_type) VALUES
+  ('00000000-0000-0000-0000-000000000030'::uuid, '00000000-0000-0000-0000-000000000001'::uuid, 'toast', 'order-005', 'POS Tip', 1, 25.00, '2024-01-18', 'tip')
+ON CONFLICT (id) DO UPDATE SET total_price = EXCLUDED.total_price;
+
+SELECT is(
+  (SELECT total_amount_cents FROM get_pos_tips_by_date(
+    '00000000-0000-0000-0000-000000000001'::uuid, '2024-01-18'::DATE, '2024-01-18'::DATE
+  ) WHERE tip_date = '2024-01-18'),
+  2500::INTEGER,
+  'Uncategorized tip (item_type=tip, no splits) should return 2500 cents'
+);
+
+-- Test 11: Uncategorized tip with adjustment_type='tip'
+
+INSERT INTO unified_sales (id, restaurant_id, pos_system, external_order_id, item_name, quantity, total_price, sale_date, adjustment_type) VALUES
+  ('00000000-0000-0000-0000-000000000031'::uuid, '00000000-0000-0000-0000-000000000001'::uuid, 'square', 'order-006', 'Adjustment Tip', 1, 15.00, '2024-01-18', 'tip')
+ON CONFLICT (id) DO UPDATE SET total_price = EXCLUDED.total_price;
+
+SELECT is(
+  (SELECT COUNT(*) FROM get_pos_tips_by_date(
+    '00000000-0000-0000-0000-000000000001'::uuid, '2024-01-18'::DATE, '2024-01-18'::DATE
+  ))::INTEGER,
+  2::INTEGER,
+  'Should return 2 rows for Jan 18: toast uncategorized + square uncategorized'
+);
+
+-- Test 12: Tip miscategorized to non-tip account still appears (not silently dropped)
+
+INSERT INTO unified_sales (id, restaurant_id, pos_system, external_order_id, item_name, quantity, total_price, sale_date, item_type) VALUES
+  ('00000000-0000-0000-0000-000000000032'::uuid, '00000000-0000-0000-0000-000000000001'::uuid, 'clover', 'order-007', 'Miscategorized Tip', 1, 40.00, '2024-01-19', 'tip')
+ON CONFLICT (id) DO UPDATE SET total_price = EXCLUDED.total_price;
+
+-- Categorize this tip to a non-tip account (Food Sales)
+INSERT INTO unified_sales_splits (sale_id, category_id, amount) VALUES
+  ('00000000-0000-0000-0000-000000000032'::uuid, '00000000-0000-0000-0000-000000000012'::uuid, 40.00);
+
+SELECT is(
+  (SELECT total_amount_cents FROM get_pos_tips_by_date(
+    '00000000-0000-0000-0000-000000000001'::uuid, '2024-01-19'::DATE, '2024-01-19'::DATE
+  ) WHERE tip_date = '2024-01-19'),
+  4000::INTEGER,
+  'Tip miscategorized to non-tip account should still appear via uncategorized path'
+);
+
+-- Test 13: Tip correctly categorized to tip account is NOT double-counted
+
+INSERT INTO unified_sales (id, restaurant_id, pos_system, external_order_id, item_name, quantity, total_price, sale_date, item_type) VALUES
+  ('00000000-0000-0000-0000-000000000033'::uuid, '00000000-0000-0000-0000-000000000001'::uuid, 'square', 'order-008', 'Properly Categorized Tip', 1, 60.00, '2024-01-20', 'tip')
+ON CONFLICT (id) DO UPDATE SET total_price = EXCLUDED.total_price;
+
+-- Categorize to a tip account
+INSERT INTO unified_sales_splits (sale_id, category_id, amount) VALUES
+  ('00000000-0000-0000-0000-000000000033'::uuid, '00000000-0000-0000-0000-000000000010'::uuid, 60.00);
+
+SELECT is(
+  (SELECT total_amount_cents FROM get_pos_tips_by_date(
+    '00000000-0000-0000-0000-000000000001'::uuid, '2024-01-20'::DATE, '2024-01-20'::DATE
+  ) WHERE tip_date = '2024-01-20'),
+  6000::INTEGER,
+  'Tip categorized to tip account should appear once (via categorized path, not double-counted)'
+);
+
 SELECT * FROM finish();
 ROLLBACK;
diff --git a/tests/unit/useAutoSaveTipSettings.test.ts b/tests/unit/useAutoSaveTipSettings.test.ts
@@ -27,15 +27,15 @@ describe('useAutoSaveTipSettings', () => {
     updated_at: '2026-01-01',
   };
 
-  it('does not trigger save when settings is null', () => {
+  it('does not trigger save when settings is null and all values are defaults', () => {
     renderHook(() =>
       useAutoSaveTipSettings({
         settings: null,
         tipSource: 'manual',
         shareMethod: 'hours',
         splitCadence: 'daily',
-        roleWeights: { Server: 1 },
-        selectedEmployees: new Set(['emp1']),
+        roleWeights: {},
+        selectedEmployees: new Set(),
         onSave,
       })
     );
@@ -44,6 +44,23 @@ describe('useAutoSaveTipSettings', () => {
     expect(onSave).not.toHaveBeenCalled();
   });
 
+  it('triggers save when settings is null but user has configured values', () => {
+    renderHook(() =>
+      useAutoSaveTipSettings({
+        settings: null,
+        tipSource: 'pos',
+        shareMethod: 'hours',
+        splitCadence: 'daily',
+        roleWeights: {},
+        selectedEmployees: new Set(),
+        onSave,
+      })
+    );
+
+    vi.advanceTimersByTime(1500);
+    expect(onSave).toHaveBeenCalledOnce();
+  });
+
   it('does not trigger save when no changes detected', () => {
     renderHook(() =>
       useAutoSaveTipSettings({