Skip to content

Commit

Permalink
2.0.0.0-dev80
Browse files Browse the repository at this point in the history
* Framework improvements:
  * Reworked subsystem of static view files preprocessing
     * Refactored implementation of the view files "fallback" and "collecting" (layout XML files, LESS files for @magento_import) mechanisms for better abstraction
     * Used the concept of "view asset" in client code of the View library across the board
     * Refactored and simplified LESS preprocessing library, mechanisms of merging and minifying static view files
     * Reworked the way how links to static view files are generated and served):
         * Changed the strategy of generating unique URL for view static files
         * Separated the view files publication process from the page generation
         * Added a separate entry point (pub/static.php) for file materialization
     * View files deployment tool changes:
         * Renamed CLI script from generator.php to deploy.php
         * Fixed the known limitation of view files deployment tool of being unable to materialize files per languages. Now the list of intended languages can be provided as a CLI parameter
         * Expanded the tool parameters
     * Improved security and reliability of view files structure:
         * Restructured the module view folder by file type: "web"  view static files, "templates"  module template files, and "layout"  module layout files
         * Reworked the theme module folder to repeat the same structure as in the module
         * Added web folder to a theme root which contains static view files
         * Renamed the pub/lib to lib/web. Currently there are no static files that are publicly accessible by default. All static view files may be subject of preprocessing
         * Renamed the former lib to lib/internal
  * Support of RequireJS:
     * Adopted RequireJS library and implemented ability for modules or themes to introduce RequireJS configuration (aka shim-config)
     * Refactored scripts in the Magento_ConfigurableProduct module to be loaded via RequireJS
* Tax calculation updates:
  * Fixed tax calculation rounding issues when discount is applied
  * Fixed extra penny problem when exact tax amount ends with 0.5 cent
  * Fixed tax calculation errors when customer tax rate is different from store tax rate
  * Added support to round tax at individual tax rate
  * Fixed price inconsistencies between catalog and shopping cart
  * Added support to maintain consistent price including tax for customers with different tax rates
  * Added support to allow tax rules with different priorities to be applied to subtotal only
* Fixed bugs:
  * Fixed an issue where it was impossible to place an order with Zero Subtotal Checkout using checkout with multiple addresses
  * Fixed an issue where an irrelevant  confirmation window appeared when placing an order with Zero Subtotal Checkout in the backend
  * Fixed an issue where it was impossible to create an order for a new customer in the backend if gift options were  enabled
  * Fixed an issue where a wrong message about backordered items in cart was displayed in the backend
  * Fixed an issue where it was impossible to perform a checkout with multiple addresses when the  Validate Each Address Separately option in Multi-address Checkout was enabled
  * Fixed an issue where the Minimum Order Amount option was applied to the orders
  * Fixed an issue where the duplicated element  caused  problems when attempting to customize styling  of the section
  * Fixed an issue where a user was redirected to Dashboard when clicking the Search  and Reset buttons on the Recurring Profile page
  * Fixed an issue where the Enabled for RMA option was available for online shipping method in Magento 2 CE
  * Fixed an issue when free shipping was applied even if the Free Shipping with Minimum Order Amount option was disabled
  * Fixed an issue with not displaying a downloadable product with the Links can be purchased separately option enabled on the grouped product page
  * Fixed an issue of not generating product price variations during configurable product creation
  * Fixed an issue with incorrect work of category pager
  * Fixed an issue with file permissions change after the system backup was run
  * Fixed an issue with inconsistency between the REST request and response format
  * Fixed an issue with the Magento Contact Us form not submitted if secure_base_url doesn't contain "https"
  * Fixed an issue with incorrect display of the Price as configured field which didnt count product options cost
  * Fixed an issue with incorrect redirect when clicking the product URL in Pending Review Rss
* JavaScript improvements:
  * Added standard validation to the front-end address fields
  * Implemented the wishlist widget
  * Implemented the tabs widget
  * Implemented the collapsible widget
  * Implemented the accordion widget
  * Implemented the tooltip widget
  * Standardized widgets used on one page checkout
  • Loading branch information
