Merge branch 'develop' into feat/custom-line-item-price

medusajs · Dec 18, 2024 · cd645db · cd645db
2 parents e5feb06 + bde4b82
commit cd645db
Show file tree

Hide file tree

Showing 252 changed files with 228,933 additions and 159,726 deletions.
diff --git a/.changeset/little-books-think.md b/.changeset/little-books-think.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/types": patch
+---
+
+Add description and Label to FilterableRefundReasonProps
diff --git a/.changeset/wet-queens-deliver.md b/.changeset/wet-queens-deliver.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/core-flows": patch
+---
+
+fix(core-flows): export getItemTaxLinesStep
diff --git a/integration-tests/modules/__tests__/order/order.spec.ts b/integration-tests/modules/__tests__/order/order.spec.ts
@@ -30,6 +30,9 @@ medusaIntegrationTestRunner({
         const created = await orderModule.createOrders({
           region_id: "test_region_id",
           email: "[email protected]",
+          metadata: {
+            foo: "bar",
+          },
           items: [
             {
               title: "Custom Item 2",
@@ -108,6 +111,9 @@ medusaIntegrationTestRunner({
           payment_status: "not_paid",
           region_id: "test_region_id",
           fulfillments: [],
+          metadata: {
+            foo: "bar",
+          },
           fulfillment_status: "not_fulfilled",
           summary: expect.objectContaining({
             // TODO: add all summary fields

diff --git a/packages/admin/dashboard/src/hooks/api/fulfillment-providers.tsx b/packages/admin/dashboard/src/hooks/api/fulfillment-providers.tsx
@@ -9,6 +9,12 @@ export const fulfillmentProvidersQueryKeys = queryKeysFactory(
   FULFILLMENT_PROVIDERS_QUERY_KEY
 )
 
+const FULFILLMENT_PROVIDER_OPTIONS_QUERY_KEY =
+  "fulfillment_provider_options" as const
+export const fulfillmentProviderOptionsQueryKeys = queryKeysFactory(
+  FULFILLMENT_PROVIDER_OPTIONS_QUERY_KEY
+)
+
 export const useFulfillmentProviders = (
   query?: HttpTypes.AdminFulfillmentProviderListParams,
   options?: Omit<
@@ -29,3 +35,25 @@ export const useFulfillmentProviders = (
 
   return { ...data, ...rest }
 }
+
+export const useFulfillmentProviderOptions = (
+  providerId: string,
+  options?: Omit<
+    UseQueryOptions<
+      HttpTypes.AdminFulfillmentProviderOptionsListResponse,
+      FetchError,
+      HttpTypes.AdminFulfillmentProviderOptionsListResponse,
+      QueryKey
+    >,
+    "queryFn" | "queryKey"
+  >
+) => {
+  const { data, ...rest } = useQuery({
+    queryFn: () =>
+      sdk.admin.fulfillmentProvider.listFulfillmentOptions(providerId),
+    queryKey: fulfillmentProviderOptionsQueryKeys.list(providerId),
+    ...options,
+  })
+
+  return { ...data, ...rest }
+}
diff --git a/packages/admin/dashboard/src/hooks/use-combobox-data.tsx b/packages/admin/dashboard/src/hooks/use-combobox-data.tsx
@@ -20,7 +20,7 @@ type ComboboxQueryParams = {
 
 export const useComboboxData = <
   TResponse extends ComboboxExternalData,
-  TParams extends ComboboxQueryParams
+  TParams extends ComboboxQueryParams,
 >({
   queryKey,
   queryFn,
@@ -50,7 +50,6 @@ export const useComboboxData = <
     enabled: !!defaultValue,
   })
 
-
   const { data, ...rest } = useInfiniteQuery({
     queryKey: [...queryKey, query],
     queryFn: async ({ pageParam = 0 }) => {