Skip to content

Commit db0b8d9

Browse files
committed
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 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
1 parent 7ac4278 commit db0b8d9

File tree

8,306 files changed

+29647
-21675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,306 files changed

+29647
-21675
lines changed

.gitignore

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ atlassian*
1818
/downloader/.cache
1919
/downloader/cache.cfg
2020
/downloader/connect.cfg
21-
/lib/flex/uploader/.actionScriptProperties
22-
/lib/flex/uploader/.flexProperties
23-
/lib/flex/uploader/.project
24-
/lib/flex/uploader/.settings
25-
/lib/flex/varien/.actionScriptProperties
26-
/lib/flex/varien/.flexLibProperties
27-
/lib/flex/varien/.project
28-
/lib/flex/varien/.settings
29-
/pub/cache/*
21+
/lib/internal/flex/uploader/.actionScriptProperties
22+
/lib/internal/flex/uploader/.flexProperties
23+
/lib/internal/flex/uploader/.project
24+
/lib/internal/flex/uploader/.settings
25+
/lib/internal/flex/varien/.actionScriptProperties
26+
/lib/internal/flex/varien/.flexLibProperties
27+
/lib/internal/flex/varien/.project
28+
/lib/internal/flex/varien/.settings
3029
/pub/media/*
3130
/pub/media/customer/*
3231
/pub/media/downloadable/*

CHANGELOG.md

Lines changed: 74 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,74 @@
1+
2.0.0.0-dev80
2+
=============
3+
* Framework improvements:
4+
* Reworked subsystem of static view files preprocessing
5+
* Refactored implementation of the view files "fallback" and "collecting" (layout XML files, LESS files for @magento_import) mechanisms for better abstraction
6+
* Used the concept of "view asset" in client code of the View library across the board
7+
* Refactored and simplified LESS preprocessing library, mechanisms of merging and minifying static view files
8+
* Reworked the way how links to static view files are generated and served):
9+
* Changed the strategy of generating unique URL for view static files
10+
* Separated the view files publication process from the page generation
11+
* Added a separate entry point (pub/static.php) for file materialization
12+
* View files deployment tool changes:
13+
* Renamed CLI script from generator.php to deploy.php
14+
* 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
15+
* Expanded the tool parameters
16+
* Improved security and reliability of view files structure:
17+
* Restructured the module view folder by file type: "web" – view static files, "templates" – module template files, and "layout" – module layout files
18+
* Reworked the theme module folder to repeat the same structure as in the module
19+
* Added “web” folder to a theme root which contains static view files
20+
* 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
21+
* Renamed the former lib to lib/internal
22+
* Support of RequireJS:
23+
* Adopted RequireJS library and implemented ability for modules or themes to introduce RequireJS configuration (aka shim-config)
24+
* Refactored scripts in the Magento_ConfigurableProduct module to be loaded via RequireJS
25+
* Tax calculation updates:
26+
* Fixed tax calculation rounding issues when discount is applied
27+
* Fixed extra penny problem when exact tax amount ends with 0.5 cent
28+
* Fixed tax calculation errors when customer tax rate is different from store tax rate
29+
* Added support to round tax at individual tax rate
30+
* Fixed price inconsistencies between catalog and shopping cart
31+
* Added support to maintain consistent price including tax for customers with different tax rates
32+
* Added support to allow tax rules with different priorities to be applied to subtotal only
33+
* Fixed bugs:
34+
* Fixed an issue where it was impossible to place an order with Zero Subtotal Checkout using checkout with multiple addresses
35+
* Fixed an issue where an irrelevant confirmation window appeared when placing an order with Zero Subtotal Checkout in the backend
36+
* Fixed an issue where it was impossible to create an order for a new customer in the backend if gift options were enabled
37+
* Fixed an issue where a wrong message about backordered items in cart was displayed in the backend
38+
* 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
39+
* Fixed an issue where the Minimum Order Amount option was applied to the orders
40+
* Fixed an issue where the duplicated element caused problems when attempting to customize styling of the section
41+
* Fixed an issue where a user was redirected to Dashboard when clicking the Search and Reset buttons on the Recurring Profile page
42+
* Fixed an issue where the Enabled for RMA option was available for online shipping method in Magento 2 CE
43+
* Fixed an issue when free shipping was applied even if the Free Shipping with Minimum Order Amount option was disabled
44+
* Fixed an issue with not displaying a downloadable product with the Links can be purchased separately option enabled on the grouped product page
45+
* Fixed an issue of not generating product price variations during configurable product creation
46+
* Fixed an issue with incorrect work of category pager
47+
* Fixed an issue with file permissions change after the system backup was run
48+
* Fixed an issue with inconsistency between the REST request and response format
49+
* Fixed an issue with the Magento Contact Us form not submitted if secure_base_url doesn't contain "https"
50+
* Fixed an issue with incorrect display of the Price as configured field which didn’t count product options cost
51+
* Fixed an issue with incorrect redirect when clicking the product URL in Pending Review Rss
52+
* JavaScript improvements:
53+
* Added standard validation to the front-end address fields
54+
* Implemented the wishlist widget
55+
* Implemented the tabs widget
56+
* Implemented the collapsible widget
57+
* Implemented the accordion widget
58+
* Implemented the tooltip widget
59+
* Standardized widgets used on one page checkout
60+
161
2.0.0.0-dev79
262
=============
363
* Tax calculation updates:
4-
* Fixed issues in tax calculation rounding with discount applied
5-
* Fixed an issue with extra penny when exact tax amount ended with 0.5 cent
6-
* Fixed an issue where there were tax calculation errors when customer tax rate was different from store tax rate
7-
* Added support to round tax at individual tax rate
8-
* Fixed price inconsistencies between catalog and shopping cart
9-
* Added support for maintaining consistent price including tax for customers with different tax rates
10-
* Added support for applying tax rules with different priorities to subtotal only
64+
* Fixed issues in tax calculation rounding with discount applied
65+
* Fixed an issue with extra penny when exact tax amount ended with 0.5 cent
66+
* Fixed an issue where there were tax calculation errors when customer tax rate was different from store tax rate
67+
* Added support to round tax at individual tax rate
68+
* Fixed price inconsistencies between catalog and shopping cart
69+
* Added support for maintaining consistent price including tax for customers with different tax rates
70+
* Added support for applying tax rules with different priorities to subtotal only
71+
1172
* Fixed bugs:
1273
* Removed the extra '%' sign in the error\notice message on Gift Card Accounts page on the backend
1374
* Fixed an issue with image uploading functionality in the Catalog configuration
@@ -52,12 +113,16 @@
52113
* Fixed an issue where Quoted price was displayed incorrectly from the shopping cart in the backend
53114
* Functional tests:
54115
* Tax Rule Creation
55-
* Admin User Roe Creation
116+
* Admin User Role Creation
56117
* Simple Product Creation
57118
* Customer Group Creation
58119
* Update Backend Customer
59120
* Newsletter Creation
60-
* Updated composer.json.dist to download and install MTF from Public GitHub repository
121+
* Virtual Product Creation
122+
* Catalog Price Rule Creation
123+
* Category Url Rewrite Creation
124+
* Admin User Role Deletion
125+
* Update composer.json.dist in order to download and install MTF from Public GitHub (MAGETWO-24698)
61126
* GitHub requests:
62127
* [#542] (https://github.com/magento/magento2/pull/542) Fix ImportExport bug which occurs while importing multiple rows per entity
63128
* [#507] (https://github.com/magento/magento2/issues/507) "Insert Image" window is overlapped on menu

app/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26-
require_once __DIR__ . '/../lib/Magento/Framework/Autoload/IncludePath.php';
26+
require_once __DIR__ . '/../lib/internal/Magento/Framework/Autoload/IncludePath.php';
2727
spl_autoload_register([new \Magento\Framework\Autoload\IncludePath(), 'load']);

app/bootstrap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
require_once BP . '/app/functions.php';
6363

6464
require_once __DIR__ . '/autoload.php';
65-
(new \Magento\Framework\Autoload\IncludePath())->addIncludePath(array(BP . '/app/code', BP . '/lib'));
65+
(new \Magento\Framework\Autoload\IncludePath())->addIncludePath(array(BP . '/app/code', BP . '/lib/internal'));
6666
$classMapPath = BP . '/var/classmap.ser';
6767
if (file_exists($classMapPath)) {
68-
require_once BP . '/lib/Magento/Framework/Autoload/ClassMap.php';
68+
require_once BP . '/lib/internal/Magento/Framework/Autoload/ClassMap.php';
6969
$classMap = new \Magento\Framework\Autoload\ClassMap(BP);
7070
$classMap->addMap(unserialize(file_get_contents($classMapPath)));
7171
spl_autoload_register(array($classMap, 'load'), true, true);

app/code/Magento/AdminNotification/etc/adminhtml/acl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/Acl/etc/acl.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
2727
<acl>
2828
<resources>
2929
<resource id="Magento_Adminhtml::admin">

app/code/Magento/AdminNotification/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
2727
<type name="Magento\AdminNotification\Model\System\MessageList">
2828
<arguments>
2929
<argument name="messages" xsi:type="array">

app/code/Magento/AdminNotification/etc/adminhtml/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/Event/etc/events.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
2727
<event name="controller_action_predispatch">
2828
<observer name="adminnotification" instance="Magento\AdminNotification\Model\Observer" method="preDispatch" />
2929
</event>

app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/App/etc/routes.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
2727
<router id="admin">
2828
<route id="adminhtml">
2929
<module name="Magento_AdminNotification" before="Magento_Adminhtml" />

app/code/Magento/AdminNotification/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/Magento/Framework/Module/etc/module.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
2727
<module name="Magento_AdminNotification" version="2.0.0.0" active="true">
2828
<sequence>
2929
<module name="Magento_Core"/>

app/code/Magento/Authorizenet/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
2727
<preference for="Magento\Authorizenet\Helper\HelperInterface" type="Magento\Authorizenet\Helper\Backend" />
2828
<type name="Magento\Authorizenet\Model\Directpost\Session">
2929
<arguments>

app/code/Magento/Authorizenet/etc/adminhtml/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/Event/etc/events.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
2727
<event name="checkout_submit_all_after">
2828
<observer name="directpost_update_all_edit_increments" instance="Magento\Authorizenet\Model\Directpost\Observer" method="updateAllEditIncrements" />
2929
</event>

app/code/Magento/Authorizenet/etc/adminhtml/routes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/App/etc/routes.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
2727
<router id="admin">
2828
<route id="adminhtml">
2929
<module name="Magento_Authorizenet" before="Magento_Adminhtml" />

app/code/Magento/Authorizenet/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
2727
<type name="Magento\Authorizenet\Model\Directpost\Observer">
2828
<arguments>
2929
<argument name="authorizenetData" xsi:type="object">Magento\Authorizenet\Helper\Data\Proxy</argument>

app/code/Magento/Authorizenet/etc/frontend/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
2727
<preference for="Magento\Authorizenet\Helper\HelperInterface" type="Magento\Authorizenet\Helper\Data" />
2828
<type name="Magento\Authorizenet\Model\Directpost\Session">
2929
<arguments>

app/code/Magento/Authorizenet/etc/frontend/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/Event/etc/events.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
2727
<event name="checkout_submit_all_after">
2828
<observer name="directpost_save_order_after_submit" instance="Magento\Authorizenet\Model\Directpost\Observer" method="saveOrderAfterSubmit" />
2929
</event>

app/code/Magento/Authorizenet/etc/frontend/routes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/App/etc/routes.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
2727
<router id="standard">
2828
<route id="authorizenet" frontName="authorizenet">
2929
<module name="Magento_Authorizenet" />

app/code/Magento/Authorizenet/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/Magento/Framework/Module/etc/module.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
2727
<module name="Magento_Authorizenet" version="1.5.0.0" active="true">
2828
<sequence>
2929
<module name="Magento_Sales"/>

app/code/Magento/Authorizenet/view/adminhtml/js/direct-post.js renamed to app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ directPost.prototype = {
244244
}
245245

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

app/code/Magento/Authorizenet/view/frontend/directpost/form.phtml renamed to app/code/Magento/Authorizenet/view/frontend/templates/directpost/form.phtml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,9 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderFro
8989
<label for="<?php echo $_code ?>_cc_cid" class="label"><span><?php echo __('Card Verification Number') ?></span></label>
9090
<div class="control">
9191
<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"/>
92+
<?php $_content = '<img src=\"'.$this->getViewFileUrl('Magento_Checkout::cvv.gif').'\" alt=\"'.__('Card Verification Number Visual Reference').'\" title=\"'.__('Card Verification Number Visual Reference').'\" />'; ?>
9293
<div class="note">
93-
<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>
94-
</div>
95-
<div class="tooltip hidden" id="directpost-tool-tip">
96-
<a href="#" id="directpost-tool-tip-close" title="<?php echo __('Close') ?>" data-mage-init='{"toggleAdvanced": {"toggleContainers":"#directpost-tool-tip"}}' class="action close">
97-
<span><?php echo __('Close') ?></span>
98-
</a>
99-
<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>
94+
<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>
10095
</div>
10196
</div>
10297
</div>

app/code/Magento/Authz/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
*/
2525
-->
26-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/Magento/Framework/ObjectManager/etc/config.xsd">
26+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
2727
<preference for="Magento\Authz\Model\UserLocatorInterface" type="Magento\Authz\Model\UserLocator\Admin"/>
2828
</config>

0 commit comments

Comments
 (0)