2.0.0.0-dev76

* Pricing improvements: * Eliminated code duplication from templates and implemented new calculation models for the following modules: * ConfigurableProduct * Wishlist * Rss * ProductAlert * JavaScript improvements: * Removed head.js usages from frontend * Removed head.js usages from adminhtml * Themes update: * Plushe styles are removed, Plushe theme is now based on blank * Fixed bugs: * Unable to place order with product that contains custom option 'file' * OnePageCheckout is not working if PayPal method is enabled to work via Payment Bridge * Impossible to reset password for admin user (incorrect reset password link in email) * Errors when deleting customer group specified as default one in the config * A number of essential buttons do not work and block other functionality in Internet Explorer 10 * "Insert Widget" button is missing in Insert Widget popup while creating CMS page * Impossible to change status for rating in admin * System email templates are not loaded when user creates new email template * Billing Agreements tab displays during New Customer creation in admin panel * Images are not displayed in WYSIWYG when editing default pages * Error message "Asymmetric transaction rollback" when creating simple product with flat catalog product option enabled in config * Fatal error when trying to preview sample(type=link) or view link for download(type="link") for downloadable product * Customer is redirected to Home Page after adding new address during multiple address checkout if secure URLs are enabled for frontend in config * Impossible to select value in the State/Province field in the customer registration form when customer uses multiple address checkout * Manage Stock option is not editable when using mass action on several products in the admin panel * Category is not displayed in layered navigation block when Flat Catalog is enabled in config * GitHub requests: * [#489] (#489) -- PHPUnit 4.0 Compatibility * [#535] (#535) -- Image management for products * Framework improvements: * Covered Magento lib form elements with unit tests: * `lib/Magento/Framework/Data/Form/Element/AbstractElement.php` * `lib/Magento/Framework/Data/Form/Element/Button.php` * `lib/Magento/Framework/Data/Form/Element/Checkbox.php` * `lib/Magento/Framework/Data/Form/Element/CollectionFactory.php` * `lib/Magento/Framework/Data/Form/Element/Column.php` * `lib/Magento/Framework/Data/Form/Element/File.php` * `lib/Magento/Framework/Data/Form/Element/Hidden.php` * `lib/Magento/Framework/Data/Form/Element/Editablemultiselect.php` * `lib/Magento/Framework/Data/Form/Element/Factory.php` * `lib/Magento/Framework/Data/Form/Element/Image.php` * `lib/Magento/Framework/Data/Form/Element/Imagefile.php` * `lib/Magento/Framework/Data/Form/Element/Label.php` * `lib/Magento/Framework/Data/Form/Element/Link.php` * `lib/Magento/Framework/Data/Form/Element/Multiselect.php` * `lib/Magento/Framework/Data/Form/Element/Note.php` * `lib/Magento/Framework/Data/Form/Element/Obscure.php` * `lib/Magento/Framework/Data/Form/Element/Password.php` * `lib/Magento/Framework/Data/Form/Element/Radio.php` * `lib/Magento/Framework/Data/Form/Element/Reset.php` * `lib/Magento/Framework/Data/Form/Element/Submit.php` * `lib/Magento/Framework/Data/Form/Element/Text.php` * `lib/Magento/Framework/Data/Form/Element/Textarea.php`
magento · May 5, 2014 · 964b46c · 964b46c
1 parent 7444894
commit 964b46c
Show file tree

Hide file tree

Showing 671 changed files with 12,253 additions and 28,210 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,61 @@
+2.0.0.0-dev76
+=============
+* Pricing improvements:
+  * Eliminated code duplication from templates and implemented new calculation models for the following modules:
+     * ConfigurableProduct
+     * Wishlist
+     * Rss
+     * ProductAlert
+* JavaScript improvements:
+  * Removed head.js usages from frontend
+  * Removed head.js usages from adminhtml
+* Themes update:
+  * Plushe styles are removed, Plushe theme is now based on blank
+* Fixed bugs:  
+  * Unable to place order with product that contains custom option 'file'
+  * OnePageCheckout is not working if PayPal method is enabled to work via Payment Bridge
+  * Impossible to reset password for admin user (incorrect reset password link in email)
+  * Errors when deleting customer group specified as default one in the config
+  * A number of essential buttons do not work and block other functionality in Internet Explorer 10
+  * "Insert Widget" button is missing in Insert Widget popup while creating CMS page
+  * Impossible to change status for rating in admin
+  * System email templates are not loaded when user creates new email template
+  * Billing Agreements tab displays during New Customer creation in admin panel
+  * Images are not displayed in WYSIWYG when editing default pages
+  * Error message "Asymmetric transaction rollback" when creating simple product with flat catalog product option enabled in config
+  * Fatal error when trying to preview sample(type=link) or view link for download(type="link") for downloadable product
+  * Customer is redirected to Home Page after adding new address during multiple address checkout if secure URLs are enabled for frontend in config
+  * Impossible to select value in the State/Province field in the customer registration form when customer uses multiple address checkout
+  * Manage Stock option is not editable when using mass action on several products in the admin panel
+  * Category is not displayed in layered navigation block when Flat Catalog is enabled in config
+* GitHub requests:
+  * [#489] (https://github.com/magento/magento2/issues/489) -- PHPUnit 4.0 Compatibility
+  * [#535] (https://github.com/magento/magento2/issues/535) -- Image management for products
+* Framework improvements:
+  * Covered Magento lib form elements with unit tests:
+      * `lib/Magento/Framework/Data/Form/Element/AbstractElement.php`
+      * `lib/Magento/Framework/Data/Form/Element/Button.php`
+      * `lib/Magento/Framework/Data/Form/Element/Checkbox.php`
+      * `lib/Magento/Framework/Data/Form/Element/CollectionFactory.php`
+      * `lib/Magento/Framework/Data/Form/Element/Column.php`
+      * `lib/Magento/Framework/Data/Form/Element/File.php`
+      * `lib/Magento/Framework/Data/Form/Element/Hidden.php`
+      * `lib/Magento/Framework/Data/Form/Element/Editablemultiselect.php`
+      * `lib/Magento/Framework/Data/Form/Element/Factory.php`
+      * `lib/Magento/Framework/Data/Form/Element/Image.php`
+      * `lib/Magento/Framework/Data/Form/Element/Imagefile.php`
+      * `lib/Magento/Framework/Data/Form/Element/Label.php`
+      * `lib/Magento/Framework/Data/Form/Element/Link.php`
+      * `lib/Magento/Framework/Data/Form/Element/Multiselect.php`
+      * `lib/Magento/Framework/Data/Form/Element/Note.php`
+      * `lib/Magento/Framework/Data/Form/Element/Obscure.php`
+      * `lib/Magento/Framework/Data/Form/Element/Password.php`
+      * `lib/Magento/Framework/Data/Form/Element/Radio.php`
+      * `lib/Magento/Framework/Data/Form/Element/Reset.php`
+      * `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:

diff --git a/app/autoload.php b/app/autoload.php
@@ -24,4 +24,4 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 require_once __DIR__ . '/../lib/Magento/Framework/Autoload/IncludePath.php';
-spl_autoload_register('\Magento\Framework\Autoload\IncludePath::load');
+spl_autoload_register([new \Magento\Framework\Autoload\IncludePath(), 'load']);
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -63,7 +63,7 @@
 require_once BP . '/app/functions.php';
 
 require_once __DIR__ . '/autoload.php';
-\Magento\Framework\Autoload\IncludePath::addIncludePath(array(BP . '/app/code', BP . '/lib'));
+(new \Magento\Framework\Autoload\IncludePath())->addIncludePath(array(BP . '/app/code', BP . '/lib'));
 $classMapPath = BP . '/var/classmap.ser';
 if (file_exists($classMapPath)) {
     require_once BP . '/lib/Magento/Framework/Autoload/ClassMap.php';

diff --git a/app/code/Magento/Authorizenet/view/frontend/form/cc.phtml b/app/code/Magento/Authorizenet/view/frontend/form/cc.phtml
@@ -34,23 +34,16 @@
 
     <?php if ($this->isPartialAuthorization()): ?>
         <?php echo $this->getChildHtml('cards') ?>
-        <div class="release-amounts" data-container="release-amounts">
+        <div class="release-amounts"
+             data-container="release-amounts"
+             data-mage-init='{"authorizenetAuthenticate":{"partialAuthorizationConfirmationMessage": "<?php echo $this->getPartialAuthorizationConfirmationMessage()?>",
+                                                          "cancelConfirmationMessage": "<?php echo $this->getCancelConfirmationMessage() ?>",
+                                                          "cancelUrl": "<?php echo $this->getCancelUrl() ?>"}}'>
             <button class="button" type="button" id="payment-button-cancel" name="cancel"><span><span>Cancel</span></span></button>
             <span><?php echo __('To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.') ?></span>
         </div>
         <?php echo $this->showNoticeMessage(__('Please enter a different credit card number to complete your purchase.')) ?>
 
-        <script type="text/javascript">
-            (function ($) {
-                head.js("<?php echo $this->getViewFileUrl('Magento_Authorizenet::authorizenet-authenticate.js') ?>", function () {
-                    $('[data-container="release-amounts"]').authorizenetAuthenticate({
-                        partialAuthorizationConfirmationMessage: '<?php echo $this->getPartialAuthorizationConfirmationMessage()?>',
-                        cancelConfirmationMessage: '<?php echo $this->getCancelConfirmationMessage() ?>',
-                        cancelUrl: '<?php echo $this->getCancelUrl() ?>'
-                    });
-                });
-            })(jQuery);
-        </script>
         <span id="cancel-please-wait" class="please-wait load indicator" style="display: none" data-text="<?php echo __('Processing...') ?>">
             <span><?php echo __('Processing...') ?></span>
         </span>

diff --git a/app/code/Magento/Authorizenet/view/frontend/js/components.phtml b/app/code/Magento/Authorizenet/view/frontend/js/components.phtml
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     base_default
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<script type="text/javascript">
+    (function($) {
+        "use strict";
+        /**
+         * Declaration of resources needed for defined components
+         */
+        $.mage.component({
+            authorizenetAuthenticate: [
+                '<?php echo $this->getViewFileUrl('Magento_Authorizenet::authorizenet-authenticate.js') ?>'
+            ]
+        });
+    })(jQuery);
+</script>
+<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml
@@ -31,4 +31,7 @@
             </arguments>
         </block>
     </referenceBlock>
+    <referenceBlock name="head.components">
+        <block class="Magento\Framework\View\Element\Js\Components" name="authorizenet_page_head_components" template="Magento_Authorizenet::js/components.phtml"/>
+    </referenceBlock>
 </layout>
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -83,7 +83,7 @@ protected function _convertDate($date, $locale)
     {
         if ($this->getColumn()->getFilterTime()) {
             try {
-                $dateObj = $this->getLocaleDate()->date(null, null, $locale, false);
+                $dateObj = $this->_localeDate->date(null, null, $locale, false);
 
                 //set default timezone for store (admin)
                 $dateObj->setTimezone(
@@ -96,7 +96,7 @@ protected function _convertDate($date, $locale)
                 //set date with applying timezone of store
                 $dateObj->set(
                     $date,
-                    $this->getLocaleDate()->getDateTimeFormat(
+                    $this->_localeDate->getDateTimeFormat(
                         \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT
                     ),
                     $locale

diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -44,9 +44,9 @@
                     <argument name="file" xsi:type="string">jquery/jquery-ui-1.9.2.js</argument>
                 </arguments>
             </block>
-            <block class="Magento\Theme\Block\Html\Head\Script" name="head-load-min-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="js-head-js">
                 <arguments>
-                    <argument name="file" xsi:type="string">headjs/head.load.min.js</argument>
+                    <argument name="file" xsi:type="string">headjs/head.min.js</argument>
                 </arguments>
             </block>
             <block class="Magento\Theme\Block\Html\Head\Script" name="underscore-js">

diff --git a/app/code/Magento/Backend/view/adminhtml/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/media/uploader.phtml
@@ -51,7 +51,7 @@
     $(function () {
         $('#fileupload').fileupload({
             dataType: 'json',
-            dropZone: '#media_gallery_content',
+            dropZone: '[data-tab-panel=image-management]',
             sequentialUploads: true,
             acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
             maxFileSize: <?php echo $this->getFileSizeService()->getMaxFileSize() ?>,

diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php
@@ -27,10 +27,6 @@
 
 /**
  * Adminhtml block for fieldset of bundle product
- *
- * @category   Magento
- * @package    Magento_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Bundle extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle
 {

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/Price.php b/app/code/Magento/Bundle/Block/Catalog/Product/Price.php
@@ -81,13 +81,13 @@ public function __construct(
      */
     public function isRatesGraterThenZero()
     {
-        $_request = $this->_taxCalc->getRateRequest(false, false, false);
-        $_request->setProductClassId($this->getProduct()->getTaxClassId());
-        $defaultTax = $this->_taxCalc->getRate($_request);
+        $request = $this->_taxCalc->getRateRequest(false, false, false);
+        $request->setProductClassId($this->getProduct()->getTaxClassId());
+        $defaultTax = $this->_taxCalc->getRate($request);
 
-        $_request = $this->_taxCalc->getRateRequest();
-        $_request->setProductClassId($this->getProduct()->getTaxClassId());
-        $currentTax = $this->_taxCalc->getRate($_request);
+        $request = $this->_taxCalc->getRateRequest();
+        $request->setProductClassId($this->getProduct()->getTaxClassId());
+        $currentTax = $this->_taxCalc->getRate($request);
 
         return floatval($defaultTax) > 0 || floatval($currentTax) > 0;
     }
@@ -101,54 +101,14 @@ public function isRatesGraterThenZero()
     public function displayBothPrices()
     {
         $product = $this->getProduct();
-        if ($product->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC &&
-            $product->getPriceModel()->getIsPricesCalculatedByIndex() !== false
+        if ($product->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
+            && $product->getPriceModel()->getIsPricesCalculatedByIndex() !== false
         ) {
             return false;
         }
         return $this->_taxData->displayBothPrices();
     }
 
-    /**
-     * Convert block to html string
-     *
-     * @return string
-     */
-    protected function _toHtml()
-    {
-        $product = $this->getProduct();
-        if ($this->getMAPTemplate() && $this->_catalogData->canApplyMsrp(
-            $product
-        ) && $product->getPriceType() != \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
-        ) {
-            $hiddenPriceHtml = parent::_toHtml();
-            if ($this->_catalogData->isShowPriceOnGesture($product)) {
-                $this->setWithoutPrice(true);
-            }
-            $realPriceHtml = parent::_toHtml();
-            $this->unsWithoutPrice();
-            $addToCartUrl = $this->getLayout()->getBlock('product.info.bundle')->getAddToCartUrl($product);
-            $product->setAddToCartUrl($addToCartUrl);
-            $html = $this->getLayout()->createBlock(
-                'Magento\Catalog\Block\Product\Price'
-            )->setTemplate(
-                $this->getMAPTemplate()
-            )->setRealPriceHtml(
-                $hiddenPriceHtml
-            )->setPriceElementIdPrefix(
-                'bundle-price-'
-            )->setIdSuffix(
-                $this->getIdSuffix()
-            )->setProduct(
-                $product
-            )->toHtml();
-
-            return $realPriceHtml . $html;
-        }
-
-        return parent::_toHtml();
-    }
-
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId
      * @return bool|\Magento\Store\Model\Website

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View.php b/app/code/Magento/Bundle/Block/Catalog/Product/View.php