magento-team committed May 30, 2014
1 parent 7ac4278 commit db0b8d9
Show file tree
Hide file tree
Showing 8,306 changed files with 29,647 additions and 21,675 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 8 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ atlassian*
/downloader/.cache
/downloader/cache.cfg
/downloader/connect.cfg
/lib/flex/uploader/.actionScriptProperties
/lib/flex/uploader/.flexProperties
/lib/flex/uploader/.project
/lib/flex/uploader/.settings
/lib/flex/varien/.actionScriptProperties
/lib/flex/varien/.flexLibProperties
/lib/flex/varien/.project
/lib/flex/varien/.settings
/pub/cache/*
/lib/internal/flex/uploader/.actionScriptProperties
/lib/internal/flex/uploader/.flexProperties
/lib/internal/flex/uploader/.project
/lib/internal/flex/uploader/.settings
/lib/internal/flex/varien/.actionScriptProperties
/lib/internal/flex/varien/.flexLibProperties
/lib/internal/flex/varien/.project
/lib/internal/flex/varien/.settings
/pub/media/*
/pub/media/customer/*
/pub/media/downloadable/*
Expand Down
83 changes: 74 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,74 @@
2.0.0.0-dev80
=============
* Framework improvements:
* Reworked subsystem of static view files preprocessing
* Refactored implementation of the view files "fallback" and "collecting" (layout XML files, LESS files for @magento_import) mechanisms for better abstraction
* Used the concept of "view asset" in client code of the View library across the board
* Refactored and simplified LESS preprocessing library, mechanisms of merging and minifying static view files
* Reworked the way how links to static view files are generated and served):
* Changed the strategy of generating unique URL for view static files
* Separated the view files publication process from the page generation
* Added a separate entry point (pub/static.php) for file materialization
* View files deployment tool changes:
* Renamed CLI script from generator.php to deploy.php
* Fixed the known limitation of view files deployment tool of being unable to materialize files per languages. Now the list of intended languages can be provided as a CLI parameter
* Expanded the tool parameters
* Improved security and reliability of view files structure:
* Restructured the module view folder by file type: "web" – view static files, "templates" – module template files, and "layout" – module layout files
* Reworked the theme module folder to repeat the same structure as in the module
* Added “web” folder to a theme root which contains static view files
* Renamed the pub/lib to lib/web. Currently there are no static files that are publicly accessible by default. All static view files may be subject of preprocessing
* Renamed the former lib to lib/internal
* Support of RequireJS:
* Adopted RequireJS library and implemented ability for modules or themes to introduce RequireJS configuration (aka shim-config)
* Refactored scripts in the Magento_ConfigurableProduct module to be loaded via RequireJS
* Tax calculation updates:
* Fixed tax calculation rounding issues when discount is applied
* Fixed extra penny problem when exact tax amount ends with 0.5 cent
* Fixed tax calculation errors when customer tax rate is different from store tax rate
* Added support to round tax at individual tax rate
* Fixed price inconsistencies between catalog and shopping cart
* Added support to maintain consistent price including tax for customers with different tax rates
* Added support to allow tax rules with different priorities to be applied to subtotal only
* Fixed bugs:
* Fixed an issue where it was impossible to place an order with Zero Subtotal Checkout using checkout with multiple addresses
* Fixed an issue where an irrelevant confirmation window appeared when placing an order with Zero Subtotal Checkout in the backend
* Fixed an issue where it was impossible to create an order for a new customer in the backend if gift options were enabled
* Fixed an issue where a wrong message about backordered items in cart was displayed in the backend
* Fixed an issue where it was impossible to perform a checkout with multiple addresses when the Validate Each Address Separately option in Multi-address Checkout was enabled
* Fixed an issue where the Minimum Order Amount option was applied to the orders
* Fixed an issue where the duplicated element caused problems when attempting to customize styling of the section
* Fixed an issue where a user was redirected to Dashboard when clicking the Search and Reset buttons on the Recurring Profile page
* Fixed an issue where the Enabled for RMA option was available for online shipping method in Magento 2 CE
* Fixed an issue when free shipping was applied even if the Free Shipping with Minimum Order Amount option was disabled
* Fixed an issue with not displaying a downloadable product with the Links can be purchased separately option enabled on the grouped product page
* Fixed an issue of not generating product price variations during configurable product creation
* Fixed an issue with incorrect work of category pager
* Fixed an issue with file permissions change after the system backup was run
* Fixed an issue with inconsistency between the REST request and response format
* Fixed an issue with the Magento Contact Us form not submitted if secure_base_url doesn't contain "https"
* Fixed an issue with incorrect display of the Price as configured field which didn’t count product options cost
* Fixed an issue with incorrect redirect when clicking the product URL in Pending Review Rss
* JavaScript improvements:
* Added standard validation to the front-end address fields
* Implemented the wishlist widget
* Implemented the tabs widget
* Implemented the collapsible widget
* Implemented the accordion widget
* Implemented the tooltip widget
* Standardized widgets used on one page checkout

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 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
Expand Down Expand Up @@ -52,12 +113,16 @@
* 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
* Admin User Role 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
* Virtual Product Creation
* Catalog Price Rule Creation
* Category Url Rewrite Creation
* Admin User Role Deletion
* Update composer.json.dist in order to download and install MTF from Public GitHub (MAGETWO-24698)
* 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
Expand Down
2 changes: 1 addition & 1 deletion app/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
* @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)
*/
require_once __DIR__ . '/../lib/Magento/Framework/Autoload/IncludePath.php';
require_once __DIR__ . '/../lib/internal/Magento/Framework/Autoload/IncludePath.php';
spl_autoload_register([new \Magento\Framework\Autoload\IncludePath(), 'load']);
4 changes: 2 additions & 2 deletions app/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
require_once BP . '/app/functions.php';

