🔃 [Magento Community Engineering] Community Contributions - 2.3-develop

Accepted Community Pull Requests:
 - #24476: Fix lib-button-as-link not using color argument (by @Leland)
 - #24478: add validation greater than zero number for MySQL Message Queue Cleanup (by @ravi-chandra3197)
 - #24467: Fix issue with "Apply Discount Code" input hidden, when code is applied (by @iGerchak)
 - #24380: fix issue #24366 - Updating cart quantity  (by @GDauer)
 - #24457: Fix for bug: If multiple children had the same sort order only one of� (by @oskarolaussen)
 - #24077: Added changes to make product price level field disabled when alert are enabled (by @arushibansal013)
 - #24274: Resolve error when call getRssUrl() method (by @edenduong)
 - #21424: Magento2 attribute option does not validate for existing records before insert 16852 (by @novikor)


Fixed GitHub Issues:
 - #24366: Updating cart with quantity that results in error, causes wrong error message to be displayed when backorders involved. (reported by @gwharton) has been fixed in #24380 by @GDauer in 2.3-develop branch
   Related commits:
     1. 48ae1fc
     2. cc78567
     3. 0a67f76
     4. d2a09d3
     5. 720799b
     6. 57a3546
     7. 650c215

 - #23890: Price attribute is enabled for dynamic price type on bundle product edit page in admin (reported by @katesuykovskaya) has been fixed in #24077 by @arushibansal013 in 2.3-develop branch
   Related commits:
     1. 7170102
     2. 87732f3
     3. 375efd1
     4. 035800e
     5. 1951578
     6. 09cd623

 - #16852: Magento2 Attribute option does not validate for existing records before insert (reported by @zeeshan2523806) has been fixed in #21424 by @novikor in 2.3-develop branch
   Related commits:
     1. e79e57b
     2. a8ec393

Author: magento-engcom-team

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePrice.php

@@ -39,9 +39,9 @@ public function __construct(
         $this->locator = $locator;
         $this->arrayManager = $arrayManager;
     }
-
+    
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyMeta(array $meta)
     {
@@ -64,7 +64,7 @@ public function modifyMeta(array $meta)
             $this->arrayManager->findPath(
                 ProductAttributeInterface::CODE_PRICE,
                 $meta,
-                null,
+                self::DEFAULT_GENERAL_PANEL . '/children',
                 'children'
             ) . static::META_CONFIG_PATH,
             $meta,
@@ -94,7 +94,7 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {

app/code/Magento/Catalog/Block/Product/View/Details.php

@@ -37,11 +37,11 @@ public function getGroupSortedChildNames(string $groupName, string $callback): a
             $alias = $layout->getElementAlias($childName);
             $sortOrder = (int)$this->getChildData($alias, 'sort_order') ?? 0;
 
-            $childNamesSortOrder[$sortOrder] = $childName;
+            $childNamesSortOrder[$childName] = $sortOrder;
         }
 
-        ksort($childNamesSortOrder, SORT_NUMERIC);
+        asort($childNamesSortOrder, SORT_NUMERIC);
 
-        return $childNamesSortOrder;
+        return array_keys($childNamesSortOrder);
     }
 }

app/code/Magento/Checkout/Controller/Cart/UpdateItemQty.php

@@ -8,16 +8,25 @@
 namespace Magento\Checkout\Controller\Cart;
 
 use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
 use Magento\Quote\Model\Quote\Item;
 use Psr\Log\LoggerInterface;
 
