Compare commits
149
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b34cd65d8 | ||
|
|
c05c4b5a35 | ||
|
|
b26d526e83 | ||
|
|
872da3b12c | ||
|
|
b4f28010df | ||
|
|
0e5422919e | ||
|
|
7f8e363b5b | ||
|
|
502e3f563c | ||
|
|
7819a88af2 | ||
|
|
a1e776e9be | ||
|
|
9e4b518f57 | ||
|
|
2d341e24a0 | ||
|
|
6db2345c49 | ||
|
|
cb7665ded1 | ||
|
|
6e179d3a0a | ||
|
|
dbc6fd1352 | ||
|
|
c70d2b1fac | ||
|
|
f6c500b27a | ||
|
|
549abd8cca | ||
|
|
a465b147a3 | ||
|
|
17028c79ff | ||
|
|
69b3ed8ea9 | ||
|
|
a56e5e2de5 | ||
|
|
22e4a1ead0 | ||
|
|
dd0462a5f9 | ||
|
|
3144cf3176 | ||
|
|
fe104a9618 | ||
|
|
63aaf1eb21 | ||
|
|
7cf247951a | ||
|
|
d458228625 | ||
|
|
82f751cbf4 | ||
|
|
9f0f38449b | ||
|
|
0595d49d5c | ||
|
|
50c5b7c430 | ||
|
|
14d6b40578 | ||
|
|
8fbcbc5f83 | ||
|
|
aaa36dd75e | ||
|
|
66a6a51fb8 | ||
|
|
b8919a4775 | ||
|
|
0cb46a087b | ||
|
|
d081d80a3f | ||
|
|
db6b7f8375 | ||
|
|
788219b9fd | ||
|
|
6add958132 | ||
|
|
3339a0b9b7 | ||
|
|
3b9d302ce2 | ||
|
|
4fc8eeac95 | ||
|
|
89300450a7 | ||
|
|
b4a116c134 | ||
|
|
c9b000a428 | ||
|
|
dbfbd5196d | ||
|
|
d5589b2980 | ||
|
|
7a1acc32a9 | ||
|
|
e92fcb709f | ||
|
|
8c21893cc2 | ||
|
|
4fcb135805 | ||
|
|
ff0629462c | ||
|
|
ae23b03d5d | ||
|
|
689fadc8b9 | ||
|
|
a4ab543a6c | ||
|
|
5ee5ee24cf | ||
|
|
3bb67f370d | ||
|
|
6161ddc9de | ||
|
|
c656f5d26b | ||
|
|
4febf38292 | ||
|
|
b6cd62f7b5 | ||
|
|
df4b875b82 | ||
|
|
ae0c34fce7 | ||
|
|
5db42f086f | ||
|
|
1103397397 | ||
|
|
a9e251d969 | ||
|
|
c82a22767f | ||
|
|
33db7d05ef | ||
|
|
6d3b6e1a9d | ||
|
|
9f168cf4c8 | ||
|
|
775e5cc08f | ||
|
|
bbb90238e4 | ||
|
|
d06088fe34 | ||
|
|
c465742635 | ||
|
|
3f04cbd5e7 | ||
|
|
ba87ff86e7 | ||
|
|
4b7a7e5d9c | ||
|
|
3778bfe836 | ||
|
|
cc852e7c6f | ||
|
|
31a8177958 | ||
|
|
030490efa3 | ||
|
|
d6b4ec84f6 | ||
|
|
ab00f8c592 | ||
|
|
02495e4173 | ||
|
|
315bc06d0d | ||
|
|
76db9dddb4 | ||
|
|
25ef504574 | ||
|
|
e0b0fc91e0 | ||
|
|
856e1a51ab | ||
|
|
831d30669b | ||
|
|
99af10f9ea | ||
|
|
0b40924af0 | ||
|
|
48ec151c15 | ||
|
|
b706973fb5 | ||
|
|
710e089c4f | ||
|
|
b2a8a56c7b | ||
|
|
d384cc96f6 | ||
|
|
5df164e9a5 | ||
|
|
b8cd1b0f89 | ||
|
|
ce67e38d77 | ||
|
|
b8296b6e29 | ||
|
|
0c1f88ed9c | ||
|
|
4a49add277 | ||
|
|
07b8c1ef16 | ||
|
|
1b561af9e9 | ||
|
|
1296555f17 | ||
|
|
7491e70a15 | ||
|
|
0a1f6b48a2 | ||
|
|
ef73a9cea0 | ||
|
|
d53d3106f2 | ||
|
|
02ac136e19 | ||
|
|
084b8764e3 | ||
|
|
281f0d3782 | ||
|
|
85e7801407 | ||
|
|
5206388958 | ||
|
|
8076d1a949 | ||
|
|
aeaca84cc7 | ||
|
|
278e57354c | ||
|
|
9f90d8726f | ||
|
|
859043f5a5 | ||
|
|
fc22a61a43 | ||
|
|
0985c38be8 | ||
|
|
af4c64bba7 | ||
|
|
a8743ba7df | ||
|
|
7b3fd4b65f | ||
|
|
dd11019fdf | ||
|
|
714c5a9b25 | ||
|
|
2a10450c3e | ||
|
|
e72d3ad9e5 | ||
|
|
a7461ff83b | ||
|
|
c1d031511a | ||
|
|
7379437cc3 | ||
|
|
8bd7d77a8a | ||
|
|
f90ba332bd | ||
|
|
e3aa17acdd | ||
|
|
1eff0f9337 | ||
|
|
3cf67f6e2a | ||
|
|
90d8db4abe | ||
|
|
d1a0eedf03 | ||
|
|
5dbeb0cb87 | ||
|
|
30a7857d13 | ||
|
|
1e79ada6d8 | ||
|
|
be85822cc7 | ||
|
|
d455738732 |
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"permissions": {
|
||||||
|
"allow": [
|
||||||
|
"Bash(npx next:*)",
|
||||||
|
"Read(//mnt/m2cache/appdata/smarthome/**)",
|
||||||
|
"Bash(docker compose:*)",
|
||||||
|
"Bash(curl -s http://localhost:4100/ -I)",
|
||||||
|
"Bash(grep:*)",
|
||||||
|
"Bash(docker port:*)",
|
||||||
|
"Bash(docker inspect:*)",
|
||||||
|
"Bash(python3 -c \"import sys,json; d=json.load\\(sys.stdin\\); [print\\(k, v['IPAddress']\\) for k,v in d.items\\(\\)]\")",
|
||||||
|
"Bash(npm install:*)",
|
||||||
|
"Bash(node_modules/.bin/vitest:*)",
|
||||||
|
"Bash(find:*)",
|
||||||
|
"Bash(xargs ls:*)",
|
||||||
|
"Bash(npm run:*)",
|
||||||
|
"Bash(docker exec postgres-personal:*)"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
#ENC[AES256_GCM,data:8Y6694wDaHKDf03nhurNnRYhbMv4TXBNI7HJnh0I4jM0tq1W4iq0NLgQ4W0wDx/cVat0szyrq/tAYsUj+LuRMMdHEY3Fcdp51MT2KtGXEa9kw/Wp,iv:jJTLMVvpbW7cKOGWV6x2JuAqkx6QgOKlw4K9NXA9fa4=,tag:9DhD7Zm9BtJPPH+mXjzZuQ==,type:comment]
|
||||||
|
#ENC[AES256_GCM,data:HMMVGfE8jPTsDyz9y0d+vfyRaf0B3segW04TFPIZDtJBlDD/RUMbv3KylOm0e+iBkJQFAIeAgBrvxr9+myD7XwYWJtIjVYrcgktHlcC8GoH4cotGDQni58uhMknlF33TdOVxTxs=,iv:4FH4Qbe4LMdUiIRLhhr+0Dnp7tT85EwQ0mcHqfz3T+Y=,tag:DT4muDzq/cKeGhgriX+Rbw==,type:comment]
|
||||||
|
#ENC[AES256_GCM,data:L39MkIKSEcj9C/aXvlz9zPDvR0Awgp4OYVXYX0ctIuwCKq0qmbApFv+fj6YbcnS7vlWttlDcyypnF8KbJe+0bDFRLN+MBzmWjMUhjKPz8eYe+v6gp9Mz,iv:1H88VnLGt6P81KP3e3lonvpL/OhtBCardjhPT0hCOag=,tag:jJmHguBHWp0Kl3Je0bEG3w==,type:comment]
|
||||||
|
#ENC[AES256_GCM,data:BBpTe55+cpatCSGS4g7YaWb0PRS4QjbrUE+mG2CzVmtS63s5onN22swVYtQw/NaMcv8qkrR2imww/vHnH/Z98IuJpAZIy8CXTMGNzXvFU82LNFIcb2QPZ1bWHHWLJfj7EHoDRgCBvuDkO8cAORgmI1U3m1ekZe82,iv:fI7a+edL5LpLVt+2vD75YwcxzHaO/Hz6OfPylSCTYEs=,tag:leDqySg/m9G8vlddrhwWhg==,type:comment]
|
||||||
|
#ENC[AES256_GCM,data:hKjWUHaA7rYY/VjDprmcQ++mphIBzPyFJVylFGyDEfRu4pSoFN3ZGD3B0H8P2wiN8IarrJz4p6hQzfrB248lEojxKBoUmOU1Dxegv1qhiNO0liIQnZWTtKrenz4zzOdb3sw=,iv:CfydB3duDyuuSphNz5OuZQMbWpJBW0u1Os94KeclgXw=,tag:PAn6S9DCeizHcaxCvS+jdg==,type:comment]
|
||||||
|
#ENC[AES256_GCM,data:hVUROHUoWJuBofyc4qdzTC1+PrecP8jG/1i/xddsTxthNwhYBiEcvq2aJhfXggbNSC1+PJ8AGg2sCrHL3NfD7KBAX33GgdDx0JAeHsyfsHN9hc583cjeVQDlOmocHGrBkGFTOi1g,iv:uiVFAPKXCQhTUFUSj0yPaX3l+eDmhsrwRrPQkTaksig=,tag:pyW76cx0dPErUWXoxW95+A==,type:comment]
|
||||||
|
#ENC[AES256_GCM,data:BOynLXwT+rKrTd1dxnVjveABiJaA94Zl2UQ/yPg5It+cbUNUpJ/GMlrR5OLJQMkw5OD+EkeEMqieY0KYTAualEKOoaIG6T+c0zZAjYNrmWBZYrPuOtpLk4Bzwuel0agrFAs3xqvmsk/OuktQNyvmXMgUpwnzD0U=,iv:WZn4CCL0tzzdorI0zl/mqE+/MMkNtkIyo1SBHpboFw4=,tag:kY/+mg9qyLAxC27UwnXacA==,type:comment]
|
||||||
|
#ENC[AES256_GCM,data:KzC0cK7daY++mskeHmBEjlmDvmC2oncQ18mxwB1tGS0hp2X7lOOYgMYnRwGZRy5Gd0ymfJF8M52GDIV7VGKsOFT2Rt+T3EcCJ8ng1Q1EJpTPk1139g27,iv:ZTg+sbmSuX3oJrf6AWkWFwV2eS+D7j0RNP57d6TGh6A=,tag:bTtnmShFZPxNi9hzI3PVrQ==,type:comment]
|
||||||
|
DATABASE_URL=ENC[AES256_GCM,data:fnfh3OD0nX7xmdCy74/8uoDxu7JNsplPbJeZ/YUrwzrr5BrdJx5+CUbIc/BDx1I1+sId0tu5G2rx1GiPJUKSVw9fKMLrP2yXk8EUjAKcTl1ozOEAxVsW6S/0fqjdBheK2iLgomcQ6LLhT2CHBUadmPNoOEpuYGRY16akPotafWGBGxZiVmg9zD0DZwgxY0ASJ6NQKn5Fup1+FAkSuLPV5Ok1evDecVol9La0bp3pVT6kX0bWQlP8SrxOpznZ2XQbHjXU6xNXJvaA2mVeP6qjCDxJbXX8BB+I52l1ZR5mQ7RZSpossbwT+q6yXGmxUVKDP54oqq7eMasNQ4AkpWrgTSSivogBATuGQyVvBUEeymRWfPRayliGMoEbiITO3Lf6/Z+u+xcAWDUoThJZ3LemScC/RgRN/PG3Dnx1b/uF0piFRDF59xNela515QlQqUDiwoxAdO7hhY1l/gH/VwZEvp4GYJgMqTIP+85Ta2y0Ph4z9clSSHOc/dkAnknRyQDCpbtDSR+DCppzQ9OgUzPK7Popqa1k/yO6Oo+1OTpov3I18Yyh+Vy00kYx9rR2AAp5C32K2rYkdYrEiK3erIBhKNPrLrYRiT/2LReArMAxpUk1iM9uDPnx/JEhISJRlD+PWcF1R8i8CiBc+OhTFOlhKykEUdpXBv4eBzqB0tSwsEnT/zJzMLvqiVoYX0fnGlS61Lg06ZIRohzQLZAU6A+m0rOOFmRkHS6oZbkOnRxf8c5QfjVUq5WxmPNEFWHsIi2LsbjkDLk9yoDLIXflO+G2sP6JB/CWvCXAK++5MiS0G6ijNBEi+kjjHokE/Snpaq+Uw7JynAFKJ0QVMT7YP9YGfVJu2cYIvEkpWtz8,iv:D2HI2gwY9R7jXFsClkV7qKDDxvBips8BVAGOPKLNZCk=,tag:cY8AgAkGXJQZpbUsQBiRxQ==,type:str]
|
||||||
|
sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkSGtocXNOZXU0NUZSZlBY\nYmpMbnJVbVVSV2xnWVdwUVBObWtIb05raW1jCkdJRzUyTlBGSjFISks3OHN0clJY\ncmluR0o0aGlXU3VOaVVUc0t5RWk4NVUKLS0tIHdZUVZrd3JxUmpnbWJkUzZBaHRx\nZ2lKK0NZT0RjU1J0andQMVRPMGdoL2sKlgWx9xKOabP5q4cmHPVVD7xuwn6/OV6V\nZR6MXV07XzLfUl3G5NMeOBI4e6s9y+xZGSoDWeWB194euASTlyiwwA==\n-----END AGE ENCRYPTED FILE-----\n
|
||||||
|
sops_age__list_0__map_recipient=age1tw6wsyxgxa465cc0wx32u7xuw5675pyz35cuzey4huz69hc54v4qp0pvgn
|
||||||
|
sops_lastmodified=2026-05-15T09:13:11Z
|
||||||
|
sops_mac=ENC[AES256_GCM,data:BhA6Tbo2bNOYzuoYBd/3nYp9CrZx7Nspl6Us1hpUIXR/EEOLRUCofqbVyDzU+2CNQMNivPYyltQ4nRdapDQwKWlZjTEufSkRKNwafr8eexN3Dwo1j3Njw9bK26ytG/d1Dm3jXOKogRRUZYsQqtHZBmZwuF4JvL49x+ODQ0Hco1o=,iv:6cIK8//MbBoiPSsxJnp7oKiz04B1hxa4vK0QFEBzHP4=,tag:TT5b8KSO+UUZJ/hOJqkMpw==,type:str]
|
||||||
|
sops_unencrypted_suffix=_unencrypted
|
||||||
|
sops_version=3.9.4
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
name: ci
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
- name: Install
|
||||||
|
run: npm ci
|
||||||
|
# The Prisma client is generated into src/generated/prisma, which is
|
||||||
|
# gitignored — so a fresh checkout has no client and every test that
|
||||||
|
# reaches src/lib/db.ts dies on "Cannot find package
|
||||||
|
# '@/generated/prisma/client'". Schema-only, so it needs no database.
|
||||||
|
# Without this the pipeline had been red on every run since at least
|
||||||
|
# ae0c34f, which is how the failure stayed invisible: it looked like
|
||||||
|
# the normal colour.
|
||||||
|
- name: Generate Prisma client
|
||||||
|
run: npx prisma generate
|
||||||
|
# Advisory until the pre-existing lint debt is cleared (2026-07-19:
|
||||||
|
# ~20 errors across budget/insights/shared pages) — then make blocking.
|
||||||
|
- name: Lint (advisory)
|
||||||
|
run: npm run lint
|
||||||
|
continue-on-error: true
|
||||||
|
- name: Unit tests
|
||||||
|
run: npm test
|
||||||
@@ -32,6 +32,7 @@ yarn-error.log*
|
|||||||
|
|
||||||
# env files (can opt-in for committing if needed)
|
# env files (can opt-in for committing if needed)
|
||||||
.env*
|
.env*
|
||||||
|
!.env.sops
|
||||||
|
|
||||||
# vercel
|
# vercel
|
||||||
.vercel
|
.vercel
|
||||||
@@ -41,3 +42,10 @@ yarn-error.log*
|
|||||||
next-env.d.ts
|
next-env.d.ts
|
||||||
|
|
||||||
/src/generated/prisma
|
/src/generated/prisma
|
||||||
|
|
||||||
|
# Raw statement exports — real financial data, never commit
|
||||||
|
dump/
|
||||||
|
|
||||||
|
# Python tooling for scripts/ (split_csv_match.py)
|
||||||
|
.venv/
|
||||||
|
__pycache__/
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
creation_rules:
|
||||||
|
- path_regex: \.env$
|
||||||
|
age: age1tw6wsyxgxa465cc0wx32u7xuw5675pyz35cuzey4huz69hc54v4qp0pvgn
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# Repository Guidelines
|
||||||
|
|
||||||
|
## Project Structure & Module Organization
|
||||||
|
|
||||||
|
Application code lives in `src/`. Next.js App Router pages and API route handlers belong in `src/app/`; reusable UI components are in `src/components/`; database access, query functions, hooks, authentication, and domain helpers are in `src/lib/`. Tests are separated into `src/__tests__/unit/` and `src/__tests__/integration/`. PostgreSQL schema and numbered SQL migrations live under `prisma/`, static assets under `public/`, operational scripts under `scripts/`, and design notes under `docs/`.
|
||||||
|
|
||||||
|
Keep data flow consistent: API routes call query functions in `src/lib/queries.ts`, which use `queryRaw()` from `src/lib/db.ts`; client components access APIs through TanStack Query hooks in `src/lib/hooks.ts`.
|
||||||
|
|
||||||
|
**Task tracking is the Vikunja board at `https://tasks.bosecamp.com`** (project *Work*, saved filter **finance-app**), which replaced the smarthome repo's `ACTIONS.md` on 2026-07-30. Update the ticket in the same change as the code. See `CLAUDE.md` → "Work tracking".
|
||||||
|
|
||||||
|
## Build, Test, and Development Commands
|
||||||
|
|
||||||
|
- `npm ci` installs the locked dependency set (Node 22 is used in CI).
|
||||||
|
- `npm run dev` starts the local Next.js development server.
|
||||||
|
- `npm run build` creates a production build; `npm start` serves it.
|
||||||
|
- `npm run lint` runs the Next.js ESLint configuration. Existing lint debt makes CI lint advisory, but new code should pass.
|
||||||
|
- `npm test` runs fast unit tests.
|
||||||
|
- `npm run test:setup` prepares the PostgreSQL test database using `.env.test`.
|
||||||
|
- `npm run test:integration` runs database-backed tests.
|
||||||
|
- `npm run test:all` runs both test suites.
|
||||||
|
|
||||||
|
## Coding Style & Naming Conventions
|
||||||
|
|
||||||
|
Use strict TypeScript, two-space indentation, semicolons, and double quotes, matching existing files. Name React components and types in PascalCase, functions and variables in camelCase, and files/routes in kebab-case. Use the `@/` alias for imports from `src/`. Preserve owner scoping and prefer transaction overrides with `COALESCE` in financial queries. Every API route must authenticate before accessing data.
|
||||||
|
|
||||||
|
## Testing Guidelines
|
||||||
|
|
||||||
|
Vitest is the test framework. Name tests `*.test.ts` and place pure logic tests under `unit/`; put PostgreSQL-dependent behavior under `integration/`. Add regression coverage for query, rule, reconciliation, and category changes. No numeric coverage threshold is configured; focus on meaningful edge cases and run `npm run test:all` before submitting database-related changes.
|
||||||
|
|
||||||
|
## Database, Security & Configuration
|
||||||
|
|
||||||
|
Add schema changes as the next numbered `prisma/migrations/NNNN_description/migration.sql`. Never commit `.env`, `.env.test`, raw statements in `dump/`, or other financial data. Consult `CLAUDE.md` and relevant `docs/` notes before changing splits, settlements, loans, reconciliation, or statement accounting.
|
||||||
|
|
||||||
|
## Commits & Pull Requests
|
||||||
|
|
||||||
|
History follows concise Conventional Commit-style subjects such as `feat(rules): preview rule changes`, `fix(trips): ...`, and `docs: ...`. Keep commits focused. Pull requests should explain behavior and data-model impact, link related issues, list validation commands, and include screenshots for UI changes. Ensure unit tests and the production build pass; call out any known lint warnings or migration steps.
|
||||||
@@ -0,0 +1,817 @@
|
|||||||
|
# CLAUDE.md
|
||||||
|
|
||||||
|
Guidance for Claude Code when working in this repository.
|
||||||
|
|
||||||
|
## Project Overview
|
||||||
|
|
||||||
|
Personal finance tracker. Bank statements are ingested via an N8N workflow (in the smarthome repo at `docker/automation/workflows/cc-statement-processor-paperless.json`) that sends PDFs to Gemini 2.5 Flash for extraction, then inserts into PostgreSQL.
|
||||||
|
|
||||||
|
- **App**: Next.js 16 App Router, TypeScript, Tailwind CSS
|
||||||
|
- **DB**: PostgreSQL container `postgres-personal`, database `personal`, user `personal`
|
||||||
|
- **Auth**: `X-Forwarded-User` header (email) set by Traefik → `participants.email`. In dev/fallback: participant id=1 ("Me")
|
||||||
|
- **Runs at**: port 3000 inside container, exposed on host port 4100, proxied at `https://finance.bosecamp.com`
|
||||||
|
|
||||||
|
## Work tracking — the board, not a markdown file
|
||||||
|
|
||||||
|
Outstanding work for this app lives on the Vikunja board at
|
||||||
|
`https://tasks.bosecamp.com` (project **Work**), which replaced the smarthome
|
||||||
|
repo's `ACTIONS.md` on 2026-07-30.
|
||||||
|
|
||||||
|
Find this app's work with the saved filter **finance-app**, or
|
||||||
|
`done = false && labels in <finance-app-label-id>`. Note that a ticket can carry
|
||||||
|
*several* system labels — the receipt→pantry work is labelled `finance-app`,
|
||||||
|
`pantry-app` **and** `email-ingestion` — so don't assume the finance filter shows
|
||||||
|
everything that will touch this codebase.
|
||||||
|
|
||||||
|
Epics that own most finance work: **Order & receipt ingestion (ING-7/8/10)**,
|
||||||
|
**Cashback tracking (ING-6)**, **Utility bills slice**, **Lane C — Ingestion
|
||||||
|
engine**, **Postgres estate & PG 14 EOL**.
|
||||||
|
|
||||||
|
**Update the ticket in the same change as the code.** The board is only worth
|
||||||
|
having if its status is true, and the previous system drifted precisely because
|
||||||
|
status lived somewhere nobody touched while shipping.
|
||||||
|
|
||||||
|
Token and API conventions: smarthome `CLAUDE.md` → "Work tracking". The token is
|
||||||
|
in smarthome `docker/utilities/.env`; this repo does not carry it.
|
||||||
|
|
||||||
|
**One deadline here is real:** `postgres-personal` runs **PostgreSQL 14, EOL 12
|
||||||
|
November 2026** — it holds `statements`, `transactions`, `orders` and
|
||||||
|
`expense_metadata`. Tracked in the Postgres epic, not here.
|
||||||
|
|
||||||
|
## Common Commands
|
||||||
|
|
||||||
|
**Deployment is push-to-deploy via Komodo** (since 2026-07-19): pushing to `main` on
|
||||||
|
Gitea triggers the `deploy-finance` Procedure, which runs DeployStack `--build` on the
|
||||||
|
`finance` stack (files_on_host over `docker/finance/` in the smarthome repo). Just
|
||||||
|
commit and push — no manual deploy needed.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Manual fallback only (from smarthome repo root), e.g. if Komodo is down
|
||||||
|
docker compose --env-file docker/common.env --env-file docker/finance/.env \
|
||||||
|
-f docker/finance/docker-compose.yml up -d --build
|
||||||
|
|
||||||
|
# IMPORTANT: docker restart does NOT pick up a new image — push to main (or use the compose command above)
|
||||||
|
|
||||||
|
# DB access
|
||||||
|
docker exec postgres-personal psql -U personal -d personal
|
||||||
|
|
||||||
|
# View logs
|
||||||
|
docker logs finance -f
|
||||||
|
```
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
### Key Files
|
||||||
|
|
||||||
|
| File | Purpose |
|
||||||
|
|------|---------|
|
||||||
|
| `src/lib/db.ts` | `queryRaw<T>()` — the only DB query function; uses `pg` directly |
|
||||||
|
| `src/lib/queries.ts` | All SQL query functions (no ORM); import `queryRaw` from `@/lib/db` |
|
||||||
|
| `src/lib/hooks.ts` | TanStack Query hooks for all API calls |
|
||||||
|
| `src/lib/auth.ts` | `getCurrentUser()` — reads `X-Forwarded-User` header |
|
||||||
|
| `src/lib/categories.ts` | Canonical category list (`CATEGORIES` array + `formatCategory()`) |
|
||||||
|
| `src/app/api/*/route.ts` | API route handlers |
|
||||||
|
| `src/components/` | Shared UI components |
|
||||||
|
|
||||||
|
### Data Flow
|
||||||
|
|
||||||
|
- All queries in `src/lib/queries.ts` use raw SQL via `queryRaw` from `src/lib/db.ts`
|
||||||
|
- API routes call query functions and return `NextResponse.json()`
|
||||||
|
- Frontend uses hooks from `src/lib/hooks.ts` (TanStack Query) — never fetches directly
|
||||||
|
- Auth is always checked first in every API route: `const user = await getCurrentUser(req)`
|
||||||
|
|
||||||
|
### Owner Scoping
|
||||||
|
|
||||||
|
All data is scoped by `owner_id`. The effective owner of a transaction is:
|
||||||
|
```sql
|
||||||
|
COALESCE(t.owner_id, s.owner_id)
|
||||||
|
```
|
||||||
|
- Statement-linked transactions: owner comes from `statements.owner_id`
|
||||||
|
- Manual transactions: `statement_id IS NULL`, owner stored directly in `transactions.owner_id`
|
||||||
|
|
||||||
|
The effective merchant and category always prefer overrides:
|
||||||
|
```sql
|
||||||
|
COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name) -- merchant
|
||||||
|
COALESCE(o.category_override, t.category) -- category
|
||||||
|
```
|
||||||
|
|
||||||
|
### Hiding categories in the transactions view
|
||||||
|
|
||||||
|
`getTransactions` takes `exclude_categories`. It is **opt-in per caller and
|
||||||
|
never defaulted in `queries.ts`** — `GET /api/rules/[id]/matches` and
|
||||||
|
`POST /api/rules/apply` both read their candidate rows through `getTransactions`,
|
||||||
|
so a default exclusion there would silently shrink what a rule can preview and
|
||||||
|
reach. Only the transactions page sets it.
|
||||||
|
|
||||||
|
The transactions view defaults it to `["transfers"]` (433 of 3,996 rows, ~11%),
|
||||||
|
with a visible "Hide transfers" checkbox. Two rules the implementation depends
|
||||||
|
on, both tested:
|
||||||
|
|
||||||
|
- **An explicit category pick beats the exclusion.** Selecting "Transfers" while
|
||||||
|
the default is on subtracts it from the hidden list rather than returning zero
|
||||||
|
rows — otherwise the view reads "you have no transfers".
|
||||||
|
- **`COALESCE(..., '')` before `<> ALL`.** `NULL <> ALL(...)` is NULL, not true,
|
||||||
|
so an uncategorised row would vanish from a filter that never named its
|
||||||
|
category. Same trap `EXCLUDE_NON_SPEND` documents.
|
||||||
|
|
||||||
|
It defaults **off** when the view is scoped to a statement (`?statement_id=`).
|
||||||
|
That is a reconciliation view — the row count has to match the statement, and a
|
||||||
|
credit-card payment is exactly the row you went there to check.
|
||||||
|
|
||||||
|
## Database
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Schema inspection
|
||||||
|
docker exec postgres-personal psql -U personal -d personal -c "\d transactions"
|
||||||
|
|
||||||
|
# Apply a migration SQL file
|
||||||
|
docker exec postgres-personal psql -U personal -d personal < prisma/migrations/<name>/migration.sql
|
||||||
|
```
|
||||||
|
|
||||||
|
### Key Tables
|
||||||
|
|
||||||
|
- `statements` — one row per billing period per bank account
|
||||||
|
- `transactions` — line items; `statement_id` is nullable (NULL = manual entry); `reconciled_with_id` links a manual tx to its matched statement tx; `payment_method` (migration 0016) is `card | cash | bank_transfer | other`, NULL = unknown
|
||||||
|
|
||||||
|
### Cash and reconciliation
|
||||||
|
|
||||||
|
`payment_method = 'cash'` excludes a transaction from reconciliation via the
|
||||||
|
`notCash()` fragment in `queries.ts`. Cash never appears on a statement, so
|
||||||
|
without it a cash entry sits in the pending queue forever being offered matches
|
||||||
|
within 3 days and 1% on amount — and accepting one is silently destructive:
|
||||||
|
reconciled manual rows are filtered out of every query, so the cash spend
|
||||||
|
disappears while the card transaction it matched claims to be that same spend.
|
||||||
|
|
||||||
|
Only cash is excluded. Bank transfers *do* appear on a statement now that
|
||||||
|
transaction accounts are imported, and NULL means unknown — both stay
|
||||||
|
candidates, preserving the behaviour of every pre-existing row.
|
||||||
|
|
||||||
|
ATM withdrawals stay categorised as spend rather than `transfers`. Treating them
|
||||||
|
as transfers only works if every cash purchase is logged; with partial logging
|
||||||
|
it silently deletes the unlogged remainder from spend totals.
|
||||||
|
- `transaction_overrides` — user corrections to AI-extracted data (category, merchant, notes)
|
||||||
|
- `transaction_splits` — shared expense tracking (participant, share_percent, settled)
|
||||||
|
- `split_payments` — recorded cash settlements between participants
|
||||||
|
- `transaction_tags` — many-to-many join to `tags`
|
||||||
|
- `rules` — auto-categorisation rules (JSONB conditions + actions)
|
||||||
|
- `rule_apply_runs` — audit log of bulk rule-apply runs with full snapshot for revert
|
||||||
|
- `expense_metadata` — enrichment from email receipts; `transaction_id` nullable until reconciled
|
||||||
|
- `participants` — people; `id=1` is "Me" (the primary user)
|
||||||
|
- `account_owner_mappings` — persists bank+account → owner assignments
|
||||||
|
|
||||||
|
### Shared expenses and settlement — read before touching
|
||||||
|
|
||||||
|
Rebuilt 2026-07-28. `docs/shared-expenses-design.md` describes the live model;
|
||||||
|
it is no longer a proposal. Everything the old version of this section warned
|
||||||
|
about has changed — if you are working from memory of it, re-read.
|
||||||
|
|
||||||
|
**The cutover date is the primary balance gate, not the `settled` flag.**
|
||||||
|
`ACTIVE_OBLIGATION` (`src/lib/analytics-sql.ts`) is
|
||||||
|
`ts.settled = false AND t.transaction_date >= '2026-01-09'`. Nothing dated
|
||||||
|
before the cutover can ever be owed, because carryover transaction **2348**
|
||||||
|
(dated 2026-01-09, $1,093.22) already carries the whole pre-cutover balance as
|
||||||
|
one figure. The bound is **inclusive** — 2348 is itself dated 2026-01-09, so an
|
||||||
|
exclusive bound would drop the carryover and the entire pre-cutover balance.
|
||||||
|
|
||||||
|
Consequence: **pre-2026 transactions can be split freely.** A split on a 2024
|
||||||
|
grocery shop describes how the expense was shared — which is what stops it
|
||||||
|
inflating spend — without asserting a debt. 657 pre-2026 transactions carry
|
||||||
|
1,266 such splits, imported from SplitMyExpenses and marked `settled`.
|
||||||
|
|
||||||
|
**Spend counts settled splits; owed does not.** `myShare`/`mySplitOf` must NOT
|
||||||
|
filter on `settled` — half a 2025 grocery shop was your expense whether or not
|
||||||
|
the other half was repaid. Filtering it out re-inflates exactly the figures the
|
||||||
|
historical import exists to correct.
|
||||||
|
|
||||||
|
**Every split totals 100%, and the payer's row is written down.** `myShare`
|
||||||
|
resolves the payer's share as `100 - SUM(everyone else)`, so a 50/50 stored as
|
||||||
|
a lone "Sonu 50%" row still computed correctly — and still read on screen as a
|
||||||
|
50% share against a blank. `completeSplit` (`src/lib/splits.ts`) is the single
|
||||||
|
place that materialises the remainder, and every write path ends in it:
|
||||||
|
`applyRuleActions`, `POST /api/transactions`, the Slack nudge's share button,
|
||||||
|
and the rule-revert restore. `POST /api/transactions/[id]/splits` needs no call
|
||||||
|
— it already rejects anything not summing to 100.
|
||||||
|
|
||||||
|
The remainder always goes to the transaction's **owner**, never to "me". The
|
||||||
|
owner's row on their own transaction is excluded from both halves of
|
||||||
|
`getParticipantBalances` (`ts.participant_id != $1` on transactions I own; the
|
||||||
|
converse on ones I do not), so writing it cannot create, enlarge or discharge a
|
||||||
|
debt. A row for *me* on someone else's transaction is a real obligation — never
|
||||||
|
synthesise one. This is what made the 7-row backfill in `22e4a1e` safe;
|
||||||
|
balances were byte-identical across it.
|
||||||
|
|
||||||
|
There is no database-level constraint on the sum. Enforcing it needs a deferred
|
||||||
|
constraint trigger, and the rule path commits its DELETE and INSERT as separate
|
||||||
|
autocommitted statements, so the trigger would reject the intermediate state.
|
||||||
|
|
||||||
|
`share_percent` has a CHECK of `> 0 AND <= 100`, so a 0% row cannot be stored —
|
||||||
|
when the others grow to cover the whole amount, the owner's row is deleted
|
||||||
|
rather than zeroed.
|
||||||
|
|
||||||
|
**Un-sharing needs DELETE, not an empty POST.** The splits route rejects an
|
||||||
|
empty array ("splits array required"), so `DELETE /api/transactions/[id]/splits`
|
||||||
|
is the only way to clear. The order panel's "Shared 50/50" toggle was inert in
|
||||||
|
both directions until `22e4a1e` because it posted a lone 50% row to share and
|
||||||
|
`[]` to un-share, and the endpoint rejected both.
|
||||||
|
|
||||||
|
**Any split write path that deletes-and-recreates must carry `settled` across.**
|
||||||
|
`POST /api/transactions/[id]/splits` did not, and silently converted discharged
|
||||||
|
obligations into live debt — $37,233.28 was exposed. Fixed in `6add958`.
|
||||||
|
`rule-actions.ts` is safe only by the shape of its upsert
|
||||||
|
(`ON CONFLICT DO UPDATE SET share_percent` never touches the flag).
|
||||||
|
The rules-apply revert route restores it explicitly.
|
||||||
|
|
||||||
|
**Settling up is recording a payment.** There is deliberately no "mark settled"
|
||||||
|
action. `settled` marks obligations discharged *outside* this app; doing both
|
||||||
|
would subtract the settlement twice.
|
||||||
|
|
||||||
|
**Payments carry scope, and one transfer can carry several rows.**
|
||||||
|
`split_payments.trip_id` (migration 0022) says which tab a payment settles;
|
||||||
|
NULL is the ongoing household tab. There is no unique constraint on
|
||||||
|
`linked_transaction_id`, so a grouped transfer is recorded as one row per scope
|
||||||
|
that re-add to the transfer — that is how Sonu's $3,779.33 and $4,794.06 were
|
||||||
|
allocated Europe-first with the remainder to household.
|
||||||
|
|
||||||
|
**Trip owed must be owner-scoped; trip cost must not be.** The owed query
|
||||||
|
applies `OWNER_SCOPE`; without it a debt between the *other two* participants
|
||||||
|
reads as owed to you ($1,605.49 on Europe 2026). Trip *cost* deliberately counts
|
||||||
|
every payer — a trip cost what the group put into it — which is why the stat card
|
||||||
|
says "all payers, net of refunds". Do not "fix" the missing scoping there.
|
||||||
|
|
||||||
|
**Duplicates are superseded, never deleted.** `transactions.superseded_by_id`
|
||||||
|
(migration 0023); 31 rows / $42,040.68 from overlapping ANZ statements 107/142/143.
|
||||||
|
Every child of `transactions` is `ON DELETE CASCADE`. The exclusion lives *inside*
|
||||||
|
`EXCLUDE_RECONCILED_SOURCE`, so any query applying that fragment gets it free —
|
||||||
|
and any query that does not still double-counts.
|
||||||
|
|
||||||
|
**Refunds:** a *partial* refund is netted in SQL (`NET_SPEND_ROWS`/`SPEND_SIGNED`);
|
||||||
|
a *cancelled* booking has both legs untagged from the trip by hand, because a
|
||||||
|
trip never incurred a cost it cancelled.
|
||||||
|
|
||||||
|
**Trips:** Europe 2026 (id 1, 19 Mar–12 Apr), Auckland 2026 (id 2),
|
||||||
|
Europe — Sonu + Sunny (id 3, 12–28 Apr, created 2026-07-28 from tag 5),
|
||||||
|
Singapore + Bangkok 2026 (id 4).
|
||||||
|
|
||||||
|
### Why `travel` looked useless on a trip page, and the fix (2026-08-02)
|
||||||
|
|
||||||
|
`travel` was ~60% of every trip and told you nothing. The tempting fix — a finer
|
||||||
|
travel taxonomy (flights / stays / getting around) — needs a hand-maintained
|
||||||
|
merchant list, which is the trap ticket #19 already describes. It is also the
|
||||||
|
wrong diagnosis.
|
||||||
|
|
||||||
|
**Measured on Europe 2026, `travel` is the only category that spans both phases
|
||||||
|
of a trip. Every other category is 100% on-the-ground — dining, transport,
|
||||||
|
entertainment, groceries and shopping are all exactly $0.00 before departure.**
|
||||||
|
So the category chart was not a bad chart; it was two different economies stacked
|
||||||
|
into one, and travel was the only thing visible in the union.
|
||||||
|
|
||||||
|
The fix is to split on `trips.start_date` and use the axis that carries
|
||||||
|
information in each phase:
|
||||||
|
|
||||||
|
- **Booked ahead** (before `start_date`, **$21,229.56 / 56%** on Europe, 30
|
||||||
|
bookings) — everything is a flight, a stay or a rail ticket, so category is a
|
||||||
|
constant and **merchant** is the axis: Agoda $4,491, Air India $3,454, Azwebin
|
||||||
|
$2,696, Luxury Escapes $2,463.
|
||||||
|
- **On the ground** (on/after `start_date`, **$16,946.77**, 180 charges) — travel
|
||||||
|
falls to $8,241 among dining $4,452, transport $2,938, entertainment $698,
|
||||||
|
groceries $589, shopping $29. **Category is finally worth charting.**
|
||||||
|
|
||||||
|
These are the **net** figures the page shows, and they are lower than a raw
|
||||||
|
`SUM(amount)` by design: the phase queries apply `NET_SPEND_ROWS` / `SPEND_SIGNED`
|
||||||
|
and `EXCLUDE_RECONCILED_SOURCE`, the same fragments as every other analytic. Raw
|
||||||
|
sums give $22,050.51 committed and Luxury Escapes at $3,283.80 — the $820.95 gap
|
||||||
|
is a partial refund on that booking. Do not "fix" the difference; a partly
|
||||||
|
refunded booking must not read at full price.
|
||||||
|
|
||||||
|
`getTripAnalytics` returns `phases`, `committed_merchants`, `on_ground_categories`
|
||||||
|
and `on_ground_daily`. A trip with a NULL `start_date` has no knowable departure,
|
||||||
|
so the SQL folds everything into on-ground rather than reporting it as committed.
|
||||||
|
|
||||||
|
**The daily rate is the only figure comparable between trips**, because totals are
|
||||||
|
not — trips differ in length. Europe $677.88/day, Sonu + Sunny $573.57, Singapore
|
||||||
|
+ Bangkok $309.76, Auckland $83.39. The page ranks the current trip against the
|
||||||
|
others from the already-loaded `useTrips()` list.
|
||||||
|
|
||||||
|
**A trip with near-zero committed spend is a filing artefact, not a cheap trip.**
|
||||||
|
Europe — Sonu + Sunny shows $184.84 committed against Europe 2026's $22,050.51
|
||||||
|
because both legs' flights and stays were filed on the first trip. The page says
|
||||||
|
so rather than letting the ratio read as missing data.
|
||||||
|
|
||||||
|
Two chart rules this page now follows, both from the `dataviz` skill and both
|
||||||
|
previously broken here:
|
||||||
|
|
||||||
|
- **One series → one colour.** The category bars use a single copper hue with the
|
||||||
|
category as a direct label. `CATEGORY_COLORS` was a per-bar rainbow, which
|
||||||
|
double-encodes identity the label already carries — and the trip subset **fails**
|
||||||
|
CVD validation on this surface (`other` ↔ `shopping` ΔE 5.0 protan, below the
|
||||||
|
floor of 6). Do not reintroduce per-category colour on a labelled bar chart.
|
||||||
|
- **No serif and no `tabular-nums` on the hero figure.** Fraunces is for section
|
||||||
|
headings; a display face on a large number reads as decoration, and equal-width
|
||||||
|
digits make it look loose.
|
||||||
|
|
||||||
|
The phase split bar is two ordinal steps of one hue (`#7c4820` → `#d28a47`),
|
||||||
|
validated with `--ordinal` against the `#171410` card surface, with a 2px gap so
|
||||||
|
the boundary is an edge rather than a colour change. Both segments are
|
||||||
|
direct-labelled, so it needs no legend.
|
||||||
|
|
||||||
|
### Trip participation is derived, and a trip is shared
|
||||||
|
|
||||||
|
Rebuilt 2026-08-02. Trips were scoped to `trips.owner_id`, so Sonu saw **no
|
||||||
|
trips at all** despite paying for 104 of the tagged rows herself — her own
|
||||||
|
spending was invisible on the only page organised around it.
|
||||||
|
|
||||||
|
**A participant is anyone with a split on, who paid for, or whose payment is
|
||||||
|
scoped to, a transaction tagged to the trip.** Derived (`TRIP_PARTICIPANT` in
|
||||||
|
`queries.ts`), never stored. A membership table was designed and rejected: it
|
||||||
|
would be a second record of a fact the expenses already carry, and two records
|
||||||
|
of one fact drift — the same reason sharing is a real split rather than a flag.
|
||||||
|
The derivation also gets the exclusions right for free, which a table has to be
|
||||||
|
kept in sync to do: Singapore + Bangkok 2026 has no Sonu split and no Sonu
|
||||||
|
payment, so she is not a participant and never sees it. Live result is
|
||||||
|
Siddharth 4 trips, Sonu 3, Molina 1.
|
||||||
|
|
||||||
|
**Everything is shared except delete.** Read, edit and assign are open to any
|
||||||
|
participant. `deleteTrip` stays `owner_id`-only because both trip foreign keys
|
||||||
|
are `ON DELETE SET NULL`, so deleting Europe 2026 untags 210 transactions *and*
|
||||||
|
NULLs the trip scope on 6 payments — which is where the hand-derived
|
||||||
|
Europe-first allocation lives, and nothing recomputes it. The route returns 403
|
||||||
|
with the reason rather than a 404 that pretends the trip is missing.
|
||||||
|
|
||||||
|
**`getTransactions` gained `trip_all_rows`, and it is opt-in for a reason.** A
|
||||||
|
participant sees every row on a trip, not only their own — the trip total
|
||||||
|
already counts every payer. It must NOT be implied by `trip_id` being present:
|
||||||
|
`GET /api/transactions` is also the main transactions list, and its trip filter
|
||||||
|
has to keep owner scoping or filtering your own ledger by "Europe 2026" would
|
||||||
|
quietly fill it with someone else's rows. Participation is re-checked in SQL, so
|
||||||
|
passing the flag for a trip you are not on returns nothing rather than
|
||||||
|
everything. Only `trips/[id]/page.tsx` sets it.
|
||||||
|
|
||||||
|
**Trip owed is pairwise and returns BOTH directions, never netted.** `owed` is
|
||||||
|
unchanged — their share of rows *the viewer* paid. `i_owe` is the mirror: the
|
||||||
|
viewer's share of rows *that participant* paid. Rendering the pair from the
|
||||||
|
viewer's side is the whole fix; an obligation lives on a row someone else paid
|
||||||
|
for, so a viewer-as-payer figure can never contain it, and Sonu's Europe 2026
|
||||||
|
read "you are owed $2,408.24" while omitting the $8,004.04 she owed.
|
||||||
|
|
||||||
|
**The API returns both halves whole; the trip page nets them for display.** One
|
||||||
|
figure per person, with the breakdown beside it, because a net nobody can
|
||||||
|
decompose is how a wrong figure survives.
|
||||||
|
|
||||||
|
**A NEGATIVE trip net is not a bill — this is the trap, and it was got wrong
|
||||||
|
twice.** A payment is allocated to a scope as a lump sum, and the grouped-payment
|
||||||
|
allocation gave each trip enough to clear the payer's **gross** share. So netting
|
||||||
|
the other side off leaves a fully-paid trip negative by exactly what the payment
|
||||||
|
over-covered: Europe reads **−$802.75** because Sonu paid $8,004.04 against a net
|
||||||
|
share of $7,201.30. That surplus is already carried in the overall balance —
|
||||||
|
**she still owes $5,313.38 overall** — so labelling it "you owe them" was flatly
|
||||||
|
wrong. Scope nets sum to the overall figure; a negative simply means this scope
|
||||||
|
was over-covered and the excess sits in another.
|
||||||
|
|
||||||
|
The discriminator is `paid_to_me`:
|
||||||
|
|
||||||
|
- negative **with** a payment into the scope → over-covered, nothing to pay
|
||||||
|
- negative **with no** payment → genuinely owed, because the viewer's share of
|
||||||
|
the other person's spending exceeds theirs
|
||||||
|
|
||||||
|
All three of today's negatives are the first kind (Europe Sonu −$802.75,
|
||||||
|
Sonu + Sunny −$936.34, Europe Molina −$816.16). Both cases are tested. The trip
|
||||||
|
table therefore carries an **Overall balance** column from the unscoped
|
||||||
|
`getParticipantBalances` — the trip figure alone cannot tell you whether to pay
|
||||||
|
anyone, and **settlement is always against the overall figure, never one trip.**
|
||||||
|
|
||||||
|
**On whether to net — the reasoning reversed once, and the second answer is the
|
||||||
|
right one.** The first objection was that the grouped-payment allocation (memory
|
||||||
|
case `allocate_grouped_payments`) cleared each trip against the *one-directional*
|
||||||
|
gross, Europe first with the remainder to household, so netting would redefine
|
||||||
|
that debt after the fact. Checking the underlying rows overturned it: Europe's
|
||||||
|
$802.75 is **56 real transactions Sonu paid** across Rome, Venice, the Dolomites,
|
||||||
|
Bellagio, Lucerne and Paris on which Siddharth holds 25% — and `paid_by_me` is
|
||||||
|
**$0.00 on every row of every trip**, because nothing has ever been recorded
|
||||||
|
going from him to her. The one-directional view was concealing a live obligation,
|
||||||
|
not protecting an allocation. Her side was paid in full and looked settled only
|
||||||
|
because the allocation derived her payment split *from* her gross, so it lands on
|
||||||
|
zero by construction.
|
||||||
|
|
||||||
|
Current nets: Auckland Sonu **+$1,077.25** (1,505.64 − 428.39), Europe Sonu
|
||||||
|
**−$802.75**, Sonu + Sunny **−$936.34**, Europe Molina **−$816.16** — the three
|
||||||
|
negatives all being over-coverage, per the rule above. The `owed` column itself
|
||||||
|
was verified byte-identical when the mirror was added — $1,505.64, −$816.16,
|
||||||
|
$0.00, $0.00.
|
||||||
|
|
||||||
|
**A payment left on the household tab makes a settled trip debt read as
|
||||||
|
outstanding.** Payment 5 (Molina → Sonu, $1,605.49) discharged the Europe debt
|
||||||
|
between those two but carries `trip_id IS NULL`, so a trip-scoped net cannot see
|
||||||
|
it and Europe still shows it owing. That is the cost of scope being optional, and
|
||||||
|
the reason the Record Payment modal now asks. Fixable per row with
|
||||||
|
`UPDATE split_payments SET trip_id = 1 WHERE id = 5` — not done, it is a data
|
||||||
|
decision.
|
||||||
|
|
||||||
|
### The Shared view shows payer and category, and is searchable (2026-08-02)
|
||||||
|
|
||||||
|
`getSharedTransactions` already returned `owner_name` and `effective_category`;
|
||||||
|
the table simply never rendered them. **Paid by** sits next to **Splits**
|
||||||
|
deliberately — together they are the two halves of the question the page exists
|
||||||
|
to answer, whose money went out and whose share it was. It shows the *effective*
|
||||||
|
owner (`COALESCE(t.owner_id, s.owner_id)`), which is the account the spend left,
|
||||||
|
and the same figure every balance on the page is computed from. Category uses the
|
||||||
|
override-first COALESCE, so a correction made anywhere shows here.
|
||||||
|
|
||||||
|
Search is **client-side**, unlike the transactions page. This endpoint returns
|
||||||
|
every split row in one request (1,267 today) with no pagination, so there is
|
||||||
|
nothing for a server round-trip to narrow, and the sort was already client-side.
|
||||||
|
It matches description, merchant, notes, category and payer — deliberately **not**
|
||||||
|
participant names, because the participant dropdown already does that and typing
|
||||||
|
"sonu" matching every row she is split on would read as broken.
|
||||||
|
|
||||||
|
### Payment scope reaches the API (2026-08-02)
|
||||||
|
|
||||||
|
`split_payments.trip_id` has existed since migration 0022, but `POST
|
||||||
|
/api/split-payments` never read it and `GET` never returned it — so **every
|
||||||
|
payment recorded through the app landed on the household tab**, and the 9
|
||||||
|
trip-scoped rows had to be written by hand in SQL. A $11k Europe settlement was
|
||||||
|
silently reducing the ongoing household balance.
|
||||||
|
|
||||||
|
Both fixed. The modal has a "Settles" selector (Household or a trip) and history
|
||||||
|
shows each payment's scope as a chip. **"Both" needs no new shape:** one
|
||||||
|
transfer becomes one row per scope sharing a `linked_transaction_id`, which is
|
||||||
|
why there is deliberately no unique constraint on it — tx 4121's $4,794.06 sits
|
||||||
|
as $1,145.52 against Europe — Sonu + Sunny and $3,648.54 against household, and
|
||||||
|
tx 4111's $3,779.33 spans two trips. All six linked transfers reconcile to the
|
||||||
|
cent.
|
||||||
|
|
||||||
|
### Three write paths that had no authorisation
|
||||||
|
|
||||||
|
All closed 2026-08-02. Each was reachable by any authenticated participant:
|
||||||
|
|
||||||
|
- **`assignTransactionsToTrip`** took no caller and checked nothing, so
|
||||||
|
`PATCH /api/trips/[id]/transactions` and `POST /api/transactions/bulk`
|
||||||
|
(`assign_trip`) let anyone move any transaction id into any trip id. Not being
|
||||||
|
able to *see* a trip was no obstacle, because the write path never read one.
|
||||||
|
Now: only rows the caller can already see move, and a non-null destination must
|
||||||
|
be a trip they participate in — enforced in the query, not the route, so
|
||||||
|
neither caller can bypass it. Returns the count actually moved.
|
||||||
|
- **`DELETE /api/split-payments?id=`** deleted by id with no check at all. Erasing
|
||||||
|
a settlement silently resurrects a discharged debt — the same class of damage
|
||||||
|
as the split rewrite that reset `settled`. Now limited to the two people the
|
||||||
|
payment is between.
|
||||||
|
- **`POST /api/split-payments`** accepted any `from`/`to` pair. Now the payment
|
||||||
|
must involve the caller, and a trip scope must be a trip they are on.
|
||||||
|
|
||||||
|
**Partial split coverage inside a category is usually correct, not a gap.** Only
|
||||||
|
*shared* items are split. `utilities` sits at 69% yours because Globird, OVO, GWW
|
||||||
|
and home telecoms are split while Telstra, Vodafone, Optus and JB Hi-Fi Mobile
|
||||||
|
are personal. `subscriptions` is 91% because Uber One, Amazon Prime and OnePass
|
||||||
|
are shared while Claude, OpenAI, Anthropic, OpenRouter, You.com, LinkedIn, Xero,
|
||||||
|
Billdu, Spotify and Patreon are not. `fees` and `charity` are 100% yours and
|
||||||
|
correct. Check the merchants before concluding a rule was never applied — a
|
||||||
|
category-level ratio that "looks wrong" usually is not.
|
||||||
|
|
||||||
|
**Still true, and still a caveat:** Sonu's loan contributions (`…emi` in the
|
||||||
|
offset account, 39 rows, $37,980.24) are categorised `transfers`, indistinguishable
|
||||||
|
from ordinary internal transfers. The loan model below is unbuilt.
|
||||||
|
|
||||||
|
### Order verdicts — "never order from here again"
|
||||||
|
|
||||||
|
Built 2026-07-28 (migrations 0024, 0025). `order_reviews` was previously a table
|
||||||
|
wired to nothing; it now backs `GET`/`PUT /api/transactions/[id]/review`, the UI
|
||||||
|
in `components/order-details.tsx`, and the Slack card in
|
||||||
|
`lib/slack-blocks.ts` + `app/api/slack/interactive/route.ts`. Logic in
|
||||||
|
`lib/order-reviews.ts`.
|
||||||
|
|
||||||
|
Five things about the shape, each load-bearing:
|
||||||
|
|
||||||
|
- **Per person, not per order.** `UNIQUE (transaction_id, participant_id)`. A
|
||||||
|
shared meal produces two opinions that routinely disagree, and the
|
||||||
|
disagreement is the useful part. `PUT` defaults to the **signed-in user**,
|
||||||
|
not the owner — Sonu authenticates through the same Traefik OAuth as
|
||||||
|
participant 4, so an owner default would file her verdict under his name.
|
||||||
|
- **Five levels** — `loved`, `liked`, `ok`, `bad`, `never`. Three collapsed the
|
||||||
|
distinction that decides a re-order; `bad` was added because the jump from
|
||||||
|
`ok` to `never again` is too big and most disappointments live in the gap.
|
||||||
|
- **Only `never` sets `warn`.** A blacklist that fires for every mediocre meal
|
||||||
|
is one nobody reads. `bad` and `never` both set `order_again = false` — you
|
||||||
|
would not choose either — but only `never` raises the alarm on a future
|
||||||
|
order. "Would I order it" and "warn me about it" are different questions.
|
||||||
|
- **Item verdicts key on the item DESCRIPTION**, not its index — an index is
|
||||||
|
meaningless across orders, and "the Pad Thai here is good" has to survive
|
||||||
|
into the next order from the same merchant. Pooled case-folded across the
|
||||||
|
merchant's orders. Only `loved`/`never`: a per-item "ok" answers neither
|
||||||
|
question you ask at order time.
|
||||||
|
- **An ABSENT `item_verdicts` means "leave them alone"; `[]` clears them.**
|
||||||
|
Without that distinction a note-only save wipes every per-item opinion — the
|
||||||
|
same shape as the bug that reset `settled` on split rewrites, and just as
|
||||||
|
invisible on screen. Mutation-tested.
|
||||||
|
|
||||||
|
**The merchant is the restaurant, not the courier.** `orderDescription` does not
|
||||||
|
append the platform — that was added on request and reversed on 2026-07-28,
|
||||||
|
because it fragmented the merchant and the platform already renders in the Order
|
||||||
|
details panel. 81 descriptions were backfilled. `merchantVerdict` joins
|
||||||
|
**case-folded**: the platforms capitalise differently (`TEG Kebabs & Biryani` vs
|
||||||
|
`TEG KEBABS & BIRYANI`) and an exact match kept two separate histories, so a
|
||||||
|
"never again" through one app never warned in the other.
|
||||||
|
|
||||||
|
The merchant signal is *derived* by aggregating on
|
||||||
|
`expense_metadata.merchant_normalized` — never `transactions.merchant_name`,
|
||||||
|
which is a bank descriptor.
|
||||||
|
|
||||||
|
**Sharing is a real 50/50 split, not a flag** — the split already IS the record,
|
||||||
|
and two records of one fact drift apart. The toggle **refuses** when a
|
||||||
|
participant outside {1, 4} is present or the second consumer's share is not 50:
|
||||||
|
splits are made by hand here, so a third party or an uneven share is deliberate
|
||||||
|
and one tap must not flatten it. It says which case it refused on.
|
||||||
|
|
||||||
|
`/api/orders/ingest` returns `prior_verdict` (so the nudge can warn inline) and
|
||||||
|
`slack_blocks` (so Block Kit stays in tested code rather than n8n expressions).
|
||||||
|
|
||||||
|
### Slack cards — two rules that cost real data
|
||||||
|
|
||||||
|
1. **Update via `response_url`, never the HTTP response body.** Block Kit
|
||||||
|
interactivity ignores the response body; replacing a message that way is
|
||||||
|
legacy attachment-style behaviour. Getting this wrong meant every press wrote
|
||||||
|
correctly and left the card stale, so a working button looked dead, got
|
||||||
|
pressed again, and toggled itself back — three splits were lost before
|
||||||
|
`conversations.history` showing `edited: false` settled it. `response_url`
|
||||||
|
needs no bot token, so the app posts it directly.
|
||||||
|
2. **Never hand-write a card.** A card built with a guessed `shared: false`
|
||||||
|
mislabels an already-shared order and the button then deletes the split.
|
||||||
|
Render by calling the interactive endpoint with a no-op verb (`<id>:noop`):
|
||||||
|
it writes nothing and returns blocks built from live state.
|
||||||
|
|
||||||
|
Slack reaches this route through an n8n webhook, not directly — see the
|
||||||
|
smarthome repo's CLAUDE.md and the `slack-interactive-via-n8n` memory.
|
||||||
|
|
||||||
|
### The shared loan
|
||||||
|
|
||||||
|
The loan is a **separate ledger**, not a shared expense and not a settlement
|
||||||
|
context — a contribution must never be able to settle a dinner. Sonu's obligation
|
||||||
|
is a fixed 50% of the repayment; actual contributions vary, and the difference is
|
||||||
|
a tracked receivable ($4,000.00 over 2025-07 → 2026-06).
|
||||||
|
|
||||||
|
Do not derive the share from actual payments. During her leave the obligation did
|
||||||
|
not change, only the payment did — a percentage-of-actual model would silently
|
||||||
|
redefine her share as 30% and make the shortfall vanish.
|
||||||
|
|
||||||
|
Loan interest reconciles exactly: `repayments − interest − fees = balance
|
||||||
|
reduction`. It stays categorised `loan_interest` and counts as spend — over 12
|
||||||
|
months $63,500 of cash left and debt fell $44,127.36, and the $16,523.64
|
||||||
|
difference bought nothing. Excluding it would leave the balance sheet unable to
|
||||||
|
reconcile cash out against equity gained.
|
||||||
|
|
||||||
|
**The repayment is voluntarily above contracted, and the gap is the largest
|
||||||
|
flexible cost in the whole picture.** Contracted is $1,190.54/fortnight
|
||||||
|
($2,579.50/mo annualised); the actual direct debit is $2,500.00/fortnight
|
||||||
|
($5,416.67/mo). That is $2,837.17/mo of overpayment, and it is *not* sunk — it
|
||||||
|
shows up as `statements.redraw_available`, which grew $62,387.17 → $81,017.42
|
||||||
|
across the two most recent loan statements. Sonu returned to $1,250/fortnight in
|
||||||
|
July 2026 after the reduced $750 period during her leave.
|
||||||
|
|
||||||
|
Treat the repayment as two figures whenever asking "what does this cost me":
|
||||||
|
the contracted floor and the actual. `scheduled_repayment` holds the actual
|
||||||
|
($2,500), not the contracted minimum — the contracted figure is not in the DB at
|
||||||
|
all. See `docs/expense-baseline.md`.
|
||||||
|
|
||||||
|
### Import Date (`created_at`)
|
||||||
|
|
||||||
|
`transactions.created_at` is the import timestamp (DB default `now()`). In the transactions and shared views, the "Imported" column shows:
|
||||||
|
- For statement transactions: when the statement was processed by N8N
|
||||||
|
- For reconciled transactions: the `created_at` of the original manual/CSV transaction (via `LEFT JOIN transactions src ON src.reconciled_with_id = t.id`) — so the original import date is preserved post-reconciliation
|
||||||
|
|
||||||
|
Use `created_at` (not `transaction_date`) to answer "what was added since the last settlement?". Sort by `created_at` is supported server-side in `getTransactions` and client-side in the shared view.
|
||||||
|
|
||||||
|
### Rules System
|
||||||
|
|
||||||
|
Conditions are AND-evaluated. Fields: `merchant_normalized`, `description`, `category`, `bank_name`, `amount`, `transaction_type`. Operators: `contains`, `equals`, `starts_with`, `gt`, `lt`, `not_equals`. Actions: `set_category`, `set_merchant`, `add_tag_ids`, `apply_split`.
|
||||||
|
|
||||||
|
`contains` and `equals` operators are case-insensitive (both sides `.toLowerCase()`).
|
||||||
|
|
||||||
|
**A rule with zero conditions matches every transaction.** Both apply paths use
|
||||||
|
`conditions.length === 0 || conditions.every(...)`. Rule 43 "Home 50/50 Sonu" has
|
||||||
|
no conditions and a 50/50 split action — applying it blindly would split all
|
||||||
|
~3,700 transactions with another participant. That is what `manual_only` is for:
|
||||||
|
those rules are excluded from bulk runs and fire from the transactions page
|
||||||
|
against a hand-picked selection.
|
||||||
|
|
||||||
|
### Previewing a rule before applying it
|
||||||
|
|
||||||
|
`GET /api/rules/[id]/matches` is a dry run — it writes nothing and returns only
|
||||||
|
the transactions a rule would actually *change*, with already-correct rows
|
||||||
|
summarised as a count. The Preview button on the rules page uses it.
|
||||||
|
|
||||||
|
Apply then goes through `POST /api/transactions/bulk` with `action: "apply_rule"`
|
||||||
|
and **explicit transaction ids**, not the conditions. That is the safety
|
||||||
|
property: a rule whose conditions are too broad cannot reach further than what
|
||||||
|
the preview showed and the user ticked.
|
||||||
|
|
||||||
|
Prefer this over auto-applying rules on ingestion. It fails safe, works
|
||||||
|
retroactively, and tells you which rules are consistent enough to automate later.
|
||||||
|
|
||||||
|
### Rule apply history
|
||||||
|
|
||||||
|
`rule_apply_runs` snapshots the before-state so a run can be reverted, and since
|
||||||
|
migration 0017 also records `rule_id`, `rule_name` and `source`
|
||||||
|
(`all` | `rule` | `selection`). `rule_name` is denormalised deliberately and
|
||||||
|
there is no FK to `rules` — history must stay readable after a rule is renamed or
|
||||||
|
deleted, and deleting a rule must not cascade away the audit trail.
|
||||||
|
|
||||||
|
`GET /api/rules/runs/[id]` diffs that snapshot against current values. Rows
|
||||||
|
changed by something else since the run are flagged, because reverting restores
|
||||||
|
the pre-run value and discards the later edit.
|
||||||
|
|
||||||
|
### Trusting extracted statement data
|
||||||
|
|
||||||
|
**Balance assertions are the check that works.** `getStatements` computes
|
||||||
|
`opening + movement − closing`; the statements page flags any statement that does
|
||||||
|
not reconcile. Sign depends on what the balance means — on a credit card or loan
|
||||||
|
it is what you owe, so spending increases it; on a transaction or offset account
|
||||||
|
it is what you hold. 11 pre-existing statements currently fail, ~$4,177
|
||||||
|
unexplained, including two adjacent ANZ statements off by exactly ±$230.38 (a
|
||||||
|
transaction filed against the wrong one).
|
||||||
|
|
||||||
|
**Do not derive `opening_balance` from `closing − movement`.** It is an accounting
|
||||||
|
identity, so every statement would reconcile and the check would go permanently
|
||||||
|
green. A null that reads "unverified" is worth more than a number that is right
|
||||||
|
by construction. For the same reason, do not add a totals assertion comparing
|
||||||
|
`total_debits` to the summed rows — those totals are now *computed* from the rows
|
||||||
|
(see the N8N `Parse Gemini Result` node), so that check can never fail.
|
||||||
|
|
||||||
|
**Gemini invents summary fields the statement does not print.** Wise PDFs show
|
||||||
|
only a closing balance; asked for an opening balance anyway, the model produced
|
||||||
|
11,277.08 against a truth of 0.00, and on another statement read the running
|
||||||
|
balance of the oldest row. Every transaction was extracted perfectly in both
|
||||||
|
cases — verified row for row against the CSV exports. When a balance assertion
|
||||||
|
fails, suspect the summary before the transactions.
|
||||||
|
|
||||||
|
**Gemini drops rows silently on long tables.** `finishReason` was `STOP`, not
|
||||||
|
`MAX_TOKENS`, so raising `maxOutputTokens` does not help. This did *not* actually
|
||||||
|
occur on the Wise imports (that was the summary bug above), but it is why an
|
||||||
|
empty statement must not throw: a document that errors never gets tagged, so it
|
||||||
|
is re-fetched every poll forever and blocks everything behind it in the queue
|
||||||
|
(`ordering=-created`, `page_size=1`).
|
||||||
|
|
||||||
|
**FX is per transaction date**, via Frankfurter (ECB daily, free, no key), with
|
||||||
|
weekends resolving to the prior publication. A single spot rate across a 15-month
|
||||||
|
statement is wrong by up to 20%. Wise's own rates are more accurate in principle
|
||||||
|
but differ by only 0.05% and exist on 44 of 194 rows, so mixing bases is not
|
||||||
|
worth it.
|
||||||
|
|
||||||
|
**When comparing CSV exports to extracted data, order by full timestamp
|
||||||
|
including milliseconds.** Two of one statement's rows are 1ms apart; dropping the
|
||||||
|
fraction reversed them and produced a bogus opening balance.
|
||||||
|
|
||||||
|
## Development Patterns
|
||||||
|
|
||||||
|
### Adding a new API route
|
||||||
|
|
||||||
|
1. Create `src/app/api/<resource>/route.ts`
|
||||||
|
2. Always call `getCurrentUser(req)` first; return 403 if null
|
||||||
|
3. Write SQL in `src/lib/queries.ts` using `queryRaw`
|
||||||
|
4. Add a TanStack Query hook in `src/lib/hooks.ts`
|
||||||
|
|
||||||
|
### Adding a new condition field to rules
|
||||||
|
|
||||||
|
Two files only:
|
||||||
|
- `src/app/api/rules/apply/route.ts` — add to `Condition.field` union, `TxFields` interface, and `evaluateCondition()` switch
|
||||||
|
- `src/app/rules/page.tsx` — add to `FIELDS` array; add special rendering if needed (e.g. enum dropdown for `transaction_type`)
|
||||||
|
|
||||||
|
### Modifying queries
|
||||||
|
|
||||||
|
- All JOINs to `statements` must be `LEFT JOIN` (manual transactions have no statement)
|
||||||
|
- Owner filter pattern: `WHERE COALESCE(t.owner_id, s.owner_id) = $1`
|
||||||
|
- Bank name pattern: `COALESCE(s.bank_name, 'Manual') as bank_name`
|
||||||
|
|
||||||
|
Analytics queries must import the fragments from `src/lib/analytics-sql.ts`
|
||||||
|
(`STATEMENTS_JOIN`, `OWNER_SCOPE`, `EFFECTIVE_CATEGORY`, `EXCLUDE_NON_SPEND`)
|
||||||
|
rather than hand-rolling them. Two failure modes they exist to prevent:
|
||||||
|
|
||||||
|
- An `INNER JOIN statements` + `WHERE s.owner_id = $1` silently drops every
|
||||||
|
manual/CSV transaction (`statement_id IS NULL`).
|
||||||
|
- Spend must exclude the `transfers` and `investment` categories. Once bank
|
||||||
|
statements are imported alongside card statements, a credit-card payment
|
||||||
|
appears twice — as a debit leaving the bank account and as the underlying
|
||||||
|
purchases on the card statement. Excluding `transfers` is what nets it out.
|
||||||
|
Use the `EXCLUDE_NON_SPEND` fragment: a bare `category NOT IN (...)` evaluates
|
||||||
|
to NULL for uncategorised rows and drops them from totals.
|
||||||
|
|
||||||
|
### Statement types
|
||||||
|
|
||||||
|
`statements.statement_type` is constrained to `credit_card | transaction |
|
||||||
|
savings | loan | offset | investment | other`. Migration 0013 added a
|
||||||
|
`normalize_statement_type()` SQL function plus a BEFORE INSERT/UPDATE trigger, so
|
||||||
|
the N8N workflow can keep sending raw free text (`'ACCESS ADVANTAGE'`, `'Business
|
||||||
|
Card'`) and the DB normalises it on write. The raw extracted value is preserved in
|
||||||
|
`account_type`.
|
||||||
|
|
||||||
|
The TypeScript mirror is `src/lib/statement-types.ts` — keep the list, the SQL
|
||||||
|
function, and the CHECK constraint in sync when adding a type.
|
||||||
|
|
||||||
|
### Loans
|
||||||
|
|
||||||
|
A loan repayment is **not** an expense. It is part principal (equity, a
|
||||||
|
balance-sheet move) and part interest (the only part that is spend). Migration
|
||||||
|
0014 adds:
|
||||||
|
|
||||||
|
- `transactions.principal_amount` / `interest_amount` — populated only when the
|
||||||
|
lender itemises the split on the repayment row itself
|
||||||
|
- `statements.interest_rate`, `scheduled_repayment`, `repayment_frequency`,
|
||||||
|
`redraw_available`, `loan_term_months`
|
||||||
|
|
||||||
|
Two statement shapes, both handled:
|
||||||
|
|
||||||
|
1. **Separate rows** (the common Australian case) — the loan statement lists
|
||||||
|
repayments and "Interest Charged" separately. `transaction_type` alone is
|
||||||
|
enough: `interest` rows count as spend, `payment` rows don't. No split columns
|
||||||
|
needed.
|
||||||
|
2. **Itemised repayment row** — some lenders print principal and interest on the
|
||||||
|
repayment line. That row is typed `payment`, so it would be skipped entirely
|
||||||
|
and its interest lost. The `SPEND_ROWS` / `SPEND_BASE` fragments in
|
||||||
|
`analytics-sql.ts` handle it: a row with a non-null `interest_amount` counts
|
||||||
|
as spend, valued at `interest_amount` rather than `amount`.
|
||||||
|
|
||||||
|
The N8N `Parse Gemini Result` node only accepts a split when both parts are
|
||||||
|
present *and* they sum to the row amount (±2c) — a half-extracted split would
|
||||||
|
silently misreport spend, so it is discarded rather than trusted.
|
||||||
|
|
||||||
|
Loan interest uses the `loan_interest` category; principal repayments use
|
||||||
|
`investment` (excluded from spend, surfaced on the investments line in monthly
|
||||||
|
analytics).
|
||||||
|
|
||||||
|
### The investments line is signed
|
||||||
|
|
||||||
|
A withdrawal from a fund is a **disinvestment**, not income. Units convert back
|
||||||
|
to cash; net worth is unchanged. `INVESTMENT_SIGNED` (`analytics-sql.ts`) makes
|
||||||
|
credits and refunds negative so they net against contributions, and
|
||||||
|
`/api/analytics/monthly` is the only consumer.
|
||||||
|
|
||||||
|
Summed unsigned, a withdrawal read as *more* money invested: March 2026 showed
|
||||||
|
$38,615.34 of investing in a month that was net **−$11,384.66**, because a
|
||||||
|
$25,000 Raiz withdrawal was added to an $8,563.80 IBKR deposit instead of
|
||||||
|
cancelling it. **Each credit costs twice** — once for being added, once for not
|
||||||
|
being subtracted — so the error is double the credit, $50,000 in that month.
|
||||||
|
|
||||||
|
Filing withdrawals as `income` is the other tempting answer and is worse: it
|
||||||
|
books an asset disposal as earnings and feeds `net = income − spent −
|
||||||
|
investments` with a flattering sign. Same reason the Up item sales in Known Gaps
|
||||||
|
do not belong on the income line.
|
||||||
|
|
||||||
|
**What this cannot resolve:** part of a withdrawal genuinely *is* income — the
|
||||||
|
capital gain. The bank descriptor is one gross figure with no cost base
|
||||||
|
(`TRANSFER FROM RAIZ WITHDRAWAL 7D5262D8A839248A12`), so it cannot be decomposed
|
||||||
|
from statement data. Netting tracks cash committed against cash returned and
|
||||||
|
leaves the gain for holdings data to surface; it does not assert the gain is zero.
|
||||||
|
|
||||||
|
Consequence for the UI: a net-disinvesting month is real data, so the budget page
|
||||||
|
gates on `!== 0`, not `> 0`, and renders negatives in amber.
|
||||||
|
|
||||||
|
### Prisma
|
||||||
|
|
||||||
|
The schema at `prisma/schema.prisma` covers all tables. The generated client (gitignored) must be regenerated after schema changes:
|
||||||
|
```bash
|
||||||
|
cd /mnt/m2cache/appdata/finance-app && npx prisma generate
|
||||||
|
```
|
||||||
|
Docker builds run `npx prisma generate` automatically. Do not commit `src/generated/prisma/` — it is gitignored.
|
||||||
|
|
||||||
|
## Agent / MCP Access
|
||||||
|
|
||||||
|
Agents read this DB through the read-only `postgres-personal` MCP server (lives in the
|
||||||
|
`personal-agent-gateway` repo, not here): `agent_ro` role, SELECT-only, SQLGlot guardrail,
|
||||||
|
100-row cap, every call audited to `mcp_query_log`. See `docs/agent-access.md` for the tool
|
||||||
|
list, the five analysis views, and per-client setup (Claude Code, Codex, Hermes).
|
||||||
|
|
||||||
|
Two things to remember when changing the schema: the agent views are created by
|
||||||
|
`smarthome/personal-agent/migrations/006_agent_read_role_views.sql` (not Prisma) and read
|
||||||
|
`transactions`/`statements`/`expense_metadata` columns directly — rename a column and they
|
||||||
|
break or go stale. And the views are **not** owner-scoped and do **not** merge
|
||||||
|
`transaction_overrides`, so agent numbers can differ from the UI.
|
||||||
|
|
||||||
|
## Known Gaps / TODOs
|
||||||
|
|
||||||
|
See `README.md` → **Known Gaps / TODOs** for full details.
|
||||||
|
|
||||||
|
**Payment provider tracking**: `merchant_normalized` currently conflates payment provider (PayPal, Afterpay, Zip) with the actual merchant. Plan: add `payment_provider` column, update Gemini prompt to extract it separately, backfill from `merchant_name` patterns, surface in UI filters.
|
||||||
|
|
||||||
|
### Open as of 2026-07-29
|
||||||
|
|
||||||
|
- **Shared expenses: loan section only** — the redesign in
|
||||||
|
`docs/shared-expenses-design.md` is built and live as of 2026-07-28; the
|
||||||
|
loan model at the end of that doc remains a proposal (Sonu's `…emi`
|
||||||
|
contributions still read as ordinary transfers).
|
||||||
|
- **Expense baseline / emergency reserve** — `docs/expense-baseline.md`. One-off
|
||||||
|
analysis, nothing built. Records four data corrections the raw numbers need
|
||||||
|
(misfiled Raiz/super/brokerage debits, `other` credits read as negative spend,
|
||||||
|
`government` conflating ATO with rates/rego, `fees` being mostly annual) and
|
||||||
|
why only Feb–Jun 2026 is trustworthy for per-person figures.
|
||||||
|
- **11 statements fail the balance assertion**, ~$4,177 unexplained. Predates
|
||||||
|
this work. One ANZ statement is off by exactly $0.50, traced to a misread digit
|
||||||
|
in fee rows ($5.00 vs $5.50).
|
||||||
|
- **28 Up Bank debits are categorised `other`** ($3,760.74). Up only categorised
|
||||||
|
16 of 88 rows. The `Payee` field is populated throughout, so merchant rules plus
|
||||||
|
the rule preview should clear most of it.
|
||||||
|
- **Up item sales are categorised `income`** ($4,238.04 across 19 credits — iPad,
|
||||||
|
drone, camera). Correct in that they are excluded from spend, but it mixes
|
||||||
|
asset disposals into the income line alongside salary.
|
||||||
|
- **`payment_method` is not shown in the transactions list** — settable on create
|
||||||
|
and edit only. Worth a column or filter if cash becomes routine.
|
||||||
|
- **Raw statement exports live in `dump/`**, gitignored since `31a8177`. They were
|
||||||
|
committed by accident in `030490e` and remain in that commit's history; the repo
|
||||||
|
has no GitHub remote, so exposure is limited to the local Gitea. Purging history
|
||||||
|
was offered and not actioned.
|
||||||
@@ -1,36 +1,409 @@
|
|||||||
This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
|
# Finance App
|
||||||
|
|
||||||
## Getting Started
|
Personal finance tracker built on Next.js 16 (App Router), PostgreSQL, and Prisma. Bank statements are ingested automatically from Paperless-NGX via an N8N workflow that uses Gemini to extract structured data from PDF statements.
|
||||||
|
|
||||||
First, run the development server:
|
## Stack
|
||||||
|
|
||||||
```bash
|
- **Frontend**: Next.js 16 App Router, TypeScript, Tailwind CSS, Recharts
|
||||||
npm run dev
|
- **Backend**: Next.js API routes, raw PostgreSQL via `pg` + `@prisma/adapter-pg`
|
||||||
# or
|
- **Database**: PostgreSQL (`postgres-personal` container)
|
||||||
yarn dev
|
- **Auth**: `X-Forwarded-User` header (email) set by Traefik forward-auth → mapped to `participants.email`
|
||||||
# or
|
- **Ingestion**: N8N workflow → Gemini 2.5 Flash (PDF parsing) → PostgreSQL
|
||||||
pnpm dev
|
|
||||||
# or
|
---
|
||||||
bun dev
|
|
||||||
|
## Data Model
|
||||||
|
|
||||||
|
### `statements`
|
||||||
|
The top-level document, one row per billing period per account.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `id` | int | Primary key |
|
||||||
|
| `bank_name` | text | Normalised bank name (e.g. "American Express") |
|
||||||
|
| `card_name` | text | Product name (e.g. "Rewards Travel Adventures") |
|
||||||
|
| `account_number` | text | Account/card number (spaces stripped) |
|
||||||
|
| `account_type` | text | Raw account type string from statement |
|
||||||
|
| `statement_type` | text | Normalised type: `Credit Card`, `Business Card`, `multi-currency account`, etc. |
|
||||||
|
| `account_holder_name` | text | Name on the account if extracted |
|
||||||
|
| `billing_start_date` | date | Period start |
|
||||||
|
| `billing_end_date` | date | Period end — used as the deduplication anchor |
|
||||||
|
| `opening_balance` | numeric | Balance at start of period |
|
||||||
|
| `closing_balance` | numeric | Balance at end of period |
|
||||||
|
| `total_credits` | numeric | Sum of all credits in period |
|
||||||
|
| `total_debits` | numeric | Sum of all debits in period |
|
||||||
|
| `total_amount_due` | numeric | Amount due (credit cards) |
|
||||||
|
| `minimum_amount_due` | numeric | Minimum payment due (credit cards) |
|
||||||
|
| `payment_due_date` | date | Payment due date (credit cards) |
|
||||||
|
| `credit_limit` | numeric | Credit limit (credit cards) |
|
||||||
|
| `available_credit` | numeric | Available credit at statement date |
|
||||||
|
| `interest_charged` | numeric | Interest charged this period (from statement summary) |
|
||||||
|
| `fees_charged` | numeric | Fees charged this period (from statement summary) |
|
||||||
|
| `currency` | text | Statement currency (e.g. `AUD`, `USD`) |
|
||||||
|
| `exchange_rate_to_aud` | numeric | FX rate at ingestion time (live from open.er-api.com) |
|
||||||
|
| `owner_id` | int FK → `participants` | Which person owns this statement |
|
||||||
|
| `paperless_doc_id` | int | Paperless-NGX document ID — deduplication key |
|
||||||
|
| `tier_used` | text | AI model used for extraction (e.g. `gemini-2.5-flash`) |
|
||||||
|
| `event_created` | bool | Whether a Google Calendar reminder was created for payment due date |
|
||||||
|
|
||||||
|
**Deduplication**: unique index on `(bank_name, account_number, billing_end_date)` prevents re-ingestion of the same period. `paperless_doc_id` has a separate unique index for Paperless-linked documents.
|
||||||
|
|
||||||
|
**Credit card detection**: `statement_type ILIKE '%card%'`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `transactions`
|
||||||
|
One row per line item within a statement. Cascade-deleted when the parent statement is deleted.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `id` | int | Primary key |
|
||||||
|
| `statement_id` | int FK → `statements` (nullable) | Parent statement; NULL for manually-entered transactions |
|
||||||
|
| `owner_id` | int FK → `participants` (nullable) | Owner for manual transactions (no statement); statement-linked transactions derive owner from `statements.owner_id` |
|
||||||
|
| `transaction_date` | date | Date of transaction |
|
||||||
|
| `description` | text | Raw description from the statement |
|
||||||
|
| `amount` | numeric | Original amount in statement currency |
|
||||||
|
| `amount_aud` | numeric | AUD-converted amount (= amount if already AUD) |
|
||||||
|
| `transaction_type` | text | `debit`, `credit`, `payment`, `refund`, `fee`, `interest`, `transfer` |
|
||||||
|
| `merchant_name` | text | Raw merchant name extracted by Gemini |
|
||||||
|
| `merchant_normalized` | text | Cleaned/normalised merchant name (Gemini) |
|
||||||
|
| `location` | text | Location if present on statement |
|
||||||
|
| `foreign_currency_amount` | numeric | Original foreign amount if this was an FX transaction |
|
||||||
|
| `foreign_currency_code` | text | Foreign currency code (e.g. `USD`) |
|
||||||
|
| `category` | text | AI-assigned category (see category taxonomy below) |
|
||||||
|
| `row_index` | int | Position in statement — used for deduplication |
|
||||||
|
| `reconciled_with_id` | int FK → `transactions` (nullable) | Links a manually-entered transaction to its matching statement transaction after reconciliation |
|
||||||
|
| `created_at` | timestamptz | When the row was inserted — the "import date". For reconciled transactions the UI shows the original manual/CSV `created_at`, not the statement's |
|
||||||
|
|
||||||
|
**Deduplication**: unique index on `(statement_id, transaction_date, description, amount, row_index)`.
|
||||||
|
|
||||||
|
**Analytics**: all spend queries use `amount_aud` for cross-currency consistency. Split-adjusted queries apply `amount_aud * share_percent / 100` where a split exists for the current user.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `transaction_overrides`
|
||||||
|
User corrections to AI-extracted data. Stored separately to preserve the original extraction.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `transaction_id` | int FK → `transactions` (unique) | One override per transaction |
|
||||||
|
| `merchant_normalized` | text | User-corrected merchant name |
|
||||||
|
| `category_override` | text | User-corrected category |
|
||||||
|
| `notes` | text | Free-text notes |
|
||||||
|
|
||||||
|
All analytics queries use `COALESCE(o.category_override, t.category)` and `COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name)` to prefer overrides over AI values.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `transaction_splits`
|
||||||
|
Shared expense tracking — records that a transaction was split between participants.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `transaction_id` | int FK → `transactions` | The transaction being split |
|
||||||
|
| `participant_id` | int FK → `participants` | Who shares in this transaction |
|
||||||
|
| `share_percent` | numeric(5,2) | Their percentage (1–100) |
|
||||||
|
| `settled` | bool | Whether this share has been settled |
|
||||||
|
| `settled_at` | timestamptz | When it was settled |
|
||||||
|
|
||||||
|
A transaction can be split across multiple participants. The statement owner's own share is implicit (`100 - SUM(other shares)`). Analytics queries LEFT JOIN `transaction_splits` on `participant_id = current_user.id` — if no split row exists, the full amount belongs to the owner.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `transaction_tags`
|
||||||
|
Many-to-many join between transactions and tags.
|
||||||
|
|
||||||
|
| Column | Type |
|
||||||
|
|--------|------|
|
||||||
|
| `transaction_id` | int FK → `transactions` |
|
||||||
|
| `tag_id` | int FK → `tags` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `tags`
|
||||||
|
User-defined coloured labels for ad-hoc transaction grouping beyond the fixed category taxonomy.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `id` | int | Primary key |
|
||||||
|
| `name` | text (unique) | Tag name |
|
||||||
|
| `color` | text | Hex colour (default `#6366f1`) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `participants`
|
||||||
|
People who own statements or share expenses.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `id` | int | Primary key |
|
||||||
|
| `name` | text (unique) | Display name |
|
||||||
|
| `email` | text (unique) | Login identity — matched against `X-Forwarded-User` header |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `account_owner_mappings`
|
||||||
|
Persists `(bank, account_number) → owner` assignments so future ingestion auto-assigns the correct owner without manual intervention.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `bank_name` | text | |
|
||||||
|
| `account_number` | text | |
|
||||||
|
| `owner_id` | int FK → `participants` | |
|
||||||
|
|
||||||
|
Written when a user reassigns a statement owner in the UI. Consulted by the N8N workflow on every new statement insert.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `rules`
|
||||||
|
Saved auto-categorisation rules. Applied in bulk via the Rules page.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `owner_id` | int FK → `participants` | Rule belongs to this user |
|
||||||
|
| `name` | text | Rule label |
|
||||||
|
| `conditions` | jsonb | Array of `{field, operator, value}` — AND logic |
|
||||||
|
| `actions` | jsonb | `{set_category, add_tag_ids, set_merchant}` |
|
||||||
|
| `enabled` | bool | |
|
||||||
|
| `priority` | int | Higher priority rules run first |
|
||||||
|
|
||||||
|
**Condition fields**: `merchant_normalized`, `description`, `category`, `bank_name`, `amount`, `transaction_type`
|
||||||
|
**Condition operators**: `contains`, `equals`, `starts_with`, `gt`, `lt`, `not_equals`
|
||||||
|
**Actions**: `set_category`, `set_merchant`, `add_tag_ids`, `apply_split`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `split_payments`
|
||||||
|
Records of actual cash settlements between participants.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `from_participant_id` | int FK → `participants` | Who paid |
|
||||||
|
| `to_participant_id` | int FK → `participants` | Who received |
|
||||||
|
| `amount` | numeric | Amount settled |
|
||||||
|
| `payment_date` | date | Date of settlement |
|
||||||
|
| `notes` | text | Optional note (e.g. "bank transfer") |
|
||||||
|
| `linked_transaction_id` | int FK → `transactions` (nullable) | If the payment was itself a transaction |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `expense_metadata`
|
||||||
|
Enrichment records for non-statement expenses (email receipts, manual entries). Linked to a `transaction` if one exists; otherwise a standalone record awaiting reconciliation.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `transaction_id` | int FK → `transactions` (unique, nullable) | Linked transaction; NULL until reconciled |
|
||||||
|
| `source` | text | Origin: `email`, `manual` |
|
||||||
|
| `paperless_doc_id` | int | Paperless-NGX document ID |
|
||||||
|
| `payment_method` | text | `credit_card`, `debit_card`, `paypal`, `afterpay`, `cash`, etc. |
|
||||||
|
| `payment_method_detail` | text | Card last-4 or provider detail |
|
||||||
|
| `order_reference` | text | Order/confirmation number |
|
||||||
|
| `line_items` | jsonb | Array of `{description, qty, unit_price, total}` |
|
||||||
|
| `merchant_normalized` | text | Canonical merchant for matching |
|
||||||
|
| `amount` / `transaction_date` | numeric / date | Used for reconciliation matching when `transaction_id IS NULL` |
|
||||||
|
| `extraction_model` | text | AI model used (`gemini-2.5-flash`) |
|
||||||
|
|
||||||
|
Partial index on `(merchant_normalized, transaction_date) WHERE transaction_id IS NULL` powers reconciliation queries.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `rule_apply_runs`
|
||||||
|
Audit log of bulk rule-apply operations. Each run captures which transactions were affected and a full snapshot for revert support.
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `owner_id` | int FK → `participants` | |
|
||||||
|
| `applied_at` | timestamptz | When the run executed |
|
||||||
|
| `split_from` | date | Optional date filter used for this run |
|
||||||
|
| `matched` | int | Number of rules matched |
|
||||||
|
| `transactions_affected` | int | Number of transactions changed |
|
||||||
|
| `reverted_at` | timestamptz | Set when run was reverted |
|
||||||
|
| `snapshot` | jsonb | Pre-run state of all affected transactions |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### `budgets`
|
||||||
|
Monthly spend targets per category. Stored but currently unused in the UI (replaced by the analytics/insights views).
|
||||||
|
|
||||||
|
| Column | Type | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `owner_id` | int FK → `participants` | |
|
||||||
|
| `category` | text | Category name |
|
||||||
|
| `month` | date | Always first of month (e.g. `2026-03-01`) |
|
||||||
|
| `amount_limit` | numeric | Spend target for that category/month |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Category Taxonomy
|
||||||
|
|
||||||
|
Fixed set defined in `src/lib/categories.ts`. Applied by Gemini at ingestion and overridable by the user or rules engine:
|
||||||
|
|
||||||
|
`groceries` · `dining` · `transport` · `fuel` · `shopping` · `utilities` · `entertainment` · `travel` · `health` · `insurance` · `subscriptions` · `cash_advance` · `government` · `education` · `rent` · `home_goods` · `home_maintenance` · `transfers` · `income` · `investment` · `personal_care` · `pets` · `gifts` · `charity` · `other`
|
||||||
|
|
||||||
|
- **home_goods** — items purchased for the house (appliances, furniture, kitchenware, electronics)
|
||||||
|
- **home_maintenance** — services on the property (cleaning, mowing, repairs)
|
||||||
|
|
||||||
|
**Committed spend** (Insights page): `rent`, `utilities`, `insurance`, `subscriptions`
|
||||||
|
**Excluded from spend analytics**: `transfers`, `investment`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## API Routes
|
||||||
|
|
||||||
|
All routes require authentication via `X-Forwarded-User` header (set by Traefik). Responses are always scoped to the authenticated user's `owner_id`.
|
||||||
|
|
||||||
|
| Method | Route | Description |
|
||||||
|
|--------|-------|-------------|
|
||||||
|
| GET | `/api/statements` | All statements for current user |
|
||||||
|
| GET / PATCH | `/api/statements/[id]` | Get statement; PATCH to reassign owner (also writes `account_owner_mappings`) |
|
||||||
|
| GET | `/api/transactions` | Paginated transactions. Filters: `from`, `to`, `categories`, `bank_names`, `tag_ids`, `transaction_types`, `search`, `statement_id`, `amount_min`, `amount_max`, `has_split` (`yes`/`no`). Sort: `sort_by` (`transaction_date`\|`amount`\|`created_at`), `sort_dir` (`asc`\|`desc`) |
|
||||||
|
| POST | `/api/transactions` | Create a manual transaction (no statement) |
|
||||||
|
| GET / PATCH | `/api/transactions/[id]` | Get transaction; PATCH to upsert override (category, merchant, notes) |
|
||||||
|
| GET / POST | `/api/transactions/[id]/splits` | List or create splits on a transaction |
|
||||||
|
| GET / POST | `/api/transactions/[id]/tags` | List or apply tags to a transaction |
|
||||||
|
| POST | `/api/transactions/bulk` | Bulk update category/merchant across multiple transactions |
|
||||||
|
| POST | `/api/transactions/reconcile` | Link manual transactions to statement transactions; copies overrides, tags, splits across |
|
||||||
|
| GET | `/api/analytics/monthly` | Split-adjusted monthly spend by category + income + investments. Params: `months` (1–24, default 6) |
|
||||||
|
| GET | `/api/analytics/subscriptions` | Recurring charge detection — merchants with ≥3 occurrences at consistent intervals |
|
||||||
|
| GET | `/api/analytics/fees` | Fees and interest from statement summaries + individual fee/interest transactions |
|
||||||
|
| GET | `/api/shared-transactions` | Transactions with active splits; sorted client-side by date/imported/amount in the UI |
|
||||||
|
| POST | `/api/splits/settle` | Mark a split as settled |
|
||||||
|
| GET / POST | `/api/split-payments` | List or record cash settlements between participants |
|
||||||
|
| GET / POST | `/api/participants` | List participants; POST to create (with optional `email`) |
|
||||||
|
| GET | `/api/participants/[id]/balance` | Net balance owed by/to a specific participant |
|
||||||
|
| GET | `/api/participants/balances` | All participant balances |
|
||||||
|
| GET / POST | `/api/rules` | List or create rules |
|
||||||
|
| PATCH / DELETE | `/api/rules/[id]` | Update or delete a rule |
|
||||||
|
| POST | `/api/rules/apply` | Run all enabled rules against all transactions; returns `{matched, transactions_affected}` |
|
||||||
|
| GET / POST | `/api/budgets` | List budgets for a month (`?month=YYYY-MM`); upsert budget |
|
||||||
|
| DELETE | `/api/budgets/[id]` | Delete a budget |
|
||||||
|
| GET | `/api/merchants` | Merchant name autocomplete suggestions |
|
||||||
|
| GET | `/api/me` | Current user info derived from `X-Forwarded-User` header |
|
||||||
|
| GET / POST | `/api/tags` | List or create tags |
|
||||||
|
| PATCH / DELETE | `/api/tags/[id]` | Update or delete a tag |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Ingestion Pipeline
|
||||||
|
|
||||||
|
```
|
||||||
|
Paperless-NGX
|
||||||
|
└─ documents tagged "Bank Statement" + "Credit Card" (without "cc-processor")
|
||||||
|
│
|
||||||
|
▼
|
||||||
|
N8N workflow — polls every 5 minutes (workflow ID: FysADdFwEtwONQl4)
|
||||||
|
│
|
||||||
|
├─ Duplicate check: SELECT WHERE paperless_doc_id = <id>
|
||||||
|
│ └─ Already processed → skip, mark in Paperless
|
||||||
|
│
|
||||||
|
├─ Download PDF binary from Paperless API
|
||||||
|
│
|
||||||
|
├─ Gemini 2.5 Flash — PDF → structured JSON
|
||||||
|
│ responseSchema: { summary: {...}, transactions: [...] }
|
||||||
|
│ timeout: 180s, retryOnFail: 3×, delay: 30s
|
||||||
|
│
|
||||||
|
├─ Parse & normalise
|
||||||
|
│ account_number: strip spaces
|
||||||
|
│ bank_name: title-case
|
||||||
|
│ FX rate: fetch live from open.er-api.com if non-AUD
|
||||||
|
│
|
||||||
|
├─ Statement exists? (bank + account + billing_end_date)
|
||||||
|
│ └─ Duplicate → skip, mark in Paperless
|
||||||
|
│
|
||||||
|
├─ New bank? → Slack approval gate (human confirms before insert)
|
||||||
|
│
|
||||||
|
├─ Lookup account_owner_mappings → resolve owner_id (default: 1 = "Me")
|
||||||
|
│
|
||||||
|
├─ INSERT statements + transactions
|
||||||
|
│
|
||||||
|
├─ Google Calendar reminder for payment_due_date (credit cards)
|
||||||
|
│
|
||||||
|
└─ Paperless: PATCH document to add "cc-processor" tag
|
||||||
```
|
```
|
||||||
|
|
||||||
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
|
N8N workflow JSON: `docker/automation/workflows/cc-statement-processor-paperless.json` in the smarthome repo.
|
||||||
|
|
||||||
You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
|
---
|
||||||
|
|
||||||
This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
|
## Schema Migrations
|
||||||
|
|
||||||
## Learn More
|
Located in `prisma/migrations/`. Applied manually against the running container:
|
||||||
|
|
||||||
To learn more about Next.js, take a look at the following resources:
|
```bash
|
||||||
|
docker exec postgres-personal psql -U personal -d personal \
|
||||||
|
< prisma/migrations/<migration>/migration.sql
|
||||||
|
```
|
||||||
|
|
||||||
- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
|
| Migration | What it adds |
|
||||||
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
|
|-----------|-------------|
|
||||||
|
| `0001_init` | `statements`, `transactions`, `participants` |
|
||||||
|
| `0002_splits` | `transaction_splits` |
|
||||||
|
| `0003_owner_segregation` | `owner_id` on statements, `account_owner_mappings`, `email` on participants |
|
||||||
|
| `0004_tags` | `tags`, `transaction_tags` |
|
||||||
|
| `0005_rules` | `rules` |
|
||||||
|
| `0006_budgets` | `budgets` |
|
||||||
|
| `0007_cashflow` | `amount_aud`, `exchange_rate_to_aud` on transactions; `exchange_rate_to_aud` on statements |
|
||||||
|
| `0008_my_share_percent` | `my_share_percent` on `transaction_overrides` |
|
||||||
|
| `0009_split_payments` | `split_payments` |
|
||||||
|
| `0010_csv_import_reconcile` | `reconciled_with_id`, CSV import support |
|
||||||
|
| `0011_trips` | `trips`, `trip_id` on `transaction_overrides` (catch-up — was applied directly) |
|
||||||
|
|
||||||
You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
|
> `paperless_doc_id` on statements and the `uq_statements_paperless_doc_id` index were added directly (not tracked in a migration file).
|
||||||
|
> `owner_id` on transactions and `statement_id` made nullable were applied directly (March 2026) to support manual transaction entry without a fake statement.
|
||||||
|
> `reconciled_with_id` on transactions, `expense_metadata`, `rule_apply_runs`, `split_payments` were added directly and are covered by the Prisma schema but lack individual migration files.
|
||||||
|
|
||||||
## Deploy on Vercel
|
---
|
||||||
|
|
||||||
The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
|
## Known Gaps / TODOs
|
||||||
|
|
||||||
Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
|
### Payment Provider tracking
|
||||||
|
|
||||||
|
Currently `merchant_normalized` conflates the *payment provider* with the *merchant*. Transactions processed through PayPal, Afterpay, Zip, Alipay, etc. end up with the provider as the merchant when the real merchant can't be recovered.
|
||||||
|
|
||||||
|
**What's been done so far:**
|
||||||
|
- PayPal entries that embed the merchant name (e.g. `PAYPAL *BUNNINGSGRO`) were cleaned up — the real merchant was extracted during the March 2026 consolidation pass.
|
||||||
|
- Pure PayPal/Afterpay/Zip entries where the merchant is unrecoverable were left as-is.
|
||||||
|
- A one-time SQL consolidation pass normalised ~50 merchant name variant groups (March 2026).
|
||||||
|
|
||||||
|
**Remaining work:**
|
||||||
|
1. **DB migration**: `ALTER TABLE transactions ADD COLUMN payment_provider text` and same on `transaction_overrides`.
|
||||||
|
2. **Gemini prompt**: add `payment_provider` to the `responseSchema` so the AI extracts it separately (`"PayPal"`, `"Afterpay"`, `"Zip"`, `null`, etc.) — the raw bank description usually contains enough signal.
|
||||||
|
3. **Backfill**: for existing transactions, derive `payment_provider` from `merchant_name` patterns (`PAYPAL *`, `AFTERPAY`, `ZIP/ZIPPAY`, `BPAY`).
|
||||||
|
4. **App**: surface `payment_provider` as a filter/column in the transactions view; exclude payment providers from merchant analytics so they don't inflate the merchant list.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Agent Access (MCP)
|
||||||
|
|
||||||
|
LLM agents read this data through the read-only `postgres-personal` MCP server (7 typed
|
||||||
|
finance tools + guarded `adhoc_query`, `agent_ro` role, 100-row cap, `mcp_query_log`
|
||||||
|
audit). It's a stdio server, so any MCP client can use it — Hermes, Claude Code, Codex,
|
||||||
|
Claude Desktop — locally via `docker exec` or remotely over SSH.
|
||||||
|
|
||||||
|
**→ [docs/agent-access.md](docs/agent-access.md)** — architecture, tool + view reference,
|
||||||
|
per-client setup, and what changing the schema means for the agent views.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Deployment
|
||||||
|
|
||||||
|
Runs as a Docker container alongside the rest of the home lab stack.
|
||||||
|
|
||||||
|
**Push-to-deploy (default, since 2026-07-19)**: pushing to `main` on Gitea fires a
|
||||||
|
webhook to Komodo's `deploy-finance` Procedure, which redeploys the `finance` stack
|
||||||
|
with `--build`. CI (Gitea Actions) runs lint + unit tests on the same push.
|
||||||
|
|
||||||
|
**Manual fallback** if Komodo is unavailable:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# From smarthome repo root
|
||||||
|
docker compose --env-file docker/common.env --env-file docker/finance/.env \
|
||||||
|
-f docker/finance/docker-compose.yml up -d --build
|
||||||
|
```
|
||||||
|
|
||||||
|
The container is only reachable via Traefik (`https://finance.bosecamp.com`, forward-auth
|
||||||
|
sets `X-Forwarded-User`) plus a `127.0.0.1`-bound host port for on-box debugging — the
|
||||||
|
app trusts the `X-Forwarded-User` header, so it must never be directly reachable from
|
||||||
|
the LAN.
|
||||||
|
|
||||||
|
The container uses Next.js standalone output. `@prisma/adapter-pg` and `pg` are listed in `serverExternalPackages` in `next.config.ts` to ensure they are included in the standalone bundle.
|
||||||
|
|||||||
@@ -0,0 +1,238 @@
|
|||||||
|
# Agent Access — querying the finance data from an LLM agent
|
||||||
|
|
||||||
|
How an AI agent (Hermes, Claude Code, Codex, Claude Desktop, …) reads the finance
|
||||||
|
database. **Read-only, audited, row-capped.** Agents never write to `personal`.
|
||||||
|
|
||||||
|
The read path is an MCP server — `postgres-personal` — that lives in the
|
||||||
|
[`personal-agent-gateway`](ssh://git@localhost:2222/siddharthd/personal-agent-gateway.git)
|
||||||
|
repo at `mcp-servers/postgres-personal/`. This app owns the data; that repo owns the
|
||||||
|
server. Keep both in mind when changing the schema (see [Schema changes](#schema-changes-that-affect-agents)).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```
|
||||||
|
agent client (Hermes / Claude Code / Codex)
|
||||||
|
│ stdio (JSON-RPC, MCP)
|
||||||
|
▼
|
||||||
|
server.py ── guardrails.validate_select (SQLGlot: single SELECT, LIMIT ≤ 100)
|
||||||
|
├── PG_DSN_RO → role agent_ro (SELECT only, statement_timeout 5s) → queries
|
||||||
|
└── PG_DSN_LOG → role agent_log (INSERT into mcp_query_log only) → audit
|
||||||
|
```
|
||||||
|
|
||||||
|
Both roles, the audit table, and the five analysis views are created by
|
||||||
|
`smarthome/personal-agent/migrations/006_agent_read_role_views.sql` — **not** by this
|
||||||
|
repo's Prisma migrations. Passwords are supplied at apply time from Infisical
|
||||||
|
(`homelab-w-ae9 / prod / /agent-gateway`), never stored in the SQL file.
|
||||||
|
|
||||||
|
Defence in depth, in order:
|
||||||
|
|
||||||
|
1. `agent_ro` has no write grants at all — the DB refuses writes regardless of the SQL.
|
||||||
|
2. `validate_select` parses every SQL string (typed tools and `adhoc_query` alike) and
|
||||||
|
rejects anything that isn't one plain `SELECT`, plus `pg_sleep`/`pg_read_file`/
|
||||||
|
`dblink`/`lo_import`/`lo_export`. It rewrites `LIMIT` to ≤ 100.
|
||||||
|
3. Third-party text columns (`description`, `location`, `order_reference`, `line_items`)
|
||||||
|
come back wrapped in `<<untrusted-data>>…<</untrusted-data>>` so the runtime's system
|
||||||
|
prompt can treat statement/receipt text as data, never instructions.
|
||||||
|
4. Every call — accepted or rejected — is inserted into `mcp_query_log`
|
||||||
|
(`tool, args, sql, row_count, duration_ms, error`).
|
||||||
|
|
||||||
|
Audit review:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker exec postgres-personal psql -U personal -d personal -c \
|
||||||
|
"SELECT at, tool, row_count, duration_ms, error FROM mcp_query_log ORDER BY at DESC LIMIT 20"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Tools
|
||||||
|
|
||||||
|
| Tool | What it answers |
|
||||||
|
|---|---|
|
||||||
|
| `query_statements` | Statements by bank / account number / `billing_end_date` range |
|
||||||
|
| `query_transactions` | Transaction search: merchant, category, date range, amount range, description substring |
|
||||||
|
| `get_spending_summary` | Outflow for one month (`YYYY-MM`) or date range, grouped by category or merchant |
|
||||||
|
| `get_spending_comparison` | Two months side by side, sorted by absolute delta — what drove the change |
|
||||||
|
| `get_upcoming_payments` | Statements with `payment_due_date` in the next N days (1–90, default 14) |
|
||||||
|
| `get_recurring_spend` | Recurring-payment candidates (heuristic — expect false positives) |
|
||||||
|
| `adhoc_query` | One read-only `SELECT` when the typed tools can't express the question |
|
||||||
|
|
||||||
|
Views available to `adhoc_query` (all `SELECT`-granted to `agent_ro`):
|
||||||
|
|
||||||
|
| Relation | Grain |
|
||||||
|
|---|---|
|
||||||
|
| `transaction_search` | Flat per-transaction surface: transaction ⟕ statement identity ⟕ `expense_metadata`. The right default for search. |
|
||||||
|
| `merchant_monthly_spend` | month × merchant → txn_count, total_spend, avg_amount |
|
||||||
|
| `category_monthly_spend` | month × category → txn_count, total_spend |
|
||||||
|
| `cashflow_monthly` | month → total_outflow, total_inflow, net, txn_count |
|
||||||
|
| `recurring_candidates` | merchant × amount bucket → occurrences, cadence, last_seen, next_expected |
|
||||||
|
|
||||||
|
Base tables (`transactions`, `statements`, `transaction_splits`, …) are also readable —
|
||||||
|
see [README → Data Model](../README.md#data-model).
|
||||||
|
|
||||||
|
Semantics baked into the views:
|
||||||
|
|
||||||
|
- outflows = `transaction_type IN ('debit','fee','interest')`; inflows = `('payment','credit','refund')`
|
||||||
|
- amount prefers `amount_aud` (FX-normalised) over `amount`
|
||||||
|
- merchant prefers `merchant_normalized` → `merchant_name` → first 60 chars of `description`
|
||||||
|
|
||||||
|
### Two caveats worth knowing
|
||||||
|
|
||||||
|
- **No owner scoping.** Unlike the app's API routes (`COALESCE(t.owner_id, s.owner_id) = $1`),
|
||||||
|
the agent views expose *all* owners' rows. Fine while the only consumer is the household's
|
||||||
|
own assistant; it must change before any agent is exposed to a second person.
|
||||||
|
- **No `transaction_overrides` merge.** The views read `t.category` / `t.merchant_normalized`
|
||||||
|
directly, so manual corrections made in the UI are not reflected. The app's own queries use
|
||||||
|
`COALESCE(o.category_override, t.category)`. Numbers from an agent can therefore differ
|
||||||
|
slightly from the same figure in the UI.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Connecting a client
|
||||||
|
|
||||||
|
The server speaks **stdio MCP**. There is no network listener, so a client connects by
|
||||||
|
*executing* it. The easiest correct way is to exec it inside the `hermes` container: the
|
||||||
|
repo is bind-mounted there (`/mnt/user/projects/personal-agent-gateway` → `/opt/data/repo`),
|
||||||
|
the venv and deps already exist, `PG_DSN_RO`/`PG_DSN_LOG` are already in the container env,
|
||||||
|
and `postgres-personal` resolves on `networks_internal`.
|
||||||
|
|
||||||
|
The canonical command, used by every recipe below:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker exec -i hermes /opt/data/venvs/pgp/bin/python \
|
||||||
|
/opt/data/repo/mcp-servers/postgres-personal/server.py
|
||||||
|
```
|
||||||
|
|
||||||
|
Smoke-test it before wiring a client in:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
printf '%s\n' \
|
||||||
|
'{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2024-11-05","capabilities":{},"clientInfo":{"name":"t","version":"0"}}}' \
|
||||||
|
'{"jsonrpc":"2.0","method":"notifications/initialized"}' \
|
||||||
|
'{"jsonrpc":"2.0","id":2,"method":"tools/list"}' \
|
||||||
|
| docker exec -i hermes /opt/data/venvs/pgp/bin/python \
|
||||||
|
/opt/data/repo/mcp-servers/postgres-personal/server.py 2>/dev/null | head -2
|
||||||
|
```
|
||||||
|
|
||||||
|
### Claude Code (on the Unraid host)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
claude mcp add postgres-personal -s user -- \
|
||||||
|
docker exec -i hermes /opt/data/venvs/pgp/bin/python \
|
||||||
|
/opt/data/repo/mcp-servers/postgres-personal/server.py
|
||||||
|
```
|
||||||
|
|
||||||
|
Then `/mcp` in a session to confirm the seven tools are listed.
|
||||||
|
|
||||||
|
### Claude Code / Claude Desktop (from a laptop, over SSH)
|
||||||
|
|
||||||
|
Same command, tunnelled — stdio doesn't care what carries it:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
claude mcp add postgres-personal -s user -- \
|
||||||
|
ssh unraid docker exec -i hermes /opt/data/venvs/pgp/bin/python \
|
||||||
|
/opt/data/repo/mcp-servers/postgres-personal/server.py
|
||||||
|
```
|
||||||
|
|
||||||
|
Needs key-based SSH to the host (Tailscale or LAN) and a non-interactive shell. For
|
||||||
|
Claude Desktop, the same `command` / `args` go in `claude_desktop_config.json` under
|
||||||
|
`mcpServers`.
|
||||||
|
|
||||||
|
### Codex CLI
|
||||||
|
|
||||||
|
`~/.codex/config.toml`:
|
||||||
|
|
||||||
|
```toml
|
||||||
|
[mcp_servers.postgres-personal]
|
||||||
|
command = "docker"
|
||||||
|
args = [
|
||||||
|
"exec", "-i", "hermes",
|
||||||
|
"/opt/data/venvs/pgp/bin/python",
|
||||||
|
"/opt/data/repo/mcp-servers/postgres-personal/server.py",
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
(Prefix `args` with `["unraid", "docker", …]` and set `command = "ssh"` for the remote case.)
|
||||||
|
|
||||||
|
### Hermes
|
||||||
|
|
||||||
|
Already wired — `mcp_servers.postgres-personal` in `/mnt/user/appdata/docker/hermes/config.yaml`
|
||||||
|
(template: `personal-agent-gateway/spike/hermes/config.yaml.example`). It runs the same
|
||||||
|
venv and script directly rather than via `docker exec`, since it *is* the container.
|
||||||
|
|
||||||
|
### Running the server outside `hermes`
|
||||||
|
|
||||||
|
Only needed if `hermes` is down or you want isolation. Two constraints: Python ≥ 3.11 with
|
||||||
|
`mcp`, `psycopg[binary]`, `sqlglot`; and network reach to `postgres-personal`, which is
|
||||||
|
**not** published to the host — it only resolves on the `networks_internal` Docker network.
|
||||||
|
So run it in a container on that network, passing the DSNs:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker run -i --rm --network networks_internal \
|
||||||
|
--env-file /mnt/user/appdata/docker/hermes/.env \
|
||||||
|
-v /mnt/user/projects/personal-agent-gateway:/app \
|
||||||
|
personal-agent-gateway python /app/mcp-servers/postgres-personal/server.py
|
||||||
|
```
|
||||||
|
|
||||||
|
A bare host venv would need the container's current bridge IP in the DSN instead of the
|
||||||
|
hostname, which breaks on every recreate — don't.
|
||||||
|
|
||||||
|
### Secrets
|
||||||
|
|
||||||
|
`PG_DSN_RO` and `PG_DSN_LOG` live in `/mnt/user/appdata/docker/hermes/.env` (canonical
|
||||||
|
copies in Infisical `/agent-gateway`). Never paste them into a client config, a
|
||||||
|
`claude mcp add` command line, or this repo — the `docker exec` recipes above inherit them
|
||||||
|
from the container, which is precisely why they're preferred.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Direct SQL (humans and one-off scripts)
|
||||||
|
|
||||||
|
For ad-hoc analysis where an agent isn't in the loop, skip MCP:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker exec postgres-personal psql -U personal -d personal -c \
|
||||||
|
"SELECT * FROM cashflow_monthly ORDER BY month DESC LIMIT 12"
|
||||||
|
```
|
||||||
|
|
||||||
|
That's the full-privilege `personal` role — no guardrail, no row cap, no audit row. Use
|
||||||
|
`agent_ro` if you want the same safety envelope an agent gets.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Making this available more widely
|
||||||
|
|
||||||
|
Today: any MCP client that can run a subprocess can use it (all of the above), and any
|
||||||
|
machine that can SSH to the host can too. That covers Claude Code, Claude Desktop, Codex,
|
||||||
|
and Hermes without a code change.
|
||||||
|
|
||||||
|
What it would take to go further:
|
||||||
|
|
||||||
|
- **Remote clients without SSH** — FastMCP supports `streamable-http`; `mcp.run()` in
|
||||||
|
`server.py` would become `mcp.run(transport="streamable-http")` behind Traefik with
|
||||||
|
forward-auth. Small code change, real security decision: it puts the household's
|
||||||
|
financial history behind a network listener. Not done, deliberately.
|
||||||
|
- **A second user** — requires owner scoping in the views (see caveats above) plus an
|
||||||
|
identity the server can bind to; the DSN carries no user identity today.
|
||||||
|
- **Write access** — out of scope. The write path is the app's API routes with
|
||||||
|
`getCurrentUser()`; `agent_ro` should stay SELECT-only.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Schema changes that affect agents
|
||||||
|
|
||||||
|
The views in `006_agent_read_role_views.sql` read `transactions`, `statements`, and
|
||||||
|
`expense_metadata` directly. If you rename or drop a column those views use, re-apply the
|
||||||
|
migration in the smarthome repo — a Prisma migration here won't do it, and the views will
|
||||||
|
either break or silently go stale:
|
||||||
|
|
||||||
|
The file is idempotent (`CREATE OR REPLACE VIEW`, guarded role creation) — re-applying is
|
||||||
|
safe. It needs the `agent.ro_password` / `agent.log_password` settings supplied at apply
|
||||||
|
time from Infisical; follow the apply instructions in the header of the SQL file itself
|
||||||
|
(`/mnt/user/appdata/smarthome/personal-agent/migrations/006_agent_read_role_views.sql`)
|
||||||
|
rather than piping it in blind.
|
||||||
|
|
||||||
|
New tables are readable by `agent_ro` automatically (`ALTER DEFAULT PRIVILEGES`), but new
|
||||||
|
*views* need an explicit `GRANT SELECT … TO agent_ro`.
|
||||||
@@ -0,0 +1,211 @@
|
|||||||
|
# Monthly expense baseline and emergency reserve
|
||||||
|
|
||||||
|
Analysis run 2026-07-26. **One-off analysis, not a feature** — nothing in the app
|
||||||
|
computes these numbers. Read "Reproducing this" before trusting a restated figure.
|
||||||
|
|
||||||
|
The question: how much should be held in reserve to cover 6–12 months of expenses?
|
||||||
|
|
||||||
|
## Answer
|
||||||
|
|
||||||
|
| Scenario | $/mo | 6 months | 12 months |
|
||||||
|
|---|---:|---:|---:|
|
||||||
|
| Survival — contracted loan repayment, essentials only | 3,040 | 18,250 | 36,500 |
|
||||||
|
| **Realistic — contracted loan, + dining and charity** | **4,140** | **24,800** | **49,600** |
|
||||||
|
| Status quo — keep overpaying the loan, normal life ex-travel | 5,557 | 33,500 | 67,000 |
|
||||||
|
|
||||||
|
Use the middle row. The survival row assumes dining is cut to zero and stays
|
||||||
|
there, which is not a plan anyone executes for six months.
|
||||||
|
|
||||||
|
Against that, liquidity already available (statements 133 and 131, 2026-06-30):
|
||||||
|
|
||||||
|
| | |
|
||||||
|
|---|---:|
|
||||||
|
| Loan redraw | 81,017.42 |
|
||||||
|
| Offset balance | 8,753.00 |
|
||||||
|
| **Accessible** | **89,770.42** |
|
||||||
|
|
||||||
|
That is 3.6× the six-month target and 1.8× the twelve-month one. Redraw grew
|
||||||
|
$62,387.17 → $81,017.42 across the last two loan statements, matching the
|
||||||
|
overpayment rate — the money spent killing the loan faster is still reachable.
|
||||||
|
|
||||||
|
**Caveat on counting redraw as the reserve.** It is available at AMP's
|
||||||
|
discretion, and lenders reduce or freeze it exactly when a borrower looks
|
||||||
|
distressed — which is when it would be needed. The rate also moved 5.54% → 6.29%
|
||||||
|
between the two statements, so redrawn funds cost more than they did. Hold some
|
||||||
|
genuine cash; it does not need to be $50,000.
|
||||||
|
|
||||||
|
## This is *your* outgoings, not household spend
|
||||||
|
|
||||||
|
The app only sees accounts that get imported. Sonu's own spending on the
|
||||||
|
household is invisible to it. Grocery spend reads as ~$300/mo gross on 4–10
|
||||||
|
transactions, which is implausible for a household and is partly explained by her
|
||||||
|
paying from her own account.
|
||||||
|
|
||||||
|
For "how much reserve do **I** need" that blind spot does not matter — your own
|
||||||
|
outgoings is the correct measure. Do not relabel these figures as household
|
||||||
|
totals; they are not, and they would be wrong by an unknown amount.
|
||||||
|
|
||||||
|
## The loan has two floors
|
||||||
|
|
||||||
|
This is the largest single lever and the reason there are three scenarios.
|
||||||
|
|
||||||
|
| | $/fortnight | $/mo annualised | Your 50% |
|
||||||
|
|---|---:|---:|---:|
|
||||||
|
| Contracted minimum | 1,190.54 | 2,579.50 | **1,290** |
|
||||||
|
| Actual direct debit | 2,500.00 | 5,416.67 | **2,708** |
|
||||||
|
| Voluntary overpayment | 1,309.46 | 2,837.17 | 1,419 |
|
||||||
|
|
||||||
|
Dropping to contracted cuts your loan cost by $1,418/mo. Sonu's obligation is a
|
||||||
|
fixed 50% of the repayment (see CLAUDE.md → "The shared loan"), so it falls with
|
||||||
|
it. Her rate returned to $1,250/fortnight in July 2026 after the reduced $750
|
||||||
|
period during her leave.
|
||||||
|
|
||||||
|
## Baseline composition
|
||||||
|
|
||||||
|
Built from **Feb–Jun 2026** — the months where split data is trustworthy — with
|
||||||
|
annual items annualised over 12 rather than divided by the 5-month sample.
|
||||||
|
|
||||||
|
| Essential | $/mo | Note |
|
||||||
|
|---|---:|---|
|
||||||
|
| Loan (contracted, your 50%) | 1,290 | 2,708 at the current actual rate |
|
||||||
|
| Transport | 326 | |
|
||||||
|
| Insurance | 280 | annualised; your 55% |
|
||||||
|
| Utilities | 278 | shared energy/water + personal mobile |
|
||||||
|
| Subscriptions | 204 | shared household + personal/AI |
|
||||||
|
| Groceries | 200 | see the blind-spot note above |
|
||||||
|
| Card + package fees | 175 | annualised — see below |
|
||||||
|
| Health | 167 | |
|
||||||
|
| Rates + rego | 122 | annualised, your share |
|
||||||
|
| **Essential** | **3,042** | |
|
||||||
|
| + dining 675, charity 422 | 4,139 | charity is a Smith Family sponsorship commitment |
|
||||||
|
| + typical shopping | ~4,800 | median 657, **not** the 1,709 mean |
|
||||||
|
|
||||||
|
**Travel is excluded throughout.** At $3,153/mo of your share even post-cutover it
|
||||||
|
would roughly double every figure, and it is the first thing that stops.
|
||||||
|
|
||||||
|
## Four corrections the raw data needed
|
||||||
|
|
||||||
|
Any restatement that skips these will be wrong. None are fixed in the data yet.
|
||||||
|
|
||||||
|
**Micro-investing counted as spend.** Raiz ($9,406 / 27 rows), Vanguard Super
|
||||||
|
($500) and moomoo ($300) sit in `other` as debits — $10,206/yr, ~$850/mo of
|
||||||
|
phantom spend. These belong in `investment`, which is already excluded.
|
||||||
|
|
||||||
|
**Incoming money counted as negative spend.** 17 rows in `other` typed `credit`
|
||||||
|
($5,622 in the window). `SPEND_SIGNED` negates credits so refunds cancel
|
||||||
|
purchases, but these are not refunds — they are money arriving. June 2025 shows
|
||||||
|
*minus* $7,814 of total spend because two Wise credits of ~$16.7k each landed in
|
||||||
|
`other`.
|
||||||
|
|
||||||
|
**`government` is two unrelated things.** $25,554 of ATO payments (one annual
|
||||||
|
bill, routed through Zen B2B and RewardPay to earn points) versus $2,054 council
|
||||||
|
rates and $875 rego. Tax is not a monthly living cost and falls with income
|
||||||
|
anyway; rates and rego are non-negotiable. Splitting them moves this line from
|
||||||
|
$2,411/mo to $244/mo.
|
||||||
|
|
||||||
|
**`fees` is mostly annual.** Of $2,599 post-cutover, $1,750 is an annual card fee
|
||||||
|
and $349 a loan package annual fee. Recurring is ~$175/mo annualised, not the
|
||||||
|
$520/mo the 5-month mean implies.
|
||||||
|
|
||||||
|
## Splits: what is trustworthy and what is not
|
||||||
|
|
||||||
|
Splits exist in this app from **2026-01-09** only; before that they were tracked
|
||||||
|
in SplitMyExpenses. So a trailing-12-month per-person series splices six months
|
||||||
|
of *gross* onto six months of *net* and is not a series at all. Use Feb–Jun 2026.
|
||||||
|
|
||||||
|
**Partial split coverage within a category is usually correct, not a gap.** This
|
||||||
|
was misdiagnosed once during the analysis. Verified composition:
|
||||||
|
|
||||||
|
| Category | Your share | Split | Unsplit |
|
||||||
|
|---|---:|---|---|
|
||||||
|
| utilities | 69% | Globird, OVO, GWW, home telecoms | Telstra, Vodafone, Optus, JB Hi-Fi Mobile |
|
||||||
|
| subscriptions | 91% | Uber One, Amazon Prime, OnePass | Claude, OpenAI, Anthropic, OpenRouter, You.com, LinkedIn, Xero, Billdu, Spotify, Patreon |
|
||||||
|
| fees | 100% | — | credit card fees are personal |
|
||||||
|
| charity | 100% | — | personal commitment |
|
||||||
|
|
||||||
|
Only *shared* utilities and subscriptions are split. Mobile bills, AI
|
||||||
|
subscriptions and card fees are personal and correctly sit at 100%. Do not
|
||||||
|
"fix" these ratios.
|
||||||
|
|
||||||
|
## Known weak spots
|
||||||
|
|
||||||
|
- **`other` is $424–773/mo of your share and unclassified.** The single biggest
|
||||||
|
lever on accuracy. Clearing it with the rule preview
|
||||||
|
(`GET /api/rules/[id]/matches`) improves every other view at the same time.
|
||||||
|
- **Five months is a short sample**, and it contains the Europe trip and the ATO
|
||||||
|
bill. Both are excluded, but they crowd out the ordinary months. The
|
||||||
|
SplitMyExpenses CSVs would stretch it to 18 months — worth having, not
|
||||||
|
blocking, since only an *aggregate ratio per category* is needed, not row
|
||||||
|
matching, so the combined-transaction problem does not bite.
|
||||||
|
- **`/api/analytics/monthly` does not filter `reconciled_with_id IS NOT NULL`.**
|
||||||
|
48 rows are double-counted app-wide. Small, but real, and unrelated to this
|
||||||
|
analysis. The queries below do filter it.
|
||||||
|
|
||||||
|
## Reproducing this
|
||||||
|
|
||||||
|
Working queries are not checked in; they were run ad hoc against
|
||||||
|
`postgres-personal`. The shape that matters:
|
||||||
|
|
||||||
|
```sql
|
||||||
|
-- Per-category monthly distribution, your share, Feb-Jun 2026.
|
||||||
|
-- Mirrors src/lib/analytics-sql.ts, plus the corrections above.
|
||||||
|
WITH s AS (
|
||||||
|
SELECT to_char(t.transaction_date,'YYYY-MM') m,
|
||||||
|
COALESCE(o.category_override, t.category, 'other') cat,
|
||||||
|
SUM((CASE WHEN t.transaction_type IN ('refund','credit') THEN -1 ELSE 1 END)
|
||||||
|
* (CASE WHEN t.interest_amount IS NOT NULL
|
||||||
|
THEN t.interest_amount ELSE COALESCE(t.amount_aud, t.amount) END)
|
||||||
|
* COALESCE(ts.share_percent, o.my_share_percent,
|
||||||
|
100 - COALESCE((SELECT SUM(x.share_percent) FROM transaction_splits x
|
||||||
|
WHERE x.transaction_id = t.id
|
||||||
|
AND x.participant_id <> 1), 0)) / 100)::numeric(12,2) amt
|
||||||
|
FROM transactions t
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
LEFT JOIN transaction_splits ts ON ts.transaction_id = t.id AND ts.participant_id = 1
|
||||||
|
LEFT JOIN statements st ON st.id = t.statement_id
|
||||||
|
WHERE COALESCE(t.owner_id, st.owner_id) = 1
|
||||||
|
AND t.reconciled_with_id IS NULL -- see weak spots
|
||||||
|
AND ((t.transaction_type IN ('debit','fee','interest')
|
||||||
|
OR t.interest_amount IS NOT NULL)
|
||||||
|
OR t.transaction_type IN ('refund','credit'))
|
||||||
|
AND COALESCE(o.category_override, t.category, 'other')
|
||||||
|
NOT IN ('transfers','investment','income')
|
||||||
|
-- correction 1: misfiled investments
|
||||||
|
AND COALESCE(t.merchant_normalized, t.merchant_name, '')
|
||||||
|
!~* '^(Raiz|Vanguard Super|moomoo)'
|
||||||
|
-- correction 2: incoming money miscategorised as 'other' credits
|
||||||
|
AND NOT (COALESCE(o.category_override, t.category, 'other') = 'other'
|
||||||
|
AND t.transaction_type = 'credit')
|
||||||
|
AND t.transaction_date >= '2026-02-01' AND t.transaction_date < '2026-07-01'
|
||||||
|
GROUP BY 1, 2
|
||||||
|
)
|
||||||
|
SELECT cat, count(*) mths, round(avg(amt),0) mean,
|
||||||
|
round(percentile_cont(0.5) WITHIN GROUP (ORDER BY amt)::numeric, 0) median
|
||||||
|
FROM s GROUP BY cat ORDER BY mean DESC;
|
||||||
|
```
|
||||||
|
|
||||||
|
Use the **median** for anything recurring monthly and the **annualised total** for
|
||||||
|
lumpy-but-certain items (insurance, rates, rego, annual card fees). Means are
|
||||||
|
badly skewed here — shopping is 1,709 mean against 657 median.
|
||||||
|
|
||||||
|
Corrections 3 and 4 (`government`, `fees`) are not expressible as filters; they
|
||||||
|
need the category split by merchant, done by hand above.
|
||||||
|
|
||||||
|
## If this becomes a feature
|
||||||
|
|
||||||
|
The blocker is `other`, not the split model — the split data held up under
|
||||||
|
scrutiny. Sequence:
|
||||||
|
|
||||||
|
1. Recategorise Raiz / Vanguard Super / moomoo to `investment` (27 rows,
|
||||||
|
unambiguous) via the rule preview.
|
||||||
|
2. Split `government` so rates and rego separate from ATO. Probably a new
|
||||||
|
category or a tag; `government` conflates a recurring obligation with an
|
||||||
|
annual tax bill.
|
||||||
|
3. Work `other` down with the rule preview.
|
||||||
|
4. Then a baseline panel on Insights, which already carries the
|
||||||
|
Regular/Occasional split this analysis is a stricter version of
|
||||||
|
(`REGULAR_CATEGORIES` in `src/lib/categories.ts`).
|
||||||
|
|
||||||
|
A **liquidity vs baseline** view would be genuinely new rather than a restatement:
|
||||||
|
`statements.redraw_available`, offset closing balance, and the
|
||||||
|
contracted-vs-actual repayment gap are all in the schema and nothing reads them.
|
||||||
@@ -0,0 +1,246 @@
|
|||||||
|
# Shared expenses and settlement
|
||||||
|
|
||||||
|
Status: **built and live**, as of 2026-07-28. The loan section at the end is
|
||||||
|
still a proposal — nothing there is built.
|
||||||
|
|
||||||
|
This replaces the 2026-07-26 proposal. That document described three problems
|
||||||
|
and proposed a `settlement_contexts` table to solve them. The problems were
|
||||||
|
real; the table was not built, and the reasoning for not building it is
|
||||||
|
recorded under [What was rejected](#what-was-rejected).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## The one rule
|
||||||
|
|
||||||
|
**Spend and owed are different questions asked of the same table, and the line
|
||||||
|
between them is the cutover date, refined by `transaction_splits.settled`.**
|
||||||
|
|
||||||
|
`ACTIVE_OBLIGATION` is `ts.settled = false AND t.transaction_date >=
|
||||||
|
'2026-01-09'`. Nothing before the cutover can be owed, because carryover
|
||||||
|
transaction 2348 already carries the entire pre-cutover balance as one figure —
|
||||||
|
so a split on an older transaction describes only *how an expense was shared*.
|
||||||
|
That is what makes splitting history safe, and it is why the flag is a
|
||||||
|
refinement rather than the guard: any delete-and-recreate write path resets a
|
||||||
|
boolean, and one did.
|
||||||
|
|
||||||
|
| | Counts settled splits? | Why |
|
||||||
|
|---|---|---|
|
||||||
|
| **Spend** (`myShare`, `mySplitOf`) | **Yes** | Half a 2025 grocery shop was my expense whether or not the other half was ever repaid. |
|
||||||
|
| **Owed** (balances, trip figures) | **No** | A discharged obligation is not outstanding. |
|
||||||
|
|
||||||
|
Getting this backwards in either direction is the failure the model exists to
|
||||||
|
prevent. Filtering settled rows out of spend would re-inflate exactly the
|
||||||
|
figures that importing settled history exists to correct.
|
||||||
|
|
||||||
|
The predicate is `ACTIVE_OBLIGATION` in `src/lib/analytics-sql.ts`.
|
||||||
|
|
||||||
|
## Two orthogonal axes
|
||||||
|
|
||||||
|
`settled` and `trip_id` answer different questions and neither implies the
|
||||||
|
other:
|
||||||
|
|
||||||
|
- **`transaction_splits.settled`** — *is this obligation still live?*
|
||||||
|
- **`split_payments.trip_id`** — *which tab does this payment settle?*
|
||||||
|
NULL means the ongoing household tab.
|
||||||
|
|
||||||
|
A trip can be fully paid while the household tab runs a balance, and vice
|
||||||
|
versa. Before migration 0022 there was one global pool and this could not be
|
||||||
|
expressed, so every trip reported 100% unsettled forever — including trips paid
|
||||||
|
in full.
|
||||||
|
|
||||||
|
## How settling up actually works
|
||||||
|
|
||||||
|
**By recording a payment.** There is deliberately no "mark settled" action
|
||||||
|
anywhere in the app.
|
||||||
|
|
||||||
|
`settled` marks obligations discharged *outside* this app — the imported
|
||||||
|
SplitMyExpenses history, whose repayments happened on a platform we no longer
|
||||||
|
run and which therefore have no `split_payments` row here. A live obligation is
|
||||||
|
settled by recording the payment, and the balance nets to zero on its own.
|
||||||
|
|
||||||
|
Doing both would subtract the settlement twice: the splits leave the sum *and*
|
||||||
|
the payment is deducted, driving the balance negative by the amount repaid.
|
||||||
|
|
||||||
|
## What is built
|
||||||
|
|
||||||
|
| Piece | Where | Note |
|
||||||
|
|---|---|---|
|
||||||
|
| `settled` as the single balance gate | `ACTIVE_OBLIGATION` | Applied in both arms of the balances UNION and in the trip owed query |
|
||||||
|
| Payment scope | `split_payments.trip_id` (migration 0022) | Household payments do not settle a trip, and vice versa |
|
||||||
|
| Owner-scoped owed | `OWNER_SCOPE` in the trip owed query | Without it, a debt between the *other two* participants was reported as owed to the owner — $1,605.49 on Europe 2026 |
|
||||||
|
| Direction on screen | `/trips/[id]`, `/shared` | all square / owes you / ahead — you owe them |
|
||||||
|
| Historical splits | `scripts/split_csv_match.py` | 1,242 rows across 657 transactions, all `settled` |
|
||||||
|
| Duplicate suppression | `transactions.superseded_by_id` (migration 0023) | 31 rows, $42,040.68 |
|
||||||
|
| Overlap detection | `STATEMENT_OVERLAPS` → statements page | Red badge; catches the cause rather than the symptom |
|
||||||
|
|
||||||
|
## The historical import
|
||||||
|
|
||||||
|
The five SplitMyExpenses CSVs are the record of how expenses were shared before
|
||||||
|
this app existed. 676 of 1,536 shareable rows matched (44%), and 1,242 split
|
||||||
|
rows were written as `settled = true`.
|
||||||
|
|
||||||
|
**The deliverable is historical spend, not balances.** $35,259 left my spend —
|
||||||
|
$13,088 in 2024 and $22,117 in 2025 — because a $200 grocery shop that was
|
||||||
|
always half hers no longer reads as $200 of mine. Balances were byte-identical
|
||||||
|
before and after, which is the assertion that mattered.
|
||||||
|
|
||||||
|
Three things the matcher has to get right, each of which has bitten:
|
||||||
|
|
||||||
|
1. **Date format is decided per file.** The household export writes D/M/YYYY and
|
||||||
|
the four trip exports write ISO; 474 rows parse validly under both readings.
|
||||||
|
Guessing per row silently swaps January and February for some rows and not
|
||||||
|
others.
|
||||||
|
2. **A person's column is net balance impact, not their share.** The payer is
|
||||||
|
whoever is positive; the other's share is `|their negative| / cost`. So a
|
||||||
|
`+cost / -cost` row means the other party owes **100%** — not that the
|
||||||
|
expense was unshared, which is the reading that fakes an arrangement change.
|
||||||
|
3. **Matching is one-to-one, best pair first.** The NZ trip has two identical
|
||||||
|
$10.16 Uber rows against three ledger rows; without this a ledger row is
|
||||||
|
claimed repeatedly while the second CSV row looks matched and is not.
|
||||||
|
|
||||||
|
**The 44% is a coverage ceiling, not a matcher weakness.** The CSVs describe 678
|
||||||
|
shared expenses in 2024; the ledger holds 591 rows for all of 2024, 3 to 72 a
|
||||||
|
month, far less than a household actually spends. South Korea April 2024 matches
|
||||||
|
4 of 158. Chasing a higher rate is chasing transactions that were never
|
||||||
|
imported.
|
||||||
|
|
||||||
|
### A reversed recommendation
|
||||||
|
|
||||||
|
The 2026-07-26 proposal said, under *What I would not do*: "**Do not** restate
|
||||||
|
history from the SplitMyExpenses CSVs… the value is low: those balances are
|
||||||
|
settled and will not change."
|
||||||
|
|
||||||
|
That was overturned on 2026-07-28, and it was wrong in an instructive way: it
|
||||||
|
measured the value in *balances*, where it is indeed nil, and missed the value
|
||||||
|
in *spend*, where it is $35,259. Importing as `settled` gets the second without
|
||||||
|
touching the first. The "combining problem" it cited is real and is why the
|
||||||
|
match rate is capped — but a partial restatement of spend beats none, and rows
|
||||||
|
that cannot be matched simply keep their current treatment.
|
||||||
|
|
||||||
|
## What was rejected
|
||||||
|
|
||||||
|
**`settlement_contexts` as a table.** The need was real — a payment must say
|
||||||
|
what it settles. But trips already exist and already carry membership on
|
||||||
|
`transaction_overrides.trip_id`, so scope is a read of existing data rather
|
||||||
|
than a new grouping key. One nullable column on `split_payments` expressed it.
|
||||||
|
|
||||||
|
A general context table would have meant a new entity to create and maintain
|
||||||
|
before a payment could be recorded, in a two-person household with two trips.
|
||||||
|
|
||||||
|
**Deleting duplicate transactions.** Every child of `transactions` is
|
||||||
|
`ON DELETE CASCADE`, and which member of a duplicate pair holds the curation is
|
||||||
|
an accident of import order. Duplicates are superseded instead: the row stays,
|
||||||
|
keeps its children, and points at the row that replaces it.
|
||||||
|
|
||||||
|
**Reusing `reconciled_with_id` for duplicates.** Its predicate is scoped to
|
||||||
|
`statement_id IS NULL` on purpose — a statement line pointing at something else
|
||||||
|
is the survivor, not the duplicate. In the duplicate-import case both rows are
|
||||||
|
statement lines, so that predicate can never hide either.
|
||||||
|
|
||||||
|
## Scale note
|
||||||
|
|
||||||
|
This is a home app for one user, occasionally two, and the second user consumes
|
||||||
|
the splits view and little else. Reviews of this subsystem have repeatedly
|
||||||
|
proposed enterprise-grade reconciliation, lineage and audit machinery; the
|
||||||
|
*findings* are often right and the *sizing* is not. A one-column solution a
|
||||||
|
person can hold in their head beats a correct-but-unmaintainable one here.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Still a proposal: the shared loan
|
||||||
|
|
||||||
|
**Nothing in this section is built.**
|
||||||
|
|
||||||
|
Sonu's contributions are in the ledger and unrecognised. All are categorised
|
||||||
|
`transfers` — correct for spend, but it makes a loan contribution and an expense
|
||||||
|
settlement indistinguishable:
|
||||||
|
|
||||||
|
| Pattern in offset credits | Rows | Total | Meaning |
|
||||||
|
|---|---:|---:|---|
|
||||||
|
| `…emi` | 39 | $37,980.24 | Sonu's loan contribution |
|
||||||
|
| `…mummy…` | 6 | $29,721.24 | Molina's money, forwarded by Sonu |
|
||||||
|
| other Meghalee | 15 | $71,130.27 | Sonu's own settlements |
|
||||||
|
|
||||||
|
### The loan is separate from shared expenses
|
||||||
|
|
||||||
|
Different obligations, different rhythms, different nature: one funds an asset,
|
||||||
|
the other funds consumption. They do not share a settlement scope, and a
|
||||||
|
contribution must never settle a dinner.
|
||||||
|
|
||||||
|
### The share is 50/50 fixed, with the shortfall tracked
|
||||||
|
|
||||||
|
Not derived from actual payments, which fluctuate. Over 2025-07-01 → 2026-06-30:
|
||||||
|
|
||||||
|
| | |
|
||||||
|
|---|---:|
|
||||||
|
| Repayments | $63,500.00 |
|
||||||
|
| Sonu's 50% obligation | $31,750.00 |
|
||||||
|
| Actually contributed (26 payments) | $27,750.00 |
|
||||||
|
| **Shortfall** | **$4,000.00** |
|
||||||
|
|
||||||
|
She never missed a fortnight; the rate changed — $1,250 × 15 (Aug 2025–Feb
|
||||||
|
2026, the correct 50%), $1,000 × 3 (Jul 2025, pre-adjustment), $750 × 8
|
||||||
|
(Mar–Jun 2026, leave).
|
||||||
|
|
||||||
|
So the model needs a **contribution schedule** (expected per period) alongside
|
||||||
|
actual contributions, with the running difference as a tracked receivable. A
|
||||||
|
flat percentage-of-actual cannot express "obligation unchanged, payment
|
||||||
|
temporarily reduced, difference owed" — it would silently redefine her share as
|
||||||
|
30% and make the shortfall disappear.
|
||||||
|
|
||||||
|
### Interest: recommended as expense, pending final call
|
||||||
|
|
||||||
|
Over 12 months $63,500 of cash left and debt fell by $44,127.36. The $16,523.64
|
||||||
|
difference bought nothing and is not recoverable — an expense by definition.
|
||||||
|
Excluding it leaves the balance sheet unable to reconcile cash out against
|
||||||
|
equity gained, and understates annual cost by ~10%.
|
||||||
|
|
||||||
|
The legitimate concern is that interest is non-discretionary. The answer is a
|
||||||
|
fixed-commitments grouping alongside rent, insurance and utilities — a
|
||||||
|
presentation change, not an exclusion.
|
||||||
|
|
||||||
|
**Do not** model the loan as a recurring split: that would put $2,500 a
|
||||||
|
fortnight of principal into spend, the error migration 0014 exists to prevent.
|
||||||
|
|
||||||
|
## Open questions
|
||||||
|
|
||||||
|
1. **Does equity need tracking per person?** If Sonu accrues a share of the
|
||||||
|
principal, that is a balance-sheet item the app has no concept of. Probably
|
||||||
|
belongs in a net-worth view rather than here.
|
||||||
|
2. **Attribution of forwarded payments.** `mummy` in the description reliably
|
||||||
|
marks Molina's money in all six known cases, but it is a description match on
|
||||||
|
a free-text field. Acceptable as a *suggestion* requiring confirmation, not
|
||||||
|
as an automatic rule.
|
||||||
|
3. **The solo leg.** A Qantas booking on 23 Apr (txn 2849, $1,366.40) is the
|
||||||
|
flight to Bangkok that begins a solo leg, and the Singapore spending
|
||||||
|
($2,242.05, 40 rows, to 9 May) is solo — not shared. It has no trip record.
|
||||||
|
Worth one if trip *cost* is wanted for it; nothing about sharing depends on
|
||||||
|
it.
|
||||||
|
|
||||||
|
## Resolved
|
||||||
|
|
||||||
|
- **Europe — Sonu + Sunny** (trip 3, 2026-04-12 → 2026-04-28, 124 rows,
|
||||||
|
$9,914.24). The leg after the group trip, previously marked only by tag 5 and
|
||||||
|
invisible to trip analytics. Includes one advance booking on 17 Mar
|
||||||
|
(Ticketmaster Nanterre) and the 12 Apr handover-day rows, which were already
|
||||||
|
held out of Europe 2026.
|
||||||
|
|
||||||
|
- **Grouped payments, split by scope.** Payments are made grouped — one transfer
|
||||||
|
covers several tabs — and that needs no schema change, because
|
||||||
|
`split_payments` has no unique constraint on `linked_transaction_id`. So one
|
||||||
|
bank transfer carries one row per scope, and the rows re-add to the transfer.
|
||||||
|
|
||||||
|
Sonu's two "transfer" payments were allocated Europe-first, remainder to
|
||||||
|
household, chronologically so each settles what was outstanding when it was
|
||||||
|
made:
|
||||||
|
|
||||||
|
| Transfer | Scope | Amount |
|
||||||
|
|---|---|---:|
|
||||||
|
| $3,779.33, 12 Apr (txn 4111) | Europe 2026 | 1,084.61 |
|
||||||
|
| | Europe — Sonu + Sunny | 2,694.72 |
|
||||||
|
| $4,794.06, 16 May (txn 4121) | Europe — Sonu + Sunny | 1,145.52 |
|
||||||
|
| | household | 3,648.54 |
|
||||||
|
|
||||||
|
Both Europe tabs now read $0.00 and her overall balance is unchanged at
|
||||||
|
$5,428.08 — allocation moves money between tabs, never between people. That
|
||||||
|
invariance is the check worth repeating on any future re-allocation.
|
||||||
@@ -0,0 +1,742 @@
|
|||||||
|
# UI and information architecture review
|
||||||
|
|
||||||
|
**Date:** 2026-07-26
|
||||||
|
**Status:** Priority 0 implemented 2026-07-27 (see below). Priorities 1–4 remain
|
||||||
|
proposals, tracked on the board under epic **Analytics & Insights information
|
||||||
|
architecture** (#154) — verified 2026-08-02, nothing in 1, 2 or 4 has been
|
||||||
|
started, and 3 is partially covered by the shared-expenses rebuild rather than by
|
||||||
|
this review.
|
||||||
|
|
||||||
|
## Implementation status — Priority 0 (2026-07-27)
|
||||||
|
|
||||||
|
All six Priority 0 items landed, with three amendments found while verifying the
|
||||||
|
proposals against the code:
|
||||||
|
|
||||||
|
1. **Reconciled source rows** — the exclusion was missing from *all five*
|
||||||
|
analytics routes, not only `/monthly`. It is now one fragment
|
||||||
|
(`EXCLUDE_RECONCILED_SOURCE`) that `queries.ts` also imports, so the two
|
||||||
|
halves cannot drift apart again. Real effect: 48 rows, **$4,474.79** of
|
||||||
|
double-counted spend removed from every category total, mover, Pareto and
|
||||||
|
merchant ranking.
|
||||||
|
2. **Spend pace** — now served by `/api/analytics/daily`, built from the same
|
||||||
|
fragments as the headline. Measured on live data, the old client-side series
|
||||||
|
ended July at **$4,747.31** against a headline of **$3,597.10** — a 32%
|
||||||
|
overstatement of the number directly above it.
|
||||||
|
3. **Fees and interest** — bounded by an explicit period (default 12 months,
|
||||||
|
`months=0` for all time), with the range shown and selectable. The unbounded
|
||||||
|
figure was overstating the last 12 months by roughly **$2,700 of fees**.
|
||||||
|
4. **Split-coverage warning** — *deliberately not implemented* (user decision,
|
||||||
|
2026-07-27).
|
||||||
|
5. **Shared foreign currency** — amended. The obvious fix, reading `s.currency`,
|
||||||
|
would have mislabelled every order row as AUD, because an order receipt has
|
||||||
|
no statement and carries its own currency. Sourcing is now
|
||||||
|
`NATIVE_CURRENCY = COALESCE(s.currency, t.foreign_currency_code, 'AUD')`,
|
||||||
|
whose COALESCE order keeps two opposite denomination conventions apart. Note
|
||||||
|
this change is **latent on today's data**: no foreign transaction is
|
||||||
|
currently split, so nothing on Shared looks different yet.
|
||||||
|
6. **Partial-month comparisons** — the hero average, the top movers and the pace
|
||||||
|
baseline now exclude the in-progress month, and compare through the same day
|
||||||
|
of the month when the selected month is the current one.
|
||||||
|
|
||||||
|
Also fixed while in here, both found by checking rather than by proposal:
|
||||||
|
|
||||||
|
- **Every analytics window was a day early.** `toISOString()` on a local-midnight
|
||||||
|
`Date` converts backwards through UTC in any timezone east of Greenwich. Now
|
||||||
|
`toDateStr()`. This was pre-existing in `/monthly` and `/merchants`.
|
||||||
|
- **Rounding grain.** `/monthly` rounded per category and `/daily` per
|
||||||
|
category-day, so the pace chart ended the month a few cents off its own
|
||||||
|
headline. Both now carry 4dp and round once, at display.
|
||||||
|
|
||||||
|
Partially guarded by `src/__tests__/integration/analytics-sql.test.ts`, which
|
||||||
|
covers the SQL fragments — `EXCLUDE_RECONCILED_SOURCE`, `NATIVE_CURRENCY` and
|
||||||
|
`INVESTMENT_SIGNED` — and nothing else. **Items 2, 3 and 6 have no test.** Those
|
||||||
|
are the three where a regression is silent rather than loud: the pace chart would
|
||||||
|
simply go back to disagreeing with the headline printed directly above it, the
|
||||||
|
fees figure back to growing forever, and a partial month back to being measured
|
||||||
|
against complete ones — all without anything failing. Tracked as #155.
|
||||||
|
|
||||||
|
### Landed after this doc, in the same family (2026-08-02)
|
||||||
|
|
||||||
|
Two changes postdate the Priority 0 pass and belong to the same
|
||||||
|
metric-integrity thread, so read them alongside it:
|
||||||
|
|
||||||
|
- **The investments line is signed** (`c70d2b1`, 2026-07-31). `INVESTMENT_SIGNED`
|
||||||
|
makes credits and refunds negative so a withdrawal nets against contributions
|
||||||
|
instead of reading as more money invested. March 2026 had shown $38,615.34 of
|
||||||
|
investing in a month that was net **−$11,384.66**. Consequence for the
|
||||||
|
Analytics section below: the "income, expenses, invested, and net-cash strip"
|
||||||
|
it describes now carries a *signed* invested figure, and a net-disinvesting
|
||||||
|
month is real data — the budget page gates on `!== 0`, not `> 0`.
|
||||||
|
- **Transfers hidden by default in the transactions view** (`f6c500b`,
|
||||||
|
2026-07-30), with an explicit category pick overriding the exclusion and the
|
||||||
|
default off when scoped to a statement. An IA change in this review's
|
||||||
|
territory that this review did not propose.
|
||||||
|
|
||||||
|
The doc's characterisation of `REGULAR_CATEGORIES` (Insights section) is also
|
||||||
|
slightly off: the set has 13 members including rent, utilities, insurance and
|
||||||
|
subscriptions, not the 8 listed. The case for replacing it stands — a flat
|
||||||
|
binary cannot express obligation — but that is the reason, not arbitrary
|
||||||
|
membership. Note too that the proposed Fixed/Essential/Lifestyle model needs a
|
||||||
|
commitment dimension that does not exist yet: `fees` cannot be split into
|
||||||
|
avoidable versus known-annual, `subscriptions` cannot be split into contractual
|
||||||
|
versus cancellable, and the contracted loan repayment is not in the spend stream
|
||||||
|
at all (`SPEND_BASE` keeps only the interest portion). That is a data-model
|
||||||
|
change, not an Insights rework.
|
||||||
|
|
||||||
|
## Executive summary
|
||||||
|
|
||||||
|
The July 19 UI refresh gave the app a cohesive and distinctive visual identity.
|
||||||
|
The ink-and-copper palette, typography, financial number treatment, month spine,
|
||||||
|
and transaction drill-downs are all strong foundations.
|
||||||
|
|
||||||
|
The larger remaining issue is not appearance. It is information hierarchy.
|
||||||
|
Analytics and Insights contain useful data, but they are reporting-heavy rather
|
||||||
|
than decision-oriented. Shared communicates the immediate running balance, but
|
||||||
|
the current settlement model prevents it from answering which expenses a payment
|
||||||
|
settled, whether a trip is closed, or how the shared loan should be represented.
|
||||||
|
|
||||||
|
The product should make four questions easy to answer:
|
||||||
|
|
||||||
|
1. Am I financially okay?
|
||||||
|
2. What changed and why?
|
||||||
|
3. What needs my attention?
|
||||||
|
4. Who owes what, and for which expenses?
|
||||||
|
|
||||||
|
Today there is no single page that answers the first three. The app opens on
|
||||||
|
Transactions and presents ten equally weighted navigation items.
|
||||||
|
|
||||||
|
The recommended direction is:
|
||||||
|
|
||||||
|
- Add an Overview as the default landing page.
|
||||||
|
- Keep Analytics focused on historical exploration: **what happened?**
|
||||||
|
- Rebuild Insights around decisions and attention: **what should I know or do?**
|
||||||
|
- Rebuild Shared around settlement contexts: **who owes what, and why?**
|
||||||
|
- Keep the shared loan as a separate ledger from shared consumption expenses.
|
||||||
|
- Fix calculation and coverage inconsistencies before adding more visualisations.
|
||||||
|
|
||||||
|
## Context reviewed
|
||||||
|
|
||||||
|
This review covered:
|
||||||
|
|
||||||
|
- The current Next.js pages and shared components.
|
||||||
|
- Analytics SQL and API calculations.
|
||||||
|
- Shared-expense balance and transaction queries.
|
||||||
|
- `CLAUDE.md`.
|
||||||
|
- `docs/shared-expenses-design.md`.
|
||||||
|
- `docs/expense-baseline.md`.
|
||||||
|
- Recent repository history.
|
||||||
|
- Recent finance-app memories retrieved from OpenViking.
|
||||||
|
|
||||||
|
The OpenViking history confirmed:
|
||||||
|
|
||||||
|
- The July 19 redesign intentionally introduced the ink-and-copper theme,
|
||||||
|
Fraunces display type, month-spine navigation, top movers, category
|
||||||
|
sparklines, and heat-tinted ledger tables.
|
||||||
|
- The user prefers a modern, high-fidelity interface and actionable analytics.
|
||||||
|
- Later July 25–26 work changed the financial meaning under those screens:
|
||||||
|
split-aware personal spend, AUD-aware settlement, refund netting, loan
|
||||||
|
principal/interest separation, rule previews, and the proposed contextual
|
||||||
|
settlement model.
|
||||||
|
- The preferred settlement model links payments to real transactions, separates
|
||||||
|
Household, Trip, and Historical contexts, and keeps the shared loan separate.
|
||||||
|
|
||||||
|
## What already works
|
||||||
|
|
||||||
|
### Visual system
|
||||||
|
|
||||||
|
- The dark ink-and-copper theme is coherent and distinctive.
|
||||||
|
- Serif headings and mono financial figures create useful hierarchy.
|
||||||
|
- The copper accent is used consistently for selection and emphasis.
|
||||||
|
- The design feels like one application rather than a collection of unrelated
|
||||||
|
pages.
|
||||||
|
|
||||||
|
### Analytics interactions
|
||||||
|
|
||||||
|
- The month spine is an effective year-at-a-glance navigation control.
|
||||||
|
- “What changed” is more useful than a generic category chart.
|
||||||
|
- Category sparklines make direction visible without creating a large
|
||||||
|
multi-series chart.
|
||||||
|
- Category rows can be expanded into their transactions.
|
||||||
|
- Inline recategorisation allows users to correct the data while investigating
|
||||||
|
it.
|
||||||
|
|
||||||
|
### Shared workflow
|
||||||
|
|
||||||
|
- “Owes you,” “you owe,” and “all square” communicate the immediate relationship
|
||||||
|
balance clearly.
|
||||||
|
- Payment history is preserved rather than reducing settlement to a boolean.
|
||||||
|
- Participant and tag filters support practical investigation.
|
||||||
|
- Split transactions can be edited without returning to the main transaction
|
||||||
|
page.
|
||||||
|
|
||||||
|
## App-wide information architecture
|
||||||
|
|
||||||
|
### Current problem
|
||||||
|
|
||||||
|
The app redirects `/` to `/transactions`. This makes the operational ledger the
|
||||||
|
default product surface. Transactions are important, but they do not tell the
|
||||||
|
user whether anything needs attention or what the current financial position
|
||||||
|
means.
|
||||||
|
|
||||||
|
The sidebar also gives equal weight to:
|
||||||
|
|
||||||
|
- operational screens such as Reconcile;
|
||||||
|
- analytical screens such as Analytics;
|
||||||
|
- configuration screens such as Rules;
|
||||||
|
- organisational screens such as Tags.
|
||||||
|
|
||||||
|
This makes the product feel like a database administration interface even when
|
||||||
|
the individual pages are well designed.
|
||||||
|
|
||||||
|
The `/budget` route is labelled Analytics in navigation. This is a leftover from
|
||||||
|
an older product concept and should become `/analytics`.
|
||||||
|
|
||||||
|
### Recommended navigation
|
||||||
|
|
||||||
|
Group navigation by intent:
|
||||||
|
|
||||||
|
**Overview**
|
||||||
|
|
||||||
|
- Overview
|
||||||
|
|
||||||
|
**Money**
|
||||||
|
|
||||||
|
- Transactions
|
||||||
|
- Statements
|
||||||
|
- Reconcile
|
||||||
|
|
||||||
|
**Understand**
|
||||||
|
|
||||||
|
- Analytics
|
||||||
|
- Insights
|
||||||
|
- Merchants
|
||||||
|
|
||||||
|
**Shared**
|
||||||
|
|
||||||
|
- Shared
|
||||||
|
- Trips
|
||||||
|
- Loan
|
||||||
|
|
||||||
|
**Organise**
|
||||||
|
|
||||||
|
- Tags
|
||||||
|
- Rules
|
||||||
|
|
||||||
|
Lower-frequency configuration items can be visually separated or collapsed.
|
||||||
|
|
||||||
|
### Recommended Overview
|
||||||
|
|
||||||
|
The default landing page should be a concise status and attention surface, not
|
||||||
|
another full analytics dashboard.
|
||||||
|
|
||||||
|
Suggested structure:
|
||||||
|
|
||||||
|
1. **This month**
|
||||||
|
- Personal spend to date
|
||||||
|
- Expected baseline at this point in the month
|
||||||
|
- Income
|
||||||
|
- Net cash
|
||||||
|
|
||||||
|
2. **Financial resilience**
|
||||||
|
- Realistic monthly baseline
|
||||||
|
- Cash coverage in months
|
||||||
|
- Redraw shown separately from cash
|
||||||
|
|
||||||
|
3. **Needs attention**
|
||||||
|
- Uncategorised or `other` transactions
|
||||||
|
- Unreconciled transactions
|
||||||
|
- Statements failing balance assertions
|
||||||
|
- New or unusual recurring charges
|
||||||
|
- Shared expenses added since the last settlement
|
||||||
|
|
||||||
|
4. **Shared**
|
||||||
|
- Current balances by person and context
|
||||||
|
- Loan contribution shortfall shown separately
|
||||||
|
|
||||||
|
5. **Recent change**
|
||||||
|
- The two or three categories that explain the largest movement
|
||||||
|
|
||||||
|
The Overview should link into Analytics, Insights, Shared, and Reconcile rather
|
||||||
|
than reproduce their complete tables.
|
||||||
|
|
||||||
|
## Analytics review
|
||||||
|
|
||||||
|
### What the current page does
|
||||||
|
|
||||||
|
The current Analytics page includes:
|
||||||
|
|
||||||
|
- selected-month spend hero;
|
||||||
|
- twelve-month month spine;
|
||||||
|
- income, expenses, invested, and net-cash strip;
|
||||||
|
- top category movers;
|
||||||
|
- eight category sparkline cards;
|
||||||
|
- spend-concentration Pareto chart;
|
||||||
|
- cumulative spend pace;
|
||||||
|
- expandable category table;
|
||||||
|
- six-month heat-tinted category ledger.
|
||||||
|
|
||||||
|
Each component is defensible in isolation. Together, they create too many
|
||||||
|
competing summaries of the same category data.
|
||||||
|
|
||||||
|
### What Analytics should answer
|
||||||
|
|
||||||
|
Analytics should answer:
|
||||||
|
|
||||||
|
> What happened during this period, how does it compare, and what explains the
|
||||||
|
> difference?
|
||||||
|
|
||||||
|
Recommended primary structure:
|
||||||
|
|
||||||
|
1. Period and comparison controls.
|
||||||
|
2. Personal spend, income, invested, and net cash.
|
||||||
|
3. Explanation of the change versus the selected comparison.
|
||||||
|
4. One main category/trend visualisation.
|
||||||
|
5. Category breakdown with transaction drill-down.
|
||||||
|
6. An optional Explore section for detailed tables.
|
||||||
|
|
||||||
|
### Recommended removals and consolidation
|
||||||
|
|
||||||
|
- Keep either category sparklines or the six-month ledger as the primary
|
||||||
|
category-trend representation, not both.
|
||||||
|
- Move the Pareto chart behind an Explore section. It describes concentration
|
||||||
|
but rarely produces an immediate decision.
|
||||||
|
- Retain “What changed,” but make each item clickable and explain which
|
||||||
|
transactions caused the movement.
|
||||||
|
- Avoid comparing a partial current month with full prior months unless values
|
||||||
|
are projected or compared through the same day.
|
||||||
|
- Add gross-versus-personal-share switching only if it is clearly labelled.
|
||||||
|
Personal share should remain the default.
|
||||||
|
|
||||||
|
### Calculation and trust issues
|
||||||
|
|
||||||
|
#### Reconciled source rows can be double-counted
|
||||||
|
|
||||||
|
`/api/analytics/monthly` does not currently exclude manual source rows where
|
||||||
|
`reconciled_with_id IS NOT NULL`. The baseline analysis identified 48
|
||||||
|
double-counted rows.
|
||||||
|
|
||||||
|
The analytics query should apply the same reconciled-row exclusion used by the
|
||||||
|
main transaction queries.
|
||||||
|
|
||||||
|
#### Spend pace compares unlike numbers
|
||||||
|
|
||||||
|
The Analytics headline uses:
|
||||||
|
|
||||||
|
- split-adjusted personal share;
|
||||||
|
- fees and interest;
|
||||||
|
- refund and credit netting;
|
||||||
|
- loan interest rather than principal;
|
||||||
|
- non-spend-category exclusions.
|
||||||
|
|
||||||
|
The cumulative spend-pace chart uses only `transaction_type === "debit"` and
|
||||||
|
adds gross `amount_aud ?? amount`. It does not use personal share and does not
|
||||||
|
apply the same refund, fee, interest, or loan semantics.
|
||||||
|
|
||||||
|
The chart can therefore disagree with the headline while both appear to
|
||||||
|
represent “spend.” The cumulative series should be produced by the same
|
||||||
|
server-side spend semantics as the monthly total.
|
||||||
|
|
||||||
|
#### Split coverage changes mid-series
|
||||||
|
|
||||||
|
Reliable in-app split data begins on 2026-01-09. A trailing twelve-month personal
|
||||||
|
series currently combines older gross spending with newer split-adjusted
|
||||||
|
spending.
|
||||||
|
|
||||||
|
Until historical splits are restored:
|
||||||
|
|
||||||
|
- default personal trend analysis to February–June 2026;
|
||||||
|
- visibly mark periods with incomplete split coverage; or
|
||||||
|
- offer gross-only twelve-month comparison separately.
|
||||||
|
|
||||||
|
Do not present the mixed series as one comparable personal-spend trend.
|
||||||
|
|
||||||
|
#### Comparison baseline is too naive
|
||||||
|
|
||||||
|
The selected month is compared against the average of all other months with
|
||||||
|
data. That average can include travel, annual fees, tax payments, incomplete
|
||||||
|
current periods, and months with incompatible split coverage.
|
||||||
|
|
||||||
|
Better comparison choices:
|
||||||
|
|
||||||
|
- previous month;
|
||||||
|
- same month last year;
|
||||||
|
- median of comparable complete months;
|
||||||
|
- recurring baseline;
|
||||||
|
- user-selected comparison.
|
||||||
|
|
||||||
|
### Data trust indicator
|
||||||
|
|
||||||
|
Analytics should include a compact methodology and coverage indicator:
|
||||||
|
|
||||||
|
> Personal share · refunds netted · investments excluded · split coverage
|
||||||
|
> reliable from Feb 2026 · 12 transactions need classification
|
||||||
|
|
||||||
|
This makes the meaning of the numbers inspectable without overwhelming the page.
|
||||||
|
|
||||||
|
## Insights review
|
||||||
|
|
||||||
|
### Current problem
|
||||||
|
|
||||||
|
The current Insights page contains:
|
||||||
|
|
||||||
|
- Regular versus occasional spending;
|
||||||
|
- another monthly category breakdown;
|
||||||
|
- recurring charges;
|
||||||
|
- fees and interest.
|
||||||
|
|
||||||
|
The monthly breakdown duplicates Analytics. The page does not yet surface the
|
||||||
|
most decision-relevant findings already known from the data: sustainable monthly
|
||||||
|
cost, liquidity, the loan-overpayment lever, data-quality weaknesses, or unusual
|
||||||
|
changes requiring attention.
|
||||||
|
|
||||||
|
### “Regular” is not the same as committed or essential
|
||||||
|
|
||||||
|
`REGULAR_CATEGORIES` includes:
|
||||||
|
|
||||||
|
- groceries;
|
||||||
|
- dining;
|
||||||
|
- transport;
|
||||||
|
- health;
|
||||||
|
- personal care;
|
||||||
|
- government;
|
||||||
|
- charity;
|
||||||
|
- pets.
|
||||||
|
|
||||||
|
These may recur, but they have very different flexibility and obligation.
|
||||||
|
“Regular” describes transaction behaviour, not financial necessity.
|
||||||
|
|
||||||
|
The current chart therefore cannot answer:
|
||||||
|
|
||||||
|
- What is the minimum monthly cost?
|
||||||
|
- What can be cut?
|
||||||
|
- What is contractually committed?
|
||||||
|
- What is lifestyle spending?
|
||||||
|
- What is a one-off?
|
||||||
|
|
||||||
|
### Recommended model
|
||||||
|
|
||||||
|
Replace Regular versus Occasional with:
|
||||||
|
|
||||||
|
1. **Fixed commitments**
|
||||||
|
- Contracted loan repayment
|
||||||
|
- Insurance
|
||||||
|
- Rates and registration
|
||||||
|
- Known annual fees
|
||||||
|
- Contractual subscriptions
|
||||||
|
|
||||||
|
2. **Essential variable spending**
|
||||||
|
- Utilities
|
||||||
|
- Groceries
|
||||||
|
- Transport
|
||||||
|
- Health
|
||||||
|
|
||||||
|
3. **Lifestyle and discretionary**
|
||||||
|
- Dining
|
||||||
|
- Shopping
|
||||||
|
- Entertainment
|
||||||
|
- Personal care
|
||||||
|
|
||||||
|
4. **One-offs and travel**
|
||||||
|
|
||||||
|
5. **Investments and transfers**
|
||||||
|
- Shown for cashflow context, excluded from spending
|
||||||
|
|
||||||
|
This should support scenario views rather than claiming there is one true
|
||||||
|
baseline.
|
||||||
|
|
||||||
|
### Recommended Insights structure
|
||||||
|
|
||||||
|
#### 1. Financial baseline
|
||||||
|
|
||||||
|
Show the scenarios already established by the expense-baseline analysis:
|
||||||
|
|
||||||
|
- Survival: contracted loan repayment and essentials only.
|
||||||
|
- Realistic: contracted loan repayment plus ordinary dining and charity.
|
||||||
|
- Status quo: current loan overpayment and normal life excluding travel.
|
||||||
|
|
||||||
|
For each scenario show:
|
||||||
|
|
||||||
|
- monthly amount;
|
||||||
|
- six-month reserve;
|
||||||
|
- twelve-month reserve.
|
||||||
|
|
||||||
|
#### 2. Liquidity and resilience
|
||||||
|
|
||||||
|
Show:
|
||||||
|
|
||||||
|
- cash available;
|
||||||
|
- redraw available separately;
|
||||||
|
- months covered under each baseline;
|
||||||
|
- a warning that redraw is lender-controlled and not equivalent to cash.
|
||||||
|
|
||||||
|
#### 3. Biggest flexible levers
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
- voluntary loan overpayment;
|
||||||
|
- dining;
|
||||||
|
- shopping;
|
||||||
|
- subscriptions;
|
||||||
|
- travel.
|
||||||
|
|
||||||
|
The loan should always show both the contracted floor and actual repayment.
|
||||||
|
|
||||||
|
#### 4. Attention and anomalies
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
- a new recurring charge;
|
||||||
|
- a charge larger than its prior range;
|
||||||
|
- a category materially above baseline;
|
||||||
|
- a fee increase;
|
||||||
|
- an unexpected incoming credit categorised as spend;
|
||||||
|
- a merchant still classified as `other`;
|
||||||
|
- an investment incorrectly counted as spending.
|
||||||
|
|
||||||
|
Each insight should link directly to the affected transactions.
|
||||||
|
|
||||||
|
#### 5. Data-quality work queue
|
||||||
|
|
||||||
|
The baseline analysis found that data quality is currently a larger blocker than
|
||||||
|
visualisation:
|
||||||
|
|
||||||
|
- `other` remains a large unresolved category;
|
||||||
|
- Raiz, Vanguard Super, and moomoo need investment classification;
|
||||||
|
- incoming `other` credits can make spending negative;
|
||||||
|
- `government` conflates tax with rates and registration;
|
||||||
|
- annual fees distort short-window monthly averages.
|
||||||
|
|
||||||
|
Insights should make these visible as fixable tasks.
|
||||||
|
|
||||||
|
### Recurring charges
|
||||||
|
|
||||||
|
The current detector identifies merchants with regular transaction intervals.
|
||||||
|
That does not necessarily mean a subscription or commitment. Weekly grocery
|
||||||
|
shopping can look recurring.
|
||||||
|
|
||||||
|
Recommended changes:
|
||||||
|
|
||||||
|
- Rename the section **Recurring patterns** unless contractual charges can be
|
||||||
|
distinguished.
|
||||||
|
- Show confidence and the basis for classification.
|
||||||
|
- Show the next expected charge date.
|
||||||
|
- Separate likely subscriptions from recurring merchants.
|
||||||
|
- Allow dismissing or confirming a detected pattern.
|
||||||
|
- Highlight price changes.
|
||||||
|
- Collapse inactive patterns by default.
|
||||||
|
|
||||||
|
The current eight-column table is also too wide for a primary page. Put secondary
|
||||||
|
fields such as first seen, total paid, and count into an expandable detail row.
|
||||||
|
|
||||||
|
### Fees and interest
|
||||||
|
|
||||||
|
The current fees query aggregates statement summary values across all available
|
||||||
|
statements without a date filter. The UI does not label the period, so the total
|
||||||
|
looks like a current-period figure even though it is effectively lifetime to
|
||||||
|
date.
|
||||||
|
|
||||||
|
Recommended presentation:
|
||||||
|
|
||||||
|
- Explicit date range.
|
||||||
|
- Avoidable fees.
|
||||||
|
- Known annual fees.
|
||||||
|
- Credit-card interest.
|
||||||
|
- Loan interest.
|
||||||
|
- Change versus prior comparable period.
|
||||||
|
- Drill-down transactions.
|
||||||
|
|
||||||
|
Loan interest should remain spending, but appear under fixed or
|
||||||
|
non-discretionary costs rather than being hidden.
|
||||||
|
|
||||||
|
## Shared review
|
||||||
|
|
||||||
|
### What the current page answers well
|
||||||
|
|
||||||
|
The unfiltered balance cards correctly implement a running ledger:
|
||||||
|
|
||||||
|
> splits minus payments
|
||||||
|
|
||||||
|
*(Superseded 2026-07-28: the shared-expenses rebuild made `settled`
|
||||||
|
load-bearing — it gates `ACTIVE_OBLIGATION` and survives split rewrites. See
|
||||||
|
`docs/shared-expenses-design.md` for the live model; the paragraph above
|
||||||
|
described the pre-rebuild state.)*
|
||||||
|
|
||||||
|
### What the current model cannot answer
|
||||||
|
|
||||||
|
- Which split expenses did a payment settle?
|
||||||
|
- Is a particular trip settled?
|
||||||
|
- Can a trip be closed without closing Household?
|
||||||
|
- Is an imported offset-account credit already represented by a manual payment?
|
||||||
|
- What remains open inside one settlement context?
|
||||||
|
- How should the shared-loan contribution shortfall be shown?
|
||||||
|
|
||||||
|
The page should not imply answers that the data model cannot support.
|
||||||
|
|
||||||
|
### Tag-filtered balance cards are semantically misleading
|
||||||
|
|
||||||
|
When a tag filter is active, participant balance queries intentionally stop
|
||||||
|
subtracting payments because payments are not attributable to a tag. The cards
|
||||||
|
then show raw split totals for the tag.
|
||||||
|
|
||||||
|
This behavior is explained in small text, but the card still says “owes you” or
|
||||||
|
“you owe.” That looks like a real payable balance when it is not.
|
||||||
|
|
||||||
|
When filtered, relabel the cards:
|
||||||
|
|
||||||
|
> Split total in Europe 2026
|
||||||
|
|
||||||
|
Do not show payment or settlement actions from that state.
|
||||||
|
|
||||||
|
### Recommended settlement-context design
|
||||||
|
|
||||||
|
Use explicit settlement contexts:
|
||||||
|
|
||||||
|
- Household
|
||||||
|
- Individual trips
|
||||||
|
- Historical / Pre-2026
|
||||||
|
- Closed contexts
|
||||||
|
|
||||||
|
Recommended Shared navigation:
|
||||||
|
|
||||||
|
- All
|
||||||
|
- Household
|
||||||
|
- Trips
|
||||||
|
- Closed
|
||||||
|
|
||||||
|
Within a context show:
|
||||||
|
|
||||||
|
1. Net balance and direction.
|
||||||
|
2. Expenses added since the last settlement.
|
||||||
|
3. Payments attributed to that context.
|
||||||
|
4. A chronological activity ledger combining expenses and payments.
|
||||||
|
5. Context status: running, ready to settle, or closed.
|
||||||
|
6. Settlement action.
|
||||||
|
|
||||||
|
### Payments should link to transactions
|
||||||
|
|
||||||
|
An offset-account credit and a manual `split_payments` row can represent the same
|
||||||
|
money. The page should:
|
||||||
|
|
||||||
|
- propose matching an imported credit to a settlement;
|
||||||
|
- display the linked transaction;
|
||||||
|
- prevent silent duplication;
|
||||||
|
- allow a manual payment only when no matching transaction exists.
|
||||||
|
|
||||||
|
“Record Payment” should become a context-aware settlement flow:
|
||||||
|
|
||||||
|
1. Choose what is being settled.
|
||||||
|
2. Match an existing incoming transaction where possible.
|
||||||
|
3. Confirm amount and residual balance.
|
||||||
|
4. Preserve an auditable history.
|
||||||
|
|
||||||
|
### Shared transaction table
|
||||||
|
|
||||||
|
The table currently shows raw `tx.amount` with a dollar sign and no currency
|
||||||
|
indicator. Participant balances correctly convert to AUD.
|
||||||
|
|
||||||
|
For foreign transactions, show:
|
||||||
|
|
||||||
|
- the native amount and currency;
|
||||||
|
- the AUD equivalent;
|
||||||
|
- splits based on the AUD settlement amount.
|
||||||
|
|
||||||
|
This prevents a visible mismatch between transaction rows and participant
|
||||||
|
balances.
|
||||||
|
|
||||||
|
### Shared loan
|
||||||
|
|
||||||
|
The loan is not a shared-expense settlement context. It funds an asset rather
|
||||||
|
than consumption, and a loan contribution must never settle a dinner or utility
|
||||||
|
bill.
|
||||||
|
|
||||||
|
Give it a separate page or clearly separated ledger showing:
|
||||||
|
|
||||||
|
- expected contribution by period;
|
||||||
|
- actual contribution;
|
||||||
|
- running shortfall or receivable;
|
||||||
|
- principal reduction;
|
||||||
|
- interest expense;
|
||||||
|
- contracted repayment;
|
||||||
|
- actual repayment;
|
||||||
|
- voluntary overpayment;
|
||||||
|
- redraw movement.
|
||||||
|
|
||||||
|
The partner obligation is a fixed 50% of the repayment schedule, not a percentage
|
||||||
|
inferred from actual contributions.
|
||||||
|
|
||||||
|
## Responsive and interaction improvements
|
||||||
|
|
||||||
|
- Replace wide eight-column primary tables with compact rows and expandable
|
||||||
|
details.
|
||||||
|
- Keep financial summaries readable at mobile widths without horizontal
|
||||||
|
scrolling.
|
||||||
|
- Add explicit loading skeletons rather than only text.
|
||||||
|
- Add error states for failed analytics requests.
|
||||||
|
- Ensure chart meaning is not conveyed by colour alone.
|
||||||
|
- Give interactive chart regions keyboard-accessible equivalents.
|
||||||
|
- Confirm material deletions, including payment-history deletion.
|
||||||
|
- Make expandable table rows use buttons with appropriate accessibility state.
|
||||||
|
- Use consistent labels for personal share, gross amount, native currency, and
|
||||||
|
AUD equivalent.
|
||||||
|
|
||||||
|
## Recommended implementation order
|
||||||
|
|
||||||
|
### Priority 0 — metric integrity *(done 2026-07-27; test gap #155)*
|
||||||
|
|
||||||
|
1. Exclude reconciled source rows from monthly analytics.
|
||||||
|
2. Make spend pace use the same spend semantics as the headline.
|
||||||
|
3. Add date ranges to fees and interest.
|
||||||
|
4. Add split-coverage warnings to historical personal-share analysis.
|
||||||
|
5. Fix Shared foreign-currency presentation.
|
||||||
|
6. Avoid partial-month versus full-month comparisons.
|
||||||
|
|
||||||
|
### Priority 1 — product hierarchy *(#156)*
|
||||||
|
|
||||||
|
1. Add Overview and make it the default route.
|
||||||
|
2. Group sidebar navigation by user intent.
|
||||||
|
3. Rename `/budget` to `/analytics`.
|
||||||
|
4. Add consistent methodology and coverage indicators.
|
||||||
|
|
||||||
|
### Priority 2 — Analytics and Insights *(#157)*
|
||||||
|
|
||||||
|
1. Simplify Analytics around period, comparison, change explanation, trend, and
|
||||||
|
drill-down.
|
||||||
|
2. Remove the duplicate monthly breakdown from Insights.
|
||||||
|
3. Add baseline scenarios and liquidity coverage.
|
||||||
|
4. Add flexible-spending levers, anomalies, and a data-quality work queue.
|
||||||
|
5. Rework recurring patterns and fees into decision-oriented summaries.
|
||||||
|
|
||||||
|
### Priority 3 — Shared *(#158; items 2 and 5 landed with the shared-expenses rebuild)*
|
||||||
|
|
||||||
|
1. Add settlement contexts.
|
||||||
|
2. Link payments to real transactions.
|
||||||
|
3. Add context activity ledgers and closeable trip contexts.
|
||||||
|
4. Introduce the separate loan contribution ledger.
|
||||||
|
5. Backfill historical closed-context splits so long-range personal analytics
|
||||||
|
become comparable.
|
||||||
|
|
||||||
|
### Priority 4 — polish *(#159)*
|
||||||
|
|
||||||
|
1. Improve mobile layouts.
|
||||||
|
2. Add accessibility semantics.
|
||||||
|
3. Add richer loading, error, and empty states.
|
||||||
|
4. Consolidate repeated card, table, filter, and page-header patterns into shared
|
||||||
|
components.
|
||||||
|
|
||||||
|
## Proposed success criteria
|
||||||
|
|
||||||
|
The redesign is successful when:
|
||||||
|
|
||||||
|
- The first page explains current status and outstanding actions without opening
|
||||||
|
multiple screens.
|
||||||
|
- Analytics can explain why one comparable period differs from another.
|
||||||
|
- Insights identifies baseline cost, financial resilience, flexible levers, and
|
||||||
|
data-quality problems.
|
||||||
|
- Every displayed total states or clearly implies its period and whether it is
|
||||||
|
gross or personal share.
|
||||||
|
- Historical charts do not silently combine incompatible split coverage.
|
||||||
|
- Shared can distinguish Household, Trip, and Historical balances.
|
||||||
|
- A settlement can be traced to both the obligation it reduces and the real
|
||||||
|
transaction representing the payment.
|
||||||
|
- Loan contributions cannot affect ordinary shared-expense balances.
|
||||||
|
|
||||||
@@ -0,0 +1,342 @@
|
|||||||
|
# Europe 2026 — Expense Report
|
||||||
|
|
||||||
|
**Trip:** 22 days · Mar 21 – Apr 12, 2026
|
||||||
|
**Route:** Rome → Venice → Ortisei (Dolomites) → Varenna (Lake Como) → St Moritz → Lucerne → Paris
|
||||||
|
**Group:** 5 travellers — Siddharth & Meghalee (Melbourne), Molina, Sibnath & Rumna (Delhi)
|
||||||
|
**Data:** 212 tagged transactions across all cards
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Group Breakdown — AU vs India
|
||||||
|
|
||||||
|
The two groups fly different routes and airlines. Everything else (accommodation, trains, on-trip spending) is shared across all 5 travellers.
|
||||||
|
|
||||||
|
| | AU Group (Siddharth + Meghalee) | India Group (Molina + Sibnath + Rumna) |
|
||||||
|
|---|---:|---:|
|
||||||
|
| Flights | $2,164 | $6,151 |
|
||||||
|
| Share of shared costs | $12,577 | $18,866 |
|
||||||
|
| **Group total** | **$14,741** | **$25,017** |
|
||||||
|
| Per person | $7,371 | $8,339 |
|
||||||
|
|
||||||
|
**Shared costs (accommodation + trains + all on-trip):** $31,443
|
||||||
|
Apportioned 2:3 by headcount — AU group (2 pax) = 40% · India group (3 pax) = 60%
|
||||||
|
|
||||||
|
| Scenario | Amount |
|
||||||
|
|---|---:|
|
||||||
|
| Total trip | $39,757 |
|
||||||
|
| **Excl. all flights** | **$31,443** |
|
||||||
|
| Excl. AU flights only (what India group is responsible for) | $37,593 |
|
||||||
|
| Excl. India flights only (what AU group is responsible for) | $33,607 |
|
||||||
|
|
||||||
|
> Australia group flights: China Eastern MEL→PVG→FCO × 2 ($1,885) + Qatar cancellation fee ($279) = **$2,164**
|
||||||
|
> India group flights: ITA Airways DEL→FCO × 3 (Azwebin, $2,696) + Air India CDG→DEL→GAU × 3 ($3,454) = **$6,151**
|
||||||
|
> India group flights are ~3× the AU group total despite flying a similar number of legs — driven by 3 pax vs 2, plus the ITA outbound on top of Air India return.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Overall Summary
|
||||||
|
|
||||||
|
| | AUD |
|
||||||
|
|---|---:|
|
||||||
|
| Gross charged | $42,696.73 |
|
||||||
|
| Refunds received | −$2,939.22 |
|
||||||
|
| **Net total spend** | **$39,757.51** |
|
||||||
|
|
||||||
|
| Phase | Net Spend | % of Total |
|
||||||
|
|---|---:|---:|
|
||||||
|
| Pre-trip bookings | $23,730.02 | 60% |
|
||||||
|
| On-trip (22 days) | $16,027.49 | 40% |
|
||||||
|
|
||||||
|
**On-trip daily average:** $729/day for the group · $146/person/day
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Refunds & Cancellations
|
||||||
|
|
||||||
|
| Merchant | Charged | Refunded | Net | Detail |
|
||||||
|
|---|---:|---:|---:|---|
|
||||||
|
| Qatar Airways | $2,396.90 | −$2,118.10 | **$278.80** | Cancelled. Replaced with China Eastern MEL→PVG→FCO. |
|
||||||
|
| Luxury Escapes | $3,283.80 | −$820.95 | **$2,462.85** | Partial refund on Paris Adagio Montmartre. |
|
||||||
|
| FreeNow | $43.32 | −$0.17 | $43.15 | Hold reversal. |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Pre-Trip Bookings — $23,730 net
|
||||||
|
|
||||||
|
### Flights
|
||||||
|
|
||||||
|
| Carrier | Passengers | Gross | Refund | Net |
|
||||||
|
|---|---|---:|---:|---:|
|
||||||
|
| ITA Airways (via Azwebin) | Delhi group (3) DEL → FCO | $2,696.34 | — | $2,696.34 |
|
||||||
|
| Air India | Delhi group (3) CDG → DEL → GAU (return) | $3,454.32 | — | $3,454.32 |
|
||||||
|
| China Eastern | Siddharth MEL → PVG → FCO | $849.05 | — | $849.05 |
|
||||||
|
| China Eastern | Meghalee MEL → PVG → FCO | $849.05 | — | $849.05 |
|
||||||
|
| China Eastern (ancillary) | Seat/baggage fees | $187.14 | — | $187.14 |
|
||||||
|
| Qatar Airways | Siddharth + Meghalee (cancelled) | $2,396.90 | −$2,118.10 | $278.80 |
|
||||||
|
| **Flights total** | | **$10,432.80** | **−$2,118.10** | **$8,314.70** |
|
||||||
|
|
||||||
|
> ITA Airways (billed as Azwebin Fiumicino) — 3 outbound tickets Delhi → Rome plus 3 sets of ancillary fees, all charged Jan 17.
|
||||||
|
> Qatar was booked first (Jan 17) and then cancelled; refund of $2,118.10 processed Mar 24 (during Rome stay). Net cancellation penalty: **$278.80**. China Eastern replaced it at $1,885.24 total — slightly cheaper.
|
||||||
|
|
||||||
|
### Accommodation
|
||||||
|
|
||||||
|
| Property | Destination | Nights | Booked via | Net Cost |
|
||||||
|
|---|---|---|---|---:|
|
||||||
|
| Fontana di Trevi area (Vrbo HA-XTP24R) | Rome | 4 | Vrbo | $2,221.66 |
|
||||||
|
| Apartment Moro 4 — Rialto | Venice | 3 | Direct | $1,410.11 |
|
||||||
|
| 174A Apartments Murata | Ortisei | 4 | Muse Holiday | $1,815.06 |
|
||||||
|
| In the heart of Varenna (Vrbo HA7B9C9J) | Varenna | 2 | Vrbo | $2,274.46 |
|
||||||
|
| Cozy Central Duplex | St Moritz | 2 | Agoda | $2,560.45 |
|
||||||
|
| Hotel Luzernerhof | Lucerne | 3 | Agoda | $1,930.07 |
|
||||||
|
| Adagio Paris Montmartre | Paris | 4 | Luxury Escapes | $2,745.24 |
|
||||||
|
| **Accommodation total** | | **22 nights** | | **$14,957.05** |
|
||||||
|
|
||||||
|
> Paris: Luxury Escapes $3,283.80 − $820.95 refund + $282.39 extra charge = $2,745.24 net.
|
||||||
|
> **Average cost per night (5 pax):** $680 · **per person per night:** $136
|
||||||
|
|
||||||
|
### Pre-booked Transport
|
||||||
|
|
||||||
|
| Date | Merchant | Route | Amount |
|
||||||
|
|---|---|---|---:|
|
||||||
|
| Jan 26 | Trenitalia (Frecciarossa Business) | Rome → Venice (5 pax) | $468.55 |
|
||||||
|
| Mar 4 | Rail Europe | Various European routes | $372.40 |
|
||||||
|
| | **Total** | | **$840.95** |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## On-Trip Spending — $16,027 net
|
||||||
|
|
||||||
|
### By Destination
|
||||||
|
|
||||||
|
| Destination | Dates | Net Spend | Txns | Daily Avg |
|
||||||
|
|---|---|---:|---:|---:|
|
||||||
|
| Rome *(inc. transit days Mar 19–20)* | Mar 19–24 | $2,955 | 46 | $493 |
|
||||||
|
| Venice | Mar 25–27 | $960 | 21 | $320 |
|
||||||
|
| Ortisei / Dolomites | Mar 28–31 | $3,595 | 19 | $899 |
|
||||||
|
| Varenna / Lake Como | Apr 1–2 | $863 | 16 | $432 |
|
||||||
|
| St Moritz | Apr 3–4 | $355 | 10 | $178 |
|
||||||
|
| Lucerne | Apr 5–7 | $3,422 | 22 | $1,141 |
|
||||||
|
| Paris | Apr 8–12 | $3,878 | 46 | $970 |
|
||||||
|
| **Total on-trip** | **22 days** | **$16,027** | **180** | **$729** |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Rome & Transit (Mar 19–24) — $2,955
|
||||||
|
|
||||||
|
**Mar 19–20 (transit via Shanghai → Milan → Rome):**
|
||||||
|
- Glovo Milan × 4 deliveries: $93 — feeding the group across airport transit days
|
||||||
|
- Shanghai Sunny restaurant: $16 (CNY 78)
|
||||||
|
- Todis Roma groceries: $55 (manual, likely night of arrival)
|
||||||
|
|
||||||
|
**On ground in Rome:**
|
||||||
|
|
||||||
|
| Category | Key Items | Total |
|
||||||
|
|---|---|---:|
|
||||||
|
| Dining | Lione 21 EUR 90 ($148) · Suresh EUR 52 ($85) · Glovo × 4 ($179) · Faro Café ($40) · Bap Vaschette ($29) · various | ~$780 |
|
||||||
|
| Transport | FreeNow × 2 ($43) · Uber × 6 ($151) · ATAC bus ($2) · Radiotaxi ($11) | ~$210 |
|
||||||
|
| Travel | Trenitalia local ($23) · Roma Termini station tickets EUR 300 ($493) · Trenitalia EUR 275 ($452) · Trenitalia EUR 165 ($274) | ~$1,242 |
|
||||||
|
| Entertainment | St Peter's Basilica tickets: $58 | $58 |
|
||||||
|
| Groceries | Todis × 2 ($12) · F.Lli Casali ($17) · SumUp ($12) | $41 |
|
||||||
|
| Shopping | Scudieri International Florence EUR 51: $84 | $84 |
|
||||||
|
| Cash | Mar 21 cash transactions lump sum | $337 |
|
||||||
|
|
||||||
|
> **Florence day trip (Mar 22):** Trenitalia tickets $452 + $274 bought at Roma Termini ($493) and online, plus Scudieri shopping EUR 51.
|
||||||
|
> The two large Trenitalia charges on Mar 22–23 suggest additional train legs beyond Rome–Venice (possibly Florence or Naples day trip and ticket changes).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Venice (Mar 25–27) — $960
|
||||||
|
|
||||||
|
| Item | Amount |
|
||||||
|
|---|---:|
|
||||||
|
| Water taxi Ferrovia → accommodation | $79 |
|
||||||
|
| Caffe Rialto Venezia (dinner) | $109 |
|
||||||
|
| Fresh pasta restaurant (Sum Dal) | $96 |
|
||||||
|
| Baci Pasta | $70 |
|
||||||
|
| Dolcemente Salato (pastries/café) | $67 |
|
||||||
|
| Farini Pizza × 3 visits | $92 |
|
||||||
|
| Tvm Rialto Diretti 2 — shopping EUR 125 | $209 |
|
||||||
|
| Muse Holiday extra charge EUR 60 | $100 |
|
||||||
|
| Uber × 2 | $48 |
|
||||||
|
| Despar groceries | $19 |
|
||||||
|
| Gelatoteca Suso + Bar Americano | $17 |
|
||||||
|
| Pasticceria Ballarin + Bar Filovia × 2 | $28 |
|
||||||
|
|
||||||
|
> Grand Canal water taxi arrival ($79) was the planned "wow moment".
|
||||||
|
> Tvm Rialto Diretti 2 (EUR 125) — likely Murano glass or quality Venetian craft souvenirs, the largest single on-trip discretionary purchase outside of gear/activities.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Ortisei / Dolomites (Mar 28–31) — $3,595
|
||||||
|
|
||||||
|
The most expensive on-trip leg. Five major items account for $2,857 of it:
|
||||||
|
|
||||||
|
| Item | Amount | Detail |
|
||||||
|
|---|---:|---|
|
||||||
|
| Erich Perathon (gear shop, Val Gardena) | **$1,477** | EUR 880 — outdoor/ski clothing or equipment in Santa Cristina |
|
||||||
|
| Funivie Seceda cable car | **$441** | EUR 236+27 — the centrepiece cable car to 2,519m above Ortisei |
|
||||||
|
| Trenitalia Venice → Bolzano (5 pax) | **$528** | EUR 259.50 + EUR 55 split across two bookings |
|
||||||
|
| Taxi Demez Gregor (into valley) | **$238** | EUR 142 — private taxi from Bolzano to Ortisei (no public option for 5 with bags) |
|
||||||
|
| Funivia Lagazuoi, Cortina | **$222** | EUR 132.50 — Cortina d'Ampezzo day trip cable car |
|
||||||
|
| Despar Dolomiti (groceries) | **$201** | EUR 97.59 + EUR 22.30 across two shops |
|
||||||
|
| Ristorante Meuble Pont, Cortina | **$180** | EUR 107.50 — group dinner on Cortina day trip |
|
||||||
|
| Turonda Pizza Ortisei | $93 | |
|
||||||
|
| Istanbul Kebab + Buffet Bolzano × 2 | $111 | Transit + local meals |
|
||||||
|
| Lago di Braies chocolate stop | $21 | |
|
||||||
|
| Café Adler + Caffe Corso | $34 | |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Varenna / Lake Como (Apr 1–2) — $863
|
||||||
|
|
||||||
|
| Item | Amount |
|
||||||
|
|---|---:|
|
||||||
|
| Taxi Demez Gregor (out of valley) | $239 |
|
||||||
|
| Trenitalia (onward journey) | $101 |
|
||||||
|
| Pizza e Sfizi × 2 dinners | $113 |
|
||||||
|
| Mr Panino Bellagio (lunch) | $67 |
|
||||||
|
| Bernasconi Claudia Varenna | $55 |
|
||||||
|
| Varenna 1 shop EUR 55 | $92 |
|
||||||
|
| Valli Mara Bellagio souvenirs | $71 |
|
||||||
|
| Bistro di Corti × 2 | $50 |
|
||||||
|
| Lake Bakery × 2 | $30 |
|
||||||
|
| Ristorante Liberty, Tirano | $44 |
|
||||||
|
| Groceries (Despar, Macelleria × 2) | $49 |
|
||||||
|
| Gelato + bakery | $28 |
|
||||||
|
|
||||||
|
> Bellagio day trip from Varenna was a highlight — lunch at Mr Panino, ice cream at Gilardoni Stefania, souvenirs.
|
||||||
|
> Taxi Demez again for the exit from Val Gardena (charged Apr 1, same driver/company as arrival).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### St Moritz (Apr 3–4) — $355
|
||||||
|
|
||||||
|
Almost entirely self-catered:
|
||||||
|
|
||||||
|
| Item | Amount |
|
||||||
|
|---|---:|
|
||||||
|
| Coop supermarket (big shop) | $114 |
|
||||||
|
| Pizzaway × 2 orders | $89 |
|
||||||
|
| Bäckerei Bad × 3 visits | $58 |
|
||||||
|
| Coop (additional) | $14 |
|
||||||
|
| Bus und Service | $22 |
|
||||||
|
| Taxi St Moritz CHF 30 | $55 |
|
||||||
|
| SBB WC | $3 |
|
||||||
|
|
||||||
|
> Despite being the highest accommodation cost per night ($1,280/night), almost nothing was spent on-trip. The group self-catered using Coop and relied on the bakery.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Lucerne (Apr 5–7) — $3,422
|
||||||
|
|
||||||
|
Three large purchases dominate:
|
||||||
|
|
||||||
|
| Item | Amount | Detail |
|
||||||
|
|---|---:|---|
|
||||||
|
| Rail Europe (last-minute) | **$1,526** | EUR 911.95 — Swiss Travel Pass or multi-city rail tickets; bought while already in Lucerne |
|
||||||
|
| Daytrip.com private tour | **$1,078** | EUR 642 — private guided day tour (description: "Prague" but likely Rhine Falls or day excursion from Lucerne) |
|
||||||
|
| Rigi Bahnen (cog railway) | **$844** | CHF 461.60 — historic Rigi mountain railway, 5 pax round trip (charged Apr 10 but relates to Lucerne stay) |
|
||||||
|
| Hotel Rigi Kaltbad dining | $47 | Lunch at mountain hotel summit |
|
||||||
|
| Rigi Dorfladen shop | $37 | CHF 20 at Rigi summit village |
|
||||||
|
| Uber Eats | $94 | CHF 51.23 |
|
||||||
|
| WAL*TENZ GMBH Zurich | $82 | CHF 45.10 — dining/café in Zurich |
|
||||||
|
| QUZGYXOO-2 | $150 | CHF 82.50 — unidentified Lucerne charge |
|
||||||
|
| GO4T Luzern | $114 | CHF 62.40 — likely a guided activity or boat tour |
|
||||||
|
| Amorino Gelato + Alpineum Café | $51 | |
|
||||||
|
| Juice Paradise bubble tea | $29 | |
|
||||||
|
| SBB toilets × 4 | $11 | CHF 1.50 each — Swiss public toilets |
|
||||||
|
|
||||||
|
> The Rail Europe purchase last-minute cost $1,526 vs booking pre-trip where Swiss Travel Passes are generally cheaper. Worth pre-purchasing on future Swiss trips.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Paris (Apr 8–12) — $3,878
|
||||||
|
|
||||||
|
The return leg via Basel with 4 nights in Paris:
|
||||||
|
|
||||||
|
**Transit Basel (Apr 8):**
|
||||||
|
Bahn Mi Pho CHF 69 ($126) + McDonald's CHF 51 ($93) + Weber1s bagels ($66) + Kaffeemacher coffee ($17) + Confiseur Bachmann ($22) + Acento Argentino ($26) = **$350 in Basel** for the group during travel day
|
||||||
|
|
||||||
|
**Paris spending:**
|
||||||
|
|
||||||
|
| Item | Amount | Detail |
|
||||||
|
|---|---:|---|
|
||||||
|
| Viator/TripAdvisor guided tour | $296 | USD 203.70 — skip-the-line or guided Versailles/Paris tour |
|
||||||
|
| Palace of Versailles tickets | $292 | Full group |
|
||||||
|
| Louvre Museum tickets | $277 | Full group |
|
||||||
|
| Adagio Paris hotel extra charge | $282 | EUR 169 — extra night or room upgrade |
|
||||||
|
| FC Soleil restaurant | $207 | EUR 125 — group dinner |
|
||||||
|
| Uber airport transfer (Apr 12) | $126 | EUR 75.98 — departure to CDG |
|
||||||
|
| Deliveroo × 2 | $123 | EUR 52.49 + EUR 21.90 |
|
||||||
|
| Yak and Yeti restaurant | $83 | EUR 49.90 |
|
||||||
|
| Uber Eats | $65 | |
|
||||||
|
| Wild Deer restaurant | $64 | EUR 38.20 |
|
||||||
|
| Uber trips × 5 | $192 | Multiple rides across Paris |
|
||||||
|
| Fric Frac Montmartre | $55 | EUR 33 |
|
||||||
|
| Mitao | $56 | |
|
||||||
|
| Navigo transit pass | $61 | Group metro/bus |
|
||||||
|
| Little Versailles coffeeshop | $36 | |
|
||||||
|
| Pain Pain bakery × 2 | $29 | |
|
||||||
|
| Sarl by Orsel (groceries) × 2 | $35 | |
|
||||||
|
| Various small | $49 | |
|
||||||
|
|
||||||
|
> Museums + guided tour = **$865 on Paris attractions** (Versailles, Louvre, Viator).
|
||||||
|
> Uber was heavily used in Paris — 5+ trips totalling $254 including the CDG airport transfer.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Spend by Category (Net)
|
||||||
|
|
||||||
|
| Category | Net Spend | Txns | Notes |
|
||||||
|
|---|---:|---:|---|
|
||||||
|
| Travel | $31,290 | 51 | Flights, accommodation, trains, cable cars |
|
||||||
|
| Dining | $4,241 | 95 | 95 restaurant/café/delivery transactions |
|
||||||
|
| Transport | $2,636 | 35 | Uber, taxis, buses, metro passes |
|
||||||
|
| Shopping | $2,053 | 6 | Erich Perathon $1,477 + Venice/Varenna/Florence |
|
||||||
|
| Entertainment | $698 | 4 | Versailles, Louvre, Basilica, Bellagio souvenirs |
|
||||||
|
| Groceries | $589 | 15 | Despar, Coop, Todis, Macelleria |
|
||||||
|
| Other (net) | −$1,751 | 4 | Qatar refund exceeds "other" debits |
|
||||||
|
| Uncategorised | $42 | 2 | Residual |
|
||||||
|
| **Total** | **$39,757** | **212** | |
|
||||||
|
|
||||||
|
> The negative "Other" figure reflects the Qatar Airways refund ($2,118) offsetting the ITA/Azwebin ancillary fees charged in the same category.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Top 15 On-Trip Transactions
|
||||||
|
|
||||||
|
| Date | Merchant | AUD | Category |
|
||||||
|
|---|---|---:|---|
|
||||||
|
| Mar 28 | Erich Perathon, Val Gardena | $1,477 | Shopping — EUR 880 gear |
|
||||||
|
| Apr 6 | Rail Europe | $1,526 | Travel — EUR 912 rail passes |
|
||||||
|
| Apr 7 | Daytrip.com | $1,078 | Transport — EUR 642 private tour |
|
||||||
|
| Apr 10 | Rigi Bahnen | $844 | Travel — CHF 462 mountain railway |
|
||||||
|
| Mar 22 | Roma Termini (train tickets) | $493 | Travel — EUR 300 |
|
||||||
|
| Mar 22 | Trenitalia | $452 | Travel — EUR 275 |
|
||||||
|
| Mar 28 | Trenitalia | $435 | Travel — EUR 260 |
|
||||||
|
| Mar 30 | Funivie Seceda | $396 | Travel — EUR 236 cable car |
|
||||||
|
| Apr 9 | Viator/TripAdvisor | $296 | Travel — USD 204 Paris tour |
|
||||||
|
| Apr 8 | Palace of Versailles | $292 | Entertainment |
|
||||||
|
| Apr 10 | Adagio Paris extra | $282 | Travel |
|
||||||
|
| Apr 8 | Louvre Museum | $277 | Entertainment |
|
||||||
|
| Mar 23 | Trenitalia | $274 | Travel — EUR 165 |
|
||||||
|
| Mar 21 | Cash transactions (Rome) | $337 | Various |
|
||||||
|
| Apr 1 | Taxi Demez Gregor | $239 | Transport — EUR 142 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Key Observations
|
||||||
|
|
||||||
|
**Flight changes cost $278.80.** Qatar was booked first (Jan 17, $2,396.90) and later cancelled; the refund of $2,118.10 came through during the Rome stay on Mar 24. China Eastern (MEL→PVG→FCO) replaced it at $1,885.24 — marginally cheaper but via Shanghai with a longer travel time.
|
||||||
|
|
||||||
|
**60% of spend was locked in before leaving Australia.** Pre-trip bookings (flights for all 5, accommodation across 7 cities, and pre-purchased trains) totalled $23,730 vs $16,027 spent on the ground.
|
||||||
|
|
||||||
|
**Dolomites was the most expensive on-trip leg** despite only 4 days — Erich Perathon EUR 880 gear purchase in Val Gardena accounts for $1,477 alone. Without it, Dolomites would be the cheapest destination per day.
|
||||||
|
|
||||||
|
**Rail spend ballooned in Lucerne.** Rail Europe EUR 912 ($1,526) bought last-minute in Lucerne was the single largest on-trip travel cost. Swiss Travel Passes are considerably cheaper when purchased outside Switzerland before travel.
|
||||||
|
|
||||||
|
**Dining: 95 transactions, $4,241 net.** The group averaged $193/day on food across 22 days ($39/person/day). Glovo delivery was the primary dining mode during transit days and in Rome (10+ orders). Paris had the most sit-down restaurant spending — FC Soleil EUR 125, Yak and Yeti EUR 50, plus multiple delivery orders.
|
||||||
|
|
||||||
|
**St Moritz: highest accommodation cost, lowest on-trip spend.** Agoda charged $2,560 for 2 nights but the group spent only $355 on-trip — almost entirely groceries and the local bakery.
|
||||||
|
|
||||||
|
**Paris Uber spend: $254 across 6+ trips** including a $126 CDG airport transfer (EUR 76). Combined with 2 Deliveroo orders and Uber Eats, rideshare/delivery accounted for ~$380 of Paris on-trip costs.
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 194 KiB |
Generated
+1644
-7
File diff suppressed because it is too large
Load Diff
+12
-3
@@ -6,7 +6,12 @@
|
|||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
"start": "next start",
|
"start": "next start",
|
||||||
"lint": "eslint"
|
"lint": "eslint",
|
||||||
|
"test": "vitest run --config vitest.config.ts",
|
||||||
|
"test:watch": "vitest --config vitest.config.ts",
|
||||||
|
"test:setup": "bash scripts/setup-test-db.sh",
|
||||||
|
"test:integration": "vitest run --config vitest.integration.config.ts",
|
||||||
|
"test:all": "npm test && npm run test:integration"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@prisma/adapter-pg": "^7.4.2",
|
"@prisma/adapter-pg": "^7.4.2",
|
||||||
@@ -16,7 +21,8 @@
|
|||||||
"pg": "^8.20.0",
|
"pg": "^8.20.0",
|
||||||
"prisma": "^7.4.2",
|
"prisma": "^7.4.2",
|
||||||
"react": "19.2.3",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.2.3"
|
"react-dom": "19.2.3",
|
||||||
|
"recharts": "^3.8.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tailwindcss/postcss": "^4",
|
"@tailwindcss/postcss": "^4",
|
||||||
@@ -24,9 +30,12 @@
|
|||||||
"@types/pg": "^8.18.0",
|
"@types/pg": "^8.18.0",
|
||||||
"@types/react": "^19",
|
"@types/react": "^19",
|
||||||
"@types/react-dom": "^19",
|
"@types/react-dom": "^19",
|
||||||
|
"@vitest/coverage-v8": "^4.1.2",
|
||||||
"eslint": "^9",
|
"eslint": "^9",
|
||||||
"eslint-config-next": "16.1.6",
|
"eslint-config-next": "16.1.6",
|
||||||
"tailwindcss": "^4",
|
"tailwindcss": "^4",
|
||||||
"typescript": "^5"
|
"typescript": "^5",
|
||||||
|
"vite-tsconfig-paths": "^6.1.1",
|
||||||
|
"vitest": "^4.1.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS participants (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
name TEXT NOT NULL UNIQUE,
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW()
|
||||||
|
);
|
||||||
|
INSERT INTO participants (name) VALUES ('Me') ON CONFLICT DO NOTHING;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS transaction_splits (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
transaction_id INTEGER NOT NULL REFERENCES transactions(id) ON DELETE CASCADE,
|
||||||
|
participant_id INTEGER NOT NULL REFERENCES participants(id) ON DELETE CASCADE,
|
||||||
|
share_percent NUMERIC(5,2) NOT NULL CHECK (share_percent > 0 AND share_percent <= 100),
|
||||||
|
settled BOOLEAN DEFAULT FALSE,
|
||||||
|
settled_at TIMESTAMPTZ,
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
UNIQUE (transaction_id, participant_id)
|
||||||
|
);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_splits_txn ON transaction_splits(transaction_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_splits_participant ON transaction_splits(participant_id);
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Add email to participants for OAuth identity mapping
|
||||||
|
ALTER TABLE participants ADD COLUMN IF NOT EXISTS email TEXT UNIQUE;
|
||||||
|
|
||||||
|
-- Add owner_id and account_holder_name to statements
|
||||||
|
ALTER TABLE statements ADD COLUMN IF NOT EXISTS owner_id INTEGER NOT NULL DEFAULT 1 REFERENCES participants(id);
|
||||||
|
ALTER TABLE statements ADD COLUMN IF NOT EXISTS account_holder_name TEXT;
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_statements_owner_id ON statements(owner_id);
|
||||||
|
|
||||||
|
-- Auto-assignment mapping table: (bank_name, account_number) -> owner
|
||||||
|
CREATE TABLE IF NOT EXISTS account_owner_mappings (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
bank_name TEXT NOT NULL,
|
||||||
|
account_number TEXT NOT NULL,
|
||||||
|
owner_id INTEGER NOT NULL REFERENCES participants(id),
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
UNIQUE(bank_name, account_number)
|
||||||
|
);
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS budgets (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
owner_id INTEGER NOT NULL REFERENCES participants(id),
|
||||||
|
category TEXT NOT NULL,
|
||||||
|
month DATE NOT NULL,
|
||||||
|
amount_limit NUMERIC(10,2) NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
UNIQUE(owner_id, category, month)
|
||||||
|
);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_budgets_owner_month ON budgets(owner_id, month);
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
-- Add FX conversion support
|
||||||
|
ALTER TABLE statements ADD COLUMN IF NOT EXISTS exchange_rate_to_aud NUMERIC(10,6);
|
||||||
|
ALTER TABLE transactions ADD COLUMN IF NOT EXISTS amount_aud NUMERIC(12,2);
|
||||||
|
|
||||||
|
-- Backfill: all existing data is AUD
|
||||||
|
UPDATE transactions SET amount_aud = amount WHERE amount_aud IS NULL;
|
||||||
|
UPDATE statements SET exchange_rate_to_aud = 1.000000 WHERE exchange_rate_to_aud IS NULL;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "transaction_overrides" ADD COLUMN "my_share_percent" DECIMAL(5,2);
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
CREATE TABLE split_payments (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
from_participant_id INTEGER NOT NULL REFERENCES participants(id),
|
||||||
|
to_participant_id INTEGER NOT NULL REFERENCES participants(id),
|
||||||
|
amount DECIMAL(10,2) NOT NULL CHECK (amount > 0),
|
||||||
|
payment_date DATE NOT NULL,
|
||||||
|
notes TEXT,
|
||||||
|
linked_transaction_id INTEGER REFERENCES transactions(id) ON DELETE SET NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_split_payments_from ON split_payments(from_participant_id);
|
||||||
|
CREATE INDEX idx_split_payments_to ON split_payments(to_participant_id);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE transactions ADD COLUMN reconciled_with_id INTEGER REFERENCES transactions(id) ON DELETE SET NULL;
|
||||||
|
CREATE INDEX idx_transactions_reconciled ON transactions(reconciled_with_id) WHERE reconciled_with_id IS NOT NULL;
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
-- Trips: group transactions (via transaction_overrides.trip_id) into named
|
||||||
|
-- trips with analytics. Catch-up migration — this DDL was applied directly to
|
||||||
|
-- the live DB when the feature shipped; idempotent so re-running is safe.
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS trips (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
owner_id INTEGER NOT NULL REFERENCES participants(id),
|
||||||
|
name VARCHAR(255) NOT NULL,
|
||||||
|
description TEXT,
|
||||||
|
start_date DATE,
|
||||||
|
end_date DATE,
|
||||||
|
color VARCHAR(20) NOT NULL DEFAULT '#6366f1',
|
||||||
|
archived BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
ALTER TABLE transaction_overrides
|
||||||
|
ADD COLUMN IF NOT EXISTS trip_id INTEGER REFERENCES trips(id) ON DELETE SET NULL;
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_tx_overrides_trip_id
|
||||||
|
ON transaction_overrides (trip_id) WHERE trip_id IS NOT NULL;
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
-- Manual-only rules ("quick actions"): a rule flagged manual_only is never
|
||||||
|
-- picked up by the bulk apply-all run. It exists to be fired by hand against a
|
||||||
|
-- selection of transactions from the transactions page, so its conditions are
|
||||||
|
-- irrelevant — the selection is the condition.
|
||||||
|
|
||||||
|
ALTER TABLE rules
|
||||||
|
ADD COLUMN IF NOT EXISTS manual_only BOOLEAN NOT NULL DEFAULT false;
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_rules_manual_only
|
||||||
|
ON rules (owner_id, manual_only) WHERE manual_only = true;
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
-- Normalise statements.statement_type to a fixed vocabulary.
|
||||||
|
--
|
||||||
|
-- Before this migration the column held whatever free text Gemini put in
|
||||||
|
-- `account_type` ('Credit Card', 'credit card', 'credit_card', 'Business Card',
|
||||||
|
-- 'ACCESS ADVANTAGE', 'multi-currency account', ...). The UI coped only by
|
||||||
|
-- doing `.includes("card")`, which breaks as soon as bank and loan statements
|
||||||
|
-- arrive.
|
||||||
|
--
|
||||||
|
-- The raw extracted text is preserved in `account_type` — this only touches
|
||||||
|
-- `statement_type`. A BEFORE trigger normalises on write, so the N8N ingestion
|
||||||
|
-- workflow keeps working unchanged while it still sends free text.
|
||||||
|
--
|
||||||
|
-- Idempotent: safe to re-run.
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION normalize_statement_type(raw TEXT)
|
||||||
|
RETURNS TEXT AS $$
|
||||||
|
DECLARE
|
||||||
|
v TEXT := lower(trim(coalesce(raw, '')));
|
||||||
|
BEGIN
|
||||||
|
IF v = '' THEN
|
||||||
|
RETURN 'other';
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
-- Already canonical
|
||||||
|
IF v IN ('credit_card', 'transaction', 'savings', 'loan', 'offset', 'investment', 'other') THEN
|
||||||
|
RETURN v;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
-- Offset before loan: "Mortgage Offset" is an offset account, not a loan.
|
||||||
|
IF v LIKE '%offset%' THEN
|
||||||
|
RETURN 'offset';
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
-- Loans before transaction: "home loan account" must not match '%account%'.
|
||||||
|
IF v LIKE '%loan%' OR v LIKE '%mortgage%' THEN
|
||||||
|
RETURN 'loan';
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
-- Cards: covers 'Credit Card', 'credit card', 'Business Card', 'Charge Card'
|
||||||
|
IF v LIKE '%card%' THEN
|
||||||
|
RETURN 'credit_card';
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
IF v LIKE '%saving%' OR v LIKE '%term deposit%' THEN
|
||||||
|
RETURN 'savings';
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
IF v LIKE '%invest%' OR v LIKE '%share%' OR v LIKE '%broker%' THEN
|
||||||
|
RETURN 'investment';
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
-- Everyday transaction accounts. Bank-specific product names go here; the
|
||||||
|
-- generic keywords catch the rest.
|
||||||
|
IF v LIKE '%access advantage%' -- ANZ
|
||||||
|
OR v LIKE '%complete access%' -- Westpac
|
||||||
|
OR v LIKE '%smart access%' -- CommBank
|
||||||
|
OR v LIKE '%netbank%' -- CommBank
|
||||||
|
OR v LIKE '%classic banking%' -- NAB
|
||||||
|
OR v LIKE '%multi-currency%' -- Wise
|
||||||
|
OR v LIKE '%multi currency%'
|
||||||
|
OR v LIKE '%transaction%'
|
||||||
|
OR v LIKE '%everyday%'
|
||||||
|
OR v LIKE '%cheque%'
|
||||||
|
OR v LIKE '%current account%'
|
||||||
|
OR v LIKE '%debit%'
|
||||||
|
THEN
|
||||||
|
RETURN 'transaction';
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
RETURN 'other';
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql IMMUTABLE;
|
||||||
|
|
||||||
|
-- Normalise on write so the N8N workflow can keep sending raw account_type.
|
||||||
|
CREATE OR REPLACE FUNCTION statements_normalize_type_trigger()
|
||||||
|
RETURNS TRIGGER AS $$
|
||||||
|
BEGIN
|
||||||
|
NEW.statement_type := normalize_statement_type(NEW.statement_type);
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql;
|
||||||
|
|
||||||
|
DROP TRIGGER IF EXISTS trg_statements_normalize_type ON statements;
|
||||||
|
CREATE TRIGGER trg_statements_normalize_type
|
||||||
|
BEFORE INSERT OR UPDATE OF statement_type ON statements
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION statements_normalize_type_trigger();
|
||||||
|
|
||||||
|
-- Backfill existing rows.
|
||||||
|
UPDATE statements
|
||||||
|
SET statement_type = normalize_statement_type(statement_type)
|
||||||
|
WHERE statement_type IS DISTINCT FROM normalize_statement_type(statement_type);
|
||||||
|
|
||||||
|
-- Guard the vocabulary. Safe because the trigger runs first on every write.
|
||||||
|
ALTER TABLE statements DROP CONSTRAINT IF EXISTS statements_statement_type_check;
|
||||||
|
ALTER TABLE statements
|
||||||
|
ADD CONSTRAINT statements_statement_type_check
|
||||||
|
CHECK (statement_type IN ('credit_card', 'transaction', 'savings', 'loan', 'offset', 'investment', 'other'));
|
||||||
|
|
||||||
|
ALTER TABLE statements ALTER COLUMN statement_type SET DEFAULT 'other';
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
-- Loan statement support.
|
||||||
|
--
|
||||||
|
-- Migration 0013 taught the system that a statement can be a loan; this gives
|
||||||
|
-- loans somewhere to put the data that only loans have.
|
||||||
|
--
|
||||||
|
-- The core accounting problem: a loan repayment is not an expense. A $3,000
|
||||||
|
-- mortgage repayment is roughly $1,200 of principal (a balance-sheet move that
|
||||||
|
-- builds equity) and $1,800 of interest (the only part that is genuinely spend).
|
||||||
|
-- Counting the whole repayment as spending overstates expenses badly.
|
||||||
|
--
|
||||||
|
-- Two statement shapes are handled:
|
||||||
|
-- (a) The common Australian case — the loan statement lists repayments and
|
||||||
|
-- "Interest Charged" as separate rows. transaction_type already carries
|
||||||
|
-- this: 'interest' rows count as spend, 'payment' rows do not.
|
||||||
|
-- (b) Some lenders itemise principal and interest on the repayment row itself.
|
||||||
|
-- That's what principal_amount / interest_amount are for: when
|
||||||
|
-- interest_amount is set, analytics count that instead of the full amount.
|
||||||
|
--
|
||||||
|
-- Idempotent: safe to re-run.
|
||||||
|
|
||||||
|
-- Per-transaction principal/interest split (shape (b) above).
|
||||||
|
ALTER TABLE transactions
|
||||||
|
ADD COLUMN IF NOT EXISTS principal_amount NUMERIC(12,2),
|
||||||
|
ADD COLUMN IF NOT EXISTS interest_amount NUMERIC(12,2);
|
||||||
|
|
||||||
|
COMMENT ON COLUMN transactions.principal_amount IS
|
||||||
|
'Principal portion of a loan repayment, when the statement itemises it. Not spend.';
|
||||||
|
COMMENT ON COLUMN transactions.interest_amount IS
|
||||||
|
'Interest portion of a loan repayment, when the statement itemises it. This is the part that counts as spend.';
|
||||||
|
|
||||||
|
-- Partial index: only loan repayment rows carry a split.
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_transactions_interest_amount
|
||||||
|
ON transactions (interest_amount)
|
||||||
|
WHERE interest_amount IS NOT NULL;
|
||||||
|
|
||||||
|
-- Loan-level terms, read off the statement header.
|
||||||
|
ALTER TABLE statements
|
||||||
|
ADD COLUMN IF NOT EXISTS interest_rate NUMERIC(6,3),
|
||||||
|
ADD COLUMN IF NOT EXISTS scheduled_repayment NUMERIC(12,2),
|
||||||
|
ADD COLUMN IF NOT EXISTS repayment_frequency TEXT,
|
||||||
|
ADD COLUMN IF NOT EXISTS redraw_available NUMERIC(12,2),
|
||||||
|
ADD COLUMN IF NOT EXISTS loan_term_months INTEGER;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN statements.interest_rate IS 'Annual interest rate as a percentage, e.g. 6.140';
|
||||||
|
COMMENT ON COLUMN statements.redraw_available IS 'Funds available to redraw (loans) — not the same as available_credit on a card.';
|
||||||
|
|
||||||
|
-- Free text varies by lender ("Monthly", "Fortnightly"); normalise the common
|
||||||
|
-- spellings rather than constraining, so an unexpected value never blocks an import.
|
||||||
|
ALTER TABLE statements DROP CONSTRAINT IF EXISTS statements_repayment_frequency_check;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION normalize_repayment_frequency(raw TEXT)
|
||||||
|
RETURNS TEXT AS $$
|
||||||
|
DECLARE
|
||||||
|
v TEXT := lower(trim(coalesce(raw, '')));
|
||||||
|
BEGIN
|
||||||
|
IF v = '' THEN RETURN NULL; END IF;
|
||||||
|
-- Check fortnightly spellings before the bare '%week%' match below.
|
||||||
|
IF v LIKE '%fortnight%' OR v LIKE '%bi-week%' OR v LIKE '%biweek%'
|
||||||
|
OR v LIKE '%2 week%' OR v LIKE '%two week%' OR v LIKE '%14 day%'
|
||||||
|
THEN RETURN 'fortnightly'; END IF;
|
||||||
|
IF v LIKE '%month%' THEN RETURN 'monthly'; END IF;
|
||||||
|
IF v LIKE '%week%' THEN RETURN 'weekly'; END IF;
|
||||||
|
IF v LIKE '%quarter%' THEN RETURN 'quarterly'; END IF;
|
||||||
|
IF v LIKE '%annual%' OR v LIKE '%year%' THEN RETURN 'annually'; END IF;
|
||||||
|
RETURN v;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql IMMUTABLE;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION statements_normalize_loan_fields_trigger()
|
||||||
|
RETURNS TRIGGER AS $$
|
||||||
|
BEGIN
|
||||||
|
NEW.repayment_frequency := normalize_repayment_frequency(NEW.repayment_frequency);
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql;
|
||||||
|
|
||||||
|
DROP TRIGGER IF EXISTS trg_statements_normalize_loan_fields ON statements;
|
||||||
|
CREATE TRIGGER trg_statements_normalize_loan_fields
|
||||||
|
BEFORE INSERT OR UPDATE OF repayment_frequency ON statements
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION statements_normalize_loan_fields_trigger();
|
||||||
|
|
||||||
|
UPDATE statements
|
||||||
|
SET repayment_frequency = normalize_repayment_frequency(repayment_frequency)
|
||||||
|
WHERE repayment_frequency IS NOT NULL
|
||||||
|
AND repayment_frequency IS DISTINCT FROM normalize_repayment_frequency(repayment_frequency);
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
-- Canonical category vocabulary, enforced at the database.
|
||||||
|
--
|
||||||
|
-- Categories arrive from three places: the Gemini extraction (which writes
|
||||||
|
-- straight to Postgres from N8N, bypassing the app entirely), CSV import, and
|
||||||
|
-- manual edits. Only the DB sits under all three, so that is where the rule has
|
||||||
|
-- to live -- the same reasoning as normalize_statement_type() in 0013.
|
||||||
|
--
|
||||||
|
-- What had leaked in without it:
|
||||||
|
-- payment 19 rows $42,569.42 transaction_type written into the category
|
||||||
|
-- refund 15 rows $8,558.99 ditto
|
||||||
|
-- Shopping 13 rows $2,917.44 title-case duplicates of real categories,
|
||||||
|
-- Dining 10 rows $127.30 which every GROUP BY counted separately
|
||||||
|
-- (NULL) 3 rows $1,135.05
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION normalize_category(raw TEXT)
|
||||||
|
RETURNS TEXT AS $$
|
||||||
|
DECLARE
|
||||||
|
v TEXT;
|
||||||
|
BEGIN
|
||||||
|
IF raw IS NULL OR btrim(raw) = '' THEN RETURN 'other'; END IF;
|
||||||
|
|
||||||
|
-- Title-case and spaced variants collapse onto the canonical spelling:
|
||||||
|
-- 'Home Goods' -> 'home_goods', 'Shopping' -> 'shopping'.
|
||||||
|
v := replace(replace(lower(btrim(raw)), ' ', '_'), '-', '_');
|
||||||
|
|
||||||
|
IF v IN ('groceries','dining','transport','fuel','shopping','utilities',
|
||||||
|
'entertainment','travel','health','insurance','subscriptions',
|
||||||
|
'cash_advance','government','education','rent','home_goods',
|
||||||
|
'home_maintenance','transfers','income','investment','loan_interest',
|
||||||
|
'personal_care','pets','gifts','charity','fees','other')
|
||||||
|
THEN RETURN v; END IF;
|
||||||
|
|
||||||
|
-- transaction_type leaking into the category field. A payment is money moving
|
||||||
|
-- to a card or account, which is exactly what 'transfers' means here.
|
||||||
|
IF v IN ('payment','payments','transfer') THEN RETURN 'transfers'; END IF;
|
||||||
|
|
||||||
|
-- Bare 'interest' is credit-card interest; loan interest is categorised
|
||||||
|
-- loan_interest by the extraction prompt and matches the list above.
|
||||||
|
IF v IN ('fee','bank_fees','interest') THEN RETURN 'fees'; END IF;
|
||||||
|
|
||||||
|
-- Singular/plural and common synonyms.
|
||||||
|
IF v IN ('grocery','supermarket') THEN RETURN 'groceries'; END IF;
|
||||||
|
IF v IN ('subscription') THEN RETURN 'subscriptions'; END IF;
|
||||||
|
IF v IN ('utility','bills') THEN RETURN 'utilities'; END IF;
|
||||||
|
IF v IN ('gift') THEN RETURN 'gifts'; END IF;
|
||||||
|
IF v IN ('pet') THEN RETURN 'pets'; END IF;
|
||||||
|
IF v IN ('restaurant','restaurants','food','takeaway') THEN RETURN 'dining'; END IF;
|
||||||
|
IF v IN ('petrol','gas','gasoline') THEN RETURN 'fuel'; END IF;
|
||||||
|
IF v IN ('medical','pharmacy') THEN RETURN 'health'; END IF;
|
||||||
|
IF v IN ('donation','donations') THEN RETURN 'charity'; END IF;
|
||||||
|
IF v IN ('salary','wages') THEN RETURN 'income'; END IF;
|
||||||
|
IF v IN ('investments','savings') THEN RETURN 'investment'; END IF;
|
||||||
|
IF v IN ('housing','mortgage') THEN RETURN 'rent'; END IF;
|
||||||
|
|
||||||
|
-- A 'refund' is not a category -- it says nothing about what was bought. The
|
||||||
|
-- backfill below recovers the real category from the merchant where it can;
|
||||||
|
-- anything still unknown lands in 'other' rather than inventing a category.
|
||||||
|
RETURN 'other';
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql IMMUTABLE;
|
||||||
|
|
||||||
|
|
||||||
|
-- Recover categories for rows typed as refunds before collapsing them to
|
||||||
|
-- 'other': use the most common category that merchant has on ordinary spend.
|
||||||
|
UPDATE transactions t
|
||||||
|
SET category = m.mode_category
|
||||||
|
FROM (
|
||||||
|
SELECT merchant_normalized,
|
||||||
|
MODE() WITHIN GROUP (ORDER BY category) AS mode_category
|
||||||
|
FROM transactions
|
||||||
|
WHERE merchant_normalized IS NOT NULL
|
||||||
|
AND category IS NOT NULL
|
||||||
|
AND category NOT IN ('payment','refund','fee','interest')
|
||||||
|
AND transaction_type IN ('debit','fee','interest')
|
||||||
|
GROUP BY merchant_normalized
|
||||||
|
) m
|
||||||
|
WHERE t.merchant_normalized = m.merchant_normalized
|
||||||
|
AND t.category = 'refund'
|
||||||
|
AND m.mode_category IS NOT NULL;
|
||||||
|
|
||||||
|
|
||||||
|
-- Backfill everything else through the function.
|
||||||
|
UPDATE transactions
|
||||||
|
SET category = normalize_category(category)
|
||||||
|
WHERE category IS NULL OR category <> normalize_category(category);
|
||||||
|
|
||||||
|
UPDATE transaction_overrides
|
||||||
|
SET category_override = normalize_category(category_override)
|
||||||
|
WHERE category_override IS NOT NULL
|
||||||
|
AND category_override <> normalize_category(category_override);
|
||||||
|
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION transactions_normalize_category()
|
||||||
|
RETURNS TRIGGER AS $$
|
||||||
|
BEGIN
|
||||||
|
NEW.category := normalize_category(NEW.category);
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql;
|
||||||
|
|
||||||
|
DROP TRIGGER IF EXISTS trg_transactions_normalize_category ON transactions;
|
||||||
|
CREATE TRIGGER trg_transactions_normalize_category
|
||||||
|
BEFORE INSERT OR UPDATE OF category ON transactions
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION transactions_normalize_category();
|
||||||
|
|
||||||
|
-- Overrides keep NULL meaning "no override"; only a set value is normalised.
|
||||||
|
CREATE OR REPLACE FUNCTION overrides_normalize_category()
|
||||||
|
RETURNS TRIGGER AS $$
|
||||||
|
BEGIN
|
||||||
|
IF NEW.category_override IS NOT NULL THEN
|
||||||
|
NEW.category_override := normalize_category(NEW.category_override);
|
||||||
|
END IF;
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$ LANGUAGE plpgsql;
|
||||||
|
|
||||||
|
DROP TRIGGER IF EXISTS trg_overrides_normalize_category ON transaction_overrides;
|
||||||
|
CREATE TRIGGER trg_overrides_normalize_category
|
||||||
|
BEFORE INSERT OR UPDATE OF category_override ON transaction_overrides
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION overrides_normalize_category();
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE transactions DROP CONSTRAINT IF EXISTS transactions_category_check;
|
||||||
|
ALTER TABLE transactions ADD CONSTRAINT transactions_category_check
|
||||||
|
CHECK (category IS NULL OR category IN (
|
||||||
|
'groceries','dining','transport','fuel','shopping','utilities','entertainment',
|
||||||
|
'travel','health','insurance','subscriptions','cash_advance','government',
|
||||||
|
'education','rent','home_goods','home_maintenance','transfers','income',
|
||||||
|
'investment','loan_interest','personal_care','pets','gifts','charity','fees','other'));
|
||||||
|
|
||||||
|
ALTER TABLE transaction_overrides DROP CONSTRAINT IF EXISTS overrides_category_check;
|
||||||
|
ALTER TABLE transaction_overrides ADD CONSTRAINT overrides_category_check
|
||||||
|
CHECK (category_override IS NULL OR category_override IN (
|
||||||
|
'groceries','dining','transport','fuel','shopping','utilities','entertainment',
|
||||||
|
'travel','health','insurance','subscriptions','cash_advance','government',
|
||||||
|
'education','rent','home_goods','home_maintenance','transfers','income',
|
||||||
|
'investment','loan_interest','personal_care','pets','gifts','charity','fees','other'));
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
-- How a transaction was paid for, so cash can be told apart from everything else.
|
||||||
|
--
|
||||||
|
-- The problem this solves: getPendingReconciliations treats every unreconciled
|
||||||
|
-- manual transaction as awaiting a matching statement row. A cash purchase never
|
||||||
|
-- appears on a statement, so it sits in the queue forever and is offered matches
|
||||||
|
-- within 3 days and 1% on amount. Accepting one is silently destructive --
|
||||||
|
-- reconciled manual rows are excluded from every query, so the cash spend
|
||||||
|
-- disappears while the card transaction it matched claims to be that same spend.
|
||||||
|
--
|
||||||
|
-- NULL means unknown, which is treated as reconcilable -- the existing behaviour
|
||||||
|
-- for every row already in the table.
|
||||||
|
--
|
||||||
|
-- Only 'cash' is excluded from reconciliation. A bank transfer DOES appear on a
|
||||||
|
-- statement now that transaction accounts are being imported, so it stays a
|
||||||
|
-- reconciliation candidate.
|
||||||
|
|
||||||
|
ALTER TABLE transactions
|
||||||
|
ADD COLUMN IF NOT EXISTS payment_method TEXT;
|
||||||
|
|
||||||
|
ALTER TABLE transactions DROP CONSTRAINT IF EXISTS transactions_payment_method_check;
|
||||||
|
ALTER TABLE transactions ADD CONSTRAINT transactions_payment_method_check
|
||||||
|
CHECK (payment_method IS NULL
|
||||||
|
OR payment_method IN ('card', 'cash', 'bank_transfer', 'other'));
|
||||||
|
|
||||||
|
-- Partial index: the reconciliation query filters on this, and cash is expected
|
||||||
|
-- to stay a small minority of rows.
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_transactions_payment_method
|
||||||
|
ON transactions (payment_method) WHERE payment_method IS NOT NULL;
|
||||||
|
|
||||||
|
-- Backfill the one row that is unambiguously cash. Statement-linked rows are
|
||||||
|
-- left NULL: they came from a statement, so by definition they are not cash.
|
||||||
|
UPDATE transactions
|
||||||
|
SET payment_method = 'cash'
|
||||||
|
WHERE statement_id IS NULL
|
||||||
|
AND description ILIKE '%cash transaction%';
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
-- Record which rule a run came from.
|
||||||
|
--
|
||||||
|
-- rule_apply_runs stored only counts ("13 matches · 13 transactions"), which is
|
||||||
|
-- not enough to decide whether to revert: you cannot tell a merchant rename from
|
||||||
|
-- a 50/50 split of your entire history. The snapshot column already holds the
|
||||||
|
-- before-state, but nothing said what was applied or why.
|
||||||
|
--
|
||||||
|
-- rule_name is denormalised deliberately. A run must stay readable after the
|
||||||
|
-- rule it came from is edited or deleted -- the history is a record of what
|
||||||
|
-- happened, not a pointer to what the rule says today.
|
||||||
|
|
||||||
|
ALTER TABLE rule_apply_runs
|
||||||
|
ADD COLUMN IF NOT EXISTS rule_id INTEGER,
|
||||||
|
ADD COLUMN IF NOT EXISTS rule_name TEXT,
|
||||||
|
-- 'all' = bulk run over every enabled rule; 'rule' = one rule by conditions;
|
||||||
|
-- 'selection' = one rule against hand-picked transactions (preview → apply).
|
||||||
|
ADD COLUMN IF NOT EXISTS source TEXT;
|
||||||
|
|
||||||
|
ALTER TABLE rule_apply_runs DROP CONSTRAINT IF EXISTS rule_apply_runs_source_check;
|
||||||
|
ALTER TABLE rule_apply_runs ADD CONSTRAINT rule_apply_runs_source_check
|
||||||
|
CHECK (source IS NULL OR source IN ('all', 'rule', 'selection'));
|
||||||
|
|
||||||
|
-- No FK to rules: deleting a rule must not cascade away the audit trail.
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_rule_apply_runs_rule
|
||||||
|
ON rule_apply_runs (rule_id) WHERE rule_id IS NOT NULL;
|
||||||
|
|
||||||
|
-- Existing rows stay NULL. There is no way to recover which rule they ran;
|
||||||
|
-- the UI shows them as "unknown rule" rather than guessing.
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
-- Create order_reviews table
|
||||||
|
CREATE TABLE IF NOT EXISTS order_reviews (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
transaction_id INTEGER NOT NULL UNIQUE REFERENCES transactions(id) ON DELETE CASCADE,
|
||||||
|
rating TEXT,
|
||||||
|
order_again BOOLEAN,
|
||||||
|
note TEXT,
|
||||||
|
item_verdicts JSONB NOT NULL DEFAULT '[]',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Add source_message_id to expense_metadata
|
||||||
|
ALTER TABLE expense_metadata ADD COLUMN IF NOT EXISTS source_message_id TEXT;
|
||||||
|
|
||||||
|
-- 1. Admit 'credits' as a payment method.
|
||||||
|
ALTER TABLE transactions DROP CONSTRAINT IF EXISTS transactions_payment_method_check;
|
||||||
|
ALTER TABLE transactions ADD CONSTRAINT transactions_payment_method_check
|
||||||
|
CHECK (payment_method IS NULL OR payment_method IN
|
||||||
|
('card','cash','bank_transfer','credits','other'));
|
||||||
|
|
||||||
|
-- 2. Idempotency key (I7). Partial: rows without an order_reference
|
||||||
|
-- (manual entries) are unaffected.
|
||||||
|
CREATE UNIQUE INDEX IF NOT EXISTS uq_expense_source_order
|
||||||
|
ON expense_metadata (source, order_reference)
|
||||||
|
WHERE order_reference IS NOT NULL;
|
||||||
|
|
||||||
|
-- 3. I1 as a database-level guard, not just workflow logic.
|
||||||
|
-- Scoped to pipeline-created rows so manual/statement rows are untouched.
|
||||||
|
ALTER TABLE transactions DROP CONSTRAINT IF EXISTS chk_ingested_orders_after_cutover;
|
||||||
|
ALTER TABLE transactions ADD CONSTRAINT chk_ingested_orders_after_cutover
|
||||||
|
CHECK (
|
||||||
|
payment_method IS DISTINCT FROM 'credits'
|
||||||
|
OR transaction_date >= DATE '2026-01-09'
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 4. Constrain the review verdict (§6.1).
|
||||||
|
ALTER TABLE order_reviews DROP CONSTRAINT IF EXISTS chk_order_review_rating;
|
||||||
|
ALTER TABLE order_reviews ADD CONSTRAINT chk_order_review_rating
|
||||||
|
CHECK (rating IS NULL OR rating IN ('again','fine','never'));
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Deferred card reconciliation.
|
||||||
|
--
|
||||||
|
-- An order paid "MasterCard Ending in 8032 and/or credits" does not state the
|
||||||
|
-- split. The split is recoverable from the card statement -- but for a live
|
||||||
|
-- order that statement is weeks away, so the split cannot be resolved at ingest
|
||||||
|
-- time. These columns let an order be parked and revisited.
|
||||||
|
|
||||||
|
ALTER TABLE expense_metadata ADD COLUMN IF NOT EXISTS card_last4 TEXT;
|
||||||
|
ALTER TABLE expense_metadata ADD COLUMN IF NOT EXISTS currency TEXT;
|
||||||
|
ALTER TABLE expense_metadata ADD COLUMN IF NOT EXISTS flags JSONB NOT NULL DEFAULT '[]';
|
||||||
|
ALTER TABLE expense_metadata ADD COLUMN IF NOT EXISTS reconciled_at TIMESTAMPTZ;
|
||||||
|
|
||||||
|
-- The pending set: provenance recorded, no transaction yet, still waiting on a
|
||||||
|
-- statement line. Partial so it stays small regardless of table growth.
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_expense_metadata_pending
|
||||||
|
ON expense_metadata (transaction_date)
|
||||||
|
WHERE transaction_id IS NULL AND reconciled_at IS NULL;
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- Which statement line settled an order's card leg.
|
||||||
|
--
|
||||||
|
-- Without this, reconcileCardLeg has no way to know a charge has already been
|
||||||
|
-- consumed, so two orders on the same card inside the match window both bind to
|
||||||
|
-- it and each books its own credits remainder -- double-counting spend.
|
||||||
|
ALTER TABLE expense_metadata
|
||||||
|
ADD COLUMN IF NOT EXISTS matched_transaction_id INTEGER
|
||||||
|
REFERENCES transactions(id) ON DELETE SET NULL;
|
||||||
|
|
||||||
|
-- One statement line settles at most one order.
|
||||||
|
CREATE UNIQUE INDEX IF NOT EXISTS uq_expense_matched_txn
|
||||||
|
ON expense_metadata (matched_transaction_id)
|
||||||
|
WHERE matched_transaction_id IS NOT NULL;
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
-- Order provenance: which platform the receipt came from, and the message it
|
||||||
|
-- came from.
|
||||||
|
--
|
||||||
|
-- The parser has always known the platform (it has to, to read the template)
|
||||||
|
-- and then threw it away. Without it a transaction reads "Order - Burger
|
||||||
|
-- Corner" with no way to tell whether to look in DoorDash or Uber Eats for the
|
||||||
|
-- detail, and no way to answer "how much of this is DoorDash?" at all.
|
||||||
|
--
|
||||||
|
-- `source_email_subject` / `source_email_from` already existed for the
|
||||||
|
-- Paperless expense path and were simply never populated by order ingestion.
|
||||||
|
|
||||||
|
ALTER TABLE expense_metadata ADD COLUMN IF NOT EXISTS platform text;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN expense_metadata.platform IS
|
||||||
|
'doordash | ubereats | uber — the receipt template the order was read from.';
|
||||||
|
|
||||||
|
-- Backfill the 101 rows written by the 2026-07-27 backfill. DoorDash receipts
|
||||||
|
-- carry no order id of their own, so ingestion synthesises `msg:<message-id>`;
|
||||||
|
-- Uber receipts carry a real trip UUID. That is the only surviving
|
||||||
|
-- discriminator, and it is exact.
|
||||||
|
UPDATE expense_metadata
|
||||||
|
SET platform = CASE WHEN order_reference LIKE 'msg:%' THEN 'doordash' ELSE 'ubereats' END
|
||||||
|
WHERE platform IS NULL
|
||||||
|
AND source = 'email'
|
||||||
|
AND paperless_doc_id IS NULL -- exclude the Paperless expense path
|
||||||
|
AND order_reference IS NOT NULL;
|
||||||
|
|
||||||
|
-- Pick-up / delivery stops, as the receipt prints them. Uber puts these on
|
||||||
|
-- every order under `Order details`; DoorDash prints no addresses at all, so
|
||||||
|
-- this stays '[]' there. Same block a *trip* receipt uses for start and
|
||||||
|
-- destination, so this column already fits rides when they come into scope.
|
||||||
|
ALTER TABLE expense_metadata ADD COLUMN IF NOT EXISTS route jsonb NOT NULL DEFAULT '[]'::jsonb;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN expense_metadata.route IS
|
||||||
|
'Uber only: [{label, time, address}] — pick-up and delivery stops as printed.';
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_expense_metadata_platform
|
||||||
|
ON expense_metadata (platform)
|
||||||
|
WHERE platform IS NOT NULL;
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
-- Settlement scope: which tab a payment settles.
|
||||||
|
--
|
||||||
|
-- `split_payments` has carried from/to/amount/date since it was written and
|
||||||
|
-- nothing else. That is the whole reason a per-trip balance has never been
|
||||||
|
-- computable — `getTripAnalytics` says so in a comment where the figure should
|
||||||
|
-- be: "split_payments carries no trip attribution, so a payment cannot be
|
||||||
|
-- assigned to a trip. Settlement is a property of the whole relationship."
|
||||||
|
--
|
||||||
|
-- It is also the reason the Shared page silently drops payments the moment a
|
||||||
|
-- tag filter is applied (`getParticipantBalances`): with one global payments
|
||||||
|
-- pool there is no honest way to show a filtered balance, so it showed gross
|
||||||
|
-- splits under the same label instead. A tag is a view; a scope is a ledger.
|
||||||
|
--
|
||||||
|
-- The scope is a *trip*, not a new `settlement_contexts` table. `trips` already
|
||||||
|
-- has owner_id, dates and an archived flag, and `transaction_overrides.trip_id`
|
||||||
|
-- already decides which transactions belong to it. A second grouping beside it
|
||||||
|
-- would be two unsynchronised scopes over the same rows — a trip could hold a
|
||||||
|
-- mix of contexts and a context could span trips, with no invariant saying
|
||||||
|
-- which one governs.
|
||||||
|
--
|
||||||
|
-- NULL means the ongoing household tab. That tab never closes, which is why
|
||||||
|
-- this is nullable rather than defaulted to some "general" row: absence is the
|
||||||
|
-- honest representation of "not attached to a trip", and it keeps every
|
||||||
|
-- existing payment correct without a backfill.
|
||||||
|
|
||||||
|
ALTER TABLE split_payments
|
||||||
|
ADD COLUMN IF NOT EXISTS trip_id integer REFERENCES trips(id) ON DELETE SET NULL;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN split_payments.trip_id IS
|
||||||
|
'The trip this payment settles. NULL = the ongoing household tab.';
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_split_payments_trip
|
||||||
|
ON split_payments (trip_id)
|
||||||
|
WHERE trip_id IS NOT NULL;
|
||||||
|
|
||||||
|
-- `settled` answers a different question and the two must not be collapsed:
|
||||||
|
-- trip_id is *which tab*, settled is *is this obligation still live*. A
|
||||||
|
-- pre-2026 historical split is settled with no tab; a Europe split becomes
|
||||||
|
-- settled when Europe's payment lands; a household split stays unsettled and
|
||||||
|
-- open indefinitely.
|
||||||
|
--
|
||||||
|
-- Nothing writes `settled` today. The comment in queries.ts claims
|
||||||
|
-- /api/splits/settle does — that route does not exist, and the column is false
|
||||||
|
-- on all 1,279 rows, which is why every trip has always reported 100%
|
||||||
|
-- unsettled including trips paid in full.
|
||||||
|
|
||||||
|
COMMENT ON COLUMN transaction_splits.settled IS
|
||||||
|
'Obligation discharged. Excluded from owed figures; still counted in spend analytics.';
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
-- A transaction imported twice cannot simply be deleted.
|
||||||
|
--
|
||||||
|
-- Every child of `transactions` is ON DELETE CASCADE — splits, tags, overrides,
|
||||||
|
-- expense_metadata, order_reviews. Deleting a row said to be "the duplicate"
|
||||||
|
-- therefore destroys whatever curation happens to sit on it, silently and
|
||||||
|
-- unrecoverably. The curation is not reliably on the surviving side either: of
|
||||||
|
-- the 31 known duplicate pairs, one carries splits and six carry overrides, and
|
||||||
|
-- which member holds them is an accident of import order.
|
||||||
|
--
|
||||||
|
-- So a duplicate is superseded, never removed. The row stays, keeps its
|
||||||
|
-- children, and points at the row that replaces it. Reversing a mistake is then
|
||||||
|
-- one UPDATE rather than a restore from backup.
|
||||||
|
--
|
||||||
|
-- This is the statement-vs-statement case. `reconciled_with_id` already covers
|
||||||
|
-- manual-vs-statement, and deliberately cannot be reused: the predicate that
|
||||||
|
-- hides a reconciled row is scoped to `statement_id IS NULL`, because a
|
||||||
|
-- statement line pointing at something else is the survivor, not the duplicate.
|
||||||
|
-- Both of these rows are statement lines.
|
||||||
|
|
||||||
|
ALTER TABLE transactions
|
||||||
|
ADD COLUMN IF NOT EXISTS superseded_by_id integer
|
||||||
|
REFERENCES transactions(id) ON DELETE SET NULL;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN transactions.superseded_by_id IS
|
||||||
|
'This row was imported twice; the named row is the one that counts. Excluded from every figure, kept for its children and its audit trail. NULL = live.';
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_transactions_superseded
|
||||||
|
ON transactions (superseded_by_id)
|
||||||
|
WHERE superseded_by_id IS NOT NULL;
|
||||||
|
|
||||||
|
-- A row cannot supersede itself, and a survivor cannot itself be superseded
|
||||||
|
-- (that would hide both members of the pair and lose the amount entirely).
|
||||||
|
ALTER TABLE transactions
|
||||||
|
DROP CONSTRAINT IF EXISTS transactions_no_self_supersede;
|
||||||
|
ALTER TABLE transactions
|
||||||
|
ADD CONSTRAINT transactions_no_self_supersede
|
||||||
|
CHECK (superseded_by_id IS NULL OR superseded_by_id <> id);
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
-- A four-level verdict, per-item opinions, and one verdict per PERSON.
|
||||||
|
--
|
||||||
|
-- Three levels collapsed the distinction that actually drives a re-order:
|
||||||
|
-- "loved" and "liked" are both "would order again", but only one is worth a
|
||||||
|
-- detour, and "ok" is not a recommendation. Asked for by the user 2026-07-28.
|
||||||
|
--
|
||||||
|
-- Safe as a straight swap: order_reviews had 0 rows when this was written, so
|
||||||
|
-- there are no old values to map. If that ever stops being true, map
|
||||||
|
-- again->liked, fine->ok, never->never BEFORE adding the constraint.
|
||||||
|
ALTER TABLE order_reviews DROP CONSTRAINT IF EXISTS chk_order_review_rating;
|
||||||
|
|
||||||
|
ALTER TABLE order_reviews ADD CONSTRAINT chk_order_review_rating
|
||||||
|
CHECK (rating IS NULL OR rating IN ('loved', 'liked', 'ok', 'never'));
|
||||||
|
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
-- A verdict belongs to a person, not to an order.
|
||||||
|
--
|
||||||
|
-- A shared meal produces two opinions and they routinely disagree — that
|
||||||
|
-- disagreement is the useful part, and one row per transaction cannot hold it.
|
||||||
|
-- The Slack nudge asks whether the order was shared; a yes both splits the
|
||||||
|
-- expense and asks the other person for their verdict, so the second row is
|
||||||
|
-- the normal case for anything shared, not an edge case.
|
||||||
|
--
|
||||||
|
-- No DEFAULT on participant_id on purpose: a verdict silently attributed to
|
||||||
|
-- whoever happens to be id 1 is worse than an insert that fails loudly.
|
||||||
|
ALTER TABLE order_reviews
|
||||||
|
ADD COLUMN IF NOT EXISTS participant_id integer
|
||||||
|
REFERENCES participants(id) ON DELETE CASCADE;
|
||||||
|
|
||||||
|
UPDATE order_reviews SET participant_id = 1 WHERE participant_id IS NULL;
|
||||||
|
|
||||||
|
ALTER TABLE order_reviews ALTER COLUMN participant_id SET NOT NULL;
|
||||||
|
|
||||||
|
-- Replace the per-transaction uniqueness with per-transaction-per-person.
|
||||||
|
-- Dropping this is what allows the second opinion to exist at all.
|
||||||
|
ALTER TABLE order_reviews DROP CONSTRAINT IF EXISTS order_reviews_transaction_id_key;
|
||||||
|
|
||||||
|
ALTER TABLE order_reviews
|
||||||
|
ADD CONSTRAINT order_reviews_transaction_participant_key
|
||||||
|
UNIQUE (transaction_id, participant_id);
|
||||||
|
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
-- item_verdicts already exists as jsonb DEFAULT '[]'. It has never been
|
||||||
|
-- written. The shape is now fixed as:
|
||||||
|
-- [{"item": "<line item description>", "verdict": "loved"|"never"}]
|
||||||
|
--
|
||||||
|
-- Keyed by description rather than by position in line_items: an index is
|
||||||
|
-- meaningless across orders, and the reusable signal is "the Pad Thai here is
|
||||||
|
-- good", which has to survive into the next order from the same merchant.
|
||||||
|
-- Only the poles are offered — a per-item "ok" is noise nobody would ever read.
|
||||||
|
ALTER TABLE order_reviews ADD CONSTRAINT chk_order_review_item_verdicts
|
||||||
|
CHECK (jsonb_typeof(item_verdicts) = 'array');
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
-- A fifth verdict: "bad", between "ok" and "never".
|
||||||
|
--
|
||||||
|
-- "OK" to "Never again" is a big jump and most disappointments live in the gap
|
||||||
|
-- (user, 2026-07-28). Without it, a merely poor meal either flatters itself as
|
||||||
|
-- OK or gets blacklisted, and the blacklist is the signal that has to stay
|
||||||
|
-- sharp — `warn` remains exclusive to 'never' so it is not diluted by every
|
||||||
|
-- mediocre delivery.
|
||||||
|
--
|
||||||
|
-- Safe as a straight widening: no existing row uses a value being removed,
|
||||||
|
-- because nothing is being removed.
|
||||||
|
ALTER TABLE order_reviews DROP CONSTRAINT IF EXISTS chk_order_review_rating;
|
||||||
|
|
||||||
|
ALTER TABLE order_reviews ADD CONSTRAINT chk_order_review_rating
|
||||||
|
CHECK (rating IS NULL OR rating IN ('loved', 'liked', 'ok', 'bad', 'never'));
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
-- Let credits-funded orders exist before the cutover.
|
||||||
|
--
|
||||||
|
-- `chk_ingested_orders_after_cutover` (migration 0018) refused any row with
|
||||||
|
-- payment_method = 'credits' dated before 2026-01-09. It was written as a
|
||||||
|
-- database-level guard for invariant I1, whose stated reason was splits:
|
||||||
|
-- before the cutover, shared expenses lived in SplitMyExpenses, and
|
||||||
|
-- re-importing them would double-charge Sonu against carryover transaction
|
||||||
|
-- 2348.
|
||||||
|
--
|
||||||
|
-- That reason no longer holds. Since finance-app 788219b, ACTIVE_OBLIGATION is
|
||||||
|
-- `ts.settled = false AND t.transaction_date >= '2026-01-09'`, so a split on a
|
||||||
|
-- pre-cutover transaction cannot assert a debt at all. The guard now blocks
|
||||||
|
-- something it was never aimed at: the orders themselves, which are ordinary
|
||||||
|
-- historical spend. 275 of them — $9,799.96 of meals and rides across
|
||||||
|
-- 2020-2025 — were invisible because the receipt was the only record and the
|
||||||
|
-- money came from a gift-card balance rather than a card.
|
||||||
|
--
|
||||||
|
-- What is NOT resolved, and is accepted deliberately (user, 2026-07-28): some
|
||||||
|
-- of those orders were funded by ShopBack gift cards that are themselves
|
||||||
|
-- recorded as expenses, so that portion is counted twice. The exposure is
|
||||||
|
-- bounded at $3,411.16 (14 loads) and is probably smaller, because the
|
||||||
|
-- descriptors name no brand — "ShopBack Gift Cards SQ" is a batch code, and
|
||||||
|
-- the card could be Amazon, Airbnb or Shell as easily as DoorDash. Six are
|
||||||
|
-- categorised `gifts` and may be real presents rather than self-funding.
|
||||||
|
-- Reclassifying them on a guess would corrupt correct data to fix a
|
||||||
|
-- double-count that cannot be demonstrated, so they are left alone; only the
|
||||||
|
-- ShopBack purchase emails can settle it, joined on total paid.
|
||||||
|
--
|
||||||
|
-- The split guard is untouched: this changes what may exist, not what may be
|
||||||
|
-- owed.
|
||||||
|
ALTER TABLE transactions DROP CONSTRAINT IF EXISTS chk_ingested_orders_after_cutover;
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
-- Receipt scans as a second producer on the order lane.
|
||||||
|
--
|
||||||
|
-- A grocery shop paid with a supermarket gift card settles against no statement and
|
||||||
|
-- arrives in no mail, so the pantry scan is the only touchpoint that ever sees it. Rather
|
||||||
|
-- than a second ingestion mechanism, a scan lands as a manual transaction
|
||||||
|
-- (statement_id IS NULL) and the existing pending-reconciliation queue resolves it —
|
||||||
|
-- with needsCardMatch() already excluding cash/credits rows for which no card leg is
|
||||||
|
-- ever coming.
|
||||||
|
|
||||||
|
-- The receipt as text, kept as evidence rather than parsed into a decision. The token
|
||||||
|
-- that distinguishes a gift card from a bank card was only findable by reading two
|
||||||
|
-- payments side by side on one receipt; whether it holds across merchants is answerable
|
||||||
|
-- from stored blocks and not at all from none.
|
||||||
|
ALTER TABLE expense_metadata
|
||||||
|
ADD COLUMN IF NOT EXISTS tender_raw TEXT;
|
||||||
|
|
||||||
|
-- The image the extraction came from. Not the idempotency key -- a photo and the store's
|
||||||
|
-- e-receipt PDF of one purchase hash differently -- but exact where it applies, and the
|
||||||
|
-- only thing a later cross-source dedupe against an emailed or Paperless copy could match
|
||||||
|
-- on.
|
||||||
|
ALTER TABLE expense_metadata
|
||||||
|
ADD COLUMN IF NOT EXISTS receipt_sha256 TEXT;
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_expense_receipt_sha256
|
||||||
|
ON expense_metadata (receipt_sha256)
|
||||||
|
WHERE receipt_sha256 IS NOT NULL;
|
||||||
|
|
||||||
|
-- Legs of one split-tender shop, so a $40.75 gift-card row can be shown as part of a
|
||||||
|
-- $114.57 purchase instead of an orphan. The shared receipt identity is carried in
|
||||||
|
-- order_reference ('pantry:<merchant:store:register:number:date>#<leg>'); this column is
|
||||||
|
-- what makes the group queryable without parsing that string.
|
||||||
|
ALTER TABLE expense_metadata
|
||||||
|
ADD COLUMN IF NOT EXISTS receipt_group TEXT;
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_expense_receipt_group
|
||||||
|
ON expense_metadata (receipt_group)
|
||||||
|
WHERE receipt_group IS NOT NULL;
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
-- A feed that re-sends yesterday's rows needs an identity the importer can recognise.
|
||||||
|
--
|
||||||
|
-- The CSV import that exists today is built for a one-off: `batchInsertCSVTransactions`
|
||||||
|
-- assigns `row_index` as MAX(row_index) + 1 over the owner's manual rows, so the same
|
||||||
|
-- file imported twice produces two sets of rows with different indexes. That defeats
|
||||||
|
-- `uq_transaction_identity` (statement_id, transaction_date, description, amount,
|
||||||
|
-- row_index) by construction — the constraint cannot fire, because the fifth column is
|
||||||
|
-- guaranteed fresh on every run. Nothing else stops it either.
|
||||||
|
--
|
||||||
|
-- For a hand-driven bank CSV that is tolerable; the operator sees the file once. For a
|
||||||
|
-- recurring aggregator export it is not, because the windows overlap *by design*: a
|
||||||
|
-- 12-month export pulled weekly re-states ~51 weeks of rows it has already sent. The
|
||||||
|
-- failure would be silent and cumulative, and it is not one we can clean up afterwards —
|
||||||
|
-- every child of `transactions` is ON DELETE CASCADE, so a duplicate must be superseded
|
||||||
|
-- rather than deleted (migration 0023), and ~$42k of re-imported statement rows already
|
||||||
|
-- exist as evidence of how this goes.
|
||||||
|
--
|
||||||
|
-- So the provider's own key travels with the row. Frollo issues a stable per-transaction
|
||||||
|
-- `id`, which is exactly what the wallet-capture lane lacked and could never synthesise
|
||||||
|
-- from a notification. The same two columns serve any future feed that has one.
|
||||||
|
|
||||||
|
ALTER TABLE transactions
|
||||||
|
ADD COLUMN IF NOT EXISTS source TEXT;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN transactions.source IS
|
||||||
|
'Feed this row was ingested from (e.g. ''frollo''). NULL = entered by hand, imported from a statement, or predates the column.';
|
||||||
|
|
||||||
|
ALTER TABLE transactions
|
||||||
|
ADD COLUMN IF NOT EXISTS source_ref TEXT;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN transactions.source_ref IS
|
||||||
|
'The provider''s own identifier for this transaction, verbatim. Idempotency key for re-imports; never generated locally.';
|
||||||
|
|
||||||
|
-- Partial, so the millions of rows with no source do not have to be unique on (NULL,
|
||||||
|
-- NULL). Enforced in the database rather than in the importer: an ON CONFLICT DO NOTHING
|
||||||
|
-- that silently depends on application-side dedupe is one refactor away from not.
|
||||||
|
CREATE UNIQUE INDEX IF NOT EXISTS uq_transaction_source_ref
|
||||||
|
ON transactions (source, source_ref)
|
||||||
|
WHERE source IS NOT NULL AND source_ref IS NOT NULL;
|
||||||
|
|
||||||
|
-- A source row is only half-identified without knowing which account it came from --
|
||||||
|
-- two accounts at the same institution can legitimately carry the same provider id
|
||||||
|
-- namespace. Kept as free text rather than a foreign key: finance-app has no account
|
||||||
|
-- entity, and inventing one to hold a label from an external system would be the tail
|
||||||
|
-- wagging the dog.
|
||||||
|
ALTER TABLE transactions
|
||||||
|
ADD COLUMN IF NOT EXISTS source_account TEXT;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN transactions.source_account IS
|
||||||
|
'Account label as the source system names it, for provenance and for scoping an import to particular accounts. Not an entity reference.';
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_transactions_source
|
||||||
|
ON transactions (source, transaction_date)
|
||||||
|
WHERE source IS NOT NULL;
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
-- 0029: let the spine bridge write one row PER SHIPMENT of a split order.
|
||||||
|
--
|
||||||
|
-- An Amazon order that ships in two boxes is charged per shipment, so its
|
||||||
|
-- order_total matches no statement line — the bridge (ingestion-engine
|
||||||
|
-- jobs/order_transaction_bridge.py) matches each shipment's own amount and
|
||||||
|
-- items instead. Those rows share (source='order-bridge', order_reference),
|
||||||
|
-- which uq_expense_source_order forbade.
|
||||||
|
--
|
||||||
|
-- The index exists as the MEAL lane's idempotency key (0018 I7), and that
|
||||||
|
-- lane's semantics are untouched: the scope simply excludes bridge rows,
|
||||||
|
-- whose idempotency key is source_message_id (<entity_key> for whole-order
|
||||||
|
-- rows, <entity_key>#f<fact_id> per shipment) — now enforced with its own
|
||||||
|
-- unique index instead of by convention. No app code does ON CONFLICT
|
||||||
|
-- against either index; ingest idempotency is SELECT-based
|
||||||
|
-- (lib/order-ingestion.ts).
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS uq_expense_source_order;
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX uq_expense_source_order
|
||||||
|
ON expense_metadata (source, order_reference)
|
||||||
|
WHERE order_reference IS NOT NULL AND source <> 'order-bridge';
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX uq_expense_bridge_message
|
||||||
|
ON expense_metadata (source, source_message_id)
|
||||||
|
WHERE source = 'order-bridge';
|
||||||
@@ -7,13 +7,30 @@ datasource db {
|
|||||||
provider = "postgresql"
|
provider = "postgresql"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
model trips {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
owner_id Int
|
||||||
|
name String
|
||||||
|
description String?
|
||||||
|
start_date DateTime? @db.Date
|
||||||
|
end_date DateTime? @db.Date
|
||||||
|
color String @default("#6366f1")
|
||||||
|
archived Boolean @default(false)
|
||||||
|
created_at DateTime @default(now())
|
||||||
|
overrides transaction_overrides[]
|
||||||
|
payments split_payments[]
|
||||||
|
}
|
||||||
|
|
||||||
model transaction_overrides {
|
model transaction_overrides {
|
||||||
id Int @id @default(autoincrement())
|
id Int @id @default(autoincrement())
|
||||||
transaction_id Int @unique
|
transaction_id Int @unique
|
||||||
merchant_normalized String?
|
merchant_normalized String?
|
||||||
category_override String?
|
category_override String?
|
||||||
notes String?
|
notes String?
|
||||||
|
my_share_percent Decimal? @db.Decimal(5, 2)
|
||||||
updated_at DateTime @default(now()) @updatedAt
|
updated_at DateTime @default(now()) @updatedAt
|
||||||
|
trip_id Int?
|
||||||
|
trip trips? @relation(fields: [trip_id], references: [id], onDelete: SetNull)
|
||||||
}
|
}
|
||||||
|
|
||||||
model participants {
|
model participants {
|
||||||
@@ -23,6 +40,9 @@ model participants {
|
|||||||
created_at DateTime @default(now())
|
created_at DateTime @default(now())
|
||||||
splits transaction_splits[]
|
splits transaction_splits[]
|
||||||
account_owner_mappings account_owner_mappings[]
|
account_owner_mappings account_owner_mappings[]
|
||||||
|
payments_sent split_payments[] @relation("payments_from")
|
||||||
|
payments_received split_payments[] @relation("payments_to")
|
||||||
|
order_reviews order_reviews[]
|
||||||
}
|
}
|
||||||
|
|
||||||
model account_owner_mappings {
|
model account_owner_mappings {
|
||||||
@@ -49,6 +69,23 @@ model transaction_splits {
|
|||||||
@@unique([transaction_id, participant_id])
|
@@unique([transaction_id, participant_id])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
model split_payments {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
from_participant_id Int
|
||||||
|
to_participant_id Int
|
||||||
|
amount Decimal @db.Decimal(10, 2)
|
||||||
|
payment_date DateTime @db.Date
|
||||||
|
notes String?
|
||||||
|
linked_transaction_id Int?
|
||||||
|
trip_id Int?
|
||||||
|
created_at DateTime @default(now())
|
||||||
|
from_participant participants @relation("payments_from", fields: [from_participant_id], references: [id])
|
||||||
|
to_participant participants @relation("payments_to", fields: [to_participant_id], references: [id])
|
||||||
|
trip trips? @relation(fields: [trip_id], references: [id], onDelete: SetNull)
|
||||||
|
|
||||||
|
@@index([trip_id])
|
||||||
|
}
|
||||||
|
|
||||||
model tags {
|
model tags {
|
||||||
id Int @id @default(autoincrement())
|
id Int @id @default(autoincrement())
|
||||||
name String @unique
|
name String @unique
|
||||||
@@ -73,6 +110,7 @@ model rules {
|
|||||||
conditions Json @default("[]")
|
conditions Json @default("[]")
|
||||||
actions Json @default("{}")
|
actions Json @default("{}")
|
||||||
enabled Boolean @default(true)
|
enabled Boolean @default(true)
|
||||||
|
manual_only Boolean @default(false)
|
||||||
priority Int @default(0)
|
priority Int @default(0)
|
||||||
created_at DateTime @default(now())
|
created_at DateTime @default(now())
|
||||||
updated_at DateTime @default(now()) @updatedAt
|
updated_at DateTime @default(now()) @updatedAt
|
||||||
@@ -89,3 +127,139 @@ model budgets {
|
|||||||
|
|
||||||
@@unique([owner_id, category, month])
|
@@unique([owner_id, category, month])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
model statements {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
filename String
|
||||||
|
bank_name String?
|
||||||
|
card_name String?
|
||||||
|
account_type String?
|
||||||
|
account_number String
|
||||||
|
billing_start_date DateTime? @db.Date
|
||||||
|
billing_end_date DateTime? @db.Date
|
||||||
|
total_amount_due Decimal? @db.Decimal(12, 2)
|
||||||
|
minimum_amount_due Decimal? @db.Decimal(12, 2)
|
||||||
|
payment_due_date DateTime? @db.Date
|
||||||
|
event_created Boolean? @default(false)
|
||||||
|
tier_used String?
|
||||||
|
created_at DateTime? @default(now())
|
||||||
|
statement_type String @default("other")
|
||||||
|
currency String? @default("AUD")
|
||||||
|
opening_balance Decimal? @db.Decimal(12, 2)
|
||||||
|
closing_balance Decimal? @db.Decimal(12, 2)
|
||||||
|
total_credits Decimal? @db.Decimal(12, 2)
|
||||||
|
total_debits Decimal? @db.Decimal(12, 2)
|
||||||
|
interest_charged Decimal? @db.Decimal(12, 2)
|
||||||
|
fees_charged Decimal? @db.Decimal(12, 2)
|
||||||
|
credit_limit Decimal? @db.Decimal(12, 2)
|
||||||
|
available_credit Decimal? @db.Decimal(12, 2)
|
||||||
|
owner_id Int @default(1)
|
||||||
|
account_holder_name String?
|
||||||
|
exchange_rate_to_aud Decimal? @db.Decimal(10, 6)
|
||||||
|
paperless_doc_id Int? @unique
|
||||||
|
interest_rate Decimal? @db.Decimal(6, 3)
|
||||||
|
scheduled_repayment Decimal? @db.Decimal(12, 2)
|
||||||
|
repayment_frequency String?
|
||||||
|
redraw_available Decimal? @db.Decimal(12, 2)
|
||||||
|
loan_term_months Int?
|
||||||
|
transactions transactions[]
|
||||||
|
}
|
||||||
|
|
||||||
|
model transactions {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
statement_id Int?
|
||||||
|
transaction_date DateTime @db.Date
|
||||||
|
description String?
|
||||||
|
amount Decimal @db.Decimal(12, 2)
|
||||||
|
created_at DateTime? @default(now())
|
||||||
|
transaction_type String? @default("debit")
|
||||||
|
merchant_name String?
|
||||||
|
location String?
|
||||||
|
foreign_currency_amount Decimal? @db.Decimal(12, 2)
|
||||||
|
foreign_currency_code String?
|
||||||
|
category String?
|
||||||
|
row_index Int?
|
||||||
|
merchant_normalized String?
|
||||||
|
amount_aud Decimal? @db.Decimal(12, 2)
|
||||||
|
payment_method String? // card | cash | bank_transfer | other; NULL = unknown (migration 0016)
|
||||||
|
owner_id Int?
|
||||||
|
reconciled_with_id Int?
|
||||||
|
superseded_by_id Int?
|
||||||
|
principal_amount Decimal? @db.Decimal(12, 2)
|
||||||
|
interest_amount Decimal? @db.Decimal(12, 2)
|
||||||
|
source String? // feed this row came from, e.g. "frollo"; NULL = statement/manual (migration 0028)
|
||||||
|
source_ref String? // the provider's own transaction id — idempotency key for re-imports
|
||||||
|
source_account String? // account label as the source names it
|
||||||
|
statement statements? @relation(fields: [statement_id], references: [id], onDelete: Cascade)
|
||||||
|
reconciled_with transactions? @relation("reconciled", fields: [reconciled_with_id], references: [id], onDelete: SetNull)
|
||||||
|
reconciled_by transactions[] @relation("reconciled")
|
||||||
|
superseded_by transactions? @relation("superseded", fields: [superseded_by_id], references: [id], onDelete: SetNull)
|
||||||
|
supersedes transactions[] @relation("superseded")
|
||||||
|
expense_metadata expense_metadata?
|
||||||
|
order_reviews order_reviews[]
|
||||||
|
}
|
||||||
|
|
||||||
|
model expense_metadata {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
transaction_id Int? @unique
|
||||||
|
source String @default("email")
|
||||||
|
paperless_doc_id Int? @unique
|
||||||
|
source_email_subject String?
|
||||||
|
source_email_from String?
|
||||||
|
source_message_id String?
|
||||||
|
payment_method String?
|
||||||
|
payment_method_detail String?
|
||||||
|
order_reference String?
|
||||||
|
line_items Json @default("[]")
|
||||||
|
tax_amount Decimal? @db.Decimal(12, 2)
|
||||||
|
subtotal Decimal? @db.Decimal(12, 2)
|
||||||
|
merchant_normalized String?
|
||||||
|
amount Decimal? @db.Decimal(12, 2)
|
||||||
|
transaction_date DateTime? @db.Date
|
||||||
|
extraction_model String? @default("gemini-2.5-flash")
|
||||||
|
created_at DateTime? @default(now())
|
||||||
|
// In the database since migrations 0019/0020 but absent from this model until 0027.
|
||||||
|
// Regenerating the client from the stale definition would have dropped columns the order
|
||||||
|
// lane writes on every ingest.
|
||||||
|
card_last4 String?
|
||||||
|
currency String?
|
||||||
|
flags Json @default("[]")
|
||||||
|
reconciled_at DateTime? @db.Timestamptz(6)
|
||||||
|
matched_transaction_id Int?
|
||||||
|
platform String?
|
||||||
|
route Json?
|
||||||
|
// 0027 — receipt scans as a second producer on this lane.
|
||||||
|
tender_raw String?
|
||||||
|
receipt_sha256 String?
|
||||||
|
receipt_group String?
|
||||||
|
transaction transactions? @relation(fields: [transaction_id], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@unique([source, order_reference], name: "uq_expense_source_order")
|
||||||
|
}
|
||||||
|
|
||||||
|
model order_reviews {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
transaction_id Int
|
||||||
|
participant_id Int
|
||||||
|
rating String?
|
||||||
|
order_again Boolean?
|
||||||
|
note String?
|
||||||
|
item_verdicts Json @default("[]")
|
||||||
|
created_at DateTime @default(now())
|
||||||
|
updated_at DateTime @updatedAt
|
||||||
|
transaction transactions @relation(fields: [transaction_id], references: [id], onDelete: Cascade)
|
||||||
|
participant participants @relation(fields: [participant_id], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@unique([transaction_id, participant_id], name: "order_reviews_transaction_participant_key")
|
||||||
|
}
|
||||||
|
|
||||||
|
model rule_apply_runs {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
owner_id Int
|
||||||
|
applied_at DateTime @default(now())
|
||||||
|
split_from DateTime? @db.Date
|
||||||
|
matched Int @default(0)
|
||||||
|
transactions_affected Int @default(0)
|
||||||
|
reverted_at DateTime?
|
||||||
|
snapshot Json @default("[]")
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,111 @@
|
|||||||
|
# Personal Finance Tracker — Project Context
|
||||||
|
|
||||||
|
## What Is This?
|
||||||
|
|
||||||
|
A self-hosted personal finance tracker built from scratch. It automatically ingests bank statements, categorises transactions using AI, and provides a web UI for reviewing spending, managing shared expenses, and running analytics.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## How It Works (High Level)
|
||||||
|
|
||||||
|
### Automatic Statement Ingestion
|
||||||
|
|
||||||
|
Bank statements (PDFs) are uploaded to a document management system (Paperless-NGX). An automation workflow (N8N) polls for new documents every 5 minutes and:
|
||||||
|
|
||||||
|
1. Sends the PDF to Google Gemini (AI) for structured data extraction
|
||||||
|
2. Normalises the extracted data (merchant names, currencies, account numbers)
|
||||||
|
3. Inserts the statement summary and individual transactions into a PostgreSQL database
|
||||||
|
4. Creates a Google Calendar reminder for credit card payment due dates
|
||||||
|
5. For new/unknown bank accounts, requires a human approval before inserting
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Core Features
|
||||||
|
|
||||||
|
### Transactions View
|
||||||
|
- Full paginated list of all transactions across all bank accounts
|
||||||
|
- Filters: date range, category, bank, tags, transaction type, amount range, split status, free-text search
|
||||||
|
- Sortable columns including transaction date, amount, and import date
|
||||||
|
- Inline editing of category, merchant name, and notes
|
||||||
|
- Tagging system with user-defined coloured labels
|
||||||
|
|
||||||
|
### Statements View
|
||||||
|
- One row per billing period per account
|
||||||
|
- Filters by bank, statement type, owner, year
|
||||||
|
- Click a statement to see only its transactions
|
||||||
|
|
||||||
|
### Analytics / Insights
|
||||||
|
- Monthly spend breakdown by category (stacked bar chart)
|
||||||
|
- Category trend lines over time
|
||||||
|
- Pareto chart (which categories drive the most spend)
|
||||||
|
- Cumulative spend curve
|
||||||
|
- Savings rate over time
|
||||||
|
- Recurring charge detection (subscriptions/recurring merchants)
|
||||||
|
- Fees and interest audit (tracks what's been paid in bank fees and interest charges)
|
||||||
|
- Committed vs discretionary spend split
|
||||||
|
|
||||||
|
### Merchant Profiles
|
||||||
|
- Per-merchant transaction history and net spend
|
||||||
|
- Scatter plot of spend over time
|
||||||
|
- Accounts for refunds/credits
|
||||||
|
|
||||||
|
### Shared Expenses
|
||||||
|
- Split transactions between multiple people (by percentage)
|
||||||
|
- Tracks who owes what with a running balance
|
||||||
|
- Record cash settlements between participants
|
||||||
|
- Tag filter on shared view to track specific projects/events
|
||||||
|
|
||||||
|
### Rules Engine
|
||||||
|
- Create saved rules that auto-apply categories, merchant names, tags, or splits to matching transactions
|
||||||
|
- Conditions: merchant name, description, category, bank, amount, transaction type
|
||||||
|
- Operators: contains, equals, starts with, greater/less than, not equals
|
||||||
|
- Bulk-apply all rules at once with full revert support (snapshot stored before each run)
|
||||||
|
|
||||||
|
### Manual Transactions + Reconciliation
|
||||||
|
- Enter transactions manually (cash, receipts not on a statement)
|
||||||
|
- CSV import for bulk entry
|
||||||
|
- Reconcile manual transactions against statement transactions when the statement arrives — merges tags, splits, and notes onto the statement version
|
||||||
|
|
||||||
|
### Multi-Owner Support
|
||||||
|
- Multiple people's accounts can be tracked in the one app
|
||||||
|
- Each statement/transaction is scoped to an owner
|
||||||
|
- The logged-in user only sees their own data
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Technology
|
||||||
|
|
||||||
|
- **Frontend**: Next.js (React), TypeScript, Tailwind CSS, Recharts for charts
|
||||||
|
- **Backend**: Next.js API routes with raw PostgreSQL queries (no ORM at query time)
|
||||||
|
- **Database**: PostgreSQL
|
||||||
|
- **AI extraction**: Google Gemini 2.5 Flash (PDF → structured JSON)
|
||||||
|
- **Automation**: N8N workflow orchestrates the ingestion pipeline
|
||||||
|
- **Auth**: Users are authenticated by the reverse proxy before reaching the app
|
||||||
|
- **Hosting**: Self-hosted Docker container on a home server
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Data Structure (Summary)
|
||||||
|
|
||||||
|
| Concept | Description |
|
||||||
|
|---------|-------------|
|
||||||
|
| **Statement** | One billing period for one bank account. Has summary totals (closing balance, fees, interest, credit limit, etc.) |
|
||||||
|
| **Transaction** | A line item. Has date, amount, merchant, category, transaction type (debit/credit/refund/fee/etc.) |
|
||||||
|
| **Override** | User correction to AI-extracted merchant name or category. Stored separately to preserve the original AI output |
|
||||||
|
| **Split** | A transaction shared with another person — records their percentage share and whether it's been settled |
|
||||||
|
| **Tag** | A free-form label applied to transactions (e.g. "Europe Trip 2026", "Home Reno") |
|
||||||
|
| **Rule** | A saved condition→action pair applied in bulk to auto-categorise/tag/split transactions |
|
||||||
|
| **Participant** | A person (account owner or expense-sharing partner) |
|
||||||
|
| **Split Payment** | A recorded cash settlement between two participants |
|
||||||
|
|
||||||
|
### Category Taxonomy
|
||||||
|
|
||||||
|
Fixed set used by AI and overridable by the user:
|
||||||
|
`groceries`, `dining`, `transport`, `fuel`, `shopping`, `utilities`, `entertainment`, `travel`, `health`, `insurance`, `subscriptions`, `cash_advance`, `government`, `education`, `rent`, `home_goods`, `home_maintenance`, `transfers`, `income`, `investment`, `personal_care`, `pets`, `gifts`, `charity`, `other`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Known Limitations / Planned Work
|
||||||
|
|
||||||
|
- **Payment provider conflation**: Transactions processed through PayPal, Afterpay, Zip etc. sometimes show the payment provider as the merchant rather than the actual store. Plan is to extract `payment_provider` as a separate field so the real merchant is preserved.
|
||||||
|
- **Budgets**: The database has a budget table but it's not currently surfaced in the UI (the analytics/insights views replaced it for now).
|
||||||
Executable
+39
@@ -0,0 +1,39 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Creates the personal_test database and writes .env.test
|
||||||
|
# Run once before integration tests: npm run test:setup
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
PG_CONTAINER=postgres-personal
|
||||||
|
PG_USER=personal
|
||||||
|
PG_PASS=personalpassword123
|
||||||
|
TEST_DB=personal_test
|
||||||
|
|
||||||
|
# Discover the container's bridge IP (accessible from the host on Linux)
|
||||||
|
PG_HOST=$(docker inspect "$PG_CONTAINER" \
|
||||||
|
--format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' 2>/dev/null | head -1)
|
||||||
|
|
||||||
|
if [ -z "$PG_HOST" ]; then
|
||||||
|
echo "ERROR: Could not find container '$PG_CONTAINER'"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Postgres container at $PG_HOST:5432"
|
||||||
|
|
||||||
|
# Create test database (ignore error if it already exists)
|
||||||
|
docker exec "$PG_CONTAINER" psql -U "$PG_USER" -d postgres \
|
||||||
|
-c "CREATE DATABASE $TEST_DB;" 2>/dev/null || true
|
||||||
|
|
||||||
|
# Wipe and rebuild schema from production (schema only, no data)
|
||||||
|
echo "Copying schema from $PG_USER to $TEST_DB..."
|
||||||
|
docker exec "$PG_CONTAINER" pg_dump -U "$PG_USER" --schema-only "$PG_USER" \
|
||||||
|
| docker exec -i "$PG_CONTAINER" psql -U "$PG_USER" -d "$TEST_DB" -q
|
||||||
|
|
||||||
|
echo "Schema ready."
|
||||||
|
|
||||||
|
# Write .env.test
|
||||||
|
cat > "$(dirname "$0")/../.env.test" << EOF
|
||||||
|
DATABASE_URL=postgresql://$PG_USER:$PG_PASS@$PG_HOST:5432/$TEST_DB
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo ".env.test written — integration tests can now run with: npm run test:integration"
|
||||||
@@ -0,0 +1,376 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Match SplitMyExpenses CSV rows to transactions already in the ledger.
|
||||||
|
|
||||||
|
Dry-run by default. It prints what it would do and writes nothing; `--write`
|
||||||
|
is a separate step (task #9) and is deliberately not implemented here.
|
||||||
|
|
||||||
|
Why this exists
|
||||||
|
---------------
|
||||||
|
The CSVs are the record of how expenses were actually shared before this app
|
||||||
|
existed. Importing them is what makes historical *spend* correct: without a
|
||||||
|
split row, a $200 grocery shop counts as $200 of my spending when half of it
|
||||||
|
was never mine. The balances are already settled by carryover transaction 2348,
|
||||||
|
so these splits are imported as `settled = true` and move no balance.
|
||||||
|
|
||||||
|
Three things make the matching harder than "same date, same amount":
|
||||||
|
|
||||||
|
1. **Dates are ambiguous across files.** The household file writes D/M/YYYY;
|
||||||
|
the four trip files write ISO. 474 rows parse validly under both readings,
|
||||||
|
so the format is decided per file, from the file, and never guessed per row.
|
||||||
|
|
||||||
|
2. **The sign convention is not "who paid".** A person's column is their net
|
||||||
|
balance impact: positive means they are owed. So the payer is whoever is
|
||||||
|
positive, and the other person's share is |their negative| / cost. A row
|
||||||
|
reading +cost / -cost therefore means the other party owes 100% -- NOT that
|
||||||
|
the expense was unshared, which is the reading that would fake an
|
||||||
|
arrangement change.
|
||||||
|
|
||||||
|
3. **A settlement is not an expense.** Rows where one person hands the other
|
||||||
|
money must not become split transactions; they are already represented by
|
||||||
|
the carryover.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
.venv/bin/python scripts/split_csv_match.py [--verbose] [--file NAME]
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import csv
|
||||||
|
import glob
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
from collections import Counter
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from datetime import date, datetime, timedelta
|
||||||
|
|
||||||
|
import psycopg2
|
||||||
|
import psycopg2.extras
|
||||||
|
|
||||||
|
DUMP_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "dump")
|
||||||
|
|
||||||
|
# Read from the same place the app does rather than hardcoding a container IP,
|
||||||
|
# which changes on every recreate.
|
||||||
|
def db_url() -> str:
|
||||||
|
url = os.environ.get("DATABASE_URL")
|
||||||
|
if url:
|
||||||
|
return url
|
||||||
|
for envfile in (".env", ".env.test"):
|
||||||
|
path = os.path.join(os.path.dirname(DUMP_DIR), envfile)
|
||||||
|
if not os.path.exists(path):
|
||||||
|
continue
|
||||||
|
for line in open(path):
|
||||||
|
if line.startswith("DATABASE_URL"):
|
||||||
|
return line.split("=", 1)[1].strip().strip('"').strip("'")
|
||||||
|
sys.exit("No DATABASE_URL found (env, .env, or .env.test)")
|
||||||
|
|
||||||
|
|
||||||
|
# The two people in these files. The CSV writes full names; the ledger uses
|
||||||
|
# first names.
|
||||||
|
CSV_ME = "Siddharth Bose"
|
||||||
|
CSV_THEM = "Meghalee"
|
||||||
|
PARTICIPANT_ME = 1
|
||||||
|
PARTICIPANT_THEM = 4
|
||||||
|
|
||||||
|
# A settlement transfers money; it is not a shared cost. These are the
|
||||||
|
# descriptions SplitMyExpenses uses for them.
|
||||||
|
SETTLEMENT_PAT = re.compile(
|
||||||
|
r"payment|settle|debts? remainder|reimburse|transfer to|paid back", re.I
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class CsvRow:
|
||||||
|
source: str
|
||||||
|
line: int
|
||||||
|
when: date
|
||||||
|
description: str
|
||||||
|
category: str
|
||||||
|
cost: float
|
||||||
|
currency: str
|
||||||
|
net_me: float
|
||||||
|
net_them: float
|
||||||
|
|
||||||
|
# Filled in by classify()
|
||||||
|
mode: str = ""
|
||||||
|
payer: int = 0 # participant id who paid
|
||||||
|
ower: int = 0 # participant id who owes
|
||||||
|
ower_share: float = 0.0 # 0-100
|
||||||
|
|
||||||
|
def __str__(self) -> str:
|
||||||
|
return f"{self.source}:{self.line} {self.when} {self.description[:38]!r} ${self.cost:.2f} [{self.mode}]"
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class MatchReport:
|
||||||
|
rows: list = field(default_factory=list)
|
||||||
|
matched: list = field(default_factory=list)
|
||||||
|
ambiguous: list = field(default_factory=list)
|
||||||
|
unmatched: list = field(default_factory=list)
|
||||||
|
skipped: list = field(default_factory=list)
|
||||||
|
|
||||||
|
|
||||||
|
def sniff_date_format(sample: list[str]) -> str:
|
||||||
|
"""Decide ISO vs D/M/YYYY for a whole file.
|
||||||
|
|
||||||
|
Deciding per row is what produces a ledger where January and February are
|
||||||
|
silently swapped for some rows and not others. A file is written by one
|
||||||
|
exporter in one format, so the file is the unit of decision.
|
||||||
|
"""
|
||||||
|
if not sample:
|
||||||
|
return "%Y-%m-%d"
|
||||||
|
slashes = sum(1 for s in sample if "/" in s)
|
||||||
|
return "%d/%m/%Y" if slashes > len(sample) / 2 else "%Y-%m-%d"
|
||||||
|
|
||||||
|
|
||||||
|
def parse_rows(path: str) -> list[CsvRow]:
|
||||||
|
with open(path, newline="", encoding="utf-8-sig") as fh:
|
||||||
|
reader = list(csv.DictReader(fh))
|
||||||
|
if not reader:
|
||||||
|
return []
|
||||||
|
|
||||||
|
# Header names vary in quoting between exports.
|
||||||
|
def col(row: dict, *names: str):
|
||||||
|
for n in names:
|
||||||
|
for k in row:
|
||||||
|
if k.strip().strip('"') == n:
|
||||||
|
return row[k]
|
||||||
|
return None
|
||||||
|
|
||||||
|
fmt = sniff_date_format([col(r, "Date") or "" for r in reader[:40]])
|
||||||
|
out: list[CsvRow] = []
|
||||||
|
for i, r in enumerate(reader, start=2):
|
||||||
|
raw_date = (col(r, "Date") or "").strip()
|
||||||
|
try:
|
||||||
|
when = datetime.strptime(raw_date, fmt).date()
|
||||||
|
except ValueError:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
cost = float(col(r, "Cost") or 0)
|
||||||
|
net_me = float(col(r, CSV_ME) or 0)
|
||||||
|
net_them = float(col(r, CSV_THEM) or 0)
|
||||||
|
except ValueError:
|
||||||
|
continue
|
||||||
|
out.append(
|
||||||
|
CsvRow(
|
||||||
|
source=os.path.basename(path),
|
||||||
|
line=i,
|
||||||
|
when=when,
|
||||||
|
description=(col(r, "Description") or "").strip(),
|
||||||
|
category=(col(r, "Category") or "").strip(),
|
||||||
|
cost=cost,
|
||||||
|
currency=(col(r, "Currency") or "AUD").strip(),
|
||||||
|
net_me=net_me,
|
||||||
|
net_them=net_them,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def classify(row: CsvRow) -> CsvRow:
|
||||||
|
"""Work out who paid and what share the other person owes.
|
||||||
|
|
||||||
|
A person's column is their net balance impact, not their share: positive
|
||||||
|
means they are owed money. So the payer is whoever is positive.
|
||||||
|
"""
|
||||||
|
if row.cost == 0:
|
||||||
|
row.mode = "zero-cost"
|
||||||
|
return row
|
||||||
|
|
||||||
|
if SETTLEMENT_PAT.search(row.description):
|
||||||
|
row.mode = "settlement"
|
||||||
|
return row
|
||||||
|
|
||||||
|
# Both zero against a real cost: recorded but not shared.
|
||||||
|
if abs(row.net_me) < 0.005 and abs(row.net_them) < 0.005:
|
||||||
|
row.mode = "unshared"
|
||||||
|
return row
|
||||||
|
|
||||||
|
if row.net_me > 0:
|
||||||
|
row.payer, row.ower, owed = PARTICIPANT_ME, PARTICIPANT_THEM, abs(row.net_them)
|
||||||
|
else:
|
||||||
|
row.payer, row.ower, owed = PARTICIPANT_THEM, PARTICIPANT_ME, abs(row.net_me)
|
||||||
|
|
||||||
|
row.ower_share = round(owed / row.cost * 100, 2)
|
||||||
|
if abs(row.ower_share - 50) < 0.6:
|
||||||
|
row.mode = "50/50"
|
||||||
|
elif abs(row.ower_share - 100) < 0.6:
|
||||||
|
row.mode = "other-owes-all"
|
||||||
|
else:
|
||||||
|
row.mode = f"uneven-{row.ower_share:.0f}"
|
||||||
|
return row
|
||||||
|
|
||||||
|
|
||||||
|
def norm(s: str) -> set[str]:
|
||||||
|
return {w for w in re.split(r"[^a-z0-9]+", (s or "").lower()) if len(w) > 2}
|
||||||
|
|
||||||
|
|
||||||
|
def score(row: CsvRow, tx: dict) -> float:
|
||||||
|
"""How well a ledger row matches a CSV row. Amount and date gate it;
|
||||||
|
description only ranks among survivors."""
|
||||||
|
days = abs((tx["transaction_date"] - row.when).days)
|
||||||
|
s = 100.0 - days * 4
|
||||||
|
overlap = norm(row.description) & (norm(tx["description"]) | norm(tx["merchant_normalized"]))
|
||||||
|
s += 12 * len(overlap)
|
||||||
|
return s
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> int:
|
||||||
|
ap = argparse.ArgumentParser()
|
||||||
|
ap.add_argument("--verbose", action="store_true")
|
||||||
|
ap.add_argument("--file", help="only this CSV (substring match)")
|
||||||
|
ap.add_argument("--window", type=int, default=5, help="date tolerance in days")
|
||||||
|
ap.add_argument(
|
||||||
|
"--write", action="store_true",
|
||||||
|
help="actually insert the splits (settled=true). Without this, nothing is written.",
|
||||||
|
)
|
||||||
|
args = ap.parse_args()
|
||||||
|
|
||||||
|
paths = sorted(glob.glob(os.path.join(DUMP_DIR, "*SplitMyExpenses*.csv")))
|
||||||
|
if args.file:
|
||||||
|
paths = [p for p in paths if args.file in os.path.basename(p)]
|
||||||
|
if not paths:
|
||||||
|
sys.exit("No SplitMyExpenses CSVs found in dump/")
|
||||||
|
|
||||||
|
conn = psycopg2.connect(db_url())
|
||||||
|
cur = conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
|
||||||
|
# Superseded rows are duplicates; matching against them would attach a split
|
||||||
|
# to a row nothing else counts.
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT t.id, t.transaction_date, COALESCE(t.description,'') AS description,
|
||||||
|
COALESCE(t.merchant_normalized,'') AS merchant_normalized,
|
||||||
|
COALESCE(t.amount_aud, t.amount)::float AS amount,
|
||||||
|
t.superseded_by_id,
|
||||||
|
EXISTS(SELECT 1 FROM transaction_splits x WHERE x.transaction_id=t.id) AS has_split
|
||||||
|
FROM transactions t
|
||||||
|
LEFT JOIN statements s ON s.id = t.statement_id
|
||||||
|
WHERE COALESCE(t.owner_id, s.owner_id) IN (%s, %s)
|
||||||
|
AND t.superseded_by_id IS NULL
|
||||||
|
AND NOT (t.statement_id IS NULL AND t.reconciled_with_id IS NOT NULL)
|
||||||
|
AND t.transaction_type IN ('debit','fee','interest')
|
||||||
|
""",
|
||||||
|
(PARTICIPANT_ME, PARTICIPANT_THEM),
|
||||||
|
)
|
||||||
|
txs = cur.fetchall()
|
||||||
|
|
||||||
|
# Index by rounded amount: the amount must agree, so it is the only cheap
|
||||||
|
# gate that never needs fuzzy comparison.
|
||||||
|
by_amount: dict[float, list[dict]] = {}
|
||||||
|
for t in txs:
|
||||||
|
by_amount.setdefault(round(t["amount"], 2), []).append(t)
|
||||||
|
|
||||||
|
rep = MatchReport()
|
||||||
|
modes: Counter = Counter()
|
||||||
|
candidates: list = []
|
||||||
|
for path in paths:
|
||||||
|
for row in parse_rows(path):
|
||||||
|
classify(row)
|
||||||
|
rep.rows.append(row)
|
||||||
|
modes[row.mode] += 1
|
||||||
|
|
||||||
|
if row.mode in ("settlement", "zero-cost", "unshared"):
|
||||||
|
rep.skipped.append(row)
|
||||||
|
continue
|
||||||
|
if row.currency != "AUD":
|
||||||
|
rep.skipped.append(row)
|
||||||
|
continue
|
||||||
|
|
||||||
|
cands = [
|
||||||
|
t for t in by_amount.get(round(row.cost, 2), [])
|
||||||
|
if abs((t["transaction_date"] - row.when).days) <= args.window
|
||||||
|
]
|
||||||
|
if not cands:
|
||||||
|
rep.unmatched.append(row)
|
||||||
|
else:
|
||||||
|
candidates.append((row, cands))
|
||||||
|
|
||||||
|
# Assign one-to-one, best pair first.
|
||||||
|
#
|
||||||
|
# Without this a ledger row can be claimed by several CSV rows. That is not
|
||||||
|
# hypothetical: the NZ trip has two identical $10.16 Uber trips on one day
|
||||||
|
# and three matching ledger rows, and four PayMyPark rows in the same shape.
|
||||||
|
# Attaching a split twice is harmless (the unique key absorbs it) but it
|
||||||
|
# leaves the second CSV row silently unrepresented while looking matched,
|
||||||
|
# which is a lie in the report rather than a defect in the data.
|
||||||
|
scored = sorted(
|
||||||
|
((score(row, t), row, t) for row, cands in candidates for t in cands),
|
||||||
|
key=lambda x: -x[0],
|
||||||
|
)
|
||||||
|
taken_tx: set[int] = set()
|
||||||
|
taken_row: set[int] = set()
|
||||||
|
for s, row, t in scored:
|
||||||
|
if id(row) in taken_row or t["id"] in taken_tx:
|
||||||
|
continue
|
||||||
|
taken_row.add(id(row))
|
||||||
|
taken_tx.add(t["id"])
|
||||||
|
rep.matched.append((row, t))
|
||||||
|
for row, cands in candidates:
|
||||||
|
if id(row) not in taken_row:
|
||||||
|
rep.ambiguous.append((row, cands))
|
||||||
|
|
||||||
|
total = len(rep.rows)
|
||||||
|
considered = total - len(rep.skipped)
|
||||||
|
print(f"CSV rows {total}")
|
||||||
|
print(f" skipped {len(rep.skipped)} (settlements, zero-cost, unshared, non-AUD)")
|
||||||
|
print(f" considered {considered}")
|
||||||
|
print(f" matched {len(rep.matched)} ({len(rep.matched)/max(considered,1)*100:.1f}%)")
|
||||||
|
print(f" ambiguous {len(rep.ambiguous)}")
|
||||||
|
print(f" unmatched {len(rep.unmatched)}")
|
||||||
|
print()
|
||||||
|
print("Row modes:")
|
||||||
|
for m, n in modes.most_common():
|
||||||
|
print(f" {m:<18} {n}")
|
||||||
|
|
||||||
|
already = sum(1 for _, t in rep.matched if t["has_split"])
|
||||||
|
print()
|
||||||
|
print(f"Of the matched, {already} already carry a split and would be left alone;")
|
||||||
|
print(f"{len(rep.matched) - already} would gain one.")
|
||||||
|
|
||||||
|
if args.write:
|
||||||
|
# Imported as settled: these obligations were discharged on a platform
|
||||||
|
# we no longer run, and the residual is already carried by transaction
|
||||||
|
# 2348. Writing them unsettled would re-open ~$40k of debts that were
|
||||||
|
# paid years ago. See ACTIVE_OBLIGATION in analytics-sql.ts -- settled
|
||||||
|
# rows stay in spend and leave every owed figure, which is exactly the
|
||||||
|
# point: this import exists to correct historical SPEND.
|
||||||
|
SETTLED_ON = "2026-01-09" # the carryover's date
|
||||||
|
written = 0
|
||||||
|
for row, tx in rep.matched:
|
||||||
|
if tx["has_split"]:
|
||||||
|
continue
|
||||||
|
payer_share = round(100 - row.ower_share, 2)
|
||||||
|
pairs = [(row.ower, row.ower_share)]
|
||||||
|
if payer_share > 0:
|
||||||
|
pairs.append((row.payer, payer_share))
|
||||||
|
for pid, share in pairs:
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO transaction_splits
|
||||||
|
(transaction_id, participant_id, share_percent, settled, settled_at)
|
||||||
|
VALUES (%s, %s, %s, true, %s)
|
||||||
|
ON CONFLICT (transaction_id, participant_id) DO NOTHING
|
||||||
|
""",
|
||||||
|
(tx["id"], pid, share, SETTLED_ON),
|
||||||
|
)
|
||||||
|
written += cur.rowcount
|
||||||
|
conn.commit()
|
||||||
|
print(f"\nWROTE {written} split rows (settled=true, settled_at={SETTLED_ON}).")
|
||||||
|
|
||||||
|
if args.verbose:
|
||||||
|
print("\n--- ambiguous ---")
|
||||||
|
for row, cands in rep.ambiguous[:40]:
|
||||||
|
print(f" {row}")
|
||||||
|
for t in cands[:3]:
|
||||||
|
print(f" -> #{t['id']} {t['transaction_date']} {t['description'][:44]!r}")
|
||||||
|
print("\n--- unmatched ---")
|
||||||
|
for row in rep.unmatched[:60]:
|
||||||
|
print(f" {row}")
|
||||||
|
|
||||||
|
conn.close()
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
raise SystemExit(main())
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"file": "dd-credits-zero.html",
|
||||||
|
"id": "19b692bdf1ea7a08",
|
||||||
|
"subject": "Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"receivedAt": "2025-12-29T08:14:00.000Z",
|
||||||
|
"sender": "DoorDash <no-reply@doordash.com>",
|
||||||
|
"why": "DoorDash credits-funded, Total Charged $0.00",
|
||||||
|
"stated": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"file": "ue-aud-prefix.html",
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAhmyVi0AAAA",
|
||||||
|
"subject": "Your Friday evening order with Uber Eats",
|
||||||
|
"receivedAt": "2025-10-17T09:50:39Z",
|
||||||
|
"sender": "noreply@uber.com",
|
||||||
|
"why": "Uber total written as Total A\\$",
|
||||||
|
"stated": "Total A$54.87"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"file": "ue-nzd-prefix.html",
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAf4nGLUAAAA",
|
||||||
|
"subject": "Your Saturday evening order with Uber Eats",
|
||||||
|
"receivedAt": "2025-05-03T19:26:05Z",
|
||||||
|
"sender": "noreply@uber.com",
|
||||||
|
"why": "Uber total written as Total NZ\\$",
|
||||||
|
"stated": "Total NZ$22.83"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"file": "ut-aud-prefix.html",
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAhLnaIfAAAA",
|
||||||
|
"subject": "Your Saturday morning trip with Uber",
|
||||||
|
"receivedAt": "2025-09-05T23:17:58Z",
|
||||||
|
"sender": "noreply@uber.com",
|
||||||
|
"why": "Uber total written as Total A\\$",
|
||||||
|
"stated": "Total A$14.19"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"file": "ut-nzd-prefix.html",
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAf1poEUAAAA",
|
||||||
|
"subject": "Your Sunday afternoon trip with Uber",
|
||||||
|
"receivedAt": "2025-04-27T13:27:16Z",
|
||||||
|
"sender": "noreply@uber.com",
|
||||||
|
"why": "Uber total written as Total NZ\\$",
|
||||||
|
"stated": "Total NZ$10.83"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"file": "ut-inr-symbol.html",
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAgPBHtAAAAA",
|
||||||
|
"subject": "Your Friday evening trip with Uber",
|
||||||
|
"receivedAt": "2025-06-06T18:00:51Z",
|
||||||
|
"sender": "noreply@uber.com",
|
||||||
|
"why": "Uber total written as Total \u20b9",
|
||||||
|
"stated": "Total \u20b9622.74"
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,549 @@
|
|||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml">
|
||||||
|
<head><!--[if gte mso 9]><xml>
|
||||||
|
<o:OfficeDocumentSettings>
|
||||||
|
<o:AllowPNG/>
|
||||||
|
<o:PixelsPerInch>96</o:PixelsPerInch>
|
||||||
|
</o:OfficeDocumentSettings>
|
||||||
|
</xml><![endif]-->
|
||||||
|
<title>DoorDash</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0 ">
|
||||||
|
<meta name="format-detection" content="telephone=no">
|
||||||
|
<style type="text/css">body {
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 0;
|
||||||
|
-webkit-text-size-adjust: 100%!important;
|
||||||
|
-ms-text-size-adjust: 100%!important;
|
||||||
|
-webkit-font-smoothing: antialiased!important;
|
||||||
|
}
|
||||||
|
img {
|
||||||
|
border: 0!important;
|
||||||
|
outline: none!important;
|
||||||
|
}
|
||||||
|
p {
|
||||||
|
Margin: 0px!important;
|
||||||
|
Padding: 0px!important;
|
||||||
|
}
|
||||||
|
table {
|
||||||
|
border-collapse: collapse;
|
||||||
|
mso-table-lspace: 0px;
|
||||||
|
mso-table-rspace: 0px;
|
||||||
|
}
|
||||||
|
td, a, span {
|
||||||
|
border-collapse: collapse;
|
||||||
|
mso-line-height-rule: exactly;
|
||||||
|
}
|
||||||
|
.ExternalClass * {
|
||||||
|
line-height: 100%;
|
||||||
|
}
|
||||||
|
.em_defaultlink a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
a[x-apple-data-detectors], u+.em_body a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: inherit;
|
||||||
|
font-family: inherit;
|
||||||
|
font-weight: inherit;
|
||||||
|
line-height: inherit;
|
||||||
|
}
|
||||||
|
@media only screen and (max-width:667px) {
|
||||||
|
.em_main_table {
|
||||||
|
width: 100%!important;
|
||||||
|
}
|
||||||
|
.em_wrapper {
|
||||||
|
width: 100%!important;
|
||||||
|
}
|
||||||
|
.em_hide {
|
||||||
|
display: none!important;
|
||||||
|
}
|
||||||
|
.em_hauto {
|
||||||
|
height: auto !important;
|
||||||
|
}
|
||||||
|
.em_full_img img {
|
||||||
|
width: 100%!important;
|
||||||
|
height: auto!important;
|
||||||
|
}
|
||||||
|
.em_pad1 {
|
||||||
|
padding-right: 10px!important;
|
||||||
|
}
|
||||||
|
.em_hauto {
|
||||||
|
height: auto!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_h20 {
|
||||||
|
height: 40px!important;
|
||||||
|
font-size: 1px!important;
|
||||||
|
line-height: 1px!important;
|
||||||
|
}
|
||||||
|
.em_h10 {
|
||||||
|
height: 10px!important;
|
||||||
|
font-size: 1px!important;
|
||||||
|
line-height: 1px!important;
|
||||||
|
}
|
||||||
|
.em_h30 {
|
||||||
|
height: 30px!important;
|
||||||
|
}
|
||||||
|
u+.em_body .em_full_wrap {
|
||||||
|
width: 100%!important;
|
||||||
|
width: 100vw!important;
|
||||||
|
}
|
||||||
|
.em_side30 {
|
||||||
|
width: 26px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 190px !important;
|
||||||
|
height: 40px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 17px !important;
|
||||||
|
line-height: 40px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 140px !important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 40px!important;
|
||||||
|
line-height: 44px!important;
|
||||||
|
}
|
||||||
|
.em_pad1 {
|
||||||
|
padding: 0px 15px !important;
|
||||||
|
}
|
||||||
|
.en_icon {
|
||||||
|
width: 30px !important;
|
||||||
|
padding-bottom:10px !important;
|
||||||
|
}
|
||||||
|
.em_rounded {
|
||||||
|
border-top-left-radius: 25px !important;
|
||||||
|
border-top-right-radius: 25px !important;
|
||||||
|
}
|
||||||
|
.em_bold {
|
||||||
|
letter-spacing: -1px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (max-width:480px) {
|
||||||
|
.em_side30 {
|
||||||
|
width: 26px!important;
|
||||||
|
}
|
||||||
|
.ft_16 {
|
||||||
|
font-size: 14px!important;
|
||||||
|
line-height: 18px!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 35px!important;
|
||||||
|
line-height: 42px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 165px !important;
|
||||||
|
height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 15px !important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 105px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (max-width:374px) {
|
||||||
|
.ft_16 {
|
||||||
|
font-size: 12px!important;
|
||||||
|
line-height: 16px!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_side30 {
|
||||||
|
width: 20px!important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 30px!important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 160px !important;
|
||||||
|
height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 15px !important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 95px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen {
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Regular';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Regular.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Regular.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Medium';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Medium.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Medium.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Bold';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Bold.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Bold.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-ExtraBold';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-ExtraBold.woff') format('woff'), url('https://typography.doordash.com/TTNorms-ExtraBold.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body bgcolor="#ffffff" class="em_body" data-gr-c-s-loaded="true" style="margin:0px auto; padding:0px;">
|
||||||
|
<span style="color:transparent;visibility:hidden;display:none;opacity:0;height:0;width:0;font-size:0;"></span> <!-- == Body Section == -->
|
||||||
|
<table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="em_full_wrap" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="em_main_table" style="width:700px;" width="700">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top"><!---->
|
||||||
|
<table align="center" bgcolor="#ededed" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h30" height="62" style="height:62px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr> <!-- banner Section -->
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" bgcolor="#ededed" class="em_hauto" valign="top"><!---->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side30" style="width:60px;" width="60"></td>
|
||||||
|
<td align="center" class="em_hauto" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top"><a style="text-decoration:none;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiX9NQvXQ9aE-2FeLMhxL9C-2FAEkIYH_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniDohab0lVqyyqLUGGGtDfKri8s0BPbLw2Kta64VgtBfCarELB9jSoY9mQzB-2FDOSk7-2FtMWjohoN3uf5f2rLrFhl33mtjWZ53lXvtDO4wQsmVDJSCEfVON02MQaDh-2BmTLPN5Vxq7DH8UlIbETnDVF4Df7l7njadHPDZB2aHMoBR9nS93-2B-2FrbnWmdM0cdfetMj3RGMa8Yk-2Fgyfj6ZKM2CqlUxqNZhbHVjZo1bFR4YvyxsTPc56A8ujeF0vzPIUM4yXtdY-2BtGKNvO-2F2momIcFB8TCK6k39zWYllF-2FQub6BRW64qF3OwcOA8Qi4U05aRe966x3Bpi5mkgpGuXH0X2CslH23bljSHOl2uOmwPSt23EvYS0CPbrX4YRtgLnEmHgYYbokWIuo5wjdIr3VkCFPni8ollM9GFO6AXsUeSwZAvhq6oZY-2FetynINJjWZRmZA3FqSomogDxHnQi04e6CHFKy-2BGOn5XT6stPkmBsFDgIMFmy1Jd3aVxMduJiqTN-2FrgtJfvcZfTHhj5HcBZymhPVxScgd1TCe4E2-2FYMFqXzB9Or-2FAP5yIgF2yNJhy8OA3CMlV8LdA8Rd-2Fsxt1caI8cPn9hyYypY-2FLckUNAxRzwuBCAQ1buubQlldewgQiuToSUsejOOxk-3D" universal="true"><img alt="DOORDASH" border="0" class="en_icon" style="display:block; max-width:45px;font-family:Arial, sans-serif;font-size:20px; line-height:30px; color:#ee3623; font-weight:bold;" width="45" src="https://assets.doordash.team/m/835d1d775f776ef/original/-04_April-MX_Winback_Campaign-logo_img.png"> </a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="50" style="height:50px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink em_font_58 em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:51px; line-height:60px; font-weight: bold;" valign="top"><!---->Thanks for your<br> order, Siddharth<!----></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h10" height="20" style="height:20px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#000000;font-size:16px; line-height:20px;" valign="top"><!---->The estimated delivery time for your order<br class="em_hide"> is <strong>2:00 pm - 2:15 pm</strong>. Track your order in<br class="em_hide"> the DoorDash app or website.<!----></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h10" height="20" style="height:20px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" class="em_cta" style="width:220px; max-width:220px;" width="220">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" class="em_defaultlink em_cta em_bold" height="45" style="font-family:'TTNorms-Bold', Arial, sans-serif;color:#ffffff;font-size:18px; background-color:#eb1700; border-radius:25px; font-weight: bold; " valign="middle"><a style="text-decoration:none; display:block; color:#ffffff; line-height:45px;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiUYpjiz5uS6IJixGXj3UHbTD93pKefx1-2F0xnbLGDGm-2F-2BQiJu-2BjCmmrEKOYlPr7srvk-3D8BvI_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniDohab0lVqyyqLUGGGtDfKri8s0BPbLw2Kta64VgtBfCarELB9jSoY9mQzB-2FDOSk7-2FtMWjohoN3uf5f2rLrFhl33mtjWZ53lXvtDO4wQsmVDJSCEfVON02MQaDh-2BmTLPN5Vxq7DH8UlIbETnDVF4Df7l7njadHPDZB2aHMoBR9nS93-2B-2FrbnWmdM0cdfetMj3RGMa8Yk-2Fgyfj6ZKM2CqlUxqNZhbHVjZo1bFR4YvyxsTPc56A8ujeF0vzPIUM4yXtdY-2BtGKNvO-2F2momIcFB8TCK6k39zWYllF-2FQub6BRW64qF3OwcOA8Qi4U05aRe966x3Bpi5mkgpGuXH0X2CslH23bljSHOl2uOmwPSt23EvYS0CPbrX4YRtgLnEmHgYYbokWIuo5wjdIr3VkCFPni8ollM9GFO6AXsUeSwZAvhq6oZY-2FetynINJjWZRmZA3FqSomogDxHnQi04e6CHFKy-2BGOn5XT6stPkmBsFDgIMFmy1JaOMC6-2F6zNNGOii9obOCSUz236yIB4gCzgF-2BEE7DFN-2BzWJDOZETyK2c-2BdBr5QJMquOChmyoid171OpGSki94P-2Br-2FT5mkOXMUdSuXDA9B2zx9bfVlZsW1KYw6NBNiJ3c-2F9p-2FTFh6SVp-2Ferm15pDsGPoc-3D" universal="true">Track Your Order</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" style="width:20px;" width="20"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!----><!--Illustration 1-->
|
||||||
|
<tr>
|
||||||
|
<td align="center" class="em_full_img" valign="top"><a style="text-decoration:none;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiX9NQvXQ9aE-2FeLMhxL9C-2FAEGC0g_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniDohab0lVqyyqLUGGGtDfKri8s0BPbLw2Kta64VgtBfCarELB9jSoY9mQzB-2FDOSk7-2FtMWjohoN3uf5f2rLrFhl33mtjWZ53lXvtDO4wQsmVDJSCEfVON02MQaDh-2BmTLPN5Vxq7DH8UlIbETnDVF4Df7l7njadHPDZB2aHMoBR9nS93-2B-2FrbnWmdM0cdfetMj3RGMa8Yk-2Fgyfj6ZKM2CqlUxqNZhbHVjZo1bFR4YvyxsTPc56A8ujeF0vzPIUM4yXtdY-2BtGKNvO-2F2momIcFB8TCK6k39zWYllF-2FQub6BRW64qF3OwcOA8Qi4U05aRe966x3Bpi5mkgpGuXH0X2CslH23bljSHOl2uOmwPSt23EvYS0CPbrX4YRtgLnEmHgYYbokWIuo5wjdIr3VkCFPni8ollM9GFO6AXsUeSwZAvhq6oZY-2FetynINJjWZRmZA3FqSomogDxHnQi04e6CHFKy-2BGOn5XT6stPkmBsFDgIMFmy1JaZrmPxM5tO3MVqwpeuZtxlipSYowDluqjEhtng6OZ1tiReEtrMZSXfyizE8Z-2BoYl-2FOhh2mVbKh8Ag8sj-2FY0Dr5fXcralZiuXdtrszdPSlbYpbbdCWJgW2Mvx4JTup-2Be7s2F323Q0hdUfWlDu1kXlV0-3D" universal="true"><img alt="" border="0" class="em_full_img" style="display:block; max-width:700px; font-family:Arial, sans-serif; font-size:22px; line-height:25px; color:#ffffff; font-weight:bold;" width="700" src="https://assets.doordash.team/m/2f9c7fde7cfed840/original/-template-OrderConfirmation-foodbag.png"></a></td>
|
||||||
|
</tr> <!--//Illustration 1--><!----><!-- //banner Section -->
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="width:6%;" width="6%"></td>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" class="em_rounded" style="border-top-left-radius: 40px; border-top-right-radius: 40px; background-color: #ffffff;" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="50" style="height:50px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px;" valign="top">Paid with credits<br> Mad Mex</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px; font-weight:bold; color:#000000;" valign="top">Total: $14.64</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="35" style="height:35px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:26px; line-height:36px; font-weight: bold;" valign="top">Your receipt</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:21px;" valign="top">19 Lady Penrhyn Dr, Wyndham Vale VIC 3024, Australia</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="45" style="height:45px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px;" valign="top"><font size="2" color="#666666"><b>- For: Siddharth Bose -</b></font><br><br>
|
||||||
|
<table width="100%" style="margin: auto; margin-bottom: 20px">
|
||||||
|
<tbody>
|
||||||
|
<tr style="text-align: left;">
|
||||||
|
<td valign="top" width="10%" style="color: #666666; font-size: 18px; line-height: 24px">1x</td>
|
||||||
|
<td valign="top" width="75%" style="color: #666666; font-size: 18px; line-height: 24px"><b>Burrito</b> (Mains)<br><font color="dimgrey">• Slow Cooked Beef (GF)</font><br><font color="dimgrey">• Fresh Guacamole (GF, VG)</font><br><font color="dimgrey">• Spicy Salsa</font><br><font color="dimgrey">• No Beans (GF,V)</font><br><br></td>
|
||||||
|
<td valign="top" width="15%" style="color: #666666; font-size: 18px; line-height: 24px text-align: right">$22.10</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="22" style="height:22px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" bgcolor="#ffffff" class="em_pad1" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="em_wrapper" style="width:530px;" width="530">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor="#e5e5e5" height="2" style="line-height:0px; font-size:0px; height: 2px;"><img alt="" border="0" height="1" style="display:block;" width="1" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="background-color: #ffffff;" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="10" style="height:10px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Subtotal</td> <!---->
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$22.10</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Taxes</td> <!---->
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!----><!---->
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Delivery Fee</td>
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Service Fee</td>
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$1.99</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Tip</td>
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Discounts</td>
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">-$24.09</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!---->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="18" style="height:18px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" bgcolor="#ffffff" class="em_pad1" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="em_wrapper" style="width:530px;" width="530">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor="#e5e5e5" height="2" style="line-height:0px; font-size:0px; height: 2px;"><img alt="" border="0" height="1" style="display:block;" width="1" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="background-color: #ffffff;" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="12" style="height:12px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td align="left" class="em_defaultlink em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:17px; line-height:24px; font-weight: bold;" valign="top">Total Charged</td> <!---->
|
||||||
|
<td align="right" class="em_defaultlink em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:17px; line-height:24px; font-weight: bold;" valign="top">$14.64</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!----><!----><!----><!----><!----><!----><!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="15" style="height:15px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#ff2f07;font-size:14px; line-height:21px; font-weight: bold;" valign="top"><a style="color:#ff2f07; text-decoration:none;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiUYpjiz5uS6IJixGXj3UHbTD93pKefx1-2F0xnbLGDGm-2F-2BQiJu-2BjCmmrEKOYlPr7srvk-3DZM8O_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniDohab0lVqyyqLUGGGtDfKri8s0BPbLw2Kta64VgtBfCarELB9jSoY9mQzB-2FDOSk7-2FtMWjohoN3uf5f2rLrFhl33mtjWZ53lXvtDO4wQsmVDJSCEfVON02MQaDh-2BmTLPN5Vxq7DH8UlIbETnDVF4Df7l7njadHPDZB2aHMoBR9nS93-2B-2FrbnWmdM0cdfetMj3RGMa8Yk-2Fgyfj6ZKM2CqlUxqNZhbHVjZo1bFR4YvyxsTPc56A8ujeF0vzPIUM4yXtdY-2BtGKNvO-2F2momIcFB8TCK6k39zWYllF-2FQub6BRW64qF3OwcOA8Qi4U05aRe966x3Bpi5mkgpGuXH0X2CslH23bljSHOl2uOmwPSt23EvYS0CPbrX4YRtgLnEmHgYYbokWIuo5wjdIr3VkCFPni8ollM9GFO6AXsUeSwZAvhq6oZY-2FetynINJjWZRmZA3FqSomogDxHnQi04e6CHFKy-2BGOn5XT6stPkmBsFDgIMFmy1JaVyVX-2BN0rfrZb4gqsyh-2FPhwDCNS7-2Fr19T2GWsMfiRQ3UNw3buP-2FdHaE5XAo30Zx73XG0x2-2Bj9CkYTdbTkYtPKndOo8C-2Frr-2BJqyRFJZMfQUP1ZV-2F2Ey3WNBzbwVr6SxafeujsUnxXrbM6VJ3DMYac3E-3D" universal="true">Get Order Help</a></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="58" style="height:58px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!-- == //Body Section == --><!-- == Footer Section == --><!-- == //Footer Section == --></td>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td style="width:6%;" width="6%"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top"><!--[if (gte mso 9)|(IE)]>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:620px;">
|
||||||
|
<tr>
|
||||||
|
<td align="center">
|
||||||
|
<![endif]-->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" id="Footer" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 700px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="padding: 0 24px;">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width:100%;max-width:572px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 48px 0;border-bottom: 1px solid #E7E7E7;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 32px 0 16px 0;"><p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;">©2026 <a style="color: #9A9A9A; text-decoration: none;">DoorDash Technologies Australia Pty Ltd <br>401 Collins St. <br>Melbourne, VIC 3000 Australia</a></p> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYCzx-2Br1lrYaof6JiBiFLOVfEOgDjXh7OOs7yReUnPIfAQpor-2FGsJy8J81hADh-2FLb3M-3Dcz1D_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniDohab0lVqyyqLUGGGtDfKri8s0BPbLw2Kta64VgtBfCarELB9jSoY9mQzB-2FDOSk7-2FtMWjohoN3uf5f2rLrFhl33mtjWZ53lXvtDO4wQsmVDJSCEfVON02MQaDh-2BmTLPN5Vxq7DH8UlIbETnDVF4Df7l7njadHPDZB2aHMoBR9nS93-2B-2FrbnWmdM0cdfetMj3RGMa8Yk-2Fgyfj6ZKM2CqlUxqNZhbHVjZo1bFR4YvyxsTPc56A8ujeF0vzPIUM4yXtdY-2BtGKNvO-2F2momIcFB8TCK6k39zWYllF-2FQub6BRW64qF3OwcOA8Qi4U05aRe966x3Bpi5mkgpGuXH0X2CslH23bljSHOl2uOmwPSt23EvYS0CPbrX4YRtgLnEmHgYYbokWIuo5wjdIr3VkCFPni8ollM9GFO6AXsUeSwZAvhq6oZY-2FetynINJjWZRmZA3FqSomogDxHnQi04e6CHFKy-2BGOn5XT6stPkmBsFDgIMFmy1JRYFdI4rWGqZbwcwPjA-2FfGSpVNEJe6-2BhKqFbWrIPgphG2UaqzMu-2FrPVVEEnOy-2F7K7l-2Fiy9DJuVosOT1N6tV6enGQ9g8qH2bVpDkJgmaqxnNTS4xf9s7LwM3H-2FEquZm-2By-2FmUkLGnDPlpUJFzu1om-2F4mY-3D" target="_blank" style="color: #9A9A9A; text-decoration: none;">Privacy Policy</a></p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 0 0 24px 0;"><p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:500;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYC9Fbd7OtaSznXr4XXA8cVP-2BJHCjKWkCwgvETCnlfYzgA-3D-3D9VgN_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniDohab0lVqyyqLUGGGtDfKri8s0BPbLw2Kta64VgtBfCarELB9jSoY9mQzB-2FDOSk7-2FtMWjohoN3uf5f2rLrFhl33mtjWZ53lXvtDO4wQsmVDJSCEfVON02MQaDh-2BmTLPN5Vxq7DH8UlIbETnDVF4Df7l7njadHPDZB2aHMoBR9nS93-2B-2FrbnWmdM0cdfetMj3RGMa8Yk-2Fgyfj6ZKM2CqlUxqNZhbHVjZo1bFR4YvyxsTPc56A8ujeF0vzPIUM4yXtdY-2BtGKNvO-2F2momIcFB8TCK6k39zWYllF-2FQub6BRW64qF3OwcOA8Qi4U05aRe966x3Bpi5mkgpGuXH0X2CslH23bljSHOl2uOmwPSt23EvYS0CPbrX4YRtgLnEmHgYYbokWIuo5wjdIr3VkCFPni8ollM9GFO6AXsUeSwZAvhq6oZY-2FetynINJjWZRmZA3FqSomogDxHnQi04e6CHFKy-2BGOn5XT6stPkmBsFDgIMFmy1JePrOHq5c5aW6evBo1DEdQJNXu-2BX-2FLP1H7ZXkSsghQ0EUu5Q6HYBtkMij3hyHvfxKdfDvfPKun4porDdzU27HkbjUwffVpDDk5SZimtlGs-2B8re-2FwuFPMI9TFYPc8JMXjGAWJTpoqf-2BcFT1RgPBXiW4Y-3D" target="_blank" style="color:#9A9A9A;text-decoration:none;">Help Center</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!--[if (gte mso 9)|(IE)]>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<![endif]--></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_hide" style="line-height:1px;min-width:700px;background-color:#f4f4f4;"><img alt="" border="0" height="1" style="max-height:1px; min-height:1px; display:block; width:700px; min-width:700px;" width="700" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<img src="https://tracksg.doordash.com/wf/open?upn=u001.EBL2ug8kstebd25Xirrl3olMckTI261ldPjJ39bNHcC7U6EKGAOA4dSVB97lcv3b8qsQRq6LwkHED6F3X4gqaODB2b1wZFk4or4JbrThItr6lxxhe0ghxdjbmj40V9NR2q6sVlDPfArvtaJbtCejz-2BJxmNDpj6cBZjf16jHN3-2B2-2FBNoONAVXEROMy-2FebOh-2BiIcflH-2B33fKp22eXYo6U8vHb6sK-2FhKm1eTZq8fP2ZliSW-2FDJ4KPJHZKnoxb-2FEyRvVNj8NRt3Z7VhrxSD83L-2BD-2Fg-2BYQJkcfBPsJzteuA7jtfPftcKLG1twN4g1gQQZHw9OGtsD1rLq9iXJ6ZzaVdWLEzmjDcZ7g3fTMixrMzH4oIIOEair3v0qOMD-2BV-2BHU7ncYtO-2FnD0bk1O9XI94PBy9e9JXZDgi2OxIT84h7X7b83MwQfHv6Y0eFjKVrvu0wzSlch7hpGzIv6v9RQGcCePKn-2BQ-2B85mf3KcKtUiyQ-2Bcvh-2BNe6ZHrHZAucV3pF0Fdo4Yn1-2Fie3uN1peu4VputGOf9gYSRqzfDIxJ-2BpD9KcAQghrRgZ08n7rFpdtIeHrI0J-2BsvQ0YqnprMwzKBgarmyWY4Ll6vo-2B-2FQLHQVXWlGWqomUtaBIY1wIPtH3sUn48aYCsuzz9tPifFXGPqgruVpD2mpi3C41MG8rFgUFQwfp4xV7SLCp8axKXY3t7WsYtRFw04WcnX-2FJMSRUrn8bq8PbEHq3Hjikf10MnkiyW7GobtuKhHdBL4F6ntalNVUHk3neSbhFBHGlJJQUA2Kfxt1bsI5eAQoX-2FRsU2BYtChgxaMUD53E-3D" alt="" width="1" height="1" border="0" style="height:1px !important;width:1px !important;border-width:0 !important;margin-top:0 !important;margin-bottom:0 !important;margin-right:0 !important;margin-left:0 !important;padding-top:0 !important;padding-bottom:0 !important;padding-right:0 !important;padding-left:0 !important;"/></body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,817 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en" dir="ltr" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width,initial-scale=1 user-scalable=yes">
|
||||||
|
<meta name="format-detection" content="telephone=no, date=no, address=no, email=no, url=no">
|
||||||
|
<meta name="x-apple-disable-message-reformatting">
|
||||||
|
<meta name="color-scheme" content="light dark">
|
||||||
|
<meta name="supported-color-schemes" content="light dark">
|
||||||
|
<title>DoorDash</title> <!-- WEB FONTS --> <!--[if !mso]>-->
|
||||||
|
<style type="text/css">
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:700;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-Bold.woff2')format('woff2');}
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:600;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-DemiBold.woff2')format('woff2');}
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:500;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-Medium.woff2')format('woff2');}
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:450;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-Normal.woff2')format('woff2');}
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:400;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-Regular.woff2')format('woff2');}
|
||||||
|
</style> <!--<![endif]--> <!-- STYLE RESETS -->
|
||||||
|
<style type="text/css">a[href^="tel"],a[href^="sms"]{color:inherit;cursor:default;font-weight:inherit;text-decoration:none}body{-ms-text-size-adjust:100%;-webkit-font-smoothing:antialiased;-webkit-text-size-adjust:100%;mso-line-height-rule:exactly;}html,body{width:100%;margin:0;padding:0}img{border:0;display:block;height:auto;line-height:100%;outline:none;text-decoration:none}table{border:0 !important;padding:0 !important; border-collapse:collapse !important;mso-table-lspace:0pt;mso-table-rspace:0pt;}u + .body a{color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;line-height:inherit}u ~ img + div > div{display:none;}u + .body{width:100%;}.body a[x-apple-data-detectors=true]{color:inherit!important;text-decoration:inherit!important}span.MsoHyperlink{color:inherit !important;mso-style-priority:99 !important}span.MsoHyperlinkFollowed{color:inherit !important;mso-style-priority:99 !important}
|
||||||
|
</style> <!-- BACKGROUND COLORS -->
|
||||||
|
<style type="text/css">
|
||||||
|
body,#MainTable{background-color:#F4F4F4;}
|
||||||
|
#Basic000{background-color:#FEFFFF;}
|
||||||
|
#Sky200{background-color:#DDF4F4;}
|
||||||
|
</style> <!-- FONT STYLES -->
|
||||||
|
<style type="text/css">
|
||||||
|
h1,h2,h3,h4,h5,h6{font-family:'TTNorms',system-ui,sans-serif;font-weight:700;margin:0 0 8px 0;}
|
||||||
|
p,ol,ul{font-family:'TTNorms',system-ui,sans-serif;font-weight:450;margin:0 0 8px 0;}
|
||||||
|
ul,ol{padding:0 0 0 20px;}
|
||||||
|
li{font-weight:450;margin:0 0 8px 0;}
|
||||||
|
h1{font-size:50px;line-height:50px;letter-spacing:-0.03em;}
|
||||||
|
h2{font-size:40px;line-height:40px;letter-spacing:-0.02em;}
|
||||||
|
h3{font-size:32px;line-height:32px;letter-spacing:-0.02em;}
|
||||||
|
h4{font-size:24px;line-height:24px;letter-spacing:-0.01em;}
|
||||||
|
h5{font-size:20px;line-height:22px;letter-spacing:-0.01em;}
|
||||||
|
h6{font-size:16px;line-height:18px;}
|
||||||
|
p.p1{font-size:20px;line-height:26px;}
|
||||||
|
p.p2{font-size:16px;line-height:22px;}
|
||||||
|
p.p4{font-size:12px;line-height:14px;}
|
||||||
|
sup{font-size:11px;line-height:11px;}
|
||||||
|
</style> <!-- FONT COLORS -->
|
||||||
|
<style type="text/css">
|
||||||
|
#MainTable table td{color:#191919;}
|
||||||
|
#MainTable table td a{color:inherit;}
|
||||||
|
#MainTable table td p a{text-decoration:underline;}
|
||||||
|
.Red200{color:#EB1700 !important;}
|
||||||
|
</style> <!-- CTAs --> <!-- MOBILE STYLES -->
|
||||||
|
<style type="text/css">
|
||||||
|
@media only screen and (max-width:699px){
|
||||||
|
#MainTable > table {max-width:410px!important;}
|
||||||
|
.full{width:100%!important;height:auto!important;}
|
||||||
|
.pad0{padding-left:0!important;padding-right:0!important;}
|
||||||
|
.pad8{padding-left:8px!important;padding-right:8px!important;}
|
||||||
|
.pad24{padding-left:24px!important;padding-right:24px!important;}
|
||||||
|
.logo{padding-top:40px!important;padding-bottom:40px!important;}
|
||||||
|
h1{font-size:40px!important;line-height:40px!important;letter-spacing:-0.02em!important;}
|
||||||
|
h2{font-size:32px!important;line-height:32px!important;}
|
||||||
|
h3{font-size:24px!important;line-height:24px!important;letter-spacing:-0.01em!important;}
|
||||||
|
}
|
||||||
|
</style> <!-- DARK MODE STYLES -->
|
||||||
|
<style type="text/css">
|
||||||
|
@media (prefers-color-scheme:dark){
|
||||||
|
body,#MainTable,#Footer{background-color:#000000!important;background-image:linear-gradient(#000000,#000000)!important;}
|
||||||
|
table[id^="Basic"]{background-color:#191919!important;background-image:linear-gradient(#191919,#191919)!important;}
|
||||||
|
table[id^="Sky"],table[id^="Blue"]{background-color:#002629!important;background-image:linear-gradient(#002629,#002629)!important;}
|
||||||
|
#MainTable table td{color:#FFFFFF!important;}
|
||||||
|
#MainTable #Footer table td a{color:#FFFFFF!important;}
|
||||||
|
#MainTable .Red200{color:#FF3008!important;}
|
||||||
|
#MainTable .label span{color:#494949!important;background-color:#FEFFFF!important;}
|
||||||
|
#MainTable .grayCopy p{color:#A6A6A6!important;}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<style type="text/css">
|
||||||
|
:root{color-scheme:light dark;supported-color-schemes:light dark;}
|
||||||
|
</style> <!-- GMAIL APP DARK MODE FIX --> <!-- OUTLOOK SPECIFIC CSS --> <!--[if gte mso 9]>
|
||||||
|
<style type="text/css">
|
||||||
|
#MainTable td a{color:#191919;}
|
||||||
|
ol,ul{margin-left:20px !important;}
|
||||||
|
li{text-indent:-1em;}
|
||||||
|
</style>
|
||||||
|
<noscript>
|
||||||
|
<xml>
|
||||||
|
<o:OfficeDocumentSettings>
|
||||||
|
<o:PixelsPerInch>96</o:PixelsPerInch>
|
||||||
|
</o:OfficeDocumentSettings>
|
||||||
|
</xml>
|
||||||
|
</noscript>
|
||||||
|
<![endif]-->
|
||||||
|
</head>
|
||||||
|
<body class="body" style="width:100%;margin:0;padding:0;">
|
||||||
|
<span style="color:transparent;visibility:hidden;display:none;opacity:0;height:0;width:0;font-size:0;"></span>
|
||||||
|
<div role="article" aria-roledescription="email" aria-label="DoorDash Email" lang="en" dir="ltr" style="font-size:medium; font-size:max(16px, 1rem);">
|
||||||
|
<div style="display: none; max-height: 0px; overflow: hidden;">
|
||||||
|
͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏
|
||||||
|
</div>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" id="MainTable" style="background-color:#F4F4F4;">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="full" id="Sky200" role="presentation" style="width:700px;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="pad24" style="padding: 0 64px;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="logo" style="padding: 48px 0;"><a href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiX9NQvXQ9aE-2FeLMhxL9C-2FAEerk2_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDdm5muv43mKBZj0FtslvRhwurT1HU7WzBFk0uKPD12dT8hiOQ5EDRx3fHM-2BeYkU4qHqDyPFxUwZuSfyRj0SIOTkg-2B18lVSaIyNV-2FYADATgkv5vXH4igP0Invu4xOPQBpgg16ckbsIS8IRV3mGaj1X5KhMT-2FuLlWkyJ0vYYtn7DRdGkRIV8GNdbKAWhFWQmTP4s1sfO-2BmfVk1PxO2rjtA0ZfcEcAKhCAzKFEEbQ9BWgK39Qvkt47rpQjykYZ9iiQAGWQLAjcs6P4DIPoAa8QmGrMb0TkMbrHUuWzG3I6o6QTpKFhzWbXT1TXbl0tj9rUZeGPY7Gxx-2FjDpfuEqSvOXz4YCMEoeSAPy7cIWp2wjaTin6ux0N-2Fsxe4v-2FsCd7o-2F1uCwW4EEDetpthuIuYYkeIXQlzypqy8rrJ5Czz-2F9QxvlX7Rurh5UPO-2FSnnEWnQNj-2Bby-2BmuZiFMapcD3VfIVucgG0YgY0q8krauzK38sC-2Bo3p3uvmDObIONy9moqGQopWgFpL5Oy8bXmdxo1-2FRjNsrDbsLgM1km0RQLa4WV7Y99oaIhdT35ahysXpZwozejK1qEgOqrm8WZjgms1TsVagTaVDuAieGpWb-2FQlcU9t3Vh8TCZEmOz2Loi3CvHDdReh6E5oaG4UkH-2BbB80dFEw5AwJF-2B0-3D" target="_blank" universal="true"><img alt="DoorDash" border="0" src="https://assets.doordash.team/m/5e68fa5cbbc50c32/original/DoorDash-Logo-Red100.png" style="color: #FF3008;font-family:'TTNorms',system-ui,sans-serif;font-weight:bold;font-size:18px;text-decoration:none;" width="50"></a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="pad0" style="padding:0 64px 0 0;"><h1 style="margin:0 0 16px 0;">There are adjustments to your order.</h1></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="right" style="padding: 0 0 40px 0;"><img alt="" src="https://img.cdn4dd.com/s/convenience/images/adjustments_eml_grocery.png" width="380" style="width:100%;max-width:380px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="pad8" style="padding: 0 40px 40px;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" id="Basic000" role="presentation" style="width:100%;border-radius:25px;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="pad24" style="padding:40px 40px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 32px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 24px 0;"><!----> <p class="p2" style="margin:0 0 4px 0;">Paid with credits</p> <p class="p2" style="margin:0 0 4px 0;">ALDI</p> <p class="p2" style="margin:0 0 4px 0;"></p> <p class="p2"><strong>Total: $0.00</strong></p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 24px 0;border-bottom:1px solid #C4C4C4;"><h4>Your receipt</h4> <!----> <p class="p2" style="margin:0 0 4px 0;"></p> <!----> <p class="p2"><a href="" style="color:#191919;text-decoration:none;">19 Lady Penrhyn Dr, Wyndham Vale VIC 3024, Australia</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!---->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 16px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><h4>Items that were adjusted</h4></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="label" style="padding: 0 0 8px 0;"><!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <span style="font-family:'TTNorms',system-ui,sans-serif;font-size:12px;line-height:18px;color:#FEFFFF;background-color:#494949;display:inline-block;padding:1px 4px;border-radius:4px;font-weight:700;white-space:nowrap;">Out of Stock</span></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class="grayCopy"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:#767676;"><strong>5x</strong> Coca-Cola Coke Zero Sugar Soft Drink (1.5 L)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: line-through; margin: 0 0 4px 0;color:#767676;white-space:nowrap;"> $16.45 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="label" style="padding: 0 0 8px 0;"><!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <span style="font-family:'TTNorms',system-ui,sans-serif;font-size:12px;line-height:18px;color:#FEFFFF;background-color:#494949;display:inline-block;padding:1px 4px;border-radius:4px;font-weight:700;white-space:nowrap;">Substituted</span></td>
|
||||||
|
</tr> <!-- --> <!-- --> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class="grayCopy"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color: #767676;"><strong>2x</strong> Specially Selected Beef Wagyu Burger (150 g)</p></td>
|
||||||
|
<td align="right" valign="top" class="grayCopy" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: line-through; margin: 0 0 4px 0;color: #767676;white-space:nowrap;"> $8.58 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; margin: 0 0 8px 0; font-size: 16px; line-height: 20px; font-weight: 700;">Substituted with:</p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="color: #191919;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;"><strong>1x</strong> Ready, Set...Cook! Wagyu Beef Burgers (400 g)</p></td>
|
||||||
|
<td align="right" valign="top" style="color: #191919; padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;white-space:nowrap;">$9.39</p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: none;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="label" style="padding: 0 0 8px 0;"><!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <span style="font-family:'TTNorms',system-ui,sans-serif;font-size:12px;line-height:18px;color:#FEFFFF;background-color:#494949;display:inline-block;padding:1px 4px;border-radius:4px;font-weight:700;white-space:nowrap;">Substituted</span></td>
|
||||||
|
</tr> <!-- --> <!-- --> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class="grayCopy"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color: #767676;"><strong>1x</strong> Bon Appetit Sliced Brioche Burger Buns with Sesame Seeds (200 g)</p></td>
|
||||||
|
<td align="right" valign="top" class="grayCopy" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: line-through; margin: 0 0 4px 0;color: #767676;white-space:nowrap;"> $3.89 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; margin: 0 0 8px 0; font-size: 16px; line-height: 20px; font-weight: 700;">Substituted with:</p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="color: #191919;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;"><strong>1x</strong> Bon Appetit Sliced Brioche Burger Buns (200 g)</p></td>
|
||||||
|
<td align="right" valign="top" style="color: #191919; padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;white-space:nowrap;">$3.89</p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!---->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 32px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><h4>Items you ordered</h4></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 16px 0;border-bottom:1px solid #C4C4C4;"><!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Ironbark Pork Belly Pack</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $24.21 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" align="left" class="grayCopy"><p class="para-md" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 14px; line-height: 18px; margin: 0 0 4px 0;color: #767676;">$18.99/kg • Purchased 1.275 kg</p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Green Capsicum Loose (each) (each)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $1.54 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" align="left" class="grayCopy"><p class="para-md" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 14px; line-height: 18px; margin: 0 0 4px 0;color: #767676;">$5.99/kg • Purchased 0.257 kg</p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>2x</strong> Broccoli Loose (each)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $3.08 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" align="left" class="grayCopy"><p class="para-md" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 14px; line-height: 18px; margin: 0 0 4px 0;color: #767676;">$4.49/kg • Purchased 0.685 kg</p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Ginger Loose (each)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $4.47 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" align="left" class="grayCopy"><p class="para-md" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 14px; line-height: 18px; margin: 0 0 4px 0;color: #767676;">$29.99/kg • Purchased 0.149 kg</p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Berg Streaky Bacon (200 g)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $4.69 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Emporium Selection Burrata (150 g)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $7.09 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Anco Soft Anco Soft Fabric Softener Concentrate - Cashmere Touch (1 L)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $3.99 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Pure Vita Canola Oil (2 L)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $6.49 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> The Herb Garden Jalapeno Chillies (80 g)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $3.49 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Farmdale Thickened Cream (300 ml)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $3.69 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Mandarins (1 kg)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $3.49 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Sweet Valley Fruit Salad in Syrup (825 g)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $3.89 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>3x</strong> Hass Avocado</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $5.37 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Spring Onion Bunch</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $2.69 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: none;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> The Herb Garden Coriander Bunch</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $2.99 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!---->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 32px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 24px 0;border-bottom:1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Subtotal</p></td>
|
||||||
|
<td align="right" valign="bottom"><p class="p2">$94.45</p></td>
|
||||||
|
</tr> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Bag Fee</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$0.75</p></td>
|
||||||
|
</tr> <!----> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Tax</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$0.00</p></td>
|
||||||
|
</tr> <!----> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Delivery fee</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$0.00</p></td>
|
||||||
|
</tr> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Service fee</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$8.95</p></td>
|
||||||
|
</tr> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Dasher tip</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$0.00</p></td>
|
||||||
|
</tr> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Discount</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">-$25.00</p></td>
|
||||||
|
</tr> <!----> <!----> <!----> <!---->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p1" style="font-weight:700;">Final total charged</p></td>
|
||||||
|
<td align="right" valign="bottom"><p class="p1" style="font-weight:700;">$0.00</p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:16px 0 24px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><!----> <!----> <!----> <p class="p4" style="margin:0 0 16px;font-weight:400;">This email confirms revisions made to your original DoorDash order and reflects the final amount charged. The new total cost of your order is above and includes all taxes and fees. Payment processing adjustments to the original charge may take up to 5-7 business days to process.</p> <!----> <p class="p2" style="margin:0 0 16px;"><a class="Red200" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiUYUIJyXMOWcKUkQoS6w1cidTUBltD9gsdDsG54KhCqi0TpTxXlRftLSD-2F0zchmY726xMeqb-2BYjhquRL7EwEUa-2B-C1a_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDdm5muv43mKBZj0FtslvRhwurT1HU7WzBFk0uKPD12dT8hiOQ5EDRx3fHM-2BeYkU4qHqDyPFxUwZuSfyRj0SIOTkg-2B18lVSaIyNV-2FYADATgkv5vXH4igP0Invu4xOPQBpgg16ckbsIS8IRV3mGaj1X5KhMT-2FuLlWkyJ0vYYtn7DRdGkRIV8GNdbKAWhFWQmTP4s1sfO-2BmfVk1PxO2rjtA0ZfcEcAKhCAzKFEEbQ9BWgK39Qvkt47rpQjykYZ9iiQAGWQLAjcs6P4DIPoAa8QmGrMb0TkMbrHUuWzG3I6o6QTpKFhzWbXT1TXbl0tj9rUZeGPY7Gxx-2FjDpfuEqSvOXz4YCMEoeSAPy7cIWp2wjaTin6ux0N-2Fsxe4v-2FsCd7o-2F1uCwW4EEDetpthuIuYYkeIXQlzypqy8rrJ5Czz-2F9QxvlX7Rurh5UPO-2FSnnEWnQNj-2Bby-2BmuZiFMapcD3VfIVucgG0YgY0q8krauzK38sC-2Bo3p3uvmDObIONy9moqGQopWgFpL5Oy8bXmdxo1-2FRjNsrDbsIzcz91FpNoAfjDMq4Z1wpXHGTMPHfVoKcReXA-2FJ6jaKo-2B6xGAG-2Bp5h6Him0z2xNQVc2hNO8YatcJsnFfudME5OtlTe61-2Bq439PkYJf0JqaFj1iwRjZNlhThyTmY7ccTBU-3D" target="_blank" style="font-weight:700;text-decoration:none;" universal="true">Get Order Help</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="full" id="Footer" role="presentation" style="width:700px;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center" style="padding:0 0 24px 0;"><!--[if (gte mso 9)|(IE)]>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:620px;">
|
||||||
|
<tr>
|
||||||
|
<td align="center">
|
||||||
|
<![endif]-->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" id="Footer" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 700px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="padding: 0 24px;">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width:100%;max-width:572px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 48px 0;border-bottom: 1px solid #E7E7E7;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 32px 0 16px 0;"><p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;">©2026 <a style="color: #9A9A9A; text-decoration: none;">DoorDash Technologies Australia Pty Ltd <br>401 Collins St. <br>Melbourne, VIC 3000 Australia</a></p> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYAqF1KGCKTTTznL6MvOfulOsmFa2kqsuG7LjgY0AllZKBKWegcAPOx5sr25l15pnWbLZL6VnVCDFc3hEnP4sDnrjJH9_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDdm5muv43mKBZj0FtslvRhwurT1HU7WzBFk0uKPD12dT8hiOQ5EDRx3fHM-2BeYkU4qHqDyPFxUwZuSfyRj0SIOTkg-2B18lVSaIyNV-2FYADATgkv5vXH4igP0Invu4xOPQBpgg16ckbsIS8IRV3mGaj1X5KhMT-2FuLlWkyJ0vYYtn7DRdGkRIV8GNdbKAWhFWQmTP4s1sfO-2BmfVk1PxO2rjtA0ZfcEcAKhCAzKFEEbQ9BWgK39Qvkt47rpQjykYZ9iiQAGWQLAjcs6P4DIPoAa8QmGrMb0TkMbrHUuWzG3I6o6QTpKFhzWbXT1TXbl0tj9rUZeGPY7Gxx-2FjDpfuEqSvOXz4YCMEoeSAPy7cIWp2wjaTin6ux0N-2Fsxe4v-2FsCd7o-2F1uCwW4EEDetpthuIuYYkeIXQlzypqy8rrJ5Czz-2F9QxvlX7Rurh5UPO-2FSnnEWnQNj-2Bby-2BmuZiFMapcD3VfIVucgG0YgY0q8krauzK38sC-2Bo3p3uvmDObIONy9moqGQopWgFpL5Oy8bXmdxo1-2FRjNsrDbsIjwoUCSEKvO5n-2Bj16PIPm9vylVUKXBAg-2Fy62EoW7wAeLOkv7ljadn2lJdO1Z8YyTZVsg50XPfub07LBUsUSDmpWsvorrlalMazpGr6pIsnVp6l5lDVPbZ82aaASmCqGBc-3D" target="_blank" style="color: #9A9A9A; text-decoration: none;">Privacy Policy</a></p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 0 0 24px 0;"><p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:500;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYABnncKv1afIihr5Gt6bkMj2LIo_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDdm5muv43mKBZj0FtslvRhwurT1HU7WzBFk0uKPD12dT8hiOQ5EDRx3fHM-2BeYkU4qHqDyPFxUwZuSfyRj0SIOTkg-2B18lVSaIyNV-2FYADATgkv5vXH4igP0Invu4xOPQBpgg16ckbsIS8IRV3mGaj1X5KhMT-2FuLlWkyJ0vYYtn7DRdGkRIV8GNdbKAWhFWQmTP4s1sfO-2BmfVk1PxO2rjtA0ZfcEcAKhCAzKFEEbQ9BWgK39Qvkt47rpQjykYZ9iiQAGWQLAjcs6P4DIPoAa8QmGrMb0TkMbrHUuWzG3I6o6QTpKFhzWbXT1TXbl0tj9rUZeGPY7Gxx-2FjDpfuEqSvOXz4YCMEoeSAPy7cIWp2wjaTin6ux0N-2Fsxe4v-2FsCd7o-2F1uCwW4EEDetpthuIuYYkeIXQlzypqy8rrJ5Czz-2F9QxvlX7Rurh5UPO-2FSnnEWnQNj-2Bby-2BmuZiFMapcD3VfIVucgG0YgY0q8krauzK38sC-2Bo3p3uvmDObIONy9moqGQopWgFpL5Oy8bXmdxo1-2FRjNsrDbsIrFQJW5Yztgt2Jh362zEdlWVE33xdgG5SV98hQgmujo0E4JvhCRaOchZGxbbbqba5s49iSoOH1uA1snY7iHXvSUNUHWVknLjLn6FaOweBoSS4nrQXEl0UQpbIiLKqwLeM-3D" target="_blank" style="color:#9A9A9A;text-decoration:none;">Help Center</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!--[if (gte mso 9)|(IE)]>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<![endif]--></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<img src="https://tracksg.doordash.com/wf/open?upn=u001.EBL2ug8kstebd25Xirrl3olMckTI261ldPjJ39bNHcC7U6EKGAOA4dSVB97lcv3b8qsQRq6LwkHED6F3X4gqaFe59-2BHz9QfrDL7jp-2BN3jX4WgiXvlTBIakpalIO3JdserrDEfSsXb7VYNi8XmPfj32D9Xcsg-2BKnH54BOn83XeKSYsMOiCB2O7NlyiRLKTOp-2FBccW4vEHOV-2FHaLf-2FAjylTtey6rU4sqCD635svGzB8KNIeJlLUHQHFm36Lriv1GKTHI0TRmME0InLq-2F8D2jWE2PvL5vl2AuTCSyofMbb8v6F0-2Fp2tKFfRS7SLHGABa-2BiIEO0Cj-2B51-2BCj8vI17Ej73lSLlLpOQjZQ5w6Xjpy94GXTJoyFOgOCkMe1dYoozgKu053kwmU-2FQgzvTvZvWljLEAh8AKZgpttD0qf9fwmzT-2FfbmEACAx1lYnUbMQSEnKVrq-2BN93H5GudoxrcNAH5xj7CeRBdn-2B-2Fm2uq78KkVh9j7d2poYBFM-2F0phg4yfzMJ8HenyMNPoDsxTYF2uwr9FPYHeHB92FdN-2FyMNtbhWu3f2Bj2Jp32hssVlE8ypjMbIy3F8Z4K8hxnzYgtXhQn9f7NJRAIR6ZxzgEYOW9gIQ1FDvzuTPT-2BOgXirIYJd7VNW1ls-2F33I09NUJXDzuQt6FpCbkzrw5rMFL9uAjGdsCzWAwAdtI0Vpj9QHVbFrQ7V0Km2o1xng4pDAf2zzOoVcOfy6Llv7NL5VR958SiCNPk-2FivSDJKGbqADXQIiUAHJEWxjJh9" alt="" width="1" height="1" border="0" style="height:1px !important;width:1px !important;border-width:0 !important;margin-top:0 !important;margin-bottom:0 !important;margin-right:0 !important;margin-left:0 !important;padding-top:0 !important;padding-bottom:0 !important;padding-right:0 !important;padding-left:0 !important;"/></body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,592 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en" dir="ltr" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width,initial-scale=1 user-scalable=yes">
|
||||||
|
<meta name="format-detection" content="telephone=no, date=no, address=no, email=no, url=no">
|
||||||
|
<meta name="x-apple-disable-message-reformatting">
|
||||||
|
<meta name="color-scheme" content="light dark">
|
||||||
|
<meta name="supported-color-schemes" content="light dark">
|
||||||
|
<title>DoorDash</title> <!-- WEB FONTS --> <!--[if !mso]>-->
|
||||||
|
<style type="text/css">
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:700;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-Bold.woff2')format('woff2');}
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:600;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-DemiBold.woff2')format('woff2');}
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:500;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-Medium.woff2')format('woff2');}
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:450;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-Normal.woff2')format('woff2');}
|
||||||
|
@font-face{font-family:'TTNorms';font-style:normal;font-weight:400;src:url('https://typography.doordash.com/TTNorms-Pro/TTNormsPro-Regular.woff2')format('woff2');}
|
||||||
|
</style> <!--<![endif]--> <!-- STYLE RESETS -->
|
||||||
|
<style type="text/css">a[href^="tel"],a[href^="sms"]{color:inherit;cursor:default;font-weight:inherit;text-decoration:none}body{-ms-text-size-adjust:100%;-webkit-font-smoothing:antialiased;-webkit-text-size-adjust:100%;mso-line-height-rule:exactly;}html,body{width:100%;margin:0;padding:0}img{border:0;display:block;height:auto;line-height:100%;outline:none;text-decoration:none}table{border:0 !important;padding:0 !important; border-collapse:collapse !important;mso-table-lspace:0pt;mso-table-rspace:0pt;}u + .body a{color:inherit;font-family:inherit;font-size:inherit;font-weight:inherit;line-height:inherit}u ~ img + div > div{display:none;}u + .body{width:100%;}.body a[x-apple-data-detectors=true]{color:inherit!important;text-decoration:inherit!important}span.MsoHyperlink{color:inherit !important;mso-style-priority:99 !important}span.MsoHyperlinkFollowed{color:inherit !important;mso-style-priority:99 !important}
|
||||||
|
</style> <!-- BACKGROUND COLORS -->
|
||||||
|
<style type="text/css">
|
||||||
|
body,#MainTable{background-color:#F4F4F4;}
|
||||||
|
#Basic000{background-color:#FEFFFF;}
|
||||||
|
#Sky200{background-color:#DDF4F4;}
|
||||||
|
</style> <!-- FONT STYLES -->
|
||||||
|
<style type="text/css">
|
||||||
|
h1,h2,h3,h4,h5,h6{font-family:'TTNorms',system-ui,sans-serif;font-weight:700;margin:0 0 8px 0;}
|
||||||
|
p,ol,ul{font-family:'TTNorms',system-ui,sans-serif;font-weight:450;margin:0 0 8px 0;}
|
||||||
|
ul,ol{padding:0 0 0 20px;}
|
||||||
|
li{font-weight:450;margin:0 0 8px 0;}
|
||||||
|
h1{font-size:50px;line-height:50px;letter-spacing:-0.03em;}
|
||||||
|
h2{font-size:40px;line-height:40px;letter-spacing:-0.02em;}
|
||||||
|
h3{font-size:32px;line-height:32px;letter-spacing:-0.02em;}
|
||||||
|
h4{font-size:24px;line-height:24px;letter-spacing:-0.01em;}
|
||||||
|
h5{font-size:20px;line-height:22px;letter-spacing:-0.01em;}
|
||||||
|
h6{font-size:16px;line-height:18px;}
|
||||||
|
p.p1{font-size:20px;line-height:26px;}
|
||||||
|
p.p2{font-size:16px;line-height:22px;}
|
||||||
|
p.p4{font-size:12px;line-height:14px;}
|
||||||
|
sup{font-size:11px;line-height:11px;}
|
||||||
|
</style> <!-- FONT COLORS -->
|
||||||
|
<style type="text/css">
|
||||||
|
#MainTable table td{color:#191919;}
|
||||||
|
#MainTable table td a{color:inherit;}
|
||||||
|
#MainTable table td p a{text-decoration:underline;}
|
||||||
|
.Red200{color:#EB1700 !important;}
|
||||||
|
</style> <!-- CTAs --> <!-- MOBILE STYLES -->
|
||||||
|
<style type="text/css">
|
||||||
|
@media only screen and (max-width:699px){
|
||||||
|
#MainTable > table {max-width:410px!important;}
|
||||||
|
.full{width:100%!important;height:auto!important;}
|
||||||
|
.pad0{padding-left:0!important;padding-right:0!important;}
|
||||||
|
.pad8{padding-left:8px!important;padding-right:8px!important;}
|
||||||
|
.pad24{padding-left:24px!important;padding-right:24px!important;}
|
||||||
|
.logo{padding-top:40px!important;padding-bottom:40px!important;}
|
||||||
|
h1{font-size:40px!important;line-height:40px!important;letter-spacing:-0.02em!important;}
|
||||||
|
h2{font-size:32px!important;line-height:32px!important;}
|
||||||
|
h3{font-size:24px!important;line-height:24px!important;letter-spacing:-0.01em!important;}
|
||||||
|
}
|
||||||
|
</style> <!-- DARK MODE STYLES -->
|
||||||
|
<style type="text/css">
|
||||||
|
@media (prefers-color-scheme:dark){
|
||||||
|
body,#MainTable,#Footer{background-color:#000000!important;background-image:linear-gradient(#000000,#000000)!important;}
|
||||||
|
table[id^="Basic"]{background-color:#191919!important;background-image:linear-gradient(#191919,#191919)!important;}
|
||||||
|
table[id^="Sky"],table[id^="Blue"]{background-color:#002629!important;background-image:linear-gradient(#002629,#002629)!important;}
|
||||||
|
#MainTable table td{color:#FFFFFF!important;}
|
||||||
|
#MainTable #Footer table td a{color:#FFFFFF!important;}
|
||||||
|
#MainTable .Red200{color:#FF3008!important;}
|
||||||
|
#MainTable .label span{color:#494949!important;background-color:#FEFFFF!important;}
|
||||||
|
#MainTable .grayCopy p{color:#A6A6A6!important;}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<style type="text/css">
|
||||||
|
:root{color-scheme:light dark;supported-color-schemes:light dark;}
|
||||||
|
</style> <!-- GMAIL APP DARK MODE FIX --> <!-- OUTLOOK SPECIFIC CSS --> <!--[if gte mso 9]>
|
||||||
|
<style type="text/css">
|
||||||
|
#MainTable td a{color:#191919;}
|
||||||
|
ol,ul{margin-left:20px !important;}
|
||||||
|
li{text-indent:-1em;}
|
||||||
|
</style>
|
||||||
|
<noscript>
|
||||||
|
<xml>
|
||||||
|
<o:OfficeDocumentSettings>
|
||||||
|
<o:PixelsPerInch>96</o:PixelsPerInch>
|
||||||
|
</o:OfficeDocumentSettings>
|
||||||
|
</xml>
|
||||||
|
</noscript>
|
||||||
|
<![endif]-->
|
||||||
|
</head>
|
||||||
|
<body class="body" style="width:100%;margin:0;padding:0;">
|
||||||
|
<span style="color:transparent;visibility:hidden;display:none;opacity:0;height:0;width:0;font-size:0;"></span>
|
||||||
|
<div role="article" aria-roledescription="email" aria-label="DoorDash Email" lang="en" dir="ltr" style="font-size:medium; font-size:max(16px, 1rem);">
|
||||||
|
<div style="display: none; max-height: 0px; overflow: hidden;">
|
||||||
|
͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏
|
||||||
|
</div>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" id="MainTable" style="background-color:#F4F4F4;">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="full" id="Sky200" role="presentation" style="width:700px;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="pad24" style="padding: 0 64px;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="logo" style="padding: 48px 0;"><a href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiX9NQvXQ9aE-2FeLMhxL9C-2FAEa1Qb_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDdm5muv43mKBZj0FtslvRhwurT1HU7WzBFk0uKPD12dTef2rlCVIu36es-2FxRXYDPOLHXG7qitIbeuwICQOtiAiJyF0XW5mYCg4EenXQa5FiPOrlqnzXCXafNC5mlJGvxOlPnGz4KG6-2FibY4F4HrGTkxRoVpyf9CEBWQB3h4B6-2F1vV34umJj7-2FLlLpcjkRso-2FZrw9zD-2FDCCnEzAJ9b7RCYUIm4jyKucNAH6Fj2kRAnALL6-2FL0QY3vFFztXGwYqrzLSreyQBjHZ9aQwUSam7UJYCAaq48Y50TUgS9EuM1bSw4Twf5p6fp3H4FoRGPMueME-2FSTdpWyR6zn70BPVqAFezHiorOMilHHsOq6nk1-2FqORI-2F0veiu3RW2zrCwnVrabBGigtiGnhurr7p9nOs1AjdyZa-2Fy5Uh8bX3CPB4wzCMXE7O-2FOmAxPQkFoB0-2BgXl8YJlxRNDOaueR-2BgqPA2uYZxr4-2BQtI4L0YynseA3NMscHGJNGN88RJHrH4CqPbPBkbpXelO-2Ftz4qkPn2adhNtmCgMrl4mfF5lxevUpoJQJ7UmMxollJfoLEGLjLhrl7sdZrHH5YHZ8O6My471AKWPRD9-2Fi1Gj5kDczANohQUl0hqEmYQa58AnEUM4SbTghHAzOx2-2FdIewmuvSy5w0lyALMIuqj5OPNSb0LQsZWNIEFVG8SDXp" target="_blank" universal="true"><img alt="DoorDash" border="0" src="https://assets.doordash.team/m/5e68fa5cbbc50c32/original/DoorDash-Logo-Red100.png" style="color: #FF3008;font-family:'TTNorms',system-ui,sans-serif;font-weight:bold;font-size:18px;text-decoration:none;" width="50"></a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="pad0" style="padding:0 64px 0 0;"><h1 style="margin:0 0 16px 0;">Final receipt.</h1></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="right" style="padding: 0 0 40px 0;"><img alt="" src="https://img.cdn4dd.com/s/convenience/images/adjustments_eml_grocery.png" width="380" style="width:100%;max-width:380px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="pad8" style="padding: 0 40px 40px;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" id="Basic000" role="presentation" style="width:100%;border-radius:25px;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="pad24" style="padding:40px 40px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 32px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 24px 0;"><!--
|
||||||
|
|
||||||
|
--> <p class="p2" style="margin:0 0 4px 0;">Paid with MasterCard Ending in 8032 and/or credits</p> <p class="p2" style="margin:0 0 4px 0;">Woolworths</p> <p class="p2" style="margin:0 0 4px 0;"></p> <p class="p2"><strong>Total: $60.93</strong></p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 24px 0;border-bottom:1px solid #C4C4C4;"><h4>Your receipt</h4> <!----> <p class="p2" style="margin:0 0 4px 0;"></p> <!----> <p class="p2"><a href="" style="color:#191919;text-decoration:none;">19 Lady Penrhyn Dr, Wyndham Vale VIC 3024, Australia</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!---->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 32px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><h4>Items you ordered</h4></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 16px 0;border-bottom:1px solid #C4C4C4;"><!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Woolworths Corned Beef Silverside (each)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $15.54 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" align="left" class="grayCopy"><p class="para-md" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 14px; line-height: 18px; margin: 0 0 4px 0;color: #767676;">$11.50/kg • Purchased 1.351 kg</p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>2x</strong> Jalapeno Chilli (1 ea)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $2.30 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>2x</strong> Coca-Cola Zero Sugar Soft Drink Bottle (2 L)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $9.00 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Kewpie Sriracha Mayonnaise (300 g)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $6.11 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Woolworths Angus Quarter Pound Beef Burgers (454 g × 4 pk)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $9.00 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Green Capsicum (1 ea)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $1.40 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Brioche Gourmet Sesame Brioche Burger Buns (4 pk)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $7.30 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>2x</strong> Hass Avocado</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $4.10 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Helga's Light Rye Bread (680 g)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $5.95 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Red Capsicum (1 ea)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $1.40 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: 1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Garlic Head</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $2.15 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----> <!-- -->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 16px 0 0 0; border-bottom: none;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!-- --> <!-- -->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 0 0 12px 0;"><!-- --> <!-- --> <!-- -->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" class=""><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; margin: 0 0 4px 0;color:inherit;"><strong>1x</strong> Lee Kum Kee Premium Dark Soy Sauce (250 ml)</p></td>
|
||||||
|
<td align="right" valign="top" style="padding: 0 0 0 24px;"><p class="para-rg" style="font-family: 'TTNorms',system-ui,sans-serif; font-weight: 500; font-size: 16px; line-height: 20px; text-decoration: none; margin: 0 0 4px 0;color:inherit;white-space:nowrap;"> $3.65 </p></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --> <!-- -->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!---->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 32px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 24px 0;border-bottom:1px solid #C4C4C4;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Subtotal</p></td>
|
||||||
|
<td align="right" valign="bottom"><p class="p2">$67.90</p></td>
|
||||||
|
</tr> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Bag Fee</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$0.50</p></td>
|
||||||
|
</tr> <!----> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Tax</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$0.00</p></td>
|
||||||
|
</tr> <!----> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Delivery fee</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$0.00</p></td>
|
||||||
|
</tr> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Service fee</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$6.11</p></td>
|
||||||
|
</tr> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Dasher tip</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">$0.00</p></td>
|
||||||
|
</tr> <!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p2">Discount</p></td>
|
||||||
|
<td align="right" valign="top"><p class="p2">-$13.58</p></td>
|
||||||
|
</tr> <!----> <!----> <!----> <!---->
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><p class="p1" style="font-weight:700;">Final total charged</p></td>
|
||||||
|
<td align="right" valign="bottom"><p class="p1" style="font-weight:700;">$60.93</p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:16px 0 24px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><!----> <!----> <!----> <p class="p4" style="margin:0 0 16px;font-weight:400;">This email confirms revisions made to your original DoorDash order and reflects the final amount charged. The new total cost of your order is above and includes all taxes and fees. Payment processing adjustments to the original charge may take up to 5-7 business days to process.</p> <!----> <p class="p2" style="margin:0 0 16px;"><a class="Red200" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiXhYhQ4ra2libvRVipt1sfv4E-2FKwlbgukGbMndo1ZsJhMUiuAxeGb86p06pmk6V-2FQsCkNG42P38jfRm6zgoux4YpHAP_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDdm5muv43mKBZj0FtslvRhwurT1HU7WzBFk0uKPD12dTef2rlCVIu36es-2FxRXYDPOLHXG7qitIbeuwICQOtiAiJyF0XW5mYCg4EenXQa5FiPOrlqnzXCXafNC5mlJGvxOlPnGz4KG6-2FibY4F4HrGTkxRoVpyf9CEBWQB3h4B6-2F1vV34umJj7-2FLlLpcjkRso-2FZrw9zD-2FDCCnEzAJ9b7RCYUIm4jyKucNAH6Fj2kRAnALL6-2FL0QY3vFFztXGwYqrzLSreyQBjHZ9aQwUSam7UJYCAaq48Y50TUgS9EuM1bSw4Twf5p6fp3H4FoRGPMueME-2FSTdpWyR6zn70BPVqAFezHiorOMilHHsOq6nk1-2FqORI-2F0veiu3RW2zrCwnVrabBGigtiGnhurr7p9nOs1AjdyZa-2Fy5Uh8bX3CPB4wzCMXE7O-2FOmAxPQkFoB0-2BgXl8YJlxRNDOaueR-2BgqPA2uYZxr4-2BQtI4L0YynseA3NMscHGJNGN88RJHrH4CqPbPBkbpXelO-2Ftz4qkPn2adhNtmCgMrl40rFinK7NkUBQ-2Fl8tQtwvq8JTmf6gxu6dY07cNv4deM6rPu-2BQ-2FvHH4q00LtMFjDuuQ3oUFkbnbQHKhXkIUv3eSN4o7Kl6vrZHuHXulUntzFpaf0-2BlkucXK2YwHzC7HliOAyEF6-2FBa1FHUj7-2B2nt5St" target="_blank" style="font-weight:700;text-decoration:none;" universal="true">Get Order Help</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="full" id="Footer" role="presentation" style="width:700px;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center" style="padding:0 0 24px 0;"><!--[if (gte mso 9)|(IE)]>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:620px;">
|
||||||
|
<tr>
|
||||||
|
<td align="center">
|
||||||
|
<![endif]-->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" id="Footer" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 700px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="padding: 0 24px;">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width:100%;max-width:572px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 48px 0;border-bottom: 1px solid #E7E7E7;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 32px 0 16px 0;"><p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;">©2026 <a style="color: #9A9A9A; text-decoration: none;">DoorDash Technologies Australia Pty Ltd <br>401 Collins St. <br>Melbourne, VIC 3000 Australia</a></p> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYAqF1KGCKTTTznL6MvOfulOsmFa2kqsuG7LjgY0AllZKBKWegcAPOx5sr25l15pnWbLZL6VnVCDFc3hEnP4sDnr_qFX_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDdm5muv43mKBZj0FtslvRhwurT1HU7WzBFk0uKPD12dTef2rlCVIu36es-2FxRXYDPOLHXG7qitIbeuwICQOtiAiJyF0XW5mYCg4EenXQa5FiPOrlqnzXCXafNC5mlJGvxOlPnGz4KG6-2FibY4F4HrGTkxRoVpyf9CEBWQB3h4B6-2F1vV34umJj7-2FLlLpcjkRso-2FZrw9zD-2FDCCnEzAJ9b7RCYUIm4jyKucNAH6Fj2kRAnALL6-2FL0QY3vFFztXGwYqrzLSreyQBjHZ9aQwUSam7UJYCAaq48Y50TUgS9EuM1bSw4Twf5p6fp3H4FoRGPMueME-2FSTdpWyR6zn70BPVqAFezHiorOMilHHsOq6nk1-2FqORI-2F0veiu3RW2zrCwnVrabBGigtiGnhurr7p9nOs1AjdyZa-2Fy5Uh8bX3CPB4wzCMXE7O-2FOmAxPQkFoB0-2BgXl8YJlxRNDOaueR-2BgqPA2uYZxr4-2BQtI4L0YynseA3NMscHGJNGN88RJHrH4CqPbPBkbpXelO-2Ftz4qkPn2adhNtmCgMrl47hiO5jAJKuIZrUFfimDnpntNrXHRtriBc5B6j34phPs9t-2FTsNtprBO5gereYjazskrJGz4kTq383Phk6ev5l-2FwkKCZAvVCUn589YJbi-2FoyqrxbStev5iE7PJ2Us6bPgQpdvcUQSEkpYDzIyI-2Blcws" target="_blank" style="color: #9A9A9A; text-decoration: none;">Privacy Policy</a></p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 0 0 24px 0;"><p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:500;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYABnncKv1afIihr5Gt6bkMjesVR_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDdm5muv43mKBZj0FtslvRhwurT1HU7WzBFk0uKPD12dTef2rlCVIu36es-2FxRXYDPOLHXG7qitIbeuwICQOtiAiJyF0XW5mYCg4EenXQa5FiPOrlqnzXCXafNC5mlJGvxOlPnGz4KG6-2FibY4F4HrGTkxRoVpyf9CEBWQB3h4B6-2F1vV34umJj7-2FLlLpcjkRso-2FZrw9zD-2FDCCnEzAJ9b7RCYUIm4jyKucNAH6Fj2kRAnALL6-2FL0QY3vFFztXGwYqrzLSreyQBjHZ9aQwUSam7UJYCAaq48Y50TUgS9EuM1bSw4Twf5p6fp3H4FoRGPMueME-2FSTdpWyR6zn70BPVqAFezHiorOMilHHsOq6nk1-2FqORI-2F0veiu3RW2zrCwnVrabBGigtiGnhurr7p9nOs1AjdyZa-2Fy5Uh8bX3CPB4wzCMXE7O-2FOmAxPQkFoB0-2BgXl8YJlxRNDOaueR-2BgqPA2uYZxr4-2BQtI4L0YynseA3NMscHGJNGN88RJHrH4CqPbPBkbpXelO-2Ftz4qkPn2adhNtmCgMrl4Xvmy9Ho7hVCvflBaTaT7GIPK-2Bx-2FVY0eWPUYOIl9ze-2FigbiVg7zeZtEGGvUnrFsPyYMZvNqAmnc5awn0lwnuo6T2MwPVn7itLe2lk679GxtX4NcwYfkPFJXWYwEqreqmpCX0cU2u5EQKvkeFL5tyNJ" target="_blank" style="color:#9A9A9A;text-decoration:none;">Help Center</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!--[if (gte mso 9)|(IE)]>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<![endif]--></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<img src="https://tracksg.doordash.com/wf/open?upn=u001.EBL2ug8kstebd25Xirrl3olMckTI261ldPjJ39bNHcC7U6EKGAOA4dSVB97lcv3b8qsQRq6LwkHED6F3X4gqaFe59-2BHz9QfrDL7jp-2BN3jX4WgiXvlTBIakpalIO3Jdse0BvY-2BpzLRd3B7D76PRNnOdtT8H1IzuhLRJrs8Ejc-2BQ4LU1ObPOGMj6kj4yuf9wvF-2BNU8yHnNyO0aMIUyf7Vw-2FvxkWQyIhy6jsNc64aO9QhWMEzgvfqcwerkGC0infSMLleveIQg1DJBFCa1l1sbtqm8v4JdVcD3tIswbkSwUBel2KQ6xwvitDjmSW4JqAVQjU2bnGfsVtQIUlNm-2FVkiKuTOkUSpSv-2BlmuRSRwJBxspIW-2FHL-2Fizzna0UNWeoxCQEouEyMXVglI9wvbdjxbE2fJhnbSO5BQgiIaJi6Z1Agc9UNZnRJQfmuKx-2BvkOjjEvTyMkvt-2F1GvutzvpeXgVGLKtJPwmIIEYfS4bk0NKmMQHCG0VBFaOwtyWNr32tHHB6clMeOlpiIJ9B-2FV6NK2NOKOn7nF2XPwImzV33xN-2B0bIZZeeDZf0piG4s3LMX9IoAqChWag-2BAHkcHaYx0ULMfGzIdlJCvGzkUFqfvXEkO7EloGLJ7Ir77VX8C-2BK1PF-2Bev7l0-2F1IBaXJUUw185DM9Yga0FDlihJgZGc0DBp8ml0RmuDjeqZPfpMHZgCXSm-2BXpoAOZg8Jjnj0I8Xr3SrabOHhH5IyYeOz-2FFmDwDDEXGh7pvKTOmsNosAQAHnmTCzcE1ABT" alt="" width="1" height="1" border="0" style="height:1px !important;width:1px !important;border-width:0 !important;margin-top:0 !important;margin-bottom:0 !important;margin-right:0 !important;margin-left:0 !important;padding-top:0 !important;padding-bottom:0 !important;padding-right:0 !important;padding-left:0 !important;"/></body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,554 @@
|
|||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml">
|
||||||
|
<head><!--[if gte mso 9]><xml>
|
||||||
|
<o:OfficeDocumentSettings>
|
||||||
|
<o:AllowPNG/>
|
||||||
|
<o:PixelsPerInch>96</o:PixelsPerInch>
|
||||||
|
</o:OfficeDocumentSettings>
|
||||||
|
</xml><![endif]-->
|
||||||
|
<title>DoorDash</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0 ">
|
||||||
|
<meta name="format-detection" content="telephone=no">
|
||||||
|
<style type="text/css">body {
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 0;
|
||||||
|
-webkit-text-size-adjust: 100%!important;
|
||||||
|
-ms-text-size-adjust: 100%!important;
|
||||||
|
-webkit-font-smoothing: antialiased!important;
|
||||||
|
}
|
||||||
|
img {
|
||||||
|
border: 0!important;
|
||||||
|
outline: none!important;
|
||||||
|
}
|
||||||
|
p {
|
||||||
|
Margin: 0px!important;
|
||||||
|
Padding: 0px!important;
|
||||||
|
}
|
||||||
|
table {
|
||||||
|
border-collapse: collapse;
|
||||||
|
mso-table-lspace: 0px;
|
||||||
|
mso-table-rspace: 0px;
|
||||||
|
}
|
||||||
|
td, a, span {
|
||||||
|
border-collapse: collapse;
|
||||||
|
mso-line-height-rule: exactly;
|
||||||
|
}
|
||||||
|
.ExternalClass * {
|
||||||
|
line-height: 100%;
|
||||||
|
}
|
||||||
|
.em_defaultlink a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
a[x-apple-data-detectors], u+.em_body a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: inherit;
|
||||||
|
font-family: inherit;
|
||||||
|
font-weight: inherit;
|
||||||
|
line-height: inherit;
|
||||||
|
}
|
||||||
|
@media only screen and (max-width:667px) {
|
||||||
|
.em_main_table {
|
||||||
|
width: 100%!important;
|
||||||
|
}
|
||||||
|
.em_wrapper {
|
||||||
|
width: 100%!important;
|
||||||
|
}
|
||||||
|
.em_hide {
|
||||||
|
display: none!important;
|
||||||
|
}
|
||||||
|
.em_hauto {
|
||||||
|
height: auto !important;
|
||||||
|
}
|
||||||
|
.em_full_img img {
|
||||||
|
width: 100%!important;
|
||||||
|
height: auto!important;
|
||||||
|
}
|
||||||
|
.em_pad1 {
|
||||||
|
padding-right: 10px!important;
|
||||||
|
}
|
||||||
|
.em_hauto {
|
||||||
|
height: auto!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_h20 {
|
||||||
|
height: 40px!important;
|
||||||
|
font-size: 1px!important;
|
||||||
|
line-height: 1px!important;
|
||||||
|
}
|
||||||
|
.em_h10 {
|
||||||
|
height: 10px!important;
|
||||||
|
font-size: 1px!important;
|
||||||
|
line-height: 1px!important;
|
||||||
|
}
|
||||||
|
.em_h30 {
|
||||||
|
height: 30px!important;
|
||||||
|
}
|
||||||
|
u+.em_body .em_full_wrap {
|
||||||
|
width: 100%!important;
|
||||||
|
width: 100vw!important;
|
||||||
|
}
|
||||||
|
.em_side30 {
|
||||||
|
width: 26px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 190px !important;
|
||||||
|
height: 40px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 17px !important;
|
||||||
|
line-height: 40px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 140px !important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 40px!important;
|
||||||
|
line-height: 44px!important;
|
||||||
|
}
|
||||||
|
.em_pad1 {
|
||||||
|
padding: 0px 15px !important;
|
||||||
|
}
|
||||||
|
.en_icon {
|
||||||
|
width: 30px !important;
|
||||||
|
padding-bottom:10px !important;
|
||||||
|
}
|
||||||
|
.em_rounded {
|
||||||
|
border-top-left-radius: 25px !important;
|
||||||
|
border-top-right-radius: 25px !important;
|
||||||
|
}
|
||||||
|
.em_bold {
|
||||||
|
letter-spacing: -1px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (max-width:480px) {
|
||||||
|
.em_side30 {
|
||||||
|
width: 26px!important;
|
||||||
|
}
|
||||||
|
.ft_16 {
|
||||||
|
font-size: 14px!important;
|
||||||
|
line-height: 18px!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 35px!important;
|
||||||
|
line-height: 42px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 165px !important;
|
||||||
|
height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 15px !important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 105px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (max-width:374px) {
|
||||||
|
.ft_16 {
|
||||||
|
font-size: 12px!important;
|
||||||
|
line-height: 16px!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_side30 {
|
||||||
|
width: 20px!important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 30px!important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 160px !important;
|
||||||
|
height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 15px !important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 95px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen {
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Regular';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Regular.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Regular.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Medium';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Medium.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Medium.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Bold';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Bold.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Bold.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-ExtraBold';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-ExtraBold.woff') format('woff'), url('https://typography.doordash.com/TTNorms-ExtraBold.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body bgcolor="#ffffff" class="em_body" data-gr-c-s-loaded="true" style="margin:0px auto; padding:0px;">
|
||||||
|
<span style="color:transparent;visibility:hidden;display:none;opacity:0;height:0;width:0;font-size:0;"></span> <!-- == Body Section == -->
|
||||||
|
<table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="em_full_wrap" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="em_main_table" style="width:700px;" width="700">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top"><!---->
|
||||||
|
<table align="center" bgcolor="#ededed" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h30" height="62" style="height:62px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr> <!-- banner Section -->
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" bgcolor="#ededed" class="em_hauto" valign="top"><!---->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side30" style="width:60px;" width="60"></td>
|
||||||
|
<td align="center" class="em_hauto" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top"><a style="text-decoration:none;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiX9NQvXQ9aE-2FeLMhxL9C-2FAEYEgU_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniCObtF-2F77Rftwzxtvch3D6ixsFu8SYfu5xBceQTH8-2FBodTZxiewjgPzbEdFl3FPmC8yd8up2svP69bkXzPP1EgX9eD-2FyUn-2FEnfP2x2wq7ZOBUoARCeqqlFkP6W7Y5dGla8nNiQlX7AucOtqmpWXoN748jOggntsFT6RKIRx0tqjjl8YZ9wNtw1lwTOb8kFmOgsOcVVtLje8EbuOzP3zqIlcuQWgqqYb-2BV3lOeDIxWBtKbxqWC5a-2FCRgVj5lY1Bv7imoZhcA0AGsBJcII2E70CeIU8WfbTYM4M37ZPgsh2cLUb3V4Aejx-2FWVUWAWH2KDEs5dv-2B4PKgCJ8Acse3h-2BQekWDD3i77HE0-2BDrWvpiQ0PqKJUExxn5P-2FL0klhkr7BaNj8Rk-2F1Chu5ZAE5-2BwUiki7JUuLsWW9OOERb4e0qR3cSg4LijaO28HYiLjXFPAYOjdZeQOd-2FBnPtUPMDVpU9gYUKfSgsagIJguyAqpdjLfY6G8VVr86jIoxtluUxhWGTXIjaVcoCCZMHwuVy8TqEvwJR2SqSwWKk68wYn83-2BGVzp0Q96Il8ghSJk4VqSWMBaTqTd0KosKTV3a2OQBYPn6Cz3rrGJtTstNW0ohwZ27PImy8rSHU9BerWxzrGv35FfsQbw-3D" universal="true"><img alt="DOORDASH" border="0" class="en_icon" style="display:block; max-width:45px;font-family:Arial, sans-serif;font-size:20px; line-height:30px; color:#ee3623; font-weight:bold;" width="45" src="https://assets.doordash.team/m/835d1d775f776ef/original/-04_April-MX_Winback_Campaign-logo_img.png"> </a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="50" style="height:50px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink em_font_58 em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:51px; line-height:60px; font-weight: bold;" valign="top"><!---->Thanks for your<br> order, Siddharth<!----></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h10" height="20" style="height:20px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#000000;font-size:16px; line-height:20px;" valign="top"><!---->The estimated delivery time for your order<br class="em_hide"> is <strong>12:56 pm - 1:06 pm</strong>. Track your order in<br class="em_hide"> the DoorDash app or website.<!----></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h10" height="20" style="height:20px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" class="em_cta" style="width:220px; max-width:220px;" width="220">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" class="em_defaultlink em_cta em_bold" height="45" style="font-family:'TTNorms-Bold', Arial, sans-serif;color:#ffffff;font-size:18px; background-color:#eb1700; border-radius:25px; font-weight: bold; " valign="middle"><a style="text-decoration:none; display:block; color:#ffffff; line-height:45px;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiVnjyPy8cqQ7jo-2BNF2Wc6ScBomnSDcwnk7ZiV0pRP-2F7pg2J7U-2BGioomJQf-2FXVlW43g-3Dvyw__gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniCObtF-2F77Rftwzxtvch3D6ixsFu8SYfu5xBceQTH8-2FBodTZxiewjgPzbEdFl3FPmC8yd8up2svP69bkXzPP1EgX9eD-2FyUn-2FEnfP2x2wq7ZOBUoARCeqqlFkP6W7Y5dGla8nNiQlX7AucOtqmpWXoN748jOggntsFT6RKIRx0tqjjl8YZ9wNtw1lwTOb8kFmOgsOcVVtLje8EbuOzP3zqIlcuQWgqqYb-2BV3lOeDIxWBtKbxqWC5a-2FCRgVj5lY1Bv7imoZhcA0AGsBJcII2E70CeIU8WfbTYM4M37ZPgsh2cLUb3V4Aejx-2FWVUWAWH2KDEs5dv-2B4PKgCJ8Acse3h-2BQekWDD3i77HE0-2BDrWvpiQ0PqKJUExxn5P-2FL0klhkr7BaNj8Rk-2F1Chu5ZAE5-2BwUiki7JUuLsWW9OOERb4e0qR3cSg4LijaO28HYiLjXFPAYOjdZeQOd-2FBnPtUPMDVpU9gYUKfSgsagIJguyAqpdjLfY6G8c11Xrs5mrwxYvXOjM-2B31YOhRV-2FVn8biClWfjAQE-2FFKhuO4Omylt1Br9cDjiGoEk5b7gncfkgZItoZ0uVSEVcQFQl4dKCCcWTsNznKpdwNr7hzrx4kK9eLK5xE8TC9mvmLuZcj8FiuGDz2TIKo2aVMk-3D" universal="true">Track Your Order</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" style="width:20px;" width="20"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!----><!----><!--Illustration 2-->
|
||||||
|
<tr>
|
||||||
|
<td align="center" class="em_full_img" valign="top"><a style="text-decoration:none;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiX9NQvXQ9aE-2FeLMhxL9C-2FAEvLxo_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniCObtF-2F77Rftwzxtvch3D6ixsFu8SYfu5xBceQTH8-2FBodTZxiewjgPzbEdFl3FPmC8yd8up2svP69bkXzPP1EgX9eD-2FyUn-2FEnfP2x2wq7ZOBUoARCeqqlFkP6W7Y5dGla8nNiQlX7AucOtqmpWXoN748jOggntsFT6RKIRx0tqjjl8YZ9wNtw1lwTOb8kFmOgsOcVVtLje8EbuOzP3zqIlcuQWgqqYb-2BV3lOeDIxWBtKbxqWC5a-2FCRgVj5lY1Bv7imoZhcA0AGsBJcII2E70CeIU8WfbTYM4M37ZPgsh2cLUb3V4Aejx-2FWVUWAWH2KDEs5dv-2B4PKgCJ8Acse3h-2BQekWDD3i77HE0-2BDrWvpiQ0PqKJUExxn5P-2FL0klhkr7BaNj8Rk-2F1Chu5ZAE5-2BwUiki7JUuLsWW9OOERb4e0qR3cSg4LijaO28HYiLjXFPAYOjdZeQOd-2FBnPtUPMDVpU9gYUKfSgsagIJguyAqpdjLfY6G8WRCD-2FqRcT3qYaTZhzIDIiyJa5PtObUnCjY4SczlOveif0uLWX8gst2iXvDBVuJze7WmSiLEzmN-2Bdnt8ToATmeJperQEu3d9WnvS8-2BknB4MEeK-2BwIQhdsw6X9lhJzohufq-2BYaSEg2vrnOSJed7mMlcQ-3D" universal="true"><img alt="" border="0" class="em_full_img" style="display:block; max-width:700px; font-family:Arial, sans-serif; font-size:22px; line-height:25px; color:#ffffff; font-weight:bold;" width="700" src="https://assets.doordash.team/m/188a590491f6c3c9/original/-template-OrderConfirmation-dancingfood.png"></a></td>
|
||||||
|
</tr> <!--//Illustration 2--><!----><!----><!-- //banner Section -->
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="width:6%;" width="6%"></td>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" class="em_rounded" style="border-top-left-radius: 40px; border-top-right-radius: 40px; background-color: #ffffff;" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="50" style="height:50px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px;" valign="top">Paid with MasterCard Ending in 8032<br> Subway</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px; font-weight:bold; color:#000000;" valign="top">Total: $29.08</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="35" style="height:35px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:26px; line-height:36px; font-weight: bold;" valign="top">Your receipt</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:21px;" valign="top">19 Lady Penrhyn Dr, Wyndham Vale VIC 3024, Australia</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="45" style="height:45px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px;" valign="top"><font size="2" color="#666666"><b>- For: Siddharth Bose -</b></font><br><br>
|
||||||
|
<table width="100%" style="margin: auto; margin-bottom: 20px">
|
||||||
|
<tbody>
|
||||||
|
<tr style="text-align: left;">
|
||||||
|
<td valign="top" width="10%" style="color: #666666; font-size: 18px; line-height: 24px">1x</td>
|
||||||
|
<td valign="top" width="75%" style="color: #666666; font-size: 18px; line-height: 24px"><b>Italian B.M.T.®</b> (All Subs)<br><font color="dimgrey">• Subway Footlong ®</font><br><font color="dimgrey">• Italian Herb & Cheese Bread</font><br><font color="dimgrey">• Toasted</font><br><font color="dimgrey">• Old English Style Cheese</font><br><font color="dimgrey">• Double Cheese</font><br><font color="dimgrey">• Spinach</font><br><font color="dimgrey">• Tomato</font><br><font color="dimgrey">• Cucumber</font><br><font color="dimgrey">• Capsicum</font><br><font color="dimgrey">• Onions</font><br><font color="dimgrey">• Jalapenos</font><br><font color="dimgrey">• Carrots</font><br><font color="dimgrey">• Honey Mustard Sauce</font><br><font color="dimgrey">• Sweet Onion Dressing</font><br><font color="dimgrey">• Pepper</font><br><font color="dimgrey">• Sea Salt</font><br><br></td>
|
||||||
|
<td valign="top" width="15%" style="color: #666666; font-size: 18px; line-height: 24px text-align: right">$19.85</td>
|
||||||
|
</tr>
|
||||||
|
<tr style="text-align: left;">
|
||||||
|
<td valign="top" width="10%" style="color: #666666; font-size: 18px; line-height: 24px">1x</td>
|
||||||
|
<td valign="top" width="75%" style="color: #666666; font-size: 18px; line-height: 24px"><b>Italian Meatball</b> (All Subs)<br><font color="dimgrey">• Subway 6-Inch ®</font><br><font color="dimgrey">• Italian Herb & Cheese Bread</font><br><font color="dimgrey">• Toasted</font><br><font color="dimgrey">• Mozzarella</font><br><font color="dimgrey">• Double Meat (Selected Meat only)</font><br><font color="dimgrey">• Double Cheese</font><br><font color="dimgrey">• Cucumber</font><br><font color="dimgrey">• Pickles</font><br><font color="dimgrey">• Capsicum</font><br><font color="dimgrey">• Onions</font><br><font color="dimgrey">• Ranch Dressing</font><br><font color="dimgrey">• Garlic Aioli</font><br><font color="dimgrey">• Pepper</font><br><font color="dimgrey">• Sea Salt</font><br><br></td>
|
||||||
|
<td valign="top" width="15%" style="color: #666666; font-size: 18px; line-height: 24px text-align: right">$16.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="22" style="height:22px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" bgcolor="#ffffff" class="em_pad1" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="em_wrapper" style="width:530px;" width="530">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor="#e5e5e5" height="2" style="line-height:0px; font-size:0px; height: 2px;"><img alt="" border="0" height="1" style="display:block;" width="1" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="background-color: #ffffff;" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="10" style="height:10px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Subtotal</td> <!---->
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$35.85</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Taxes</td> <!---->
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!----><!---->
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Delivery Fee</td>
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Service Fee</td>
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$3.23</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Tip</td>
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!---->
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">Discounts</td>
|
||||||
|
<td align="right" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;" valign="top">-$26.02</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!---->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="18" style="height:18px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" bgcolor="#ffffff" class="em_pad1" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" class="em_wrapper" style="width:530px;" width="530">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor="#e5e5e5" height="2" style="line-height:0px; font-size:0px; height: 2px;"><img alt="" border="0" height="1" style="display:block;" width="1" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="background-color: #ffffff;" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="12" style="height:12px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td align="left" class="em_defaultlink em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:17px; line-height:24px; font-weight: bold;" valign="top">Total Charged</td> <!---->
|
||||||
|
<td align="right" class="em_defaultlink em_bold" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:17px; line-height:24px; font-weight: bold;" valign="top">$29.08</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!----><!----><!----><!----><!----><!----><!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="15" style="height:15px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" class="em_defaultlink" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#ff2f07;font-size:14px; line-height:21px; font-weight: bold;" valign="top"><a style="color:#ff2f07; text-decoration:none;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiVnjyPy8cqQ7jo-2BNF2Wc6ScBomnSDcwnk7ZiV0pRP-2F7pg2J7U-2BGioomJQf-2FXVlW43g-3D6wBj_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniCObtF-2F77Rftwzxtvch3D6ixsFu8SYfu5xBceQTH8-2FBodTZxiewjgPzbEdFl3FPmC8yd8up2svP69bkXzPP1EgX9eD-2FyUn-2FEnfP2x2wq7ZOBUoARCeqqlFkP6W7Y5dGla8nNiQlX7AucOtqmpWXoN748jOggntsFT6RKIRx0tqjjl8YZ9wNtw1lwTOb8kFmOgsOcVVtLje8EbuOzP3zqIlcuQWgqqYb-2BV3lOeDIxWBtKbxqWC5a-2FCRgVj5lY1Bv7imoZhcA0AGsBJcII2E70CeIU8WfbTYM4M37ZPgsh2cLUb3V4Aejx-2FWVUWAWH2KDEs5dv-2B4PKgCJ8Acse3h-2BQekWDD3i77HE0-2BDrWvpiQ0PqKJUExxn5P-2FL0klhkr7BaNj8Rk-2F1Chu5ZAE5-2BwUiki7JUuLsWW9OOERb4e0qR3cSg4LijaO28HYiLjXFPAYOjdZeQOd-2FBnPtUPMDVpU9gYUKfSgsagIJguyAqpdjLfY6G8bOKlnu7vSFB-2BIQ-2FSa0IlYx-2F9RNR0nsTokQzCNSqlpkomb9IWoemjq9we5J1OThMwqfb3jx6ATLRRe0hZPiX7urz31ND8Ku6OkcqBpF9xCGYZ-2B8b-2FruvvcHPSbTGjapxW5zZugpMbHsegIXXCMVBkNg-3D" universal="true">Get Order Help</a></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="58" style="height:58px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!-- == //Body Section == --><!-- == Footer Section == --><!-- == //Footer Section == --></td>
|
||||||
|
<td class="em_side15" style="width: 40px;" width="40"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td style="width:6%;" width="6%"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top"><!--[if (gte mso 9)|(IE)]>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:620px;">
|
||||||
|
<tr>
|
||||||
|
<td align="center">
|
||||||
|
<![endif]-->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" id="Footer" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 700px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="padding: 0 24px;">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width:100%;max-width:572px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 48px 0;border-bottom: 1px solid #E7E7E7;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 32px 0 16px 0;"><p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;">©2026 <a style="color: #9A9A9A; text-decoration: none;">DoorDash Technologies Australia Pty Ltd <br>401 Collins St. <br>Melbourne, VIC 3000 Australia</a></p> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYAqF1KGCKTTTznL6MvOfulOsmFa2kqsuG7LjgY0AllZKBKWegcAPOx5sr25l15pnWbLZL6VnVCDFc3hEnP4sDnrBpZV_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniCObtF-2F77Rftwzxtvch3D6ixsFu8SYfu5xBceQTH8-2FBodTZxiewjgPzbEdFl3FPmC8yd8up2svP69bkXzPP1EgX9eD-2FyUn-2FEnfP2x2wq7ZOBUoARCeqqlFkP6W7Y5dGla8nNiQlX7AucOtqmpWXoN748jOggntsFT6RKIRx0tqjjl8YZ9wNtw1lwTOb8kFmOgsOcVVtLje8EbuOzP3zqIlcuQWgqqYb-2BV3lOeDIxWBtKbxqWC5a-2FCRgVj5lY1Bv7imoZhcA0AGsBJcII2E70CeIU8WfbTYM4M37ZPgsh2cLUb3V4Aejx-2FWVUWAWH2KDEs5dv-2B4PKgCJ8Acse3h-2BQekWDD3i77HE0-2BDrWvpiQ0PqKJUExxn5P-2FL0klhkr7BaNj8Rk-2F1Chu5ZAE5-2BwUiki7JUuLsWW9OOERb4e0qR3cSg4LijaO28HYiLjXFPAYOjdZeQOd-2FBnPtUPMDVpU9gYUKfSgsagIJguyAqpdjLfY6G8Q8l21R-2BUnujFyqLh7dgRALyW1uXR-2FN8S0g00dvJLLfcmlzcQZxW44cVyDjeLcQdT7oXKMmfaQcqjpUqJASXPTpcyojzmAR7AJNx0XL1wVst-2FulVzDY1gZlfxA5V-2BU-2F-2B4tKqztf0gKzb-2BVk9xtu1bac-3D" target="_blank" style="color: #9A9A9A; text-decoration: none;">Privacy Policy</a></p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 0 0 24px 0;"><p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:500;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYABnncKv1afIihr5Gt6bkMjMbSD_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRygzsqDKLqVcMuBPdkhwo7LHk9TXfSbi-2B0mW4NvsDLo9Q6gWLaNP3J-2Fyzkvnw5dniCObtF-2F77Rftwzxtvch3D6ixsFu8SYfu5xBceQTH8-2FBodTZxiewjgPzbEdFl3FPmC8yd8up2svP69bkXzPP1EgX9eD-2FyUn-2FEnfP2x2wq7ZOBUoARCeqqlFkP6W7Y5dGla8nNiQlX7AucOtqmpWXoN748jOggntsFT6RKIRx0tqjjl8YZ9wNtw1lwTOb8kFmOgsOcVVtLje8EbuOzP3zqIlcuQWgqqYb-2BV3lOeDIxWBtKbxqWC5a-2FCRgVj5lY1Bv7imoZhcA0AGsBJcII2E70CeIU8WfbTYM4M37ZPgsh2cLUb3V4Aejx-2FWVUWAWH2KDEs5dv-2B4PKgCJ8Acse3h-2BQekWDD3i77HE0-2BDrWvpiQ0PqKJUExxn5P-2FL0klhkr7BaNj8Rk-2F1Chu5ZAE5-2BwUiki7JUuLsWW9OOERb4e0qR3cSg4LijaO28HYiLjXFPAYOjdZeQOd-2FBnPtUPMDVpU9gYUKfSgsagIJguyAqpdjLfY6G8aanhk3H7M0AmyPIeD-2FSytmK5nE5elBgAZcjX3JsIKz28vuZG4HM2bl-2FxI9FZWifPR-2FNBQ-2FOmTQqLo0YK3jcUZRxpOUh8EYeWnkDHAf9CUnJYhfBCXrPHy8-2BIouWsFADv6rViHCrwIlJq7PKIdjhsQU-3D" target="_blank" style="color:#9A9A9A;text-decoration:none;">Help Center</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!--[if (gte mso 9)|(IE)]>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<![endif]--></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_hide" style="line-height:1px;min-width:700px;background-color:#f4f4f4;"><img alt="" border="0" height="1" style="max-height:1px; min-height:1px; display:block; width:700px; min-width:700px;" width="700" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<img src="https://tracksg.doordash.com/wf/open?upn=u001.EBL2ug8kstebd25Xirrl3olMckTI261ldPjJ39bNHcC7U6EKGAOA4dSVB97lcv3b8qsQRq6LwkHED6F3X4gqaODB2b1wZFk4or4JbrThItr6lxxhe0ghxdjbmj40V9NR2q6sVlDPfArvtaJbtCejz-2BJxmNDpj6cBZjf16jHN3-2B0iC1V4tFBTMLc-2BJwfmofzVTZ93Zr38yBFeE9QeTx2HIPl8aahBdGSAhck5E0FopTVrs3ftPac-2BjBZQ-2F-2BOtO9AAatRdgybtYfdgGvULGP9PgScKi7bqhiEsMHtYK5BiFCtgHDd3wSmmSQEmLY5CxOdBaxC6hncHaAEfQICV5PV5RYoWJUn59AMV6iCj-2FAzsFmZDmbIos3SveyBNTIRxoQ9cPRYnGUJvcAO2C-2FN1QxbjuL3Y8ELK5gWiOUqwAeJaoIqwImrrWGzkrtF6Iu6lpAYw2yIml9u8FnfV-2BNo6dypylz5AbWbO4wm5AnTe6e7WmglLSPh-2FBr7RLUmgVl05JkvNjJmFrJUL-2FOA3VD8xCUTqdI8CiSkwhJgeP4PUUSKU6CPRXiEhpXbnj4JBARqbiZEvMCv3cChoIFQg20r6bMddokffgXp-2BiFWCvNIrp4WNUFzUegA1y-2FApKsMQemjXy5KM5DhVuyriQDcI1uKZbNH2L4o9QR7SSsEbRXbj-2F5-2FuRPshsLYfjHnGoPt11ACguPrpPaB5Kmke1gWd0UvceKwobel8MH3YRSgU2gvLJEJ000ZGfHr9Mj0j30BzHFnFaYfPzegN2Y2l5rXh6a3zR9Dsv0mUWU0mjRXrYJif2o5NEVM-3D" alt="" width="1" height="1" border="0" style="height:1px !important;width:1px !important;border-width:0 !important;margin-top:0 !important;margin-bottom:0 !important;margin-right:0 !important;margin-left:0 !important;padding-top:0 !important;padding-bottom:0 !important;padding-right:0 !important;padding-left:0 !important;"/></body>
|
||||||
|
</html>
|
||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,868 @@
|
|||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
|
||||||
|
<head><!--[if gte mso 9]><xml>
|
||||||
|
<o:OfficeDocumentSettings>
|
||||||
|
<o:AllowPNG/>
|
||||||
|
<o:PixelsPerInch>96</o:PixelsPerInch>
|
||||||
|
</o:OfficeDocumentSettings>
|
||||||
|
</xml><![endif]-->
|
||||||
|
<title>DoorDash</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0 ">
|
||||||
|
<meta name="format-detection" content="telephone=no">
|
||||||
|
<style type="text/css">body {
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 0;
|
||||||
|
-webkit-text-size-adjust: 100%!important;
|
||||||
|
-ms-text-size-adjust: 100%!important;
|
||||||
|
-webkit-font-smoothing: antialiased!important;
|
||||||
|
}
|
||||||
|
img {
|
||||||
|
border: 0!important;
|
||||||
|
outline: none!important;
|
||||||
|
}
|
||||||
|
p {
|
||||||
|
Margin: 0px!important;
|
||||||
|
Padding: 0px!important;
|
||||||
|
}
|
||||||
|
table {
|
||||||
|
border-collapse: collapse;
|
||||||
|
mso-table-lspace: 0px;
|
||||||
|
mso-table-rspace: 0px;
|
||||||
|
}
|
||||||
|
td, a, span {
|
||||||
|
border-collapse: collapse;
|
||||||
|
mso-line-height-rule: exactly;
|
||||||
|
}
|
||||||
|
.ExternalClass * {
|
||||||
|
line-height: 100%;
|
||||||
|
}
|
||||||
|
.em_defaultlink a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
a[x-apple-data-detectors], u+.em_body a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: inherit;
|
||||||
|
font-family: inherit;
|
||||||
|
font-weight: inherit;
|
||||||
|
line-height: inherit;
|
||||||
|
}
|
||||||
|
@media only screen and (max-width:667px) {
|
||||||
|
.em_main_table {
|
||||||
|
width: 100%!important;
|
||||||
|
}
|
||||||
|
.em_wrapper {
|
||||||
|
width: 100%!important;
|
||||||
|
}
|
||||||
|
.em_hide {
|
||||||
|
display: none!important;
|
||||||
|
}
|
||||||
|
.em_hauto {
|
||||||
|
height: auto !important;
|
||||||
|
}
|
||||||
|
.em_full_img img {
|
||||||
|
width: 100%!important;
|
||||||
|
height: auto!important;
|
||||||
|
}
|
||||||
|
.em_pad1 {
|
||||||
|
padding-right: 10px!important;
|
||||||
|
}
|
||||||
|
.em_hauto {
|
||||||
|
height: auto!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_h20 {
|
||||||
|
height: 40px!important;
|
||||||
|
font-size: 1px!important;
|
||||||
|
line-height: 1px!important;
|
||||||
|
}
|
||||||
|
.em_h10 {
|
||||||
|
height: 10px!important;
|
||||||
|
font-size: 1px!important;
|
||||||
|
line-height: 1px!important;
|
||||||
|
}
|
||||||
|
.em_h30 {
|
||||||
|
height: 30px!important;
|
||||||
|
}
|
||||||
|
u+.em_body .em_full_wrap {
|
||||||
|
width: 100%!important;
|
||||||
|
width: 100vw!important;
|
||||||
|
}
|
||||||
|
.em_side30 {
|
||||||
|
width: 26px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 190px !important;
|
||||||
|
height: 40px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 17px !important;
|
||||||
|
line-height: 40px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 140px !important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 40px!important;
|
||||||
|
line-height: 44px!important;
|
||||||
|
}
|
||||||
|
.em_pad1 {
|
||||||
|
padding: 0px 15px !important;
|
||||||
|
}
|
||||||
|
.en_icon {
|
||||||
|
width: 30px !important;
|
||||||
|
padding-bottom: 10px !important;
|
||||||
|
}
|
||||||
|
.em_rounded {
|
||||||
|
border-top-left-radius: 25px !important;
|
||||||
|
border-top-right-radius: 25px !important;
|
||||||
|
}
|
||||||
|
.em_bold {
|
||||||
|
letter-spacing: -1px !important;
|
||||||
|
}
|
||||||
|
.em_side_15 {
|
||||||
|
width: 15px!important;
|
||||||
|
}
|
||||||
|
.em_h20 {
|
||||||
|
height: 20px!important;
|
||||||
|
font-size: 1px!important;
|
||||||
|
line-height: 1px!important;
|
||||||
|
}
|
||||||
|
.em_ptop {
|
||||||
|
padding-top: 20px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (max-width:480px) {
|
||||||
|
.em_side30 {
|
||||||
|
width: 26px!important;
|
||||||
|
}
|
||||||
|
.ft_16 {
|
||||||
|
font-size: 14px!important;
|
||||||
|
line-height: 18px!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 35px!important;
|
||||||
|
line-height: 42px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 165px !important;
|
||||||
|
height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 15px !important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 105px !important;
|
||||||
|
}
|
||||||
|
.em_font_20 {
|
||||||
|
font-size: 22px!important;
|
||||||
|
line-height: 26px!important;
|
||||||
|
}
|
||||||
|
.em_f_16 {
|
||||||
|
font-size: 16px!important;
|
||||||
|
line-height: 20px!important;
|
||||||
|
}
|
||||||
|
.em_img img {
|
||||||
|
width: 22px !important;
|
||||||
|
height: auto !important;
|
||||||
|
padding-top: 3px !important;
|
||||||
|
}
|
||||||
|
.em_cta1 {
|
||||||
|
width: 200px!important;
|
||||||
|
height: 45px!important;
|
||||||
|
}
|
||||||
|
.em_cta1 a {
|
||||||
|
font-size: 16px!important;
|
||||||
|
line-height: 45px!important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (max-width:374px) {
|
||||||
|
.ft_16 {
|
||||||
|
font-size: 12px!important;
|
||||||
|
line-height: 16px!important;
|
||||||
|
}
|
||||||
|
.em_side15 {
|
||||||
|
width: 40px!important;
|
||||||
|
}
|
||||||
|
.em_side30 {
|
||||||
|
width: 20px!important;
|
||||||
|
}
|
||||||
|
.em_img img {
|
||||||
|
width: 20px !important;
|
||||||
|
height: auto !important;
|
||||||
|
padding-top: 3px !important;
|
||||||
|
}
|
||||||
|
.em_f_16 {
|
||||||
|
font-size: 15px!important;
|
||||||
|
line-height: 19px!important;
|
||||||
|
}
|
||||||
|
.em_font_20 {
|
||||||
|
font-size: 20px!important;
|
||||||
|
line-height: 24px!important;
|
||||||
|
}
|
||||||
|
.em_font_58 {
|
||||||
|
font-size: 30px!important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta {
|
||||||
|
width: 160px !important;
|
||||||
|
height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta a {
|
||||||
|
font-size: 15px !important;
|
||||||
|
line-height: 38px!important;
|
||||||
|
}
|
||||||
|
.em_cta1 {
|
||||||
|
width: 180px!important;
|
||||||
|
height: 42px!important;
|
||||||
|
}
|
||||||
|
.em_cta1 a {
|
||||||
|
font-size: 15px!important;
|
||||||
|
line-height: 42px!important;
|
||||||
|
}
|
||||||
|
.em_h90 {
|
||||||
|
height: 95px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen {
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Regular';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Regular.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Regular.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Medium';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Medium.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Medium.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-Bold';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-Bold.woff') format('woff'), url('https://typography.doordash.com/TTNorms-Bold.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'TTNorms-ExtraBold';
|
||||||
|
src: url('https://typography.doordash.com/TTNorms-ExtraBold.woff') format('woff'), url('https://typography.doordash.com/TTNorms-ExtraBold.ttf') format('truetype');
|
||||||
|
font-weight: normal !important;
|
||||||
|
font-style: normal !important;
|
||||||
|
mso-font-alt: 'Arial'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body class="em_body" style="margin:0px auto; padding:0px;" bgcolor="#ffffff">
|
||||||
|
<span style="color:transparent;visibility:hidden;display:none;opacity:0;height:0;width:0;font-size:0;"></span> <!-- == Body Section == -->
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="em_full_wrap" bgcolor="#ffffff">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table align="center" width="700" border="0" cellspacing="0" cellpadding="0" class="em_main_table" style="width:700px;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top"><!----><!-- --><!-- --><!-- --><!-- -->
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#D1EDEE">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h30" height="62" style="height:62px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr> <!-- banner Section -->
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_hauto" valign="top" align="center" bgcolor="#D1EDEE" background="https://assets.doordash.team/m/1a24eac71707251f/original/-05_May-Order_Confirmation_Revamp-bg_img_02fr.jpg" style="background-position: right bottom; background-size: cover; background-repeat: no-repeat; height: 526px;" height="526"><!--[if gte mso 9]>
|
||||||
|
<v:image xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style=" border: 0;display: inline-block; width:700px;height:526px;" src="https://assets.doordash.team/m/1a24eac71707251f/original/-05_May-Order_Confirmation_Revamp-bg_img_02fr.jpg" />
|
||||||
|
<v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style=" border: 0;display: inline-block;position: absolute; width:700px;height:526px;">
|
||||||
|
<v:fill opacity="0%" color="#ededed" />
|
||||||
|
<v:textbox inset="0,0,0,0">
|
||||||
|
<!----><!----><!----><!----><!---->
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side30" width="60" style="width:60px;"></td>
|
||||||
|
<td class="em_hauto" align="center" valign="top">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top"><a target="_blank" style="text-decoration:none;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiX9NQvXQ9aE-2FeLMhxL9C-2FAErzBY_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9U6tAttMWs-2F17L53RCWUgjdFZL-2BBM-2FvMAbWQw8VEkpCEspZjWjjzE0oiyQq85glyUiycwLDkDUnlXnoi-2Ff89LkDx-2Bc-2BDpwSECL30G4Nt-2FixG9XD5XY21LkSdp3wDhHwzT5424p65s8zLSQqDqMSr-2FJg-3D-3D" universal="true"><img width="45" alt="DOORDASH" style="display:block; max-width:45px;font-family:Arial, sans-serif;font-size:20px; line-height:30px; color:#ee3623; font-weight:bold;" border="0" class="en_icon" src="https://assets.doordash.team/m/835d1d775f776ef/original/-04_April-MX_Winback_Campaign-logo_img.png"> </a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="50" style="height:50px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink em_font_58 em_bold" align="left" valign="top" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:51px; line-height:60px; font-weight: bold;"><!---->Thanks for your<br> order, Siddharth<!----></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="66" style="height:66px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top">
|
||||||
|
<table width="220" border="0" cellspacing="0" cellpadding="0" align="left" style="width:220px; max-width:220px;" class="em_cta">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink em_cta em_bold" align="center" valign="middle" height="45" style="font-family:'TTNorms-Bold', Arial, sans-serif;color:#ffffff;font-size:18px; background-color:#eb1700; border-radius:25px; font-weight: bold; "><a target="_blank" style="text-decoration:none; display:block; color:#ffffff; line-height:45px;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3DXis9_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9DhoSoVJQPXHb0daBH8Su71-2FWDBw7ES1ME-2FUoDwtJ1oW0yC1YYQRsoWgxjV-2BgzJbsIISc2svF3BIflrR-2F4JaCzYXaSuX0Iv-2BBnV5dxK3NGiCpg70gOKqGPmQgE4kTqX7GZZVXQUInMiK7lB-2BeczLXaA-3D-3D" universal="true">Track Your Order</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h90" height="28" style="height:28px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" width="20" style="width:20px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!--[if gte mso 9]>
|
||||||
|
</v:textbox>
|
||||||
|
</v:rect>
|
||||||
|
</v:image>
|
||||||
|
<![endif]--></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- //banner Section -->
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td width="6%" style="width:6%;"></td>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center" class="em_rounded" style="border-top-left-radius: 40px; border-top-right-radius: 40px; background-color: #ffffff;">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" width="40" style="width: 40px;"></td>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="50" style="height:50px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px;">Paid with credits<br> Chilli India</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink em_bold" align="left" valign="top" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px; font-weight:bold; color:#000000;">Total: $0.00</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="35" style="height:35px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink em_bold" align="left" valign="top" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:26px; line-height:36px; font-weight: bold;">Your receipt</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:21px;">2/210 Ballan Rd, Wyndham Vale VIC 3024, Australia</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="45" style="height:45px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:17px; line-height:24px;"><font size="2" color="#666666"><b>- For: Siddharth Bose -</b></font><br><br>
|
||||||
|
<table width="100%" style="margin: auto; margin-bottom: 20px">
|
||||||
|
<tbody>
|
||||||
|
<tr style="text-align: left;">
|
||||||
|
<td valign="top" width="10%" style="color: #666666; font-size: 18px; line-height: 24px">1x</td>
|
||||||
|
<td valign="top" width="75%" style="color: #666666; font-size: 18px; line-height: 24px"><b>Chicken Lollipops</b> (NON-VEGETARIAN STARTERS)<br></td>
|
||||||
|
<td valign="top" width="15%" style="color: #666666; font-size: 18px; line-height: 24px text-align: right">$23.88</td>
|
||||||
|
</tr>
|
||||||
|
<tr style="text-align: left;">
|
||||||
|
<td valign="top" width="10%" style="color: #666666; font-size: 18px; line-height: 24px">2x</td>
|
||||||
|
<td valign="top" width="75%" style="color: #666666; font-size: 18px; line-height: 24px"><b>Hyderabadi Goat Dum Biryani</b> (BIRYANI'S)<br></td>
|
||||||
|
<td valign="top" width="15%" style="color: #666666; font-size: 18px; line-height: 24px text-align: right">$47.98</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="22" style="height:22px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" width="40" style="width: 40px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center" bgcolor="#ffffff" class="em_pad1">
|
||||||
|
<table width="530" style="width:530px;" border="0" cellspacing="0" cellpadding="0" align="center" class="em_wrapper">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor="#e5e5e5" height="2" style="line-height:0px; font-size:0px; height: 2px;"><img alt="" border="0" height="1" style="display:block;" width="1" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center" style="background-color: #ffffff;">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" width="40" style="width: 40px;"></td>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="10" style="height:10px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">Subtotal</td> <!---->
|
||||||
|
<td class="em_defaultlink" align="right" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">$71.86</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">Taxes</td> <!---->
|
||||||
|
<td class="em_defaultlink" align="right" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!----><!---->
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">Delivery Fee</td>
|
||||||
|
<td class="em_defaultlink" align="right" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">Service Fee</td>
|
||||||
|
<td class="em_defaultlink" align="right" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!-- --><!---->
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">Discounts</td>
|
||||||
|
<td class="em_defaultlink" align="right" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#767676;font-size:14px; line-height:22px;">-$71.86</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!---->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="18" style="height:18px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" width="40" style="width: 40px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center" bgcolor="#ffffff" class="em_pad1">
|
||||||
|
<table width="530" style="width:530px;" border="0" cellspacing="0" cellpadding="0" align="center" class="em_wrapper">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor="#e5e5e5" height="2" style="line-height:0px; font-size:0px; height: 2px;"><img alt="" border="0" height="1" style="display:block;" width="1" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center" style="background-color: #ffffff;">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side15" width="40" style="width: 40px;"></td>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="12" style="height:12px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
|
||||||
|
<tbody>
|
||||||
|
<tr><!---->
|
||||||
|
<td class="em_defaultlink em_bold" align="left" valign="top" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:17px; line-height:24px; font-weight: bold;">Total Charged</td> <!---->
|
||||||
|
<td class="em_defaultlink em_bold" align="right" valign="top" style="font-family:'TTNorms-Bold', Arial, sans-serif; color:#000000;font-size:17px; line-height:24px; font-weight: bold;">$0.00</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr> <!----><!----><!----><!----><!----> <!---->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="15" style="height:15px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#ff2f07;font-size:14px; line-height:21px; font-weight: bold;"><a style="color:#ff2f07; text-decoration:none;" target="_blank" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzf-2F8itKxlwlpgC5eDvfobsPqcWIfajKSF9K5IVNYF4z5cDdr_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9yGet7aCJhkLcWM9jtE5P15Gw2aS9-2Bd8S0lxqE0ofFQUprfLXvCW-2Fyw6lcqXZj16oIJGN1Z3kyxulmmMYsrht81Fbmp7xhgSLYmCFSjIeEUapNr9xy5EHJGf5QgpKFBoWt24n8NDLxIVQHt7hhCz72g-3D-3D" universal="true">Get Order Help</a></td>
|
||||||
|
</tr> <!-- -->
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="58" style="height:58px; line-height:0px; font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!-- == //Body Section == --><!-- == Footer Section == --><!-- == //Footer Section == --></td>
|
||||||
|
<td class="em_side15" width="40" style="width: 40px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td width="6%" style="width:6%;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top" bgcolor="#00838a">
|
||||||
|
<table width="700" border="0" cellspacing="0" cellpadding="0" align="center" style="width:700px;" bgcolor="#00838a" class="em_wrapper">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="73" style="height:73px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top">
|
||||||
|
<table width="700" border="0" cellspacing="0" cellpadding="0" align="center" style="width:700px;" class="em_wrapper">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top">
|
||||||
|
<table width="275" border="0" cellspacing="0" cellpadding="0" align="left" style="width:275px;" dir="ltr" class="em_wrapper">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top"><a target="_blank" style="text-decoration: none;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3DINmM_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9ab-2BWHgIPHw-2FHA-2F8LmdECgPJuMjpcjZqmvbOeE-2FjweAF697cyRBN1bGlXezke3iQVhJlWoqTPIP6wOH-2B4pWw-2FSZzecFDoRexCypWWX3P9hHvZQo7rZEU7tsxj5JgFvOgtMytra1OA69PgnlD7sYqwLg-3D-3D" universal="true"><img width="275" border="0" alt="DOORDASH | Pick up your order | Ready now | I Picked Up My Order" style="font-family:Arial,sans-serif;font-size:16px;line-height:20px;color:#ffffff;display:block;max-width:275px;" src="https://assets.doordash.team/m/21479b41d7738a14/original/-08_August-Pickup_Order_Confirmation_Banner_Add-imgpsh_fullsize_anim.jpg"></a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!--[if gte mso 9]></td><td valign="top"><![endif]-->
|
||||||
|
<table width="425" border="0" cellspacing="0" cellpadding="0" align="right" style="width:425px;" class="em_wrapper">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center" class="em_ptop">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side_15" width="20" style="width:20px;"></td>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink em_font_20" align="left" valign="top" style="font-family:'TTNorms-Bold',Arial,sans-serif;color:#ffffff;font-size:24px;line-height:27px;font-weight:bold;"><a target="_blank" style="text-decoration: none; color:#ffffff;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3DP1G7_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9TY-2FNuh-2BDY9H-2BggfcF9DNm8tS-2F0Or82eJo3NB1P4i45n8bhW7X6ws7ulGWM6bg3oQzJvOsdVijjWDx4dcCUeJGbF-2B0Ym3Jb-2BHgIZXtdvXT3n2YQ06merlibFALmewVfDnhuod0QtRNmiXw-2FFVUDN9Ng-3D-3D" universal="true">What to do when you arrive</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="30" style="height:30px;line-height:0px;font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="left">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left" style="font-size:0px; line-height:0px;">
|
||||||
|
<table width="42" border="0" cellspacing="0" cellpadding="0" align="left" style="width:42px;" class="em_img"><!--[if mso]>
|
||||||
|
<tr>
|
||||||
|
<td height="4" style="height:4px; line-height:0px; font-size:0px;"><img alt="" src="https://assets.doordash.team/m/28838ff35afbe7b6/original/-04_April-Merchant_Activation_DelayedBanking_T2-spacer.gif" width="1" height="1" border="0" style="display:block;"/></td>
|
||||||
|
</tr>
|
||||||
|
<![endif]-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left" class="em_img"><a target="_blank" style="text-decoration: none; color:#ffffff;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3D7lI6_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9ZzL5VDXQ75SCksv9T-2BBr2RypmGvKuusULq0tKEaH4uE4vzXMns5EJCzWV6TYk-2FjXjSFiR6SpLmekxAokzPq1w4yx6ZFdXk4Dobwp054H1RQbz6TdnF7tabjp8IrSXgVr9WY7iNtPL92D9OBckgsOpA-3D-3D" universal="true"><img width="25" alt="1" border="0" style="width:25px; max-width:25px; display:block;" src="https://assets.doordash.team/m/7e33ff26ef721acd/original/-06_June-Pickup_Ready_Trigger_Transactional-img3.png"></a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_defaultlink em_f_16" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#ffffff; font-size:18px; line-height:25px;"><a target="_blank" style="text-decoration: none; color:#ffffff;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3D7Yxi_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9mJLiBoDz0shrpBZ9UyY35gO2Tvb1mkMlDjb1L4hP-2Fe8w1mhlj7Vq-2BgkxFJshnRkjNvwHS6KydeE1U6kxaxP-2FgBg0SHCyHHPyCHpGC1WUI1-2BvIBH45EESdEbgRRstSmiMJnlSZBODcuvw6-2B-2FMmUFcNg-3D-3D" universal="true">Skip the line! Go straight to the restaurant’s pick-up counter.</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="18" style="height:18px;line-height:0px;font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="left">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left" style="font-size:0px; line-height:0px;">
|
||||||
|
<table width="42" border="0" cellspacing="0" cellpadding="0" align="left" style="width:42px;" class="em_img"><!--[if mso]>
|
||||||
|
<tr>
|
||||||
|
<td height="4" style="height:4px; line-height:0px; font-size:0px;"><img alt="" src="https://assets.doordash.team/m/28838ff35afbe7b6/original/-04_April-Merchant_Activation_DelayedBanking_T2-spacer.gif" width="1" height="1" border="0" style="display:block;"/></td>
|
||||||
|
</tr>
|
||||||
|
<![endif]-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left" class="em_img"><a target="_blank" style="text-decoration: none; color:#ffffff;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3DQVMA_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9TT29R06OuljbEo39-2FOTjWKbFYuihjiQbzN93K0WenMsdSv3CMjQ3LgXlB8Z23eVnUTgVUn-2FexjpNLPsk-2F4F8eQUAmmd-2FroRbrb-2B-2FHRZ4PM81L9BwR4dUhMMytvUHgXMeMaVQ-2BvlEXL-2B4-2BA-2F6NKiDHw-3D-3D" universal="true"><img width="25" alt="2" border="0" style="width:25px; max-width:25px; display:block;" src="https://assets.doordash.team/m/6e7053e55643679c/original/-06_June-Pickup_Ready_Trigger_Transactional-img4.png"></a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_defaultlink em_f_16" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#ffffff; font-size:18px; line-height:25px;"><a target="_blank" style="text-decoration: none; color:#ffffff;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3DhA1g_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9mzX65ESzRyRG6-2FahXssBqsMHZ1Pb-2B4JH0zke3ALCl5ba1asn0pPJcsHIF21G1gxaXIDB1BTSmsTeeAP2vv2l9m-2B-2Be0B820AC82EmsiVAu-2BAXT5BUOLtE5KSO6nb0Tu8lymdaakTiTguPn9SK02pMfw-3D-3D" universal="true">Show the staff your DoorDash app or receipt to claim your order.</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="12" style="height:12px;line-height:0px;font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="left">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left" style="font-size:0px; line-height:0px;">
|
||||||
|
<table width="42" border="0" cellspacing="0" cellpadding="0" align="left" style="width:42px;" class="em_img"><!--[if mso]>
|
||||||
|
<tr>
|
||||||
|
<td height="4" style="height:4px; line-height:0px; font-size:0px;"><img alt="" src="https://assets.doordash.team/m/28838ff35afbe7b6/original/-04_April-Merchant_Activation_DelayedBanking_T2-spacer.gif" width="1" height="1" border="0" style="display:block;"/></td>
|
||||||
|
</tr>
|
||||||
|
<![endif]-->
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="left" class="em_img"><a target="_blank" style="text-decoration: none; color:#ffffff;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3D0mF__gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh94MnLK9HomwO-2FOszt9E7QJHHky1AOyVqjlUKLIboeAL6IP3yZz1z7H74tRU5A-2FfyfbWbF1523ckL0gqpecu-2Bicoc7KBKQr7IOGs9J72-2BrnJ8ScOZ17p3zx6y-2BSKj0LdG0Y3zo3RT9jUWy9uC41IvVug-3D-3D" universal="true"><img width="25" alt="3" border="0" style="width:25px; max-width:25px; display:block;" src="https://assets.doordash.team/m/4ac84ede5f4634dd/original/-06_June-Pickup_Ready_Trigger_Transactional-img5.png"></a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_defaultlink em_f_16" align="left" valign="top" style="font-family:'TTNorms-Regular', Arial, sans-serif; color:#ffffff; font-size:18px; line-height:25px;"><a target="_blank" style="text-decoration: none; color:#ffffff;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3Dd9zs_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9T2MYp7K6Sf6fSWsAKtcO-2FN-2BLKQVPx0NItCo6TS9Lbz9DVXwvRY01J3L-2BB0rcAe8LX34GOvEUDMoiaIp-2Fzc1jNSYPOGyfNBhgoTZHJZOge23hA-2FAM5zvUmMgQIklw4qg2o0sFVjjpxrorZZrSxn3vvA-3D-3D" universal="true">Before heading out, double check to confirm you’ve received all items.</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="32" style="height:32px;line-height:0px;font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top">
|
||||||
|
<table width="244" border="0" cellspacing="0" cellpadding="0" align="left" style="max-width:244px;width:244px;background-color:#f7f7f7;border-radius:25px;" class="em_cta1">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_defaultlink em_cta1" align="center" valign="middle" height="52" style="font-family:'TTNorms-Bold',Arial,sans-serif;color:#00838a;font-size:21px;font-weight:bold;"><a target="_blank" style="text-decoration:none;display:block;color:#00838a;line-height:52px;" href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiV6F8V0WgHH5qpw3jxS-2Fa6EGy0eTNS93bJBD8CrAgawzeLHduIsGGvaKZS6iNaYp-2Fk-3D2r2h_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9BlqHmjcqtruwkpuxTPfGAFBqNGbOff2wsddx2rLTQfUNcIpX6rp-2Fi3hN0y91lSiN77BoHqgHjhwWBGPj2dqZReijcs9pT2mVBhbLSE-2B6gD7cK3oVswuoKjmdtE9pHt-2FGYeampPt5ChmBk8wrTekfpg-3D-3D" universal="true">Track Your Order</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="82" style="height:82px;line-height:0px;font-size:0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side_15" width="65" style="width:65px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center" valign="top"><!--
|
||||||
|
|
||||||
|
|
||||||
|
--> <!--[if (gte mso 9)|(IE)]>
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:620px;">
|
||||||
|
<tr>
|
||||||
|
<td align="center">
|
||||||
|
<![endif]-->
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" id="Footer" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 700px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="padding: 0 24px;">
|
||||||
|
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width:100%;max-width:572px; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding: 48px 0 32px 0; border-bottom: 1px solid #E7E7E7;"><a href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiX9NQvXQ9aE-2FeLMhxL9C-2FAExxvL_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9qQUzDXwAPVf3usjWBBGhHRLmujJqcr5Rpr0PP44oD28hQuWJPYJrorj7eh2LRnirXsIBnEOnfFYtqzJkMGMEGNmEOgHh3wyCdzJ2n2Puv04jUFFdcFfzwf2DhbocZswmyBpEfcpIH-2FlFcdQy-2FhT-2BOw-3D-3D" target="_blank" style="color: #191919;" universal="true"><img alt="DoorDash" border="0" src="https://assets.doordash.team/m/60228540eee4df0c/original/DoorDash-Logo-Full-Red100.png" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; color: #FF3008; font-family:'TTNorms',system-ui,sans-serif; font-weight: bold; font-size: 18px; text-decoration: none; width: 183px;" width="183"></a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:16px 0 0 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; border: 0; padding: 0; border-collapse: collapse;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="padding:0 0 16px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 280px; border: 0; padding: 0; border-collapse: collapse; float: left;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="padding: 16px 0; width: 50%;" width="50%">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 140px; border: 0; padding: 0; border-collapse: collapse;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="height: 40px;" height="40"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2BzcjCYVO02E6L8GZdu019pLCdzrwjBbgDTooc-2Bf2hmV45f2EGDuiNzmiTMuRZPKlHjhcIixsxt6mci9emxQ30-2BVxGv0RnlPka-2FFd4fNutCfWP59qLn5b2LnYMFz9QVRs-2FSPJVeax0MxwhWejYUsJXRb6tR22CAvldJ8oQ3uaWNGfc2kv_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9R4wgtEbczXbCqxsOmwOuD8TRRqpB8mgi65GNM0ra-2BDIasAQnax2eVxI3R-2B-2FuRqaLHBmPzYkNY7qp1O6je5HGjjUVmC9twIfopxuQDZ6-2FKexPxWMVSM-2F8loKR-2Bqg4VGGsWxZnktEHCP49h2XEsQVyrw-3D-3D" target="_blank" style="color: #191919;"><img alt="Download the app" src="https://assets.doordash.team/m/500fea64c23bc120/original/icon-footer-mobileapp.png" width="55" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; text-decoration: none; width: 55px;"></a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="color: #191919;"><!--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:16px;line-height:22px;font-weight:500;margin:0;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2BzcjCYVO02E6L8GZdu019pLCdzrwjBbgDTooc-2Bf2hmV45f2EGDuiNzmiTMuRZPKlHjhcIixsxt6mci9emxQ30-2BVxGv0RnlPka-2FFd4fNutCfWP59qLn5b2LnYMFz9QVRs-2FSPJVeax0MxwhWejYUsJXRb6tR22CAvldJ8oQ3uaWNGfq8tx_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9nCInppLEx0QjS9UIqmR9A6tK1rrX29VgRrPMFhXKvuK7oQPkDzgCCSJrLjL7o4NQWvDB1sSZqQ-2FSe1FEfAAfV3nF79K2drmxPzHnH-2BfZnDBqxXCk-2FJySmYh7qTnjrSmQQOjWq0ELD3XYA-2Ffl8KwTSw-3D-3D" target="_blank" style="color: #191919; text-decoration: none;">Download <br>the app</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td data-skip-shadow-validation="true" align="left" valign="top" style="padding: 16px 0; width: 50%;" width="50%"><!---->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 140px; border: 0; padding: 0; border-collapse: collapse;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="height: 40px;" height="40"><a href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiXcTh9RnomDHl8hjluP2Kf-2BD5RGeDVqI9bmTUfMaMWMZA-3D-3D9OQ4_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9KiOVKcHwAKXzSDerRpI06sHCdXelptvmh5TX6eheG3hL-2BDJApljrdxxxsnF2yuJCcY59R18ThK4PytDo6b3-2FxMMs2AmhqUuk6lOquSQHZZ9xaFPJvK-2B2VyuvOy2K6Cq8pjVy05LWrU-2BDmDv0dWLLkQ-3D-3D" target="_blank" style="color: #191919;" universal="true"><img alt="Shop Gift Cards" src="https://assets.doordash.team/m/2f055075aa667d75/original/icon-dd-giftcard.png" width="43" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; text-decoration: none; width: 43px;"></a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="color: #191919;"><!--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:16px;line-height:22px;font-weight:500;margin:0;"><a href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiXcTh9RnomDHl8hjluP2Kf-2BD5RGeDVqI9bmTUfMaMWMZA-3D-3DY5So_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9GV3TaqwrUSNs0VNNJqAxdBlgKOmAVgbASYjmJxklvK8fK57W2se0CiBUCWF5vIsxzo-2B0-2FWPkW4yMrhD1MZWbP2Ins6z-2FKAMOGJThI3gulXRLVoaHYzIz5CZWYLXMQuTGoICEKHKLxMF797snr-2FlEDg-3D-3D" target="_blank" style="color: #191919; text-decoration: none;" universal="true">Shop <br>Gift Cards</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!----></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!--[if gte mso 9]></td><td align="left"><![endif]-->
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 280px; border: 0; padding: 0; border-collapse: collapse; float: left;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="padding: 16px 0; width: 50%;" width="50%">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 140px; border: 0; padding: 0; border-collapse: collapse;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="height: 40px;" height="40"><a href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiVT5CX2SpN45IR7hQUH3fjvHqA4t-2F4SC8-2BnSVnPlHEF7Q-3D-3DBrSO_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9z0KK6nQtSnhfb-2FUomS803meemWRHA4sQjByYkmPXACE0mylumcET2NUswGrd9benLF5r-2FPeUmoj3Lse1JLnNkeRzU1y-2B50hwAOrNPeBBwiD8LueTQRuRIJU9n9bIHMUL2vW-2F41pw0gRonBp1iZLPEQ-3D-3D" target="_blank" style="color: #191919;" universal="true"><img alt="Refer and Earn Credit" src="https://assets.doordash.team/m/73675450875ebb57/original/icon-footer-refer.png" width="30" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; text-decoration: none; width: 30px;"></a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="color: #191919;"><!--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:16px;line-height:22px;font-weight:500;margin:0;"><a href="https://tracksg.doordash.com/uni/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiVT5CX2SpN45IR7hQUH3fjvHqA4t-2F4SC8-2BnSVnPlHEF7Q-3D-3DQYAA_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9b8DqiT5Q5ujCYXW1jmCIIQr2jrhQiXxpUpJkZVq6-2FXE3xAAaIU9uNCa3Tst0CMi30Xmf6B6blHudQ41g-2Bdo-2F-2FEJaQOyAihNzLn1QjSXjCXm9wsvNG4WFRvHcpjaUB9ysdVzj58W2YmDqsrwUX-2BAamA-3D-3D" target="_blank" style="color: #191919; text-decoration: none;" universal="true">Refer and <br>Earn Credit</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td align="left" valign="top" style="padding: 16px 0; width: 50%;" width="50%">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%" style="mso-table-lspace: 0; mso-table-rspace: 0; width: 100%; max-width: 140px; border: 0; padding: 0; border-collapse: collapse;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="height: 40px;" height="40"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiUmEso6tSMMqb4wX3Q58ulh0RYYyPmHEEAnk-2BGx0Kt-2BeA-3D-3Dnczm_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9uKQbfTVabK-2BCeR1hvsRChiANq1hO-2B0sgHCiQ2TT5j-2FThmhWRJWIFB-2FqVuSp-2FMqtezLuyqCEjJCQtd2a380n0ZMCRlgPpuxIxADrzkVC1pyCVnzEURgTGA0zWXTzRFtJkheSwwpf-2BdoaO5DIriyKX2g-3D-3D" target="_blank" style="color: #191919;"><img alt="Deliver with DoorDash" src="https://assets.doordash.team/m/d3fd5564cd1d0f3/original/icon-footer-deliverdd.png" width="27" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; text-decoration: none; width: 27px;"></a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="top" style="color: #191919;"><!--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:16px;line-height:22px;font-weight:500;margin:0;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FBg5Q-2B-2F17CbuWT8XZi-2BuiUmEso6tSMMqb4wX3Q58ulh0RYYyPmHEEAnk-2BGx0Kt-2BeA-3D-3D2kBd_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9le2StZYD3ubMp1KkMbKkNUQoWO4K5WcuSFl-2FAzi28IA-2FJy-2BsG6J9DEMetOBvHewEWRbr4bovhkci5-2FtozPIGcm3J-2BqMc1HK7CIpSAJIDCObAMR4Q5g5WWg7fk-2BiHH7rjW4X3Te-2Ft2Y1UFFZYA6Eu9g-3D-3D" target="_blank" style="color: #191919; text-decoration: none;">Deliver with <br>DoorDash</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 16px 0;"><!--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;">©2025 <a style="color: #9A9A9A; text-decoration: none;">DoorDash Inc. <br>303 2nd Street, South Tower, Suite 800 <br>San Francisco, CA 94107</a></p> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:400;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYAfdX67BmAmt0ufvV0DN-2BQcKLBxKTnrSNIWzubRh3E-2BfgEsS2yrPfbmkJcf80iMMHs-3DwEg6_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9h3Rn-2F7yUSjc-2FwVCqVcNmU8CXMadRKnLkc4c7YA9pFdgbp7NrgKsaXN-2BHGEi4WqxDUgyheueRw5y1AuaHsjK8WHj9Bt5Bom8lX-2FhZeE9Fj3XHsEbY4o3UeLMcHYf0NXcPVaFrGwukrORpM40XL8d6BQ-3D-3D" target="_blank" style="color: #9A9A9A; text-decoration: none;">Privacy Policy</a></p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 0 0 16px 0;">
|
||||||
|
<table align="left" border="0" cellpadding="0" cellspacing="0" role="presentation" style="mso-table-lspace: 0; mso-table-rspace: 0; border: 0; padding: 0; border-collapse: collapse;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="left" valign="middle" style="color: #191919; padding: 0 8px 0 0;"><!----> <a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FB3YMlmntmTqKXVA7huNFqC-2FY2hoh-2Fz5YPfVOcCa6quNkOp_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9OdczW9buEiXcf20eZjTw6j3J4DfvzhvSMCiSvWZwiDKXclLhN-2FIwB-2B7PGLYtvQ60V3Jr5QHNH8gJFbU-2Bz1k7P2vaHXNv3aCa97vS-2FNB7-2FPdCUjGx9V-2F2kW5cbmeoapqiZzw-2BuS7DT16VHd3sto3Eaw-3D-3D" target="_blank" style="color: #191919;"><img alt="fb" src="https://assets.doordash.team/m/5188bb1f5f04acaa/original/logo-facebook.png" width="24" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; text-decoration: none; width: 24px;"></a></td>
|
||||||
|
<td align="left" valign="middle" style="color: #191919; padding: 0 8px 0 0;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B4AUo6me50US-2FvcfePJUZTRhfLFumwrfkjz2KbYGBSYXzRff_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9sIbSZ5WBiRa4hCI-2B34oVAaYz2w9t6Dpx6XDZHG1iczvd6GtkYR4x4eU86rC0FX1Ud2VYsHAqw4Q5JXWIiZf3H8oX1DPHS-2BCiLKN2gwMqd1gGkcHdN-2FX94xN0E7YU7pI7vb82d-2BHY0LZGRmP3wSrPQQ-3D-3D" target="_blank" style="color: #191919;"><img alt="tw" src="https://assets.doordash.team/m/250ca598c483f1b8/original/logo-x.png" width="24" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; text-decoration: none; width: 24px;"></a></td>
|
||||||
|
<td align="left" valign="middle" style="color: #191919; padding: 0 12px 0 0;"><!----> <a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B2DmXtXKS05Hn1cgbRhFddpiLHO0EWksR6pd5wFKsdGvQCGd_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9ZzV7C3gLn62BVgulaM3ruZ6flQuhgjIPc1NKsAsFHFyrWmfULs5CePKbilEE0Qe73jOUvfNQUBPBk9vGBwIkf7xoJsNuuTs3yaXkRyJUDRxEVe6XFZ17E-2F0vekhq57UAEdx1IoMULbfAwi5OIUcQJQ-3D-3D" target="_blank" style="color: #191919;"><img alt="ig" src="https://assets.doordash.team/m/30ad9ef70caf3a55/original/logo-instagram.png" width="24" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; text-decoration: none; width: 24px;"></a></td>
|
||||||
|
<td align="left" valign="middle" style="color: #191919; padding: 0 8px 0 0;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B9Cc31vkufkxkjeQDdWBHi-2BEykKWTniWhBO2q7EZvDyOuAqc_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9wuaGJcQf0orrDSRaKoipbvQDaYa-2F47nRDf-2BwZRi-2Bn5jM1kHB5Q6cFntzO0XSQZhBjEzoXpkvqIfaaBv1-2FpxzBWFnB-2F-2BDuOm3iKIn45MZr57P5q0PDBMjssxnMRoNDScjLmJIuivQwjsX9jOuk1SMcg-3D-3D" target="_blank" style="color: #191919;"><img alt="blog" src="https://assets.doordash.team/m/4d258e2251ad126b/original/icon_medium.png" width="18" style="-ms-interpolation-mode: bicubic; border: 0; display: block; height: auto; line-height: 100%; outline: none; text-decoration: none; width: 18px;"></a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left" style="color: #191919; padding: 0 0 24px 0;"><!--
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--> <p style="font-family:'TTNorms',system-ui,sans-serif;font-size:14px;line-height:18px;font-weight:500;margin:0;color:#9A9A9A;"><a href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B-2FDD8FcMNUAvAdfcDQmgdYABnncKv1afIihr5Gt6bkMjwdgg_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh959Xd7Y6Gud2X1ehoSf-2B6JFftx-2BaY5Mq4YxuhkM55n-2BkcU47okbJWk6U0blQD0LfYHq227JOJbCKmDYH7YjpQEWkr2EOi8Ib9oLB5Md7Giae-2B-2FhI2ZoWq9YJipl7-2FZ37LRnS8I5tmKbedGAiHdI2hdg-3D-3D" target="_blank" style="color: #9A9A9A; text-decoration: none;">Help Center</a></p></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table> <!--[if (gte mso 9)|(IE)]>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<![endif]--></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" align="center">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f4f4f4">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="em_side30" width="55" style="width: 55px;"></td>
|
||||||
|
<td valign="top" align="center" style="padding-top:30px;">
|
||||||
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="left">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="font-family: 'TTNorms-Regular', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 18px; color: #ababab; font-weight:400;font-style:italic;" align="left" valign="top">Prop 65 Restaurant <a class="em_color_u" style="text-decoration:underline; color:#939393;" target="_blank" href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B15-2BhWQxoYkZ56rcWBjgowVNhC-2BKbbpJ-2FyS4l8ZzrqkvpAbpmh6xMGqJ3PxZACrgiw-3D-3DW9aM_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9-2BX92qlOdUUG5zpRoqMtp61TUZGhnlfUjf4Og4-2FnA7XVQxt39u1XghxMdeU3hIXIwRwwyZu19taIo0dOY04BW2IM7y6Mx8nbbC7OYNoIDu4xkgO-2BFZwj-2BXHg9RkRpYVV4MlfX8V6IsDT0GVEpEfgfCw-3D-3D">WARNING</a><br> <br> Prop 65 Alcohol <a class="em_color_u" style="text-decoration:underline; color:#939393;" target="_blank" href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B15-2BhWQxoYkZ56rcWBjgowVkh-2FKcx9IdsYOYOX3bSSQXX2VU9kylc3JZnginfYpP8Fv58V2Gad0szmjBZwRM34k-3Dgpsi_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9mvITrwEQj9x3VDARPEbXxE-2F-2Bku-2FgBEukw4-2FlFJug1YLEHPvpxieYuJgxS0Faiq-2B6DpzyS3s9P-2BhpgswwZogoBC6HPkvgNTQV-2FJnfghwCIrprRnT0sMQXmUS1SpDaQPeZc0Ukc3RwTTcq7Kq-2BVVcrng-3D-3D">WARNING</a><br> Drinking distilled spirits, beer, coolers, wine, and other alcoholic beverages may increase cancer risk, and, during pregnancy, can cause birth defects. For more information go to <a href="https://tracksg.doordash.com/ls/click?upn=u001.w8bmSeHXyA0fd7rAPHCC-2BveYEEDFpPbKqpH0908D-2FbFTn662MrnwWC94hremUVyWnadZ_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9R4aHBRRb0w2n2FCCFOYlx5z5AkE1SBYQ4UrFK5MnIcZwchKoiq4OgAxK2JI9YXzMnQgtsALyjfQmjeNbjSPupiwUSEcdZiaXYMI5yiGsQTPa0RJfavowHuHTjgibU3ACzfx4hlVCHQwD8lzLzrLM0A-3D-3D">www.P65Warnings.ca.gov/alcohol</a>.<br> <br> Prop 65 BPA <a class="em_color_u" style="text-decoration:underline; color:#939393;" target="_blank" href="https://tracksg.doordash.com/ls/click?upn=u001.2WPFTROKt87XSwhhpTWl-2B15-2BhWQxoYkZ56rcWBjgowW6WbwCN57LjWD5UaEYOVHrJPpLgJl33D1dHGtpAMDr2w-3D-3DHmwR_gLgx7IOQjj9tjcBPTdxDOJz1JqFsZO0kLUqSc8MGlKXluNU-2FF7J47geTAg8w6cqXb3B-2FMFQSFRN7JikLQZlFDU38dwgb-2BDbpbbf0hwXhFRx2m-2Bx6Npoq7irZzHPfD9P-2FYYJptv8l-2BigMjxI45jkjAkgNtbVB16VoUxsk7SMPBw8a-2FelGMT82ceEz-2BvpqbQp0r1xbE2OA2TnPx3xvM1srvI631o-2F8btZwumk47Ma4HzQmpBExphRnMlSBa03L-2BMfiW-2FCEtNMxDTu80LwRKAX2WPgKnh9s65o0kO1VZbqgD-2BYFuy89wo4udZAodoWOJMa96gK612W1szjrdsLrKjxfDUc0Za1usKJAnXY5kDXHTw-2Fpxx9OvPCGHs2fMZcwUWGci4Hc8OSpZo0jFqKGUCE-2Fc-2BJFtx0BdkoZinPoMkq9Ta7dllJhS5ZGwpNXmwbdtFXIovnb2p2aN3iw5lQ3AtNyeEXxPIRpxDcc9oLJtssFxcwSrBufr8VSnX0iS-2FHSyQwvZtgbeR2JES2snlC0cmemuvsIRd0GVwUJMvxxYF6C6TW1lDGwv-2F1ZNyYp-2FNfzKa-2BxdXdFcj0XZ58smKSK29HEN9FrTupJ9IVUs9-2BodhHpswAMZwgdH1Zng8FsOutsKQh9Iemc3b-2FjbWd4-2F8WUYcyMZ0svv7YTBgClQkvSBCqOUtSXfuZ5-2Bg6lHR4W-2BXc7uxb7qMuyzGRpiJLm-2BACbcHm-2Bku-2FTC7lNYoLHy-2FYQRbNcm-2FOk3qSlHHVnzxm6RihOUBKkOHuSpC42MXuR2bWQI4odUw-3D-3D">WARNING</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_h20" height="30" style="height:30px; line-height: 0px; font-size: 0px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
<td class="em_side15" width="180" style="width: 180px;"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="em_hide" style="line-height:1px;min-width:700px;background-color:#f4f4f4;"><img alt="" height="1" width="700" style="max-height:1px; min-height:1px; display:block; width:700px; min-width:700px;" border="0" src="https://assets.doordash.team/m/1b5c04bd5b887a06/original/-05_May-90D_Resurrection_Campaign_Refresh_T2-spacer.gif"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<img src="https://tracksg.doordash.com/wf/open?upn=u001.EBL2ug8kstebd25Xirrl3olMckTI261ldPjJ39bNHcC7U6EKGAOA4dSVB97lcv3b8qsQRq6LwkHED6F3X4gqaODB2b1wZFk4or4JbrThItoY-2FjAhYjqDwj5repwbzWNEue2JKteT4DEg7QY2vIxKrLZJCbuXHYZIzbee8h9tIN-2FDXVgfLQD4cGXRG4pvU9txqqdu78N63JaPaY-2BDo4qOWLe6-2BqnVfGz4g-2Ba-2BajGOeDJRt49161pCqdpSqkANOD7uPpa-2FIsuThD8ZfI9T6VtFxjuGxrsPYp-2F2dfZ3k2vX3ldEfD-2BAXCWlv9p884-2F2SRyJZCjbRCptm2UzImQFAxyJ3JjD349MBw90of5ckPJkHLa2s8Pad24yQCbMOuM35kYIvL2F-2FBQ0ptFHzENChwdaRJrb6cBf-2Fn7zxgLCTbbfJjc5PYH6f03JNOD7t3NknVYEdYwx3buSysW6f2CnLZESh4zqNMaIRkPKYyOSjrjWYLnf73C4QA8-2FPwb3GS8GN0yT9WHX-2B-2Fte61MfQMplNw8cWBdOS46KJWZvpse8d0Z4dx5DCBHkyZIknmmkb-2BsCT0b3oWk-2B8GCKHQ7XZKQurRgp5DLtNovpC0Zt-2FDfIJYaJ00-2FgnfaSpwfDnDOJqwv49a5Dcb5IOuGknhwTag1y2B-2BMO6SRdaOa8Ws8-2Fvq9FRdtwzwDiTXIPmoFZFkHF2ExDW7FJI4YvTjC1RaOciyUTbaapJuI9uLzrvXEHAUix3hAWSTl-2B6AVVANasaQrx-2FLjSL0AwM8ccKHDEgdM5eZ8FhiVwA-3D-3D" alt="" width="1" height="1" border="0" style="height:1px !important;width:1px !important;border-width:0 !important;margin-top:0 !important;margin-bottom:0 !important;margin-right:0 !important;margin-left:0 !important;padding-top:0 !important;padding-bottom:0 !important;padding-right:0 !important;padding-left:0 !important;"/></body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,254 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"id": "19f89664ea7b3aeb",
|
||||||
|
"date": "Date: Wed, 22 Jul 2026 10:36:50 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Homey Meals",
|
||||||
|
"len": 38394
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f68fd09cd2c3f1",
|
||||||
|
"date": "Date: Thu, 16 Jul 2026 03:34:00 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Mad Mex",
|
||||||
|
"len": 37448
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f656a298f42858",
|
||||||
|
"date": "Date: Wed, 15 Jul 2026 10:54:42 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Carl's Jr.",
|
||||||
|
"len": 37970
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f605de9ab82216",
|
||||||
|
"date": "Date: Tue, 14 Jul 2026 11:23:14 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Delhi Nights - Sweets & Indian\r\n Cuisine",
|
||||||
|
"len": 38707
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f2b6390a95b665",
|
||||||
|
"date": "Date: Sat, 04 Jul 2026 04:29:32 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from TEG KEBABS & BIRYANI",
|
||||||
|
"len": 38005
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f2256c51714b9c",
|
||||||
|
"date": "Date: Thu, 02 Jul 2026 10:18:58 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Sri Dwaraka",
|
||||||
|
"len": 37817
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f1d0b003834626",
|
||||||
|
"date": "Date: Wed, 01 Jul 2026 09:38:07 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Taco Bell",
|
||||||
|
"len": 38019
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f1c301dda7332c",
|
||||||
|
"date": "Date: Wed, 01 Jul 2026 05:39:01 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Woolworths",
|
||||||
|
"len": 38753
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f0c5624707ae34",
|
||||||
|
"date": "Date: Sun, 28 Jun 2026 03:46:39 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from ALDI",
|
||||||
|
"len": 68206
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19f0c0d0c33bf5c9",
|
||||||
|
"date": "Date: Sun, 28 Jun 2026 02:26:49 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from ALDI",
|
||||||
|
"len": 47419
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19eed89eee79b624",
|
||||||
|
"date": "Date: Mon, 22 Jun 2026 04:14:59 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Woolworths",
|
||||||
|
"len": 48653
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19eed498e3fb7fce",
|
||||||
|
"date": "Date: Mon, 22 Jun 2026 03:04:39 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Woolworths",
|
||||||
|
"len": 44104
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19eed38ca77047a1",
|
||||||
|
"date": "Date: Mon, 22 Jun 2026 02:46:21 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Oporto",
|
||||||
|
"len": 38675
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19ee9b9b1b7073c9",
|
||||||
|
"date": "Date: Sun, 21 Jun 2026 10:28:39 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37871
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19e95be74e216594",
|
||||||
|
"date": "Date: Fri, 05 Jun 2026 03:05:46 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37817
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19e854cdbf552dcf",
|
||||||
|
"date": "Date: Mon, 01 Jun 2026 22:27:45 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from TOMKINS BAKERY",
|
||||||
|
"len": 37741
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19e8020eb0027109",
|
||||||
|
"date": "Date: Sun, 31 May 2026 22:21:39 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Tonmax Bakery",
|
||||||
|
"len": 37439
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19e16b64b3f6dbad",
|
||||||
|
"date": "Date: Mon, 11 May 2026 11:05:04 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Woolworths",
|
||||||
|
"len": 39750
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19e16b1a2d9526f8",
|
||||||
|
"date": "Date: Mon, 11 May 2026 11:00:00 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Burger Road",
|
||||||
|
"len": 38230
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19e11390ea456222",
|
||||||
|
"date": "Date: Sun, 10 May 2026 09:30:11 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37847
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19cdfa1d25f194a8",
|
||||||
|
"date": "Date: Thu, 12 Mar 2026 01:20:48 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Kesari Indian Kitchen",
|
||||||
|
"len": 37922
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19cc62db0460b8a0",
|
||||||
|
"date": "Date: Sat, 07 Mar 2026 02:43:28 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37884
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19ca1f0fa493f0ca",
|
||||||
|
"date": "Date: Sat, 28 Feb 2026 01:50:49 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37862
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c9c18ad4bf22e1",
|
||||||
|
"date": "Date: Thu, 26 Feb 2026 22:36:27 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Hungry Jacks",
|
||||||
|
"len": 37596
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c8ef02c0a0f590",
|
||||||
|
"date": "Date: Tue, 24 Feb 2026 09:17:09 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Schnitz",
|
||||||
|
"len": 38107
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c6e7cb5565afd5",
|
||||||
|
"date": "Date: Wed, 18 Feb 2026 02:03:12 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37418
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c4c4b1a0efa1e0",
|
||||||
|
"date": "Date: Wed, 11 Feb 2026 10:41:56 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from lahori fish n tikka",
|
||||||
|
"len": 37166
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c4013c5a7fac93",
|
||||||
|
"date": "Date: Mon, 09 Feb 2026 01:46:02 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Subway",
|
||||||
|
"len": 39212
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c30b95bf183a2b",
|
||||||
|
"date": "Date: Fri, 06 Feb 2026 02:12:59 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Souvlaki GR",
|
||||||
|
"len": 37776
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c30b773199c2fb",
|
||||||
|
"date": "Date: Fri, 06 Feb 2026 02:10:54 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Souvlaki GR",
|
||||||
|
"len": 37309
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c27f770fae04f2",
|
||||||
|
"date": "Date: Wed, 04 Feb 2026 09:24:13 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37440
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19c21316b26e066f",
|
||||||
|
"date": "Date: Tue, 03 Feb 2026 01:50:11 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Punjabi bai sweets & Indian\r\n cuisine",
|
||||||
|
"len": 39289
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19bf2e0fd25facda",
|
||||||
|
"date": "Date: Sun, 25 Jan 2026 01:59:48 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 38432
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19bb18096ebd9bf5",
|
||||||
|
"date": "Date: Mon, 12 Jan 2026 09:19:12 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Woolworths",
|
||||||
|
"len": 42464
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19bac527ef5fb1d4",
|
||||||
|
"date": "Date: Sun, 11 Jan 2026 09:10:45 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37833
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "19baad6dd7f80a9f",
|
||||||
|
"date": "Date: Sun, 11 Jan 2026 02:16:04 +0000 (UTC)",
|
||||||
|
"from": "From: DoorDash Order <no-reply@doordash.com>",
|
||||||
|
"subject": "Subject: Order Confirmation for Siddharth from Chilli India",
|
||||||
|
"len": 37334
|
||||||
|
}
|
||||||
|
]
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,205 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"i": 0,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkeckxXAAAA",
|
||||||
|
"date": "2026-07-22T03:41:19Z",
|
||||||
|
"subject": "Your Wednesday afternoon order with Uber Eats",
|
||||||
|
"len": 57778
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 1,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkd32TzAAAA",
|
||||||
|
"date": "2026-07-21T04:25:09Z",
|
||||||
|
"subject": "Your Tuesday afternoon order with Uber Eats",
|
||||||
|
"len": 61532
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 2,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkd32TsAAAA",
|
||||||
|
"date": "2026-07-20T23:17:05Z",
|
||||||
|
"subject": "Your Tuesday morning order with Uber Eats",
|
||||||
|
"len": 59110
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 3,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkdK0voAAAA",
|
||||||
|
"date": "2026-07-20T04:23:40Z",
|
||||||
|
"subject": "Your Monday afternoon order with Uber Eats",
|
||||||
|
"len": 66211
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 4,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkR0aigAAAA",
|
||||||
|
"date": "2026-07-07T15:31:27Z",
|
||||||
|
"subject": "[Family] Your Tuesday evening order with Uber Eats",
|
||||||
|
"len": 80279
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 5,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkR0aicAAAA",
|
||||||
|
"date": "2026-07-07T08:58:43Z",
|
||||||
|
"subject": "Your Tuesday evening order with Uber Eats",
|
||||||
|
"len": 73592
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 6,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkR0aibAAAA",
|
||||||
|
"date": "2026-07-07T08:50:06Z",
|
||||||
|
"subject": "[Family] Your Tuesday afternoon order with Uber Eats",
|
||||||
|
"len": 78782
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 7,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkR0aiaAAAA",
|
||||||
|
"date": "2026-07-07T08:46:17Z",
|
||||||
|
"subject": "Your Tuesday evening order with Uber Eats",
|
||||||
|
"len": 65886
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 8,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkR0ah6AAAA",
|
||||||
|
"date": "2026-07-05T15:51:11Z",
|
||||||
|
"subject": "[Family] Your Sunday evening order with Uber Eats",
|
||||||
|
"len": 82383
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 9,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkR0ah5AAAA",
|
||||||
|
"date": "2026-07-05T15:33:01Z",
|
||||||
|
"subject": "[Family] Your Sunday evening order with Uber Eats",
|
||||||
|
"len": 88958
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 10,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkR0ahTAAAA",
|
||||||
|
"date": "2026-07-03T10:04:15Z",
|
||||||
|
"subject": "Your Friday evening order with Uber Eats",
|
||||||
|
"len": 61485
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 11,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkR0ahFAAAA",
|
||||||
|
"date": "2026-07-02T22:57:18Z",
|
||||||
|
"subject": "Your Friday morning order with Uber Eats",
|
||||||
|
"len": 60751
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 12,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkOIIcBAAAA",
|
||||||
|
"date": "2026-06-27T04:21:08Z",
|
||||||
|
"subject": "Your Saturday afternoon order with Uber Eats",
|
||||||
|
"len": 60720
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 13,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkH8zVTAAAA",
|
||||||
|
"date": "2026-06-22T10:19:49Z",
|
||||||
|
"subject": "Your Monday evening order with Uber Eats",
|
||||||
|
"len": 58303
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 14,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkH8zUwAAAA",
|
||||||
|
"date": "2026-06-20T12:28:26Z",
|
||||||
|
"subject": "Your Saturday afternoon order with Uber Eats",
|
||||||
|
"len": 60856
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 15,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkH8zURAAAA",
|
||||||
|
"date": "2026-06-18T18:43:06Z",
|
||||||
|
"subject": "Your Thursday evening order with Uber Eats",
|
||||||
|
"len": 57881
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 16,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkGJuBoAAAA",
|
||||||
|
"date": "2026-06-15T19:32:17Z",
|
||||||
|
"subject": "Your Monday evening order with Uber Eats",
|
||||||
|
"len": 60838
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 17,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAj9_fg8AAAA",
|
||||||
|
"date": "2026-06-02T11:27:03Z",
|
||||||
|
"subject": "Your Tuesday evening order with Uber Eats",
|
||||||
|
"len": 55147
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 18,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAj7_L67AAAA",
|
||||||
|
"date": "2026-06-02T03:11:33Z",
|
||||||
|
"subject": "Your Tuesday afternoon order with Uber Eats",
|
||||||
|
"len": 60716
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 19,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAj66TeuAAAA",
|
||||||
|
"date": "2026-05-29T02:47:06Z",
|
||||||
|
"subject": "Your Friday afternoon order with Uber Eats",
|
||||||
|
"len": 55127
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 20,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAj19QCWNwAAAA==",
|
||||||
|
"date": "2026-05-23T03:00:14Z",
|
||||||
|
"subject": "Your Saturday afternoon order with Uber Eats",
|
||||||
|
"len": 65562
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 21,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAjzoSJtAAAA",
|
||||||
|
"date": "2026-05-18T10:50:25Z",
|
||||||
|
"subject": "Your Monday evening order with Uber Eats",
|
||||||
|
"len": 68144
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 22,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAjy8e6sAAAA",
|
||||||
|
"date": "2026-05-17T03:13:05Z",
|
||||||
|
"subject": "Your Sunday afternoon order with Uber Eats",
|
||||||
|
"len": 62439
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 23,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAjw8ZyAAAAA",
|
||||||
|
"date": "2026-05-15T09:45:15Z",
|
||||||
|
"subject": "Your Friday evening order with Uber Eats",
|
||||||
|
"len": 55113
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 24,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAjw8ZxwAAAA",
|
||||||
|
"date": "2026-05-14T15:02:24Z",
|
||||||
|
"subject": "Your Thursday afternoon order with Uber Eats",
|
||||||
|
"len": 58231
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 25,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAjw8ZxtAAAA",
|
||||||
|
"date": "2026-05-14T11:24:43Z",
|
||||||
|
"subject": "Your Thursday evening order with Uber Eats",
|
||||||
|
"len": 60745
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 26,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAjV0eF4AAAA",
|
||||||
|
"date": "2026-04-08T05:54:03Z",
|
||||||
|
"subject": "Your Tuesday evening order with Uber Eats",
|
||||||
|
"len": 68338
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 27,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAjV0eFyAAAA",
|
||||||
|
"date": "2026-04-07T22:40:52Z",
|
||||||
|
"subject": "Your Tuesday afternoon order with Uber Eats",
|
||||||
|
"len": 52600
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"i": 28,
|
||||||
|
"id": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAjV0eFcAAAA",
|
||||||
|
"date": "2026-04-06T05:23:40Z",
|
||||||
|
"subject": "Your Sunday evening order with Uber Eats",
|
||||||
|
"len": 59440
|
||||||
|
}
|
||||||
|
]
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"ut-00": {
|
||||||
|
"messageId": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkH8zVAAAAA",
|
||||||
|
"subject": "Your Sunday evening trip with Uber",
|
||||||
|
"receivedAt": "2026-06-21T10:11:16Z",
|
||||||
|
"sender": "noreply@uber.com"
|
||||||
|
},
|
||||||
|
"ut-01": {
|
||||||
|
"messageId": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkH8zU-AAAA",
|
||||||
|
"subject": "Your Sunday morning trip with Uber",
|
||||||
|
"receivedAt": "2026-06-21T09:02:09Z",
|
||||||
|
"sender": "noreply@uber.com"
|
||||||
|
},
|
||||||
|
"ut-summary": {
|
||||||
|
"messageId": "AQMkADAwATM0MDAAMS1hYzQyLTVjZDktMDACLTAwCgBGAAADS6kDcxBxKkKwbCK1wU1QlwcA7Ex_hlaTTU0AgHQ16optl_AAAAIBDAAAAOxMfoZWk01NAIB0NeqKbZfgAAkH8zU3AAAA",
|
||||||
|
"subject": "Your Sunday morning trip with Uber",
|
||||||
|
"receivedAt": "2026-06-20T22:27:54Z",
|
||||||
|
"sender": "noreply@uber.com"
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,185 @@
|
|||||||
|
import { describe, it, expect } from "vitest";
|
||||||
|
import { queryRaw, queryRow } from "../../lib/db";
|
||||||
|
import {
|
||||||
|
EXCLUDE_RECONCILED_SOURCE,
|
||||||
|
NATIVE_CURRENCY,
|
||||||
|
AMOUNT_UNCONVERTED,
|
||||||
|
INVESTMENT_SIGNED,
|
||||||
|
} from "../../lib/analytics-sql";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* These fragments are the ones that drifted.
|
||||||
|
*
|
||||||
|
* The reconciled-row exclusion lived only in `queries.ts` for months while every
|
||||||
|
* analytics route counted the superseded manual rows as spend — 48 rows, $4,474
|
||||||
|
* of double count, invisible because the transaction list (which did exclude
|
||||||
|
* them) looked right. The currency expression has the same shape of risk: it is
|
||||||
|
* read by two call sites with two different denomination conventions.
|
||||||
|
*
|
||||||
|
* Assertions are per-row against known fixtures rather than against aggregate
|
||||||
|
* totals, so a change in unrelated data cannot mask a regression.
|
||||||
|
*/
|
||||||
|
|
||||||
|
async function scratchTxn(cols: string, vals: string, params: unknown[] = []) {
|
||||||
|
const row = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO transactions (${cols}) VALUES (${vals}) RETURNING id`,
|
||||||
|
params
|
||||||
|
);
|
||||||
|
return row!.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Does this row survive the predicate? */
|
||||||
|
async function passes(predicate: string, id: number): Promise<boolean> {
|
||||||
|
const rows = await queryRaw(
|
||||||
|
`SELECT t.id FROM transactions t
|
||||||
|
LEFT JOIN statements s ON s.id = t.statement_id
|
||||||
|
WHERE t.id = $1 AND (${predicate})`,
|
||||||
|
[id]
|
||||||
|
);
|
||||||
|
return rows.length === 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("EXCLUDE_RECONCILED_SOURCE", () => {
|
||||||
|
it("drops a manual row that a statement line has superseded", async () => {
|
||||||
|
const survivor = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type",
|
||||||
|
"'2026-03-01','Analytics fixture — survivor', 10.00, 'debit'"
|
||||||
|
);
|
||||||
|
const superseded = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type, reconciled_with_id",
|
||||||
|
"'2026-03-01','Analytics fixture — superseded', 10.00, 'debit', $1",
|
||||||
|
[survivor]
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(await passes(EXCLUDE_RECONCILED_SOURCE, superseded)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps an ordinary manual row that was never reconciled", async () => {
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type",
|
||||||
|
"'2026-03-01','Analytics fixture — unreconciled', 10.00, 'debit'"
|
||||||
|
);
|
||||||
|
expect(await passes(EXCLUDE_RECONCILED_SOURCE, id)).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps a credits order row — nothing ever sets reconciled_with_id on one", async () => {
|
||||||
|
// The order slice records the card match in expense_metadata, not on the
|
||||||
|
// transaction, and needsCardMatch() holds these out of the reconcile queue.
|
||||||
|
// If that ever changes, this exclusion would start eating real spend.
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type, payment_method",
|
||||||
|
"'2026-03-01','Order - Analytics fixture', 25.00, 'debit', 'credits'"
|
||||||
|
);
|
||||||
|
expect(await passes(EXCLUDE_RECONCILED_SOURCE, id)).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("NATIVE_CURRENCY", () => {
|
||||||
|
async function currencyOf(id: number) {
|
||||||
|
const row = await queryRow<{ ccy: string; unconverted: boolean }>(
|
||||||
|
`SELECT ${NATIVE_CURRENCY} AS ccy, ${AMOUNT_UNCONVERTED} AS unconverted
|
||||||
|
FROM transactions t LEFT JOIN statements s ON s.id = t.statement_id
|
||||||
|
WHERE t.id = $1`,
|
||||||
|
[id]
|
||||||
|
);
|
||||||
|
return row!;
|
||||||
|
}
|
||||||
|
|
||||||
|
it("reads a statement-less order row's own currency, not 'AUD'", async () => {
|
||||||
|
// The bug this guards: sourcing currency from s.currency alone labelled
|
||||||
|
// every foreign order row AUD, because an order has no statement.
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type, payment_method, foreign_currency_amount, foreign_currency_code",
|
||||||
|
"'2026-03-01','Order - Foreign fixture', 3500.00, 'debit', 'credits', 3500.00, 'LKR'"
|
||||||
|
);
|
||||||
|
const { ccy, unconverted } = await currencyOf(id);
|
||||||
|
expect(ccy).toBe("LKR");
|
||||||
|
// No amount_aud: the ingest path refuses to assert an FX rate it lacks, so
|
||||||
|
// this row's AUD value is genuinely unknown and must be reported as such.
|
||||||
|
expect(unconverted).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("prefers the statement's currency over the foreign-charge record", async () => {
|
||||||
|
// Opposite convention: on an AUD statement, `amount` is AUD and
|
||||||
|
// foreign_currency_code merely notes what was originally charged. Reading
|
||||||
|
// the foreign code here would mislabel an AUD row as USD.
|
||||||
|
const stmt = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO statements (bank_name, account_number, billing_end_date, currency, filename)
|
||||||
|
VALUES ('Analytics Fixture Bank','0000','2026-03-31','AUD','analytics-fixture.pdf') RETURNING id`
|
||||||
|
);
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, amount_aud, transaction_type, statement_id, foreign_currency_amount, foreign_currency_code",
|
||||||
|
"'2026-03-01','Overseas purchase fixture', 45.00, 45.00, 'debit', $1, 30.00, 'USD'",
|
||||||
|
[stmt!.id]
|
||||||
|
);
|
||||||
|
const { ccy, unconverted } = await currencyOf(id);
|
||||||
|
expect(ccy).toBe("AUD");
|
||||||
|
expect(unconverted).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("defaults a plain manual row to AUD", async () => {
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type",
|
||||||
|
"'2026-03-01','Plain manual fixture', 12.00, 'debit'"
|
||||||
|
);
|
||||||
|
expect((await currencyOf(id)).ccy).toBe("AUD");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("INVESTMENT_SIGNED", () => {
|
||||||
|
/** The signed value the investments line would attribute to this row. */
|
||||||
|
async function signedValue(id: number): Promise<number> {
|
||||||
|
const row = await queryRow<{ v: string }>(
|
||||||
|
`SELECT (${INVESTMENT_SIGNED})::text AS v FROM transactions t WHERE t.id = $1`,
|
||||||
|
[id]
|
||||||
|
);
|
||||||
|
return Number(row!.v);
|
||||||
|
}
|
||||||
|
|
||||||
|
it("counts a contribution positive", async () => {
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type, category",
|
||||||
|
"'2026-03-01','Investment fixture — deposit', 5000.00, 'debit', 'investment'"
|
||||||
|
);
|
||||||
|
expect(await signedValue(id)).toBe(5000);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("counts a withdrawal negative so it nets against contributions", async () => {
|
||||||
|
// The $25,000 Raiz withdrawal that made March 2026 read as a $38,615.34
|
||||||
|
// investing month when it was net -$11,384.66.
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type, category",
|
||||||
|
"'2026-03-19','Investment fixture — withdrawal', 25000.00, 'credit', 'investment'"
|
||||||
|
);
|
||||||
|
expect(await signedValue(id)).toBe(-25000);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("a deposit and an equal withdrawal net to zero", async () => {
|
||||||
|
const inId = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type, category",
|
||||||
|
"'2026-03-01','Investment fixture — net in', 1000.00, 'debit', 'investment'"
|
||||||
|
);
|
||||||
|
const outId = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type, category",
|
||||||
|
"'2026-03-02','Investment fixture — net out', 1000.00, 'credit', 'investment'"
|
||||||
|
);
|
||||||
|
expect(await signedValue(inId) + await signedValue(outId)).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("prefers amount_aud over the native amount", async () => {
|
||||||
|
// The IBKR rows are USD; the line is denominated in AUD.
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, amount_aud, transaction_type, category",
|
||||||
|
"'2026-07-25','Investment fixture — foreign', 10000.00, 14310.00, 'debit', 'investment'"
|
||||||
|
);
|
||||||
|
expect(await signedValue(id)).toBe(14310);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("treats a refund like a withdrawal", async () => {
|
||||||
|
const id = await scratchTxn(
|
||||||
|
"transaction_date, description, amount, transaction_type, category",
|
||||||
|
"'2026-03-01','Investment fixture — reversal', 1500.00, 'refund', 'investment'"
|
||||||
|
);
|
||||||
|
expect(await signedValue(id)).toBe(-1500);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
import { Pool } from "pg";
|
||||||
|
import { vi } from "vitest";
|
||||||
|
|
||||||
|
export function createPool() {
|
||||||
|
return new Pool({ connectionString: process.env.DATABASE_URL });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Replace the app's Prisma-based queryRaw with a direct pg call so that
|
||||||
|
// tests don't depend on Prisma's singleton picking up the right DATABASE_URL.
|
||||||
|
// Must be called BEFORE dynamically importing any module that uses @/lib/db.
|
||||||
|
// Uses vi.doMock (not vi.mock) so it is NOT hoisted and CAN close over `p`.
|
||||||
|
export function mockDbWithPool(p: Pool) {
|
||||||
|
vi.resetModules(); // clear module cache so fresh imports pick up the mock
|
||||||
|
vi.doMock("@/lib/db", () => ({
|
||||||
|
queryRaw: async (sql: string, params: unknown[] = []) => {
|
||||||
|
const result = await p.query(sql, params);
|
||||||
|
return result.rows;
|
||||||
|
},
|
||||||
|
// Mirrors the real module: a mock that omits an export makes it `undefined`
|
||||||
|
// at the call site, so any route using queryRow fails with a confusing
|
||||||
|
// "not a function" rather than a query error.
|
||||||
|
queryRow: async (sql: string, params: unknown[] = []) => {
|
||||||
|
const result = await p.query(sql, params);
|
||||||
|
return result.rows[0] ?? null;
|
||||||
|
},
|
||||||
|
prisma: p,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Refuse to truncate anything that is not the test database.
|
||||||
|
*
|
||||||
|
* `DATABASE_URL` in `.env.test` names the Postgres container by IP, and
|
||||||
|
* container IPs move on recreation: 172.22.0.47 stopped being
|
||||||
|
* `postgres-personal` and became `postgres-pantry`, so the suite spent a while
|
||||||
|
* pointing its TRUNCATE at another app's database. It only failed safe because
|
||||||
|
* the credentials happened not to match — had they matched, this would have
|
||||||
|
* wiped pantry-app.
|
||||||
|
*
|
||||||
|
* Checked once per process, before the first truncate.
|
||||||
|
*/
|
||||||
|
let targetVerified = false;
|
||||||
|
async function assertTestDatabase(pool: Pool) {
|
||||||
|
if (targetVerified) return;
|
||||||
|
const { rows } = await pool.query<{ db: string }>(`SELECT current_database() AS db`);
|
||||||
|
const db = rows[0]?.db;
|
||||||
|
if (db !== "personal_test") {
|
||||||
|
throw new Error(
|
||||||
|
`Refusing to truncate: connected to "${db}", expected "personal_test". ` +
|
||||||
|
`Check DATABASE_URL in .env.test — the Postgres container IP may have changed ` +
|
||||||
|
`(docker inspect postgres-personal --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}').`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
targetVerified = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Wipe all data tables and restart sequences between tests. */
|
||||||
|
export async function resetDB(pool: Pool) {
|
||||||
|
await assertTestDatabase(pool);
|
||||||
|
await pool.query(`
|
||||||
|
TRUNCATE
|
||||||
|
split_payments,
|
||||||
|
transaction_splits,
|
||||||
|
transaction_tags,
|
||||||
|
transaction_overrides,
|
||||||
|
rule_apply_runs,
|
||||||
|
rules,
|
||||||
|
budgets,
|
||||||
|
account_owner_mappings,
|
||||||
|
transactions,
|
||||||
|
statements,
|
||||||
|
tags,
|
||||||
|
trips,
|
||||||
|
participants
|
||||||
|
RESTART IDENTITY CASCADE
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Seed two participants and return their IDs. */
|
||||||
|
export async function seedParticipants(pool: Pool, names: [string, string] = ["Alice", "Bob"]) {
|
||||||
|
const r1 = await pool.query(
|
||||||
|
`INSERT INTO participants (name) VALUES ($1) RETURNING id`,
|
||||||
|
[names[0]]
|
||||||
|
);
|
||||||
|
const r2 = await pool.query(
|
||||||
|
`INSERT INTO participants (name) VALUES ($1) RETURNING id`,
|
||||||
|
[names[1]]
|
||||||
|
);
|
||||||
|
return { ownerId: r1.rows[0].id as number, otherId: r2.rows[0].id as number };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Insert a manual transaction (no statement) and return its id. */
|
||||||
|
export async function insertTransaction(
|
||||||
|
pool: Pool,
|
||||||
|
ownerId: number,
|
||||||
|
overrides: {
|
||||||
|
description?: string;
|
||||||
|
amount?: number;
|
||||||
|
category?: string;
|
||||||
|
transaction_type?: string;
|
||||||
|
transaction_date?: string;
|
||||||
|
merchant_normalized?: string;
|
||||||
|
} = {}
|
||||||
|
): Promise<number> {
|
||||||
|
const r = await pool.query(
|
||||||
|
`INSERT INTO transactions
|
||||||
|
(owner_id, statement_id, transaction_date, description, amount, transaction_type, category, row_index)
|
||||||
|
VALUES ($1, NULL, $2, $3, $4, $5, $6, 0) RETURNING id`,
|
||||||
|
[
|
||||||
|
ownerId,
|
||||||
|
// Post-cutover by default: a split on an older transaction never counts
|
||||||
|
// towards a balance (ACTIVE_OBLIGATION), so a pre-cutover default would
|
||||||
|
// make every balance fixture silently read zero.
|
||||||
|
overrides.transaction_date ?? "2026-06-15",
|
||||||
|
overrides.description ?? "Test transaction",
|
||||||
|
overrides.amount ?? 100,
|
||||||
|
overrides.transaction_type ?? "debit",
|
||||||
|
overrides.category ?? "other",
|
||||||
|
]
|
||||||
|
);
|
||||||
|
return r.rows[0].id as number;
|
||||||
|
}
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
import { describe, it, expect, beforeAll } from "vitest";
|
||||||
|
import { readFileSync } from "fs";
|
||||||
|
import { resolve } from "path";
|
||||||
|
import { queryRaw } from "../../lib/db";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The HTTP path had no tests at all — which is how three defects reached the
|
||||||
|
* branch through a suite of 105 green ones. These exercise the route handler
|
||||||
|
* directly (no server needed) so the auth gate and the error taxonomy are
|
||||||
|
* actually covered.
|
||||||
|
*/
|
||||||
|
const dir = resolve(__dirname, "../fixtures/orders/real");
|
||||||
|
const html = (f: string) => readFileSync(resolve(dir, `${f}.html`), "utf-8");
|
||||||
|
|
||||||
|
const TOKEN = "test-ingest-token";
|
||||||
|
let POST: any;
|
||||||
|
|
||||||
|
const req = (body: unknown, token: string | null = TOKEN) =>
|
||||||
|
({
|
||||||
|
headers: { get: (h: string) => (h === "x-ingest-token" ? token : null) },
|
||||||
|
json: async () => body,
|
||||||
|
}) as any;
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
process.env.ORDER_INGEST_TOKEN = TOKEN;
|
||||||
|
({ POST } = await import("../../app/api/orders/ingest/route"));
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("ingest API — auth", () => {
|
||||||
|
it("rejects a missing token", async () => {
|
||||||
|
const res = await POST(req({ html: "x", meta: {} }, null));
|
||||||
|
expect(res.status).toBe(401);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a wrong token", async () => {
|
||||||
|
const res = await POST(req({ html: "x", meta: {} }, "nope"));
|
||||||
|
expect(res.status).toBe(401);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a malformed body", async () => {
|
||||||
|
const res = await POST(req({ html: "only html" }));
|
||||||
|
expect(res.status).toBe(400);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("ingest API — error taxonomy", () => {
|
||||||
|
const meta = (over = {}) => ({
|
||||||
|
messageId: `api-${Math.random().toString(36).slice(2)}`,
|
||||||
|
subject: "Order Confirmation for Siddharth from Mad Mex",
|
||||||
|
receivedAt: "2026-07-16T03:34:00Z",
|
||||||
|
sender: "DoorDash Order <no-reply@doordash.com>",
|
||||||
|
...over,
|
||||||
|
});
|
||||||
|
|
||||||
|
it("a non-receipt is 200 and silent — it must not alert", async () => {
|
||||||
|
// A newsletter: real traffic, correctly ignored.
|
||||||
|
const res = await POST(req({ html: html("dd-01"), meta: meta({ subject: "Newsletter", sender: "promo@example.com" }) }));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect((await res.json()).kind).toBe("skipped");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("an adjustment notice is 200 and silent", async () => {
|
||||||
|
const res = await POST(req({
|
||||||
|
html: html("dd-08"),
|
||||||
|
meta: meta({ subject: "Order Confirmation for Siddharth from ALDI" }),
|
||||||
|
}));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect((await res.json()).kind).toBe("skipped");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("a receipt that cannot be parsed is 422 so it ALERTS", async () => {
|
||||||
|
// A DoorDash receipt with its totals stripped out — i.e. what a provider
|
||||||
|
// template change looks like. Previously this returned 200 and vanished.
|
||||||
|
const broken = html("dd-01")
|
||||||
|
.replace(/Total Charged/g, "Gesamtbetrag")
|
||||||
|
.replace(/Total:/g, "Summe:");
|
||||||
|
const res = await POST(req({ html: broken, meta: meta() }));
|
||||||
|
expect(res.status).toBe(422);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.kind).toBe("parse_failed");
|
||||||
|
expect(body.reason).toMatch(/total/i);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("a refund is routed to the amendment path, not ingestion", async () => {
|
||||||
|
const res = await POST(req({
|
||||||
|
html: html("ue-05"),
|
||||||
|
meta: meta({ subject: "Your Tuesday evening order with Uber Eats", sender: "uber.com" }),
|
||||||
|
dryRun: true,
|
||||||
|
}));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.kind).toBe("amendment");
|
||||||
|
expect(body.amendment.new_total).toBeCloseTo(45.73, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("a good receipt ingests", async () => {
|
||||||
|
await queryRaw(`DELETE FROM expense_metadata WHERE source = 'email'`);
|
||||||
|
await queryRaw(`DELETE FROM transactions WHERE description LIKE 'Order - %'`);
|
||||||
|
const res = await POST(req({ html: html("dd-01"), meta: meta({ messageId: "api-ok-1" }) }));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.kind).toBe("order");
|
||||||
|
expect(body.total).toBe(14.64);
|
||||||
|
expect(body.transactionId).not.toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,532 @@
|
|||||||
|
import { describe, it, expect, beforeEach } from "vitest";
|
||||||
|
import { readFileSync } from "fs";
|
||||||
|
import { resolve } from "path";
|
||||||
|
import { queryRaw, queryRow } from "../../lib/db";
|
||||||
|
import {
|
||||||
|
parseOrderHTML,
|
||||||
|
validateOrderTotals,
|
||||||
|
processOrderIngestion,
|
||||||
|
reconcilePendingOrders,
|
||||||
|
parseOrderAmendment,
|
||||||
|
applyOrderAmendment,
|
||||||
|
NotAReceiptError,
|
||||||
|
type MessageMeta,
|
||||||
|
} from "../../lib/order-ingestion";
|
||||||
|
import { EXCLUDE_NON_SPEND } from "../../lib/analytics-sql";
|
||||||
|
import { bankLabel, needsCardMatch } from "../../lib/queries";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* These run against REAL captured receipts, not synthetic fixtures. The earlier
|
||||||
|
* suite passed 31/31 against fixtures written to satisfy the parser, while the
|
||||||
|
* parser could not read a single real email. Fixtures live in
|
||||||
|
* __tests__/fixtures/orders/real/ and are unmodified message bodies.
|
||||||
|
*/
|
||||||
|
const dir = resolve(__dirname, "../fixtures/orders/real");
|
||||||
|
const html = (f: string) => readFileSync(resolve(dir, `${f}.html`), "utf-8");
|
||||||
|
|
||||||
|
const meta = (over: Partial<MessageMeta> = {}): MessageMeta => ({
|
||||||
|
messageId: `test-${Math.random().toString(36).slice(2)}`,
|
||||||
|
subject: "Order Confirmation for Siddharth from Mad Mex",
|
||||||
|
receivedAt: "2026-07-16T03:34:00Z",
|
||||||
|
sender: "DoorDash Order <no-reply@doordash.com>",
|
||||||
|
...over,
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Order parsing — real receipts", () => {
|
||||||
|
it("reads DoorDash totals structurally, not by flattening (I9)", () => {
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta());
|
||||||
|
expect(p.merchant_name).toBe("Mad Mex");
|
||||||
|
expect(p.totals.total_charged).toBe(14.64);
|
||||||
|
expect(p.payment.credits_amount).toBe(14.64);
|
||||||
|
expect(p.line_items).toHaveLength(1);
|
||||||
|
expect(p.line_items[0].description).toBe("Burrito (Mains)");
|
||||||
|
expect(p.line_items[0].options).toContain("Slow Cooked Beef (GF)");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does NOT gate on DoorDash's fee breakdown, which genuinely does not reconcile", () => {
|
||||||
|
// Real receipt: subtotal 22.10 + service 1.99 - Discounts 24.09 = 0.00,
|
||||||
|
// against a stated total of 14.64. DoorDash prints this; it is not a parse
|
||||||
|
// artefact. Recorded here so nobody "fixes" the parser to force it to sum.
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta());
|
||||||
|
expect(p.totals.subtotal).toBe(22.10);
|
||||||
|
expect(p.totals.discounts).toBe(24.09);
|
||||||
|
expect(validateOrderTotals(p, html("dd-01")).ok).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("derives order_reference from the message, never randomly (I7)", () => {
|
||||||
|
const m = meta({ messageId: "abc123" });
|
||||||
|
const a = parseOrderHTML(html("dd-01"), m);
|
||||||
|
const b = parseOrderHTML(html("dd-01"), m);
|
||||||
|
expect(a.order_reference).toBe(b.order_reference);
|
||||||
|
expect(a.order_reference).toBe("msg:abc123");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses Uber's embedded order UUID as the reference", () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-00"),
|
||||||
|
meta({ subject: "Your Wednesday afternoon order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
expect(p.order_reference).toMatch(/^[0-9a-f-]{36}$/);
|
||||||
|
expect(p.platform).toBe("ubereats");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("takes the order date from the message, not a body string", () => {
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta({ receivedAt: "2026-07-16T03:34:00Z" }));
|
||||||
|
expect(p.order_datetime.slice(0, 10)).toBe("2026-07-16");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects [Family] from the subject prefix, not a body substring (I11)", () => {
|
||||||
|
const fam = parseOrderHTML(
|
||||||
|
html("ue-04"),
|
||||||
|
meta({ subject: "[Family] Your Tuesday evening order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
expect(fam.is_family).toBe(true);
|
||||||
|
const notFam = parseOrderHTML(html("dd-01"), meta());
|
||||||
|
expect(notFam.is_family).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reads [Family] orders as LKR, not dollars", () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-04"),
|
||||||
|
meta({ subject: "[Family] Your Tuesday evening order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
expect(p.currency).toBe("LKR");
|
||||||
|
expect(p.totals.total_charged).toBeCloseTo(3783.20, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reads Swiss orders as CHF", () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-26"),
|
||||||
|
meta({ subject: "Your Tuesday evening order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
expect(p.currency).toBe("CHF");
|
||||||
|
expect(p.totals.total_charged).toBeCloseTo(51.23, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("skips a failed payment attempt and takes the successful one", () => {
|
||||||
|
// ue-09: "Visa ••••8841 LKR 4,267.01 ... Failed" then "LKR 3,757.01".
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-09"),
|
||||||
|
meta({ subject: "[Family] Your Sunday evening order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
expect(p.totals.total_charged).toBeCloseTo(3757.01, 2);
|
||||||
|
expect(validateOrderTotals(p, html("ue-09")).ok).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects an order-adjustment notice rather than booking $0.00", () => {
|
||||||
|
// NotAReceiptError, not OrderParseError: this is expected traffic, so it
|
||||||
|
// must be skipped silently. Only a receipt that fails to parse should
|
||||||
|
// alert — see the ingest API's error taxonomy.
|
||||||
|
expect(() =>
|
||||||
|
parseOrderHTML(html("dd-08"), meta({ subject: "Order Confirmation for Siddharth from ALDI" }))
|
||||||
|
).toThrow(NotAReceiptError);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a refund notice rather than inserting a duplicate order", () => {
|
||||||
|
expect(() =>
|
||||||
|
parseOrderHTML(html("ue-05"), meta({ subject: "Your Tuesday evening order with Uber Eats", sender: "uber.com" }))
|
||||||
|
).toThrow(/refund/i);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reads a grocery Final receipt that has no Total Charged row", () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("dd-10"),
|
||||||
|
meta({ subject: "Order Confirmation for Siddharth from Woolworths" })
|
||||||
|
);
|
||||||
|
expect(p.totals.total_charged).toBeCloseTo(60.93, 2);
|
||||||
|
expect(p.payment.ambiguous).toBe(true); // "8032 and/or credits"
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Order ingestion — invariants", () => {
|
||||||
|
beforeEach(async () => {
|
||||||
|
await queryRaw(`DELETE FROM expense_metadata WHERE source = 'email'`);
|
||||||
|
await queryRaw(`DELETE FROM transactions WHERE description LIKE 'Order - %'`);
|
||||||
|
// The statement fixtures these tests insert survived into the next run, and
|
||||||
|
// reconcileCardLeg matched a leftover charge at ingest time — so an order
|
||||||
|
// meant to park "awaiting_card_statement" resolved immediately instead.
|
||||||
|
// That is the whole story behind the intermittent failure in "parks an
|
||||||
|
// unresolvable split": not a race, just fixtures that were never cleaned.
|
||||||
|
// Must happen BEFORE ingest, which is why cleaning up at the end of the
|
||||||
|
// test was not enough.
|
||||||
|
await queryRaw(
|
||||||
|
`DELETE FROM statements WHERE filename IN ('test-westpac-2026-03.pdf', 'panel-cba.pdf', 'panel-plain.pdf')`
|
||||||
|
);
|
||||||
|
await queryRaw(
|
||||||
|
`DELETE FROM transactions WHERE description IN ('DD *DOORDASH WOOLWORTHS MELBOURNE AUS', 'UBER *EATS ZURICH')`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("I6: a credits order creates one transaction at face value", async () => {
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta());
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
expect(res.transactionId).not.toBeNull();
|
||||||
|
const txn = await queryRow<{ amount: string; payment_method: string; category: string }>(
|
||||||
|
`SELECT amount::text, payment_method, category FROM transactions WHERE id = $1`,
|
||||||
|
[res.transactionId]
|
||||||
|
);
|
||||||
|
expect(Number(txn!.amount)).toBe(14.64);
|
||||||
|
expect(txn!.payment_method).toBe("credits");
|
||||||
|
expect(txn!.category).toBe("dining");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("I7: re-ingesting the same receipt creates nothing new", async () => {
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta({ messageId: "dedupe-1" }));
|
||||||
|
const a = await processOrderIngestion(p);
|
||||||
|
const b = await processOrderIngestion(parseOrderHTML(html("dd-01"), meta({ messageId: "dedupe-1" })));
|
||||||
|
expect(b.skipped).toBe("already_ingested");
|
||||||
|
expect(b.metadataId).toBe(a.metadataId);
|
||||||
|
const n = await queryRow<{ c: string }>(
|
||||||
|
`SELECT count(*)::text c FROM transactions WHERE description = 'Order - Mad Mex'`
|
||||||
|
);
|
||||||
|
expect(Number(n!.c)).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("I1 retired: a credits order before the cutover is recorded, not refused", async () => {
|
||||||
|
// I1 used to store nothing at all for these — no transaction and no
|
||||||
|
// metadata — so the receipt was discarded. Its reason was splits (shared
|
||||||
|
// expenses lived in SplitMyExpenses before 2026-01-09), and that expired
|
||||||
|
// when ACTIVE_OBLIGATION gained its date bound: a pre-cutover split can no
|
||||||
|
// longer assert a debt, so a pre-cutover order cannot move a balance
|
||||||
|
// however it is recorded. All it was still doing was hiding history.
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta({ receivedAt: "2025-11-15T12:00:00Z" }));
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
expect(res.skipped).toBeUndefined();
|
||||||
|
expect(res.transactionId).not.toBeNull();
|
||||||
|
expect(res.flags).toContain("pre_cutover_credits_order");
|
||||||
|
|
||||||
|
const txn = await queryRow<{ transaction_date: string; payment_method: string; amount: string }>(
|
||||||
|
`SELECT transaction_date::text, payment_method, amount::text
|
||||||
|
FROM transactions WHERE id = $1`,
|
||||||
|
[res.transactionId]
|
||||||
|
);
|
||||||
|
expect(txn!.transaction_date).toBe("2025-11-15");
|
||||||
|
expect(txn!.payment_method).toBe("credits");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("a pre-cutover order still creates no split, so no balance moves", async () => {
|
||||||
|
// The whole safety argument for retiring I1. Ingestion writes no splits at
|
||||||
|
// any date; if that ever changes, this fails before a balance does.
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta({ receivedAt: "2025-11-15T12:00:00Z", messageId: "pre-cut-2" }));
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
const n = await queryRow<{ c: string }>(
|
||||||
|
`SELECT count(*)::text c FROM transaction_splits WHERE transaction_id = $1`,
|
||||||
|
[res.transactionId]
|
||||||
|
);
|
||||||
|
expect(Number(n!.c)).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("I11: a [Family] order records provenance and creates no transaction", async () => {
|
||||||
|
// Requirement was "import them but tag so they're excluded from budgets".
|
||||||
|
// Correct mechanism: the CARD statement line is the transaction and carries
|
||||||
|
// the family tag. Creating a second, credits-flavoured row duplicated it.
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-04"),
|
||||||
|
meta({ subject: "[Family] Your Tuesday evening order with Uber Eats", sender: "uber.com", receivedAt: "2026-07-07T10:08:00Z" })
|
||||||
|
);
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
expect(res.transactionId).toBeNull();
|
||||||
|
expect(res.flags).toContain("family_card_settled_no_transaction");
|
||||||
|
|
||||||
|
const meta_ = await queryRow<{ currency: string }>(
|
||||||
|
`SELECT currency FROM expense_metadata WHERE id = $1`, [res.metadataId]
|
||||||
|
);
|
||||||
|
expect(meta_!.currency).toBe("LKR");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("a foreign-currency order records the original amount and code", async () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-26"),
|
||||||
|
meta({ subject: "Your Tuesday evening order with Uber Eats", sender: "uber.com", receivedAt: "2026-04-07T08:53:00Z" })
|
||||||
|
);
|
||||||
|
// Card-settled Swiss order: no credits leg, so no transaction (I5).
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
expect(res.transactionId).toBeNull();
|
||||||
|
const meta_ = await queryRow<{ currency: string }>(
|
||||||
|
`SELECT currency FROM expense_metadata WHERE id = $1`,
|
||||||
|
[res.metadataId]
|
||||||
|
);
|
||||||
|
expect(meta_!.currency).toBe("CHF");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("parks an unresolvable split instead of guessing, then resolves it once the statement lands", async () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("dd-10"),
|
||||||
|
meta({ subject: "Order Confirmation for Siddharth from Woolworths", receivedAt: "2026-03-02T12:00:00Z" })
|
||||||
|
);
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
expect(res.transactionId).toBeNull();
|
||||||
|
expect(res.flags).toContain("awaiting_card_statement");
|
||||||
|
|
||||||
|
// Statement arrives: card 8032 took 40.93 of the 60.93 order.
|
||||||
|
const st = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO statements (bank_name, account_number, filename)
|
||||||
|
VALUES ('Westpac','5163103015778032','test-westpac-2026-03.pdf') RETURNING id`
|
||||||
|
);
|
||||||
|
await queryRaw(
|
||||||
|
`INSERT INTO transactions (statement_id, transaction_date, description, amount, transaction_type)
|
||||||
|
VALUES ($1, '2026-03-02', 'DD *DOORDASH WOOLWORTHS MELBOURNE AUS', 40.93, 'debit')`,
|
||||||
|
[st!.id]
|
||||||
|
);
|
||||||
|
|
||||||
|
const out = await reconcilePendingOrders();
|
||||||
|
// Deliberately not asserting global counts: reconcilePendingOrders() scans
|
||||||
|
// every pending row in the database, so another test's leftovers change the
|
||||||
|
// totals. Assert on THIS order's outcome instead — that is what the test is
|
||||||
|
// actually about, and it does not depend on what else is in the table.
|
||||||
|
expect(out.examined).toBeGreaterThanOrEqual(1);
|
||||||
|
|
||||||
|
const credits = await queryRow<{ amount: string }>(
|
||||||
|
`SELECT t.amount::text FROM transactions t
|
||||||
|
JOIN expense_metadata em ON em.transaction_id = t.id
|
||||||
|
WHERE em.id = $1`,
|
||||||
|
[res.metadataId]
|
||||||
|
);
|
||||||
|
expect(Number(credits!.amount)).toBeCloseTo(20.00, 2); // 60.93 - 40.93
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reconciliation is idempotent — a second pass creates nothing", async () => {
|
||||||
|
// A first pass has already run above; a second must add nothing. Scoped to
|
||||||
|
// 'Order - %' rows so unrelated fixtures cannot move the number.
|
||||||
|
const q = `SELECT count(*)::text c FROM transactions WHERE description LIKE 'Order - %'`;
|
||||||
|
const before = await queryRow<{ c: string }>(q);
|
||||||
|
const out = await reconcilePendingOrders();
|
||||||
|
const after = await queryRow<{ c: string }>(q);
|
||||||
|
expect(out.created).toBe(0);
|
||||||
|
expect(after!.c).toBe(before!.c);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("EXCLUDE_NON_SPEND removes family-tagged rows", async () => {
|
||||||
|
const txn = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO transactions (transaction_date, description, amount, category, transaction_type)
|
||||||
|
VALUES ('2026-03-01','Order - Family Test', 50.00, 'dining', 'debit') RETURNING id`
|
||||||
|
);
|
||||||
|
const tag = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO tags (name, color) VALUES ('family','#ef4444')
|
||||||
|
ON CONFLICT (name) DO UPDATE SET name = EXCLUDED.name RETURNING id`
|
||||||
|
);
|
||||||
|
await queryRaw(`INSERT INTO transaction_tags (transaction_id, tag_id) VALUES ($1,$2)`, [txn!.id, tag!.id]);
|
||||||
|
|
||||||
|
const visible = await queryRaw(
|
||||||
|
`SELECT t.id FROM transactions t
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
WHERE t.id = $1 AND (${EXCLUDE_NON_SPEND})`,
|
||||||
|
[txn!.id]
|
||||||
|
);
|
||||||
|
expect(visible).toHaveLength(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Refund amendments", () => {
|
||||||
|
const ueMeta = (over = {}) => meta({
|
||||||
|
subject: "Your Tuesday evening order with Uber Eats",
|
||||||
|
sender: "uber.com",
|
||||||
|
receivedAt: "2026-07-07T08:17:00Z",
|
||||||
|
...over,
|
||||||
|
});
|
||||||
|
|
||||||
|
it("parses a refund notice into an amendment, not an order", () => {
|
||||||
|
const a = parseOrderAmendment(html("ue-05"), ueMeta());
|
||||||
|
expect(a.previous_total).toBeCloseTo(49.94, 2);
|
||||||
|
expect(a.refund_amount).toBeCloseTo(4.21, 2);
|
||||||
|
expect(a.new_total).toBeCloseTo(45.73, 2);
|
||||||
|
expect(a.order_reference).toMatch(/^[0-9a-f-]{36}$/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reduces the original transaction instead of adding a second row", async () => {
|
||||||
|
// Seed the original order this amendment refers to.
|
||||||
|
const a = parseOrderAmendment(html("ue-05"), ueMeta());
|
||||||
|
const txn = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO transactions (transaction_date, description, amount, amount_aud, category, payment_method, transaction_type)
|
||||||
|
VALUES ('2026-07-07','Order - Coles (Wyndham Vale)', 49.94, 49.94, 'groceries', 'credits', 'debit')
|
||||||
|
RETURNING id`
|
||||||
|
);
|
||||||
|
await queryRaw(
|
||||||
|
`INSERT INTO expense_metadata (transaction_id, source, order_reference, amount, transaction_date, flags)
|
||||||
|
VALUES ($1,'email',$2, 49.94, '2026-07-07', '[]'::jsonb)`,
|
||||||
|
[txn!.id, a.order_reference]
|
||||||
|
);
|
||||||
|
|
||||||
|
const before = await queryRow<{ c: string }>(`SELECT count(*)::text c FROM transactions`);
|
||||||
|
const res = await applyOrderAmendment(a);
|
||||||
|
const after = await queryRow<{ c: string }>(`SELECT count(*)::text c FROM transactions`);
|
||||||
|
|
||||||
|
expect(res.matched).toBe(true);
|
||||||
|
expect(after!.c).toBe(before!.c); // amended in place, no second row
|
||||||
|
const updated = await queryRow<{ amount: string }>(
|
||||||
|
`SELECT amount::text FROM transactions WHERE id = $1`,
|
||||||
|
[txn!.id]
|
||||||
|
);
|
||||||
|
expect(Number(updated!.amount)).toBeCloseTo(45.73, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("invents nothing when the original order was never ingested", async () => {
|
||||||
|
const a = parseOrderAmendment(html("ue-05"), ueMeta());
|
||||||
|
await queryRaw(`DELETE FROM expense_metadata WHERE order_reference = $1`, [a.order_reference]);
|
||||||
|
const res = await applyOrderAmendment(a);
|
||||||
|
expect(res.matched).toBe(false);
|
||||||
|
expect(res.transactionId).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("[Family] orders are card-settled, not credits", () => {
|
||||||
|
it("creates provenance but NO transaction — the statement line is the transaction", async () => {
|
||||||
|
// Regression: these were assumed credits-funded because the receipt names
|
||||||
|
// the payer and no instrument. The card statement carries all four (CBA
|
||||||
|
// ...3893, exact LKR matches), so creating a transaction double-counted
|
||||||
|
// spend already recorded.
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-04"),
|
||||||
|
meta({ subject: "[Family] Your Tuesday evening order with Uber Eats", sender: "uber.com", receivedAt: "2026-07-07T10:08:00Z" })
|
||||||
|
);
|
||||||
|
expect(p.flags).toContain("family_card_settled_no_transaction");
|
||||||
|
expect(p.payment.credits_amount).toBeNull();
|
||||||
|
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
expect(res.transactionId).toBeNull();
|
||||||
|
expect(res.metadataId).not.toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("owner scoping", () => {
|
||||||
|
it("sets owner_id so the row is visible to the app", async () => {
|
||||||
|
// Regression: analytics scope on COALESCE(t.owner_id, s.owner_id). An
|
||||||
|
// ingested order has no statement, so a NULL owner_id made all 85
|
||||||
|
// backfilled rows invisible in every view while sitting in the table.
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta({ messageId: `owner-${Date.now()}` }));
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
const row = await queryRow<{ owner_id: number | null }>(
|
||||||
|
`SELECT owner_id FROM transactions WHERE id = $1`,
|
||||||
|
[res.transactionId]
|
||||||
|
);
|
||||||
|
expect(row!.owner_id).not.toBeNull();
|
||||||
|
|
||||||
|
const visible = await queryRaw(
|
||||||
|
`SELECT t.id FROM transactions t LEFT JOIN statements s ON s.id = t.statement_id
|
||||||
|
WHERE t.id = $1 AND COALESCE(t.owner_id, s.owner_id) = $2`,
|
||||||
|
[res.transactionId, row!.owner_id]
|
||||||
|
);
|
||||||
|
expect(visible).toHaveLength(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("how an ingested order presents in the app", () => {
|
||||||
|
it("names the restaurant, not the courier", async () => {
|
||||||
|
// Reversed 2026-07-28. The platform was in the headline on request, but it
|
||||||
|
// fragmented the merchant — the same restaurant read differently depending
|
||||||
|
// on who delivered — and it already has a home: the Order details panel
|
||||||
|
// renders expense_metadata.platform next to its heading.
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta({ messageId: `desc-${Date.now()}` }));
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
const row = await queryRow<{ description: string }>(
|
||||||
|
`SELECT description FROM transactions WHERE id = $1`, [res.transactionId]
|
||||||
|
);
|
||||||
|
expect(row!.description).toBe('Order - Mad Mex');
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reads as 'Gift Card', not 'Manual', and stays out of the reconcile queue", async () => {
|
||||||
|
// bank_name is derived — no statement means "Manual", which reads as
|
||||||
|
// "hand-entered, awaiting a card line". A credits order has no card line
|
||||||
|
// coming, ever; 81 of them sat in the queue waiting for one.
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta({ messageId: `bank-${Date.now()}` }));
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
|
||||||
|
const row = await queryRow<{ bank_name: string }>(
|
||||||
|
`SELECT ${bankLabel()} as bank_name
|
||||||
|
FROM transactions t LEFT JOIN statements s ON s.id = t.statement_id
|
||||||
|
WHERE t.id = $1`,
|
||||||
|
[res.transactionId]
|
||||||
|
);
|
||||||
|
expect(row!.bank_name).toBe("Gift Card");
|
||||||
|
|
||||||
|
const queued = await queryRaw(
|
||||||
|
`SELECT t.id FROM transactions t
|
||||||
|
WHERE t.id = $1 AND t.statement_id IS NULL AND ${needsCardMatch("t")}`,
|
||||||
|
[res.transactionId]
|
||||||
|
);
|
||||||
|
expect(queued).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("records the platform and the message it came from", async () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-00"),
|
||||||
|
meta({ messageId: `prov-${Date.now()}`, subject: "Your Wednesday order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
const res = await processOrderIngestion(p, {
|
||||||
|
messageId: `prov-${Date.now()}`,
|
||||||
|
subject: "Your Wednesday order with Uber Eats",
|
||||||
|
sender: "uber.com",
|
||||||
|
});
|
||||||
|
const row = await queryRow<{
|
||||||
|
platform: string; source_email_from: string; route: { label: string }[];
|
||||||
|
}>(
|
||||||
|
`SELECT platform, source_email_from, route FROM expense_metadata WHERE id = $1`,
|
||||||
|
[res.metadataId]
|
||||||
|
);
|
||||||
|
expect(row!.platform).toBe("ubereats");
|
||||||
|
expect(row!.source_email_from).toBe("uber.com");
|
||||||
|
expect(row!.route.map((r) => r.label)).toEqual(["Pick-up", "Delivery"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("receipt lookup for the transaction detail panel", () => {
|
||||||
|
// Mirrors /api/transactions/[id]/order — the panel resolves a receipt from
|
||||||
|
// either side, and a card-settled order only has the matched_transaction_id
|
||||||
|
// side, which is exactly where the detail would otherwise go missing.
|
||||||
|
const receiptFor = (txnId: number) =>
|
||||||
|
queryRow<{ platform: string; route: { label: string; address: string }[] }>(
|
||||||
|
`SELECT platform, route FROM expense_metadata
|
||||||
|
WHERE transaction_id = $1 OR matched_transaction_id = $1 LIMIT 1`,
|
||||||
|
[txnId]
|
||||||
|
);
|
||||||
|
|
||||||
|
it("finds the receipt for a credits order", async () => {
|
||||||
|
// ue-00 is Uber Cash — credits, so it creates a transaction. ue-09 names a
|
||||||
|
// payer with no instrument and correctly parks awaiting a card statement,
|
||||||
|
// which would leave nothing to look the receipt up by.
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-00"),
|
||||||
|
meta({ messageId: `panel-${Date.now()}`, subject: "Your Wednesday order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
const res = await processOrderIngestion(p);
|
||||||
|
const r = await receiptFor(res.transactionId!);
|
||||||
|
expect(r!.platform).toBe("ubereats");
|
||||||
|
expect(r!.route.map((x) => x.label)).toEqual(["Pick-up", "Delivery"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("finds it from the statement line for a card-settled order", async () => {
|
||||||
|
const st = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO statements (bank_name, account_number, filename)
|
||||||
|
VALUES ('CBA', '5523504401723893', 'panel-cba.pdf') RETURNING id`
|
||||||
|
);
|
||||||
|
const card = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO transactions (statement_id, transaction_date, description, amount, transaction_type)
|
||||||
|
VALUES ($1, '2026-04-07', 'UBER *EATS ZURICH', 51.23, 'debit') RETURNING id`,
|
||||||
|
[st!.id]
|
||||||
|
);
|
||||||
|
const m = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO expense_metadata (source, order_reference, platform, route, matched_transaction_id)
|
||||||
|
VALUES ('email', $1, 'ubereats', '[{"label":"Pick-up","time":null,"address":"Ebikon"}]'::jsonb, $2)
|
||||||
|
RETURNING id`,
|
||||||
|
[`panel-card-${Date.now()}`, card!.id]
|
||||||
|
);
|
||||||
|
expect(m).not.toBeNull();
|
||||||
|
|
||||||
|
const r = await receiptFor(card!.id);
|
||||||
|
expect(r!.platform).toBe("ubereats");
|
||||||
|
expect(r!.route[0].address).toBe("Ebikon");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns nothing for an ordinary transaction", async () => {
|
||||||
|
const st = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO statements (bank_name, account_number, filename)
|
||||||
|
VALUES ('CBA', '1111', 'panel-plain.pdf') RETURNING id`
|
||||||
|
);
|
||||||
|
const t = await queryRow<{ id: number }>(
|
||||||
|
`INSERT INTO transactions (statement_id, transaction_date, description, amount, transaction_type)
|
||||||
|
VALUES ($1, '2026-04-07', 'COLES 1234', 12.00, 'debit') RETURNING id`,
|
||||||
|
[st!.id]
|
||||||
|
);
|
||||||
|
expect(await receiptFor(t!.id)).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,240 @@
|
|||||||
|
import { describe, it, expect, beforeAll, beforeEach, vi } from "vitest";
|
||||||
|
import { createPool, mockDbWithPool, resetDB } from "./helpers";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verdicts on orders — the "never order from here again" memory (ING-9).
|
||||||
|
*
|
||||||
|
* These cover the two things that are easy to get silently wrong and invisible
|
||||||
|
* on screen when you do: a second person's verdict overwriting the first, and a
|
||||||
|
* note-only save wiping the per-item opinions. Both are the same shape as the
|
||||||
|
* bug that reset `settled` on split rewrites.
|
||||||
|
*/
|
||||||
|
const pool = createPool();
|
||||||
|
mockDbWithPool(pool);
|
||||||
|
|
||||||
|
let GET: any;
|
||||||
|
let PUT: any;
|
||||||
|
let ownerId: number;
|
||||||
|
let otherId: number;
|
||||||
|
let txnId: number;
|
||||||
|
|
||||||
|
const req = (body?: unknown) =>
|
||||||
|
({ headers: { get: () => null }, json: async () => body }) as any;
|
||||||
|
const params = (id: number) => ({ params: Promise.resolve({ id: String(id) }) });
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
vi.doMock("@/lib/auth", () => ({
|
||||||
|
getCurrentUser: async () => ({ id: ownerId, name: "Owner", email: "o@x" }),
|
||||||
|
}));
|
||||||
|
vi.doMock("@/lib/queries", () => ({ canAccessTransactions: async () => true }));
|
||||||
|
({ GET, PUT } = await import("../../app/api/transactions/[id]/review/route"));
|
||||||
|
});
|
||||||
|
|
||||||
|
/** An ingested order: a transaction plus the expense_metadata behind it. */
|
||||||
|
async function seedOrder(merchant: string, date = "2026-07-01") {
|
||||||
|
const t = await pool.query(
|
||||||
|
`INSERT INTO transactions (transaction_date, description, amount, transaction_type, merchant_name, owner_id)
|
||||||
|
VALUES ($1, $2, 48.20, 'debit', $3, $4) RETURNING id`,
|
||||||
|
[date, `DoorDash ${merchant}`, merchant, ownerId]
|
||||||
|
);
|
||||||
|
const id = t.rows[0].id as number;
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO expense_metadata (transaction_id, source, order_reference, merchant_normalized, line_items)
|
||||||
|
VALUES ($1, 'email', $2, $3, '[]'::jsonb)`,
|
||||||
|
[id, `ref-${id}`, merchant]
|
||||||
|
);
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDB(pool);
|
||||||
|
const a = await pool.query(`INSERT INTO participants (name) VALUES ('Owner') RETURNING id`);
|
||||||
|
const b = await pool.query(`INSERT INTO participants (name) VALUES ('Other') RETURNING id`);
|
||||||
|
ownerId = a.rows[0].id;
|
||||||
|
otherId = b.rows[0].id;
|
||||||
|
txnId = await seedOrder("Thai Palace");
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("order verdicts — one per person", () => {
|
||||||
|
it("keeps both people's verdicts on the same order", async () => {
|
||||||
|
await PUT(req({ participant_id: ownerId, rating: "loved" }), params(txnId));
|
||||||
|
const res = await PUT(req({ participant_id: otherId, rating: "never" }), params(txnId));
|
||||||
|
const body = await res.json();
|
||||||
|
|
||||||
|
// The bug this guards: a UNIQUE on transaction_id alone made the second
|
||||||
|
// save overwrite the first, and the disagreement is the useful part.
|
||||||
|
expect(body.reviews).toHaveLength(2);
|
||||||
|
expect(body.reviews.find((r: any) => r.participant_id === ownerId).rating).toBe("loved");
|
||||||
|
expect(body.reviews.find((r: any) => r.participant_id === otherId).rating).toBe("never");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("defaults the verdict to the signed-in user, not the owner", async () => {
|
||||||
|
const res = await PUT(req({ rating: "ok" }), params(txnId));
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.reviews[0].participant_id).toBe(ownerId);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("revising a verdict updates rather than duplicating", async () => {
|
||||||
|
await PUT(req({ participant_id: ownerId, rating: "loved" }), params(txnId));
|
||||||
|
const res = await PUT(req({ participant_id: ownerId, rating: "never" }), params(txnId));
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.reviews).toHaveLength(1);
|
||||||
|
expect(body.reviews[0].rating).toBe("never");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a rating outside the scale", async () => {
|
||||||
|
const res = await PUT(req({ rating: "amazing" }), params(txnId));
|
||||||
|
expect(res.status).toBe(400);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("derives order_again from the rating", async () => {
|
||||||
|
let body = await (await PUT(req({ rating: "never" }), params(txnId))).json();
|
||||||
|
expect(body.reviews[0].order_again).toBe(false);
|
||||||
|
body = await (await PUT(req({ rating: "ok" }), params(txnId))).json();
|
||||||
|
expect(body.reviews[0].order_again).toBe(true);
|
||||||
|
// "bad" is also a no — you would not choose it again.
|
||||||
|
body = await (await PUT(req({ rating: "bad" }), params(txnId))).json();
|
||||||
|
expect(body.reviews[0].order_again).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("only `never` raises the warning, not `bad`", async () => {
|
||||||
|
// The boundary the five-level scale exists for. A blacklist that fires for
|
||||||
|
// every mediocre meal is one nobody reads, so "bad" records the
|
||||||
|
// disappointment without triggering the alarm.
|
||||||
|
const older = await seedOrder("Thai Palace", "2026-06-01");
|
||||||
|
await PUT(req({ participant_id: ownerId, rating: "bad" }), params(older));
|
||||||
|
|
||||||
|
let body = await (await GET(req(), params(txnId))).json();
|
||||||
|
expect(body.merchant.counts.bad).toBe(1);
|
||||||
|
expect(body.merchant.warn).toBe(false);
|
||||||
|
|
||||||
|
await PUT(req({ participant_id: ownerId, rating: "never" }), params(older));
|
||||||
|
body = await (await GET(req(), params(txnId))).json();
|
||||||
|
expect(body.merchant.warn).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("item verdicts", () => {
|
||||||
|
it("a note-only save does not wipe item opinions", async () => {
|
||||||
|
await PUT(
|
||||||
|
req({
|
||||||
|
rating: "liked",
|
||||||
|
item_verdicts: [{ item: "Pad Thai", verdict: "loved" }],
|
||||||
|
}),
|
||||||
|
params(txnId)
|
||||||
|
);
|
||||||
|
// No item_verdicts key at all — the shape a note-only form sends.
|
||||||
|
const res = await PUT(req({ rating: "liked", note: "slow delivery" }), params(txnId));
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.reviews[0].item_verdicts).toEqual([
|
||||||
|
{ item: "Pad Thai", verdict: "loved" },
|
||||||
|
]);
|
||||||
|
expect(body.reviews[0].note).toBe("slow delivery");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("an explicit empty array does clear them", async () => {
|
||||||
|
await PUT(
|
||||||
|
req({ rating: "liked", item_verdicts: [{ item: "Pad Thai", verdict: "loved" }] }),
|
||||||
|
params(txnId)
|
||||||
|
);
|
||||||
|
const res = await PUT(req({ rating: "liked", item_verdicts: [] }), params(txnId));
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.reviews[0].item_verdicts).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("drops malformed entries without failing the save", async () => {
|
||||||
|
const res = await PUT(
|
||||||
|
req({
|
||||||
|
rating: "ok",
|
||||||
|
item_verdicts: [
|
||||||
|
{ item: "Pad Thai", verdict: "loved" },
|
||||||
|
{ item: "", verdict: "loved" },
|
||||||
|
{ item: "Curry", verdict: "middling" },
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
params(txnId)
|
||||||
|
);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.reviews[0].rating).toBe("ok");
|
||||||
|
expect(body.reviews[0].item_verdicts).toEqual([
|
||||||
|
{ item: "Pad Thai", verdict: "loved" },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("merchant history", () => {
|
||||||
|
it("warns when the merchant was ever marked never, and excludes this order", async () => {
|
||||||
|
const older = await seedOrder("Thai Palace", "2026-06-01");
|
||||||
|
await PUT(req({ participant_id: ownerId, rating: "never", note: "cold" }), params(older));
|
||||||
|
|
||||||
|
const body = await (await GET(req(), params(txnId))).json();
|
||||||
|
expect(body.merchant.warn).toBe(true);
|
||||||
|
expect(body.merchant.counts.never).toBe(1);
|
||||||
|
expect(body.merchant.history.map((h: any) => h.transaction_id)).toEqual([older]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("treats the same restaurant as one merchant across platforms", async () => {
|
||||||
|
// DoorDash and Uber Eats capitalise differently — "TEG Kebabs & Biryani"
|
||||||
|
// vs "TEG KEBABS & BIRYANI". An exact match split one restaurant's history
|
||||||
|
// in two, so a "never again" recorded through one app never warned in the
|
||||||
|
// other, silently defeating the point of the memory.
|
||||||
|
const shouty = await seedOrder("THAI PALACE", "2026-06-01");
|
||||||
|
await PUT(req({ participant_id: ownerId, rating: "never" }), params(shouty));
|
||||||
|
|
||||||
|
const body = await (await GET(req(), params(txnId))).json();
|
||||||
|
expect(body.merchant.warn).toBe(true);
|
||||||
|
expect(body.merchant.history.map((h: any) => h.transaction_id)).toContain(shouty);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not carry a verdict across different merchants", async () => {
|
||||||
|
const other = await seedOrder("Pizza Place", "2026-06-01");
|
||||||
|
await PUT(req({ participant_id: ownerId, rating: "never" }), params(other));
|
||||||
|
|
||||||
|
const body = await (await GET(req(), params(txnId))).json();
|
||||||
|
expect(body.merchant.warn).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("pools item opinions across the merchant's orders", async () => {
|
||||||
|
const older = await seedOrder("Thai Palace", "2026-06-01");
|
||||||
|
await PUT(
|
||||||
|
req({ item_verdicts: [{ item: "Pad Thai", verdict: "loved" }] }),
|
||||||
|
params(older)
|
||||||
|
);
|
||||||
|
const older2 = await seedOrder("Thai Palace", "2026-05-01");
|
||||||
|
await PUT(
|
||||||
|
req({ item_verdicts: [{ item: "pad thai", verdict: "loved" }] }),
|
||||||
|
params(older2)
|
||||||
|
);
|
||||||
|
|
||||||
|
const body = await (await GET(req(), params(txnId))).json();
|
||||||
|
// Case-folded: the same dish comes back capitalised differently between
|
||||||
|
// receipts, and two entries for one dish is not a track record.
|
||||||
|
expect(body.merchant.items).toEqual([{ item: "Pad Thai", loved: 2, never: 0 }]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps item opinions from reviews that have no overall rating", async () => {
|
||||||
|
const older = await seedOrder("Thai Palace", "2026-06-01");
|
||||||
|
await PUT(
|
||||||
|
req({ item_verdicts: [{ item: "Satay", verdict: "never" }] }),
|
||||||
|
params(older)
|
||||||
|
);
|
||||||
|
const body = await (await GET(req(), params(txnId))).json();
|
||||||
|
expect(body.merchant.items).toEqual([{ item: "Satay", loved: 0, never: 1 }]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("share state", () => {
|
||||||
|
it("reports splits so the panel can show shared vs just me", async () => {
|
||||||
|
let body = await (await GET(req(), params(txnId))).json();
|
||||||
|
expect(body.splits).toEqual([]);
|
||||||
|
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 50)`,
|
||||||
|
[txnId, otherId]
|
||||||
|
);
|
||||||
|
body = await (await GET(req(), params(txnId))).json();
|
||||||
|
expect(body.splits).toHaveLength(1);
|
||||||
|
expect(body.splits[0].participant_id).toBe(otherId);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import { describe, it, expect, beforeEach, afterAll } from "vitest";
|
||||||
|
import { createPool, resetDB } from "./helpers";
|
||||||
|
|
||||||
|
const pool = createPool();
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDB(pool);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await pool.end();
|
||||||
|
});
|
||||||
|
|
||||||
|
// This tests the name-substitution logic applied in /api/participants GET.
|
||||||
|
// The rule: the participant matching the current user's ID gets name "Me";
|
||||||
|
// everyone else keeps their real name.
|
||||||
|
function substituteMe(
|
||||||
|
participants: { id: number; name: string }[],
|
||||||
|
currentUserId: number
|
||||||
|
) {
|
||||||
|
return participants.map((p) =>
|
||||||
|
p.id === currentUserId ? { ...p, name: "Me" } : p
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("participant Me substitution", () => {
|
||||||
|
it("replaces the current user's name with Me", async () => {
|
||||||
|
const r = await pool.query(
|
||||||
|
`INSERT INTO participants (name) VALUES ('Siddharth') RETURNING id`
|
||||||
|
);
|
||||||
|
const userId = r.rows[0].id;
|
||||||
|
const participants = [
|
||||||
|
{ id: userId, name: "Siddharth" },
|
||||||
|
{ id: userId + 1, name: "Sonu" },
|
||||||
|
];
|
||||||
|
|
||||||
|
const result = substituteMe(participants, userId);
|
||||||
|
expect(result.find((p) => p.id === userId)?.name).toBe("Me");
|
||||||
|
expect(result.find((p) => p.id === userId + 1)?.name).toBe("Sonu");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves all names unchanged when currentUserId does not match", () => {
|
||||||
|
const participants = [
|
||||||
|
{ id: 1, name: "Siddharth" },
|
||||||
|
{ id: 2, name: "Sonu" },
|
||||||
|
];
|
||||||
|
const result = substituteMe(participants, 999);
|
||||||
|
expect(result).toEqual(participants);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Sonu sees Me for herself and Siddharth for the primary user", async () => {
|
||||||
|
const r1 = await pool.query(
|
||||||
|
`INSERT INTO participants (name) VALUES ('Siddharth') RETURNING id`
|
||||||
|
);
|
||||||
|
const r2 = await pool.query(
|
||||||
|
`INSERT INTO participants (name, email) VALUES ('Sonu', 'sonu@example.com') RETURNING id`
|
||||||
|
);
|
||||||
|
const siddharthId = r1.rows[0].id;
|
||||||
|
const sonuId = r2.rows[0].id;
|
||||||
|
|
||||||
|
const rawParticipants = [
|
||||||
|
{ id: siddharthId, name: "Siddharth" },
|
||||||
|
{ id: sonuId, name: "Sonu" },
|
||||||
|
];
|
||||||
|
|
||||||
|
// Siddharth's view
|
||||||
|
const siddharthView = substituteMe(rawParticipants, siddharthId);
|
||||||
|
expect(siddharthView.find((p) => p.id === siddharthId)?.name).toBe("Me");
|
||||||
|
expect(siddharthView.find((p) => p.id === sonuId)?.name).toBe("Sonu");
|
||||||
|
|
||||||
|
// Sonu's view
|
||||||
|
const sonuView = substituteMe(rawParticipants, sonuId);
|
||||||
|
expect(sonuView.find((p) => p.id === siddharthId)?.name).toBe("Siddharth");
|
||||||
|
expect(sonuView.find((p) => p.id === sonuId)?.name).toBe("Me");
|
||||||
|
});
|
||||||
|
});
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,231 @@
|
|||||||
|
import { describe, it, expect, beforeAll, beforeEach } from "vitest";
|
||||||
|
import { Pool } from "pg";
|
||||||
|
import { createPool, resetDB, seedParticipants } from "./helpers";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The receipt lane, exercised against the real schema.
|
||||||
|
*
|
||||||
|
* Every fixture here is a receipt that actually exists: a Coles split-tender e-receipt
|
||||||
|
* (7777 Werribee, 11/07/2026, $114.57 settled $40.75 gift card + $73.82 Mastercard), a
|
||||||
|
* Woolworths e-receipt (3345 Wyndham Vale, 29/06/2026, $40.75, single gift card) and a
|
||||||
|
* Coles photo (556 Manor Lakes, 29/07/2026, $23.18). The split one is the reason the lane
|
||||||
|
* writes one transaction per tender leg rather than one per receipt, so it is the case
|
||||||
|
* these tests are built around.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const TOKEN = "test-receipt-token";
|
||||||
|
let pool: Pool;
|
||||||
|
let POST: typeof import("../../app/api/receipts/ingest/route").POST;
|
||||||
|
|
||||||
|
const req = (body: unknown, token: string | null = TOKEN) =>
|
||||||
|
({
|
||||||
|
headers: { get: (h: string) => (h === "x-ingest-token" ? token : null) },
|
||||||
|
json: async () => body,
|
||||||
|
}) as never;
|
||||||
|
|
||||||
|
const colesSplit = () => ({
|
||||||
|
receipt_uid: "coles:7777:114:2153:2026-07-11",
|
||||||
|
capture_event_id: 412,
|
||||||
|
image_sha256: "sha-coles-split",
|
||||||
|
merchant_name: "Coles",
|
||||||
|
store_detail: "7777",
|
||||||
|
transaction_date: "2026-07-11",
|
||||||
|
total: 114.57,
|
||||||
|
tender_raw: "EFT $40.75\nEFT $73.82\n***** 0443 MASTERCARD\nCREDIT ACCOUNT STORE CARD",
|
||||||
|
tender_legs: [
|
||||||
|
{ leg_index: 1, amount: 40.75, card_last4: "0443", card_product: "STORE CARD", class: "gift_card" as const },
|
||||||
|
{ leg_index: 2, amount: 73.82, card_last4: "3302", card_product: "MASTERCARD", class: "card" as const },
|
||||||
|
],
|
||||||
|
line_items: [
|
||||||
|
{ description: "Pork Loin Roast", qty: 1, unit: "ea", amount: 15.86, category: "meat" },
|
||||||
|
{ description: "Tomatoes", qty: 1, unit: "ea", amount: 98.71, category: "produce" },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
const woolworthsGiftCard = () => ({
|
||||||
|
receipt_uid: "woolworths:3345:62:148:2026-06-29",
|
||||||
|
capture_event_id: 500,
|
||||||
|
merchant_name: "Woolworths",
|
||||||
|
store_detail: "3345",
|
||||||
|
transaction_date: "2026-06-29",
|
||||||
|
total: 40.75,
|
||||||
|
tender_legs: [{ leg_index: 1, amount: 40.75, card_last4: "0443", card_product: "STORE CARD", class: "gift_card" as const }],
|
||||||
|
line_items: [{ description: "Oat Milk", qty: 2, unit: "ea", amount: 40.75, category: "dairy" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
process.env.RECEIPT_INGEST_TOKEN = TOKEN;
|
||||||
|
pool = createPool();
|
||||||
|
({ POST } = await import("../../app/api/receipts/ingest/route"));
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDB(pool);
|
||||||
|
await pool.query("DELETE FROM expense_metadata");
|
||||||
|
// transactions.owner_id references participants, and resetDB truncates it with RESTART
|
||||||
|
// IDENTITY — so DEFAULT_OWNER_ID (1) has to be re-seeded or every insert here fails the
|
||||||
|
// foreign key. Same dependency the order lane has; it just never had to say so.
|
||||||
|
await seedParticipants(pool);
|
||||||
|
});
|
||||||
|
|
||||||
|
const legsOf = async (group: string) =>
|
||||||
|
(await pool.query(
|
||||||
|
`SELECT t.id, t.amount::text, t.payment_method, t.statement_id, em.order_reference, em.line_items, em.flags
|
||||||
|
FROM expense_metadata em JOIN transactions t ON t.id = em.transaction_id
|
||||||
|
WHERE em.receipt_group = $1 ORDER BY em.order_reference`,
|
||||||
|
[group]
|
||||||
|
)).rows;
|
||||||
|
|
||||||
|
describe("auth", () => {
|
||||||
|
it("rejects a missing or wrong token", async () => {
|
||||||
|
expect((await POST(req(colesSplit(), null))).status).toBe(401);
|
||||||
|
expect((await POST(req(colesSplit(), "nope"))).status).toBe(401);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a body missing what it needs to book money", async () => {
|
||||||
|
expect((await POST(req({ merchant_name: "Coles" }))).status).toBe(400);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("a split-tender receipt", () => {
|
||||||
|
it("books one transaction per leg, not one for the total", async () => {
|
||||||
|
const res = await POST(req(colesSplit()));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.legs).toHaveLength(2);
|
||||||
|
|
||||||
|
const rows = await legsOf("pantry:coles:7777:114:2153:2026-07-11");
|
||||||
|
expect(rows.map((r) => r.amount)).toEqual(["40.75", "73.82"]);
|
||||||
|
// Not one $114.57 row: marked credits it would let the $73.82 statement line
|
||||||
|
// double-count; marked card it would be searched for at ±1% of $114.57 and never match.
|
||||||
|
expect(rows.some((r) => r.amount === "114.57")).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("sums the legs back to the printed total", async () => {
|
||||||
|
await POST(req(colesSplit()));
|
||||||
|
const rows = await legsOf("pantry:coles:7777:114:2153:2026-07-11");
|
||||||
|
const total = rows.reduce((sum, r) => sum + Number(r.amount), 0);
|
||||||
|
expect(Number(total.toFixed(2))).toBe(114.57);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("marks the gift-card leg credits and the card leg card", async () => {
|
||||||
|
await POST(req(colesSplit()));
|
||||||
|
const rows = await legsOf("pantry:coles:7777:114:2153:2026-07-11");
|
||||||
|
expect(rows.find((r) => r.amount === "40.75")!.payment_method).toBe("credits");
|
||||||
|
expect(rows.find((r) => r.amount === "73.82")!.payment_method).toBe("card");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves every leg as a manual row for the reconciliation queue", async () => {
|
||||||
|
await POST(req(colesSplit()));
|
||||||
|
const rows = await legsOf("pantry:coles:7777:114:2153:2026-07-11");
|
||||||
|
expect(rows.every((r) => r.statement_id === null)).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("puts the line items on the card leg only", async () => {
|
||||||
|
// They describe the whole shop but transaction_id is UNIQUE on expense_metadata, so
|
||||||
|
// they can attach to one row — and the card leg is the one that reconciles onto the
|
||||||
|
// statement line, which is where an unreadable descriptor gets its contents.
|
||||||
|
await POST(req(colesSplit()));
|
||||||
|
const rows = await legsOf("pantry:coles:7777:114:2153:2026-07-11");
|
||||||
|
expect(rows.find((r) => r.amount === "73.82")!.line_items).toHaveLength(2);
|
||||||
|
expect(rows.find((r) => r.amount === "40.75")!.line_items).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("flags the split so it can be shown as one purchase", async () => {
|
||||||
|
await POST(req(colesSplit()));
|
||||||
|
const rows = await legsOf("pantry:coles:7777:114:2153:2026-07-11");
|
||||||
|
expect(rows[0].flags).toContain("split_tender");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("a gift-card receipt", () => {
|
||||||
|
it("becomes a visible transaction on the day it is scanned", async () => {
|
||||||
|
const res = await POST(req(woolworthsGiftCard()));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const rows = await legsOf("pantry:woolworths:3345:62:148:2026-06-29");
|
||||||
|
expect(rows).toHaveLength(1);
|
||||||
|
expect(rows[0].amount).toBe("40.75");
|
||||||
|
expect(rows[0].payment_method).toBe("credits");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("is owned, so it is not invisible in every view", async () => {
|
||||||
|
// Owner scoping is COALESCE(t.owner_id, s.owner_id) and these rows carry no statement;
|
||||||
|
// a NULL owner is how 85 backfilled order rows ended up in the table and on no screen.
|
||||||
|
await POST(req(woolworthsGiftCard()));
|
||||||
|
const { rows } = await pool.query("SELECT owner_id FROM transactions WHERE merchant_name = 'Woolworths'");
|
||||||
|
expect(rows[0].owner_id).not.toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("idempotency", () => {
|
||||||
|
it("keys on the receipt, so the same shop from two files lands once", async () => {
|
||||||
|
// A photo and the store's e-receipt PDF are different files with different hashes.
|
||||||
|
// Keying on the capture would let one purchase arrive twice.
|
||||||
|
await POST(req(colesSplit()));
|
||||||
|
await POST(req({ ...colesSplit(), capture_event_id: 999, image_sha256: "sha-different-file" }));
|
||||||
|
const rows = await legsOf("pantry:coles:7777:114:2153:2026-07-11");
|
||||||
|
expect(rows).toHaveLength(2); // still just the two legs
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reports the replay rather than silently doing nothing", async () => {
|
||||||
|
await POST(req(colesSplit()));
|
||||||
|
const body = await (await POST(req(colesSplit()))).json();
|
||||||
|
expect(body.legs.every((l: { skipped?: string }) => l.skipped === "already_ingested")).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("falls back to the capture when the receipt did not identify itself", async () => {
|
||||||
|
// A crumpled photo can lose the header entirely. That receipt still becomes spend; it
|
||||||
|
// just cannot be recognised if the same shop is scanned again from another file.
|
||||||
|
await POST(req({ ...colesSplit(), receipt_uid: null }));
|
||||||
|
expect(await legsOf("pantry:capture:412")).toHaveLength(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("validation — what becomes money", () => {
|
||||||
|
it("refuses a receipt whose tender does not add up to its total", async () => {
|
||||||
|
// A missed leg is spend that never appears; booking the rest would put a number in the
|
||||||
|
// ledger nobody can stand behind.
|
||||||
|
const broken = { ...colesSplit(), tender_legs: [colesSplit().tender_legs[0]] };
|
||||||
|
const res = await POST(req(broken));
|
||||||
|
expect(res.status).toBe(422);
|
||||||
|
expect((await res.json()).reason).toContain("tender legs sum to 40.75");
|
||||||
|
expect(await legsOf("pantry:coles:7777:114:2153:2026-07-11")).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("refuses a receipt with no tender at all", async () => {
|
||||||
|
expect((await POST(req({ ...colesSplit(), tender_legs: [] }))).status).toBe(422);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("flags but accepts lines that do not sum, because promo rows are skipped by design", async () => {
|
||||||
|
const res = await POST(req({ ...colesSplit(), line_items: [{ description: "One line", amount: 10 }] }));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect((await res.json()).flags.some((f: string) => f.startsWith("line_items_sum_"))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("writes nothing at all when validation fails", async () => {
|
||||||
|
await POST(req({ ...colesSplit(), tender_legs: [] }));
|
||||||
|
const { rows } = await pool.query("SELECT count(*)::int AS n FROM transactions");
|
||||||
|
expect(rows[0].n).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("marks a leg nobody could classify as reconcilable rather than deciding for them", async () => {
|
||||||
|
const unknown = { ...colesSplit(), tender_legs: [{ leg_index: 1, amount: 114.57, card_last4: "9999", card_product: null, class: null }] };
|
||||||
|
const res = await POST(req(unknown));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const rows = await legsOf("pantry:coles:7777:114:2153:2026-07-11");
|
||||||
|
// NULL is what needsCardMatch() treats as still needing a card match, so it surfaces in
|
||||||
|
// the queue instead of being silently excluded from it.
|
||||||
|
expect(rows[0].payment_method).toBeNull();
|
||||||
|
expect(rows[0].flags).toContain("unclassified_tender");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("dry run", () => {
|
||||||
|
it("validates without writing", async () => {
|
||||||
|
const res = await POST(req({ ...colesSplit(), dryRun: true }));
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect((await res.json()).dryRun).toBe(true);
|
||||||
|
const { rows } = await pool.query("SELECT count(*)::int AS n FROM transactions");
|
||||||
|
expect(rows[0].n).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,166 @@
|
|||||||
|
import { describe, it, expect, beforeAll, beforeEach, vi } from "vitest";
|
||||||
|
import { Pool } from "pg";
|
||||||
|
import { createPool, resetDB, seedParticipants } from "./helpers";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What happens to a scanned receipt when its statement finally arrives.
|
||||||
|
*
|
||||||
|
* This is the case the first design of this lane got wrong, so it is tested first-class.
|
||||||
|
* Reconciliation moves a manual row's overrides, tags and splits onto the statement row and
|
||||||
|
* then hides the manual row from every figure. `expense_metadata` was the one child it left
|
||||||
|
* behind — which did not matter while metadata only ever came from an email that had made
|
||||||
|
* its own transaction, and matters completely now that it carries a shop's line items. Left
|
||||||
|
* unmoved, the contents of the shop vanish at exactly the moment the statement line shows
|
||||||
|
* up, and `COLES 0556 MANOR LAKES` stays as unreadable as it was before anything was
|
||||||
|
* scanned.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const TOKEN = "test-receipt-token";
|
||||||
|
let pool: Pool;
|
||||||
|
let ownerId: number;
|
||||||
|
let ingest: typeof import("../../app/api/receipts/ingest/route").POST;
|
||||||
|
let reconcile: typeof import("../../app/api/transactions/reconcile/route").POST;
|
||||||
|
|
||||||
|
const ingestReq = (body: unknown) =>
|
||||||
|
({ headers: { get: (h: string) => (h === "x-ingest-token" ? TOKEN : null) }, json: async () => body }) as never;
|
||||||
|
|
||||||
|
// The reconcile route authenticates a browser session rather than a shared secret.
|
||||||
|
const userReq = (body: unknown) => ({ json: async () => body }) as never;
|
||||||
|
|
||||||
|
const colesSplit = {
|
||||||
|
receipt_uid: "coles:7777:114:2153:2026-07-11",
|
||||||
|
capture_event_id: 412,
|
||||||
|
merchant_name: "Coles",
|
||||||
|
transaction_date: "2026-07-11",
|
||||||
|
total: 114.57,
|
||||||
|
tender_legs: [
|
||||||
|
{ leg_index: 1, amount: 40.75, card_last4: "0443", card_product: "STORE CARD", class: "gift_card" },
|
||||||
|
{ leg_index: 2, amount: 73.82, card_last4: "3302", card_product: "MASTERCARD", class: "card" },
|
||||||
|
],
|
||||||
|
line_items: [
|
||||||
|
{ description: "Pork Loin Roast", qty: 1, unit: "ea", amount: 15.86, category: "meat" },
|
||||||
|
{ description: "Jasmine Rice 1kg", qty: 1, unit: "ea", amount: 98.71, category: "pantry_dry" },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
async function statementLine(amount: number, date: string, description: string) {
|
||||||
|
const statement = await pool.query(
|
||||||
|
`INSERT INTO statements (filename, account_number, bank_name, billing_start_date, billing_end_date, owner_id)
|
||||||
|
VALUES ('sept.pdf', '1234-5678-9012-3302', 'Test Bank', $1::date - 20, $1::date + 10, $2) RETURNING id`,
|
||||||
|
[date, ownerId]
|
||||||
|
);
|
||||||
|
const txn = await pool.query(
|
||||||
|
`INSERT INTO transactions (statement_id, transaction_date, description, amount, transaction_type, owner_id)
|
||||||
|
VALUES ($1, $2, $3, $4, 'debit', $5) RETURNING id`,
|
||||||
|
[statement.rows[0].id, date, description, amount, ownerId]
|
||||||
|
);
|
||||||
|
return txn.rows[0].id as number;
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
process.env.RECEIPT_INGEST_TOKEN = TOKEN;
|
||||||
|
pool = createPool();
|
||||||
|
// The reconcile route scopes every query to the signed-in user. Mocked before the import
|
||||||
|
// (doMock is not hoisted, so it can close over `ownerId`, which resetDB reassigns on each
|
||||||
|
// run) because an ES module binding cannot be reassigned afterwards.
|
||||||
|
vi.doMock("@/lib/auth", () => ({
|
||||||
|
getCurrentUser: async () => ({ id: ownerId, name: "Alice", email: "alice@example.com" }),
|
||||||
|
}));
|
||||||
|
({ POST: ingest } = await import("../../app/api/receipts/ingest/route"));
|
||||||
|
({ POST: reconcile } = await import("../../app/api/transactions/reconcile/route"));
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDB(pool);
|
||||||
|
await pool.query("DELETE FROM expense_metadata");
|
||||||
|
({ ownerId } = await seedParticipants(pool));
|
||||||
|
});
|
||||||
|
|
||||||
|
const reconcileAs = (manualId: number, statementId: number) =>
|
||||||
|
reconcile(userReq({ matches: [{ manual_id: manualId, statement_tx_id: statementId }] }));
|
||||||
|
|
||||||
|
describe("a card leg meeting its statement line", () => {
|
||||||
|
it("carries the shop's line items onto the statement row", async () => {
|
||||||
|
await ingest(ingestReq(colesSplit));
|
||||||
|
const manual = await pool.query(
|
||||||
|
`SELECT t.id FROM transactions t JOIN expense_metadata em ON em.transaction_id = t.id
|
||||||
|
WHERE em.order_reference = 'pantry:coles:7777:114:2153:2026-07-11#2'`
|
||||||
|
);
|
||||||
|
const manualId = manual.rows[0].id as number;
|
||||||
|
const statementId = await statementLine(73.82, "2026-07-12", "COLES 7777 WERRIBEE");
|
||||||
|
|
||||||
|
const res = await reconcileAs(manualId, statementId);
|
||||||
|
expect(res.status ?? 200).toBe(200);
|
||||||
|
|
||||||
|
const moved = await pool.query(`SELECT transaction_id, line_items FROM expense_metadata WHERE order_reference = $1`, [
|
||||||
|
"pantry:coles:7777:114:2153:2026-07-11#2",
|
||||||
|
]);
|
||||||
|
// The whole point: the items are now on the row that survives, not the one that got hidden.
|
||||||
|
expect(moved.rows[0].transaction_id).toBe(statementId);
|
||||||
|
expect(moved.rows[0].line_items).toHaveLength(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("counts the shop once, not twice", async () => {
|
||||||
|
await ingest(ingestReq(colesSplit));
|
||||||
|
const manual = await pool.query(
|
||||||
|
`SELECT t.id FROM transactions t JOIN expense_metadata em ON em.transaction_id = t.id
|
||||||
|
WHERE em.order_reference = 'pantry:coles:7777:114:2153:2026-07-11#2'`
|
||||||
|
);
|
||||||
|
const statementId = await statementLine(73.82, "2026-07-12", "COLES 7777 WERRIBEE");
|
||||||
|
await reconcileAs(manual.rows[0].id, statementId);
|
||||||
|
|
||||||
|
// Reconciled manual rows are excluded from figures by reconciled_with_id; what remains
|
||||||
|
// live is the gift-card leg plus the statement line = the $114.57 that was actually spent.
|
||||||
|
const { rows } = await pool.query(
|
||||||
|
`SELECT coalesce(sum(amount), 0)::text AS total FROM transactions
|
||||||
|
WHERE reconciled_with_id IS NULL AND superseded_by_id IS NULL`
|
||||||
|
);
|
||||||
|
expect(Number(rows[0].total)).toBeCloseTo(114.57, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves the gift-card leg alone", async () => {
|
||||||
|
await ingest(ingestReq(colesSplit));
|
||||||
|
const manual = await pool.query(
|
||||||
|
`SELECT t.id FROM transactions t JOIN expense_metadata em ON em.transaction_id = t.id
|
||||||
|
WHERE em.order_reference = 'pantry:coles:7777:114:2153:2026-07-11#2'`
|
||||||
|
);
|
||||||
|
const statementId = await statementLine(73.82, "2026-07-12", "COLES 7777 WERRIBEE");
|
||||||
|
await reconcileAs(manual.rows[0].id, statementId);
|
||||||
|
|
||||||
|
const gift = await pool.query(
|
||||||
|
`SELECT t.reconciled_with_id, t.payment_method FROM transactions t
|
||||||
|
JOIN expense_metadata em ON em.transaction_id = t.id
|
||||||
|
WHERE em.order_reference = 'pantry:coles:7777:114:2153:2026-07-11#1'`
|
||||||
|
);
|
||||||
|
expect(gift.rows[0].reconciled_with_id).toBeNull();
|
||||||
|
expect(gift.rows[0].payment_method).toBe("credits");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps the other source's metadata when the statement row already has some", async () => {
|
||||||
|
// An emailed or Paperless copy of the same purchase may have got there first.
|
||||||
|
// transaction_id is UNIQUE, so one of them has to lose — and it must lose visibly
|
||||||
|
// rather than by constraint violation at 11pm.
|
||||||
|
await ingest(ingestReq(colesSplit));
|
||||||
|
const manual = await pool.query(
|
||||||
|
`SELECT t.id FROM transactions t JOIN expense_metadata em ON em.transaction_id = t.id
|
||||||
|
WHERE em.order_reference = 'pantry:coles:7777:114:2153:2026-07-11#2'`
|
||||||
|
);
|
||||||
|
const statementId = await statementLine(73.82, "2026-07-12", "COLES 7777 WERRIBEE");
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO expense_metadata (transaction_id, source, order_reference, line_items)
|
||||||
|
VALUES ($1, 'email', 'email:already-here', '[]'::jsonb)`,
|
||||||
|
[statementId]
|
||||||
|
);
|
||||||
|
|
||||||
|
const res = await reconcileAs(manual.rows[0].id, statementId);
|
||||||
|
expect(res.status ?? 200).toBe(200);
|
||||||
|
|
||||||
|
const incumbent = await pool.query(`SELECT source FROM expense_metadata WHERE transaction_id = $1`, [statementId]);
|
||||||
|
expect(incumbent.rows.map((r) => r.source)).toEqual(["email"]);
|
||||||
|
|
||||||
|
const pantryRow = await pool.query(`SELECT flags FROM expense_metadata WHERE order_reference = $1`, [
|
||||||
|
"pantry:coles:7777:114:2153:2026-07-11#2",
|
||||||
|
]);
|
||||||
|
expect(JSON.stringify(pantryRow.rows[0].flags)).toContain("metadata_collision_on_reconcile");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,304 @@
|
|||||||
|
import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
|
||||||
|
import type { Pool } from "pg";
|
||||||
|
import {
|
||||||
|
createPool,
|
||||||
|
mockDbWithPool,
|
||||||
|
resetDB,
|
||||||
|
seedParticipants,
|
||||||
|
insertTransaction,
|
||||||
|
} from "./helpers";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every split adds up to 100%.
|
||||||
|
*
|
||||||
|
* The failure this guards against is not an arithmetic one — `myShare` has
|
||||||
|
* always treated the payer's share as the remainder, so the numbers were right.
|
||||||
|
* It is that the remainder was never written down, so a 50/50 arrangement was
|
||||||
|
* stored as a single row reading "Sonu 50%" and displayed as half a split.
|
||||||
|
*/
|
||||||
|
describe("completeSplit", () => {
|
||||||
|
let pool: Pool;
|
||||||
|
let completeSplit: (id: number) => Promise<void>;
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
pool = createPool();
|
||||||
|
mockDbWithPool(pool);
|
||||||
|
({ completeSplit } = await import("@/lib/splits"));
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await pool.end();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDB(pool);
|
||||||
|
});
|
||||||
|
|
||||||
|
const sharesOf = async (txId: number) => {
|
||||||
|
const r = await pool.query(
|
||||||
|
`SELECT participant_id, share_percent::float FROM transaction_splits
|
||||||
|
WHERE transaction_id = $1 ORDER BY participant_id`,
|
||||||
|
[txId]
|
||||||
|
);
|
||||||
|
return r.rows as { participant_id: number; share_percent: number }[];
|
||||||
|
};
|
||||||
|
|
||||||
|
it("writes the payer's half of a 50/50 recorded as one row", async () => {
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 50)`,
|
||||||
|
[txId, otherId]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
expect(await sharesOf(txId)).toEqual([
|
||||||
|
{ participant_id: ownerId, share_percent: 50 },
|
||||||
|
{ participant_id: otherId, share_percent: 50 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves an unsplit transaction unsplit", async () => {
|
||||||
|
// A transaction nobody shares is not a 100% split of itself. Writing one
|
||||||
|
// would put every row in the Shared view.
|
||||||
|
const { ownerId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
expect(await sharesOf(txId)).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("adds nothing when the other party owes all of it", async () => {
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 100)`,
|
||||||
|
[txId, otherId]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
expect(await sharesOf(txId)).toEqual([
|
||||||
|
{ participant_id: otherId, share_percent: 100 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("removes the owner's row when the others grow to cover the whole amount", async () => {
|
||||||
|
// A 50/50 revised to "they owe all of it". The owner's share becomes zero,
|
||||||
|
// and a 0% row cannot be stored anyway — `share_percent > 0` is a CHECK
|
||||||
|
// constraint — so the row has to go rather than be zeroed.
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 100), ($1, $3, 50)`,
|
||||||
|
[txId, otherId, ownerId]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
expect(await sharesOf(txId)).toEqual([
|
||||||
|
{ participant_id: otherId, share_percent: 100 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("fills the remainder for a three-way split, not a half", async () => {
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const third = (
|
||||||
|
await pool.query(`INSERT INTO participants (name) VALUES ('Carol') RETURNING id`)
|
||||||
|
).rows[0].id as number;
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 50), ($1, $3, 25)`,
|
||||||
|
[txId, otherId, third]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
expect(await sharesOf(txId)).toEqual([
|
||||||
|
{ participant_id: ownerId, share_percent: 25 },
|
||||||
|
{ participant_id: otherId, share_percent: 50 },
|
||||||
|
{ participant_id: third, share_percent: 25 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves an over-allocated split alone instead of trimming someone's share", async () => {
|
||||||
|
// >100% is a caller's mistake. Silently deleting a share to force the total
|
||||||
|
// down would destroy the evidence of it.
|
||||||
|
// No single row may exceed 100 (CHECK constraint), but two can add up past
|
||||||
|
// it — 60 + 60 is how an over-allocated split actually arrives.
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const third = (
|
||||||
|
await pool.query(`INSERT INTO participants (name) VALUES ('Dave') RETURNING id`)
|
||||||
|
).rows[0].id as number;
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 60), ($1, $3, 60)`,
|
||||||
|
[txId, otherId, third]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
expect(await sharesOf(txId)).toEqual([
|
||||||
|
{ participant_id: otherId, share_percent: 60 },
|
||||||
|
{ participant_id: third, share_percent: 60 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("gives the remainder to the statement's owner when the row has none", async () => {
|
||||||
|
// Statement rows carry no owner_id of their own; it comes from the
|
||||||
|
// statement. Transaction 3828 was one of these.
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const stmt = await pool.query(
|
||||||
|
`INSERT INTO statements (owner_id, filename, bank_name, account_number, billing_start_date, billing_end_date)
|
||||||
|
VALUES ($1, 'test.pdf', 'Test Bank', '0001', '2026-06-01', '2026-06-30') RETURNING id`,
|
||||||
|
[ownerId]
|
||||||
|
);
|
||||||
|
const tx = await pool.query(
|
||||||
|
`INSERT INTO transactions (owner_id, statement_id, transaction_date, description, amount, transaction_type, row_index)
|
||||||
|
VALUES (NULL, $1, '2026-06-15', 'Statement row', 29.17, 'debit', 0) RETURNING id`,
|
||||||
|
[stmt.rows[0].id]
|
||||||
|
);
|
||||||
|
const txId = tx.rows[0].id as number;
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 50)`,
|
||||||
|
[txId, otherId]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
expect(await sharesOf(txId)).toEqual([
|
||||||
|
{ participant_id: ownerId, share_percent: 50 },
|
||||||
|
{ participant_id: otherId, share_percent: 50 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("never puts my share on someone else's transaction", async () => {
|
||||||
|
// The remainder goes to the transaction's owner, never to "me". A row for
|
||||||
|
// me on a transaction I do not own is a debt I owe, and this helper must
|
||||||
|
// not invent one.
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, otherId); // they paid
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 50)`,
|
||||||
|
[txId, ownerId]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
const shares = await sharesOf(txId);
|
||||||
|
expect(shares).toEqual([
|
||||||
|
{ participant_id: ownerId, share_percent: 50 },
|
||||||
|
{ participant_id: otherId, share_percent: 50 },
|
||||||
|
]);
|
||||||
|
// My share is unchanged — the new row belongs to the payer.
|
||||||
|
expect(shares.find((s) => s.participant_id === ownerId)?.share_percent).toBe(50);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not disturb a settled split", async () => {
|
||||||
|
// Adding the payer's row must not touch anyone else's `settled` flag —
|
||||||
|
// that is how $37k of discharged debt gets resurrected.
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent, settled)
|
||||||
|
VALUES ($1, $2, 50, true)`,
|
||||||
|
[txId, otherId]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
|
||||||
|
const r = await pool.query(
|
||||||
|
`SELECT settled FROM transaction_splits
|
||||||
|
WHERE transaction_id = $1 AND participant_id = $2`,
|
||||||
|
[txId, otherId]
|
||||||
|
);
|
||||||
|
expect(r.rows[0].settled).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("is idempotent", async () => {
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
await pool.query(
|
||||||
|
`INSERT INTO transaction_splits (transaction_id, participant_id, share_percent)
|
||||||
|
VALUES ($1, $2, 50)`,
|
||||||
|
[txId, otherId]
|
||||||
|
);
|
||||||
|
|
||||||
|
await completeSplit(txId);
|
||||||
|
const once = await sharesOf(txId);
|
||||||
|
await completeSplit(txId);
|
||||||
|
expect(await sharesOf(txId)).toEqual(once);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The rule path, which is where ten of the live rules write a single share.
|
||||||
|
*/
|
||||||
|
describe("applyRuleActions completes the split", () => {
|
||||||
|
let pool: Pool;
|
||||||
|
let applyRuleActions: (
|
||||||
|
id: number,
|
||||||
|
actions: { apply_split?: { participant_id: number; share_percent: number }[] }
|
||||||
|
) => Promise<void>;
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
pool = createPool();
|
||||||
|
mockDbWithPool(pool);
|
||||||
|
({ applyRuleActions } = await import("@/lib/rule-actions"));
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await pool.end();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await resetDB(pool);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("writes the payer's half for a rule that names only the other person", async () => {
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, ownerId, { description: "Woolworths" });
|
||||||
|
|
||||||
|
await applyRuleActions(txId, {
|
||||||
|
apply_split: [{ participant_id: otherId, share_percent: 50 }],
|
||||||
|
});
|
||||||
|
|
||||||
|
const r = await pool.query(
|
||||||
|
`SELECT participant_id, share_percent::float FROM transaction_splits
|
||||||
|
WHERE transaction_id = $1 ORDER BY participant_id`,
|
||||||
|
[txId]
|
||||||
|
);
|
||||||
|
expect(r.rows).toEqual([
|
||||||
|
{ participant_id: ownerId, share_percent: 50 },
|
||||||
|
{ participant_id: otherId, share_percent: 50 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves a rule that already names both alone", async () => {
|
||||||
|
const { ownerId, otherId } = await seedParticipants(pool);
|
||||||
|
const txId = await insertTransaction(pool, ownerId);
|
||||||
|
|
||||||
|
await applyRuleActions(txId, {
|
||||||
|
apply_split: [
|
||||||
|
{ participant_id: ownerId, share_percent: 50 },
|
||||||
|
{ participant_id: otherId, share_percent: 50 },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
const r = await pool.query(
|
||||||
|
`SELECT sum(share_percent)::float AS total, count(*)::int AS n
|
||||||
|
FROM transaction_splits WHERE transaction_id = $1`,
|
||||||
|
[txId]
|
||||||
|
);
|
||||||
|
expect(r.rows[0]).toEqual({ total: 100, n: 2 });
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import { describe, it, expect } from "vitest";
|
||||||
|
import { CATEGORIES, formatCategory } from "@/lib/categories";
|
||||||
|
|
||||||
|
describe("formatCategory", () => {
|
||||||
|
it("capitalises single word", () => {
|
||||||
|
expect(formatCategory("groceries")).toBe("Groceries");
|
||||||
|
});
|
||||||
|
it("capitalises and spaces underscore-separated words", () => {
|
||||||
|
expect(formatCategory("home_goods")).toBe("Home Goods");
|
||||||
|
});
|
||||||
|
it("handles three-word categories", () => {
|
||||||
|
expect(formatCategory("home_maintenance")).toBe("Home Maintenance");
|
||||||
|
});
|
||||||
|
it("handles cash_advance", () => {
|
||||||
|
expect(formatCategory("cash_advance")).toBe("Cash Advance");
|
||||||
|
});
|
||||||
|
it("handles personal_care", () => {
|
||||||
|
expect(formatCategory("personal_care")).toBe("Personal Care");
|
||||||
|
});
|
||||||
|
it("handles single-word categories without underscores", () => {
|
||||||
|
expect(formatCategory("travel")).toBe("Travel");
|
||||||
|
expect(formatCategory("fees")).toBe("Fees");
|
||||||
|
expect(formatCategory("other")).toBe("Other");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("CATEGORIES", () => {
|
||||||
|
it("contains expected core categories", () => {
|
||||||
|
const cats = CATEGORIES as readonly string[];
|
||||||
|
expect(cats).toContain("groceries");
|
||||||
|
expect(cats).toContain("dining");
|
||||||
|
expect(cats).toContain("transport");
|
||||||
|
expect(cats).toContain("health");
|
||||||
|
expect(cats).toContain("other");
|
||||||
|
});
|
||||||
|
it("has no duplicates", () => {
|
||||||
|
const cats = CATEGORIES as readonly string[];
|
||||||
|
expect(new Set(cats).size).toBe(cats.length);
|
||||||
|
});
|
||||||
|
it("all entries are lowercase with only letters and underscores", () => {
|
||||||
|
for (const cat of CATEGORIES) {
|
||||||
|
expect(cat).toMatch(/^[a-z_]+$/);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
it("formatCategory produces unique display names", () => {
|
||||||
|
const formatted = CATEGORIES.map(formatCategory);
|
||||||
|
expect(new Set(formatted).size).toBe(formatted.length);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,523 @@
|
|||||||
|
import { describe, it, expect } from "vitest";
|
||||||
|
import { readFileSync } from "fs";
|
||||||
|
import { resolve } from "path";
|
||||||
|
import {
|
||||||
|
parseOrderHTML,
|
||||||
|
validateOrderTotals,
|
||||||
|
resolveCategory,
|
||||||
|
NotAReceiptError,
|
||||||
|
orderDescription,
|
||||||
|
type MessageMeta,
|
||||||
|
type ParsedOrder,
|
||||||
|
} from "../../lib/order-ingestion";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rewritten 2026-07-26. The previous unit suite exercised synthetic fixtures
|
||||||
|
* built to satisfy the parser, so it passed while the parser could not read a
|
||||||
|
* real email. These run against unmodified captured receipts.
|
||||||
|
*/
|
||||||
|
const dir = resolve(__dirname, "../fixtures/orders/real");
|
||||||
|
const html = (f: string) => readFileSync(resolve(dir, `${f}.html`), "utf-8");
|
||||||
|
const meta = (over: Partial<MessageMeta> = {}): MessageMeta => ({
|
||||||
|
messageId: "unit-1",
|
||||||
|
subject: "Order Confirmation for Siddharth from Mad Mex",
|
||||||
|
receivedAt: "2026-07-16T03:34:00Z",
|
||||||
|
sender: "DoorDash Order <no-reply@doordash.com>",
|
||||||
|
...over,
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("payment detection", () => {
|
||||||
|
it("credits-only", () => {
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta());
|
||||||
|
expect(p.payment.credits_amount).toBe(14.64);
|
||||||
|
expect(p.payment.card_last4).toBeNull();
|
||||||
|
expect(p.payment.ambiguous).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("card-only produces no credits figure", () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("dd-27"),
|
||||||
|
meta({ subject: "Order Confirmation for Siddharth from Subway" })
|
||||||
|
);
|
||||||
|
expect(p.payment.card_last4).toBe("8032");
|
||||||
|
expect(p.payment.credits_amount).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("'and/or credits' is ambiguous, not silently credits", () => {
|
||||||
|
// Regression: an earlier regex delimited the payment line on a double
|
||||||
|
// space, which whitespace collapsing removes. Every card and mixed receipt
|
||||||
|
// fell through to the credits branch — this one booked the whole $60.93 as
|
||||||
|
// credits spend that never happened.
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("dd-10"),
|
||||||
|
meta({ subject: "Order Confirmation for Siddharth from Woolworths" })
|
||||||
|
);
|
||||||
|
expect(p.payment.ambiguous).toBe(true);
|
||||||
|
expect(p.payment.card_last4).toBe("8032");
|
||||||
|
expect(p.payment.credits_amount).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("validateOrderTotals", () => {
|
||||||
|
const base = (over: Partial<ParsedOrder> = {}): ParsedOrder => ({
|
||||||
|
order_reference: "x",
|
||||||
|
platform: "doordash",
|
||||||
|
merchant_name: "M",
|
||||||
|
order_datetime: "2026-03-01T00:00:00Z",
|
||||||
|
currency: "AUD",
|
||||||
|
payment: { credits_amount: 10, card_amount: null, card_last4: null, ambiguous: false },
|
||||||
|
totals: {
|
||||||
|
subtotal: null, taxes: null, delivery_fee: null,
|
||||||
|
service_fee: null, tip: null, discounts: null, total_charged: 10,
|
||||||
|
},
|
||||||
|
line_items: [],
|
||||||
|
route: [],
|
||||||
|
is_family: false,
|
||||||
|
flags: [],
|
||||||
|
...over,
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a non-positive total", () => {
|
||||||
|
const o = base();
|
||||||
|
o.totals.total_charged = 0;
|
||||||
|
expect(validateOrderTotals(o).ok).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects payments that do not account for the total", () => {
|
||||||
|
const r = validateOrderTotals(
|
||||||
|
base({ payment: { credits_amount: 5, card_amount: null, card_last4: null, ambiguous: false } })
|
||||||
|
);
|
||||||
|
expect(r.ok).toBe(false);
|
||||||
|
expect(r.reason).toMatch(/payments sum/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("accepts a matching total", () => {
|
||||||
|
expect(validateOrderTotals(base()).ok).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not gate on DoorDash's non-reconciling fee breakdown", () => {
|
||||||
|
const p = parseOrderHTML(html("dd-01"), meta());
|
||||||
|
expect(p.totals.subtotal).toBe(22.10);
|
||||||
|
expect(p.totals.discounts).toBe(24.09); // 22.10 + 1.99 — genuinely printed
|
||||||
|
expect(validateOrderTotals(p, html("dd-01")).ok).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("resolveCategory", () => {
|
||||||
|
const o = (merchant: string, platform: ParsedOrder["platform"] = "doordash") =>
|
||||||
|
({ merchant_name: merchant, platform }) as ParsedOrder;
|
||||||
|
|
||||||
|
it("maps grocers to groceries", () => {
|
||||||
|
expect(resolveCategory(o("Woolworths"))).toBe("groceries");
|
||||||
|
expect(resolveCategory(o("ALDI"))).toBe("groceries");
|
||||||
|
expect(resolveCategory(o("GLOMARK Kandana", "ubereats"))).toBe("groceries");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("maps restaurants to dining rather than 'other'", () => {
|
||||||
|
// The earlier six-merchant allowlist sent every one of these to `other`.
|
||||||
|
for (const m of ["Carl's Jr.", "Taco Bell", "Chilli India", "Oporto", "Schnitz", "Souvlaki GR"]) {
|
||||||
|
expect(resolveCategory(o(m))).toBe("dining");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it("maps rides to transport", () => {
|
||||||
|
expect(resolveCategory(o("Uber Trip", "uber"))).toBe("transport");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("parse guards", () => {
|
||||||
|
it("throws on a body too short to be a receipt", () => {
|
||||||
|
expect(() => parseOrderHTML("<html></html>", meta())).toThrow(NotAReceiptError);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("throws rather than inventing a platform", () => {
|
||||||
|
expect(() =>
|
||||||
|
parseOrderHTML(html("dd-01"), meta({ subject: "Newsletter", sender: "someone@example.com" }))
|
||||||
|
).toThrow(/platform/i);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("order_reference anchoring", () => {
|
||||||
|
it("takes Uber's tripReference, not the first UUID in the document", () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-00"),
|
||||||
|
meta({ subject: "Your Wednesday afternoon order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
// The UUID the PDF redirect actually resolves to for this receipt.
|
||||||
|
expect(p.order_reference).toBe("34d6b4ee-da8f-5029-8d14-bd359617c8e9");
|
||||||
|
expect(p.flags).not.toContain("order_uuid_ambiguous");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("is stable across repeated parses of the same message", () => {
|
||||||
|
const m = meta({ subject: "Your Wednesday afternoon order with Uber Eats", sender: "uber.com" });
|
||||||
|
const a = parseOrderHTML(html("ue-00"), m).order_reference;
|
||||||
|
const b = parseOrderHTML(html("ue-00"), m).order_reference;
|
||||||
|
expect(a).toBe(b);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("flags ambiguity only when several UUIDs and no anchor", () => {
|
||||||
|
// Strip the anchor from a receipt that carries multiple UUIDs (ue-09 has 6).
|
||||||
|
const stripped = html("ue-09").replace(/tripReference/gi, "notTheAnchor");
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
stripped,
|
||||||
|
meta({ subject: "[Family] Your Sunday evening order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
expect(p.flags).toContain("order_uuid_ambiguous");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("mixed Uber payment (issuer-named card leg)", () => {
|
||||||
|
it("captures both legs when the card is labelled by issuer, not brand", () => {
|
||||||
|
// Real receipt: Uber Cash $1.17 + Westpac ••••8032 $15.33 = $16.50.
|
||||||
|
// A brand allowlist (Visa|MasterCard|Amex) misses "Westpac" and drops the
|
||||||
|
// card half, leaving payments that do not account for the total.
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
readFileSync(resolve(dir, "ue-mixed.html"), "utf-8"),
|
||||||
|
meta({ subject: "Your Friday morning order with Uber Eats", sender: "uber.com", receivedAt: "2026-01-09T09:26:44Z" })
|
||||||
|
);
|
||||||
|
expect(p.totals.total_charged).toBeCloseTo(16.50, 2);
|
||||||
|
expect(p.payment.credits_amount).toBeCloseTo(1.17, 2);
|
||||||
|
expect(p.payment.card_amount).toBeCloseTo(15.33, 2);
|
||||||
|
expect(p.payment.card_last4).toBe("8032");
|
||||||
|
expect(validateOrderTotals(p).ok).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Uber route (pick-up / delivery)", () => {
|
||||||
|
const uber = (f: string, subject = "Your Wednesday order with Uber Eats") =>
|
||||||
|
parseOrderHTML(html(f), meta({ subject, sender: "uber.com" }));
|
||||||
|
|
||||||
|
it("reads both stops with their times, as printed", () => {
|
||||||
|
const p = uber("ue-00");
|
||||||
|
expect(p.route).toEqual([
|
||||||
|
{ label: "Pick-up", time: "1:20 pm", address: "197 Watton St, Werribee VIC 3030, Australia" },
|
||||||
|
{ label: "Delivery", time: "1:40 pm", address: "19 Lady Penrhyn Dr, Wyndham Vale VIC 3024, Australia" },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("de-duplicates the block Uber renders twice", () => {
|
||||||
|
// The receipt emits the whole address section a second time for narrow
|
||||||
|
// screens. Without de-duplication every trip has four stops.
|
||||||
|
expect(uber("ue-00").route).toHaveLength(2);
|
||||||
|
expect(uber("ue-26").route).toHaveLength(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps the receipt's own wording rather than normalising it", () => {
|
||||||
|
// Uber is not internally consistent: "Pick-up" on some receipts,
|
||||||
|
// "Pickup" on others. Inventing a canonical spelling would hide that a
|
||||||
|
// template changed.
|
||||||
|
expect(uber("ue-mixed", "Your Friday morning order with Uber Eats").route[0].label).toBe("Pickup");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("works on an international receipt", () => {
|
||||||
|
const p = uber("ue-26");
|
||||||
|
expect(p.route[1].address).toContain("Luzern, Switzerland");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("DoorDash has no route — its receipts carry no addresses", () => {
|
||||||
|
expect(parseOrderHTML(html("dd-01"), meta()).route).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Uber line items", () => {
|
||||||
|
it("itemises a grocery order, binding qty/title/amount by item id", () => {
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-09"),
|
||||||
|
meta({ subject: "Your Sunday evening order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
expect(p.line_items).toHaveLength(5);
|
||||||
|
expect(p.line_items[0]).toMatchObject({
|
||||||
|
qty: 1,
|
||||||
|
description: "Highland Brewing MILK FULL CREAM U H T 900ML",
|
||||||
|
amount: 440,
|
||||||
|
});
|
||||||
|
// A sold-out item prints 0.00 and is kept: it is why the total is lower
|
||||||
|
// than what was ordered, and dropping it makes the receipt unexplainable.
|
||||||
|
expect(p.line_items.map((i) => i.amount)).toContain(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("a restaurant order legitimately has none", () => {
|
||||||
|
// Uber itemises groceries only; a restaurant receipt states a total and
|
||||||
|
// nothing else. Empty here is the receipt, not a parse failure — so it
|
||||||
|
// must not raise no_line_items_parsed either.
|
||||||
|
const p = parseOrderHTML(
|
||||||
|
html("ue-00"),
|
||||||
|
meta({ subject: "Your Wednesday order with Uber Eats", sender: "uber.com" })
|
||||||
|
);
|
||||||
|
expect(p.line_items).toEqual([]);
|
||||||
|
expect(p.flags).not.toContain("no_line_items_parsed");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Uber trips. Captured 2026-06 via a dry-run against the real mailbox after the
|
||||||
|
* user pointed out that only *overseas* rides go on a card — local rides are
|
||||||
|
* paid with credits, which puts them in the same class as delivery orders.
|
||||||
|
*/
|
||||||
|
describe("Uber trips", () => {
|
||||||
|
const utMeta: Record<string, MessageMeta> = JSON.parse(
|
||||||
|
readFileSync(resolve(dir, "ut-meta.json"), "utf-8")
|
||||||
|
);
|
||||||
|
const trip = (f: string) => parseOrderHTML(html(f), utMeta[f]);
|
||||||
|
|
||||||
|
it("a local trip is credits-funded", () => {
|
||||||
|
const p = trip("ut-00");
|
||||||
|
expect(p.platform).toBe("uber");
|
||||||
|
expect(p.currency).toBe("AUD");
|
||||||
|
expect(p.totals.total_charged).toBeCloseTo(84.78, 2);
|
||||||
|
expect(p.payment.credits_amount).toBeCloseTo(84.78, 2);
|
||||||
|
expect(p.payment.card_last4).toBeNull();
|
||||||
|
expect(validateOrderTotals(p).ok).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("an overseas trip is card-settled", () => {
|
||||||
|
const p = trip("ut-01");
|
||||||
|
expect(p.currency).toBe("NZD");
|
||||||
|
expect(p.totals.total_charged).toBeCloseTo(55.51, 2);
|
||||||
|
expect(p.payment.card_amount).toBeCloseTo(55.51, 2);
|
||||||
|
expect(p.payment.card_last4).toBe("3893");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("labels the two ends of a trip, which the receipt does not", () => {
|
||||||
|
// Delivery receipts write "1:20 pm - Pick-up"; trip receipts print the time
|
||||||
|
// alone. The naive split put the time in `label` and left `time` null.
|
||||||
|
const p = trip("ut-00");
|
||||||
|
expect(p.route).toEqual([
|
||||||
|
{
|
||||||
|
label: "Pick-up",
|
||||||
|
time: "7:32 pm",
|
||||||
|
address: "Terminal 2, Melbourne Airport (MEL), Tullamarine VIC 3045, Australia",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Drop-off",
|
||||||
|
time: "8:10 pm",
|
||||||
|
address: "19 Lady Penrhyn Dr, Wyndham Vale VIC 3024, Australia",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects the charge summary Uber sends before the receipt", () => {
|
||||||
|
// Uber sends two mails per trip with the same subject and the same total.
|
||||||
|
// The first says "This is not a payment receipt" and carries no
|
||||||
|
// tripReference, so order_reference would fall back to msg:<id> and I7
|
||||||
|
// could not dedupe it — every trip would be recorded twice.
|
||||||
|
expect(() => trip("ut-summary")).toThrow(NotAReceiptError);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("orderDescription", () => {
|
||||||
|
it("names the restaurant, not the courier", () => {
|
||||||
|
// The platform is provenance and lives in the Order details panel, which
|
||||||
|
// already renders expense_metadata.platform. Putting it here fragmented the
|
||||||
|
// merchant — the same restaurant read differently depending on who carried
|
||||||
|
// the bag, which nobody rating the food cares about.
|
||||||
|
expect(orderDescription("doordash", "Mad Mex")).toBe("Order - Mad Mex");
|
||||||
|
expect(orderDescription("ubereats", "Coles (Wyndham Vale)")).toBe(
|
||||||
|
"Order - Coles (Wyndham Vale)"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves a merchant that already names the platform alone", () => {
|
||||||
|
// A trip's merchant is literally "Uber Trip". What identifies a trip is its
|
||||||
|
// addresses, and those live in the Order details panel.
|
||||||
|
expect(orderDescription("uber", "Uber Trip")).toBe("Order - Uber Trip");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("gives the same description whichever platform delivered it", () => {
|
||||||
|
// The regression this whole change exists to prevent.
|
||||||
|
expect(orderDescription("doordash", "TEG Kebabs & Biryani")).toBe(
|
||||||
|
orderDescription("ubereats", "TEG Kebabs & Biryani")
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Two parse failures that between them accounted for 218 of the 287 unreadable
|
||||||
|
* messages in the 776-message capture set. Neither was an "old template": the
|
||||||
|
* Uber one fails on current 2024-2025 mail, and the DoorDash one fails on every
|
||||||
|
* order paid from credits, in every year.
|
||||||
|
*/
|
||||||
|
describe("currency notations Uber actually sends", () => {
|
||||||
|
const uber = (f: string, subject: string) =>
|
||||||
|
parseOrderHTML(html(f), meta({ subject, sender: "Uber Receipts <noreply@uber.com>" }));
|
||||||
|
|
||||||
|
it("reads a symbol-prefixed Australian total", () => {
|
||||||
|
// "Total A$54.87". The old pattern allowed a 3-letter ISO code or a bare
|
||||||
|
// "$", so A$ — which is what Uber sends for ordinary domestic orders —
|
||||||
|
// matched neither and 98 of 275 Uber Eats mails were unreadable.
|
||||||
|
const o = uber("ue-aud-prefix", "Your Friday evening order with Uber Eats");
|
||||||
|
expect(o.totals.total_charged).toBe(54.87);
|
||||||
|
expect(o.currency).toBe("AUD");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reads NZ$ as New Zealand dollars, not Australian", () => {
|
||||||
|
// The prefix is the only thing distinguishing them, and getting it wrong
|
||||||
|
// books a Queenstown dinner at the wrong rate rather than failing loudly.
|
||||||
|
const o = uber("ue-nzd-prefix", "Your Saturday evening order with Uber Eats");
|
||||||
|
expect(o.totals.total_charged).toBe(22.83);
|
||||||
|
expect(o.currency).toBe("NZD");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reads a bare rupee symbol on a trip", () => {
|
||||||
|
const o = uber("ut-inr-symbol", "Your Friday evening trip with Uber");
|
||||||
|
expect(o.totals.total_charged).toBe(622.74);
|
||||||
|
expect(o.currency).toBe("INR");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("still reads the space-separated ISO form", () => {
|
||||||
|
// The [Family] LKR receipts depend on this and must not regress.
|
||||||
|
const o = uber("ut-nzd-prefix", "Your Sunday afternoon trip with Uber");
|
||||||
|
expect(o.totals.total_charged).toBe(10.83);
|
||||||
|
expect(o.currency).toBe("NZD");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("credits-funded orders are orders", () => {
|
||||||
|
const credits = () =>
|
||||||
|
parseOrderHTML(
|
||||||
|
html("dd-credits-zero"),
|
||||||
|
meta({ subject: "Order Confirmation for Siddharth from Chilli India" })
|
||||||
|
);
|
||||||
|
|
||||||
|
it("records the subtotal when the card was charged nothing", () => {
|
||||||
|
// The receipt says "Subtotal $71.86 ... Total Charged $0.00" — truthfully,
|
||||||
|
// because credits covered it. Reading that as a $0 order threw away the
|
||||||
|
// credit-funded spend this pipeline exists to surface.
|
||||||
|
const o = credits();
|
||||||
|
expect(o.totals.total_charged).toBe(71.86);
|
||||||
|
expect(o.totals.subtotal).toBe(71.86);
|
||||||
|
expect(o.flags).toContain("credits_funded_zero_charge");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("books the amount as credits, not as a card charge", () => {
|
||||||
|
const o = credits();
|
||||||
|
expect(o.payment.credits_amount).toBe(71.86);
|
||||||
|
expect(o.payment.card_amount).toBeNull();
|
||||||
|
expect(o.payment.card_last4).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("passes validation instead of being rejected as non-positive", () => {
|
||||||
|
// Both stated totals are $0.00 and agree, so the header cross-check has to
|
||||||
|
// stand down here or it rejects the very figure the parser overrode.
|
||||||
|
const o = credits();
|
||||||
|
expect(validateOrderTotals(o, html("dd-credits-zero"))).toEqual({ ok: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not invent a total when the receipt never says credits", () => {
|
||||||
|
// The guard that keeps this from becoming "any zero total borrows the
|
||||||
|
// subtotal" — a genuinely empty receipt must still fail.
|
||||||
|
const notCredits = html("dd-credits-zero").replace(/Paid with/gi, "Charged to");
|
||||||
|
const o = parseOrderHTML(notCredits, meta({ subject: "Order Confirmation for Siddharth from Chilli India" }));
|
||||||
|
expect(o.totals.total_charged).toBe(0);
|
||||||
|
expect(validateOrderTotals(o, notCredits).ok).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Uber Cash is credits, not a card", () => {
|
||||||
|
it("reads a payment line carrying a timestamp and a prefixed currency", () => {
|
||||||
|
// "Payments Uber Cash 10/17/25 8:50 PM A$54.87". The old pattern allowed
|
||||||
|
// neither the timestamp nor the A$ prefix, so credits_amount stayed null
|
||||||
|
// and the order was filed as card-settled — sent looking for a card leg
|
||||||
|
// that does not exist, and left as an orphan with nothing to match on.
|
||||||
|
const o = parseOrderHTML(
|
||||||
|
html("ue-aud-prefix"),
|
||||||
|
meta({
|
||||||
|
subject: "Your Friday evening order with Uber Eats",
|
||||||
|
sender: "Uber Receipts <noreply@uber.com>",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
expect(o.payment.credits_amount).toBe(54.87);
|
||||||
|
expect(o.payment.card_last4).toBeNull();
|
||||||
|
expect(o.payment.ambiguous).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("still reads the plain form, where the timestamp follows the amount", () => {
|
||||||
|
// "Uber Cash $25.33 22/7/26 1:41 pm" — the older layout the widened
|
||||||
|
// pattern must not break.
|
||||||
|
const o = parseOrderHTML(
|
||||||
|
html("ue-00"),
|
||||||
|
meta({
|
||||||
|
subject: "Your order with Uber Eats",
|
||||||
|
sender: "Uber Receipts <noreply@uber.com>",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
expect(o.payment.credits_amount).toBe(25.33);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("still reads the card leg of a mixed payment", () => {
|
||||||
|
// "Uber Cash $1.17 ... Westpac ••••8032 $15.33" — the credits half must
|
||||||
|
// not swallow the card half.
|
||||||
|
const o = parseOrderHTML(
|
||||||
|
html("ue-mixed"),
|
||||||
|
meta({ subject: "Your order with Uber Eats", sender: "Uber Receipts <noreply@uber.com>" })
|
||||||
|
);
|
||||||
|
expect(o.payment.credits_amount).toBe(1.17);
|
||||||
|
expect(o.payment.card_last4).toBe("8032");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("payment legs", () => {
|
||||||
|
const trip = (f: string) =>
|
||||||
|
parseOrderHTML(
|
||||||
|
html(f),
|
||||||
|
meta({
|
||||||
|
subject: "Your Wednesday afternoon trip with Uber",
|
||||||
|
sender: "Uber Receipts <noreply@uber.com>",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
it("does not add a superseded authorisation to the settled charge", () => {
|
||||||
|
// "Citi Prestige ••••0253 AED 17.67" then the same card "AED 577.83",
|
||||||
|
// against a stated total of 577.83. The first is a hold, not a part
|
||||||
|
// payment; adding it overstates the trip by the held amount.
|
||||||
|
const o = trip("ut-reauth");
|
||||||
|
expect(o.totals.total_charged).toBe(577.83);
|
||||||
|
expect(o.payment.card_amount).toBe(577.83);
|
||||||
|
expect(o.payment.card_last4).toBe("0253");
|
||||||
|
expect(validateOrderTotals(o, html("ut-reauth")).ok).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("adds the legs of a genuinely split payment", () => {
|
||||||
|
// "PayPal - <email> A$78.41" + "Uber Cash A$6.85" = 85.26. Neither leg
|
||||||
|
// equals the total, so both are real and both must be counted — and the
|
||||||
|
// PayPal leg carries no card mask to anchor on.
|
||||||
|
const o = trip("ut-paypal");
|
||||||
|
expect(o.totals.total_charged).toBe(85.26);
|
||||||
|
expect(o.payment.credits_amount).toBe(6.85);
|
||||||
|
expect(o.payment.card_amount).toBe(78.41);
|
||||||
|
expect(validateOrderTotals(o, html("ut-paypal")).ok).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("HTML entities in line items", () => {
|
||||||
|
it("splits options on an encoded bullet instead of swallowing it", () => {
|
||||||
|
// "<b>Sweet & Sour Crunch</b> (…)<br><font>• Sweet & Sour
|
||||||
|
// Crunch 12 Pieces</font>". • was not in the decode table, and
|
||||||
|
// parseDoorDashLineItems splits on the literal "•" — so the option never
|
||||||
|
// separated and the entity was rendered raw in the Order details panel.
|
||||||
|
const o = parseOrderHTML(
|
||||||
|
html("dd-bull-entity"),
|
||||||
|
meta({ subject: "Order Confirmation for Siddharth from Red Rooster" })
|
||||||
|
);
|
||||||
|
const all = JSON.stringify(o.line_items);
|
||||||
|
expect(all).not.toContain("•");
|
||||||
|
expect(all).not.toContain("&");
|
||||||
|
|
||||||
|
const item = o.line_items.find((i) => i.description.startsWith("Sweet"));
|
||||||
|
expect(item).toBeDefined();
|
||||||
|
// The ampersand decodes, and the bullet becomes a boundary, not text.
|
||||||
|
expect(item!.description).toContain("Sweet & Sour Crunch");
|
||||||
|
expect(item!.description).not.toContain("•");
|
||||||
|
expect(item!.options.length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves a literal &bull; alone rather than turning it into a bullet", () => {
|
||||||
|
// Why & resolves last: decoding it first would rewrite text that was
|
||||||
|
// deliberately escaped.
|
||||||
|
const o = parseOrderHTML(
|
||||||
|
html("dd-01").replace("Mad Mex", "A&amp;bull;B"),
|
||||||
|
meta()
|
||||||
|
);
|
||||||
|
expect(JSON.stringify(o)).not.toContain("A•B".replace("•", "•"));
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,166 @@
|
|||||||
|
import { describe, it, expect } from "vitest";
|
||||||
|
import { evaluateCondition, type Condition, type TxFields } from "@/lib/rules";
|
||||||
|
|
||||||
|
function tx(overrides: Partial<TxFields> = {}): TxFields {
|
||||||
|
return {
|
||||||
|
effective_category: "groceries",
|
||||||
|
effective_merchant: "Coles",
|
||||||
|
description: "COLES WYNDHAM VALE",
|
||||||
|
bank_name: "ANZ",
|
||||||
|
amount: 42.5,
|
||||||
|
transaction_type: "debit",
|
||||||
|
tags: [],
|
||||||
|
...overrides,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function cond(field: Condition["field"], operator: Condition["operator"], value: string): Condition {
|
||||||
|
return { field, operator, value };
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── String fields ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
describe("merchant_normalized", () => {
|
||||||
|
it("contains — matches substring", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "contains", "coles"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("contains — case-insensitive", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "contains", "COLES"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("contains — no match", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "contains", "woolworths"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("equals — exact match (case-insensitive)", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "equals", "coles"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("equals — no match", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "equals", "cole"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("starts_with — matches prefix", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "starts_with", "col"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("starts_with — no match", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "starts_with", "oles"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("not_equals — different value", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "not_equals", "woolworths"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("not_equals — same value", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "not_equals", "coles"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("empty merchant falls back to empty string", () => {
|
||||||
|
expect(evaluateCondition(cond("merchant_normalized", "contains", "coles"), tx({ effective_merchant: "" }))).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("description", () => {
|
||||||
|
it("contains — matches", () => {
|
||||||
|
expect(evaluateCondition(cond("description", "contains", "wyndham"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("equals — exact (case-insensitive)", () => {
|
||||||
|
expect(evaluateCondition(cond("description", "equals", "coles wyndham vale"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("starts_with", () => {
|
||||||
|
expect(evaluateCondition(cond("description", "starts_with", "coles"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("category", () => {
|
||||||
|
it("equals category", () => {
|
||||||
|
expect(evaluateCondition(cond("category", "equals", "groceries"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("not_equals different category", () => {
|
||||||
|
expect(evaluateCondition(cond("category", "not_equals", "dining"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("contains partial", () => {
|
||||||
|
expect(evaluateCondition(cond("category", "contains", "grocer"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("bank_name", () => {
|
||||||
|
it("equals bank", () => {
|
||||||
|
expect(evaluateCondition(cond("bank_name", "equals", "anz"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("not_equals different bank", () => {
|
||||||
|
expect(evaluateCondition(cond("bank_name", "not_equals", "nab"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("transaction_type", () => {
|
||||||
|
it("equals debit", () => {
|
||||||
|
expect(evaluateCondition(cond("transaction_type", "equals", "debit"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("not_equals credit", () => {
|
||||||
|
expect(evaluateCondition(cond("transaction_type", "not_equals", "credit"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("equals credit — no match on debit tx", () => {
|
||||||
|
expect(evaluateCondition(cond("transaction_type", "equals", "credit"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Amount field ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
describe("amount", () => {
|
||||||
|
it("equals exact amount", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "equals", "42.5"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("equals wrong amount", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "equals", "42"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("not_equals different amount", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "not_equals", "100"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("gt — amount is greater", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "gt", "40"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("gt — amount is equal (not strictly greater)", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "gt", "42.5"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("gt — amount is less", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "gt", "50"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("lt — amount is less", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "lt", "50"), tx())).toBe(true);
|
||||||
|
});
|
||||||
|
it("lt — amount is equal (not strictly less)", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "lt", "42.5"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("lt — amount is greater", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "lt", "40"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
it("unsupported operator (contains) returns false", () => {
|
||||||
|
expect(evaluateCondition(cond("amount", "contains", "42"), tx())).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Tag field ────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
describe("tag", () => {
|
||||||
|
it("equals — tag present", () => {
|
||||||
|
expect(evaluateCondition(cond("tag", "equals", "5"), tx({ tags: [{ id: 5 }] }))).toBe(true);
|
||||||
|
});
|
||||||
|
it("equals — tag absent", () => {
|
||||||
|
expect(evaluateCondition(cond("tag", "equals", "5"), tx({ tags: [] }))).toBe(false);
|
||||||
|
});
|
||||||
|
it("equals — different tag", () => {
|
||||||
|
expect(evaluateCondition(cond("tag", "equals", "5"), tx({ tags: [{ id: 7 }] }))).toBe(false);
|
||||||
|
});
|
||||||
|
it("not_equals — tag absent", () => {
|
||||||
|
expect(evaluateCondition(cond("tag", "not_equals", "5"), tx({ tags: [] }))).toBe(true);
|
||||||
|
});
|
||||||
|
it("not_equals — tag present", () => {
|
||||||
|
expect(evaluateCondition(cond("tag", "not_equals", "5"), tx({ tags: [{ id: 5 }] }))).toBe(false);
|
||||||
|
});
|
||||||
|
it("matches one of multiple tags", () => {
|
||||||
|
expect(evaluateCondition(cond("tag", "equals", "3"), tx({ tags: [{ id: 1 }, { id: 3 }] }))).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Unknown field ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
describe("unknown field", () => {
|
||||||
|
it("returns false for unrecognised field", () => {
|
||||||
|
// @ts-expect-error intentional invalid field for regression guard
|
||||||
|
expect(evaluateCondition({ field: "nonexistent", operator: "equals", value: "x" }, tx())).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
|
||||||
|
import { createHmac } from "node:crypto";
|
||||||
|
import { verifySlackSignature, participantForSlackUser } from "@/lib/slack-verify";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The signature is one of the two gates on a route that writes splits. Getting
|
||||||
|
* it wrong is not a cosmetic bug — it is an unauthenticated write path — so the
|
||||||
|
* fail-closed cases are tested first and explicitly.
|
||||||
|
*/
|
||||||
|
const SECRET = "test-signing-secret";
|
||||||
|
|
||||||
|
function sign(body: string, ts: string, secret = SECRET) {
|
||||||
|
return "v0=" + createHmac("sha256", secret).update(`v0:${ts}:${body}`).digest("hex");
|
||||||
|
}
|
||||||
|
|
||||||
|
const now = () => String(Math.floor(Date.now() / 1000));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
process.env.SLACK_SIGNING_SECRET = SECRET;
|
||||||
|
});
|
||||||
|
afterEach(() => {
|
||||||
|
vi.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("verifySlackSignature", () => {
|
||||||
|
it("accepts a correctly signed request", () => {
|
||||||
|
const ts = now();
|
||||||
|
const body = "payload=%7B%22type%22%3A%22block_actions%22%7D";
|
||||||
|
expect(verifySlackSignature(body, ts, sign(body, ts))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects when the signing secret is unset", () => {
|
||||||
|
const ts = now();
|
||||||
|
const body = "x=1";
|
||||||
|
const sig = sign(body, ts);
|
||||||
|
delete process.env.SLACK_SIGNING_SECRET;
|
||||||
|
// Fails CLOSED. An unset secret waving requests through would turn a
|
||||||
|
// misconfigured deploy into an open write endpoint.
|
||||||
|
expect(verifySlackSignature(body, ts, sig)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a tampered body", () => {
|
||||||
|
const ts = now();
|
||||||
|
const sig = sign("payload=original", ts);
|
||||||
|
expect(verifySlackSignature("payload=tampered", ts, sig)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a signature made with a different secret", () => {
|
||||||
|
const ts = now();
|
||||||
|
const body = "x=1";
|
||||||
|
expect(verifySlackSignature(body, ts, sign(body, ts, "wrong-secret"))).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a replay outside the 5 minute window", () => {
|
||||||
|
const old = String(Math.floor(Date.now() / 1000) - 400);
|
||||||
|
const body = "x=1";
|
||||||
|
expect(verifySlackSignature(body, old, sign(body, old))).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("accepts inside the window", () => {
|
||||||
|
const recent = String(Math.floor(Date.now() / 1000) - 60);
|
||||||
|
const body = "x=1";
|
||||||
|
expect(verifySlackSignature(body, recent, sign(body, recent))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects missing headers", () => {
|
||||||
|
expect(verifySlackSignature("x=1", null, "v0=abc")).toBe(false);
|
||||||
|
expect(verifySlackSignature("x=1", now(), null)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a signature of the wrong length without throwing", () => {
|
||||||
|
// timingSafeEqual throws on length mismatch; a truncated signature must be
|
||||||
|
// a plain false, not a 500.
|
||||||
|
expect(() => verifySlackSignature("x=1", now(), "v0=short")).not.toThrow();
|
||||||
|
expect(verifySlackSignature("x=1", now(), "v0=short")).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("participantForSlackUser", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
process.env.SLACK_USER_MAP = "U111:1, U444:4";
|
||||||
|
});
|
||||||
|
|
||||||
|
it("maps known users", () => {
|
||||||
|
expect(participantForSlackUser("U111")).toBe(1);
|
||||||
|
expect(participantForSlackUser("U444")).toBe(4);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null for an unknown user rather than defaulting to the owner", () => {
|
||||||
|
// A wrong attribution records the other person's opinion under your name,
|
||||||
|
// which is worse than refusing.
|
||||||
|
expect(participantForSlackUser("U999")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null when the map is unset", () => {
|
||||||
|
delete process.env.SLACK_USER_MAP;
|
||||||
|
expect(participantForSlackUser("U111")).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { queryRaw } from "@/lib/db";
|
||||||
|
import {
|
||||||
|
OWNER_SCOPE,
|
||||||
|
STATEMENTS_JOIN,
|
||||||
|
EXCLUDE_NON_SPEND,
|
||||||
|
EXCLUDE_RECONCILED_SOURCE,
|
||||||
|
EFFECTIVE_CATEGORY,
|
||||||
|
NET_SPEND_ROWS,
|
||||||
|
SPEND_SIGNED,
|
||||||
|
mySplitOf,
|
||||||
|
toDateStr,
|
||||||
|
} from "@/lib/analytics-sql";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Daily net spend, by month, day-of-month and category.
|
||||||
|
*
|
||||||
|
* This exists so the spend-pace chart stops computing its own totals. It used to
|
||||||
|
* sum gross `amount_aud ?? amount` over `transaction_type = 'debit'` in the
|
||||||
|
* browser, which meant it ignored personal share, refunds, fees, interest, and
|
||||||
|
* itemised loan repayments — every rule the headline applies. The two numbers
|
||||||
|
* could disagree while both were labelled "spend", and the chart's own baseline
|
||||||
|
* line was drawn from the split-adjusted monthly totals, so the two series in
|
||||||
|
* one chart were on different bases.
|
||||||
|
*
|
||||||
|
* Day-of-month granularity is also what lets the page compare a partial current
|
||||||
|
* month against prior months *through the same day*, instead of against their
|
||||||
|
* full-month totals — which always made a month in progress look thrifty.
|
||||||
|
*
|
||||||
|
* Same fragments as /api/analytics/monthly. If that route's semantics change,
|
||||||
|
* this one changes with it.
|
||||||
|
*/
|
||||||
|
export async function GET(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
|
|
||||||
|
const { searchParams } = new URL(req.url);
|
||||||
|
const monthCount = Math.min(Math.max(Number(searchParams.get("months") || "12"), 1), 24);
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const endDate = new Date(now.getFullYear(), now.getMonth() + 1, 1);
|
||||||
|
const startDate = new Date(now.getFullYear(), now.getMonth() - monthCount + 1, 1);
|
||||||
|
|
||||||
|
const rows = await queryRaw<{ month: string; day: number; category: string; spent: string }>(
|
||||||
|
`SELECT
|
||||||
|
TO_CHAR(DATE_TRUNC('month', t.transaction_date::date), 'YYYY-MM') as month,
|
||||||
|
EXTRACT(DAY FROM t.transaction_date::date)::int as day,
|
||||||
|
${EFFECTIVE_CATEGORY} as category,
|
||||||
|
-- 4dp, not 2. This is grouped finer than /monthly (by day as well as
|
||||||
|
-- category), so rounding each bucket to cents and summing accumulates a
|
||||||
|
-- different error than rounding per category does — the pace chart ended
|
||||||
|
-- the month a few cents off the headline it sits under. Round once, at
|
||||||
|
-- display time.
|
||||||
|
SUM(${mySplitOf(SPEND_SIGNED)})::numeric(14,4) as spent
|
||||||
|
FROM transactions t
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
LEFT JOIN transaction_splits ts ON ts.transaction_id = t.id AND ts.participant_id = $1
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND ${NET_SPEND_ROWS}
|
||||||
|
AND ${EXCLUDE_NON_SPEND}
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
AND t.transaction_date >= $2
|
||||||
|
AND t.transaction_date < $3
|
||||||
|
GROUP BY 1, 2, 3
|
||||||
|
ORDER BY 1, 2`,
|
||||||
|
[user.id, toDateStr(startDate), toDateStr(endDate)]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Sparse by design — a day with no spend has no entry, and the client treats
|
||||||
|
// a missing day as zero. Emitting 31 zeroes per month per category would
|
||||||
|
// dominate the payload.
|
||||||
|
const daily: Record<string, Record<number, number>> = {};
|
||||||
|
const byCategory: Record<string, Record<string, Record<number, number>>> = {};
|
||||||
|
|
||||||
|
for (const r of rows) {
|
||||||
|
const spent = Number(r.spent);
|
||||||
|
const m = (daily[r.month] ??= {});
|
||||||
|
m[r.day] = (m[r.day] ?? 0) + spent;
|
||||||
|
|
||||||
|
const c = ((byCategory[r.month] ??= {})[r.category] ??= {});
|
||||||
|
c[r.day] = (c[r.day] ?? 0) + spent;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NextResponse.json({ daily, byCategory });
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { queryRaw } from "@/lib/db";
|
||||||
|
import { OWNER_SCOPE, STATEMENTS_JOIN, EXCLUDE_RECONCILED_SOURCE, mySplitOf, toDateStr } from "@/lib/analytics-sql";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fees and interest over an explicit window.
|
||||||
|
*
|
||||||
|
* This used to aggregate every statement ever imported with no date filter, and
|
||||||
|
* the UI printed the result with no period label — so a lifetime-to-date total
|
||||||
|
* read as a current-period one, and grew forever. `months=0` asks for all time
|
||||||
|
* deliberately, which is a different claim from asking for it by accident.
|
||||||
|
*/
|
||||||
|
export async function GET(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
|
|
||||||
|
const { searchParams } = new URL(req.url);
|
||||||
|
const monthsParam = Number(searchParams.get("months") ?? "12");
|
||||||
|
const months = Number.isFinite(monthsParam) ? Math.min(Math.max(monthsParam, 0), 120) : 12;
|
||||||
|
const allTime = months === 0;
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const from = new Date(now.getFullYear(), now.getMonth() - months + 1, 1);
|
||||||
|
const fromStr = toDateStr(from);
|
||||||
|
const toStr = toDateStr(new Date(now.getFullYear(), now.getMonth() + 1, 1));
|
||||||
|
|
||||||
|
// A statement is dated by the period it covers, not by when it was imported.
|
||||||
|
const stmtWindow = allTime ? "" : `AND billing_end_date >= $2 AND billing_end_date < $3`;
|
||||||
|
const txnWindow = allTime ? "" : `AND t.transaction_date >= $2 AND t.transaction_date < $3`;
|
||||||
|
const windowParams = allTime ? [] : [fromStr, toStr];
|
||||||
|
|
||||||
|
// Statement-level fees and interest (aggregated by Gemini from the PDF)
|
||||||
|
const stmtRows = await queryRaw<{
|
||||||
|
bank_name: string;
|
||||||
|
fees: string;
|
||||||
|
interest: string;
|
||||||
|
}>(
|
||||||
|
`SELECT
|
||||||
|
bank_name,
|
||||||
|
SUM(COALESCE(fees_charged, 0))::numeric(12,2) AS fees,
|
||||||
|
SUM(COALESCE(interest_charged, 0))::numeric(12,2) AS interest
|
||||||
|
FROM statements
|
||||||
|
WHERE owner_id = $1
|
||||||
|
${stmtWindow}
|
||||||
|
GROUP BY bank_name
|
||||||
|
HAVING SUM(COALESCE(fees_charged, 0)) + SUM(COALESCE(interest_charged, 0)) > 0
|
||||||
|
ORDER BY (SUM(COALESCE(fees_charged, 0)) + SUM(COALESCE(interest_charged, 0))) DESC`,
|
||||||
|
[user.id, ...windowParams]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Transaction-level fee and interest line items (split-adjusted)
|
||||||
|
const txnRows = await queryRaw<{
|
||||||
|
id: number;
|
||||||
|
transaction_date: string;
|
||||||
|
description: string;
|
||||||
|
merchant_name: string | null;
|
||||||
|
transaction_type: string;
|
||||||
|
my_amount: string;
|
||||||
|
bank_name: string;
|
||||||
|
}>(
|
||||||
|
`SELECT
|
||||||
|
t.id,
|
||||||
|
t.transaction_date,
|
||||||
|
t.description,
|
||||||
|
t.merchant_name,
|
||||||
|
t.transaction_type,
|
||||||
|
${mySplitOf(`COALESCE(t.amount_aud, t.amount)`)}::numeric(12,2) AS my_amount,
|
||||||
|
COALESCE(s.bank_name, 'Manual') AS bank_name
|
||||||
|
FROM transactions t
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
LEFT JOIN transaction_splits ts ON ts.transaction_id = t.id AND ts.participant_id = $1
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND t.transaction_type IN ('fee', 'interest')
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
${txnWindow}
|
||||||
|
ORDER BY t.transaction_date DESC`,
|
||||||
|
[user.id, ...windowParams]
|
||||||
|
);
|
||||||
|
|
||||||
|
const by_bank = stmtRows.map((r) => ({
|
||||||
|
bank_name: r.bank_name,
|
||||||
|
fees: Number(r.fees),
|
||||||
|
interest: Number(r.interest),
|
||||||
|
total: Number(r.fees) + Number(r.interest),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const transactions = txnRows.map((r) => ({
|
||||||
|
...r,
|
||||||
|
my_amount: Number(r.my_amount),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Totals from statement-level data (more complete — Gemini reads the statement summary)
|
||||||
|
const total_fees = by_bank.reduce((s, r) => s + r.fees, 0);
|
||||||
|
const total_interest = by_bank.reduce((s, r) => s + r.interest, 0);
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
by_bank,
|
||||||
|
transactions,
|
||||||
|
total_fees,
|
||||||
|
total_interest,
|
||||||
|
// The period is part of the answer — the client must be able to say what
|
||||||
|
// window these totals cover rather than implying "now".
|
||||||
|
period: { months, from: allTime ? null : fromStr, to: allTime ? null : toStr, all_time: allTime },
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { queryRaw } from "@/lib/db";
|
||||||
|
import { OWNER_SCOPE, STATEMENTS_JOIN, EXCLUDE_RECONCILED_SOURCE, EFFECTIVE_CATEGORY, mySplitOf } from "@/lib/analytics-sql";
|
||||||
|
import { bankLabel } from "@/lib/queries";
|
||||||
|
|
||||||
|
const MY_AMOUNT = mySplitOf(`COALESCE(t.amount_aud, t.amount)`);
|
||||||
|
|
||||||
|
export async function GET(
|
||||||
|
req: NextRequest,
|
||||||
|
{ params }: { params: Promise<{ merchant: string }> }
|
||||||
|
) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||||
|
|
||||||
|
const { merchant } = await params;
|
||||||
|
const decoded = decodeURIComponent(merchant);
|
||||||
|
|
||||||
|
const transactions = await queryRaw<{
|
||||||
|
id: number;
|
||||||
|
transaction_date: string;
|
||||||
|
description: string;
|
||||||
|
amount: number;
|
||||||
|
amount_aud: number | null;
|
||||||
|
my_amount: number;
|
||||||
|
transaction_type: string;
|
||||||
|
category: string;
|
||||||
|
bank_name: string;
|
||||||
|
statement_id: number;
|
||||||
|
}>(`
|
||||||
|
SELECT
|
||||||
|
t.id,
|
||||||
|
t.transaction_date::text,
|
||||||
|
t.description,
|
||||||
|
t.amount,
|
||||||
|
t.amount_aud,
|
||||||
|
CASE
|
||||||
|
WHEN t.transaction_type IN ('refund', 'credit') THEN -${MY_AMOUNT}
|
||||||
|
ELSE ${MY_AMOUNT}
|
||||||
|
END::numeric(10,2) as my_amount,
|
||||||
|
t.transaction_type,
|
||||||
|
${EFFECTIVE_CATEGORY} as category,
|
||||||
|
${bankLabel()} as bank_name,
|
||||||
|
t.statement_id
|
||||||
|
FROM transactions t
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
LEFT JOIN transaction_splits ts ON ts.transaction_id = t.id AND ts.participant_id = $1
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND t.transaction_type IN ('debit', 'fee', 'interest', 'refund', 'credit')
|
||||||
|
AND COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name, t.description) = $2
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
ORDER BY t.transaction_date DESC
|
||||||
|
LIMIT 500
|
||||||
|
`, [user.id, decoded]);
|
||||||
|
|
||||||
|
return NextResponse.json({ transactions });
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { queryRaw } from "@/lib/db";
|
||||||
|
import { OWNER_SCOPE, STATEMENTS_JOIN, EXCLUDE_NON_SPEND, EXCLUDE_RECONCILED_SOURCE, EFFECTIVE_CATEGORY, mySplitOf, toDateStr } from "@/lib/analytics-sql";
|
||||||
|
|
||||||
|
// Split-adjusted amount helper (positive for spend, negative for refunds)
|
||||||
|
const MY_AMOUNT = mySplitOf(`COALESCE(t.amount_aud, t.amount)`);
|
||||||
|
const SPEND_EXPR = `
|
||||||
|
CASE
|
||||||
|
WHEN t.transaction_type IN ('refund', 'credit') THEN -(${MY_AMOUNT})
|
||||||
|
ELSE (${MY_AMOUNT})
|
||||||
|
END
|
||||||
|
`;
|
||||||
|
|
||||||
|
export async function GET(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||||
|
|
||||||
|
const { searchParams } = new URL(req.url);
|
||||||
|
const months = Math.min(24, Math.max(1, Number(searchParams.get("months") || "12")));
|
||||||
|
|
||||||
|
const cutoff = new Date();
|
||||||
|
cutoff.setMonth(cutoff.getMonth() - months);
|
||||||
|
const fromDate = toDateStr(cutoff);
|
||||||
|
|
||||||
|
// Merchant aggregates — net spend (debits + fees - refunds/credits)
|
||||||
|
const rows = await queryRaw<{
|
||||||
|
merchant: string;
|
||||||
|
category: string;
|
||||||
|
debit_count: number;
|
||||||
|
refund_count: number;
|
||||||
|
gross_spend: number;
|
||||||
|
total_refunds: number;
|
||||||
|
net_spend: number;
|
||||||
|
avg_debit: number;
|
||||||
|
first_seen: string;
|
||||||
|
last_seen: string;
|
||||||
|
months_active: number;
|
||||||
|
}>(`
|
||||||
|
SELECT
|
||||||
|
COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name, t.description) as merchant,
|
||||||
|
MODE() WITHIN GROUP (ORDER BY ${EFFECTIVE_CATEGORY}) as category,
|
||||||
|
COUNT(*) FILTER (WHERE t.transaction_type IN ('debit', 'fee', 'interest'))::int as debit_count,
|
||||||
|
COUNT(*) FILTER (WHERE t.transaction_type IN ('refund', 'credit'))::int as refund_count,
|
||||||
|
COALESCE(SUM(
|
||||||
|
CASE WHEN t.transaction_type IN ('debit', 'fee', 'interest') THEN
|
||||||
|
${MY_AMOUNT}
|
||||||
|
ELSE 0 END
|
||||||
|
), 0)::numeric(12,2) as gross_spend,
|
||||||
|
COALESCE(SUM(
|
||||||
|
CASE WHEN t.transaction_type IN ('refund', 'credit') THEN
|
||||||
|
${MY_AMOUNT}
|
||||||
|
ELSE 0 END
|
||||||
|
), 0)::numeric(12,2) as total_refunds,
|
||||||
|
SUM(${SPEND_EXPR})::numeric(12,2) as net_spend,
|
||||||
|
AVG(
|
||||||
|
CASE WHEN t.transaction_type IN ('debit', 'fee', 'interest') THEN
|
||||||
|
${MY_AMOUNT}
|
||||||
|
END
|
||||||
|
)::numeric(10,2) as avg_debit,
|
||||||
|
MIN(t.transaction_date)::text as first_seen,
|
||||||
|
MAX(t.transaction_date)::text as last_seen,
|
||||||
|
COUNT(DISTINCT TO_CHAR(DATE_TRUNC('month', t.transaction_date::date), 'YYYY-MM'))::int as months_active
|
||||||
|
FROM transactions t
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
LEFT JOIN transaction_splits ts ON ts.transaction_id = t.id AND ts.participant_id = $1
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND t.transaction_type IN ('debit', 'fee', 'interest', 'refund', 'credit')
|
||||||
|
AND t.transaction_date >= $2
|
||||||
|
AND ${EXCLUDE_NON_SPEND}
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
GROUP BY 1
|
||||||
|
HAVING SUM(${SPEND_EXPR}) > 0
|
||||||
|
ORDER BY net_spend DESC
|
||||||
|
LIMIT 200
|
||||||
|
`, [user.id, fromDate]);
|
||||||
|
|
||||||
|
// Monthly net trend per merchant (top 50 by net spend)
|
||||||
|
const topMerchants = rows.slice(0, 50).map((r) => r.merchant);
|
||||||
|
|
||||||
|
interface TrendRow { merchant: string; month: string; total: number }
|
||||||
|
let trendRows: TrendRow[] = [];
|
||||||
|
if (topMerchants.length > 0) {
|
||||||
|
trendRows = await queryRaw<TrendRow>(`
|
||||||
|
SELECT
|
||||||
|
COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name, t.description) as merchant,
|
||||||
|
TO_CHAR(DATE_TRUNC('month', t.transaction_date::date), 'YYYY-MM') as month,
|
||||||
|
SUM(${SPEND_EXPR})::numeric(10,2) as total
|
||||||
|
FROM transactions t
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
LEFT JOIN transaction_splits ts ON ts.transaction_id = t.id AND ts.participant_id = $1
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND t.transaction_type IN ('debit', 'fee', 'interest', 'refund', 'credit')
|
||||||
|
AND t.transaction_date >= $2
|
||||||
|
AND COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name, t.description) = ANY($3)
|
||||||
|
AND ${EXCLUDE_NON_SPEND}
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
GROUP BY 1, 2
|
||||||
|
ORDER BY 1, 2
|
||||||
|
`, [user.id, fromDate, topMerchants]);
|
||||||
|
}
|
||||||
|
|
||||||
|
const trendByMerchant: Record<string, Record<string, number>> = {};
|
||||||
|
for (const tr of trendRows) {
|
||||||
|
if (!trendByMerchant[tr.merchant]) trendByMerchant[tr.merchant] = {};
|
||||||
|
trendByMerchant[tr.merchant][tr.month] = Number(tr.total);
|
||||||
|
}
|
||||||
|
|
||||||
|
const merchants = rows.map((r) => ({
|
||||||
|
...r,
|
||||||
|
debit_count: Number(r.debit_count),
|
||||||
|
refund_count: Number(r.refund_count),
|
||||||
|
gross_spend: Number(r.gross_spend),
|
||||||
|
total_refunds: Number(r.total_refunds),
|
||||||
|
net_spend: Number(r.net_spend),
|
||||||
|
avg_debit: Number(r.avg_debit),
|
||||||
|
months_active: Number(r.months_active),
|
||||||
|
monthly_trend: trendByMerchant[r.merchant] || {},
|
||||||
|
}));
|
||||||
|
|
||||||
|
return NextResponse.json({ merchants, months });
|
||||||
|
}
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { queryRaw } from "@/lib/db";
|
||||||
|
import {
|
||||||
|
OWNER_SCOPE,
|
||||||
|
STATEMENTS_JOIN,
|
||||||
|
EFFECTIVE_CATEGORY,
|
||||||
|
EXCLUDE_NON_SPEND,
|
||||||
|
EXCLUDE_RECONCILED_SOURCE,
|
||||||
|
NET_SPEND_ROWS,
|
||||||
|
SPEND_SIGNED,
|
||||||
|
INVESTMENT_SIGNED,
|
||||||
|
mySplitOf,
|
||||||
|
toDateStr,
|
||||||
|
} from "@/lib/analytics-sql";
|
||||||
|
|
||||||
|
export async function GET(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
|
|
||||||
|
const { searchParams } = new URL(req.url);
|
||||||
|
const monthCount = Math.min(Math.max(Number(searchParams.get("months") || "6"), 1), 24);
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const endDate = new Date(now.getFullYear(), now.getMonth() + 1, 1);
|
||||||
|
const startDate = new Date(now.getFullYear(), now.getMonth() - monthCount + 1, 1);
|
||||||
|
|
||||||
|
const startStr = toDateStr(startDate);
|
||||||
|
const endStr = toDateStr(endDate);
|
||||||
|
|
||||||
|
// Expenses: debits excluding transfers and investments, split-adjusted
|
||||||
|
const spendRows = await queryRaw<{
|
||||||
|
month: string;
|
||||||
|
category: string;
|
||||||
|
total_spent: number;
|
||||||
|
transaction_count: number;
|
||||||
|
}>(
|
||||||
|
`SELECT
|
||||||
|
TO_CHAR(DATE_TRUNC('month', t.transaction_date::date), 'YYYY-MM') as month,
|
||||||
|
${EFFECTIVE_CATEGORY} as category,
|
||||||
|
-- 4dp so the month total is summed from unrounded parts; every consumer
|
||||||
|
-- rounds for display. See the note in /api/analytics/daily.
|
||||||
|
SUM(${mySplitOf(SPEND_SIGNED)})::numeric(14,4) as total_spent,
|
||||||
|
COUNT(*)::int as transaction_count
|
||||||
|
FROM transactions t
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
LEFT JOIN transaction_splits ts ON ts.transaction_id = t.id AND ts.participant_id = $1
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND ${NET_SPEND_ROWS}
|
||||||
|
AND ${EXCLUDE_NON_SPEND}
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
AND t.transaction_date >= $2
|
||||||
|
AND t.transaction_date < $3
|
||||||
|
GROUP BY 1, 2
|
||||||
|
ORDER BY 1 DESC, total_spent DESC`,
|
||||||
|
[user.id, startStr, endStr]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Income: credits/payments categorised as income
|
||||||
|
const incomeRows = await queryRaw<{
|
||||||
|
month: string;
|
||||||
|
total_income: number;
|
||||||
|
transaction_count: number;
|
||||||
|
}>(
|
||||||
|
`SELECT
|
||||||
|
TO_CHAR(DATE_TRUNC('month', t.transaction_date::date), 'YYYY-MM') as month,
|
||||||
|
SUM(COALESCE(t.amount_aud, t.amount))::numeric(12,2) as total_income,
|
||||||
|
COUNT(*)::int as transaction_count
|
||||||
|
FROM transactions t
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND t.transaction_type IN ('credit', 'payment')
|
||||||
|
AND ${EFFECTIVE_CATEGORY} = 'income'
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
AND t.transaction_date >= $2
|
||||||
|
AND t.transaction_date < $3
|
||||||
|
GROUP BY 1
|
||||||
|
ORDER BY 1 DESC`,
|
||||||
|
[user.id, startStr, endStr]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Investments: any transaction categorised as investment, signed so that
|
||||||
|
// withdrawals net against contributions (see INVESTMENT_SIGNED).
|
||||||
|
const investmentRows = await queryRaw<{
|
||||||
|
month: string;
|
||||||
|
total_invested: number;
|
||||||
|
transaction_count: number;
|
||||||
|
}>(
|
||||||
|
`SELECT
|
||||||
|
TO_CHAR(DATE_TRUNC('month', t.transaction_date::date), 'YYYY-MM') as month,
|
||||||
|
SUM(${INVESTMENT_SIGNED})::numeric(12,2) as total_invested,
|
||||||
|
COUNT(*)::int as transaction_count
|
||||||
|
FROM transactions t
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND ${EFFECTIVE_CATEGORY} = 'investment'
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
AND t.transaction_date >= $2
|
||||||
|
AND t.transaction_date < $3
|
||||||
|
GROUP BY 1
|
||||||
|
ORDER BY 1 DESC`,
|
||||||
|
[user.id, startStr, endStr]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Build month list (most recent first)
|
||||||
|
const months: string[] = [];
|
||||||
|
for (let i = monthCount - 1; i >= 0; i--) {
|
||||||
|
const d = new Date(now.getFullYear(), now.getMonth() - i, 1);
|
||||||
|
months.push(`${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}`);
|
||||||
|
}
|
||||||
|
months.reverse();
|
||||||
|
|
||||||
|
const spendMap = new Map<string, number>();
|
||||||
|
const countMap = new Map<string, number>();
|
||||||
|
const incomeMap = new Map<string, number>();
|
||||||
|
const investMap = new Map<string, number>();
|
||||||
|
|
||||||
|
for (const r of spendRows) {
|
||||||
|
spendMap.set(`${r.category}:${r.month}`, Number(r.total_spent));
|
||||||
|
countMap.set(`${r.category}:${r.month}`, r.transaction_count);
|
||||||
|
}
|
||||||
|
for (const r of incomeRows) incomeMap.set(r.month, Number(r.total_income));
|
||||||
|
for (const r of investmentRows) investMap.set(r.month, Number(r.total_invested));
|
||||||
|
|
||||||
|
const allCategories = new Set<string>();
|
||||||
|
for (const r of spendRows) allCategories.add(r.category);
|
||||||
|
|
||||||
|
const rows = Array.from(allCategories)
|
||||||
|
.sort()
|
||||||
|
.map((cat) => {
|
||||||
|
const spent: Record<string, number> = {};
|
||||||
|
const txCount: Record<string, number> = {};
|
||||||
|
for (const m of months) {
|
||||||
|
const s = spendMap.get(`${cat}:${m}`);
|
||||||
|
const c = countMap.get(`${cat}:${m}`);
|
||||||
|
if (s !== undefined) spent[m] = s;
|
||||||
|
if (c !== undefined) txCount[m] = c;
|
||||||
|
}
|
||||||
|
return { category: cat, spent, txCount };
|
||||||
|
});
|
||||||
|
|
||||||
|
const totals: Record<string, { spent: number; income: number; investments: number; net: number }> = {};
|
||||||
|
for (const m of months) {
|
||||||
|
let spent = 0;
|
||||||
|
for (const row of rows) spent += row.spent[m] || 0;
|
||||||
|
const income = incomeMap.get(m) || 0;
|
||||||
|
const investments = investMap.get(m) || 0;
|
||||||
|
totals[m] = {
|
||||||
|
spent: Math.round(spent * 100) / 100,
|
||||||
|
income: Math.round(income * 100) / 100,
|
||||||
|
investments: Math.round(investments * 100) / 100,
|
||||||
|
net: Math.round((income - spent - investments) * 100) / 100,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return NextResponse.json({ months, rows, income: Object.fromEntries(incomeMap), investments: Object.fromEntries(investMap), totals });
|
||||||
|
}
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { queryRaw } from "@/lib/db";
|
||||||
|
import { OWNER_SCOPE, STATEMENTS_JOIN, EXCLUDE_NON_SPEND, EXCLUDE_RECONCILED_SOURCE, EFFECTIVE_CATEGORY, mySplitOf } from "@/lib/analytics-sql";
|
||||||
|
|
||||||
|
export async function GET(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
|
|
||||||
|
const rows = await queryRaw<{
|
||||||
|
merchant: string;
|
||||||
|
category: string;
|
||||||
|
occurrences: number;
|
||||||
|
avg_amount: string;
|
||||||
|
first_seen: string;
|
||||||
|
last_seen: string;
|
||||||
|
total_paid: string;
|
||||||
|
median_interval: string;
|
||||||
|
frequency: string | null;
|
||||||
|
}>(
|
||||||
|
`WITH merchant_txns AS (
|
||||||
|
SELECT
|
||||||
|
COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name) AS merchant,
|
||||||
|
${EFFECTIVE_CATEGORY} AS category,
|
||||||
|
t.transaction_date,
|
||||||
|
${mySplitOf(`COALESCE(t.amount_aud, t.amount)`)} AS my_amount
|
||||||
|
FROM transactions t
|
||||||
|
LEFT JOIN transaction_overrides o ON o.transaction_id = t.id
|
||||||
|
LEFT JOIN transaction_splits ts ON ts.transaction_id = t.id AND ts.participant_id = $1
|
||||||
|
${STATEMENTS_JOIN}
|
||||||
|
WHERE ${OWNER_SCOPE} = $1
|
||||||
|
AND t.transaction_type IN ('debit', 'fee')
|
||||||
|
AND ${EXCLUDE_NON_SPEND}
|
||||||
|
AND ${EXCLUDE_RECONCILED_SOURCE}
|
||||||
|
AND COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name) IS NOT NULL
|
||||||
|
),
|
||||||
|
merchant_with_lag AS (
|
||||||
|
SELECT
|
||||||
|
merchant,
|
||||||
|
category,
|
||||||
|
transaction_date,
|
||||||
|
my_amount,
|
||||||
|
LAG(transaction_date) OVER (PARTITION BY merchant ORDER BY transaction_date) AS prev_date
|
||||||
|
FROM merchant_txns
|
||||||
|
),
|
||||||
|
merchant_stats AS (
|
||||||
|
SELECT
|
||||||
|
merchant,
|
||||||
|
MODE() WITHIN GROUP (ORDER BY category) AS category,
|
||||||
|
(COUNT(*) + 1)::int AS occurrences,
|
||||||
|
AVG(my_amount)::numeric(12,2) AS avg_amount,
|
||||||
|
MIN(transaction_date) AS first_seen,
|
||||||
|
MAX(transaction_date) AS last_seen,
|
||||||
|
SUM(my_amount)::numeric(12,2) AS total_paid,
|
||||||
|
PERCENTILE_CONT(0.5) WITHIN GROUP (
|
||||||
|
ORDER BY (transaction_date - prev_date)::int
|
||||||
|
) AS median_interval,
|
||||||
|
STDDEV((transaction_date - prev_date)::int) AS stddev_interval
|
||||||
|
FROM merchant_with_lag
|
||||||
|
WHERE prev_date IS NOT NULL
|
||||||
|
GROUP BY merchant
|
||||||
|
HAVING COUNT(*) >= 2
|
||||||
|
),
|
||||||
|
classified AS (
|
||||||
|
SELECT *,
|
||||||
|
CASE
|
||||||
|
WHEN median_interval BETWEEN 6 AND 8 THEN 'weekly'
|
||||||
|
WHEN median_interval BETWEEN 13 AND 16 THEN 'fortnightly'
|
||||||
|
WHEN median_interval BETWEEN 27 AND 35 THEN 'monthly'
|
||||||
|
WHEN median_interval BETWEEN 85 AND 95 THEN 'quarterly'
|
||||||
|
WHEN median_interval BETWEEN 350 AND 380 THEN 'annual'
|
||||||
|
ELSE NULL
|
||||||
|
END AS frequency
|
||||||
|
FROM merchant_stats
|
||||||
|
WHERE stddev_interval < median_interval * 0.4
|
||||||
|
AND (
|
||||||
|
median_interval BETWEEN 6 AND 8 OR
|
||||||
|
median_interval BETWEEN 13 AND 16 OR
|
||||||
|
median_interval BETWEEN 27 AND 35 OR
|
||||||
|
median_interval BETWEEN 85 AND 95 OR
|
||||||
|
median_interval BETWEEN 350 AND 380
|
||||||
|
)
|
||||||
|
)
|
||||||
|
SELECT merchant, category, occurrences, avg_amount, first_seen, last_seen, total_paid,
|
||||||
|
median_interval::numeric(8,1), frequency
|
||||||
|
FROM classified
|
||||||
|
WHERE frequency IS NOT NULL
|
||||||
|
ORDER BY
|
||||||
|
CASE frequency
|
||||||
|
WHEN 'weekly' THEN avg_amount * 4.33
|
||||||
|
WHEN 'fortnightly' THEN avg_amount * 2.17
|
||||||
|
WHEN 'monthly' THEN avg_amount
|
||||||
|
WHEN 'quarterly' THEN avg_amount / 3
|
||||||
|
WHEN 'annual' THEN avg_amount / 12
|
||||||
|
END DESC NULLS LAST`,
|
||||||
|
[user.id]
|
||||||
|
);
|
||||||
|
|
||||||
|
const today = new Date();
|
||||||
|
const subscriptions = rows.map((r) => {
|
||||||
|
const lastSeen = new Date(r.last_seen);
|
||||||
|
const daysSinceLast = Math.floor((today.getTime() - lastSeen.getTime()) / 86400000);
|
||||||
|
const medianInterval = Number(r.median_interval);
|
||||||
|
const is_active = daysSinceLast < medianInterval * 1.5;
|
||||||
|
|
||||||
|
const avg = Number(r.avg_amount);
|
||||||
|
const monthly_equiv =
|
||||||
|
r.frequency === "weekly" ? avg * 4.33 :
|
||||||
|
r.frequency === "fortnightly" ? avg * 2.17 :
|
||||||
|
r.frequency === "quarterly" ? avg / 3 :
|
||||||
|
r.frequency === "annual" ? avg / 12 :
|
||||||
|
avg;
|
||||||
|
|
||||||
|
return {
|
||||||
|
merchant: r.merchant,
|
||||||
|
category: r.category,
|
||||||
|
frequency: r.frequency,
|
||||||
|
avg_amount: avg,
|
||||||
|
monthly_equiv: Math.round(monthly_equiv * 100) / 100,
|
||||||
|
first_seen: r.first_seen,
|
||||||
|
last_seen: r.last_seen,
|
||||||
|
occurrences: r.occurrences,
|
||||||
|
total_paid: Number(r.total_paid),
|
||||||
|
is_active,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const total_monthly_equiv = subscriptions
|
||||||
|
.filter((s) => s.is_active)
|
||||||
|
.reduce((sum, s) => sum + s.monthly_equiv, 0);
|
||||||
|
|
||||||
|
return NextResponse.json({ subscriptions, total_monthly_equiv: Math.round(total_monthly_equiv * 100) / 100 });
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { queryRaw } from "@/lib/db";
|
||||||
|
|
||||||
|
export async function DELETE(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
|
|
||||||
|
const { id } = await params;
|
||||||
|
const existing = await queryRaw<{ id: number }>(
|
||||||
|
`SELECT id FROM budgets WHERE id = $1 AND owner_id = $2`,
|
||||||
|
[Number(id), user.id]
|
||||||
|
);
|
||||||
|
if (!existing.length) return NextResponse.json({ error: "Not found" }, { status: 404 });
|
||||||
|
|
||||||
|
await queryRaw(`DELETE FROM budgets WHERE id = $1`, [Number(id)]);
|
||||||
|
return NextResponse.json({ ok: true });
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { queryRaw } from "@/lib/db";
|
||||||
|
|
||||||
|
export async function GET(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
|
|
||||||
|
const { searchParams } = new URL(req.url);
|
||||||
|
const month = searchParams.get("month");
|
||||||
|
|
||||||
|
let monthDate: string;
|
||||||
|
if (month) {
|
||||||
|
monthDate = month.length === 7 ? `${month}-01` : month;
|
||||||
|
} else {
|
||||||
|
const now = new Date();
|
||||||
|
monthDate = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-01`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = await queryRaw<{ id: number; category: string; month: string; amount_limit: number }>(
|
||||||
|
`SELECT id, category, month::text, amount_limit::numeric FROM budgets WHERE owner_id = $1 AND month = $2::date`,
|
||||||
|
[user.id, monthDate]
|
||||||
|
);
|
||||||
|
return NextResponse.json(rows);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function POST(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
|
|
||||||
|
const { category, month, amount_limit } = await req.json();
|
||||||
|
if (!category || !month || amount_limit === undefined) {
|
||||||
|
return NextResponse.json({ error: "category, month, and amount_limit required" }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const monthDate = month.length === 7 ? `${month}-01` : month;
|
||||||
|
|
||||||
|
const rows = await queryRaw<{ id: number; category: string; month: string; amount_limit: number }>(
|
||||||
|
`INSERT INTO budgets (owner_id, category, month, amount_limit)
|
||||||
|
VALUES ($1, $2, $3::date, $4)
|
||||||
|
ON CONFLICT (owner_id, category, month) DO UPDATE SET amount_limit = $4, updated_at = NOW()
|
||||||
|
RETURNING id, category, month::text, amount_limit::numeric`,
|
||||||
|
[user.id, category, monthDate, amount_limit]
|
||||||
|
);
|
||||||
|
return NextResponse.json(rows[0], { status: 201 });
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { ensureTag, batchInsertCSVTransactions } from "@/lib/queries";
|
||||||
|
|
||||||
|
export async function POST(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
|
|
||||||
|
const body = await req.json() as {
|
||||||
|
bank_name: string;
|
||||||
|
transactions: {
|
||||||
|
date: string;
|
||||||
|
description: string;
|
||||||
|
amount: number;
|
||||||
|
transaction_type: string;
|
||||||
|
merchant_name?: string;
|
||||||
|
foreign_currency_amount?: number;
|
||||||
|
foreign_currency_code?: string;
|
||||||
|
category?: string;
|
||||||
|
}[];
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!Array.isArray(body.transactions) || body.transactions.length === 0) {
|
||||||
|
return NextResponse.json({ error: "No transactions provided" }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const tagId = await ensureTag("csv-import", "#8b5cf6");
|
||||||
|
const inserted = await batchInsertCSVTransactions(user.id, body.transactions, tagId);
|
||||||
|
|
||||||
|
return NextResponse.json({ inserted }, { status: 201 });
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
|
||||||
|
export async function GET(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||||
|
return NextResponse.json(user);
|
||||||
|
}
|
||||||
@@ -1,13 +1,16 @@
|
|||||||
import { NextRequest, NextResponse } from "next/server";
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
import { getMerchantSuggestions, getBankNames } from "@/lib/queries";
|
import { getMerchantSuggestions, getBankNames } from "@/lib/queries";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
|
||||||
export async function GET(req: NextRequest) {
|
export async function GET(req: NextRequest) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
|
||||||
const search = req.nextUrl.searchParams.get("search");
|
const search = req.nextUrl.searchParams.get("search");
|
||||||
const type = req.nextUrl.searchParams.get("type");
|
const type = req.nextUrl.searchParams.get("type");
|
||||||
|
|
||||||
if (type === "banks") {
|
if (type === "banks") {
|
||||||
const banks = await getBankNames();
|
const banks = await getBankNames();
|
||||||
return NextResponse.json(banks.map((b) => b.bank_name));
|
return NextResponse.json(banks);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!search) return NextResponse.json([]);
|
if (!search) return NextResponse.json([]);
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { getCurrentUser } from "@/lib/auth";
|
||||||
|
import { getOrderDetail, canViewOrders } from "@/lib/order-feed";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /api/orders/[entityKey] — one order, its lifecycle, settlement siblings
|
||||||
|
* and any linked ledger transactions.
|
||||||
|
*
|
||||||
|
* Keyed on entity_key (text) rather than entity_id: entity_id is BIGINT and
|
||||||
|
* would break JSON.stringify, and the key is stable, unique and readable.
|
||||||
|
* All 8,147 order keys are URL-safe today, but nothing enforces that, so the
|
||||||
|
* client encodes and we decode.
|
||||||
|
*/
|
||||||
|
export async function GET(
|
||||||
|
req: NextRequest,
|
||||||
|
{ params }: { params: Promise<{ entityKey: string }> }
|
||||||
|
) {
|
||||||
|
const user = await getCurrentUser(req);
|
||||||
|
if (!user) return NextResponse.json({ error: "unauthorized" }, { status: 403 });
|
||||||
|
if (!canViewOrders(user.id)) {
|
||||||
|
return NextResponse.json({ error: "forbidden" }, { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const { entityKey } = await params;
|
||||||
|
const order = await getOrderDetail(decodeURIComponent(entityKey));
|
||||||
|
if (!order) return NextResponse.json({ error: "not found" }, { status: 404 });
|
||||||
|
|
||||||
|
return NextResponse.json(order);
|
||||||
|
}
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
import { NextRequest, NextResponse } from "next/server";
|
||||||
|
import { queryRow } from "@/lib/db";
|
||||||
|
import {
|
||||||
|
parseOrderHTML,
|
||||||
|
parseOrderAmendment,
|
||||||
|
isAmendment,
|
||||||
|
validateOrderTotals,
|
||||||
|
processOrderIngestion,
|
||||||
|
applyOrderAmendment,
|
||||||
|
reconcilePendingOrders,
|
||||||
|
OrderParseError,
|
||||||
|
NotAReceiptError,
|
||||||
|
type MessageMeta,
|
||||||
|
} from "@/lib/order-ingestion";
|
||||||
|
import { merchantVerdict, SECOND_CONSUMER_ID } from "@/lib/order-reviews";
|
||||||
|
import { nudgeBlocks } from "@/lib/slack-blocks";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Machine ingest endpoint for order receipts.
|
||||||
|
*
|
||||||
|
* n8n polls the two mailboxes and POSTs each message here. The parsing lives in
|
||||||
|
* the app, not in an n8n Code node, because the n8n sandbox has no `require`
|
||||||
|
* and no filesystem — a parser there could not be unit-tested against the real
|
||||||
|
* fixture corpus, which is the whole reason this one is trustworthy.
|
||||||
|
*
|
||||||
|
* Auth is a shared secret, not the Traefik `x-forwarded-user` header: this is
|
||||||
|
* called machine-to-machine and there is no browser session to forward.
|
||||||
|
*/
|
||||||
|
function authorised(req: NextRequest): boolean {
|
||||||
|
const expected = process.env.ORDER_INGEST_TOKEN;
|
||||||
|
if (!expected) return false; // fail closed when unconfigured
|
||||||
|
const got = req.headers.get("x-ingest-token");
|
||||||
|
return !!got && got === expected;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Does a split with the second consumer already exist on this transaction? */
|
||||||
|
async function isShared(transactionId: number | null): Promise<boolean> {
|
||||||
|
if (!transactionId) return false;
|
||||||
|
const row = await queryRow<{ n: string }>(
|
||||||
|
`SELECT count(*) AS n FROM transaction_splits
|
||||||
|
WHERE transaction_id = $1 AND participant_id = $2`,
|
||||||
|
[transactionId, SECOND_CONSUMER_ID]
|
||||||
|
);
|
||||||
|
return Number(row?.n ?? 0) > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function POST(req: NextRequest) {
|
||||||
|
if (!authorised(req)) {
|
||||||
|
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||||
|
}
|
||||||
|
|
||||||
|
let body: { html?: string; meta?: MessageMeta; dryRun?: boolean };
|
||||||
|
try {
|
||||||
|
body = await req.json();
|
||||||
|
} catch {
|
||||||
|
return NextResponse.json({ error: "invalid JSON" }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const { html, meta, dryRun } = body;
|
||||||
|
if (!html || !meta?.messageId || !meta?.subject || !meta?.receivedAt) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "html and meta{messageId,subject,receivedAt} are required" },
|
||||||
|
{ status: 400 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Amendments restate an existing order; they are not receipts.
|
||||||
|
if (isAmendment(html)) {
|
||||||
|
const amendment = parseOrderAmendment(html, meta);
|
||||||
|
if (dryRun) return NextResponse.json({ kind: "amendment", amendment });
|
||||||
|
const applied = await applyOrderAmendment(amendment);
|
||||||
|
return NextResponse.json({ kind: "amendment", amendment, applied });
|
||||||
|
}
|
||||||
|
|
||||||
|
const order = parseOrderHTML(html, meta);
|
||||||
|
|
||||||
|
const check = validateOrderTotals(order, html);
|
||||||
|
if (!check.ok) {
|
||||||
|
// Refuse rather than record a number we cannot stand behind.
|
||||||
|
return NextResponse.json(
|
||||||
|
{ kind: "rejected", reason: check.reason, order_reference: order.order_reference },
|
||||||
|
{ status: 422 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dryRun) return NextResponse.json({ kind: "order", order });
|
||||||
|
|
||||||
|
const result = await processOrderIngestion(order, {
|
||||||
|
messageId: meta.messageId,
|
||||||
|
subject: meta.subject,
|
||||||
|
sender: meta.sender,
|
||||||
|
});
|
||||||
|
// What we said about this merchant before, so the Slack nudge can warn at
|
||||||
|
// the moment the order lands rather than waiting for someone to open the
|
||||||
|
// app. `result.transactionId` is excluded because a brand-new order has no
|
||||||
|
// verdict yet — anything found is genuinely a previous visit.
|
||||||
|
const verdict = result.skipped
|
||||||
|
? null
|
||||||
|
: await merchantVerdict(order.merchant_name, result.transactionId);
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
kind: "order",
|
||||||
|
order_reference: order.order_reference,
|
||||||
|
merchant: order.merchant_name,
|
||||||
|
total: order.totals.total_charged,
|
||||||
|
currency: order.currency,
|
||||||
|
is_family: order.is_family,
|
||||||
|
...result,
|
||||||
|
prior_verdict: verdict && {
|
||||||
|
warn: verdict.warn,
|
||||||
|
counts: verdict.counts,
|
||||||
|
last_note: verdict.history.find((h) => h.note)?.note ?? null,
|
||||||
|
},
|
||||||
|
// The nudge message is built here, not in n8n expressions: Block Kit in a
|
||||||
|
// template string is untestable, and this shape has to stay in step with
|
||||||
|
// what /api/slack/interactive renders after a button press. Null when
|
||||||
|
// there is no transaction to act on — a card-settled order is parked
|
||||||
|
// until its statement arrives, so there is nothing yet to split or rate.
|
||||||
|
slack_blocks:
|
||||||
|
result.transactionId && !result.skipped
|
||||||
|
? nudgeBlocks({
|
||||||
|
transactionId: result.transactionId,
|
||||||
|
merchant: order.merchant_name,
|
||||||
|
currency: order.currency,
|
||||||
|
total: Number(order.totals.total_charged),
|
||||||
|
isFamily: order.is_family,
|
||||||
|
// Read rather than assume. Today a freshly ingested order has no
|
||||||
|
// splits, so `false` would be right — the 140 ingested orders
|
||||||
|
// that do carry splits were split by hand after the backfill,
|
||||||
|
// not by a rule. But the card's label drives a destructive
|
||||||
|
// button: if a split rule is ever added, an assumed `false`
|
||||||
|
// would label a shared order "Not shared" and offer to remove
|
||||||
|
// the split. One query is cheaper than that failure.
|
||||||
|
shared: await isShared(result.transactionId),
|
||||||
|
warn: verdict?.warn ?? false,
|
||||||
|
warnNote: verdict?.history.find((h) => h.note)?.note ?? null,
|
||||||
|
})
|
||||||
|
: null,
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
// Not a receipt: promotions, delivery updates, adjustment and refund
|
||||||
|
// notices. Expected traffic — 200 and silent, or the alert channel fills
|
||||||
|
// with noise and stops being read.
|
||||||
|
if (e instanceof NotAReceiptError) {
|
||||||
|
return NextResponse.json({ kind: "skipped", reason: e.message });
|
||||||
|
}
|
||||||
|
|
||||||
|
// IS a receipt, could not be parsed. This is the failure that matters and
|
||||||
|
// it must be loud: a provider template change breaks every order at once,
|
||||||
|
// and the only other symptom is spend quietly ceasing to appear. Returning
|
||||||
|
// 200 here — as this route originally did — made the most likely
|
||||||
|
// production failure completely invisible.
|
||||||
|
if (e instanceof OrderParseError) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ kind: "parse_failed", reason: e.message, messageId: e.messageId },
|
||||||
|
{ status: 422 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const message = e instanceof Error ? e.message : String(e);
|
||||||
|
return NextResponse.json({ error: message }, { status: 500 });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Statement-import hook: resolve orders parked awaiting a card statement. */
|
||||||
|
export async function PATCH(req: NextRequest) {
|
||||||
|
if (!authorised(req)) {
|
||||||
|
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||||
|
}
|
||||||
|
const out = await reconcilePendingOrders();
|
||||||
|
return NextResponse.json(out);
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user