Merge pull request #137 from magento-south/BUGS

[South] Sprint 32: Bug fixes

Author: slavvka

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

@@ -179,6 +179,10 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
                 </field>
+                <field id="minify_html" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Minify Html</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="translate_inline" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Translate Inline</label>

app/code/Magento/Backend/etc/config.xml

@@ -7,6 +7,11 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd">
     <default>
+        <dev>
+            <template>
+                <minify_html>1</minify_html>
+            </template>
+        </dev>
         <system>
             <media_storage_configuration>
                 <allowed_resources>

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml

@@ -30,7 +30,7 @@
     echo 'validate-one-required-by-name' ?>"
                     id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
                     type="checkbox"
-                    name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($block->isSelected($_selection)) {
+                    name="bundle_option[<?php echo $_option->getId() ?>][<?php echo $_selection ?>]"<?php if ($block->isSelected($_selection)) {
     echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) {
     echo ' disabled="disabled"' ?>
                     value="<?php echo $_selection->getSelectionId() ?>"

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml

@@ -21,7 +21,7 @@
                    price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
         <?php else: ?>
             <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>"
-                    name="bundle_option[<?php echo $_option->getId() ?>][]"
+                    name="bundle_option[<?php echo $_option->getId() ?>]"
                     class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
             <?php if(!$_option->getRequired()): ?>

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml

@@ -30,7 +30,7 @@
                                id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
                                type="checkbox"
                                <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
-                               name="bundle_option[<?php echo $_option->getId() ?>][]"
+                               name="bundle_option[<?php echo $_option->getId() ?>][<?php echo $_selection->getId() ?>]"
                                <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
                                <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
                                value="<?php echo $_selection->getSelectionId() ?>"/>

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml

@@ -24,7 +24,7 @@
             <select multiple="multiple"
                     size="5"
                     id="bundle-option-<?php echo $_option->getId() ?>"
-                    name="bundle_option[<?php echo $_option->getId() ?>][]"
+                    name="bundle_option[<?php echo $_option->getId() ?>]"
                     class="bundle-option-<?php echo $_option->getId() ?> multiselect product bundle option change-container-classname"
                     <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
                 <?php if(!$_option->getRequired()): ?>

app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml

@@ -15,7 +15,7 @@
     <?php if ($block->getDisplayLabel()): ?>
         <span class="price-label"><?php echo $block->getDisplayLabel(); ?></span>
     <?php endif; ?>
-    <span<?php if ($block->getPriceId()): ?> id="<?php echo $block->getPriceId() ?>"<?php endif;?>
+    <span <?php if ($block->getPriceId()): ?> id="<?php echo $block->getPriceId() ?>"<?php endif;?>
         <?php echo($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
         data-price-amount="<?php echo $block->getDisplayValue(); ?>"
         data-price-type="<?php echo $block->getPriceType(); ?>"

app/code/Magento/Checkout/Helper/Data.php

@@ -278,7 +278,11 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
                 [
                     'reason' => $message,
                     'checkoutType' => $checkoutType,
-                    'dateAndTime' => $this->_localeDate->date(),
+                    'dateAndTime' => $this->_localeDate->formatDateTime(
+                        new \DateTime(),
+                        \IntlDateFormatter::MEDIUM,
+                        \IntlDateFormatter::MEDIUM
+                    ),
                     'customer' => $checkout->getCustomerFirstname() . ' ' . $checkout->getCustomerLastname(),
                     'customerEmail' => $checkout->getCustomerEmail(),
                     'billingAddress' => $checkout->getBillingAddress(),

app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php

@@ -123,8 +123,9 @@ protected function setUp()
             );
 
         $this->_checkoutSession = $arguments['checkoutSession'];
-        $localeDate = $arguments['localeDate'];
-        $localeDate->expects($this->any())->method('date')->will($this->returnValue('Oct 02, 2013'));
+        $arguments['localeDate']->expects($this->any())
+            ->method('formatDateTime')
+            ->willReturn('Oct 02, 2013');
 
         $this->_transportBuilder = $arguments['transportBuilder'];
 

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

@@ -1,13 +1,14 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Customer\Model\Account\Redirect as AccountRedirect;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Model\Url;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
 use Magento\Framework\Controller\Result\RedirectFactory;
@@ -28,19 +29,12 @@
 use Magento\Customer\Model\CustomerExtractor;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Exception\InputException;
-use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CreatePost extends \Magento\Customer\Controller\Account
 {
-    /** @var ScopeConfigInterface */
-    protected $scopeConfig;
-
-    /** @var StoreManagerInterface */
-    protected $storeManager;
-
     /** @var AccountManagementInterface */
     protected $accountManagement;
 
@@ -77,10 +71,13 @@ class CreatePost extends \Magento\Customer\Controller\Account
     /** @var \Magento\Framework\UrlInterface */
     protected $urlModel;
 
+    /** @var DataObjectHelper  */
+    protected $dataObjectHelper;
+
     /**
-     * @var \Magento\Framework\Api\DataObjectHelper
+     * @var AccountRedirect
      */
-    protected $dataObjectHelper;
+    private $accountRedirect;
 
     /**
      * @param Context $context
@@ -101,7 +98,8 @@ class CreatePost extends \Magento\Customer\Controller\Account
      * @param Registration $registration
      * @param Escaper $escaper
      * @param CustomerExtractor $customerExtractor
-     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param DataObjectHelper $dataObjectHelper
+     * @param AccountRedirect $accountRedirect
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -124,7 +122,8 @@ public function __construct(
         Registration $registration,
         Escaper $escaper,
         CustomerExtractor $customerExtractor,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+        DataObjectHelper $dataObjectHelper,
+        AccountRedirect $accountRedirect
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
@@ -141,7 +140,13 @@ public function __construct(
         $this->customerExtractor = $customerExtractor;
         $this->urlModel = $urlFactory->create();
         $this->dataObjectHelper = $dataObjectHelper;
-        parent::__construct($context, $customerSession, $resultRedirectFactory, $resultPageFactory);
+        $this->accountRedirect = $accountRedirect;
+        parent::__construct(
+            $context,
+            $customerSession,
+            $resultRedirectFactory,
+            $resultPageFactory
+        );
     }
 
     /**
@@ -257,9 +262,8 @@ public function execute()
                 $resultRedirect->setUrl($this->_redirect->success($url));
             } else {
                 $this->_getSession()->setCustomerDataAsLoggedIn($customer);
-
                 $this->messageManager->addSuccess($this->getSuccessMessage());
-                $resultRedirect->setUrl($this->getSuccessRedirect());
+                $resultRedirect = $this->accountRedirect->getRedirect();
             }
             return $resultRedirect;
         } catch (StateException $e) {
@@ -329,23 +333,4 @@ protected function getSuccessMessage()
         }
         return $message;
     }
-
-    /**
-     * Retrieve success redirect URL
-     *
-     * @return string
-     */
-    protected function getSuccessRedirect()
-    {
-        $redirectToDashboard = $this->scopeConfig->isSetFlag(
-            Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD,
-            ScopeInterface::SCOPE_STORE
-        );
-        if (!$redirectToDashboard && $this->_getSession()->getBeforeAuthUrl()) {
-            $successUrl = $this->_getSession()->getBeforeAuthUrl(true);
-        } else {
-            $successUrl = $this->urlModel->getUrl('*/*/index', ['_secure' => true]);
-        }
-        return $this->_redirect->success($successUrl);
-    }
 }