Skip to content

Commit 1918bc2

Browse files
authored
Merge branch '2.4-develop' into 2.4-develop
2 parents bd4996f + 35e4ae6 commit 1918bc2

File tree

48 files changed

+1906
-1697
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1906
-1697
lines changed

app/code/Magento/BundleGraphQl/etc/schema.graphqls

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,67 @@
22
# See COPYING.txt for license details.
33

44
type Mutation {
5-
addBundleProductsToCart(input: AddBundleProductsToCartInput): AddBundleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
5+
addBundleProductsToCart(input: AddBundleProductsToCartInput @doc(description: "An input object that defines which bundle products to add to the cart.")): AddBundleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart") @doc(description: "Add one or more bundle products to the specified cart. We recommend using `addProductsToCart` instead.")
66
}
77

8-
input AddBundleProductsToCartInput {
9-
cart_id: String!
10-
cart_items: [BundleProductCartItemInput!]!
8+
input AddBundleProductsToCartInput @doc(description: "Defines the bundle products to add to the cart.") {
9+
cart_id: String! @doc(description: "The ID of the cart.")
10+
cart_items: [BundleProductCartItemInput!]! @doc(description: "An array of bundle products to add.")
1111
}
1212

13-
input BundleProductCartItemInput {
14-
data: CartItemInput!
15-
bundle_options:[BundleOptionInput!]!
16-
customizable_options:[CustomizableOptionInput!]
13+
input BundleProductCartItemInput @doc(description: "Defines a single bundle product.") {
14+
data: CartItemInput! @doc(description: "The quantity and SKU of the bundle product.")
15+
bundle_options:[BundleOptionInput!]! @doc(description: "A mandatory array of options for the bundle product, including each chosen option and specified quantity.")
16+
customizable_options:[CustomizableOptionInput!] @doc(description: "The ID and value of the option.")
1717
}
1818

19-
input BundleOptionInput {
20-
id: Int!
21-
quantity: Float!
22-
value: [String!]!
19+
input BundleOptionInput @doc(description: "Defines the input for a bundle option.") {
20+
id: Int! @doc(description: "The ID of the option.")
21+
quantity: Float! @doc(description: "The number of the selected item to add to the cart.")
22+
value: [String!]! @doc(description: "An array with the chosen value of the option.")
2323
}
2424

25-
type AddBundleProductsToCartOutput {
26-
cart: Cart!
25+
type AddBundleProductsToCartOutput @doc(description: "Contains details about the cart after adding bundle products.") {
26+
cart: Cart! @doc(description: "The cart after adding products.")
2727
}
2828

29-
type BundleCartItem implements CartItemInterface {
30-
customizable_options: [SelectedCustomizableOption]! @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
31-
bundle_options: [SelectedBundleOption!]! @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleOption")
29+
type BundleCartItem implements CartItemInterface @doc(description: "An implementation for bundle product cart items.") {
30+
customizable_options: [SelectedCustomizableOption]! @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions") @doc(description: "An array containing the customizable options the shopper selected.")
31+
bundle_options: [SelectedBundleOption!]! @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleOption") @doc(description: "An array containing the bundle options the shopper selected.")
3232
}
3333

34-
type SelectedBundleOption {
34+
type SelectedBundleOption @doc(description: "Contains details about a selected bundle option.") {
3535
id: Int! @deprecated(reason: "Use `uid` instead")
3636
uid: ID! @doc(description: "The unique ID for a `SelectedBundleOption` object")
37-
label: String!
38-
type: String!
39-
values: [SelectedBundleOptionValue!]!
37+
label: String! @doc(description: "The display name of the selected bundle product option.")
38+
type: String! @doc(description: "The type of selected bundle product option.")
39+
values: [SelectedBundleOptionValue!]! @doc(description: "An array of selected bundle option values.")
4040
}
4141

42-
type SelectedBundleOptionValue {
42+
type SelectedBundleOptionValue @doc(description: "Contains details about a value for a selected bundle option.") {
4343
id: Int! @doc(description: "Use `uid` instead")
4444
uid: ID! @doc(description: "The unique ID for a `SelectedBundleOptionValue` object")
45-
label: String!
46-
quantity: Float!
47-
price: Float!
45+
label: String! @doc(description: "The display name of the value for the selected bundle product option.")
46+
quantity: Float! @doc(description: "The quantity of the value for the selected bundle product option.")
47+
price: Float! @doc(description: "The price of the value for the selected bundle product option.")
4848
}
4949

50-
type BundleItem @doc(description: "BundleItem defines an individual item in a bundle product.") {
50+
type BundleItem @doc(description: "Defines an individual item within a bundle product.") {
5151
option_id: Int @deprecated(reason: "Use `uid` instead") @doc(description: "An ID assigned to each type of item in a bundle product.")
5252
uid: ID @doc(description: "The unique ID for a `BundleItem` object.")
5353
title: String @doc(description: "The display name of the item.")
5454
required: Boolean @doc(description: "Indicates whether the item must be included in the bundle.")
5555
type: String @doc(description: "The input type that the customer uses to select the item. Examples include radio button and checkbox.")
56-
position: Int @doc(description: "he relative position of this item compared to the other bundle items.")
56+
position: Int @doc(description: "A number indicating the sequence order of this item compared to the other bundle items.")
5757
sku: String @doc(description: "The SKU of the bundle product.")
5858
options: [BundleItemOption] @doc(description: "An array of additional options for this bundle item.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItemLinks")
5959
}
6060

61-
type BundleItemOption @doc(description: "BundleItemOption defines characteristics and options for a specific bundle item.") {
61+
type BundleItemOption @doc(description: "Defines the characteristics that comprise a specific bundle item and its options.") {
6262
id: Int @deprecated(reason: "Use `uid` instead") @doc(description: "The ID assigned to the bundled item option.")
6363
label: String @doc(description: "The text that identifies the bundled item option.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\Label")
64-
qty: Float @deprecated(reason: "The `qty` is deprecated. Use `quantity` instead.") @doc(description: "Indicates the quantity of this specific bundle item.")
65-
quantity: Float @doc(description: "Indicates the quantity of this specific bundle item.")
64+
qty: Float @deprecated(reason: "Use `quantity` instead.") @doc(description: "Indicates the quantity of this specific bundle item.")
65+
quantity: Float @doc(description: "The quantity of this specific bundle item.")
6666
position: Int @doc(description: "When a bundle item contains multiple options, the relative position of this option compared to the other options.")
6767
is_default: Boolean @doc(description: "Indicates whether this option is the default option.")
6868
price: Float @doc(description: "The price of the selected option.")
@@ -72,57 +72,57 @@ type BundleItemOption @doc(description: "BundleItemOption defines characteristic
7272
uid: ID! @doc(description: "The unique ID for a `BundleItemOption` object.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid")
7373
}
7474

75-
type BundleProduct implements ProductInterface, RoutableInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "Defines basic features of a bundle product and contains multiple BundleItems") {
75+
type BundleProduct implements ProductInterface, RoutableInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "Defines basic features of a bundle product and contains multiple BundleItems.") {
7676
price_view: PriceViewEnum @doc(description: "One of PRICE_RANGE or AS_LOW_AS.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\PriceView")
7777
dynamic_price: Boolean @doc(description: "Indicates whether the bundle product has a dynamic price.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicPrice")
78-
dynamic_sku: Boolean @doc(description: "Indicates whether the bundle product has a dynamic SK.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicSku")
78+
dynamic_sku: Boolean @doc(description: "Indicates whether the bundle product has a dynamic SKU.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicSku")
7979
ship_bundle_items: ShipBundleItemsEnum @doc(description: "Indicates whether to ship bundle items together or individually.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\ShipBundleItems")
8080
dynamic_weight: Boolean @doc(description: "Indicates whether the bundle product has a dynamically calculated weight.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicWeight")
8181
items: [BundleItem] @doc(description: "An array containing information about individual bundle items.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItems")
8282
}
8383

84-
enum PriceViewEnum @doc(description: "This enumeration defines whether a bundle product's price is displayed as the lowest possible value or as a range.") {
84+
enum PriceViewEnum @doc(description: "Defines whether a bundle product's price is displayed as the lowest possible value or as a range.") {
8585
PRICE_RANGE
8686
AS_LOW_AS
8787
}
8888

89-
enum ShipBundleItemsEnum @doc(description: "This enumeration defines whether bundle items must be shipped together.") {
89+
enum ShipBundleItemsEnum @doc(description: "Defines whether bundle items must be shipped together.") {
9090
TOGETHER
9191
SEPARATELY
9292
}
9393

94-
type BundleOrderItem implements OrderItemInterface {
95-
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
94+
type BundleOrderItem implements OrderItemInterface @doc(description: "Defines bundle product options for `OrderItemInterface`.") {
95+
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
9696
}
9797

98-
type BundleInvoiceItem implements InvoiceItemInterface{
99-
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
98+
type BundleInvoiceItem implements InvoiceItemInterface @doc(description: "Defines bundle product options for `InvoiceItemInterface`.") {
99+
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to an invoiced bundle product.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
100100
}
101101

102-
type BundleShipmentItem implements ShipmentItemInterface {
103-
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
102+
type BundleShipmentItem implements ShipmentItemInterface @doc(description: "Defines bundle product options for `ShipmentItemInterface`.") {
103+
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to a shipped product.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
104104
}
105105

106-
type BundleCreditMemoItem implements CreditMemoItemInterface {
107-
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
106+
type BundleCreditMemoItem implements CreditMemoItemInterface @doc(description: "Defines bundle product options for `CreditMemoItemInterface`.") {
107+
bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to a bundle product that is part of a credit memo.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
108108
}
109109

110-
type ItemSelectedBundleOption @doc(description: "A list of options of the selected bundle product") {
111-
id: ID! @deprecated(reason: "Use `uid` instead") @doc(description: "The unique ID for a `ItemSelectedBundleOption` object")
112-
uid: ID! @doc(description: "The unique ID for a `ItemSelectedBundleOption` object")
113-
label: String! @doc(description: "The label of the option")
114-
values: [ItemSelectedBundleOptionValue] @doc(description: "A list of products that represent the values of the parent option")
110+
type ItemSelectedBundleOption @doc(description: "A list of options of the selected bundle product.") {
111+
id: ID! @deprecated(reason: "Use `uid` instead.") @doc(description: "The unique ID for a `ItemSelectedBundleOption` object.")
112+
uid: ID! @doc(description: "The unique ID for a `ItemSelectedBundleOption` object.")
113+
label: String! @doc(description: "The label of the option.")
114+
values: [ItemSelectedBundleOptionValue] @doc(description: "A list of products that represent the values of the parent option.")
115115
}
116116

117-
type ItemSelectedBundleOptionValue @doc(description: "A list of values for the selected bundle product") {
118-
id: ID! @deprecated(reason: "Use `uid` instead") @doc(description: "The unique ID for a `ItemSelectedBundleOptionValue` object")
119-
uid: ID! @doc(description: "The unique ID for a `ItemSelectedBundleOptionValue` object")
120-
product_name: String! @doc(description: "The name of the child bundle product")
121-
product_sku: String! @doc(description: "The SKU of the child bundle product")
122-
quantity: Float! @doc(description: "Indicates how many of this bundle product were ordered")
123-
price: Money! @doc(description: "The price of the child bundle product")
117+
type ItemSelectedBundleOptionValue @doc(description: "A list of values for the selected bundle product.") {
118+
id: ID! @deprecated(reason: "Use `uid` instead.") @doc(description: "The unique ID for a `ItemSelectedBundleOptionValue` object.")
119+
uid: ID! @doc(description: "The unique ID for a `ItemSelectedBundleOptionValue` object.")
120+
product_name: String! @doc(description: "The name of the child bundle product.")
121+
product_sku: String! @doc(description: "The SKU of the child bundle product.")
122+
quantity: Float! @doc(description: "The number of this bundle product that were ordered.")
123+
price: Money! @doc(description: "The price of the child bundle product.")
124124
}
125125

126-
type BundleWishlistItem implements WishlistItemInterface {
127-
bundle_options: [SelectedBundleOption!] @doc(description: "An array containing information about the selected bundle items") @resolver(class: "\\Magento\\BundleGraphQl\\Model\\Wishlist\\BundleOptions")
126+
type BundleWishlistItem implements WishlistItemInterface @doc(description: "Defines bundle product options for `WishlistItemInterface`.") {
127+
bundle_options: [SelectedBundleOption!] @doc(description: "An array containing information about the selected bundle items.") @resolver(class: "\\Magento\\BundleGraphQl\\Model\\Wishlist\\BundleOptions")
128128
}

app/code/Magento/CatalogCmsGraphQl/etc/schema.graphqls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# See COPYING.txt for license details.
33

44
interface CategoryInterface {
5-
cms_block: CmsBlock @doc(description: "Category CMS Block.") @resolver(class: "Magento\\CatalogCmsGraphQl\\Model\\Resolver\\Category\\Block")
6-
}
5+
cms_block: CmsBlock @doc(description: "Contains a category CMS block.") @resolver(class: "Magento\\CatalogCmsGraphQl\\Model\\Resolver\\Category\\Block")
6+
}

app/code/Magento/CatalogCustomerGraphQl/etc/schema.graphqls

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# See COPYING.txt for license details.
33

44
interface ProductInterface {
5-
tier_prices: [ProductTierPrices] @deprecated(reason: "Use price_tiers for product tier price information.") @doc(description: "An array of ProductTierPrices objects.") @resolver(class: "Magento\\CatalogCustomerGraphQl\\Model\\Resolver\\TierPrices")
6-
price_tiers: [TierPrice] @doc(description: "An array of TierPrice objects.") @resolver(class: "Magento\\CatalogCustomerGraphQl\\Model\\Resolver\\PriceTiers")
5+
tier_prices: [ProductTierPrices] @deprecated(reason: "Use `price_tiers` for product tier price information.") @doc(description: "An array of ProductTierPrices objects.") @resolver(class: "Magento\\CatalogCustomerGraphQl\\Model\\Resolver\\TierPrices")
6+
price_tiers: [TierPrice] @doc(description: "An array of `TierPrice` objects.") @resolver(class: "Magento\\CatalogCustomerGraphQl\\Model\\Resolver\\PriceTiers")
77
}
88

9-
type ProductTierPrices @doc(description: "ProductTierPrices is deprecated and has been replaced by TierPrice. The ProductTierPrices object defines a tier price, which is a quantity discount offered to a specific customer group.") {
10-
customer_group_id: String @deprecated(reason: "customer_group_id is not relevant for storefront.") @doc(description: "The ID of the customer group.")
11-
qty: Float @deprecated(reason: "ProductTierPrices is deprecated, use TierPrice.quantity.") @doc(description: "The number of items that must be purchased to qualify for tier pricing.")
12-
value: Float @deprecated(reason: "ProductTierPrices is deprecated. Use TierPrice.final_price") @doc(description: "The price of the fixed price item.")
13-
percentage_value: Float @deprecated(reason: "ProductTierPrices is deprecated. Use TierPrice.discount.") @doc(description: "The percentage discount of the item.")
14-
website_id: Float @deprecated(reason: "website_id is not relevant for storefront.") @doc(description: "The ID assigned to the website.")
9+
type ProductTierPrices @doc(description: "Deprecated. Use `TierPrice` instead. Defines a tier price, which is a quantity discount offered to a specific customer group.") {
10+
customer_group_id: String @deprecated(reason: "Not relevant for the storefront.") @doc(description: "The ID of the customer group.")
11+
qty: Float @deprecated(reason: "Use `TierPrice.quantity` instead.") @doc(description: "The number of items that must be purchased to qualify for tier pricing.")
12+
value: Float @deprecated(reason: "Use `TierPrice.final_price` instead.") @doc(description: "The price of the fixed price item.")
13+
percentage_value: Float @deprecated(reason: "Use `TierPrice.discount` instead.") @doc(description: "The percentage discount of the item.")
14+
website_id: Float @deprecated(reason: "Not relevant for the storefront.") @doc(description: "The ID assigned to the website.")
1515
}
1616

1717

18-
type TierPrice @doc(description: "A price based on the quantity purchased.") {
19-
final_price: Money @doc(desription: "The price of the product at this tier.")
18+
type TierPrice @doc(description: "Defines a price based on the quantity purchased.") {
19+
final_price: Money @doc(description: "The price of the product at this tier.")
2020
quantity: Float @doc(description: "The minimum number of items that must be purchased to qualify for this price tier.")
2121
discount: ProductDiscount @doc(description: "The price discount that this tier represents.")
2222
}

0 commit comments

Comments
 (0)