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>
75 lines
2.7 KiB
Plaintext
75 lines
2.7 KiB
Plaintext
<div
|
|
class="dd-widget"
|
|
data-dd-widget
|
|
data-heading="{{ block.settings.heading | escape }}"
|
|
data-show-shipping="{{ block.settings.show_shipping }}"
|
|
data-show-local-delivery="{{ block.settings.show_local_delivery }}"
|
|
data-show-pickup="{{ block.settings.show_pickup }}"
|
|
data-label-shipping="{{ 'widget.method_shipping' | t | escape }}"
|
|
data-label-local-delivery="{{ 'widget.method_local_delivery' | t | escape }}"
|
|
data-label-pickup="{{ 'widget.method_pickup' | t | escape }}"
|
|
data-attr-label-shipping="{{ 'widget.date_label_shipping' | t | escape }}"
|
|
data-attr-label-local-delivery="{{ 'widget.date_label_local_delivery' | t | escape }}"
|
|
data-attr-label-pickup="{{ 'widget.date_label_pickup' | t | escape }}"
|
|
data-label-choose-date="{{ 'widget.choose_date' | t | escape }}"
|
|
data-label-choose-time="{{ 'widget.choose_time' | t | escape }}"
|
|
data-label-no-dates="{{ 'widget.no_dates' | t | escape }}"
|
|
data-label-confirmed="{{ 'widget.confirmed' | t | escape }}"
|
|
data-label-change="{{ 'widget.change' | t | escape }}"
|
|
data-label-loading="{{ 'widget.loading' | t | escape }}"
|
|
data-label-error="{{ 'widget.error' | t | escape }}"
|
|
data-label-postal-code="{{ 'widget.postal_code' | t | escape }}"
|
|
data-label-postal-code-submit="{{ 'widget.postal_code_submit' | t | escape }}"
|
|
data-label-out-of-area="{{ 'widget.out_of_area' | t | escape }}"
|
|
{% if block.settings.location_id != blank %}data-location-id="{{ block.settings.location_id | escape }}"{% endif %}
|
|
{% if block.settings.google_maps_api_key != blank %}data-google-maps-api-key="{{ block.settings.google_maps_api_key | escape }}"{% endif %}
|
|
{{ block.shopify_attributes }}
|
|
>
|
|
<noscript>{{ 'widget.enable_js' | t | escape }}</noscript>
|
|
</div>
|
|
|
|
{% schema %}
|
|
{
|
|
"name": "t:datetime_picker.name",
|
|
"target": "section",
|
|
"settings": [
|
|
{
|
|
"type": "text",
|
|
"id": "heading",
|
|
"label": "t:datetime_picker.heading_label",
|
|
"default": "Choose your delivery date"
|
|
},
|
|
{
|
|
"type": "checkbox",
|
|
"id": "show_shipping",
|
|
"label": "t:datetime_picker.show_shipping_label",
|
|
"default": true
|
|
},
|
|
{
|
|
"type": "checkbox",
|
|
"id": "show_local_delivery",
|
|
"label": "t:datetime_picker.show_local_delivery_label",
|
|
"default": true
|
|
},
|
|
{
|
|
"type": "checkbox",
|
|
"id": "show_pickup",
|
|
"label": "t:datetime_picker.show_pickup_label",
|
|
"default": true
|
|
},
|
|
{
|
|
"type": "text",
|
|
"id": "location_id",
|
|
"label": "t:datetime_picker.location_id_label",
|
|
"info": "t:datetime_picker.location_id_info"
|
|
},
|
|
{
|
|
"type": "text",
|
|
"id": "google_maps_api_key",
|
|
"label": "t:datetime_picker.google_maps_api_key_label",
|
|
"info": "t:datetime_picker.google_maps_api_key_info"
|
|
}
|
|
]
|
|
}
|
|
{% endschema %}
|