fix: merge

This commit is contained in:
Sebastian Rindom
2021-03-16 22:27:09 +01:00
24 changed files with 2717 additions and 1729 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -53,7 +53,7 @@ paths:
application/json:
schema:
properties:
customer:
user:
$ref: '#/components/schemas/user'
requestBody:
content:
@@ -83,7 +83,7 @@ paths:
application/json:
schema:
properties:
customer:
user:
$ref: '#/components/schemas/user'
/collections:
post:
@@ -695,6 +695,49 @@ paths:
properties:
discount:
$ref: '#/components/schemas/discount'
/notifications:
get:
operationId: GetNotifications
summary: List Notifications
description: Retrieves a list of Notifications.
tags:
- Notification
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
notifications:
type: array
items:
$ref: '#/components/schemas/notification'
'/notifications/{id}/resend':
post:
operationId: PostNotificationsNotificationResend
summary: Resend Notification
description: >-
Resends a previously sent notifications, with the same data but
optionally to a different address
parameters:
- in: path
name: id
required: true
description: The id of the Notification
schema:
type: string
tags:
- Notification
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
notification:
$ref: '#/components/schemas/notification'
/gift-cards:
post:
operationId: PostGiftCards
@@ -867,49 +910,6 @@ paths:
properties:
gift_card:
$ref: '#/components/schemas/gift_card'
/notifications:
get:
operationId: GetNotifications
summary: List Notifications
description: Retrieves a list of Notifications.
tags:
- Notification
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
notifications:
type: array
items:
$ref: '#/components/schemas/notification'
'/notifications/{id}/resend':
post:
operationId: PostNotificationsNotificationResend
summary: Resend Notification
description: >-
Resends a previously sent notifications, with the same data but
optionally to a different address
parameters:
- in: path
name: id
required: true
description: The id of the Notification
schema:
type: string
tags:
- Notification
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
notification:
$ref: '#/components/schemas/notification'
'/orders/{id}/shipping-methods':
post:
operationId: PostOrdersOrderShippingMethods
@@ -1511,8 +1511,10 @@ paths:
application/json:
schema:
properties:
order:
$ref: '#/components/schemas/order'
orders:
type: array
items:
$ref: '#/components/schemas/order'
'/orders/{id}/swaps/{swap_id}/process-payment':
post:
operationId: PostOrdersOrderSwapsSwapProcessPayment

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1000,6 +1000,7 @@ paths:
application/json:
schema:
properties:
<<<<<<< HEAD
id:
description: The id of the Gift Card
code:
@@ -1104,6 +1105,8 @@ paths:
application/json:
schema:
properties:
=======
>>>>>>> origin/master
customer:
$ref: '#/components/schemas/customer'
'/regions/{id}':
@@ -1156,6 +1159,7 @@ paths:
type: array
items:
$ref: '#/components/schemas/region'
<<<<<<< HEAD
'/swaps/{cart_id}':
get:
operationId: GetSwapsSwapCartId
@@ -1180,11 +1184,15 @@ paths:
swap:
$ref: '#/components/schemas/swap'
/shipping-options:
=======
'/products/{id}':
>>>>>>> origin/master
get:
operationId: GetShippingOptions
summary: Retrieve Shipping Options
description: Retrieves a list of Shipping Options.
operationId: GetProductsProduct
summary: Retrieves a Product
description: Retrieves a Product.
parameters:
<<<<<<< HEAD
- in: query
name: is_return
description: >-
@@ -1200,6 +1208,140 @@ paths:
- in: query
name: region_id
description: the Region to retrieve Shipping Options from.
=======
- in: path
name: id
required: true
description: The id of the Product.
>>>>>>> origin/master
schema:
type: string
tags:
- Product
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
product:
$ref: '#/components/schemas/product'
/products:
get:
operationId: GetProducts
summary: List Products
description: Retrieves a list of Products.
tags:
- Product
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
count:
description: The total number of Products.
type: integer
offset:
description: The offset for pagination.
type: integer
limit:
description: 'The maxmimum number of Products to return,'
type: integer
products:
type: array
items:
<<<<<<< HEAD
$ref: '#/components/schemas/shipping_option'
=======
$ref: '#/components/schemas/product'
'/swaps/{cart_id}':
get:
operationId: GetSwapsSwapCartId
summary: Retrieve Swap by Cart id
description: Retrieves a Swap by the id of the Cart used to confirm the Swap.
parameters:
- in: path
name: cart_id
required: true
description: The id of the Cart
schema:
type: string
tags:
- Swap
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
swap:
$ref: '#/components/schemas/swap'
>>>>>>> origin/master
'/variants/{variant_id}':
get:
operationId: GetVariantsVariant
summary: Retrieve a Product Variant
description: Retrieves a Product Variant by id
parameters:
- in: path
name: variant_id
required: true
description: The id of the Product Variant.
schema:
type: string
tags:
- Product Variant
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
variant:
$ref: '#/components/schemas/product_variant'
/variants:
get:
operationId: GetVariants
summary: Retrieve Product Variants
description: Retrieves a list of Product Variants
parameters:
- in: query
name: ids
description: A comma separated list of Product Variant ids to filter by.
schema:
type: string
tags:
- Product Variant
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
variants:
type: array
items:
$ref: '#/components/schemas/product_variant'
/shipping-options:
get:
operationId: GetShippingOptions
summary: Retrieve Shipping Options
description: Retrieves a list of Shipping Options.
parameters:
- in: query
name: product_ids
description: A comma separated list of Product ids to filter Shipping Options by.
schema:
type: string
- in: query
name: region_id
description: the Region to retrieve Shipping Options from.
schema:
type: string
tags:
@@ -1240,53 +1382,6 @@ paths:
type: array
items:
$ref: '#/components/schemas/shipping_option'
'/variants/{variant_id}':
get:
operationId: GetVariantsVariant
summary: Retrieve a Product Variant
description: Retrieves a Product Variant by id
parameters:
- in: path
name: variant_id
required: true
description: The id of the Product Variant.
schema:
type: string
tags:
- Product Variant
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
variant:
$ref: '#/components/schemas/product_variant'
/variants:
get:
operationId: GetVariants
summary: Retrieve Product Variants
description: Retrieves a list of Product Variants
parameters:
- in: query
name: ids
description: A comma separated list of Product Variant ids to filter by.
schema:
type: string
tags:
- Product Variant
responses:
'200':
description: OK
content:
application/json:
schema:
properties:
variants:
type: array
items:
$ref: '#/components/schemas/product_variant'
components:
schemas:
address: