Merge pull request #3796 from magento-tsg/2.2.8-develop-pr79

[TSG] Backporting for 2.2 (pr79) (2.2.8-develop)

Author: Alexander Akimov

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

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -95,7 +94,7 @@ protected function _updateShoppingCart()
      */
     public function execute()
     {
-        if (!$this->getRequest()->isPost() || !$this->_formKeyValidator->validate($this->getRequest())) {
+        if (!$this->_formKeyValidator->validate($this->getRequest())) {
             return $this->resultRedirectFactory->create()->setPath('*/*/');
         }
 

app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php

@@ -109,8 +109,10 @@ private function updateRelatedProductTypes(string $attributeId, array $relatedPr
      */
     private function upgradeQuoteItemPrice(ModuleDataSetupInterface $setup)
     {
-        $connection = $setup->getConnection();
-        $quoteItemTable = $setup->getTable('quote_item');
+        $connectionName = 'checkout';
+        $connection = $setup->getConnection($connectionName);
+        $quoteItemTable = $setup->getTable('quote_item', $connectionName);
+
         $select = $connection->select();
         $select->joinLeft(
             ['qi2' => $quoteItemTable],
@@ -121,10 +123,10 @@ private function upgradeQuoteItemPrice(ModuleDataSetupInterface $setup)
             . ' AND qi1.parent_item_id IS NOT NULL'
             . ' AND qi2.product_type = "' . Configurable::TYPE_CODE . '"'
         );
-        $updateQuoteItem = $setup->getConnection()->updateFromSelect(
+        $updateQuoteItem = $connection->updateFromSelect(
             $select,
             ['qi1' => $quoteItemTable]
         );
-        $setup->getConnection()->query($updateQuoteItem);
+        $connection->query($updateQuoteItem);
     }
 }

app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php

@@ -9,7 +9,7 @@
 use Magento\Sales\Model\Order;
 
 /**
- * Class to check order State.
+ * Class to check and adjust order state/status.
  */
 class State
 {
@@ -31,7 +31,10 @@ public function check(Order $order)
         }
 
         if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice()) {
-            if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE]) && !$order->canCreditmemo()) {
+            if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE])
+                && !$order->canCreditmemo()
+                && !$order->canShip()
+            ) {
                 $order->setState(Order::STATE_CLOSED)
                     ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
             } elseif ($currentState === Order::STATE_PROCESSING && !$order->canShip()) {

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php

@@ -118,13 +118,13 @@ public function stateCheckDataProvider(): array
     {
         return [
             'processing - !canCreditmemo!canShip -> closed' =>
-                [false, 1, false, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED],
+                [false, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_CLOSED],
             'complete - !canCreditmemo,!canShip -> closed' =>
-                [false, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED],
-            'processing - !canCreditmemo,canShip -> closed' =>
-                [false, 1, true, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED],
-            'complete - !canCreditmemo,canShip -> closed' =>
-                [false, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED],
+                [false, 1, false, 1, Order::STATE_COMPLETE, Order::STATE_CLOSED],
+            'processing - !canCreditmemo,canShip -> processing' =>
+                [false, 1, true, 2, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
+            'complete - !canCreditmemo,canShip -> complete' =>
+                [false, 1, true, 1, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
             'processing - canCreditmemo,!canShip -> complete' =>
                 [true, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_COMPLETE],
             'complete - canCreditmemo,!canShip -> complete' =>

app/code/Magento/Ui/view/base/web/templates/form/field.html

@@ -8,7 +8,7 @@
      visible="visible"
      css="$data.additionalClasses"
      attr="'data-index': index">
-    <div class="admin__field-label">
+    <div class="admin__field-label" if="$data.label" visible="$data.labelVisible">
         <label if="$data.label" visible="$data.labelVisible"  attr="for: uid">
             <span translate="label" attr="'data-config-scope': $data.scopeLabel" />
         </label>

app/code/Magento/Ui/view/base/web/templates/group/group.html

@@ -8,10 +8,11 @@
           visible="visible"
           css="_required: required"
           attr="'data-index': index">
-    <legend class="admin__field-label" if="showLabel">
-        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
-    </legend>
-
+    <div if="showLabel" class="admin__field-label">
+        <legend>
+            <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
+        </legend>
+    </div>
     <div class="admin__field-control" css="$data.additionalClasses">
         <each args="elems">
             <if args="visible()" if="!$data.additionalForGroup">

app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less

@@ -3,6 +3,8 @@
 //  * See COPYING.txt for license details.
 //  */
 
+@import 'module/_rma.less';
+
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .rma-request-details,
     .rma-wrapper .order-shipping-address {

app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/module/_rma.less

@@ -0,0 +1,15 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Layout
+//  ---------------------------------------------
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+    .rma-wrapper .order-shipping-method {
+        float: right;
+        #mix-grid .width(6,12);
+    }
+}

app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less

@@ -207,7 +207,6 @@
 
         &:before {
             .appearing__off();
-            content: '.';
             margin-left: -7px;
             overflow: hidden;
         }
@@ -679,10 +678,13 @@
                 margin: 0;
                 opacity: 1;
                 position: static;
-                text-align: left;
             }
         }
 
+        .admin__field-label {
+            text-align: left;
+        }
+
         &:nth-child(n + 2) {
             &:not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date) {
                 > .admin__field-label[class] {

dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php

@@ -240,7 +240,6 @@ public function testUpdatePostAction()
             'update_cart_action' => 'update_qty',
             'form_key' => $formKey->getFormKey(),
         ];
-        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         /** @var $customerSession \Magento\Customer\Model\Session */
         $customerSession = $this->_objectManager->create(\Magento\Customer\Model\Session::class);