Merge pull request #1583 from magento-engcom/2.2-develop-prs

Public Pull Requests

#11327
#11297
#11165

Author: Oleksii Korshenko

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

@@ -212,7 +212,7 @@ protected function loadQuote($loadMethod, $loadField, $identifier, array $shared
         if ($sharedStoreIds) {
             $quote->setSharedStoreIds($sharedStoreIds);
         }
-        $quote->setStoreId($this->storeManager->getStore()->getId())->$loadMethod($identifier);
+        $quote->$loadMethod($identifier)->setStoreId($this->storeManager->getStore()->getId());
         if (!$quote->getId()) {
             throw NoSuchEntityException::singleField($loadField, $identifier);
         }

app/code/Magento/Sales/view/frontend/templates/email/items/invoice/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>

pub/media/.htaccess

@@ -1,4 +1,4 @@
-Options All -Indexes
+Options -Indexes
 
 <IfModule mod_php5.c>
 php_flag engine 0

pub/media/theme_customization/.htaccess

@@ -1,4 +1,4 @@
-Options All -Indexes
+Options -Indexes
 <Files ~ "\.xml$">
     Order allow,deny
     Deny from all