2.0.0.0-dev79

* Tax calculation updates: * Fixed issues in tax calculation rounding with discount applied * Fixed an issue with extra penny when exact tax amount ended with 0.5 cent * Fixed an issue where there were tax calculation errors when customer tax rate was different from store tax rate * Added support to round tax at individual tax rate * Fixed price inconsistencies between catalog and shopping cart * Added support for maintaining consistent price including tax for customers with different tax rates * Added support for applying tax rules with different priorities to subtotal only * Fixed bugs: * Removed the extra '%' sign in the error\notice message on Gift Card Accounts page on the backend * Fixed an issue with image uploading functionality in the Catalog configuration * Fixed an issue where a customer could not navigate the store when downloading the downloadable product * Fixed an issue where adding CMS block Catalog Events Lister caused an error * Fixed an issue where the price was displayed twice on the Product page on the frontend * Fixed an issue where an admin could not open search results on the backend * Fixed an issue where the Rule Based Product Relations functionality was generating incorrect SQL when product category attribute was set through "is one of" or "contains" operator by constant value * Fixed an issue where it was impossible to add a product to the Compare list for categories with three-column page layout * Fixed an issue where a blank page opened when changing store view on a product page on the frontend * Fixed an issue where the "Please specify at least one search term." error message was not displayed if search is performed without search data specified on the frontend * Fixed a Google Chrome specific issue where page layout was broken when updating status for reviews on the backend * Fixed admin look and feel issues * Fixed an issue where the order notices and error messages were not red * Fixed a UI issue which appeared during custom attribute creation * Fixed an issue where the popup did not open after clicking What's this? next to the Remember Me check box when persistent shopping cart was enabled * Fixed an issue where the options of the Add Product split dropdown did not fit the page * Fixed an issue where the default theme preview image sample link was missing * Fixed a Safari and Internet Explorer 9 specific issue where the backend menu is not displayed for users with custom admin roles * Fixed an issue where the price of bundle products was not displayed correctly on the product page on the frontend * Fixed a UI issue in the debug mode configuration * Fixed minor issues with page layout * Fixed an issue where the mini shopping cart loaded data from cache * Fixed an issue where there was an incorrect value in the Grand Total (Base) column in the Orders grid if Catalog Price Scope was set to Website * Fixed an issue where the Entity Generator tool did not accept the "class" parameter * Fixed an issue where the default email template was not applied when the custom template in use was deleted * Fixed an issue where shipping price for flat rate was set to 0 in the side block during checkout of a product with a configured recurring profile * Fixed an issue where it was possible to create more Shipping Labels than there were products in the shipment * Fixed an issue where data about "SHA-IN Pass Phrase" was missing after changing "Payment Action" in the Ogone payment method configuration * Fixed performance issues with reindexing of the Price indexer * Fixed an issue where importing tax rates with postal code = * led to incorrect data entered into database * Fixed an issue where incorrect link to reset password was sent if secure URL was used on the frontend * Fixed an issue where the Links section was absent while editing downloadable products from the Wishlist * Fixed an issue where specified details for composite products were lost after adding to Gift Card and Downloadable products to the Wishlist * Fixed and issue where the Date widget was set to incorrect date when creating a new customer * Fixed an issue where a customer was redirected to Dashboard if the Redirect user to dashboard after login option was set to No * Fixed an issue where a customer was not able to register during checkout if Guest Checkout was not allowed * Fixed an issue where System logs were not generated properly in integration tests * Fixed benchmarking script * Fixed an issue where it was impossible to put store to the maintenance mode during backup * Fixed insecure use of mt_rand() * Fixed an issue where Quoted price was displayed incorrectly from the shopping cart in the backend * Functional tests: * Tax Rule Creation * Admin User Roe Creation * Simple Product Creation * Customer Group Creation * Update Backend Customer * Newsletter Creation * Updated composer.json.dist to download and install MTF from Public GitHub repository * GitHub requests: * [#542] (#542) Fix ImportExport bug which occurs while importing multiple rows per entity * [#507] (#507) "Insert Image" window is overlapped on menu
magento · May 27, 2014 · 7ac4278 · 7ac4278
1 parent f78121f
commit 7ac4278
Show file tree

