Merge branch '2.4.1-develop' of github.com:magento/magento2ce into 2.4.1-develop-MC-37097

Gabriel Galvao da Gama · Gabriel Galvao da Gama · commit a1c915716718 · 2020-09-03T11:28:12.000+01:00
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableCartItemOptions.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableCartItemOptions.php
@@ -55,6 +55,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $result = [];
         foreach ($this->configurationHelper->getOptions($cartItem) as $option) {
+            if (isset($option['option_type'])) {
+                //Don't return customizable options in this resolver
+                continue;
+            }
             $result[] = [
                 'id' => $option['option_id'],
                 'option_label' => $option['label'],
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -58,7 +58,7 @@ input ConfigurableProductCartItemInput {
 }
 
 type ConfigurableCartItem implements CartItemInterface {
-    customizable_options: [SelectedCustomizableOption]!
+    customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
     configurable_options: [SelectedConfigurableOption!]! @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ConfigurableCartItemOptions")
 }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,9 +7,11 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\QuoteRepository;
 
 /**
  * Set single shipping address for a specified shopping cart
@@ -26,16 +28,25 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
      */
     private $getShippingAddress;
 
+    /**
+     * @var QuoteRepository
+     */
+    private $quoteRepository;
+
     /**
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      * @param GetShippingAddress $getShippingAddress
+     * @param QuoteRepository|null $quoteRepository
      */
     public function __construct(
         AssignShippingAddressToCart $assignShippingAddressToCart,
-        GetShippingAddress $getShippingAddress
+        GetShippingAddress $getShippingAddress,
+        QuoteRepository $quoteRepository = null
     ) {
         $this->assignShippingAddressToCart = $assignShippingAddressToCart;
         $this->getShippingAddress = $getShippingAddress;
+        $this->quoteRepository = $quoteRepository
+            ?? ObjectManager::getInstance()->get(QuoteRepository::class);
     }
 
     /**
@@ -70,5 +81,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
             throw $e;
         }
         $this->assignShippingAddressToCart->execute($cart, $shippingAddress);
+        // trigger quote re-evaluation after address change
+        $this->quoteRepository->save($cart);
     }
 }
diff --git a/app/code/Magento/ReviewGraphQl/etc/graphql/di.xml b/app/code/Magento/ReviewGraphQl/etc/graphql/di.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigData" xsi:type="array">
+                <item name="product_reviews_enabled" xsi:type="string">catalog/review/active</item>
+                <item name="allow_guests_to_write_product_reviews" xsi:type="string">catalog/review/allow_guest</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
@@ -39,14 +39,14 @@ type ProductReviewRatingsMetadata {
 }
 
 type ProductReviewRatingMetadata {
-    id: String! @doc(description: "Base64 encoded rating ID.")
+    id: String! @doc(description: "An encoded rating ID.")
     name: String! @doc(description: "The label assigned to an aspect of a product that is being rated, such as quality or price")
     values: [ProductReviewRatingValueMetadata!]! @doc(description: "List of product review ratings sorted by position.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingValueMetadata")
 }
 
 type ProductReviewRatingValueMetadata {
-    value_id: String! @doc(description: "Base 64 encoded rating value id.")
-    value: String! @doc(description: "e.g Good, Perfect, 3, 4, 5")
+    value_id: String! @doc(description: "An encoded rating value id.")
+    value: String! @doc(description: "A ratings scale, such as the number of stars awarded")
 }
 
 type Customer {
@@ -73,6 +73,11 @@ input CreateProductReviewInput {
 }
 
 input ProductReviewRatingInput {
-    id: String! @doc(description: "Base64 encoded rating ID.")
-    value_id: String! @doc(description: "Base 64 encoded rating value id.")
+    id: String! @doc(description: "An encoded rating ID.")
+    value_id: String! @doc(description: "An encoded rating value id.")
+}
+
+type StoreConfig @doc(description: "The type contains information about a store config") {
+    product_reviews_enabled : String @doc(description: "Indicates whether product reviews are enabled. Possible values: 1 (Yes) and 0 (No)")
+    allow_guests_to_write_product_reviews : String @doc(description: "Indicates whether guest users can write product reviews. Possible values: 1 (Yes) and 0 (No)")
 }
diff --git a/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php b/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
@@ -8,6 +8,7 @@
 namespace Magento\Wishlist\Model\Wishlist;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -113,6 +114,12 @@ private function addItemToWishlist(Wishlist $wishlist, WishlistItem $wishlistIte
         }
 
         try {
+            if ((int)$wishlistItem->getQuantity() === 0) {
+                throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
+            }
+            if ($product->getStatus() == Status::STATUS_DISABLED) {
+                throw new LocalizedException(__("The product is disabled"));
+            }
             $options = $this->buyRequestBuilder->build($wishlistItem, (int) $product->getId());
             $result = $wishlist->addNewItem($product, $options);
 
diff --git a/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php b/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Wishlist\Model\Wishlist;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Wishlist\Model\Item as WishlistItem;
 use Magento\Wishlist\Model\ItemFactory as WishlistItemFactory;
@@ -95,6 +96,12 @@ private function updateItemInWishlist(Wishlist $wishlist, WishlistItemData $wish
             $wishlistItem = $this->wishlistItemFactory->create();
             $this->wishlistItemResource->load($wishlistItem, $wishlistItemData->getId());
             $wishlistItem->setDescription($wishlistItemData->getDescription());
+            if ((int)$wishlistItemData->getQuantity() === 0) {
+                throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
+            }
+            if ($wishlistItem->getProduct()->getStatus() == Status::STATUS_DISABLED) {
+                throw new LocalizedException(__("The product is disabled"));
+            }
             $resultItem = $wishlist->updateItem($wishlistItem, $options);
 
             if (is_string($resultItem)) {
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
@@ -83,7 +83,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $customerId = $context->getUserId();
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php
@@ -54,7 +54,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         if (false === $context->getExtensionAttributes()->getIsCustomer()) {
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php
@@ -83,7 +83,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $customerId = $context->getUserId();
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
@@ -83,7 +83,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $customerId = $context->getUserId();
@@ -101,7 +101,7 @@ public function resolve(
         }
 
         $wishlistItems = $args['wishlistItems'];
-        $wishlistItems = $this->getWishlistItems($wishlistItems);
+        $wishlistItems = $this->getWishlistItems($wishlistItems, $wishlist);
         $wishlistOutput = $this->updateProductsInWishlist->execute($wishlist, $wishlistItems);
 
         if (count($wishlistOutput->getErrors()) !== count($wishlistItems)) {
@@ -126,14 +126,27 @@ function (Error $error) {
      * Get DTO wishlist items
      *
      * @param array $wishlistItemsData
+     * @param Wishlist $wishlist
      *
      * @return array
      */
-    private function getWishlistItems(array $wishlistItemsData): array
+    private function getWishlistItems(array $wishlistItemsData, Wishlist $wishlist): array
     {
         $wishlistItems = [];
 
         foreach ($wishlistItemsData as $wishlistItemData) {
+            if (!isset($wishlistItemData['quantity'])) {
+                $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
+                if ($wishlistItem !== null) {
+                    $wishlistItemData['quantity'] = (float) $wishlistItem->getQty();
+                }
+            }
+            if (!isset($wishlistItemData['description'])) {
+                $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
+                if ($wishlistItem !== null) {
+                    $wishlistItemData['description'] = $wishlistItem->getDescription();
+                }
+            }
             $wishlistItems[] = (new WishlistItemFactory())->create($wishlistItemData);
         }
 
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
@@ -63,7 +63,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $customerId = $context->getUserId();
diff --git a/app/code/Magento/WishlistGraphQl/etc/graphql/di.xml b/app/code/Magento/WishlistGraphQl/etc/graphql/di.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigData" xsi:type="array">
+                <item name="magento_wishlist_general_is_enabled" xsi:type="string">wishlist/general/active</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -40,8 +40,8 @@ type Mutation {
 }
 
 input WishlistItemInput @doc(description: "Defines the items to add to a wish list") {
-    sku: String @doc(description: "The SKU of the product to add. For complex product types, specify the child product SKU")
-    quantity: Float @doc(description: "The amount or number of items to add")
+    sku: String! @doc(description: "The SKU of the product to add. For complex product types, specify the child product SKU")
+    quantity: Float! @doc(description: "The amount or number of items to add")
     parent_sku: String @doc(description: "For complex product types, the SKU of the parent product")
     selected_options: [ID!] @doc(description: "An array of strings corresponding to options the customer selected")
     entered_options: [EnteredOptionInput!] @doc(description: "An array of options that the customer entered")
@@ -58,9 +58,9 @@ type RemoveProductsFromWishlistOutput @doc(description: "Contains the customer's
 }
 
 input WishlistItemUpdateInput @doc(description: "Defines updates to items in a wish list") {
-    wishlist_item_id: ID @doc(description: "The ID of the wishlist item to update")
+    wishlist_item_id: ID! @doc(description: "The ID of the wishlist item to update")
     quantity: Float @doc(description: "The new amount or number of this item")
-    description: String @doc(description: "Describes the update")
+    description: String @doc(description: "Customer-entered comments about the item")
     selected_options: [ID!] @doc(description: "An array of strings corresponding to options the customer selected")
     entered_options: [EnteredOptionInput!] @doc(description: "An array of options that the customer entered")
 }
@@ -79,3 +79,7 @@ enum WishListUserInputErrorType {
     PRODUCT_NOT_FOUND
     UNDEFINED
 }
+
+type StoreConfig {
+    magento_wishlist_general_is_enabled: String @doc(description: "Indicates whether wishlists are enabled (1) or disabled (0)")
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown.php
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown_rollback.php

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ input ConfigurableProductCartItemInput {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`type ConfigurableCartItem implements CartItemInterface {`
`61`		`- customizable_options: [SelectedCustomizableOption]!`
	`61`	`+ customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")`
`62`	`62`	`configurable_options: [SelectedConfigurableOption!]! @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ConfigurableCartItemOptions")`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,14 @@ type ProductReviewRatingsMetadata {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`type ProductReviewRatingMetadata {`
`42`		`- id: String! @doc(description: "Base64 encoded rating ID.")`
	`42`	`+ id: String! @doc(description: "An encoded rating ID.")`
`43`	`43`	`name: String! @doc(description: "The label assigned to an aspect of a product that is being rated, such as quality or price")`
`44`	`44`	`values: [ProductReviewRatingValueMetadata!]! @doc(description: "List of product review ratings sorted by position.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingValueMetadata")`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`type ProductReviewRatingValueMetadata {`
`48`		`- value_id: String! @doc(description: "Base 64 encoded rating value id.")`
`49`		`- value: String! @doc(description: "e.g Good, Perfect, 3, 4, 5")`
	`48`	`+ value_id: String! @doc(description: "An encoded rating value id.")`
	`49`	`+ value: String! @doc(description: "A ratings scale, such as the number of stars awarded")`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`type Customer {`
`@@ -73,6 +73,11 @@ input CreateProductReviewInput {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`input ProductReviewRatingInput {`
`76`		`- id: String! @doc(description: "Base64 encoded rating ID.")`
`77`		`- value_id: String! @doc(description: "Base 64 encoded rating value id.")`
	`76`	`+ id: String! @doc(description: "An encoded rating ID.")`
	`77`	`+ value_id: String! @doc(description: "An encoded rating value id.")`
	`78`	`+}`
	`79`	`+`
	`80`	`+type StoreConfig @doc(description: "The type contains information about a store config") {`
	`81`	`+ product_reviews_enabled : String @doc(description: "Indicates whether product reviews are enabled. Possible values: 1 (Yes) and 0 (No)")`
	`82`	`+ allow_guests_to_write_product_reviews : String @doc(description: "Indicates whether guest users can write product reviews. Possible values: 1 (Yes) and 0 (No)")`
`78`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function resolve(`
`83`	`83`	`array $args = null`
`84`	`84`	`) {`
`85`	`85`	`if (!$this->wishlistConfig->isEnabled()) {`
`86`		`- throw new GraphQlInputException(__('The wishlist is not currently available.'));`
	`86`	`+ throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`$customerId = $context->getUserId();`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function resolve(`
`54`	`54`	`array $args = null`
`55`	`55`	`) {`
`56`	`56`	`if (!$this->wishlistConfig->isEnabled()) {`
`57`		`- throw new GraphQlInputException(__('The wishlist is not currently available.'));`
	`57`	`+ throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if (false === $context->getExtensionAttributes()->getIsCustomer()) {`