- 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>
234 lines
7.8 KiB
TypeScript
234 lines
7.8 KiB
TypeScript
import { useState } from "react";
|
|
import { data, type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/node";
|
|
import { Form, useLoaderData, useNavigation, useSearchParams } from "@remix-run/react";
|
|
import {
|
|
Page,
|
|
Card,
|
|
BlockStack,
|
|
InlineStack,
|
|
Text,
|
|
Button,
|
|
Select,
|
|
TextField,
|
|
IndexTable,
|
|
EmptyState,
|
|
} from "@shopify/polaris";
|
|
import { TitleBar } from "@shopify/app-bridge-react";
|
|
import { authenticate } from "../shopify.server";
|
|
import db from "../db.server";
|
|
|
|
const ZONE_TYPES = [
|
|
{ label: "Postal / ZIP codes", value: "postal" },
|
|
{ label: "Radius (straight-line distance)", value: "radius" },
|
|
];
|
|
|
|
export const loader = async ({ request }: LoaderFunctionArgs) => {
|
|
const { session } = await authenticate.admin(request);
|
|
const url = new URL(request.url);
|
|
const locationId = url.searchParams.get("locationId");
|
|
|
|
const locations = await db.location.findMany({
|
|
where: { shopDomain: session.shop },
|
|
orderBy: { createdAt: "asc" },
|
|
});
|
|
|
|
const activeLocationId = locationId || locations[0]?.id || null;
|
|
|
|
const zones = activeLocationId
|
|
? await db.zone.findMany({
|
|
where: { shopDomain: session.shop, locationId: activeLocationId },
|
|
orderBy: { createdAt: "asc" },
|
|
})
|
|
: [];
|
|
|
|
return { locations, activeLocationId, zones };
|
|
};
|
|
|
|
export const action = async ({ request }: ActionFunctionArgs) => {
|
|
const { session } = await authenticate.admin(request);
|
|
const formData = await request.formData();
|
|
const intent = formData.get("intent");
|
|
|
|
if (intent === "delete") {
|
|
const id = String(formData.get("id") || "");
|
|
await db.zone.deleteMany({ where: { id, shopDomain: session.shop } });
|
|
return data({ ok: true });
|
|
}
|
|
|
|
const locationId = String(formData.get("locationId") || "");
|
|
const name = String(formData.get("name") || "").trim();
|
|
const type = String(formData.get("type") || "postal");
|
|
const postalCodesRaw = String(formData.get("postalCodes") || "");
|
|
const radiusKmRaw = String(formData.get("radiusKm") || "");
|
|
const minOrdersRaw = String(formData.get("minOrders") || "");
|
|
|
|
const errors: Record<string, string> = {};
|
|
if (!locationId) errors.locationId = "Choose a location";
|
|
if (!name) errors.name = "Name is required";
|
|
if (type === "radius" && !radiusKmRaw) errors.radiusKm = "Radius is required for a radius zone";
|
|
if (Object.keys(errors).length > 0) {
|
|
return data({ errors });
|
|
}
|
|
|
|
const postalCodes = postalCodesRaw
|
|
.split(",")
|
|
.map((code) => code.trim())
|
|
.filter(Boolean);
|
|
|
|
await db.zone.create({
|
|
data: {
|
|
shopDomain: session.shop,
|
|
locationId,
|
|
name,
|
|
type,
|
|
postalCodes: type === "postal" ? postalCodes : [],
|
|
radiusKm: type === "radius" && radiusKmRaw ? Number(radiusKmRaw) : null,
|
|
minOrders: minOrdersRaw ? Number(minOrdersRaw) : null,
|
|
},
|
|
});
|
|
|
|
return data({ ok: true });
|
|
};
|
|
|
|
export default function ZonesIndex() {
|
|
const { locations, activeLocationId, zones } = useLoaderData<typeof loader>();
|
|
const [, setSearchParams] = useSearchParams();
|
|
const navigation = useNavigation();
|
|
const isSubmitting = navigation.state === "submitting";
|
|
|
|
if (locations.length === 0) {
|
|
return (
|
|
<Page>
|
|
<TitleBar title="Delivery zones" />
|
|
<Card>
|
|
<EmptyState
|
|
heading="Add a location first"
|
|
action={{ content: "Add location", url: "/app/locations/new" }}
|
|
image="https://cdn.shopify.com/s/files/1/0757/9955/files/empty-state.svg"
|
|
>
|
|
<Text as="p">Delivery zones determine which addresses a location's Local Delivery covers.</Text>
|
|
</EmptyState>
|
|
</Card>
|
|
</Page>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<Page>
|
|
<TitleBar title="Delivery zones" />
|
|
<BlockStack gap="400">
|
|
<Card>
|
|
<Select
|
|
label="Location"
|
|
options={locations.map((l) => ({ label: l.name, value: l.id }))}
|
|
value={activeLocationId ?? undefined}
|
|
onChange={(value) => setSearchParams({ locationId: value })}
|
|
/>
|
|
</Card>
|
|
|
|
<Card padding="0">
|
|
{zones.length === 0 ? (
|
|
<div style={{ padding: 16 }}>
|
|
<Text as="p" tone="subdued">
|
|
No delivery zones yet for this location. Without a zone, Local Delivery is offered everywhere.
|
|
</Text>
|
|
</div>
|
|
) : (
|
|
<IndexTable
|
|
itemCount={zones.length}
|
|
headings={[
|
|
{ title: "Name" },
|
|
{ title: "Type" },
|
|
{ title: "Coverage" },
|
|
{ title: "Min. orders" },
|
|
{ title: "" },
|
|
]}
|
|
selectable={false}
|
|
>
|
|
{zones.map((zone, index) => (
|
|
<IndexTable.Row id={zone.id} key={zone.id} position={index}>
|
|
<IndexTable.Cell>{zone.name}</IndexTable.Cell>
|
|
<IndexTable.Cell>{zone.type === "postal" ? "Postal/ZIP" : "Radius"}</IndexTable.Cell>
|
|
<IndexTable.Cell>
|
|
{zone.type === "postal" ? zone.postalCodes.join(", ") || "—" : `${zone.radiusKm ?? "—"} km`}
|
|
</IndexTable.Cell>
|
|
<IndexTable.Cell>{zone.minOrders ?? "—"}</IndexTable.Cell>
|
|
<IndexTable.Cell>
|
|
<Form method="post">
|
|
<input type="hidden" name="intent" value="delete" />
|
|
<input type="hidden" name="id" value={zone.id} />
|
|
<Button submit variant="plain" tone="critical">
|
|
Remove
|
|
</Button>
|
|
</Form>
|
|
</IndexTable.Cell>
|
|
</IndexTable.Row>
|
|
))}
|
|
</IndexTable>
|
|
)}
|
|
</Card>
|
|
|
|
<AddZoneForm key={activeLocationId} locationId={activeLocationId ?? ""} isSubmitting={isSubmitting} />
|
|
</BlockStack>
|
|
</Page>
|
|
);
|
|
}
|
|
|
|
function AddZoneForm({ locationId, isSubmitting }: { locationId: string; isSubmitting: boolean }) {
|
|
const [type, setType] = useState("postal");
|
|
const [name, setName] = useState("");
|
|
const [postalCodes, setPostalCodes] = useState("");
|
|
const [radiusKm, setRadiusKm] = useState("");
|
|
const [minOrders, setMinOrders] = useState("");
|
|
|
|
return (
|
|
<Card>
|
|
<Form method="post">
|
|
<input type="hidden" name="locationId" value={locationId} />
|
|
<BlockStack gap="300">
|
|
<Text as="h3" variant="headingSm">
|
|
Add a delivery zone
|
|
</Text>
|
|
<InlineStack gap="300" wrap>
|
|
<TextField label="Name" name="name" autoComplete="off" value={name} onChange={setName} />
|
|
<Select label="Type" name="type" options={ZONE_TYPES} value={type} onChange={setType} />
|
|
{type === "postal" ? (
|
|
<TextField
|
|
label="Postal/ZIP codes (comma-separated)"
|
|
name="postalCodes"
|
|
autoComplete="off"
|
|
value={postalCodes}
|
|
onChange={setPostalCodes}
|
|
helpText="e.g. M5V 3A8, M4B 1B3"
|
|
/>
|
|
) : (
|
|
<TextField
|
|
label="Radius (km)"
|
|
name="radiusKm"
|
|
type="number"
|
|
autoComplete="off"
|
|
value={radiusKm}
|
|
onChange={setRadiusKm}
|
|
/>
|
|
)}
|
|
<TextField
|
|
label="Min. orders before this zone unlocks (optional)"
|
|
name="minOrders"
|
|
type="number"
|
|
autoComplete="off"
|
|
value={minOrders}
|
|
onChange={setMinOrders}
|
|
helpText="Delivery-density threshold — leave blank for no minimum."
|
|
/>
|
|
</InlineStack>
|
|
<div>
|
|
<Button submit variant="primary" loading={isSubmitting}>
|
|
Add zone
|
|
</Button>
|
|
</div>
|
|
</BlockStack>
|
|
</Form>
|
|
</Card>
|
|
);
|
|
}
|