require_once __DIR__ . '/autoload.php';
(new \Magento\Framework\Autoload\IncludePath())->addIncludePath(array(BP . '/app/code', BP . '/lib'));
(new \Magento\Framework\Autoload\IncludePath())->addIncludePath(array(BP . '/app/code', BP . '/lib/internal'));
$classMapPath = BP . '/var/classmap.ser';
if (file_exists($classMapPath)) {
require_once BP . '/lib/Magento/Framework/Autoload/ClassMap.php';
require_once BP . '/lib/internal/Magento/Framework/Autoload/ClassMap.php';
$classMap = new \Magento\Framework\Autoload\ClassMap(BP);
$classMap->addMap(unserialize(file_get_contents($classMapPath)));
spl_autoload_register(array($classMap, 'load'), true, true);
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/etc/adminhtml/acl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/Acl/etc/acl.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
<resource id="Magento_Adminhtml::admin">
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/etc/adminhtml/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<type name="Magento\AdminNotification\Model\System\MessageList">
<arguments>
<argument name="messages" xsi:type="array">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/Event/etc/events.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
<event name="controller_action_predispatch">
<observer name="adminnotification" instance="Magento\AdminNotification\Model\Observer" method="preDispatch" />
</event>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/App/etc/routes.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
<module name="Magento_AdminNotification" before="Magento_Adminhtml" />
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/Magento/Framework/Module/etc/module.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
<module name="Magento_AdminNotification" version="2.0.0.0" active="true">
<sequence>
<module name="Magento_Core"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/etc/adminhtml/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Authorizenet\Helper\HelperInterface" type="Magento\Authorizenet\Helper\Backend" />
<type name="Magento\Authorizenet\Model\Directpost\Session">
<arguments>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/etc/adminhtml/events.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/Event/etc/events.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
<event name="checkout_submit_all_after">
<observer name="directpost_update_all_edit_increments" instance="Magento\Authorizenet\Model\Directpost\Observer" method="updateAllEditIncrements" />
</event>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/etc/adminhtml/routes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/App/etc/routes.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
<module name="Magento_Authorizenet" before="Magento_Adminhtml" />
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<type name="Magento\Authorizenet\Model\Directpost\Observer">
<arguments>
<argument name="authorizenetData" xsi:type="object">Magento\Authorizenet\Helper\Data\Proxy</argument>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/etc/frontend/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Authorizenet\Helper\HelperInterface" type="Magento\Authorizenet\Helper\Data" />
<type name="Magento\Authorizenet\Model\Directpost\Session">
<arguments>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/etc/frontend/events.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/Event/etc/events.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
<event name="checkout_submit_all_after">
<observer name="directpost_save_order_after_submit" instance="Magento\Authorizenet\Model\Directpost\Observer" method="saveOrderAfterSubmit" />
</event>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/etc/frontend/routes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/App/etc/routes.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="standard">
<route id="authorizenet" frontName="authorizenet">
<module name="Magento_Authorizenet" />
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/Magento/Framework/Module/etc/module.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
<module name="Magento_Authorizenet" version="1.5.0.0" active="true">
<sequence>
<module name="Magento_Sales"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ directPost.prototype = {
}

if (response.update_section) {
$('checkout-' + response.update_section.name + '-load').update(response.update_section.html);
$('checkout-' + response.update_section.name + '-load').replace(response.update_section.html);
response.update_section.html.evalScripts();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,9 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderFro
<label for="<?php echo $_code ?>_cc_cid" class="label"><span><?php echo __('Card Verification Number') ?></span></label>
<div class="control">
<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" data-mage-init='{"toggleAdvanced": {"toggleContainers":"#directpost-tool-tip"}}'><span><?php echo __('What is this?') ?></span></a>
</div>
<div class="tooltip hidden" id="directpost-tool-tip">
<a href="#" id="directpost-tool-tip-close" title="<?php echo __('Close') ?>" data-mage-init='{"toggleAdvanced": {"toggleContainers":"#directpost-tool-tip"}}' class="action close">
<span><?php echo __('Close') ?></span>
</a>
<div class="content"><img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" /></div>
<a href="#" id="directpost-cvv-what-is-this" class="action cvv" title="" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authz/etc/adminhtml/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Authz\Model\UserLocatorInterface" type="Magento\Authz\Model\UserLocator\Admin"/>
</config>
Loading

0 comments on commit db0b8d9

Please sign in to comment.