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

Public Pull Requests

magento#11505
magento#11381
magento#11460
magento#11299
magento#11199

Author: Oleksii Korshenko

app/code/Magento/Cron/etc/cron_groups.xml

@@ -11,8 +11,8 @@
         <schedule_ahead_for>20</schedule_ahead_for>
         <schedule_lifetime>15</schedule_lifetime>
         <history_cleanup_every>10</history_cleanup_every>
-        <history_success_lifetime>60</history_success_lifetime>
-        <history_failure_lifetime>600</history_failure_lifetime>
+        <history_success_lifetime>10080</history_success_lifetime>
+        <history_failure_lifetime>10080</history_failure_lifetime>
         <use_separate_process>0</use_separate_process>
     </group>
 </config>

app/code/Magento/Indexer/etc/cron_groups.xml

@@ -11,8 +11,8 @@
         <schedule_ahead_for>4</schedule_ahead_for>
         <schedule_lifetime>2</schedule_lifetime>
         <history_cleanup_every>10</history_cleanup_every>
-        <history_success_lifetime>60</history_success_lifetime>
-        <history_failure_lifetime>600</history_failure_lifetime>
+        <history_success_lifetime>10080</history_success_lifetime>
+        <history_failure_lifetime>10080</history_failure_lifetime>
         <use_separate_process>1</use_separate_process>
     </group>
 </config>

app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php

@@ -6,7 +6,29 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-class AddressSave extends \Magento\Sales\Controller\Adminhtml\Order
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Directory\Model\RegionFactory;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Controller\Adminhtml\Order;
+use Magento\Sales\Model\Order\Address as AddressModel;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Translate\InlineInterface;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\View\Result\LayoutFactory;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AddressSave extends Order
 {
     /**
      * Authorization level of a basic admin session
@@ -15,19 +37,70 @@ class AddressSave extends \Magento\Sales\Controller\Adminhtml\Order
      */
     const ADMIN_RESOURCE = 'Magento_Sales::actions_edit';
 
+    /**
+     * @var RegionFactory
+     */
+    private $regionFactory;
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param FileFactory $fileFactory
+     * @param InlineInterface $translateInline
+     * @param PageFactory $resultPageFactory
+     * @param JsonFactory $resultJsonFactory
+     * @param LayoutFactory $resultLayoutFactory
+     * @param RawFactory $resultRawFactory
+     * @param OrderManagementInterface $orderManagement
+     * @param OrderRepositoryInterface $orderRepository
+     * @param LoggerInterface $logger
+     * @param RegionFactory|null $regionFactory
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        FileFactory $fileFactory,
+        InlineInterface $translateInline,
+        PageFactory $resultPageFactory,
+        JsonFactory $resultJsonFactory,
+        LayoutFactory $resultLayoutFactory,
+        RawFactory $resultRawFactory,
+        OrderManagementInterface $orderManagement,
+        OrderRepositoryInterface $orderRepository,
+        LoggerInterface $logger,
+        RegionFactory $regionFactory = null
+    ) {
+        $this->regionFactory = $regionFactory ?: ObjectManager::getInstance()->get(RegionFactory::class);
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $translateInline,
+            $resultPageFactory,
+            $resultJsonFactory,
+            $resultLayoutFactory,
+            $resultRawFactory,
+            $orderManagement,
+            $orderRepository,
+            $logger
+        );
+    }
+
     /**
      * Save order address
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return Redirect
      */
     public function execute()
     {
         $addressId = $this->getRequest()->getParam('address_id');
-        /** @var $address \Magento\Sales\Api\Data\OrderAddressInterface|\Magento\Sales\Model\Order\Address */
+        /** @var $address OrderAddressInterface|AddressModel */
         $address = $this->_objectManager->create(
-            \Magento\Sales\Api\Data\OrderAddressInterface::class
+            OrderAddressInterface::class
         )->load($addressId);
         $data = $this->getRequest()->getPostValue();
+        $data = $this->updateRegionData($data);
         $resultRedirect = $this->resultRedirectFactory->create();
         if ($data && $address->getId()) {
             $address->addData($data);
@@ -41,7 +114,7 @@ public function execute()
                 );
                 $this->messageManager->addSuccess(__('You updated the order address.'));
                 return $resultRedirect->setPath('sales/*/view', ['order_id' => $address->getParentId()]);
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException($e, __('We can\'t update the order address right now.'));
@@ -51,4 +124,20 @@ public function execute()
             return $resultRedirect->setPath('sales/*/');
         }
     }
+
+    /**
+     * Update region data
+     *
+     * @param array $attributeValues
+     * @return array
+     */
+    private function updateRegionData($attributeValues)
+    {
+        if (!empty($attributeValues['region_id'])) {
+            $newRegion = $this->regionFactory->create()->load($attributeValues['region_id']);
+            $attributeValues['region_code'] = $newRegion->getCode();
+            $attributeValues['region'] = $newRegion->getDefaultName();
+        }
+        return $attributeValues;
+    }
 }

app/code/Magento/Sales/Helper/Guest.php

@@ -178,6 +178,9 @@ public function loadValidOrder(App\RequestInterface $request)
     public function getBreadcrumbs(\Magento\Framework\View\Result\Page $resultPage)
     {
         $breadcrumbs = $resultPage->getLayout()->getBlock('breadcrumbs');
+        if (!$breadcrumbs) {
+            return;
+        }
         $breadcrumbs->addCrumb(
             'home',
             [

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;

setup/src/Magento/Setup/Model/Installer.php

@@ -1010,6 +1010,7 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
     public function installAdminUser($data)
     {
         $this->assertDbConfigExists();
+        $data += ['db-prefix' => $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX)];
         $setup = $this->setupFactory->create($this->context->getResources());
         $adminAccount = $this->adminAccountFactory->create($setup->getConnection(), (array)$data);
         $adminAccount->save();