🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #17200: [Backport] Fixed a grammatical error on the vault tooltip (by @mage2pratik)
 - #17243: [Backport] [ISSUE-11140][BUGFIX] Skip store code admin from being detected in ca� (by @mageprince)
 - #17224: [Backport] Credit memo email template file: fixing incorrect object type error (by @gelanivishal)
 - #17155: [Backport] Set proper text-aligh for the <th> element of the Subtotal column in the Creditmemo email (by @TomashKhamlai)


Fixed GitHub Issues:
 - #11140: Going to '/admin' while using storecodes in url and a different adminhtml url will throw exception (reported by @koenner01) has been fixed in #17243 by @mageprince in 2.1-develop branch
   Related commits:
     1. c5d85e0
     2. f9696c9

Author: Stanislav Idolov

app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html

@@ -45,7 +45,7 @@
                 </span>
                 <div class="field-tooltip-content"
                      data-target="dropdown"
-                     translate="'We store you payment information securely on Braintree servers via SSL.'"></div>
+                     translate="'We store your payment information securely on Braintree servers via SSL.'"></div>
             </div>
         </div>
         <!-- /ko -->

app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml

@@ -31,6 +31,6 @@
     </td>
     <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item->getOrderItem()) ?>
     </td>
 </tr>

app/code/Magento/Store/App/Request/PathInfoProcessor.php

@@ -6,6 +6,7 @@
 namespace Magento\Store\App\Request;
 
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\Store;
 
 class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
 {
@@ -42,7 +43,7 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI
         }
 
         if ($store->isUseStoreInUrl()) {
-            if (!$request->isDirectAccessFrontendName($storeCode)) {
+            if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE) {
                 $this->storeManager->setCurrentStore($storeCode);
                 $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
                 return $pathInfo;

app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less

@@ -203,7 +203,8 @@
         text-align: center;
     }
 
-    .item-price {
+    .item-price,
+    .item-subtotal {
         text-align: right;
     }
 

app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less

@@ -207,7 +207,8 @@
         text-align: center;
     }
 
-    .item-price {
+    .item-price,
+    .item-subtotal {
         text-align: right;
     }