@medusajs/dashboard 2.10.4-snapshot-20250930123356 → 2.10.4-snapshot-20251001130744

package/src/routes/campaigns/campaign-detail/components/campaign-budget/campaign-budget.tsx

@@ -25,11 +25,7 @@ export const CampaignBudget = ({ campaign }: CampaignBudgetProps) => {
             className="text-ui-fg-subtle ms-10 mt-[1.5px] font-normal"
             level="h3"
           >
-            {campaign.budget?.type === "use_by_attribute"
-              ? campaign.budget?.attribute === "customer_id"
-                ? t("campaigns.budget.fields.limitBudgetAttributeCustomer")
-                : t("campaigns.budget.fields.limitBudgetAttributeEmail")
-              : t("campaigns.fields.budget_limit")}
+            {t("campaigns.fields.budget_limit")}
           </Heading>
         </div>
 

package/src/routes/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx

@@ -19,7 +19,6 @@ import {
   currencies,
   getCurrencySymbol,
 } from "../../../../../lib/data/currencies"
-import { Combobox } from "../../../../../components/inputs/combobox"
 
 export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {
   const { t } = useTranslation()
@@ -210,19 +209,17 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {
               <Form.Control>
                 <RadioGroup
                   dir={direction}
-                  className="flex gap-x-4 gap-y-3"
+                  className="flex gap-y-3"
                   {...field}
                   onValueChange={field.onChange}
                 >
                   <RadioGroup.ChoiceBox
-                    className="flex-1"
                     value={"usage"}
                     label={t("campaigns.budget.type.usage.title")}
                     description={t("campaigns.budget.type.usage.description")}
                   />
 
                   <RadioGroup.ChoiceBox
-                    className="flex-1"
                     value={"spend"}
                     label={t("campaigns.budget.type.spend.title")}
                     description={t("campaigns.budget.type.spend.description")}
@@ -345,52 +342,6 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {
             )
           }}
         />
-
-        {!isTypeSpend && (
-          <Form.Field
-            control={form.control}
-            name={`${fieldScope}budget.attribute`}
-            render={({ field }) => {
-              return (
-                <Form.Item className="basis-1/2">
-                  <Form.Label
-                    tooltip={t(
-                      "campaigns.budget.fields.budgetAttributeTooltip"
-                    )}
-                  >
-                    {t("campaigns.budget.fields.budgetAttribute")}
-                  </Form.Label>
-
-                  <Form.Control>
-                    <Combobox
-                      key="attribute"
-                      {...field}
-                      onChange={(e) => {
-                        if (typeof e === "undefined") {
-                          field.onChange(null)
-                        } else {
-                          field.onChange(e)
-                        }
-                      }}
-                      allowClear
-                      options={[
-                        {
-                          label: t("fields.customer"),
-                          value: "customer_id",
-                        },
-                        {
-                          label: t("fields.email"),
-                          value: "customer_email",
-                        },
-                      ]}
-                    ></Combobox>
-                  </Form.Control>
-                  <Form.ErrorMessage />
-                </Form.Item>
-              )
-            }}
-          />
-        )}
       </div>
     </div>
   )

package/src/routes/campaigns/common/constants.ts

@@ -10,6 +10,5 @@ export const DEFAULT_CAMPAIGN_VALUES = {
     type: "usage" as CampaignBudgetTypeValues,
     currency_code: null,
     limit: null,
-    attribute: null,
   },
 }

package/src/routes/orders/order-create-refund/components/create-refund-form/create-refund-form.tsx

@@ -1,7 +1,14 @@
 import { zodResolver } from "@hookform/resolvers/zod"
 import { HttpTypes } from "@medusajs/types"
-import { Button, CurrencyInput, Select, Textarea, toast } from "@medusajs/ui"
-import { useMemo, useState } from "react"
+import {
+  Button,
+  CurrencyInput,
+  Label,
+  Select,
+  Textarea,
+  toast,
+} from "@medusajs/ui"
+import { useEffect, useMemo, useState } from "react"
 import { formatValue } from "react-currency-input-field"
 import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
@@ -16,6 +23,7 @@ import { formatCurrency } from "../../../../../lib/format-currency"
 import { getLocaleAmount } from "../../../../../lib/money-amount-helpers"
 import { getPaymentsFromOrder } from "../../../../../lib/orders"
 import { useDocumentDirection } from "../../../../../hooks/use-document-direction"
