magento
diff --git a/‎CHANGELOG.md
Lines changed: 112 additions & 6 deletions b/‎CHANGELOG.md
Lines changed: 112 additions & 6 deletions
diff --git a/‎app/code/Magento/AdminNotification/Block/System/Messages.php
Lines changed: 2 additions & 2 deletions b/‎app/code/Magento/AdminNotification/Block/System/Messages.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Authorizenet/view/frontend/templates/directpost/form.phtml
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Authorizenet/view/frontend/templates/directpost/form.phtml
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php
Lines changed: 14 additions & 35 deletions b/‎app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php
Lines changed: 14 additions & 35 deletions
diff --git a/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/AbstractScopeConfig.php
Lines changed: 69 additions & 0 deletions b/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/AbstractScopeConfig.php
Lines changed: 69 additions & 0 deletions
diff --git a/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/Edit.php
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/Edit.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/Index.php
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/Index.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/Save.php
Lines changed: 3 additions & 5 deletions b/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/Save.php
Lines changed: 3 additions & 5 deletions
diff --git a/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/State.php
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/State.php
Lines changed: 1 addition & 1 deletion
@@ -1,3 +1,110 @@
+2.0.0.0-dev88
+=============
+* Fixed bugs:
+  * Fixed an issue when PayPal Express Checkout Payflow Edition and PayPal Payments Advanced were available for multiple checkout
+  * Fixed an issue when the Bill me later button did not redirect to https when secure url was enabled for frontend
+  * Fixed an issue when the Billing agreement option was available in multishipping checkout, even if there were no signed agreements
+  * Fixed an issue when DoExpressCheckout request instead of DoCapture did not allow to do refund, when using PayPal Express Checkout Payflow Edition
+  * Fixed an issue when eWay was not present on checkout if Base Currency was set to AUD
+  * Fixed an issue with fatal error occurring when placing order via SagePay with 3D Secure enabled
+  * Fixed an issue when the FedEx shipping method had no option to specify unit for weight attribute
+  * Fixed an issue with inability to create credit memo for PalPal Express Checkout/Payments Pro/Payments Pro Hosted Solution (NVP family), if partial refund was initiated on the PayPal side
+  * Fixed an issue when a guest user could not return product to store, if product was paid using PayPal
+  * Fixed an issue when PayPal Payments Pro Hosted Solution Fraud protection did not work properly
+  * Fixed an issue when JavaScript took values from default config for payment methods and used them on the website scope
+  * Fixed an issue with incorrect address in request to shipping carrier (DHL International) in case the address contained diacritic letters
+  * Fixed an issue when it was possible to hack currency in PayPal Website Payments Standard
+  * Fixed an issue when no rows were added to the PayPal Settlement report grid while fetching it from custom server
+  * Fixed an issue when order had the Suspected Fraud status after creating partial invoice on the PayPal side
+  * Fixed an issue when PayPal Payflow Pro did not properly implement CUSTREF and INVNUM
+  * Fixed an issue with PayPal errors handling during IPN postback
+  * Fixed an issue when the Paypal Express Checkout button was not available on product page for several product types
+  * Fixed an issue with PayPal Payflow Pro and Payflow Link broken unit tests
+  * Fixed an issue when PayPal Payments Pro Hosted Solution had the City parameter duplicated in the State parameter for UK
+  * Fixed an issue with remove multiple HTTP 100/101 headers
+  * Fixed an issue when SagePay did not transfer shopping cart information
+  * Fixed an issue when transaction records were absent on Transaction tab for Ogone
+  * Fixed an issue when partial cancel with SagePay Direct was unavailable
+  * Fixed an issue when order did not place using PayPal Payments Pro Hosted Solution
+  * Fixed an issue when order did not place using Authorize.net Direct Post from backend
+  * Fixed an issue when sort order for payment methods did not work
+  * Fixed an issue with multiple schema of language.xml
+  * Fixed an issue with infinite loop in language inheritance
+  * Fixed an issue with residual "scopes" logic in i18n implementation
+  * Fixed an issue when search did not work for the CMS Blocks grid
+  * Fixed an issue when WSDL for one scope was cached and displayed for all scopes
+  * Fixed an issue with unit tests coverage build failure
+  * Fixed an issue when custom options were lost after product import
+  * Fixed an issue when product did not show in backend grid if store contained several store view
+  * Fixed an issue when the Recurring Profile section was not updated after changing product template
+  * Fixed an issue with incorrect discount calculation
+  * Fixed an issue when customer could not register during Checkout if Guest Checkout was disabled
+  * Fixed an issue when shopping cart price rule was not applied after updating items and qty in the shopping cart
+  * Fixed an issue when updated and created dates were not shown for Billing Agreement in the Billing Agreement Grid in the backend
+  * Fixed an issue with broken design on the multiple addresses order review page
+  * Fixed an issue when sort by did not work in frontend for Yes/No attributes when Flat catalog was disabled
+  * Fixed an issue when a new blank CMS page was displayed after saving the CMS page entity
+  * Fixed an issue when product attributes were absent on the Product page after switching to another product template
+  * Fixed a 404 error after saving mass update product attributes form
+  * Fixed an issue when it was impossible to perform search by all tax classes on the Advanced Search page
+  * Fixed an issue when attribute order for configurable product was not preserved after saving product
+  * Fixed an issue with no results for the Product Best Sellers report
+  * Fixed a fatal error when opening tax configuration page in the backend
+  * Fixed an error occurring when opening the Tax Zones and Rates page in the backend
+  * Fixed a 404 error occurring while searching products on the New Review page
+  * Fixed an error when performing search in the Tax rate grid
+* Payments implementation:
+  * Ported correct behaviour for Fraud Management in PayPal Payflow Pro from M1 to M2
+  * Implemented ability to use negative line items for PayPal Payflowpro
+* Language packs:
+  * Implemented ability to use multiple packages for the same language from one vendor
+* GitHub requests:
+  * [#587] (https://github.com/magento/magento2/issues/587) --  The "install/Magento/basic/*_*/layout/*.xml" pattern cannot be processed in "/mnt/fs01/test/mdt/htdocs/app/design/" path Warning!Invalid argument supplied for foreach()
+* Unit tests coverage:
+  * Magento\Catalog\Model\Product
+* Service layer implementation:
+  * Created ConfigurableProduct service
+  * Created CompositeProduct service
+  * Refactored TaxCalculationService
+  * Refactored Google Shopping to use tax service
+  * Exposed TaxRate and TaxRule search functions as WebAPI TaxCalculationService
+  * Refactored QuoteDetails and QuoteDetailsItem to use tax class name
+  * Refactored gift wrapping to use tax/weee services
+  * Performed more tax refactoring for service layer
+  * Improved unit test coverage
+* Indexer-less implementation of URL Rewrites functionality in new UrlRedirect module:
+  * Implemented URL Rewrites generators for all entities: CMS page, product, category
+  * Implemented URL Rewrites matching in the frontend
+* Added the following functional tests:
+  * Activate Integration
+  * Add Compared Products
+  * Create Bundle Product
+  * Clear All Compare Products
+  * Create CMS Block
+  * Create CMS Page
+  * Create Custom Variable
+  * Create Integration
+  * Create Grouped Product
+  * Create Search Term
+  * Delete Assigned to Template Product Attribute
+  * Delete CMS Block
+  * Delete CMS Page Rewrite
+  * Delete Compare Products
+  * Delete Custom URL Rewrite
+  * Delete Integration
+  * Delete Product Template
+  * Duplicate Product
+  * Edit Search Term
+  * Update Bundle Product
+  * Update CMS Block
+  * Update CMS Page URL Rewrite
+  * Update Custom Variable
+  * Update Custom URL Rewrite
+  * Update Customer on Frontend
+  * Update Integration
+  * Update Product Template
+  * Update Virtual Product
+
 2.0.0.0-dev87
 =============
 * Service layer updates:
@@ -12,6 +119,7 @@
   * [#584] (https://github.com/magento/magento2/issues/584) -- Merge and minify js - Exception
   * [#585] (https://github.com/magento/magento2/pull/585) -- Add forgotten return statement
   * [#592] (https://github.com/magento/magento2/issues/592) -- Module name pattern
+  * [#618] (https://github.com/magento/magento2/issues/618) -- Fix of unit tests failure on Travis CI
 * Tax calculation updates:
   * Separate and display Weee line item totals from Tax
 * Fixed bugs:
@@ -30,18 +138,16 @@
   * Fixed an issue when configurable product was out of stock in Google Shopping while being in stock in the Magento backend
   * Fixed an issue when swipe gesture in menu widget was not supported on mobile
   * Fixed an issue when it was impossible to enter alpha-numeric zip code on the stage of  estimating shipping and tax rates
-  * Fixed an issue when it was impossible to edit gift card account
   * Fixed an issue when custom price was not applied when editing an order
-  * Fixed an issue when  items were  not returned to stock after unsuccessful order was placed
+  * Fixed an issue when items were not returned to stock after unsuccessful order was placed
   * Fixed an issue when error message appeared "Cannot save the credit memo” while creating credit memo
   * Fixed an issue when Catalog price rule was not shown for the product if price was less than a discount
 * Indexer implementation:
   * Implemented a new Stock indexer
   * Implemented a new EAV indexer
-  * Fixed failed L1 plan on phpunit 4.1.0
-  * Minor updates for integration test framework
-  * Split action controllers classes into action classes
-  * Added public MTF repository to the packagist.org
+* Minor updates for integration test framework
+* Split action controllers classes into action classes
+* Added public MTF repository to the packagist.org
 * Added the following functional tests:
   * Create Admin User
   * Create Category
 
@@ -17,7 +17,7 @@
  * 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.
- * 
+ *
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -129,7 +129,7 @@ protected function _getMessagesUrl()
     }
 
     /**
-     * Initialize Syste,Message dialog widget
+     * Initialize system message dialog widget
      *
      * @return string
      */
 
@@ -138,7 +138,7 @@ directPost.prototype = {
     loadOrderIframe : function() {
         if (this.orderRequestSent) {
             $(this.iframeId).hide();
-            var data = $('order-' + this.iframeId).contentWindow.document.body.innerHTML;
+            var data = $('order-' + this.iframeId).contentWindow.document.body.getElementsByTagName('pre')[0].innerHTML;
             this.saveAdminOrderSuccess(data);
             this.orderRequestSent = false;
         }
 
@@ -91,7 +91,7 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderFro
                 <input type="number" title="<?php echo __('Card Verification Number') ?>" data-container="cc-cvv" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' autocomplete="off"/>
                 <?php $_content = '<img src=\"'.$this->getViewFileUrl('Magento_Checkout::cvv.gif').'\" alt=\"'.__('Card Verification Number Visual Reference').'\" title=\"'.__('Card Verification Number Visual Reference').'\" />'; ?>
                 <div class="note">
-                    <a href="#" id="directpost-cvv-what-is-this" class="action cvv" title="<?php echo __('What is this?') ?>" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
+                    <a href="#" id="directpost-cvv-what-is-this" class="action cvv" title="<?php echo $this->escapeHtml(__('What is this?'));?>" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
                 </div>
             </div>
         </div>
 
@@ -27,25 +27,32 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System;
 
-use Magento\Framework\App\Action\NotFoundException;
-
 abstract class AbstractConfig extends \Magento\Backend\App\AbstractAction
 {
     /**
      * @var \Magento\Backend\Model\Config\Structure
      */
     protected $_configStructure;
 
+    /**
+     * @var ConfigSectionChecker
+     */
+    protected $_sectionChecker;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\Model\Config\Structure $configStructure
+     * @param ConfigSectionChecker $sectionChecker
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Backend\Model\Config\Structure $configStructure
+        \Magento\Backend\Model\Config\Structure $configStructure,
+        ConfigSectionChecker $sectionChecker
     ) {
         parent::__construct($context);
         $this->_configStructure = $configStructure;
+        $this->_sectionChecker = $sectionChecker;
+
     }
 
     /**
@@ -56,12 +63,8 @@ public function __construct(
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
-        $section = null;
         if (!$request->getParam('section')) {
-            $section = $this->_configStructure->getFirstSection();
-            $request->setParam('section', $section->getId());
-        } else {
-            $this->_isSectionAllowed($request->getParam('section'));
+            $request->setParam('section', $this->_configStructure->getFirstSection()->getId());
         }
         return parent::dispatch($request);
     }
@@ -73,33 +76,9 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Adminhtml::config');
-    }
-
-    /**
-     * Check if specified section allowed in ACL
-     *
-     * Will forward to deniedAction(), if not allowed.
-     *
-     * @param string $sectionId
-     * @throws \Exception
-     * @return bool
-     * @throws NotFoundException
-     */
-    protected function _isSectionAllowed($sectionId)
-    {
-        try {
-            if (false == $this->_configStructure->getElement($sectionId)->isAllowed()) {
-                throw new \Exception('');
-            }
-            return true;
-        } catch (\Zend_Acl_Exception $e) {
-            throw new NotFoundException();
-        } catch (\Exception $e) {
-            $this->deniedAction();
-            $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
-            return false;
-        }
+        $sectionId = $this->_request->getParam('section');
+        return $this->_authorization->isAllowed('Magento_Adminhtml::config')
+            || $this->_configStructure->getElement($sectionId)->isAllowed();
     }
 
     /**
 
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-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.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+ 
+namespace Magento\Backend\Controller\Adminhtml\System\Config;
+
+use Magento\Backend\Controller\Adminhtml\System\ConfigSectionChecker;
+
+abstract class AbstractScopeConfig extends \Magento\Backend\Controller\Adminhtml\System\AbstractConfig
+{
+    /**
+     * @var \Magento\Backend\Model\Config
+     */
+    protected $_backendConfig;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Backend\Model\Config\Structure $configStructure
+     * @param ConfigSectionChecker $sectionChecker
+     * @param \Magento\Backend\Model\Config $backendConfig
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Backend\Model\Config\Structure $configStructure,
+        ConfigSectionChecker $sectionChecker,
+        \Magento\Backend\Model\Config $backendConfig
+    ) {
+        $this->_backendConfig = $backendConfig;
+        parent::__construct($context, $configStructure, $sectionChecker);
+    }
+
+    /**
+     * Sets scope for backend config
+     *
+     * @param string $sectionId
+     * @return bool
+     */
+    protected function isSectionAllowed($sectionId)
+    {
+        $website = $this->getRequest()->getParam('website');
+        $store = $this->getRequest()->getParam('store');
+        if ($store) {
+            $this->_backendConfig->setStore($store);
+        } elseif ($website) {
+            $this->_backendConfig->setWebsite($website);
+        }
+        return parent::isSectionAllowed($sectionId);
+    }
+}
@@ -24,7 +24,7 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Config;
 
-class Edit extends \Magento\Backend\Controller\Adminhtml\System\AbstractConfig
+class Edit extends AbstractScopeConfig
 {
     /**
      * Edit configuration section
 
@@ -24,7 +24,7 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Config;
 
-class Index extends \Magento\Backend\Controller\Adminhtml\System\AbstractConfig
+class Index extends AbstractScopeConfig
 {
     /**
      * Index action
 
@@ -53,18 +53,20 @@ class Save extends AbstractConfig
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\Model\Config\Structure $configStructure
+     * @param \Magento\Backend\Controller\Adminhtml\System\ConfigSectionChecker $sectionChecker
      * @param \Magento\Backend\Model\Config\Factory $configFactory
      * @param \Magento\Framework\Cache\FrontendInterface $cache
      * @param \Magento\Framework\Stdlib\String $string
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Backend\Model\Config\Structure $configStructure,
+        \Magento\Backend\Controller\Adminhtml\System\ConfigSectionChecker $sectionChecker,
         \Magento\Backend\Model\Config\Factory $configFactory,
         \Magento\Framework\Cache\FrontendInterface $cache,
         \Magento\Framework\Stdlib\String $string
     ) {
-        parent::__construct($context, $configStructure);
+        parent::__construct($context, $configStructure, $sectionChecker);
         $this->_configFactory = $configFactory;
         $this->_cache = $cache;
         $this->string = $string;
@@ -160,10 +162,6 @@ protected function _saveAdvanced()
     public function execute()
     {
         try {
-            if (false == $this->_isSectionAllowed($this->getRequest()->getParam('section'))) {
-                throw new \Exception(__('This section is not allowed.'));
-            }
-
             // custom save logic
             $this->_saveSection();
             $section = $this->getRequest()->getParam('section');
 
@@ -24,7 +24,7 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Config;
 
-class State extends \Magento\Backend\Controller\Adminhtml\System\AbstractConfig
+class State extends AbstractScopeConfig
 {
     /**
      * Save fieldset state through AJAX
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ directPost.prototype = {`
`138`	`138`	`loadOrderIframe : function() {`
`139`	`139`	`if (this.orderRequestSent) {`
`140`	`140`	`$(this.iframeId).hide();`
`141`		`- var data = $('order-' + this.iframeId).contentWindow.document.body.innerHTML;`
	`141`	`+ var data = $('order-' + this.iframeId).contentWindow.document.body.getElementsByTagName('pre')[0].innerHTML;`
`142`	`142`	`this.saveAdminOrderSuccess(data);`
`143`	`143`	`this.orderRequestSent = false;`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`namespace Magento\Backend\Controller\Adminhtml\System\Config;`
`26`	`26`
`27`		`-class Edit extends \Magento\Backend\Controller\Adminhtml\System\AbstractConfig`
	`27`	`+class Edit extends AbstractScopeConfig`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`	`30`	`* Edit configuration section`