-class UpdateItemQty extends \Magento\Framework\App\Action\Action
+/**
+ * UpdateItemQty ajax request
+ *
+ * @package Magento\Checkout\Controller\Cart
+ */
+class UpdateItemQty extends Action implements HttpPostActionInterface
 {
+
     /**
      * @var RequestQuantityProcessor
      */
@@ -44,13 +53,16 @@ class UpdateItemQty extends \Magento\Framework\App\Action\Action
     private $logger;
 
     /**
-     * @param Context $context,
+     * UpdateItemQty constructor
+     *
+     * @param Context $context
      * @param RequestQuantityProcessor $quantityProcessor
      * @param FormKeyValidator $formKeyValidator
      * @param CheckoutSession $checkoutSession
      * @param Json $json
      * @param LoggerInterface $logger
      */
+
     public function __construct(
         Context $context,
         RequestQuantityProcessor $quantityProcessor,
@@ -68,30 +80,26 @@ public function __construct(
     }
 
     /**
+     * Controller execute method
+     *
      * @return void
      */
     public function execute()
     {
         try {
-            if (!$this->formKeyValidator->validate($this->getRequest())) {
-                throw new LocalizedException(
-                    __('Something went wrong while saving the page. Please refresh the page and try again.')
-                );
-            }
+            $this->validateRequest();
+            $this->validateFormKey();
 
             $cartData = $this->getRequest()->getParam('cart');
-            if (!is_array($cartData)) {
-                throw new LocalizedException(
-                    __('Something went wrong while saving the page. Please refresh the page and try again.')
-                );
-            }
+
+            $this->validateCartData($cartData);
 
             $cartData = $this->quantityProcessor->process($cartData);
             $quote = $this->checkoutSession->getQuote();
 
             foreach ($cartData as $itemId => $itemInfo) {
                 $item = $quote->getItemById($itemId);
-                $qty = isset($itemInfo['qty']) ? (double)$itemInfo['qty'] : 0;
+                $qty = isset($itemInfo['qty']) ? (double) $itemInfo['qty'] : 0;
                 if ($item) {
                     $this->updateItemQuantity($item, $qty);
                 }
@@ -111,11 +119,13 @@ public function execute()
      *
      * @param Item $item
      * @param float $qty
+     * @return void
      * @throws LocalizedException
      */
     private function updateItemQuantity(Item $item, float $qty)
     {
         if ($qty > 0) {
+            $item->clearMessage();
             $item->setQty($qty);
 
             if ($item->getHasError()) {
@@ -145,9 +155,7 @@ private function jsonResponse(string $error = '')
      */
     private function getResponseData(string $error = ''): array
     {
-        $response = [
-            'success' => true,
-        ];
+        $response = ['success' => true];
 
         if (!empty($error)) {
             $response = [
@@ -158,4 +166,48 @@ private function getResponseData(string $error = ''): array
 
         return $response;
     }
+
+    /**
+     * Validates the Request HTTP method
+     *
+     * @return void
+     * @throws NotFoundException
+     */
+    private function validateRequest()
+    {
+        if ($this->getRequest()->isPost() === false) {
+            throw new NotFoundException(__('Page Not Found'));
+        }
+    }
+
+    /**
+     * Validates form key
+     *
+     * @return void
+     * @throws LocalizedException
+     */
+    private function validateFormKey()
+    {
+        if (!$this->formKeyValidator->validate($this->getRequest())) {
+            throw new LocalizedException(
+                __('Something went wrong while saving the page. Please refresh the page and try again.')
+            );
+        }
+    }
+
+    /**
+     * Validates cart data
+     *
+     * @param array|null $cartData
+     * @return void
+     * @throws LocalizedException
+     */
+    private function validateCartData($cartData = null)
+    {
+        if (!is_array($cartData)) {
+            throw new LocalizedException(
+                __('Something went wrong while saving the page. Please refresh the page and try again.')
+            );
+        }
+    }
 }

app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml

@@ -7,10 +7,13 @@
 /**
  * @var \Magento\Framework\View\Element\AbstractBlock $block
  */
+
+// We should use strlen function because coupon code could be "0", converted to bool will lead to false
+$hasCouponCode = (bool) strlen($block->getCouponCode());
 ?>
 <div class="block discount"
      id="block-discount"
-     data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'
+     data-mage-init='{"collapsible":{"active": <?= $hasCouponCode ? 'true' : 'false' ?>, "openedState": "active", "saveState": false}}'
 >
     <div class="title" data-role="title">
         <strong id="block-discount-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Apply Discount Code')) ?></strong>
@@ -23,7 +26,7 @@
                                                "removeCouponSelector": "#remove-coupon",
                                                "applyButton": "button.action.apply",
                                                "cancelButton": "button.action.cancel"}}'>
-            <div class="fieldset coupon<?= strlen($block->getCouponCode()) ? ' applied' : '' ?>">
+            <div class="fieldset coupon<?= $hasCouponCode ? ' applied' : '' ?>">
                 <input type="hidden" name="remove" id="remove-coupon" value="0" />
                 <div class="field">
                     <label for="coupon_code" class="label"><span><?= $block->escapeHtml(__('Enter discount code')) ?></span></label>
@@ -34,14 +37,14 @@
                                name="coupon_code"
                                value="<?= $block->escapeHtmlAttr($block->getCouponCode()) ?>"
                                placeholder="<?= $block->escapeHtmlAttr(__('Enter discount code')) ?>"
-                                <?php if (strlen($block->getCouponCode())) :?>
+                                <?php if ($hasCouponCode) :?>
                                    disabled="disabled"
                                 <?php endif; ?>
                         />
                     </div>
                 </div>
                 <div class="actions-toolbar">
-                    <?php if (!strlen($block->getCouponCode())) :?>
+                    <?php if (!$hasCouponCode) :?>
                     <div class="primary">
                         <button class="action apply primary" type="button" value="<?= $block->escapeHtmlAttr(__('Apply Discount')) ?>">
                             <span><?= $block->escapeHtml(__('Apply Discount')) ?></span>
@@ -54,7 +57,7 @@
                     <?php endif; ?>
                 </div>
             </div>
-            <?php if (!strlen($block->getCouponCode())) : ?>
+            <?php if (!$hasCouponCode) : ?>
                 <?= /* @noEscape */ $block->getChildHtml('captcha') ?>
             <?php endif; ?>
         </form>