Merge branch 'master' into develop

packages/medusa/src/api/routes/admin/currencies/update-currency.ts

@@ -6,7 +6,7 @@ import { FeatureFlagDecorators } from "../../../../utils/feature-flag-decorators
 import TaxInclusivePricingFeatureFlag from "../../../../loaders/feature-flags/tax-inclusive-pricing"
 
 /**
- * @oas [post] /currencies/:code
+ * @oas [post] /currencies/{code}
  * operationId: "PostCurrenciesCurrency"
  * summary: "Update a Currency"
  * description: "Update a Currency"
@@ -20,7 +20,7 @@ import TaxInclusivePricingFeatureFlag from "../../../../loaders/feature-flags/ta
  *         properties:
  *           includes_tax:
  *             type: boolean
- *             description: [EXPERIMENTAL] Tax included in prices of currency.
+ *             description: "[EXPERIMENTAL] Tax included in prices of currency."
  * tags:
  *   - Currency
  * responses:

packages/medusa/src/api/routes/admin/regions/update-region.ts

@@ -51,7 +51,7 @@ import { validator } from "../../../../utils/validator"
  *           tax_rate:
  *             description: "The tax rate to use on Orders in the Region."
  *             type: number
- *          includes_tax:
+ *           includes_tax:
  *             description: "[EXPERIMENTAL] Tax included in prices of region"
  *             type: boolean
  *           payment_providers:

packages/medusa/src/api/routes/admin/uploads/create-upload.ts

@@ -3,8 +3,8 @@ import fs from "fs"
 /**
  * @oas [post] /uploads
  * operationId: "PostUploads"
- * summary: "Upload a file"
- * description: "Uploads a file to the specific fileservice that is installed in Medusa."
+ * summary: "Upload files"
+ * description: "Uploads at least one file to the specific fileservice that is installed in Medusa."
  * x-authenticated: true
  * requestBody:
  *   content:
@@ -32,7 +32,8 @@ import fs from "fs"
  *       curl --location --request POST 'https://medusa-url.com/admin/uploads' \
  *       --header 'Authorization: Bearer {api_token}' \
  *       --header 'Content-Type: image/jpeg' \
- *       --data-binary '{file_path}'
+ *       --form 'files=@"<FILE_PATH_1>"' \
+ *       --form 'files=@"<FILE_PATH_1>"'
  * security:
  *   - api_token: []
  *   - cookie_auth: []

packages/medusa/src/api/routes/admin/users/delete-user.ts

@@ -29,7 +29,7 @@ import UserService from "../../../../services/user"
  *   - api_token: []
  *   - cookie_auth: []
  * tags:
- *   - Users
+ *   - User
  * responses:
  *   200:
  *     description: OK

packages/medusa/src/api/routes/store/customers/list-orders.ts

@@ -57,7 +57,16 @@ import { Type } from "class-transformer"
  *   - (query) cart_id {string} to search for.
  *   - (query) email {string} to search for.
  *   - (query) region_id {string} to search for.
- *   - (query) currency_code {string} to search for.
+ *   - in: query
+ *     name: currency_code
+ *     style: form
+ *     explode: false
+ *     description: The 3 character ISO currency code to set prices based on.
+ *     schema:
+ *       type: string
+ *       externalDocs:
+ *         url: https://en.wikipedia.org/wiki/ISO_4217#Active_codes
+ *         description: See a list of codes.
  *   - (query) tax_rate {string} to search for.
  *   - in: query
  *     name: created_at

packages/medusa/src/api/routes/store/products/get-product.ts

@@ -15,6 +15,18 @@ import { validator } from "../../../../utils/validator"
  * description: "Retrieves a Product."
  * parameters:
  *   - (path) id=* {string} The id of the Product.
+ *   - (query) cart_id {string} The ID of the customer's cart.
+ *   - (query) region_id {string} The ID of the region the customer is using. This is helpful to ensure correct prices are retrieved for a region.
+ *   - in: query
+ *     name: currency_code
+ *     style: form
+ *     explode: false
+ *     description: The 3 character ISO currency code to set prices based on. This is helpful to ensure correct prices are retrieved for a currency.
+ *     schema:
+ *       type: string
+ *       externalDocs:
+ *         url: https://en.wikipedia.org/wiki/ISO_4217#Active_codes
+ *         description: See a list of codes.
  * x-codeSamples:
  *   - lang: JavaScript
  *     label: JS Client

packages/medusa/src/models/custom-shipping-option.ts

@@ -92,7 +92,7 @@ export class CustomShippingOption extends SoftDeletableEntity {
  *     type: object
  *     description: An optional key-value map with additional details
  *     example: {car: "white"}
- *  includes_tax:
+ *   includes_tax:
  *     description: "[EXPERIMENTAL] Indicates if the custom shipping option price include tax"
  *     type: boolean
  */

packages/medusa/src/models/order-edit.ts

@@ -98,7 +98,7 @@ export class OrderEdit extends SoftDeletableEntity {
  *     type: array
  *     description: Line item changes array.
  *     items:
- *       $ref: "#/components/schemas/order_item_changes"
+ *       $ref: "#/components/schemas/order_item_change"
  *   internal_note:
  *     description: "An optional note with additional details about the order edit."
  *     type: string

packages/medusa/src/models/order.ts

@@ -449,7 +449,7 @@ export class Order extends BaseEntity {
  *       $ref: "#/components/schemas/line_item"
  *   edits:
  *     type: array
- *     description: [EXPERIMENTAL] Order edits done on the order. Available if the relation `edits` is expanded.
+ *     description: "[EXPERIMENTAL] Order edits done on the order. Available if the relation `edits` is expanded."
  *     items:
  *       $ref: "#/components/schemas/order_edit"
  *   gift_card_transactions:

packages/medusa/src/models/price-list.ts

@@ -122,8 +122,9 @@ export class PriceList extends SoftDeletableEntity {
  *     description: The Money Amounts that are associated with the Price List. Available if the relation `prices` is expanded.
  *     type: array
  *     items:
- *       $ref: "#/components/schemas/money_amount"
- *       $ref: "#/components/schemas/customer_group"
+ *       oneOf:
+ *         - $ref: "#/components/schemas/money_amount"
+ *         - $ref: "#/components/schemas/customer_group"
  *   includes_tax:
  *     description: "[EXPERIMENTAL] Does the price list prices include tax"
  *     type: boolean