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

 - merged with '2.3-develop-expedited-prs' branch

Author: magento-engcom-team

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -592,7 +592,7 @@ public function getHintHtml()
                 'What is this?'
             ) . '"' . ' class="admin__field-tooltip-action action-help"><span>' . __(
                 'What is this?'
-            ) . '</span></a></span>' . ' </div>';
+            ) . '</span></a>' . ' </div>';
         }
         return $html;
     }

app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml

@@ -19,26 +19,41 @@
                         <label>Environment</label>
                         <source_model>Magento\CardinalCommerce\Model\Adminhtml\Source\Environment</source_model>
                         <config_path>three_d_secure/cardinal/environment</config_path>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                     <field id="org_unit_id" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Org Unit Id</label>
                         <config_path>three_d_secure/cardinal/org_unit_id</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                     <field id="api_key" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>API Key</label>
                         <config_path>three_d_secure/cardinal/api_key</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                     <field id="api_identifier" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>API Identifier</label>
                         <config_path>three_d_secure/cardinal/api_identifier</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                     <field id="debug" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Debug</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>three_d_secure/cardinal/debug</config_path>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                 </group>
             </group>

app/code/Magento/Paypal/view/adminhtml/web/styles.css

@@ -28,9 +28,9 @@
 .paypal-recommended-header > .admin__collapsible-block > a::before {content: "" !important;}
 .paypal-other-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
 .paypal-other-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}
-.paypal-other-header > .admin__collapsible-block > a {color: #007bdb !important; text-align: right;}
 .payments-other-header > .admin__collapsible-block > a,
-.paypal-recommended-header > .admin__collapsible-block > a {display: inline-block;}
+.paypal-recommended-header > .admin__collapsible-block > a,
+.paypal-other-header > .admin__collapsible-block > a {display: inline-block;}
 .payments-other-header > .admin__collapsible-block > a::before,
 .paypal-recommended-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
 .payments-other-header > .admin__collapsible-block > a.open::before,

app/code/Magento/Quote/Api/CartManagementInterface.php

@@ -52,6 +52,9 @@ public function getCartForCustomer($customerId);
      * @param int $customerId The customer ID.
      * @param int $storeId
      * @return boolean
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function assignCustomer($cartId, $customerId, $storeId);
 

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -298,22 +298,28 @@ public function assignCustomer($cartId, $customerId, $storeId)
             );
         }
         try {
-            $this->quoteRepository->getForCustomer($customerId);
-            throw new StateException(
-                __("The customer can't be assigned to the cart because the customer already has an active cart.")
-            );
+            $customerActiveQuote = $this->quoteRepository->getForCustomer($customerId);
+
+            $quote->merge($customerActiveQuote);
+            $customerActiveQuote->setIsActive(0);
+            $this->quoteRepository->save($customerActiveQuote);
+
         // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
         }
 
         $quote->setCustomer($customer);
         $quote->setCustomerIsGuest(0);
+        $quote->setIsActive(1);
+
         /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'quote_id');
         if ($quoteIdMask->getId()) {
             $quoteIdMask->delete();
         }
+
         $this->quoteRepository->save($quote);
+
         return true;
     }