(null)
@@ -80,6 +86,25 @@ export const CreateShippingOptionsPricesForm = ({
[currencies, regions]
)
+ /**
+ * Prefill prices with 0 if createing a pickup (shipping) option
+ */
+ useEffect(() => {
+ if (!isLoading && isPickup) {
+ if (currencies.length > 0) {
+ currencies.forEach((currency) => {
+ form.setValue(`currency_prices.${currency}`, "0")
+ })
+ }
+
+ if (regions.length > 0) {
+ regions.forEach((region) => {
+ form.setValue(`region_prices.${region.id}`, "0")
+ })
+ }
+ }
+ }, [isLoading, isPickup])
+
if (isStoreError) {
throw storeError
}
diff --git a/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx b/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx
index f878ac9d0d..c40d49a89b 100644
--- a/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx
+++ b/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx
@@ -4,6 +4,7 @@ import { RouteFocusModal } from "../../../components/modals"
import { useStockLocation } from "../../../hooks/api/stock-locations"
import { CreateShippingOptionsForm } from "./components/create-shipping-options-form"
import { LOC_CREATE_SHIPPING_OPTION_FIELDS } from "./constants"
+import { FulfillmentSetType } from "../common/constants"
export function LocationServiceZoneShippingOptionCreate() {
const { location_id, fset_id, zone_id } = useParams()
@@ -15,9 +16,18 @@ export function LocationServiceZoneShippingOptionCreate() {
fields: LOC_CREATE_SHIPPING_OPTION_FIELDS,
})
- const zone = stock_location?.fulfillment_sets
- ?.find((f) => f.id === fset_id)
- ?.service_zones?.find((z) => z.id === zone_id)
+ const fulfillmentSet = stock_location?.fulfillment_sets?.find(
+ (f) => f.id === fset_id
+ )
+
+ if (!isPending && !isFetching && !fulfillmentSet) {
+ throw json(
+ { message: `Fulfillment set with ID ${fset_id} was not found` },
+ 404
+ )
+ }
+
+ const zone = fulfillmentSet?.service_zones?.find((z) => z.id === zone_id)
if (!isPending && !isFetching && !zone) {
throw json(
@@ -37,6 +47,7 @@ export function LocationServiceZoneShippingOptionCreate() {
zone={zone}
isReturn={isReturn}
locationId={location_id!}
+ type={fulfillmentSet!.type as FulfillmentSetType}
/>
)}
diff --git a/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx b/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
index bed53bbe99..c33fe0b6dd 100644
--- a/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
+++ b/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
@@ -15,11 +15,15 @@ import { useComboboxData } from "../../../../../hooks/use-combobox-data"
import { sdk } from "../../../../../lib/client"
import { pick } from "../../../../../lib/common"
import { isOptionEnabledInStore } from "../../../../../lib/shipping-options"
-import { ShippingOptionPriceType } from "../../../common/constants"
+import {
+ FulfillmentSetType,
+ ShippingOptionPriceType,
+} from "../../../common/constants"
type EditShippingOptionFormProps = {
locationId: string
shippingOption: HttpTypes.AdminShippingOption
+ type: FulfillmentSetType
}
const EditShippingOptionSchema = zod.object({
@@ -32,10 +36,13 @@ const EditShippingOptionSchema = zod.object({
export const EditShippingOptionForm = ({
locationId,
shippingOption,
+ type,
}: EditShippingOptionFormProps) => {
const { t } = useTranslation()
const { handleSuccess } = useRouteModal()
+ const isPickup = type === FulfillmentSetType.Pickup
+
const shippingProfiles = useComboboxData({
queryFn: (params) => sdk.admin.shippingProfile.list(params),
queryKey: ["shipping_profiles"],
@@ -108,46 +115,48 @@ export const EditShippingOptionForm = ({
-
{
- return (
-
-
- {t(
- "stockLocations.shippingOptions.fields.priceType.label"
- )}
-
-
-
-
-
-
-
-
-
- )
- }}
- />
+ {!isPickup && (
+ {
+ return (
+
+
+ {t(
+ "stockLocations.shippingOptions.fields.priceType.label"
+ )}
+
+
+
+
+
+
+
+
+
+ )
+ }}
+ />
+ )}
-
-
-
+ {!isPickup && (
+ <>
+
+
+
+ )}
diff --git a/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx b/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx
index 5845c6a891..90c9bd1fce 100644
--- a/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx
+++ b/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx
@@ -5,6 +5,7 @@ import { json, useParams } from "react-router-dom"
import { RouteDrawer } from "../../../components/modals"
import { useShippingOptions } from "../../../hooks/api/shipping-options"
import { EditShippingOptionForm } from "./components/edit-region-form"
+import { FulfillmentSetType } from "../common/constants"
export const LocationServiceZoneShippingOptionEdit = () => {
const { t } = useTranslation()
@@ -14,6 +15,7 @@ export const LocationServiceZoneShippingOptionEdit = () => {
const { shipping_options, isPending, isFetching, isError, error } =
useShippingOptions({
id: so_id,
+ fields: "+service_zone.fulfillment_set.type",
})
const shippingOption = shipping_options?.find((so) => so.id === so_id)
@@ -29,15 +31,27 @@ export const LocationServiceZoneShippingOptionEdit = () => {
throw error
}
+ const isPickup =
+ shippingOption?.service_zone.fulfillment_set.type ===
+ FulfillmentSetType.Pickup
+
return (
- {t("stockLocations.shippingOptions.edit.header")}
+
+ {t(
+ `stockLocations.${isPickup ? "pickupOptions" : "shippingOptions"}.edit.header`
+ )}
+
{shippingOption && (
)}
diff --git a/packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx b/packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx
index 30e5d8f4f7..8e2054ef7a 100644
--- a/packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx
+++ b/packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx
@@ -30,6 +30,7 @@ import {
import { useStockLocation } from "../../../../../hooks/api/stock-locations"
import { formatProvider } from "../../../../../lib/format-provider"
import { getLocaleAmount } from "../../../../../lib/money-amount-helpers"
+import { FulfillmentSetType } from "../../../../locations/common/constants"
type OrderFulfillmentSectionProps = {
order: AdminOrder
@@ -213,6 +214,10 @@ const Fulfillment = ({
const showLocation = !!fulfillment.location_id
+ const isPickUpFulfillment =
+ fulfillment.shipping_option?.service_zone.fulfillment_set.type ===
+ FulfillmentSetType.Pickup
+
const { stock_location, isError, error } = useStockLocation(
fulfillment.location_id!,
undefined,
@@ -222,7 +227,9 @@ const Fulfillment = ({
)
let statusText = fulfillment.requires_shipping
- ? "Awaiting shipping"
+ ? isPickUpFulfillment
+ ? "Awaiting pickup"
+ : "Awaiting shipping"
: "Awaiting delivery"
let statusColor: "blue" | "green" | "red" = "blue"
let statusTimestamp = fulfillment.created_at
@@ -251,7 +258,9 @@ const Fulfillment = ({
!fulfillment.canceled_at &&
!fulfillment.shipped_at &&
!fulfillment.delivered_at &&
- fulfillment.requires_shipping
+ fulfillment.requires_shipping &&
+ !isPickUpFulfillment
+
const showDeliveryButton =
!fulfillment.canceled_at && !fulfillment.delivered_at
@@ -267,7 +276,13 @@ const Fulfillment = ({
if (res) {
await markAsDelivered(undefined, {
onSuccess: () => {
- toast.success(t("orders.fulfillment.toast.fulfillmentDelivered"))
+ toast.success(
+ t(
+ isPickUpFulfillment
+ ? "orders.fulfillment.toast.fulfillmentPickedUp"
+ : "orders.fulfillment.toast.fulfillmentDelivered"
+ )
+ )
},
onError: (e) => {
toast.error(e.message)
@@ -431,7 +446,11 @@ const Fulfillment = ({
{showDeliveryButton && (
)}
diff --git a/packages/admin/dashboard/src/routes/orders/order-detail/constants.ts b/packages/admin/dashboard/src/routes/orders/order-detail/constants.ts
index 446ff7e218..a4a1519659 100644
--- a/packages/admin/dashboard/src/routes/orders/order-detail/constants.ts
+++ b/packages/admin/dashboard/src/routes/orders/order-detail/constants.ts
@@ -37,6 +37,7 @@ const DEFAULT_RELATIONS = [
"*promotion",
"*shipping_methods",
"*fulfillments",
+ "+fulfillments.shipping_option.service_zone.fulfillment_set.type",
"*fulfillments.items",
"*fulfillments.labels",
"*fulfillments.labels",
diff --git a/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart-with-pricing.ts b/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart-with-pricing.ts
index 1fc550029e..600138fd90 100644
--- a/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart-with-pricing.ts
+++ b/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart-with-pricing.ts
@@ -22,6 +22,8 @@ const COMMON_OPTIONS_FIELDS = [
"price_type",
"service_zone_id",
"service_zone.fulfillment_set_id",
+ "service_zone.fulfillment_set.type",
+ "service_zone.fulfillment_set.location.address.*",
"shipping_profile_id",
"provider_id",
"data",
diff --git a/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart.ts b/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart.ts
index 2a177673f6..255eda18c8 100644
--- a/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart.ts
+++ b/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart.ts
@@ -131,6 +131,8 @@ export const listShippingOptionsForCartWorkflow = createWorkflow(
"provider_id",
"data",
"service_zone.fulfillment_set_id",
+ "service_zone.fulfillment_set.type",
+ "service_zone.fulfillment_set.location.address.*",
"type.id",
"type.label",