Merge branch 'develop' into fix/partial-fulfillment-reservations

.github/actions/setup-server/action.yml

@@ -31,7 +31,7 @@ runs:
 
     - name: Install dev cli
       shell: "bash"
-      run: sudo npm i -g medusa-dev-cli
+      run: sudo npm i -g medusa-dev-cli@preview
 
     - name: Set path to medusa repo
       shell: "bash"

packages/core/js-sdk/src/admin/payment-collection.ts

@@ -14,33 +14,6 @@ export class PaymentCollection {
     this.client = client
   }
 
-  async list(
-    query?: HttpTypes.AdminPaymentCollectionFilters,
-    headers?: ClientHeaders
-  ) {
-    return await this.client.fetch<HttpTypes.AdminPaymentCollectionsResponse>(
-      `/admin/payment-collections`,
-      {
-        query,
-        headers,
-      }
-    )
-  }
-
-  async retrieve(
-    id: string,
-    query?: HttpTypes.AdminPaymentCollectionFilters,
-    headers?: ClientHeaders
-  ) {
-    return await this.client.fetch<HttpTypes.AdminPaymentCollectionResponse>(
-      `/admin/payment-collections/${id}`,
-      {
-        query,
-        headers,
-      }
-    )
-  }
-
   async create(
     body: HttpTypes.AdminCreatePaymentCollection,
     query?: SelectParams,

www/apps/api-reference/package.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "@mdx-js/loader": "^3.0.0",
     "@mdx-js/react": "^3.0.0",
-    "@medusajs/icons": "preview",
+    "@medusajs/icons": "^2.0.0",
     "@medusajs/ui": "^3.0.0",
     "@next/mdx": "14.2.14",
     "@react-hook/resize-observer": "^2.0.2",

www/apps/api-reference/specs/admin/components/schemas/AdminApiKey.yaml

@@ -10,8 +10,10 @@ required:
   - last_used_at
   - created_by
   - created_at
+  - updated_at
   - revoked_by
   - revoked_at
+  - deleted_at
 properties:
   id:
     type: string
@@ -65,3 +67,13 @@ properties:
       The date and time the API key was revoked. The API key is considered
       revoked when this property is set.
     format: date-time
+  updated_at:
+    type: string
+    format: date-time
+    title: updated_at
+    description: The date the API key was updated.
+  deleted_at:
+    type: string
+    format: date-time
+    title: deleted_at
+    description: The date the API key was deleted.

www/apps/api-reference/specs/admin/components/schemas/AdminCampaign.yaml

@@ -10,6 +10,9 @@ required:
   - starts_at
   - ends_at
   - budget
+  - created_at
+  - updated_at
+  - deleted_at
 properties:
   id:
     type: string
@@ -79,3 +82,18 @@ properties:
           property holds the total amount discounted so far. If the limit is
           `usage`, it holds the number of times the campaign's promotions have
           been used so far.
+  created_at:
+    type: string
+    format: date-time
+    title: created_at
+    description: The date the campaign was created.
+  updated_at:
+    type: string
+    format: date-time
+    title: updated_at
+    description: The date the campaign was updated.
+  deleted_at:
+    type: string
+    format: date-time
+    title: deleted_at
+    description: The date the campaign was deleted.

www/apps/api-reference/specs/admin/components/schemas/AdminCollection.yaml

@@ -41,7 +41,7 @@ properties:
     type: array
     description: The collection's products.
     items:
-      type: object
+      $ref: ./BaseProduct.yaml
   metadata:
     type: object
     description: The collection's metadata, used to store custom key-value pairs.

www/apps/api-reference/specs/admin/components/schemas/AdminCreateProduct.yaml

@@ -146,3 +146,7 @@ properties:
   metadata:
     type: object
     description: The product's metadata, used to store custom key-value pairs.
+  external_id:
+    type: string
+    title: external_id
+    description: The ID of the product in an external or third-party system.

www/apps/api-reference/specs/admin/components/schemas/AdminPromotion.yaml

@@ -3,6 +3,9 @@ description: The promotion's details.
 x-schemaName: AdminPromotion
 required:
   - id
+  - created_at
+  - updated_at
+  - deleted_at
 properties:
   application_method:
     type: object
@@ -38,3 +41,18 @@ properties:
     description: The ID of the campaign this promotion belongs to.
   campaign:
     $ref: ./AdminCampaign.yaml
+  created_at:
+    type: string
+    format: date-time
+    title: created_at
+    description: The date the promotion was created.
+  updated_at:
+    type: string
+    format: date-time
+    title: updated_at
+    description: The date the promotion was updated.
+  deleted_at:
+    type: string
+    format: date-time
+    title: deleted_at
+    description: The date the promotion was deleted.

www/apps/api-reference/specs/admin/components/schemas/AdminUpdateProduct.yaml

@@ -147,3 +147,7 @@ properties:
   metadata:
     type: object
     description: The product's metadata, can hold custom key-value pairs.
+  external_id:
+    type: string
+    title: external_id
+    description: The ID of the product in an external or third-party system.

www/apps/api-reference/specs/admin/components/schemas/BaseCollection.yaml

@@ -41,7 +41,7 @@ properties:
     type: array
     description: The collection's products.
     items:
-      $ref: ./AdminProduct.yaml
+      type: object
   metadata:
     type: object
     description: The collection's metadata, used to store custom key-value pairs.

www/apps/api-reference/specs/admin/components/schemas/BaseProduct.yaml

@@ -1,5 +1,5 @@
 type: object
-description: The parent's product.
+description: The product's details.
 x-schemaName: BaseProduct
 required:
   - id
@@ -52,7 +52,7 @@ properties:
   is_giftcard:
     type: boolean
     title: is_giftcard
-    description: The product's is giftcard.
+    description: Whether the product is a gift card.
   status:
     type: string
     description: The product's status.
@@ -64,7 +64,7 @@ properties:
   thumbnail:
     type: string
     title: thumbnail
-    description: The product's thumbnail.
+    description: The product's thumbnail URL.
   width:
     type: number
     title: width
@@ -102,18 +102,18 @@ properties:
   collection_id:
     type: string
     title: collection_id
-    description: The product's collection id.
+    description: The ID of the collection the product belongs to.
   categories:
     type: array
     description: The product's categories.
     items:
       $ref: ./BaseProductCategory.yaml
   type:
-    type: object
+    $ref: ./BaseProductType.yaml
   type_id:
     type: string
     title: type_id
-    description: The product's type id.
+    description: The ID of the type the product belongs to.
   tags:
     type: array
     description: The product's tags.
@@ -137,26 +137,26 @@ properties:
   discountable:
     type: boolean
     title: discountable
-    description: The product's discountable.
+    description: Whether the product is discountable.
   external_id:
     type: string
     title: external_id
-    description: The product's external id.
+    description: The ID of the product in an external or third-party system.
   created_at:
     type: string
     format: date-time
     title: created_at
-    description: The product's created at.
+    description: The date the product was created.
   updated_at:
     type: string
     format: date-time
     title: updated_at
-    description: The product's updated at.
+    description: The date the product was updated.
   deleted_at:
     type: string
     format: date-time
     title: deleted_at
-    description: The product's deleted at.
+    description: The date the product was deleted.
   metadata:
     type: object
-    description: The product's metadata.
+    description: The product's metadata, can hold custom key-value pairs.

www/apps/api-reference/specs/admin/components/schemas/BaseProductType.yaml

@@ -0,0 +1,35 @@
+type: object
+description: The product type's details.
+x-schemaName: BaseProductType
+required:
+  - id
+  - value
+  - created_at
+  - updated_at
+properties:
+  id:
+    type: string
+    title: id
+    description: The type's ID.
+  value:
+    type: string
+    title: value
+    description: The type's value.
+  created_at:
+    type: string
+    format: date-time
+    title: created_at
+    description: The date the type was created.
+  updated_at:
+    type: string
+    format: date-time
+    title: updated_at
+    description: The date the type was updated.
+  deleted_at:
+    type: string
+    format: date-time
+    title: deleted_at
+    description: The date the type was deleted.
+  metadata:
+    type: object
+    description: The type's metadata, can hold custom key-value pairs.

www/apps/api-reference/specs/admin/components/schemas/StoreCartShippingOption.yaml

@@ -0,0 +1,94 @@
+type: object
+description: The shipping option's details.
+x-schemaName: StoreCartShippingOption
+required:
+  - id
+  - name
+  - price_type
+  - service_zone_id
+  - shipping_profile_id
+  - provider_id
+  - data
+  - type
+  - provider
+  - amount
+properties:
+  id:
+    type: string
+    title: id
+    description: The shipping option's ID.
+  name:
+    type: string
+    title: name
+    description: The shipping option's name.
+  price_type:
+    type: string
+    description: >-
+      The shipping option's price type. If it's `flat`, the price is fixed and
+      is set in the `prices` property. If it's `calculated`, the price is
+      calculated on checkout by the associated fulfillment provider.
+    enum:
+      - flat
+      - calculated
+  service_zone_id:
+    type: string
+    title: service_zone_id
+    description: The ID of the service zone the shipping option belongs to.
+  provider_id:
+    type: string
+    title: provider_id
+    description: The ID of the fulfillment provider handling this option.
+  provider:
+    type: object
+    description: The fulfillment provider's details.
+    required:
+      - id
+      - is_enabled
+    properties:
+      id:
+        type: string
+        title: id
+        description: The provider's ID.
+      is_enabled:
+        type: boolean
+        title: is_enabled
+        description: Whether the provider is enabled.
+  type:
+    type: object
+    description: The shipping option type's details.
+    required:
+      - id
+      - label
+      - description
+      - code
+    properties:
+      id:
+        type: string
+        title: id
+        description: The type's ID.
+      label:
+        type: string
+        title: label
+        description: The type's label.
+      description:
+        type: string
+        title: description
+        description: The type's description.
+      code:
+        type: string
+        title: code
+        description: The type's code.
+  shipping_profile_id:
+    type: string
+    title: shipping_profile_id
+    description: The ID of the associated shipping profile.
+  amount:
+    type: number
+    title: amount
+    description: The shipping option's amount.
+  data:
+    type: object
+    description: The shipping option's data, useful for the provider handling fulfillment.
+    externalDocs:
+      url: >-
+        https://docs.medusajs.com/v2/resources/commerce-modules/fulfillment/shipping-option#data-property