@medusajs/dashboard 2.12.2-snapshot-20251208134209 → 2.12.2-snapshot-20251208150616

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

@@ -402,6 +402,16 @@ export const ReturnCreateForm = ({
     return method?.total || 0
   }, [preview.shipping_methods])
 
+  /**
+   * For estimated difference show pending difference and subtract the total of inbound items (assume all items will be returned correctly)
+   * We don't include inbound total in the pending difference because it will be considered returned when the receive flow is completed
+   */
+  const estimatedDifference =
+    preview.summary.pending_difference -
+    previewItems.reduce((acc, item) => {
+      return acc + item.total
+    }, 0)
+
   return (
     <RouteFocusModal.Form
       form={form}
@@ -707,10 +717,7 @@ export const ReturnCreateForm = ({
                   {t("orders.returns.estDifference")}
                 </span>
                 <span className="txt-small font-medium">
-                  {getStylizedAmount(
-                    preview.summary.pending_difference,
-                    order.currency_code
-                  )}
+                  {getStylizedAmount(estimatedDifference, order.currency_code)}
                 </span>
               </div>
             </div>

package/src/routes/orders/order-export/components/export-filters.tsx

@@ -0,0 +1,22 @@
+import { Heading, Text } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { DataTableFilter } from "../../../../components/table/data-table/data-table-filter"
+import { useOrderTableFilters } from "../../order-list/components/order-list-table/use-order-table-filters"
+
+export const ExportFilters = () => {
+  const { t } = useTranslation()
+  const filters = useOrderTableFilters()
+
+  return (
+    <div>
+      <Heading level="h2">{t("orders.export.filters.title")}</Heading>
+      <Text size="small" className="text-ui-fg-subtle">
+        {t("orders.export.filters.description")}
+      </Text>
+
+      <div className="mt-4">
+        <DataTableFilter filters={filters} readonly />
+      </div>
+    </div>
+  )
+}

package/src/routes/orders/order-export/index.ts

@@ -0,0 +1 @@
+export { OrderExport as Component } from "./order-export"

package/src/routes/orders/order-export/order-export.tsx

@@ -0,0 +1,66 @@
+import { Button, Heading, toast } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { RouteDrawer, useRouteModal } from "../../../components/modals"
+import { useExportOrders } from "../../../hooks/api"
+import { useOrderTableQuery } from "../../../hooks/table/query"
+import { ExportFilters } from "./components/export-filters"
+
+export const OrderExport = () => {
+  const { t } = useTranslation()
+
+  return (
+    <RouteDrawer>
+      <RouteDrawer.Header>
+        <RouteDrawer.Title asChild>
+          <Heading>{t("orders.export.header")}</Heading>
+        </RouteDrawer.Title>
+        <RouteDrawer.Description className="sr-only">
+          {t("orders.export.description")}
+        </RouteDrawer.Description>
+      </RouteDrawer.Header>
+      <OrderExportContent />
+    </RouteDrawer>
+  )
+}
+
+const OrderExportContent = () => {
+  const { t } = useTranslation()
+  const { searchParams } = useOrderTableQuery({})
+
+  const { mutateAsync } = useExportOrders(searchParams)
+  const { handleSuccess } = useRouteModal()
+
+  const handleExportRequest = async () => {
+    await mutateAsync(searchParams, {
+      onSuccess: () => {
+        toast.info(t("orders.export.success.title"), {
+          description: t("orders.export.success.description"),
+        })
+        handleSuccess()
+      },
+      onError: (err) => {
+        toast.error(err.message)
+      },
+    })
+  }
+
+  return (
+    <>
+      <RouteDrawer.Body>
+        <ExportFilters />
+      </RouteDrawer.Body>
+      <RouteDrawer.Footer>
+        <div className="flex items-center gap-x-2">
+          <RouteDrawer.Close asChild>
+            <Button size="small" variant="secondary">
+              {t("actions.cancel")}
+            </Button>
+          </RouteDrawer.Close>
+          <Button onClick={handleExportRequest} size="small">
+            {t("actions.export")}
+          </Button>
+        </div>
+      </RouteDrawer.Footer>
+    </>
+  )
+}

package/src/routes/orders/order-list/components/order-list-table/order-list-table.tsx

@@ -1,15 +1,16 @@
-import { Container, Heading } from "@medusajs/ui"
+import { Button, Container, Heading } from "@medusajs/ui"
 import { keepPreviousData } from "@tanstack/react-query"
 import { useTranslation } from "react-i18next"
+import { Link, Outlet, useLocation } from "react-router-dom"
 
 import { _DataTable } from "../../../../../components/table/data-table/data-table"
 import { useOrders } from "../../../../../hooks/api/orders"
 import { useOrderTableColumns } from "../../../../../hooks/table/columns/use-order-table-columns"
-import { useOrderTableFilters } from "./use-order-table-filters"
 import { useOrderTableQuery } from "../../../../../hooks/table/query/use-order-table-query"
 import { useDataTable } from "../../../../../hooks/use-data-table"
 import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
 import { ConfigurableOrderListTable } from "./configurable-order-list-table"
+import { useOrderTableFilters } from "./use-order-table-filters"
 
 import { DEFAULT_FIELDS } from "../../const"
 
@@ -17,6 +18,7 @@ const PAGE_SIZE = 20
 
 export const OrderListTable = () => {
   const { t } = useTranslation()
+  const location = useLocation()
   const isViewConfigEnabled = useFeatureFlag("view_configurations")
 
   // If feature flag is enabled, use the new configurable table
@@ -57,6 +59,9 @@ export const OrderListTable = () => {
     <Container className="divide-y p-0">
       <div className="flex items-center justify-between px-6 py-4">
         <Heading>{t("orders.domain")}</Heading>
+        <Button size="small" variant="secondary" asChild>
+          <Link to={`export${location.search}`}>{t("actions.export")}</Link>
+        </Button>
       </div>
       <_DataTable
         columns={columns}
@@ -78,6 +83,7 @@ export const OrderListTable = () => {
           message: t("orders.list.noRecordsMessage"),
         }}
       />
+      <Outlet />
     </Container>
   )
 }

package/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-products-form.tsx

@@ -109,6 +109,7 @@ export const PriceListProductsForm = ({ form }: PriceListProductsFormProps) => {
       updater,
     },
     pageSize: PAGE_SIZE,
+    prefix: PREFIX,
   })
 
   if (isError) {

package/dist/{chunk-ACJ3PPQJ.mjs → chunk-2QH2TBJ2.mjs}

@@ -5,12 +5,12 @@ import {
   _DataTable,
   useDataTable
 } from "./chunk-YTN73JYH.mjs";
-import {
-  useCustomerGroupTableQuery
-} from "./chunk-MOSRJHJ3.mjs";
 import {
   useCustomerGroupTableFilters
 } from "./chunk-DLZWPHHO.mjs";
+import {
+  useCustomerGroupTableQuery
+} from "./chunk-MOSRJHJ3.mjs";
 import {
   StackedDrawer,
   StackedFocusModal

package/dist/{customer-group-add-customers-QU4Q56SS.mjs → customer-group-add-customers-2Y2GVCDV.mjs}

@@ -11,12 +11,12 @@ import {
 } from "./chunk-YTN73JYH.mjs";
 import "./chunk-HQKGZADC.mjs";
 import "./chunk-EMIHDNB7.mjs";
-import {
-  useCustomerTableQuery
-} from "./chunk-WRSGHGAT.mjs";
 import {
   useCustomerTableFilters
 } from "./chunk-6OU4CHZI.mjs";
+import {
+  useCustomerTableQuery
+} from "./chunk-WRSGHGAT.mjs";
 import "./chunk-GU5PJRPM.mjs";
 import "./chunk-C76H5USB.mjs";
 import "./chunk-DZWH2RV6.mjs";

package/dist/{customer-list-ZXCGIXJC.mjs → customer-list-TG4D4QOT.mjs}

@@ -11,12 +11,12 @@ import {
 } from "./chunk-YTN73JYH.mjs";
 import "./chunk-HQKGZADC.mjs";
 import "./chunk-EMIHDNB7.mjs";
-import {
-  useCustomerTableQuery
-} from "./chunk-WRSGHGAT.mjs";
 import {
   useCustomerTableFilters
 } from "./chunk-6OU4CHZI.mjs";
+import {
+  useCustomerTableQuery
+} from "./chunk-WRSGHGAT.mjs";
 import "./chunk-GU5PJRPM.mjs";
 import {
   SingleColumnPage

package/dist/{location-service-zone-shipping-option-edit-TTVV3BSV.mjs → location-service-zone-shipping-option-edit-LXZ77VD7.mjs}

@@ -1,12 +1,12 @@
+import {
+  isOptionEnabledInStore
+} from "./chunk-UC26CCHZ.mjs";
 import {
   ShippingOptionPriceType
 } from "./chunk-PYIO3TDQ.mjs";
 import {
   formatProvider
 } from "./chunk-IR5DHEKS.mjs";
-import {
-  isOptionEnabledInStore
-} from "./chunk-UC26CCHZ.mjs";
 import {
   useComboboxData
 } from "./chunk-3TZOFKX2.mjs";

package/dist/{product-type-list-QX7QC6RI.mjs → product-type-list-7WQ5D2KV.mjs}

@@ -14,13 +14,13 @@ import {
 } from "./chunk-YTN73JYH.mjs";
 import "./chunk-HQKGZADC.mjs";
 import "./chunk-EMIHDNB7.mjs";
-import {
-  useProductTypeTableQuery
-} from "./chunk-TDK3JDOB.mjs";
 import {
   useProductTypeTableFilters
 } from "./chunk-CBSCX7RE.mjs";
 import "./chunk-W7625H47.mjs";
+import {
+  useProductTypeTableQuery
+} from "./chunk-TDK3JDOB.mjs";
 import "./chunk-GU5PJRPM.mjs";
 import {
   SingleColumnPage

package/dist/{region-list-XQRIBDMF.mjs → region-list-JAQXIBYD.mjs}

@@ -11,12 +11,12 @@ import {
 } from "./chunk-YTN73JYH.mjs";
 import "./chunk-HQKGZADC.mjs";
 import "./chunk-EMIHDNB7.mjs";
-import {
-  useRegionTableQuery
-} from "./chunk-XR4GEMGR.mjs";
 import {
   useRegionTableFilters
 } from "./chunk-LT4MVCA7.mjs";
+import {
+  useRegionTableQuery
+} from "./chunk-XR4GEMGR.mjs";
 import "./chunk-GU5PJRPM.mjs";
 import {
   SingleColumnPage