+import { formatProvider } from "../../../../../lib/format-provider.ts"
 
 type CreateRefundFormProps = {
   order: HttpTypes.AdminOrder
@@ -36,11 +44,12 @@ export const CreateRefundForm = ({ order }: CreateRefundFormProps) => {
   const { refund_reasons } = useRefundReasons()
 
   const [searchParams] = useSearchParams()
+  const hasPaymentIdInSearchParams = !!searchParams.get("paymentId")
   const [paymentId, setPaymentId] = useState<string | undefined>(
     searchParams.get("paymentId") || undefined
   )
   const payments = getPaymentsFromOrder(order)
-  const payment = payments.find((p) => p.id === paymentId)!
+  const payment = payments.find((p) => p.id === paymentId)
   const paymentAmount = payment?.amount || 0
 
   const currency = useMemo(
@@ -59,6 +68,23 @@ export const CreateRefundForm = ({ order }: CreateRefundFormProps) => {
     resolver: zodResolver(CreateRefundSchema),
   })
 
+  useEffect(() => {
+    const pendingDifference = order.summary.pending_difference as number
+    const paymentAmount = (payment?.amount || 0) as number
+    const pendingAmount =
+      pendingDifference < 0
+        ? Math.min(Math.abs(pendingDifference), paymentAmount)
+        : paymentAmount
+
+    const normalizedAmount =
+      pendingAmount < 0 ? pendingAmount * -1 : pendingAmount
+
+    form.setValue("amount", {
+      value: normalizedAmount.toFixed(currency.decimal_digits),
+      float: normalizedAmount,
+    })
+  }, [payment?.id || ""])
+
   const { mutateAsync, isPending } = useRefundPayment(order.id, payment?.id!)
 
   const handleSubmit = form.handleSubmit(async (data) => {
@@ -96,16 +122,69 @@ export const CreateRefundForm = ({ order }: CreateRefundFormProps) => {
       >
         <RouteDrawer.Body className="flex-1 overflow-auto">
           <div className="flex flex-col gap-y-4">
-            <div className="flex items-center">
-              <span>
-                {getLocaleAmount(
-                  payment.amount as number,
-                  payment.currency_code
-                )}
-              </span>
-              <span> - </span>
-              <span>(#{payment.id.substring(23)})</span>
-            </div>
+            {!hasPaymentIdInSearchParams && (
+              <Select
+                dir={direction}
+                value={paymentId}
+                onValueChange={(value) => {
+                  setPaymentId(value)
+                }}
+              >
+                <Label className="txt-compact-small mb-[-6px] font-sans font-medium">
+                  {t("orders.payment.selectPaymentToRefund")}
+                </Label>
+
+                <Select.Trigger>
+                  <Select.Value
+                    placeholder={t("orders.payment.selectPaymentToRefund")}
+                  />
+                </Select.Trigger>
+
+                <Select.Content>
+                  {payments.map((payment) => {
+                    const totalRefunded =
+                      payment.refunds?.reduce(
+                        (acc, next) => next.amount + acc,
+                        0
+                      ) || 0
+
+                    return (
+                      <Select.Item
+                        value={payment!.id}
+                        key={payment.id}
+                        disabled={
+                          !!payment.canceled_at ||
+                          totalRefunded >= payment.amount
+                        }
+                        className="flex items-center justify-center"
+                      >
+                        <span>
+                          {getLocaleAmount(
+                            payment.amount as number,
+                            payment.currency_code
+                          )}
+                          {" - "}
+                        </span>
+                        <span>{formatProvider(payment.provider_id)}</span>
+                        <span> - (#{payment.id.substring(23)})</span>
+                      </Select.Item>
+                    )
+                  })}
+                </Select.Content>
+              </Select>
+            )}
+            {hasPaymentIdInSearchParams && (
+              <div className="flex items-center">
+                <span>
+                  {getLocaleAmount(
+                    payment!.amount as number,
+                    payment!.currency_code
+                  )}
+                </span>
+                <span> - </span>
+                <span>(#{payment!.id.substring(23)})</span>
+              </div>
+            )}
 
             <Form.Field
               control={form.control}

package/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx

@@ -139,13 +139,6 @@ export const CreatePromotionForm = () => {
           }))
       }
 
-      if (data.campaign) {
-        data.campaign.budget.attribute = data.campaign.budget.attribute || null
-        data.campaign.budget.type = data.campaign.budget.attribute
-          ? "use_by_attribute"
-          : data.campaign.budget.type
-      }
-
       createPromotion(
         {
           ...promotionData,

package/dist/{order-detail-G3IQFZ4U.mjs → order-detail-XZKV6VOY.mjs}

@@ -2,15 +2,15 @@ import {
   By
 } from "./chunk-GXXQ33F7.mjs";
 import "./chunk-PYIO3TDQ.mjs";
-import {
-  formatProvider
-} from "./chunk-IR5DHEKS.mjs";
 import {
   formatPercentage
 } from "./chunk-4FM6S5CX.mjs";
 import {
   getLoyaltyPlugin
 } from "./chunk-AMRS4CSX.mjs";
+import {
+  formatProvider
+} from "./chunk-IR5DHEKS.mjs";
 import {
   formatCurrency
 } from "./chunk-WATKBUHQ.mjs";

package/dist/{tax-region-detail-S5R5D4KY.mjs → tax-region-detail-HNTTGBII.mjs}

@@ -20,10 +20,10 @@ import {
 import {
   useTaxRegionTableQuery
 } from "./chunk-RIV7FKGN.mjs";
+import "./chunk-4FM6S5CX.mjs";
 import {
   formatProvider
 } from "./chunk-IR5DHEKS.mjs";
-import "./chunk-4FM6S5CX.mjs";
 import "./chunk-YEDAFXMB.mjs";
 import "./chunk-HQKGZADC.mjs";
 import "./chunk-EMIHDNB7.mjs";