6598691372
- Prisma: Zone (postal-code list or radius), Rate (zone- or distance-band
keyed), GeocodeCache (permanent address->lat/lng cache per
IMPLEMENTATION_PLAN.md §9), Location.shopifyLocationId (maps to
Shopify's own Location resource for inventory checks), Booking.zoneId
(needed for per-zone delivery-density counts, not just per-location).
- app/lib/geo.ts: pure haversine distance + postal-code matching, unit
tested against known city-to-city distances.
- app/services/zones.server.ts: geocoding (Google Maps Geocoding API,
cached — never re-geocodes the same address twice), zone eligibility,
nearest-location auto-assignment ranked by distance, delivery-density
threshold checks (a sparse zone doesn't unlock until minOrders bookings
have already routed through it), and inventory-based location exclusion
via Shopify's InventoryLevel API (locations without a mapped
shopifyLocationId are left in rather than false-negative excluded).
- app/services/rates.server.ts: pure rate resolution by zone or distance
band, cheapest-match-wins when bands overlap.
- apps.scheduling.availability.tsx: LOCAL_DELIVERY requests with a
postalCode/address now auto-assign to the nearest eligible,
density-qualified zone/location instead of the shop's default location;
response includes the matched rate. Also fixed a real gap left over from
Phase 4: this route never actually read Booking counts into
getAvailability's `consumed` map, so capacity always showed as fully
available regardless of existing bookings — now it does.
- extensions/datetime-widget: LOCAL_DELIVERY now asks for a postal code
before showing dates; PICKUP shows a Google Maps pin for the location
(both gated on an optional Maps API key — a block setting in the theme
editor, since it needs to be public/client-side, not an app secret);
confirmation display and cart attributes (dd_zone_id, dd_rate_label)
carry the resolved zone/rate through to checkout.
- extensions/delivery-customization: now appends the resolved rate to the
relabeled delivery option ("Local delivery — Aug 25 ($5.99)") when one's
configured — real Cart Transform-based fee *charging* stays deferred to
v2 per IMPLEMENTATION_PLAN.md §5.4, this is display-only.
- Admin: /app/zones and /app/rates (Polaris CRUD, mirroring Phase 1's
patterns), plus shopifyLocationId and auto-geocode-on-save added to the
location edit form.
Fixed one real bug caught only by `npm run build` (not tsc/vitest, which
both passed clean): app.rates._index.tsx's component called
formatPriceLabel from rates.server.ts, and Remix correctly refuses to
bundle anything imported from a .server.ts path for the client. Moved the
pure (no I/O, no Prisma) formatter to app/lib/currency.ts.
Verified: lint, typecheck, 86 unit tests (+21 new: geo, zones, rates,
delivery-customization's rate-label case with a real WASM fixture run),
16 integration tests against live Postgres (+8 new: geocode caching,
postal/radius zone matching, nearest-first ranking, density thresholds),
both builds, and a live script exercising the full
zone-match -> density-check -> rate-resolve -> availability pipeline
together against the Postgres container.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
45 lines
2.0 KiB
TypeScript
45 lines
2.0 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import { renameLabelFor } from "../../extensions/delivery-customization/src/evaluate.js";
|
|
|
|
describe("renameLabelFor", () => {
|
|
it("relabels a pickup order unambiguously", () => {
|
|
const result = renameLabelFor({ dd_method: "PICKUP", dd_date: "2026-08-25" });
|
|
expect(result).toEqual({ rename: true, title: "Pickup — 2026-08-25" });
|
|
});
|
|
|
|
it("relabels a local delivery order distinctly from pickup", () => {
|
|
const result = renameLabelFor({ dd_method: "LOCAL_DELIVERY", dd_date: "2026-08-25" });
|
|
expect(result.rename).toBe(true);
|
|
if (!result.rename) throw new Error("unreachable");
|
|
expect(result.title).toContain("Local delivery");
|
|
expect(result.title).not.toContain("Pickup");
|
|
});
|
|
|
|
it("relabels shipping too, for consistency across all three methods", () => {
|
|
const result = renameLabelFor({ dd_method: "SHIPPING", dd_date: "2026-08-25" });
|
|
expect(result).toEqual({ rename: true, title: "Shipping — 2026-08-25" });
|
|
});
|
|
|
|
it("does nothing when no method was selected", () => {
|
|
expect(renameLabelFor({})).toEqual({ rename: false });
|
|
});
|
|
|
|
it("does nothing for an unrecognized method value", () => {
|
|
expect(renameLabelFor({ dd_method: "TELEPORT", dd_date: "2026-08-25" })).toEqual({ rename: false });
|
|
});
|
|
|
|
it("does nothing when the date is missing even if method is present", () => {
|
|
expect(renameLabelFor({ dd_method: "PICKUP" })).toEqual({ rename: false });
|
|
});
|
|
|
|
it("appends the resolved rate when a rate label is present", () => {
|
|
const result = renameLabelFor({ dd_method: "LOCAL_DELIVERY", dd_date: "2026-08-25", dd_rate_label: "$5.00" });
|
|
expect(result).toEqual({ rename: true, title: "Local delivery — 2026-08-25 ($5.00)" });
|
|
});
|
|
|
|
it("omits the rate suffix entirely when no rate label is present", () => {
|
|
const result = renameLabelFor({ dd_method: "LOCAL_DELIVERY", dd_date: "2026-08-25" });
|
|
expect(result).toEqual({ rename: true, title: "Local delivery — 2026-08-25" });
|
|
});
|
|
});
|