From c510ac3883f0ffaf6d2e456ee935135ea1e911fc Mon Sep 17 00:00:00 2001 From: Valentin Dellangela <43359039+valentindellangela@users.noreply.github.com> Date: Tue, 21 Mar 2023 06:04:19 +1100 Subject: [PATCH 01/12] fix(checkout): CHECKOUT-7328 Update discounted_amount description (#1186) Co-authored-by: Traci Porter Co-authored-by: Mark Murphy --- reference/carts.sf.yml | 2 +- reference/carts.v3.yml | 2 +- reference/checkouts.sf.yml | 2 +- reference/checkouts.v3.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reference/carts.sf.yml b/reference/carts.sf.yml index 5ddb7bcea..e646ac5cb 100644 --- a/reference/carts.sf.yml +++ b/reference/carts.sf.yml @@ -396,7 +396,7 @@ components: description: 'Cost of cart’s contents, before applying discounts.' discountAmount: type: number - description: Discounted amount. + description: Order based discounted amount only - Coupon discounts and product based discounts are excluded. format: float cartAmount: type: number diff --git a/reference/carts.v3.yml b/reference/carts.v3.yml index 27152a0ae..4b611a6ef 100644 --- a/reference/carts.v3.yml +++ b/reference/carts.v3.yml @@ -1324,7 +1324,7 @@ components: description: 'Sum of cart line-item amounts before cart-level discounts, coupons, or taxes.' discount_amount: type: number - description: Discounted amount. + description: Order-based discounted amount only - Excludes coupon discounts and product-based discounts. cart_amount: type: number description: Sum of cart line-item amounts minus cart-level discounts and coupons. This amount includes taxes (where applicable). diff --git a/reference/checkouts.sf.yml b/reference/checkouts.sf.yml index d5bfbcfcc..e10feecc3 100644 --- a/reference/checkouts.sf.yml +++ b/reference/checkouts.sf.yml @@ -2725,7 +2725,7 @@ components: format: double discountAmount: type: number - description: Discounted amount. + description: Order-based discounted amount only - Excludes coupon discounts and product-based discounts. format: double cartAmount: type: number diff --git a/reference/checkouts.v3.yml b/reference/checkouts.v3.yml index 1288eaaf4..9b9abd3f7 100644 --- a/reference/checkouts.v3.yml +++ b/reference/checkouts.v3.yml @@ -7846,7 +7846,7 @@ components: description: ID of channel discount_amount: type: number - description: Discounted amount. + description: Order-based discounted amount only - Excludes coupon discounts and product-based discounts. format: double example: 0.5 cart_amount_inc_tax: From a92aff71a1fd6f44436b32deeaedab53ba450fe4 Mon Sep 17 00:00:00 2001 From: Traci Porter Date: Tue, 21 Mar 2023 15:08:13 -0500 Subject: [PATCH 02/12] DEVDOCS-4633: [revise] Storefront Customers, update schema (#1125) * DEVDOCS-4633 * DEVDOCS-4575: [update] Catalog V3 API, update request response schemas (#1101) Co-authored-by: Tina Gomez Co-authored-by: Sarah Riehl --------- Co-authored-by: bc-andreadao <96258747+bc-andreadao@users.noreply.github.com> Co-authored-by: Tina Gomez Co-authored-by: Sarah Riehl --- reference/catalog.v3.yml | 19 +++++++++++++++++-- reference/customers.sf.yml | 13 +++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/reference/catalog.v3.yml b/reference/catalog.v3.yml index 35541a8a5..db67cc99f 100644 --- a/reference/catalog.v3.yml +++ b/reference/catalog.v3.yml @@ -10270,7 +10270,6 @@ paths: meta: title: Meta type: object - properties: {} description: Empty meta object; may be used later. example: data: @@ -14527,7 +14526,23 @@ paths: data: $ref: '#/components/schemas/metafield_Full' meta: - $ref: '#/components/schemas/metaEmpty_Full' + title: Meta + type: object + properties: {} + description: Empty meta object; may be used later. + example: + data: + id: 4 + key: location_id + value: 'Shelf 3, Bin 5' + namespace: App Namespace + permission_set: app_only + resource_type: brand + resource_id: 137 + description: Where products are located + date_created: '2021-08-06T19:15:35+00:00' + date_modified: '2021-08-06T19:15:35+00:00' + meta: {} examples: example-1: value: diff --git a/reference/customers.sf.yml b/reference/customers.sf.yml index 120f095d1..f27d2ec65 100644 --- a/reference/customers.sf.yml +++ b/reference/customers.sf.yml @@ -86,9 +86,18 @@ components: CustomFields: title: CustomFields type: object + x-internal: false properties: fieldId: type: string fieldValue: - type: string - x-internal: false + oneOf: + - type: string + - type: number + - type: array + items: + type: string +x-stoplight: + docs: + includeDownloadLink: false + showModels: false From e2d2fd47d529c42abff73bc8c47fbc23ac64d68c Mon Sep 17 00:00:00 2001 From: Tina Gomez <94003415+bc-tgomez@users.noreply.github.com> Date: Tue, 21 Mar 2023 15:51:26 -0500 Subject: [PATCH 03/12] DEVDOCS-4800: [update] OrdersV2, update custom form fields for billing and shipping (#1215) * docs(orders): DEVDOCS-4800 allow updating billing address & shipping address custom form fields in Orders v2 API (#1177) * Change example names and moved reference out of GET * Update reference/orders.v2.oas2.yml Incorporate peer review feedback * Fix merge conflicts * Remove orderShippingAddress_Resp examples * Fix problems with grammar in doc * Update form fields schema example * Rebase with BOPIS, Checkout, and OrdersV2 * DEVDOCS-4651: [new] SF Checkout, Checkout V3, & Orders V2 endpoints, incorporate BOPIS (#1209) * links for abandoned carts * changed Abandoned Cart Emails * changed carts V3 and catalog V3 * changed Channels * changed checkouts * changed currencies * changed custom template associations * changed customers * changed customers V3 * changed email templates * changed geography * changed marketing * changed orders v2 * changed orders v3 * changed pages v3 * changed payment methods * changed payment processing * changed price lists * changed redirects * changed scripts * changed settings and shipping * changed shipping V3 * changed sites * changed store content * changed store information * changed store logs * changed subscribers * changed tax classes * changed tax properties * changed tax settings * changes tax connection * changed themes * edited themes * changed webhooks * changed widgets * changed wishlists * changed carts SF * changed checkouts SF * changed consent SF * changed customers SF * changed form fields SF * changed orders SF * changed pricing * changed subscriptions SF * changed Tax Provider API * changed Shipping Provider API, fixed Tax Provider API * changed Current Customer * changed Customer Login * DEVDOCS-4568: [update] Remove negative numbers (#1043) * DEVDOCS-4568: [revise open PR] Align dst_offset (#1054) * scripts, verify name of checkout content scope, ancillary * debug store_content * debug currencies * checkouts, remove duplicate key * put openapi versions in quotes * wishlists add to info field * tax settings, update name of api key * all, add description of API gateway * tax provider, remove quotes * update tax_properties API Key name * DEVDOCS-4605: [update] Payments, add bigpay_token 2 (#1066) * reorder security section * ace, param sh-a-ct * ac, param sh-a-ct * ac rearrange * ac typos * carts v3 tos, contact * cv3, param sh-a-ct * catalog tos, contact * chv3, rearrange * DEVDOCS-4575: [update] Catalog V3 API, update request response schemas (#1101) * style * add path variables * terms of service, file order * terms of service * remove request runner * remove duplicate auth section * storefront tokens move auth section * remove request runner * add v2 and v3 to rates * add paths * remove store_hash path parameter from all endpoints. * cleaned up some store_hash and x-stoplight artifacts * empty parameters type error after store_hash deletes * remove ''s and ''t syntax errors * add description to store hash * add description to storefront url store domain * add description to app api app_domain * move orders file front matter to front * price lists -- add header parameters, fix typos * wishlists & widgets, parameter cleanup * tax settings, reorganize, add header parameters * themes parameters * tax properties spacing and schemas * tax classes, quote endpoints, parameters * subscribers, parameters, spaces * storefront tokens, add header parameters * sites, add header parameters * store content, add header parameters * tax provider connection, add header parameters * shipping v2, add header parameters * scripts, add header parameters * redirects, add header parameters * payment methods, add header parameters * orders v3, add info, header parameters * marketing, add info, header parameters * customers, add info, header parameters * channels, add header parameters * payment processing, add header parameters, revise security schemes * orders v2. SHE LINTS. * catalog, add header parameters, debug * (no ticket): [tools] MDX linter, create + add github action (#1150) * tax provider, change oas 3.1 --> 3.0.3, lint null object * tax rates & zone, oas 3.1 --> 3.0.3, remove oas 3.1 feature * convert .md to .mdx * channels, update image paths * DEVDOCS-4719: [migrate] Settings, Customer Login, revise linter * DEVDOCS-4719: [migrate] Stoplight links (#1156) * DEVDOCS-4719: [migrate] remove x-stoplight (#1157) * correct current customer path * update current_customer per Slack * shipping version quotes * updated meta object in Carts V3 * meta updates in carts.v3 file * DEVDOCS-4719: [migrate] Shipping V3, remove truly redundant examples (#1162) * DEVDOCS-4719: [migrate] Many, give meta objects properties (#1158) * DEVDOCS-4719: [migrate] Handle callouts (#1164) * DEVDOCS-4719: [migrate] Many, add array items (#1160) * DEVDOCS-4719: [migrate] Many, add object properties (#1161) * DEVDOCS-4719: [migrate] response bodies (#1165) * (no ticket): [migrate] Many, resolve errors * (no ticket): [migrate] Carts SF, re-lint * (no ticket): [revise] Customers SF, Standardize create a customer summary (#1176) * DEVDOCS-4719: [migrate] Catalog V3, fix request body not rendering (#1163) * DEVDOCS-4719: [migrate] Catalog V3, rendering issues (#1166) * DEVDOCS-4719: [migrate] Many, update additionalProperties (#1174) * (no ticket): [remove] Catalog V3, generic catalog tag (#1180) See also PR #1175 * apostrophes * DEVDOCS-4719: [migrate] Email Templates and Custom Template Associations, migrate syntax (#1181) * DEVDOCS-4719: [migrate] Email templates, unify (#1188) * remove ambiguous hyphen * DEVDOCS-4719: [migrate] Webhook schemas (#1189) * Change 'description' to 'properties' within store_cart_created.yml (#1191) * DEVDOCS-4719: [migrate] Price Lists V3 API, remove content type header from GET (#1187) * DEVDOCS-4719 [migrate] Orders, summary/table cleanup (#1185) * DEVDOCS-4719: [migrate] Tax V3 API, rendering (#1183) * DEVDOCS-4719: [migrate] Tax Provider API, request example rendering (#1195) * DEVDOCS-4719: [migrate] Shipping provider API, move example (#1194) * move response example for Request Rates * change example names * DEVDOCS-4719: [migrate] Tax APIs (#1196) * DEVDOCS-4719: [migrate] Shipping APIs, move example (#1197) * DEVDOCS-4719: [migrate] Carts SF & V3, rendering-based changes (#1199) * change auth docs links (#1202) * Migrate links #1 (#1204) * available-apis, storefront-graphql * storefront carts * carts v3 * catalog * channels * sf checkouts * sf carts, change links to sf from v3 * checkouts v3 * sf consent * currencies * wishlists * widgets * webhooks * tax provider * customers v2 * shipping v2 * customers v3 * orders v2 * payment processing * add tags to email templates and custom template associations (#1206) * Migrate links #2 (#1207) * incorporate BOPIS changes, SF checkouts * incorporate BOPIS changes, checkouts V3 * incorporate BOPIS changes, orders V2 * incorporate BOPIS changes * manual resolution commits * fix incorrect casing for pickup method id field * copyedit description * fix(checkout): CHECKOUT-7328 Update discounted_amount description (#1186) * docs(orders): DEVDOCS-4800 allow updating billing address & shipping address custom form fields in Orders v2 API Co-authored-by: bc-andreadao <96258747+bc-andreadao@users.noreply.github.com> Co-authored-by: Traci Porter Co-authored-by: Sarah Riehl Co-authored-by: Tina Gomez Co-authored-by: Matthew Volk Co-authored-by: stanzikratelbc <108146487+stanzikratelbc@users.noreply.github.com> Co-authored-by: Nate Stewart Co-authored-by: Tina Gomez <94003415+bc-tgomez@users.noreply.github.com> Co-authored-by: Valentin Dellangela <43359039+valentindellangela@users.noreply.github.com> Co-authored-by: Donald Nguyen * Remove duplicate consignment from Order_Put --- reference/orders.v2.oas2.yml | 212 +++++++++++++++++++++++------------ 1 file changed, 142 insertions(+), 70 deletions(-) diff --git a/reference/orders.v2.oas2.yml b/reference/orders.v2.oas2.yml index b09823d6e..99b6a1515 100644 --- a/reference/orders.v2.oas2.yml +++ b/reference/orders.v2.oas2.yml @@ -4,30 +4,30 @@ info: title: Orders V2 description: |- Manage order coupons, messages, products, shipping addresses, statuses, taxes, shipments, and shipping address quotes. - + ## Order - + The Order object contains a record of the purchase agreement between a shopper and a merchant. To learn more about creating orders, see [Orders API Guide](/api-docs/orders/orders-api-overview). - + ### Currency Fields - + The **default** currency refers to the transactional currency which is the currency the shopper pays in. - + The **display** currency refers to the presentational currency used to present prices to the shopper on the storefront. - + * `currency_id` - the display currency ID. Depending on the currency selected, the value may be different from the transactional currency. * `currency_code` - the currency code of the display currency used to present prices to the shopper on the storefront. Depending on the currency selected, the value may be different from the transactional currency. * `currency_exchange_rate` - the exchange rate between the store’s default currency and the display currency. For orders created using the V2 endpoints, this value is always 1 (only in the storefront this value can be different to 1). * `default_currency_id` - the transactional currency ID. * `default_currency_code` - the currency code of the transactional currency the shopper pays in. - + The following additional fields are returned on orders when Multi-Currency is enabled on the store: - + * `store_default_currency_code` - the currency code of the store’s default currency. * `store_default_to_transactional_exchange_rate` - the exchange rate between the store’s default currency and the transactional currency used in the order. - + **Example:** - + ```json { ... @@ -88,13 +88,13 @@ paths: put: description: |- Updates an *Order*. - + To add a product to an existing order, don't include `id` in the body. Include `product_options` if adding a product with variants. - + To update a product in an order, include `id` in the body. The body should only contain the fields that need to be updated. Those fields that are omitted will not be changed. - + To remove a product from an order, set that product’s `quantity` to `0`. - + To learn more about creating or updating orders, see [Orders Overview](/api-docs/orders/orders-api-overview). summary: Update an Order tags: @@ -208,9 +208,9 @@ paths: get: description: |- Gets a list of orders using the filter query. - + **Notes** - + The default sort is by order id, from lowest to highest. tags: - Orders @@ -417,7 +417,7 @@ paths: get: description: |- Lists all order coupons. Optional parameters can be passed in. - + |Type `int`|Type Name| |-|-| |`0`|`per_item_discount`| @@ -459,7 +459,7 @@ paths: get: description: |- Get all shipping addresses on an order using the `order_id`. - + Returned in the response is shipping_quotes object. Please use the Get Shipping Quotes Endpoint. Using the response will return a 204 for the shipping quote. summary: Get Order Shipping Addresses parameters: @@ -477,7 +477,7 @@ paths: get: description: |- Returns a Collection of All Order Statuses. - + **Order Status Descriptions:** |Status ID | Name | Description | |--|--|--| @@ -510,7 +510,7 @@ paths: get: description: |- Returns a single order status. - + **Order Status Descriptions** |Status ID | Name | Description | |:--|:--|:--| @@ -546,7 +546,7 @@ paths: Each tax applied to an order. This information can be useful for reporting purposes. Pass in the query parameter `?details=true` to return extra details about order taxes. `order_product_id` and `line_item_type` are also returned. - + All values are read-only. summary: Get All Order Taxes parameters: @@ -583,17 +583,17 @@ paths: post: description: | Creates an *Order Shipment*. For more details, see [Shipping an Order](/api-docs/orders/orders-api-overview#creating-order-shipments). - + **Required Fields** * order_address_id * items - + **Usage notes** - - Presuming that a valid carrier code is used, a tracking link is generated if either `shipping_provider` or `tracking_carrier` is supplied alongside a tracking number. Providing only the tracking number will result in an unclickable text in the customer facing email. - + + Presuming that a valid carrier code is used, a tracking link is generated if either `shipping_provider` or `tracking_carrier` is supplied alongside a tracking number. Providing only the tracking number will result in non-clickable text in the customer facing email. + Acceptable values for `shipping_provider` include an empty string (`""`), auspost, canadapost, endicia, usps, fedex, royalmail, ups, upsready, upsonline, or shipperhq. - + Acceptable values for `tracking_carrier` include an empty string (`""`) or one of the valid [tracking-carrier values](https://github.com/bigcommerce/dev-docs/blob/master/assets/csv/tracking_carrier_values.csv). summary: Create Order Shipment parameters: @@ -736,7 +736,7 @@ paths: summary: Get a Shipping Address description: |- Gets a shipping address associated with an order. - + Returned in the response is shipping_quotes object. Please use the Get Shipping Quotes Endpoint. Using the response will return a 204 for the shipping quote. tags: - Order Shipping Addresses @@ -829,7 +829,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/shippingAddress_Base' + $ref: '#/components/schemas/shippingAddress_Put' examples: application/json: value: @@ -847,7 +847,7 @@ paths: phone: '468444123' description: |- Update a shipping address associated with an order. - + **Note**: Updating a shipping address will NOT trigger the recalculation of shipping cost and tax tags: - Order Shipping Addresses @@ -863,7 +863,7 @@ paths: summary: Get Order Shipping Quotes description: |- Gets all shipping quotes persisted on an order. - + This is a read-only endpoint and the output can vary based on the shipping quote. A shipping quote can only be generated using the storefront at this time. Orders that are created in the control panel or using the API return a 204 for this endpoint since a shipping quote is not generated during that process. tags: - Order Shipping Addresses Quotes @@ -1083,9 +1083,9 @@ components: in: query description: |- Minimum date the order was created in RFC-2822 or ISO-8601. - + RFC-2822: `Thu, 20 Apr 2017 11:32:00 -0400` - + ISO-8601: `2017-04-20T11:32:00.000-04:00` schema: type: string @@ -1094,9 +1094,9 @@ components: in: query description: |- Maximum date the order was created in RFC-2822 or ISO-8601. - + RFC-2822: `Thu, 20 Apr 2017 11:32:00 -0400` - + ISO-8601: `2017-04-20T11:32:00.000-04:00` schema: type: string @@ -1105,9 +1105,9 @@ components: in: query description: |- Minimum date the order was modified in RFC-2822 or ISO-8601. - + RFC-2822: `Thu, 20 Apr 2017 11:32:00 -0400` - + ISO-8601: `2017-04-20T11:32:00.000-04:00` schema: type: string @@ -1116,9 +1116,9 @@ components: in: query description: |- Maximum date the order was modified in RFC-2822 or ISO-8601. - + RFC-2822: `Thu, 20 Apr 2017 11:32:00 -0400` - + ISO-8601: `2017-04-20T11:32:00.000-04:00` schema: type: string @@ -1429,7 +1429,7 @@ components: customer_locale: en external_order_id: external-order-id ordersCount_Resp: - description: Order Country response collection. + description: Order Counter response collection. content: application/json: schema: @@ -2849,11 +2849,11 @@ components: type: number description: The number of shipping addresses associated with this transaction. A read-only value. Do not pass in a POST or PUT request. is_deleted: - description: Boolean value that indicates whether the order was deleted (archived). Set to to true, to archive an order.' + description: 'Boolean value indicates whether the order was deleted (archived). Set to to true to archive an order.' example: false type: boolean is_email_opt_in: - description: Boolean value that indicates whether the shopper has selected an opt-in check box (on the checkout page) to receive emails. A read-only value. Do not pass in a POST or PUT request. + description: Boolean value indicates whether the shopper has selected an opt-in check box (on the checkout page) to receive emails. A read-only value. Do not pass in a POST or PUT request. example: false type: boolean credit_card_type: @@ -2971,9 +2971,9 @@ components: type: string description: | BasicTaxProvider - Tax is set to manual and order is created in the store. - + AvaTaxProvider - Tax is set to automatic and order is created in the store. Used for Avalara. - + "" (empty string) - The order is created with the API, or the tax provider is unknown. 404_Resp: description: Not Found @@ -3003,7 +3003,7 @@ components: |:--------|:-----------|:----------| | Orders | modify | `store_v2_orders` | | Orders | read-only | `store_v2_orders_read_only` | - + ### Authentication header | Header | Argument | Description | @@ -3150,10 +3150,10 @@ components: price_tax: description: |- Amount of tax applied to a single product. - + Price tax is calculated as: `price_tax = price_inc_tax - price_ex_tax` - + (Float, Float-As-String, Integer) example: '0.0000' type: string @@ -3173,8 +3173,8 @@ components: description: |- Total tax applied to products. For example, if quantity if 2, base price is 5 and tax rate is 10%. price_tax will be $.50 and total_tax will be $1.00. - - If there is a manual discount applied total_tax is calcuted as the following: + + If there is a manual discount applied total_tax is calculated as the following: `(price_ex_tax - discount)*tax_rate=total_tax`. (Float, Float-As-String, Integer) example: '0.5200' @@ -3722,20 +3722,66 @@ components: formFields: title: formFields type: object - readOnly: true - description: Read-Only. + x-internal: false properties: name: - description: Read-Only. - readOnly: true type: string example: License ID + description: The form field name. value: - description: Read-Only. - readOnly: true - type: string + description: The form field value. + type: + - number + - string + - array example: 123BAF - x-internal: false + items: + type: string + x-examples: + Example 1: + name: License ID + value: 123BAF + Example 2: + name: Borrowing Amount + value: 12.2 + Example 3: + name: Acceptable Sizes + value: + - Small + - Medium + Capture Custom Billing Address Form Fields: + data: + billing_address: + form_fields: + - name: picklist1 + value: picklist-value-2 + - name: textfield1 + value: text2 + - name: radiobutton1 + value: radio-value-2 + - name: checkbox1 + value: checkbox-value-2 + - name: multilinetextfield + value: line1\line2 + - name: numberonlyfield + value: 123.2 + - name: passwordfield1 + value: password2 + Capture Custom Shipping Address Form Fields: + data: + shipping_address: + id: 23 + form_fields: + - name: picklist1 + value: picklist-value-3 + Capture Custom Consignment Shipping Form Fields: + data: + consignments: + Shipping: + id: 23 + form_fields: + - name: picklist1 + value: picklist-value-2 orderMessages: type: array items: @@ -4049,7 +4095,7 @@ components: type: string description: |- IPv4 Address of the customer, if known. - + Note: You can set either `ip_address` or `ip_address_v6`. Setting the `ip_address` value will reset the `ip_address_v6` value and vice versa. example: 12.345.678.910 maxLength: 30 @@ -4057,7 +4103,7 @@ components: type: string description: |- IPv6 Address of the customer, if known. - + Note: You can set either `ip_address` or `ip_address_v6`. Setting the `ip_address_v6` value will reset the `ip_address` value and vice versa. example: '2001:db8:3333:4444:5555:6666:7777:8888' maxLength: 39 @@ -4122,9 +4168,9 @@ components: tax_provider_id: description: | BasicTaxProvider - Tax is set to manual and order is created in the store. - + AvaTaxProvider - Tax is set to automatic and order is created in the store. Used for Avalara. - + "" (empty string) - The order is created with the API, or the tax provider is unknown. enum: - BasicTaxProvider @@ -4386,10 +4432,10 @@ components: title: orderCustomProduct_Put description: | **Usage notes:** - + To `add` a custom product to an existing order, don't include `id` in the payload. You must provide a non-empty value for at least one of these fields: `name`, `name_customer`, or `name_merchant`. To `update` an order product line, `id` is required. The payload should only contain the fields that need to be updated. You cannot change omitted fields. - + Note the following constraints and default field values: - Empty strings `''` and `null` are invalid for `xxx`, `xxx_customer`, and `xxx_merchant`. - `name` and `name_customer` always hold the same value; updating either `name` or `name_customer` will change the value for both of those fields. @@ -4435,10 +4481,10 @@ components: title: orderCatalogProduct_Put description: | **Usage notes** - + To `add` a product to an existing order, don't include `id` in the payload. When adding a product with variants, `product_options` are required. To `update` an order product line, `id` is required. The payload should only contain the fields that need to be updated. The fields that you omit will not be changed. - + Note the following constraints and default field values: - `xxx` and `xxx_customer` always hold the same value. Updating either `xxx` or `xxx_customer` will change the value of both fields. - If both fields `xxx` and `xxx_customer` are present, they must have same value. @@ -4496,7 +4542,7 @@ components: Depending on the option type, value can be one of the following: - The variant option value id or the modifier value id for modifier types with a list of defined values, such as drop down or checkbox modifiers. - The modifier value for modifier types without a list of defined values, such as text field or date field modifiers. - + Notes: - The API does not currently support the following option types: - File upload @@ -4568,7 +4614,7 @@ components: - `name` - `name_customer` - `name_merchant` - + Note the following constraints and default field values: - Null and `''` empty strings are invalid for `name`, `name_customer`, and `name_merchant`. - `name` and `name_customer` always share the same value; updating one updates the other. @@ -4604,13 +4650,17 @@ components: - price_ex_tax x-internal: false order_Put: - title: order_Put allOf: - $ref: '#/components/schemas/order_Shared' - type: object properties: + billing_address: + $ref: '#/components/schemas/billingAddress_Put' consignments: $ref: '#/components/schemas/orderConsignment_Put' + payment_method: + type: string + description: 'The payment method for this order. Can be one of the following: `Manual`, `Credit Card`, `Cash`,`Test Payment Gateway`, etc.' products: type: array items: @@ -4618,8 +4668,12 @@ components: - $ref: '#/components/schemas/orderCatalogProduct_Put' - $ref: '#/components/schemas/orderCustomProduct_Put' shipping_addresses: - $ref: '#/components/schemas/shippingAddress_Base' - x-internal: false + allOf: + - type: object + properties: + id: + type: integer + - $ref: '#/components/schemas/shippingAddress_Put' order_Post: title: order_Post description: Products and Billing address only required for POST operation. @@ -4640,6 +4694,24 @@ components: $ref: '#/components/schemas/orderConsignment_Post' - $ref: '#/components/schemas/order_Shared' x-internal: false + shippingAddress_Put: + allOf: + - $ref: '#/components/schemas/shippingAddress_Base' + - type: object + properties: + form_fields: + type: array + items: + $ref: '#/components/schemas/formFields' + billingAddress_Put: + allOf: + - $ref: '#/components/schemas/billingAddress_Base' + - type: object + properties: + form_fields: + type: array + items: + $ref: '#/components/schemas/formFields' orderConsignment_Put: title: '' type: object From ee2b465c380f08cdcfe1f9ef83c5d5bcb6000b02 Mon Sep 17 00:00:00 2001 From: Tina Gomez <94003415+bc-tgomez@users.noreply.github.com> Date: Tue, 21 Mar 2023 16:00:29 -0500 Subject: [PATCH 04/12] DEVDOCS-4702: [remove] OrdersV3, Remove batch endpoints for Refund Quotes and Refunds (#1216) Remove Batch endpoints for Refund Quotes and Refunds --- reference/orders.v3.yml | 262 ---------------------------------------- 1 file changed, 262 deletions(-) diff --git a/reference/orders.v3.yml b/reference/orders.v3.yml index 75db03448..d790e4fb9 100644 --- a/reference/orders.v3.yml +++ b/reference/orders.v3.yml @@ -370,121 +370,6 @@ paths: $ref: '#/components/responses/RefundID_Response' tags: - Payment Actions - '/orders/payment_actions/refund_quotes': - parameters: - - $ref: '#/components/parameters/Accept' - post: - summary: Create Refund Quotes - BATCH - description: |- - Calculate the tax amount, total refund amount and get availble payment options for an order refund by providing items and costs or quantities to refund. - - This endpoint will accept a batch of one or more. - - Requires at least one of the following scopes: - * `store_v2_orders` - * `store_v2_transactions` - operationId: postrefundquotes - parameters: - - $ref: '#/components/parameters/ContentType' - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/PostRefundQuotesRequest' - required: true - x-examples: - application/json: - - items: - - item_id: 76 - item_type: PRODUCT - quantity: 1 - tax_adjustment_amount: 0 - responses: - '201': - $ref: '#/components/responses/RefundQuotesBATCH_Resp' - '422': - description: Partial success/failure response. Status to roll up to the most severe individual failure to the whole request. - content: - application/json: - schema: - type: object - properties: - data: - type: array - items: - $ref: '#/components/schemas/RefundQuote_Full' - errors: - type: array - items: - $ref: '#/components/schemas/FailedQuoteError' - meta: - $ref: '#/components/schemas/Meta' - Example 1: - examples: - response: - value: |- - { - "data": [ - { - "order_id": 1, - "total_refund_amount": 1.99, - "total_refund_tax_amount": 1.95, - "rounding": 1, - "adjustment": 0.05, - "tax_inclusive": true, - "refund_methods": [ - "" - ] - } - ], - "errors": [ - { - "order_id": 1, - "status": 422, - "error": "Refund amount is greater than remaining amount" - } - ], - "meta": { - "failure": 1, - "success": 1, - "total": 2 - } - } - '503': - description: Every request in the batch failed. The error object describes the failure for each component request. - content: - application/json: - schema: - type: object - properties: - data: - type: array - items: - $ref: '#/components/schemas/RefundQuote_Full' - errors: - type: array - items: - $ref: '#/components/schemas/FailedQuoteError' - meta: - $ref: '#/components/schemas/Meta' - examples: - response: - value: - data: [] - errors: - - order_id: 1 - status: 503 - error: Tax service could not be contacted - - order_id: 100 - status: 422 - error: Refund amount exceeds remaining amount - meta: - failure: 2 - success: 0 - total: 2 - tags: - - Payment Actions - x-private: true '/orders/payment_actions/refunds': parameters: - $ref: '#/components/parameters/Accept' @@ -557,153 +442,6 @@ paths: $ref: '#/components/responses/RefundCollection_Resp' tags: - Payment Actions - post: - summary: Create Refunds - BATCH - description: |- - Creates a refund. - - This endpoint will accept a batch of one or more. - - Requires at least one of the following scopes: - * `store_v2_orders` - * `store_v2_transactions` - operationId: postrefunds - parameters: - - $ref: '#/components/parameters/ContentType' - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/PostRefundsRequest' - examples: {} - required: true - x-examples: - application/json: - - items: - - item_id: 76 - item_type: PRODUCT - quantity: 1 - tax_adjustment_amount: 0 - payments: - - provider_id: testgateway - amount: 220.5 - offline: false - - provider_id: storecredit - amount: 2.25 - offline: true - responses: - '201': - $ref: '#/components/responses/refundsBATCH_Resp' - '422': - description: Partial success/failure response. HTTP status for the entire response to roll up to the most severe individual failure to the whole request. - content: - application/json: - schema: - type: object - properties: - data: - type: array - items: - $ref: '#/components/schemas/Refund' - errors: - type: array - items: - $ref: '#/components/schemas/FailedQuoteError' - meta: - $ref: '#/components/schemas/metaEmpty_Full' - Example 1: - examples: - response: - value: |- - { - "data": [ - { - "id": 1, - "order_id": 100, - "user_id": 1, - "created": "", - "reason": "", - "total_amount": 0.05, - "total_tax": 1, - "items": [ - { - "item_type": "ORDER", - "item_id": 1, - "reason": "", - "quantity": 1, - "requested_amount": 0.05 - } - ], - "payments": [ - { - "id": 1, - "provider_id": "checkout_paypalexpress", - "amount": 0.05, - "offline": true, - "is_declined": true, - "declined_message": "" - } - ] - } - ], - errors: [ - { - "order_id": 1, - "status": 422, - "error": "Refund amount was negative" - } - ], - "meta": { - "failure": 1, - "success": 1, - "total": 2 - } - } - '503': - description: Every request in the batch failed. The error object describes the failure for each component request. - content: - application/json: - schema: - type: object - properties: - data: - type: array - items: - $ref: '#/components/schemas/Refund' - errors: - type: array - items: - $ref: '#/components/schemas/FailedQuoteError' - meta: - $ref: '#/components/schemas/metaEmpty_Full' - Example 1: - examples: - response: - value: |- - { - "data": [ - ], - "errors": [ - { - "order_id": 1, - "status": 422, - "error": "Refund amount was negative" - }, - { - "order_id": 100, - "status": 503, - "error": "Tax service could not be contacted" - } - ], - "meta": { - "failure": 2, - "success": 0, - "total": 2 - } - } - tags: - - Payment Actions - x-private: true '/orders/{order_id}/metafields': parameters: - $ref: '#/components/parameters/Accept' From f50818aba7009e4ce7b35df4326719b218a91241 Mon Sep 17 00:00:00 2001 From: Valentin Dellangela <43359039+valentindellangela@users.noreply.github.com> Date: Thu, 23 Mar 2023 00:40:07 +1100 Subject: [PATCH 05/12] feat(checkout): CHECKOUT-7264 Update our Dev Docs with the new Line Items Overrides (#1140) * feat(checkout): CHECKOUT-7264 Update our Dev Docs with the new Line Items Overrides * Update reference/carts.v3.yml Co-authored-by: Traci Porter * Update reference/carts.v3.yml Co-authored-by: Traci Porter * Update reference/carts.v3.yml Co-authored-by: Traci Porter * Update reference/carts.v3.yml Co-authored-by: Traci Porter * fix(checkout): CHECKOUT-7328 Update discounted_amount description (#1186) Co-authored-by: Traci Porter Co-authored-by: Mark Murphy * DEVDOCS-4633: [revise] Storefront Customers, update schema (#1125) * DEVDOCS-4633 * DEVDOCS-4575: [update] Catalog V3 API, update request response schemas (#1101) Co-authored-by: Tina Gomez Co-authored-by: Sarah Riehl --------- Co-authored-by: bc-andreadao <96258747+bc-andreadao@users.noreply.github.com> Co-authored-by: Tina Gomez Co-authored-by: Sarah Riehl * DEVDOCS-4800: [update] OrdersV2, update custom form fields for billing and shipping (#1215) * docs(orders): DEVDOCS-4800 allow updating billing address & shipping address custom form fields in Orders v2 API (#1177) * Change example names and moved reference out of GET * Update reference/orders.v2.oas2.yml Incorporate peer review feedback * Fix merge conflicts * Remove orderShippingAddress_Resp examples * Fix problems with grammar in doc * Update form fields schema example * Rebase with BOPIS, Checkout, and OrdersV2 * DEVDOCS-4651: [new] SF Checkout, Checkout V3, & Orders V2 endpoints, incorporate BOPIS (#1209) * links for abandoned carts * changed Abandoned Cart Emails * changed carts V3 and catalog V3 * changed Channels * changed checkouts * changed currencies * changed custom template associations * changed customers * changed customers V3 * changed email templates * changed geography * changed marketing * changed orders v2 * changed orders v3 * changed pages v3 * changed payment methods * changed payment processing * changed price lists * changed redirects * changed scripts * changed settings and shipping * changed shipping V3 * changed sites * changed store content * changed store information * changed store logs * changed subscribers * changed tax classes * changed tax properties * changed tax settings * changes tax connection * changed themes * edited themes * changed webhooks * changed widgets * changed wishlists * changed carts SF * changed checkouts SF * changed consent SF * changed customers SF * changed form fields SF * changed orders SF * changed pricing * changed subscriptions SF * changed Tax Provider API * changed Shipping Provider API, fixed Tax Provider API * changed Current Customer * changed Customer Login * DEVDOCS-4568: [update] Remove negative numbers (#1043) * DEVDOCS-4568: [revise open PR] Align dst_offset (#1054) * scripts, verify name of checkout content scope, ancillary * debug store_content * debug currencies * checkouts, remove duplicate key * put openapi versions in quotes * wishlists add to info field * tax settings, update name of api key * all, add description of API gateway * tax provider, remove quotes * update tax_properties API Key name * DEVDOCS-4605: [update] Payments, add bigpay_token 2 (#1066) * reorder security section * ace, param sh-a-ct * ac, param sh-a-ct * ac rearrange * ac typos * carts v3 tos, contact * cv3, param sh-a-ct * catalog tos, contact * chv3, rearrange * DEVDOCS-4575: [update] Catalog V3 API, update request response schemas (#1101) * style * add path variables * terms of service, file order * terms of service * remove request runner * remove duplicate auth section * storefront tokens move auth section * remove request runner * add v2 and v3 to rates * add paths * remove store_hash path parameter from all endpoints. * cleaned up some store_hash and x-stoplight artifacts * empty parameters type error after store_hash deletes * remove ''s and ''t syntax errors * add description to store hash * add description to storefront url store domain * add description to app api app_domain * move orders file front matter to front * price lists -- add header parameters, fix typos * wishlists & widgets, parameter cleanup * tax settings, reorganize, add header parameters * themes parameters * tax properties spacing and schemas * tax classes, quote endpoints, parameters * subscribers, parameters, spaces * storefront tokens, add header parameters * sites, add header parameters * store content, add header parameters * tax provider connection, add header parameters * shipping v2, add header parameters * scripts, add header parameters * redirects, add header parameters * payment methods, add header parameters * orders v3, add info, header parameters * marketing, add info, header parameters * customers, add info, header parameters * channels, add header parameters * payment processing, add header parameters, revise security schemes * orders v2. SHE LINTS. * catalog, add header parameters, debug * (no ticket): [tools] MDX linter, create + add github action (#1150) * tax provider, change oas 3.1 --> 3.0.3, lint null object * tax rates & zone, oas 3.1 --> 3.0.3, remove oas 3.1 feature * convert .md to .mdx * channels, update image paths * DEVDOCS-4719: [migrate] Settings, Customer Login, revise linter * DEVDOCS-4719: [migrate] Stoplight links (#1156) * DEVDOCS-4719: [migrate] remove x-stoplight (#1157) * correct current customer path * update current_customer per Slack * shipping version quotes * updated meta object in Carts V3 * meta updates in carts.v3 file * DEVDOCS-4719: [migrate] Shipping V3, remove truly redundant examples (#1162) * DEVDOCS-4719: [migrate] Many, give meta objects properties (#1158) * DEVDOCS-4719: [migrate] Handle callouts (#1164) * DEVDOCS-4719: [migrate] Many, add array items (#1160) * DEVDOCS-4719: [migrate] Many, add object properties (#1161) * DEVDOCS-4719: [migrate] response bodies (#1165) * (no ticket): [migrate] Many, resolve errors * (no ticket): [migrate] Carts SF, re-lint * (no ticket): [revise] Customers SF, Standardize create a customer summary (#1176) * DEVDOCS-4719: [migrate] Catalog V3, fix request body not rendering (#1163) * DEVDOCS-4719: [migrate] Catalog V3, rendering issues (#1166) * DEVDOCS-4719: [migrate] Many, update additionalProperties (#1174) * (no ticket): [remove] Catalog V3, generic catalog tag (#1180) See also PR #1175 * apostrophes * DEVDOCS-4719: [migrate] Email Templates and Custom Template Associations, migrate syntax (#1181) * DEVDOCS-4719: [migrate] Email templates, unify (#1188) * remove ambiguous hyphen * DEVDOCS-4719: [migrate] Webhook schemas (#1189) * Change 'description' to 'properties' within store_cart_created.yml (#1191) * DEVDOCS-4719: [migrate] Price Lists V3 API, remove content type header from GET (#1187) * DEVDOCS-4719 [migrate] Orders, summary/table cleanup (#1185) * DEVDOCS-4719: [migrate] Tax V3 API, rendering (#1183) * DEVDOCS-4719: [migrate] Tax Provider API, request example rendering (#1195) * DEVDOCS-4719: [migrate] Shipping provider API, move example (#1194) * move response example for Request Rates * change example names * DEVDOCS-4719: [migrate] Tax APIs (#1196) * DEVDOCS-4719: [migrate] Shipping APIs, move example (#1197) * DEVDOCS-4719: [migrate] Carts SF & V3, rendering-based changes (#1199) * change auth docs links (#1202) * Migrate links #1 (#1204) * available-apis, storefront-graphql * storefront carts * carts v3 * catalog * channels * sf checkouts * sf carts, change links to sf from v3 * checkouts v3 * sf consent * currencies * wishlists * widgets * webhooks * tax provider * customers v2 * shipping v2 * customers v3 * orders v2 * payment processing * add tags to email templates and custom template associations (#1206) * Migrate links #2 (#1207) * incorporate BOPIS changes, SF checkouts * incorporate BOPIS changes, checkouts V3 * incorporate BOPIS changes, orders V2 * incorporate BOPIS changes * manual resolution commits * fix incorrect casing for pickup method id field * copyedit description * fix(checkout): CHECKOUT-7328 Update discounted_amount description (#1186) * docs(orders): DEVDOCS-4800 allow updating billing address & shipping address custom form fields in Orders v2 API Co-authored-by: bc-andreadao <96258747+bc-andreadao@users.noreply.github.com> Co-authored-by: Traci Porter Co-authored-by: Sarah Riehl Co-authored-by: Tina Gomez Co-authored-by: Matthew Volk Co-authored-by: stanzikratelbc <108146487+stanzikratelbc@users.noreply.github.com> Co-authored-by: Nate Stewart Co-authored-by: Tina Gomez <94003415+bc-tgomez@users.noreply.github.com> Co-authored-by: Valentin Dellangela <43359039+valentindellangela@users.noreply.github.com> Co-authored-by: Donald Nguyen * Remove duplicate consignment from Order_Put * DEVDOCS-4702: [remove] OrdersV3, Remove batch endpoints for Refund Quotes and Refunds (#1216) Remove Batch endpoints for Refund Quotes and Refunds --------- Co-authored-by: Traci Porter Co-authored-by: Mark Murphy Co-authored-by: bc-andreadao <96258747+bc-andreadao@users.noreply.github.com> Co-authored-by: Tina Gomez Co-authored-by: Sarah Riehl Co-authored-by: Tina Gomez <94003415+bc-tgomez@users.noreply.github.com> --- reference/carts.v3.yml | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/reference/carts.v3.yml b/reference/carts.v3.yml index 4b611a6ef..19a629ca1 100644 --- a/reference/carts.v3.yml +++ b/reference/carts.v3.yml @@ -2420,6 +2420,22 @@ components: name: type: string description: Optionally, provide a value to override the product name. + weight: + type: number + description: Optionally, provide a value to override the product weight. + dimensions: + type: object + description: Optionally, provide a value to override the product dimensions. + properties: + height: + type: number + description: The custom height of the product. + width: + type: number + description: The custom width of the product. + depth: + type: number + description: The custom depth of the product. gift_wrapping: type: object properties: @@ -2471,6 +2487,22 @@ components: name: type: string description: Optionally, provide a value to override the product name. + weight: + type: number + description: Optionally, provide a value to override the product weight. + dimensions: + type: object + description: Optionally, provide a value to override the product dimensions. + properties: + height: + type: number + description: The custom height of the product. + width: + type: number + description: The custom width of the product. + depth: + type: number + description: The custom depth of the product. option_selections: type: array description: Needed for Catalog V2. @@ -2773,6 +2805,25 @@ components: type: string description: The item’s product name. example: T-Shirt + weight: + type: number + description: The weight is displayed here if the item has a custom dimension. + example: 1.2 + dimensions: + type: object + properties: + height: + type: number + description: The height is displayed here if the item has a custom dimension. + example: 2.0 + width: + type: number + description: The width is displayed here if the item has a custom dimension. + example: 2.1 + depth: + type: number + description: The depth is displayed here if the item has a custom dimension. + example: 2.2 url: description: The product URL. type: string From 157a1c57f05324947d82bdca5b80f8059784514a Mon Sep 17 00:00:00 2001 From: Andrew Chan Date: Thu, 23 Mar 2023 03:13:11 +1100 Subject: [PATCH 06/12] refactor(shipping): SHIPPING-700 Update code rule in carrier response (#1205) --- reference/shipping_provider.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/reference/shipping_provider.yml b/reference/shipping_provider.yml index a8967fb5a..db293a106 100644 --- a/reference/shipping_provider.yml +++ b/reference/shipping_provider.yml @@ -805,6 +805,7 @@ components: code: description: A code describing the service. type: string + minLength: 1 maxLength: 50 example: GND display_name: From dbd19a07b15606881b96fe032d7272407cd7694d Mon Sep 17 00:00:00 2001 From: Traci Porter Date: Wed, 22 Mar 2023 11:41:59 -0500 Subject: [PATCH 07/12] DEVDOCS-4806 : [update] update minLength (#1221) update minLength for Tree schema --- reference/catalog.v3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/catalog.v3.yml b/reference/catalog.v3.yml index db67cc99f..67d6c6e4d 100644 --- a/reference/catalog.v3.yml +++ b/reference/catalog.v3.yml @@ -21757,7 +21757,7 @@ components: type: integer name: type: string - minLength: 6 + minLength: 1 maxLength: 255 channels: type: array From a120d82b13f833455a4d89db7a64091fc6121504 Mon Sep 17 00:00:00 2001 From: Traci Porter Date: Wed, 22 Mar 2023 14:11:40 -0500 Subject: [PATCH 08/12] DEVDOCS-4693: [update] Get all states, add query parameters (#1126) * DEVDOCS-4693 * DEVDOCS-4575: [update] Catalog V3 API, update request response schemas (#1101) * Added /stores/{store_hash}/v2 to the paths * resolving errors * resolving error --------- Co-authored-by: bc-andreadao <96258747+bc-andreadao@users.noreply.github.com> Co-authored-by: Tina Gomez Co-authored-by: Sarah Riehl --- reference/geography.v2.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/reference/geography.v2.yml b/reference/geography.v2.yml index 32f222e0e..1368d091e 100644 --- a/reference/geography.v2.yml +++ b/reference/geography.v2.yml @@ -243,7 +243,7 @@ paths: tags: - States description: Returns a count of all states. - '/countries/states': + '/stores/{store_hash}/v2/countries/states': get: responses: '200': @@ -252,6 +252,23 @@ paths: tags: - States description: Returns a list of all states. + parameters: + - schema: + type: integer + in: query + name: limit + description: The number of results to return per request. + - schema: + type: integer + in: query + name: page + description: The ordered grouping of results to return. + parameters: + - schema: + type: string + name: store_hash + in: path + required: true '/countries/{country_id}/states/count': get: responses: From 1d2b5bb49108abdd02f101ecc1db50ba5f3bc682 Mon Sep 17 00:00:00 2001 From: kzhang Date: Mon, 3 Apr 2023 10:23:57 -0500 Subject: [PATCH 09/12] create webhook_Put object to fix the required fields --- reference/webhooks.v3.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/reference/webhooks.v3.yml b/reference/webhooks.v3.yml index e03c523a8..2e13b4a13 100644 --- a/reference/webhooks.v3.yml +++ b/reference/webhooks.v3.yml @@ -148,7 +148,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/webhook_Base' + $ref: '#/components/schemas/webhook_Put' x-examples: application/json: scope: store/cart/lineItem/* @@ -3005,6 +3005,34 @@ components: errors: type: object x-internal: false + webhook_Put: + type: object + title: webhook_Put + x-internal: false + properties: + scope: + type: string + example: store/order/* + description: Event you subscribe to. + destination: + type: string + example: 'https://665b65a6.ngrok.io/webhooks' + description: 'URL must be active, return a 200 response, and be served on port 443 (custom ports not currently supported).' + is_active: + type: boolean + example: true + description: Boolean value that indicates whether the webhook is active or not. + events_history_enabled: + type: boolean + example: true + description: Boolean value that identifies whether events are stored that could not be received. + headers: + type: object + description: 'Headers used to validate that webhooks are active. You can pass in any number of custom headers to validate webhooks are being returned. ' + nullable: true + properties: + custom: + type: string webhook_Base: type: object title: webhook_Base From 8383baa185692f2c568a0682322457ffba55b3ba Mon Sep 17 00:00:00 2001 From: kzhang Date: Thu, 27 Apr 2023 19:31:57 -0500 Subject: [PATCH 10/12] fix webhook put header --- reference/webhooks.v3.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/reference/webhooks.v3.yml b/reference/webhooks.v3.yml index 2e13b4a13..1a41ab808 100644 --- a/reference/webhooks.v3.yml +++ b/reference/webhooks.v3.yml @@ -3030,9 +3030,8 @@ components: type: object description: 'Headers used to validate that webhooks are active. You can pass in any number of custom headers to validate webhooks are being returned. ' nullable: true - properties: - custom: - type: string + additionalProperties: + type: string webhook_Base: type: object title: webhook_Base From be5eee4bbeff667cfaf41a24b1f25ec27351a227 Mon Sep 17 00:00:00 2001 From: Sarah Riehl Date: Tue, 26 Dec 2023 12:44:35 -0600 Subject: [PATCH 11/12] restore geography and orders --- reference/geography.v2.yml | 2 +- reference/orders.v2.oas2.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reference/geography.v2.yml b/reference/geography.v2.yml index 3214a4e7e..64cf350a9 100644 --- a/reference/geography.v2.yml +++ b/reference/geography.v2.yml @@ -248,7 +248,7 @@ paths: tags: - States description: Returns a count of all states. - '/stores/{store_hash}/v2/countries/states': + '/countries/states': get: operationId: get-all-states responses: diff --git a/reference/orders.v2.oas2.yml b/reference/orders.v2.oas2.yml index 6cd6cadb1..22bdc2e3a 100644 --- a/reference/orders.v2.oas2.yml +++ b/reference/orders.v2.oas2.yml @@ -3762,7 +3762,7 @@ components: type: string description: |- IPv4 Address of the customer, if known. - + Note: You can set either `ip_address` or `ip_address_v6`. Setting the `ip_address` value will reset the `ip_address_v6` value and vice versa. example: 12.345.678.910 maxLength: 30 @@ -3770,7 +3770,7 @@ components: type: string description: |- IPv6 Address of the customer, if known. - + Note: You can set either `ip_address` or `ip_address_v6`. Setting the `ip_address_v6` value will reset the `ip_address` value and vice versa. example: '2001:db8:3333:4444:5555:6666:7777:8888' maxLength: 39 @@ -4107,10 +4107,10 @@ components: title: Custom product description: |- **Usage notes:** - + To `add` a custom product to an existing order, don't include `id` in the payload. You must provide a non-empty value for at least one of these fields: `name`, `name_customer`, or `name_merchant`. To `update` an order product line, `id` is required. The payload should only contain the fields that need to be updated. You cannot change omitted fields. - + Note the following constraints and default field values: - Empty strings `''` and `null` are invalid for `xxx`, `xxx_customer`, and `xxx_merchant`. - `name` and `name_customer` always hold the same value; updating either `name` or `name_customer` will change the value for both of those fields. @@ -4159,7 +4159,7 @@ components: To `add` a product to an existing order, don't include `id` in the payload. When adding a product with variants, `product_options` are required. To `update` an order product line, `id` is required. The payload should only contain the fields that need to be updated. The fields that you omit will not be changed. - + Note the following constraints and default field values: - `xxx` and `xxx_customer` always hold the same value. Updating either `xxx` or `xxx_customer` will change the value of both fields. - If both fields `xxx` and `xxx_customer` are present, they must have same value. From a65097cbe4466e115da438b0ecf9e2a81b0254a7 Mon Sep 17 00:00:00 2001 From: Sarah Riehl Date: Tue, 26 Dec 2023 12:48:44 -0600 Subject: [PATCH 12/12] update description --- reference/webhooks.v3.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reference/webhooks.v3.yml b/reference/webhooks.v3.yml index 593c19624..2bedb7b97 100644 --- a/reference/webhooks.v3.yml +++ b/reference/webhooks.v3.yml @@ -3038,7 +3038,7 @@ components: destination: type: string example: 'https://665b65a6.ngrok.io/webhooks' - description: 'URL must be active, return a 200 response, and be served on port 443 (custom ports not currently supported).' + description: URL must be active, return a 200 response, and be served on port 443. Custom ports arenʼt currently supported. is_active: type: boolean example: true @@ -3049,8 +3049,9 @@ components: description: Boolean value that identifies whether events are stored that could not be received. headers: type: object - description: 'Headers used to validate that webhooks are active. You can pass in any number of custom headers to validate webhooks are being returned. ' + description: Headers used to validate that webhooks are active. You can pass in any number of custom headers to validate webhooks are being returned. nullable: true + properties: {} additionalProperties: type: string webhook_Base: