@medusajs/dashboard 2.6.0-snapshot-20250221164338 → 3.0.0-preview-20250211091350

package/src/routes/locations/location-detail/components/location-general-section/location-general-section.tsx

@@ -195,14 +195,12 @@ type ServiceZoneOptionsProps = {
   zone: HttpTypes.AdminServiceZone
   locationId: string
   fulfillmentSetId: string
-  type: FulfillmentSetType
 }
 
 function ServiceZoneOptions({
   zone,
   locationId,
   fulfillmentSetId,
-  type,
 }: ServiceZoneOptionsProps) {
   const { t } = useTranslation()
 
@@ -218,7 +216,7 @@ function ServiceZoneOptions({
       <div className="flex flex-col gap-y-4 px-6 py-4">
         <div className="item-center flex justify-between">
           <span className="text-ui-fg-subtle txt-small self-center font-medium">
-            {t(`stockLocations.shippingOptions.create.${type}.label`)}
+            {t("stockLocations.shippingOptions.create.shipping.label")}
           </span>
           <LinkButton
             to={`/settings/locations/${locationId}/fulfillment-set/${fulfillmentSetId}/service-zone/${zone.id}/shipping-option/create`}
@@ -276,15 +274,9 @@ type ServiceZoneProps = {
   zone: HttpTypes.AdminServiceZone
   locationId: string
   fulfillmentSetId: string
-  type: FulfillmentSetType
 }
 
-function ServiceZone({
-  zone,
-  locationId,
-  fulfillmentSetId,
-  type,
-}: ServiceZoneProps) {
+function ServiceZone({ zone, locationId, fulfillmentSetId }: ServiceZoneProps) {
   const { t } = useTranslation()
   const prompt = usePrompt()
   const [open, setOpen] = useState(true)
@@ -376,7 +368,7 @@ function ServiceZone({
             />
             <span>·</span>
             <Text className="text-ui-fg-subtle txt-small">
-              {t(`stockLocations.shippingOptions.fields.count.${type}`, {
+              {t("stockLocations.shippingOptions.fields.count.shipping", {
                 count: shippingOptionsCount,
               })}
             </Text>
@@ -435,7 +427,6 @@ function ServiceZone({
         <ServiceZoneOptions
           fulfillmentSetId={fulfillmentSetId}
           locationId={locationId}
-          type={type}
           zone={zone}
         />
       )}
@@ -579,7 +570,6 @@ function FulfillmentSet(props: FulfillmentSetProps) {
             {fulfillmentSet?.service_zones.map((zone) => (
               <ServiceZone
                 zone={zone}
-                type={type}
                 key={zone.id}
                 locationId={locationId}
                 fulfillmentSetId={fulfillmentSet.id}

package/src/routes/locations/location-service-zone-create/components/create-service-zone-form/create-service-zone-form.tsx

@@ -1,11 +1,12 @@
 import { zodResolver } from "@hookform/resolvers/zod"
 import { HttpTypes } from "@medusajs/types"
-import { Button, Heading, InlineTip, Input, toast } from "@medusajs/ui"
+import { Button, Heading, Input, toast } from "@medusajs/ui"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
 
 import { Form } from "../../../../../components/common/form"
+import { InlineTip } from "../../../../../components/common/inline-tip"
 import {
   RouteFocusModal,
   StackedFocusModal,
@@ -117,7 +118,7 @@ export function CreateServiceZoneForm({
                   />
                 </div>
 
-                <InlineTip label={t("general.tip")}>
+                <InlineTip>
                   {t("stockLocations.serviceZones.fields.tip")}
                 </InlineTip>
 

package/src/routes/locations/location-service-zone-edit/components/edit-region-form/edit-service-zone-form.tsx

@@ -1,10 +1,11 @@
 import { HttpTypes } from "@medusajs/types"
-import { Button, InlineTip, Input, toast } from "@medusajs/ui"
+import { Button, Input, toast } from "@medusajs/ui"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import * as zod from "zod"
 
 import { Form } from "../../../../../components/common/form"
+import { InlineTip } from "../../../../../components/common/inline-tip"
 import { RouteDrawer, useRouteModal } from "../../../../../components/modals"
 import { KeyboundForm } from "../../../../../components/utilities/keybound-form"
 import { useUpdateFulfillmentSetServiceZone } from "../../../../../hooks/api/fulfillment-sets"
@@ -82,9 +83,7 @@ export const EditServiceZoneForm = ({
                 }}
               />
             </div>
-            <InlineTip label={t("general.tip")}>
-              {t("stockLocations.serviceZones.fields.tip")}
-            </InlineTip>
+            <InlineTip>{t("stockLocations.serviceZones.fields.tip")}</InlineTip>
           </div>
         </RouteDrawer.Body>
         <RouteDrawer.Footer>

package/src/routes/locations/location-service-zone-shipping-option-create/components/create-shipping-options-form/create-shipping-option-details-form.tsx

@@ -10,10 +10,7 @@ import { Combobox } from "../../../../../components/inputs/combobox"
 import { useComboboxData } from "../../../../../hooks/use-combobox-data"
 import { sdk } from "../../../../../lib/client"
 import { formatProvider } from "../../../../../lib/format-provider"
-import {
-  FulfillmentSetType,
-  ShippingOptionPriceType,
-} from "../../../common/constants"
+import { ShippingOptionPriceType } from "../../../common/constants"
 import { CreateShippingOptionSchema } from "./schema"
 
 type CreateShippingOptionDetailsFormProps = {
@@ -23,7 +20,6 @@ type CreateShippingOptionDetailsFormProps = {
   locationId: string
   fulfillmentProviderOptions: HttpTypes.AdminFulfillmentProviderOption[]
   selectedProviderId?: string
-  type: FulfillmentSetType
 }
 
 export const CreateShippingOptionDetailsForm = ({
@@ -33,12 +29,9 @@ export const CreateShippingOptionDetailsForm = ({
   locationId,
   fulfillmentProviderOptions,
   selectedProviderId,
-  type,
 }: CreateShippingOptionDetailsFormProps) => {
   const { t } = useTranslation()
 
-  const isPickup = type === FulfillmentSetType.Pickup
-
   const shippingProfiles = useComboboxData({
     queryFn: (params) => sdk.admin.shippingProfile.list(params),
     queryKey: ["shipping_profiles"],
@@ -70,7 +63,7 @@ export const CreateShippingOptionDetailsForm = ({
           <Heading>
             {t(
               `stockLocations.shippingOptions.create.${
-                isPickup ? "pickup" : isReturn ? "returns" : "shipping"
+                isReturn ? "returns" : "shipping"
               }.header`,
               {
                 zone: zone.name,
@@ -80,56 +73,54 @@ export const CreateShippingOptionDetailsForm = ({
           <Text size="small" className="text-ui-fg-subtle">
             {t(
               `stockLocations.shippingOptions.create.${
-                isReturn ? "returns" : isPickup ? "pickup" : "shipping"
+                isReturn ? "returns" : "shipping"
               }.hint`
             )}
           </Text>
         </div>
 
-        {!isPickup && (
-          <Form.Field
-            control={form.control}
-            name="price_type"
-            render={({ field }) => {
-              return (
-                <Form.Item>
-                  <Form.Label>
-                    {t("stockLocations.shippingOptions.fields.priceType.label")}
-                  </Form.Label>
-                  <Form.Control>
-                    <RadioGroup
-                      className="grid grid-cols-1 gap-4 md:grid-cols-2"
-                      {...field}
-                      onValueChange={field.onChange}
-                    >
-                      <RadioGroup.ChoiceBox
-                        className="flex-1"
-                        value={ShippingOptionPriceType.FlatRate}
-                        label={t(
-                          "stockLocations.shippingOptions.fields.priceType.options.fixed.label"
-                        )}
-                        description={t(
-                          "stockLocations.shippingOptions.fields.priceType.options.fixed.hint"
-                        )}
-                      />
-                      <RadioGroup.ChoiceBox
-                        className="flex-1"
-                        value={ShippingOptionPriceType.Calculated}
-                        label={t(
-                          "stockLocations.shippingOptions.fields.priceType.options.calculated.label"
-                        )}
-                        description={t(
-                          "stockLocations.shippingOptions.fields.priceType.options.calculated.hint"
-                        )}
-                      />
-                    </RadioGroup>
-                  </Form.Control>
-                  <Form.ErrorMessage />
-                </Form.Item>
-              )
-            }}
-          />
-        )}
+        <Form.Field
+          control={form.control}
+          name="price_type"
+          render={({ field }) => {
+            return (
+              <Form.Item>
+                <Form.Label>
+                  {t("stockLocations.shippingOptions.fields.priceType.label")}
+                </Form.Label>
+                <Form.Control>
+                  <RadioGroup
+                    className="grid grid-cols-1 gap-4 md:grid-cols-2"
+                    {...field}
+                    onValueChange={field.onChange}
+                  >
+                    <RadioGroup.ChoiceBox
+                      className="flex-1"
+                      value={ShippingOptionPriceType.FlatRate}
+                      label={t(
+                        "stockLocations.shippingOptions.fields.priceType.options.fixed.label"
+                      )}
+                      description={t(
+                        "stockLocations.shippingOptions.fields.priceType.options.fixed.hint"
+                      )}
+                    />
+                    <RadioGroup.ChoiceBox
+                      className="flex-1"
+                      value={ShippingOptionPriceType.Calculated}
+                      label={t(
+                        "stockLocations.shippingOptions.fields.priceType.options.calculated.label"
+                      )}
+                      description={t(
+                        "stockLocations.shippingOptions.fields.priceType.options.calculated.hint"
+                      )}
+                    />
+                  </RadioGroup>
+                </Form.Control>
+                <Form.ErrorMessage />
+              </Form.Item>
+            )
+          }}
+        />
 
         <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
           <Form.Field
@@ -248,6 +239,7 @@ export const CreateShippingOptionDetailsForm = ({
         </div>
 
         <Divider />
+
         <SwitchBox
           control={form.control}
           name="enabled_in_store"

package/src/routes/locations/location-service-zone-shipping-option-create/components/create-shipping-options-form/create-shipping-options-form.tsx

@@ -12,10 +12,7 @@ import {
 import { KeyboundForm } from "../../../../../components/utilities/keybound-form"
 import { useCreateShippingOptions } from "../../../../../hooks/api/shipping-options"
 import { castNumber } from "../../../../../lib/cast-number"
-import {
-  FulfillmentSetType,
-  ShippingOptionPriceType,
-} from "../../../common/constants"
+import { ShippingOptionPriceType } from "../../../common/constants"
 import { buildShippingOptionPriceRules } from "../../../common/utils/price-rule-helpers"
 import { CreateShippingOptionDetailsForm } from "./create-shipping-option-details-form"
 import { CreateShippingOptionsPricesForm } from "./create-shipping-options-prices-form"
@@ -34,14 +31,12 @@ type CreateShippingOptionFormProps = {
   zone: HttpTypes.AdminServiceZone
   locationId: string
   isReturn?: boolean
-  type: FulfillmentSetType
 }
 
 export function CreateShippingOptionsForm({
   zone,
   isReturn,
   locationId,
-  type,
 }: CreateShippingOptionFormProps) {
   const [activeTab, setActiveTab] = useState<Tab>(Tab.DETAILS)
   const [validDetails, setValidDetails] = useState(false)
@@ -314,14 +309,13 @@ export function CreateShippingOptionsForm({
                 form={form}
                 zone={zone}
                 isReturn={isReturn}
-                type={type}
                 locationId={locationId}
                 fulfillmentProviderOptions={fulfillmentProviderOptions || []}
                 selectedProviderId={selectedProviderId}
               />
             </ProgressTabs.Content>
             <ProgressTabs.Content value={Tab.PRICING} className="size-full">
-              <CreateShippingOptionsPricesForm form={form} type={type} />
+              <CreateShippingOptionsPricesForm form={form} />
             </ProgressTabs.Content>
           </RouteFocusModal.Body>
           <RouteFocusModal.Footer>

package/src/routes/locations/location-service-zone-shipping-option-create/components/create-shipping-options-form/create-shipping-options-prices-form.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from "react"
+import { useMemo, useState } from "react"
 import { UseFormReturn, useWatch } from "react-hook-form"
 
 import { DataGrid } from "../../../../../components/data-grid"
@@ -12,24 +12,18 @@ import { useRegions } from "../../../../../hooks/api/regions"
 import { useStore } from "../../../../../hooks/api/store"
 import { ConditionalPriceForm } from "../../../common/components/conditional-price-form"
 import { ShippingOptionPriceProvider } from "../../../common/components/shipping-option-price-provider"
-import {
-  FulfillmentSetType,
-  CONDITIONAL_PRICES_STACKED_MODAL_ID,
-} from "../../../common/constants"
+import { CONDITIONAL_PRICES_STACKED_MODAL_ID } from "../../../common/constants"
 import { useShippingOptionPriceColumns } from "../../../common/hooks/use-shipping-option-price-columns"
 import { ConditionalPriceInfo } from "../../../common/types"
 import { CreateShippingOptionSchema } from "./schema"
 
 type PricingPricesFormProps = {
   form: UseFormReturn<CreateShippingOptionSchema>
-  type: FulfillmentSetType
 }
 
 export const CreateShippingOptionsPricesForm = ({
   form,
-  type,
 }: PricingPricesFormProps) => {
-  const isPickup = type === FulfillmentSetType.Pickup
   const { getIsOpen, setIsOpen } = useStackedModal()
   const [selectedPrice, setSelectedPrice] =
     useState<ConditionalPriceInfo | null>(null)
@@ -86,25 +80,6 @@ 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
   }

package/src/routes/locations/location-service-zone-shipping-option-create/location-service-zone-shipping-option-create.tsx

@@ -4,7 +4,6 @@ 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()
@@ -16,18 +15,9 @@ export function LocationServiceZoneShippingOptionCreate() {
       fields: LOC_CREATE_SHIPPING_OPTION_FIELDS,
     })
 
-  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)
+  const zone = stock_location?.fulfillment_sets
+    ?.find((f) => f.id === fset_id)
+    ?.service_zones?.find((z) => z.id === zone_id)
 
   if (!isPending && !isFetching && !zone) {
     throw json(
@@ -47,7 +37,6 @@ export function LocationServiceZoneShippingOptionCreate() {
           zone={zone}
           isReturn={isReturn}
           locationId={location_id!}
-          type={fulfillmentSet!.type as FulfillmentSetType}
         />
       )}
     </RouteFocusModal>

package/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx

@@ -15,15 +15,11 @@ import { useComboboxData } from "../../../../../hooks/use-combobox-data"
 import { sdk } from "../../../../../lib/client"
 import { pick } from "../../../../../lib/common"
 import { isOptionEnabledInStore } from "../../../../../lib/shipping-options"
-import {
-  FulfillmentSetType,
-  ShippingOptionPriceType,
-} from "../../../common/constants"
+import { ShippingOptionPriceType } from "../../../common/constants"
 
 type EditShippingOptionFormProps = {
   locationId: string
   shippingOption: HttpTypes.AdminShippingOption
-  type: FulfillmentSetType
 }
 
 const EditShippingOptionSchema = zod.object({
@@ -36,13 +32,10 @@ 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"],
@@ -115,48 +108,46 @@ export const EditShippingOptionForm = ({
         <RouteDrawer.Body>
           <div className="flex flex-col gap-y-8">
             <div className="flex flex-col gap-y-8">
-              {!isPickup && (
-                <Form.Field
-                  control={form.control}
-                  name="price_type"
-                  render={({ field }) => {
-                    return (
-                      <Form.Item>
-                        <Form.Label>
-                          {t(
-                            "stockLocations.shippingOptions.fields.priceType.label"
-                          )}
-                        </Form.Label>
-                        <Form.Control>
-                          <RadioGroup {...field} onValueChange={field.onChange}>
-                            <RadioGroup.ChoiceBox
-                              className="flex-1"
-                              value={ShippingOptionPriceType.FlatRate}
-                              label={t(
-                                "stockLocations.shippingOptions.fields.priceType.options.fixed.label"
-                              )}
-                              description={t(
-                                "stockLocations.shippingOptions.fields.priceType.options.fixed.hint"
-                              )}
-                            />
-                            <RadioGroup.ChoiceBox
-                              className="flex-1"
-                              value={ShippingOptionPriceType.Calculated}
-                              label={t(
-                                "stockLocations.shippingOptions.fields.priceType.options.calculated.label"
-                              )}
-                              description={t(
-                                "stockLocations.shippingOptions.fields.priceType.options.calculated.hint"
-                              )}
-                            />
-                          </RadioGroup>
-                        </Form.Control>
-                        <Form.ErrorMessage />
-                      </Form.Item>
-                    )
-                  }}
-                />
-              )}
+              <Form.Field
+                control={form.control}
+                name="price_type"
+                render={({ field }) => {
+                  return (
+                    <Form.Item>
+                      <Form.Label>
+                        {t(
+                          "stockLocations.shippingOptions.fields.priceType.label"
+                        )}
+                      </Form.Label>
+                      <Form.Control>
+                        <RadioGroup {...field} onValueChange={field.onChange}>
+                          <RadioGroup.ChoiceBox
+                            className="flex-1"
+                            value={ShippingOptionPriceType.FlatRate}
+                            label={t(
+                              "stockLocations.shippingOptions.fields.priceType.options.fixed.label"
+                            )}
+                            description={t(
+                              "stockLocations.shippingOptions.fields.priceType.options.fixed.hint"
+                            )}
+                          />
+                          <RadioGroup.ChoiceBox
+                            className="flex-1"
+                            value={ShippingOptionPriceType.Calculated}
+                            label={t(
+                              "stockLocations.shippingOptions.fields.priceType.options.calculated.label"
+                            )}
+                            description={t(
+                              "stockLocations.shippingOptions.fields.priceType.options.calculated.hint"
+                            )}
+                          />
+                        </RadioGroup>
+                      </Form.Control>
+                      <Form.ErrorMessage />
+                    </Form.Item>
+                  )
+                }}
+              />
 
               <div className="grid gap-y-4">
                 <Form.Field
@@ -203,6 +194,7 @@ export const EditShippingOptionForm = ({
               </div>
 
               <Divider />
+
               <SwitchBox
                 control={form.control}
                 name="enabled_in_store"

package/src/routes/locations/location-service-zone-shipping-option-edit/location-service-zone-shipping-option-edit.tsx

@@ -5,7 +5,6 @@ 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()
@@ -15,7 +14,6 @@ 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)
@@ -31,27 +29,15 @@ export const LocationServiceZoneShippingOptionEdit = () => {
     throw error
   }
 
-  const isPickup =
-    shippingOption?.service_zone.fulfillment_set.type ===
-    FulfillmentSetType.Pickup
-
   return (
     <RouteDrawer>
       <RouteDrawer.Header>
-        <Heading>
-          {t(
-            `stockLocations.${isPickup ? "pickupOptions" : "shippingOptions"}.edit.header`
-          )}
-        </Heading>
+        <Heading>{t("stockLocations.shippingOptions.edit.header")}</Heading>
       </RouteDrawer.Header>
       {shippingOption && (
         <EditShippingOptionForm
           shippingOption={shippingOption}
           locationId={location_id!}
-          type={
-            shippingOption.service_zone.fulfillment_set
-              .type as FulfillmentSetType
-          }
         />
       )}
     </RouteDrawer>

package/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx

@@ -30,7 +30,6 @@ 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
@@ -214,10 +213,6 @@ 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,
@@ -227,9 +222,7 @@ const Fulfillment = ({
   )
 
   let statusText = fulfillment.requires_shipping
-    ? isPickUpFulfillment
-      ? "Awaiting pickup"
-      : "Awaiting shipping"
+    ? "Awaiting shipping"
     : "Awaiting delivery"
   let statusColor: "blue" | "green" | "red" = "blue"
   let statusTimestamp = fulfillment.created_at
@@ -258,9 +251,7 @@ const Fulfillment = ({
     !fulfillment.canceled_at &&
     !fulfillment.shipped_at &&
     !fulfillment.delivered_at &&
-    fulfillment.requires_shipping &&
-    !isPickUpFulfillment
-
+    fulfillment.requires_shipping
   const showDeliveryButton =
     !fulfillment.canceled_at && !fulfillment.delivered_at
 
@@ -276,13 +267,7 @@ const Fulfillment = ({
     if (res) {
       await markAsDelivered(undefined, {
         onSuccess: () => {
-          toast.success(
-            t(
-              isPickUpFulfillment
-                ? "orders.fulfillment.toast.fulfillmentPickedUp"
-                : "orders.fulfillment.toast.fulfillmentDelivered"
-            )
-          )
+          toast.success(t("orders.fulfillment.toast.fulfillmentDelivered"))
         },
         onError: (e) => {
           toast.error(e.message)
@@ -446,11 +431,7 @@ const Fulfillment = ({
         <div className="bg-ui-bg-subtle flex items-center justify-end gap-x-2 rounded-b-xl px-4 py-4">
           {showDeliveryButton && (
             <Button onClick={handleMarkAsDelivered} variant="secondary">
-              {t(
-                isPickUpFulfillment
-                  ? "orders.fulfillment.markAsPickedUp"
-                  : "orders.fulfillment.markAsDelivered"
-              )}
+              {t("orders.fulfillment.markAsDelivered")}
             </Button>
           )}