Merge pull request #346 from magento-folks/2.0.11_bugs_pr

Fixed issues:
- MAGETWO-57338: [Backport] - Customer is not redirected to checkout on login if guest is disabled - for 2.0
- MAGETWO-57513: [Backport] - Giftcard Purchase - Order Status - Processing - for 2.0
- MAGETWO-57844: [Backport] - [Github # 6294] Coupon code override cart rules with no coupon code - for 2.0

Author: MomotenkoNatalia

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -55,6 +55,8 @@ define([
                     customer = customerData.get('customer');
 
                 if (!customer().firstname && !cart().isGuestCheckoutAllowed) {
+                    // set URL for redirect on successful login/registration. It's postprocessed on backend.
+                    $.cookie('login_redirect', this.options.url.checkout);
                     if (this.options.url.isRedirectRequired) {
                         location.href = this.options.url.loginUrl;
                     } else {

app/code/Magento/Customer/Controller/Account/CreatePost.php

@@ -29,6 +29,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class CreatePost extends \Magento\Customer\Controller\AbstractAccount
 {
@@ -81,6 +82,11 @@ class CreatePost extends \Magento\Customer\Controller\AbstractAccount
      */
     private $accountRedirect;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -198,6 +204,7 @@ protected function extractAddress()
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
@@ -257,6 +264,12 @@ public function execute()
             } else {
                 $this->session->setCustomerDataAsLoggedIn($customer);
                 $this->messageManager->addSuccess($this->getSuccessMessage());
+                $requestedRedirect = $this->accountRedirect->getRedirectCookie();
+                if (!$this->scopeConfig->getValue('customer/startup/redirect_dashboard') && $requestedRedirect) {
+                    $resultRedirect->setUrl($this->_redirect->success($requestedRedirect));
+                    $this->accountRedirect->clearRedirectCookie();
+                    return $resultRedirect;
+                }
                 $resultRedirect = $this->accountRedirect->getRedirect();
             }
             return $resultRedirect;

app/code/Magento/Customer/Controller/Account/LoginPost.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Data\Form\FormKey\Validator;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -35,6 +36,11 @@ class LoginPost extends \Magento\Customer\Controller\AbstractAccount
      */
     protected $session;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -59,6 +65,35 @@ public function __construct(
         parent::__construct($context);
     }
 
+    /**
+     * Set scope config
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @return void
+     * @deprecated
+     */
+    public function setScopeConfig(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Get scope config
+     *
+     * @return ScopeConfigInterface
+     * @deprecated
+     */
+    private function getScopeConfig()
+    {
+        if (!($this->scopeConfig instanceof \Magento\Framework\App\Config\ScopeConfigInterface)) {
+            return \Magento\Framework\App\ObjectManager::getInstance()->get(
+                'Magento\Framework\App\Config\ScopeConfigInterface'
+            );
+        } else {
+            return $this->scopeConfig;
+        }
+    }
+
     /**
      * Login post action
      *
@@ -81,6 +116,14 @@ public function execute()
                     $customer = $this->customerAccountManagement->authenticate($login['username'], $login['password']);
                     $this->session->setCustomerDataAsLoggedIn($customer);
                     $this->session->regenerateId();
+                    $redirectUrl = $this->accountRedirect->getRedirectCookie();
+                    if (!$this->getScopeConfig()->getValue('customer/startup/redirect_dashboard') && $redirectUrl) {
+                        $this->accountRedirect->clearRedirectCookie();
+                        $resultRedirect = $this->resultRedirectFactory->create();
+                        // URL is checked to be internal in $this->_redirect->success()
+                        $resultRedirect->setUrl($this->_redirect->success($redirectUrl));
+                        return $resultRedirect;
+                    }
                 } catch (EmailNotConfirmedException $e) {
                     $value = $this->customerUrl->getEmailConfirmationUrl($login['username']);
                     $message = __(

app/code/Magento/Customer/Controller/Ajax/Login.php

@@ -9,12 +9,16 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
+use Magento\Framework\App\ObjectManager;
+use Magento\Customer\Model\Account\Redirect as AccountRedirect;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Login controller
  *
  * @method \Magento\Framework\App\RequestInterface getRequest()
  * @method \Magento\Framework\App\Response\Http getResponse()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Login extends \Magento\Framework\App\Action\Action
 {
@@ -43,6 +47,18 @@ class Login extends \Magento\Framework\App\Action\Action
      */
     protected $resultRawFactory;
 
+    /**
+     * @var AccountRedirect
+     * @deprecated
+     */
+    private $accountRedirect;
+
+    /**
+     * @var ScopeConfigInterface
+     * @deprecated
+     */
+    private $scopeConfig;
+
     /**
      * Initialize Login controller
      *
@@ -69,12 +85,62 @@ public function __construct(
         $this->resultRawFactory = $resultRawFactory;
     }
 
+    /**
+     * Get account redirect.
+     * For release backward compatibility.
+     *
+     * @deprecated
+     * @return AccountRedirect
+     */
+    private function getAccountRedirect()
+    {
+        if (!is_object($this->accountRedirect)) {
+            $this->accountRedirect = ObjectManager::getInstance()->get(AccountRedirect::class);
+        }
+        return $this->accountRedirect;
+    }
+
+    /**
+     * Account redirect setter for unit tests.
+     *
+     * @deprecated
+     * @param AccountRedirect $value
+     * @return void
+     */
+    public function setAccountRedirect($value)
+    {
+        $this->accountRedirect = $value;
+    }
+
+    /**
+     * @deprecated
+     * @return ScopeConfigInterface
+     */
+    private function getScopeConfig()
+    {
+        if (!is_object($this->scopeConfig)) {
+            $this->scopeConfig = ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        }
+        return $this->scopeConfig;
+    }
+
+    /**
+     * @deprecated
+     * @param ScopeConfigInterface $value
+     * @return void
+     */
+    public function setScopeConfig($value)
+    {
+        $this->scopeConfig = $value;
+    }
+
     /**
      * Login registered users and initiate a session.
      *
      * Expects a POST. ex for JSON {"username":"[email protected]", "password":"userpassword"}
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
@@ -103,6 +169,11 @@ public function execute()
             );
             $this->customerSession->setCustomerDataAsLoggedIn($customer);
             $this->customerSession->regenerateId();
+            $redirectRoute = $this->getAccountRedirect()->getRedirectCookie();
+            if (!$this->getScopeConfig()->getValue('customer/startup/redirect_dashboard') && $redirectRoute) {
+                $response['redirectUrl'] = $this->_redirect->success($redirectRoute);
+                $this->getAccountRedirect()->clearRedirectCookie();
+            }
         } catch (EmailNotConfirmedException $e) {
             $response = [
                 'errors' => true,

app/code/Magento/Customer/Model/Account/Redirect.php

@@ -15,12 +15,17 @@
 use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\Url\DecoderInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\CookieManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Redirect
 {
+    /** URL to redirect user on successful login or registration */
+    const LOGIN_REDIRECT_URL = 'login_redirect';
+
     /**
      * @var RequestInterface
      */
@@ -56,6 +61,12 @@ class Redirect
      */
     protected $resultRedirectFactory;
 
+    /**
+     * @var CookieManagerInterface
+     * @deprecated
+     */
+    private $cookieManager;
+
     /**
      * @param RequestInterface $request
      * @param Session $customerSession
@@ -196,4 +207,61 @@ private function applyRedirect($url)
     {
         $this->session->setBeforeAuthUrl($url);
     }
+
+    /**
+     * Get Cookie manager. For release backward compatibility.
+     *
+     * @deprecated
+     * @return CookieManagerInterface
+     */
+    private function getCookieManager()
+    {
+        if (!is_object($this->cookieManager)) {
+            $this->cookieManager = ObjectManager::getInstance()->get(CookieManagerInterface::class);
+        }
+        return $this->cookieManager;
+    }
+
+    /**
+     * Set cookie manager. For unit tests.
+     *
+     * @deprecated
+     * @param object $value
+     * @return void
+     */
+    public function setCookieManager($value)
+    {
+        $this->cookieManager = $value;
+    }
+
+    /**
+     * Get redirect route from cookie for case of successful login/registration
+     *
+     * @return null|string
+     */
+    public function getRedirectCookie()
+    {
+        return $this->getCookieManager()->getCookie(self::LOGIN_REDIRECT_URL, null);
+    }
+
+    /**
+     * Save redirect route to cookie for case of successful login/registration
+     *
+     * @param string $route
+     * @return void
+     */
+    public function setRedirectCookie($route)
+    {
+        $this->getCookieManager()->setPublicCookie(self::LOGIN_REDIRECT_URL, $route);
+    }
+
+    /**
+     * Clear cookie with requested route
+     *
+     * @return void
+     */
+    public function clearRedirectCookie()
+    {
+        $this->getCookieManager()->deleteCookie(self::LOGIN_REDIRECT_URL);
+    }
 }