Hide file tree

Showing 401 changed files with 17,128 additions and 4,350 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,67 @@
+2.0.0.0-dev79
+=============
+* Tax calculation updates:
+ * Fixed issues in tax calculation rounding with discount applied
+ * Fixed an issue with extra penny  when exact tax amount ended with 0.5 cent
+ * Fixed an issue where there were tax calculation errors when customer tax rate was different from store tax rate
+ * Added support to round tax at individual tax rate
+ * Fixed price inconsistencies between catalog and shopping cart
+ * Added support for maintaining consistent price including tax for customers with different tax rates
+ * Added support for applying tax rules with different priorities to subtotal only
+* Fixed bugs:
+  * Removed the extra '%' sign in the error\notice message on Gift Card Accounts page on the backend
+  * Fixed an issue with image uploading functionality in the Catalog configuration
+  * Fixed an issue where a customer could not navigate the store when downloading the downloadable product
+  * Fixed an issue where adding CMS block Catalog Events Lister caused an error
+  * Fixed an issue where the price was displayed twice on the Product page on the frontend
+  * Fixed an issue where an admin could not open search results on the backend
+  * Fixed an issue where the Rule Based Product Relations functionality was generating incorrect SQL when product category attribute was set through "is one of" or "contains" operator by constant value
+  * Fixed an issue where it was impossible to add a product to the Compare list for  categories with three-column page layout
+  * Fixed an issue where a blank page opened when changing store view on a product page on the frontend
+  * Fixed an issue where the  "Please specify at least one search term." error message was not displayed if search is performed without search data specified on the frontend
+  * Fixed a Google Chrome specific issue where page layout was broken when updating status for reviews on the backend
+  * Fixed admin look and feel issues
+  * Fixed an issue where the order notices and error messages were not red
+  * Fixed a UI issue which appeared during custom attribute creation
+  * Fixed an issue where the popup did not open after clicking What's this? next to the Remember Me check box  when persistent shopping cart was enabled
+  * Fixed an issue where the options of the Add Product split dropdown did not fit the page
+  * Fixed an issue where the default theme preview image sample link was missing
+  * Fixed a Safari and Internet Explorer 9 specific issue where the backend menu is not displayed for users with custom admin roles
+  * Fixed an issue where  the price of bundle products was not  displayed correctly on the product page on the frontend
+  * Fixed a UI issue in the debug mode configuration
+  * Fixed minor issues with page layout
+  * Fixed an issue where the mini shopping cart loaded data from cache
+  * Fixed an issue where there was an incorrect value in the Grand Total (Base) column in the Orders grid if Catalog Price Scope was set to Website
+  * Fixed an issue where the Entity Generator tool did not accept the "class" parameter
+  * Fixed an issue where the default email template was not applied when the custom template in use was deleted
+  * Fixed an issue where shipping price for flat rate was set to 0 in the side block during checkout of a product with a configured recurring profile
+  * Fixed an issue where it was possible to create more Shipping Labels than there were products in the shipment
+  * Fixed an issue where data about "SHA-IN Pass Phrase" was missing after changing "Payment Action" in the Ogone payment method configuration
+  * Fixed performance issues with reindexing of the Price indexer
+  * Fixed an issue where importing tax rates with postal code = * led to incorrect data entered into database
+  * Fixed an issue where incorrect link to reset password was sent if secure URL was used on the frontend
+  * Fixed an issue where the Links section was absent while editing downloadable products from the Wishlist
+  * Fixed an issue where specified details for composite products were lost after adding to Gift Card and Downloadable products to the Wishlist
+  * Fixed and issue where the Date widget was set to incorrect date when creating a new customer
+  * Fixed an issue where a customer was redirected to Dashboard if the Redirect user to dashboard after login option was set to вЂNoвЂ™
+  * Fixed an issue where a customer was not able to register during checkout if Guest Checkout was not allowed
+  * Fixed an issue where System logs were not generated properly in integration tests
+  * Fixed benchmarking script
+  * Fixed an issue where it was impossible to put store to the maintenance mode during backup
+  * Fixed insecure use of mt_rand()
+  * Fixed an issue where Quoted price was displayed incorrectly from the shopping cart in the backend
+* Functional tests:
+  * Tax Rule Creation
+  * Admin User Roe Creation
+  * Simple Product Creation
+  * Customer Group Creation
+  * Update Backend Customer
+  * Newsletter Creation
+* Updated composer.json.dist to download and install MTF from Public GitHub repository
+* GitHub requests:
+  * [#542] (https://github.com/magento/magento2/pull/542) Fix ImportExport bug which occurs while importing multiple rows per entity
+  * [#507] (https://github.com/magento/magento2/issues/507) "Insert Image" window is overlapped on menu
+
 2.0.0.0-dev78
 =============
 * Fixed bugs:
@@ -158,7 +222,7 @@
       * `lib/Magento/Framework/Data/Form/Element/Submit.php`
       * `lib/Magento/Framework/Data/Form/Element/Text.php`
       * `lib/Magento/Framework/Data/Form/Element/Textarea.php`
-  
+
 2.0.0.0-dev75
 =============
 * Modularity improvements:
@@ -2678,4 +2742,3 @@ Deprecated code & minor fixes update:
 2.0.0.0-dev01
 =============
 * Added initial version of Magento 2.x CE to public repository
-
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -72,9 +72,10 @@
 }
 
 if (!defined('BARE_BOOTSTRAP')) {
-    if (file_exists(BP . '/maintenance.flag')) {
-
-        if (!in_array($_SERVER['REMOTE_ADDR'], explode(",", file_get_contents(BP . '/maintenance.flag')))) {
+    $maintenanceFlag = BP . '/' . \Magento\Framework\App\State\MaintenanceMode::FLAG_DIR . '/'
+        . \Magento\Framework\App\State\MaintenanceMode::FLAG_FILENAME;
+    if (file_exists($maintenanceFlag)) {
+        if (!in_array($_SERVER['REMOTE_ADDR'], explode(",", file_get_contents($maintenanceFlag)))) {
             if (PHP_SAPI == 'cli') {
                 echo 'Service temporarily unavailable due to maintenance downtime.';
             } else {

diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Field/Image.php b/app/code/Magento/Backend/Block/System/Config/Form/Field/Image.php
@@ -27,6 +27,11 @@
  */
 namespace Magento\Backend\Block\System\Config\Form\Field;
 
+/**
+ * Class Image Field
+ * @method getFieldConfig()
+ * @method setFieldConfig()
+ */
 class Image extends \Magento\Framework\Data\Form\Element\Image
 {
     /**
@@ -39,10 +44,10 @@ protected function _getUrl()
         $url = parent::_getUrl();
         $config = $this->getFieldConfig();
         /* @var $config array */
-        if (array_key_exists('base_url', $config)) {
+        if (isset($config['base_url'])) {
             $element = $config['base_url'];
             $urlType = empty($element['type']) ? 'link' : (string)$element['type'];
-            $url = $this->_urlBuilder->getBaseUrl($urlType) . $element['value'] . '/' . $url;
+            $url = $this->_urlBuilder->getBaseUrl(['_type' => $urlType]) . $element['value'] . '/' . $url;
         }
         return $url;
     }

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -57,7 +57,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
     /**
      * @var \Magento\Directory\Model\Currency
      */
-    protected $_baseCurrency;
+    protected $_defaultBaseCurrency;
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
@@ -84,11 +84,11 @@ public function __construct(
         $this->_storeManager = $storeManager;
         $this->_currencyLocator = $currencyLocator;
         $this->_localeCurrency = $localeCurrency;
-        $baseCurrencyCode = $this->_scopeConfig->getValue(
+        $defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
             \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
             'default'
         );
-        $this->_baseCurrency = $currencyFactory->create()->load($baseCurrencyCode);
+        $this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
     }
 
     /**
@@ -142,7 +142,7 @@ protected function _getRate($row)
         if ($rate = $row->getData($this->getColumn()->getRateField())) {
             return floatval($rate);
         }
-        return $this->_baseCurrency->getRate($this->_getCurrencyCode($row));
+        return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
     }
 
     /**

diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
@@ -51,40 +51,8 @@
             <argument name="sessionName" xsi:type="string">adminhtml</argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\Model\Config\Structure\Data">
-        <arguments>
-            <argument name="cacheId" xsi:type="string">backend_system_configuration_structure</argument>
-        </arguments>
-    </type>
     <type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Tab" shared="false" />
     <type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Section" shared="false" />
-    <type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Group" shared="false" />
-    <type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Field" shared="false">
-        <arguments>
-            <argument name="groupFlyweight" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Group\Proxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper" shared="false">
-        <arguments>
-            <argument name="fieldLocator" xsi:type="object">Magento\Backend\Model\Config\Structure\Search\Proxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Backend\Model\Config\Structure\Element\Tab" shared="false">
-        <arguments>
-            <argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Section</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Backend\Model\Config\Structure\Element\Section" shared="false">
-        <arguments>
-            <argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Group</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Backend\Model\Config\Structure\Element\Group" shared="false">
-        <arguments>
-            <argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Field</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Backend\Model\Config\Structure\Element\Group\Proxy" shared="false" />
     <type name="Magento\Framework\View\Layout">
         <arguments>
             <argument name="area" xsi:type="string">adminhtml</argument>

diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
@@ -183,4 +183,38 @@
             <argument name="storage" xsi:type="object">Magento\Backend\Model\Session\Quote\Storage</argument>
         </arguments>
     </type>
+
+    <type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Group" shared="false" />
+    <type name="Magento\Backend\Model\Config\Structure\Element\Group\Proxy" shared="false" />
+
+    <type name="Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper" shared="false">
+        <arguments>
+            <argument name="fieldLocator" xsi:type="object">Magento\Backend\Model\Config\Structure\Search\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Backend\Model\Config\Structure\Data">
+        <arguments>
+            <argument name="cacheId" xsi:type="string">backend_system_configuration_structure</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Backend\Model\Config\Structure\Element\Tab" shared="false">
+        <arguments>
+            <argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Section</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Backend\Model\Config\Structure\Element\Section" shared="false">
+        <arguments>
+            <argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Group</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Field" shared="false">
+        <arguments>
+            <argument name="groupFlyweight" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Group\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Backend\Model\Config\Structure\Element\Group" shared="false">
+        <arguments>
+            <argument name="childrenIterator" xsi:type="object">Magento\Backend\Model\Config\Structure\Element\Iterator\Field</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Backend/view/adminhtml/page/js/calendar.phtml b/app/code/Magento/Backend/view/adminhtml/page/js/calendar.phtml
@@ -64,7 +64,8 @@
             showHour: false,
             showMinute: false,
             localTimezone: <?php echo $this->getTimezoneOffsetSeconds() ?>,
-            serverTimezoneSeconds:<?php echo $this->getStoreTimestamp() ?>
+            serverTimezoneSeconds:<?php echo $this->getStoreTimestamp() ?>,
+            yearRange: '<?php echo $this->getYearRange() ?>'
         }
     });
 })(jQuery);

diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -52,24 +52,32 @@ class Index extends \Magento\Backend\App\Action
      */
     protected $_backupModelFactory;
 
+    /**
+     * @var \Magento\Framework\App\State\MaintenanceMode
+     */
+    protected $maintenanceMode;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Backup\Factory $backupFactory
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
+     * @param \Magento\Framework\App\State\MaintenanceMode $maintenanceMode
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Backup\Factory $backupFactory,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-        \Magento\Backup\Model\BackupFactory $backupModelFactory
+        \Magento\Backup\Model\BackupFactory $backupModelFactory,
+        \Magento\Framework\App\State\MaintenanceMode $maintenanceMode
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_backupFactory = $backupFactory;
         $this->_fileFactory = $fileFactory;
         $this->_backupModelFactory = $backupModelFactory;
+        $this->maintenanceMode = $maintenanceMode;
         parent::__construct($context);
     }
 
@@ -150,9 +158,7 @@ public function createAction()
             $this->_coreRegistry->register('backup_manager', $backupManager);
 
             if ($this->getRequest()->getParam('maintenance_mode')) {
-                $turnedOn = $helper->turnOnMaintenanceMode();
-
-                if (!$turnedOn) {
+                if (!$this->maintenanceMode->turnOn()) {
                     $response->setError(
                         __(
                             'You need more permissions to activate maintenance mode right now.'
@@ -202,7 +208,7 @@ public function createAction()
         }
 
         if ($this->getRequest()->getParam('maintenance_mode')) {
-            $helper->turnOffMaintenanceMode();
+            $this->maintenanceMode->turnOff();
         }
 
         $this->getResponse()->setBody($response->toJson());
@@ -306,9 +312,7 @@ public function rollbackAction()
             }
 
             if ($this->getRequest()->getParam('maintenance_mode')) {
-                $turnedOn = $helper->turnOnMaintenanceMode();
-
-                if (!$turnedOn) {
+                if (!$this->maintenanceMode->turnOn()) {
                     $response->setError(
                         __(
                             'You need more permissions to activate maintenance mode right now.'
@@ -373,7 +377,7 @@ public function rollbackAction()
         }
 
         if ($this->getRequest()->getParam('maintenance_mode')) {
-            $helper->turnOffMaintenanceMode();
+            $this->maintenanceMode->turnOff();
         }
 
         $this->getResponse()->setBody($response->toJson());

diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
@@ -23,6 +23,8 @@
  */
 namespace Magento\Backup\Helper;
 
+use Magento\Framework\App\State\MaintenanceMode;
+
 /**
  * Backup data helper
  */
@@ -191,7 +193,7 @@ public function getBackupIgnorePaths()
         return array(
             '.git',
             '.svn',
-            'maintenance.flag',
+            $this->_filesystem->getPath(MaintenanceMode::FLAG_DIR) . '/' . MaintenanceMode::FLAG_FILENAME,
             $this->_filesystem->getPath(\Magento\Framework\App\Filesystem::SESSION_DIR),
             $this->_filesystem->getPath(\Magento\Framework\App\Filesystem::CACHE_DIR),
             $this->_filesystem->getPath(\Magento\Framework\App\Filesystem::LOG_DIR),
@@ -211,7 +213,7 @@ public function getRollbackIgnorePaths()
         return array(
             '.svn',
             '.git',
-            'maintenance.flag',
+            $this->_filesystem->getPath(MaintenanceMode::FLAG_DIR) . '/' . MaintenanceMode::FLAG_FILENAME,
             $this->_filesystem->getPath(\Magento\Framework\App\Filesystem::SESSION_DIR),
             $this->_filesystem->getPath(\Magento\Framework\App\Filesystem::LOG_DIR),
             $this->_filesystem->getPath(\Magento\Framework\App\Filesystem::VAR_DIR) . '/locks',
@@ -221,35 +223,6 @@ public function getRollbackIgnorePaths()
         );
     }
 
-    /**
-     * Put store into maintenance mode
-     *
-     * @return bool
-     */
-    public function turnOnMaintenanceMode()
-    {
-        $maintenanceFlagFile = $this->getMaintenanceFlagFilePath();
-        $result = $this->_filesystem->getDirectoryWrite(
-            \Magento\Framework\App\Filesystem::ROOT_DIR
-        )->writeFile(
-            $maintenanceFlagFile,
-            'maintenance'
-        );
-
-        return $result !== false;
-    }
-
-    /**
-     * Turn off store maintenance mode
-     *
-     * @return void
-     */
-    public function turnOffMaintenanceMode()
-    {
-        $maintenanceFlagFile = $this->getMaintenanceFlagFilePath();
-        $this->_filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem::ROOT_DIR)->delete($maintenanceFlagFile);
-    }
-
     /**
      * Get backup create success message by backup type
      *
@@ -274,16 +247,6 @@ public function getCreateSuccessMessageByType($type)
         return $messagesMap[$type];
     }
 
-    /**
-     * Get path to maintenance flag file
-     *
-     * @return string
-     */
-    protected function getMaintenanceFlagFilePath()
-    {
-        return 'maintenance.flag';
-    }
-
     /**
      * Invalidate Cache
      *