Skip to content

Commit

Permalink
Merge branch 'main' into 4232-discount-catalog-skeleton
Browse files Browse the repository at this point in the history
  • Loading branch information
poulch committed Nov 13, 2023
2 parents 88cc014 + c4b6085 commit 4ff1d44
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 54 deletions.
5 changes: 5 additions & 0 deletions .changeset/large-geckos-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

fix pt-br locale
5 changes: 5 additions & 0 deletions .changeset/rare-cats-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Update graphql schema
96 changes: 66 additions & 30 deletions introspection.json
Original file line number Diff line number Diff line change
Expand Up @@ -18314,6 +18314,18 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "voucher",
"description": "The voucher assigned to the checkout.\n\nAdded in Saleor 3.18.\n\nRequires one of the following permissions: MANAGE_DISCOUNTS.",
"args": [],
"type": {
"kind": "OBJECT",
"name": "Voucher",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "voucherCode",
"description": "The code of voucher assigned to the checkout.",
Expand Down Expand Up @@ -34970,6 +34982,18 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "shippingRefundedAmount",
"description": "Amount of refunded shipping price.\n\nAdded in Saleor 3.14.",
"args": [],
"type": {
"kind": "OBJECT",
"name": "Money",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "status",
"description": null,
Expand Down Expand Up @@ -34998,6 +35022,18 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "totalRefundedAmount",
"description": "Total refunded amount assigned to this fulfillment.\n\nAdded in Saleor 3.14.",
"args": [],
"type": {
"kind": "OBJECT",
"name": "Money",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "trackingNumber",
"description": null,
Expand Down Expand Up @@ -63278,7 +63314,7 @@
"args": [
{
"name": "action",
"description": "The expected action called for the transaction. By default, the `channel.defaultTransactionFlowStrategy` will be used. The field can be used only by app that has `HANDLE_PAYMENTS` permission.",
"description": "The expected action called for the transaction. By default, the `channel.paymentSettings.defaultTransactionFlowStrategy` will be used.The field can be used only by app that has `HANDLE_PAYMENTS` permission.",
"type": {
"kind": "ENUM",
"name": "TransactionFlowStrategyEnum",
Expand Down Expand Up @@ -75736,22 +75772,6 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "defaultTransactionFlowStrategy",
"description": "Determine the transaction flow strategy to be used. Include the selected option in the payload sent to the payment app, as a requested action for the transaction.\n\nAdded in Saleor 3.13.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.This preview feature field will be removed in Saleor 3.17. Use `PaymentSettings.defaultTransactionFlowStrategy` instead.",
"args": [],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "ENUM",
"name": "TransactionFlowStrategyEnum",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "deleteExpiredOrdersAfter",
"description": "The time in days after expired orders will be deleted.\n\nAdded in Saleor 3.14.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.",
Expand Down Expand Up @@ -75780,6 +75800,22 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "includeDraftOrderInVoucherUsage",
"description": "Determine if voucher applied on draft order should be count toward voucher usage.\n\nAdded in Saleor 3.18.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.",
"args": [],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "markAsPaidStrategy",
"description": "Determine what strategy will be used to mark the order as paid. Based on the chosen option, the proper object will be created and attached to the order when it's manually marked as paid.\n`PAYMENT_FLOW` - [default option] creates the `Payment` object.\n`TRANSACTION_FLOW` - creates the `TransactionItem` object.\n\nAdded in Saleor 3.13.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.",
Expand Down Expand Up @@ -75913,35 +75949,35 @@
"deprecationReason": null
},
{
"name": "defaultTransactionFlowStrategy",
"description": "Determine the transaction flow strategy to be used. Include the selected option in the payload sent to the payment app, as a requested action for the transaction.\n\nAdded in Saleor 3.13.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.\n\nDEPRECATED: this preview feature field will be removed in Saleor 3.17. Use `PaymentSettingsInput.defaultTransactionFlowStrategy` instead.",
"name": "deleteExpiredOrdersAfter",
"description": "The time in days after expired orders will be deleted.Allowed range is from 1 to 120.\n\nAdded in Saleor 3.14.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.",
"type": {
"kind": "ENUM",
"name": "TransactionFlowStrategyEnum",
"kind": "SCALAR",
"name": "Day",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "deleteExpiredOrdersAfter",
"description": "The time in days after expired orders will be deleted.Allowed range is from 1 to 120.\n\nAdded in Saleor 3.14.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.",
"name": "expireOrdersAfter",
"description": "Expiration time in minutes. Default null - means do not expire any orders. Enter 0 or null to disable.\n\nAdded in Saleor 3.13.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.",
"type": {
"kind": "SCALAR",
"name": "Day",
"name": "Minute",
"ofType": null
},
"defaultValue": null,
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "expireOrdersAfter",
"description": "Expiration time in minutes. Default null - means do not expire any orders. Enter 0 or null to disable.\n\nAdded in Saleor 3.13.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.",
"name": "includeDraftOrderInVoucherUsage",
"description": "Specify whether a coupon applied to draft orders will count toward voucher usage.\n\nWarning: when switching this setting from `false` to `true`, the vouchers will be disconnected from all draft orders.\n\nAdded in Saleor 3.18.\n\nNote: this API is currently in Feature Preview and can be subject to changes at later point.",
"type": {
"kind": "SCALAR",
"name": "Minute",
"name": "Boolean",
"ofType": null
},
"defaultValue": null,
Expand Down Expand Up @@ -76056,7 +76092,7 @@
},
{
"name": "automaticallyFulfillNonShippableGiftCard",
"description": "When enabled, all non-shippable gift card orders will be fulfilled automatically. By defualt set to True.",
"description": "When enabled, all non-shippable gift card orders will be fulfilled automatically. By default set to True.",
"type": {
"kind": "SCALAR",
"name": "Boolean",
Expand Down Expand Up @@ -136304,7 +136340,7 @@
},
{
"name": "PRODUCT_VARIANT_DELETED",
"description": "A product variant is deleted.",
"description": "A product variant is deleted. Warning: this event will not be executed when parent product has been deleted. Check PRODUCT_DELETED.",
"isDeprecated": false,
"deprecationReason": null
},
Expand Down Expand Up @@ -137251,7 +137287,7 @@
},
{
"name": "PRODUCT_VARIANT_DELETED",
"description": "A product variant is deleted.",
"description": "A product variant is deleted. Warning: this event will not be executed when parent product has been deleted. Check PRODUCT_DELETED.",
"isDeprecated": false,
"deprecationReason": null
},
Expand Down
File renamed without changes.
75 changes: 51 additions & 24 deletions schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -4674,6 +4674,15 @@ type Checkout implements Node & ObjectWithMetadata {
"""
user: User

"""
The voucher assigned to the checkout.

Added in Saleor 3.18.

Requires one of the following permissions: MANAGE_DISCOUNTS.
"""
voucher: Voucher

"""The code of voucher assigned to the checkout."""
voucherCode: String
}
Expand Down Expand Up @@ -8239,10 +8248,24 @@ type Fulfillment implements Node & ObjectWithMetadata {
Added in Saleor 3.3.
"""
privateMetafields(keys: [String!]): Metadata

"""
Amount of refunded shipping price.

Added in Saleor 3.14.
"""
shippingRefundedAmount: Money
status: FulfillmentStatus!

"""User-friendly fulfillment status."""
statusDisplay: String

"""
Total refunded amount assigned to this fulfillment.

Added in Saleor 3.14.
"""
totalRefundedAmount: Money
trackingNumber: String!

"""Warehouse from fulfillment was fulfilled."""
Expand Down Expand Up @@ -16211,7 +16234,7 @@ type Mutation {
"""
transactionInitialize(
"""
The expected action called for the transaction. By default, the `channel.defaultTransactionFlowStrategy` will be used. The field can be used only by app that has `HANDLE_PAYMENTS` permission.
The expected action called for the transaction. By default, the `channel.paymentSettings.defaultTransactionFlowStrategy` will be used.The field can be used only by app that has `HANDLE_PAYMENTS` permission.
"""
action: TransactionFlowStrategyEnum

Expand Down Expand Up @@ -19131,15 +19154,6 @@ type OrderSettings {
"""
automaticallyFulfillNonShippableGiftCard: Boolean!

"""
Determine the transaction flow strategy to be used. Include the selected option in the payload sent to the payment app, as a requested action for the transaction.

Added in Saleor 3.13.

Note: this API is currently in Feature Preview and can be subject to changes at later point.This preview feature field will be removed in Saleor 3.17. Use `PaymentSettings.defaultTransactionFlowStrategy` instead.
"""
defaultTransactionFlowStrategy: TransactionFlowStrategyEnum!

"""
The time in days after expired orders will be deleted.

Expand All @@ -19158,6 +19172,15 @@ type OrderSettings {
"""
expireOrdersAfter: Minute

"""
Determine if voucher applied on draft order should be count toward voucher usage.

Added in Saleor 3.18.

Note: this API is currently in Feature Preview and can be subject to changes at later point.
"""
includeDraftOrderInVoucherUsage: Boolean!

"""
Determine what strategy will be used to mark the order as paid. Based on the chosen option, the proper object will be created and attached to the order when it's manually marked as paid.
`PAYMENT_FLOW` - [default option] creates the `Payment` object.
Expand Down Expand Up @@ -19208,17 +19231,6 @@ input OrderSettingsInput {
"""
automaticallyFulfillNonShippableGiftCard: Boolean

"""
Determine the transaction flow strategy to be used. Include the selected option in the payload sent to the payment app, as a requested action for the transaction.

Added in Saleor 3.13.

Note: this API is currently in Feature Preview and can be subject to changes at later point.

DEPRECATED: this preview feature field will be removed in Saleor 3.17. Use `PaymentSettingsInput.defaultTransactionFlowStrategy` instead.
"""
defaultTransactionFlowStrategy: TransactionFlowStrategyEnum

"""
The time in days after expired orders will be deleted.Allowed range is from 1 to 120.

Expand All @@ -19237,6 +19249,17 @@ input OrderSettingsInput {
"""
expireOrdersAfter: Minute

"""
Specify whether a coupon applied to draft orders will count toward voucher usage.

Warning: when switching this setting from `false` to `true`, the vouchers will be disconnected from all draft orders.

Added in Saleor 3.18.

Note: this API is currently in Feature Preview and can be subject to changes at later point.
"""
includeDraftOrderInVoucherUsage: Boolean

"""
Determine what strategy will be used to mark the order as paid. Based on the chosen option, the proper object will be created and attached to the order when it's manually marked as paid.
`PAYMENT_FLOW` - [default option] creates the `Payment` object.
Expand Down Expand Up @@ -19269,7 +19292,7 @@ input OrderSettingsUpdateInput {
automaticallyConfirmAllNewOrders: Boolean

"""
When enabled, all non-shippable gift card orders will be fulfilled automatically. By defualt set to True.
When enabled, all non-shippable gift card orders will be fulfilled automatically. By default set to True.
"""
automaticallyFulfillNonShippableGiftCard: Boolean
}
Expand Down Expand Up @@ -34661,7 +34684,9 @@ enum WebhookEventTypeAsyncEnum {
"""A new product variant is created."""
PRODUCT_VARIANT_CREATED

"""A product variant is deleted."""
"""
A product variant is deleted. Warning: this event will not be executed when parent product has been deleted. Check PRODUCT_DELETED.
"""
PRODUCT_VARIANT_DELETED

"""
Expand Down Expand Up @@ -35250,7 +35275,9 @@ enum WebhookEventTypeEnum {
"""A new product variant is created."""
PRODUCT_VARIANT_CREATED

"""A product variant is deleted."""
"""
A product variant is deleted. Warning: this event will not be executed when parent product has been deleted. Check PRODUCT_DELETED.
"""
PRODUCT_VARIANT_DELETED

"""
Expand Down

0 comments on commit 4ff1d44

Please sign in to comment.