Skip to content

Commit 853a409

Browse files
magento-teammagento-team
committed
0.1.0-alpha89
* Fixed bugs: * Fixed an issue where the Price indexer did not pass successfully from console after the first run * Fixed an issue where deleted items were displayed in the Mini shopping cart * Fixed an issue with the Mage_Sales_Model_OrderTest unit test violating the Cyclomatic and NPath complexity requirements * Fixed an issue where taxes were not applied for logged in users * Fixed a JavaScript issue where the Checkout with PayPal button did not redirect to the PayPal site * Framework improvements: * Removed the head.js library and its calls * Implemented the usage of RequireJS for runtime resources loading on the storefront * Added the following functional tests: * Create Backend Product Review * Delete Used in Configurable Product Attribute * Delete Search Term * Mass Actions for Product Review * Mass Delete Search Term * Reset Currency Symbol * Update Currency Symbol * Update Grouped Product * Added composer.json for all the Magento components: modules, language packs, themes and the whole Magento framework * Removed the downloader, the Magento_Connect module and the Magento_Connect framework component * Implemented the alpha-version of the Independent Deployment Tool
1 parent 65e1ba1 commit 853a409

File tree

1,319 files changed

+60283
-53595
lines changed

Some content is hidden

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

1,319 files changed

+60283
-53595
lines changed

‎.gitignore

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
/.buildpath
22
/.cache
3-
/.htaccess
43
/.metadata
54
/.project
65
/.settings
76
atlassian*
8-
/index.php
97
/nbproject
108
/sitemap
11-
/.htaccess.orig
129
/.idea
1310
/.gitattributes
1411
/app/config_sandbox
1512
/app/etc/local.xml
16-
/app/etc/local.xml.*
1713
/app/etc/*/module.xml
18-
/downloader/.cache
19-
/downloader/cache.cfg
20-
/downloader/connect.cfg
2114
/lib/internal/flex/uploader/.actionScriptProperties
2215
/lib/internal/flex/uploader/.flexProperties
2316
/lib/internal/flex/uploader/.project
@@ -26,10 +19,18 @@ atlassian*
2619
/lib/internal/flex/varien/.flexLibProperties
2720
/lib/internal/flex/varien/.project
2821
/lib/internal/flex/varien/.settings
29-
/pub/media/*
22+
23+
/pub/media/*.*
24+
!/pub/media/.htaccess
3025
/pub/media/customer/*
26+
!/pub/media/customer/.htaccess
3127
/pub/media/downloadable/*
28+
!/pub/media/downloadable/.htaccess
29+
/pub/media/theme/*
30+
/pub/media/theme_customization/*
31+
!/pub/media/theme_customization/.htaccess
3232
/pub/static/*
3333
!/pub/static/.htaccess
34+
3435
/var/*
35-
/app/code/Magento/TestModule*
36+
!/var/.htaccess

‎CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
0.1.0-alpha89
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue where the Price indexer did not pass successfully from console after the first run
5+
* Fixed an issue where deleted items were displayed in the Mini shopping cart
6+
* Fixed an issue with the Mage_Sales_Model_OrderTest unit test violating the Cyclomatic and NPath complexity requirements
7+
* Fixed an issue where taxes were not applied for logged in users
8+
* Fixed a JavaScript issue where the Checkout with PayPal button did not redirect to the PayPal site
9+
* Framework improvements:
10+
* Removed the head.js library and its calls
11+
* Implemented the usage of RequireJS for runtime resources loading on the storefront
12+
* Added the following functional tests:
13+
* Create Backend Product Review
14+
* Delete Used in Configurable Product Attribute
15+
* Delete Search Term
16+
* Mass Actions for Product Review
17+
* Mass Delete Search Term
18+
* Reset Currency Symbol
19+
* Update Currency Symbol
20+
* Update Grouped Product
21+
* Added composer.json for all the Magento components: modules, language packs, themes and the whole Magento framework
22+
* Removed the downloader, the Magento_Connect module and the Magento_Connect framework component
23+
* Implemented the “alpha-version” of the Independent Deployment Tool
24+
125
2.0.0.0-dev88
226
=============
327
* Fixed bugs:

‎CONTRIBUTING.md

+1-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The Magento 2 development team will review all issues and contributions submitte
44

55
## Contribution Process
66

7-
If you are a new github user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
7+
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
88

99
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
1010
2. Review the [Contributor License Agreement](https://github.com/magento/magento2/wiki/Contributor-License-Agreement) if this is your first time contributing.
@@ -26,11 +26,3 @@ Yes. We strongly encourage that you follow the requirements as stated, before su
2626
**Do you accept all contributions?**
2727

2828
Not all contributions will be used or incorporated into the code for the project. The decision to incorporate the code or not is at the discretion of the Magento 2 development team.
29-
30-
# X.Commerce (Magento) Contributor License Agreement
31-
32-
All Submissions you make to Magento, a division of X.commerce, Inc. (“Magento”) through GitHub are subject to the following terms and conditions:
33-
34-
1. You grant Magento a perpetual, worldwide, non-exclusive, no charge, royalty free, irrevocable license under your applicable copyrights and patents to reproduce, prepare derivative works of, display, publically perform, sublicense and distribute any feedback, ideas, code, or other information (“Submission”) you submit through GitHub.
35-
2. Your Submission is an original work of authorship and you are the owner or are legally entitled to grant the license stated above.
36-
3. You agree to the X.commerce Agreement found here: [https://www.x.com/developers/x.commerce/x.commerce-user-agreement](https://www.x.com/developers/x.commerce/x.commerce-user-agreement)

‎app/code/Magento/AdminNotification/composer.json

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"name": "magento/module-admin-notification",
3+
"description": "N/A",
4+
"require": {
5+
"php": "5.4.*|5.5.*",
6+
"magento/module-store": "0.1.0-alpha89",
7+
"magento/module-core": "0.1.0-alpha89",
8+
"magento/module-backend": "0.1.0-alpha89",
9+
"magento/module-theme": "0.1.0-alpha89",
10+
"magento/framework": "0.1.0-alpha89",
11+
"lib-libxml": "*",
12+
"magento/magento-composer-installer": "*"
13+
},
14+
"type": "magento2-module",
15+
"version": "0.1.0-alpha89",
16+
"extra": {
17+
"map": [
18+
[
19+
"*",
20+
"Magento/AdminNotification"
21+
]
22+
]
23+
}
24+
}

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

-10
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@
3333
<block class="Magento\AdminNotification\Block\ToolbarEntry" before="user" template="toolbar_entry.phtml" />
3434
</referenceContainer>
3535
<referenceBlock name="head">
36-
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js" after="jquery-jquery-js">
37-
<arguments>
38-
<argument name="file" xsi:type="string">Magento_AdminNotification::toolbar_entry.js</argument>
39-
</arguments>
40-
</block>
41-
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-system-notification-js" after="jquery-jquery-js">
42-
<arguments>
43-
<argument name="file" xsi:type="string">Magento_AdminNotification::system/notification.js</argument>
44-
</arguments>
45-
</block>
4636
<block class="Magento\Theme\Block\Html\Head\Css" name="magento-core-prototype-magento-css">
4737
<arguments>
4838
<argument name="file" xsi:type="string">Magento_Core::prototype/magento.css</argument>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

+11-4
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,27 @@
3333
</ul>
3434
</div>
3535
<script type="text/javascript">
36-
jQuery(function() {
37-
jQuery("#system_messages_list").dialog({
36+
require([
37+
"jquery",
38+
"jquery/ui"
39+
], function($){
40+
41+
$(function() {
42+
$("#system_messages_list").dialog({
3843
autoOpen: true,
3944
resizable: false,
4045
width: 650,
4146
position: {
4247
using: function(pos) {
43-
jQuery(this).css({
48+
$(this).css({
4449
"position": "absolute",
45-
"top": Math.ceil(jQuery(window).height()/2 - jQuery(this).height()/2),
50+
"top": Math.ceil($(window).height()/2 - $(this).height()/2),
4651
"left": pos.left
4752
});
4853
}
4954
}
5055
});
5156
});
57+
58+
});
5259
</script>

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@
2121
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2222
*/
2323
/*jshint jquery:true*/
24-
jQuery(function ($) {
24+
define([
25+
"jquery",
26+
"jquery/ui",
27+
"jquery/template"
28+
], function($){
29+
2530
$.template(
2631
'systemMessageDialog',
2732
'<li class="{{if severity == 1}}error{{else}}warning{{/if}}">{{html text}}</li>'
@@ -69,5 +74,5 @@ jQuery(function ($) {
6974
$('#message-system-all').systemMessageDialog('open', 2);
7075
});
7176
});
72-
});
7377

78+
});

‎app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2121
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2222
*/
23-
24-
(function($) {
23+
define([
24+
"jquery",
25+
"jquery/ui"
26+
], function($){
2527
'use strict';
28+
2629
$(document).ready(function() {
2730
// Mark notification as read via AJAX call
2831
var markNotificationAsRead = function(notificationId) {
@@ -120,4 +123,5 @@
120123
$('.notifications-action .counter').show();
121124
}
122125
});
123-
})(window.jQuery);
126+
127+
});

‎app/code/Magento/Authorizenet/composer.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"name": "magento/module-authorizenet",
3+
"description": "N/A",
4+
"require": {
5+
"php": "5.4.*|5.5.*",
6+
"magento/module-store": "0.1.0-alpha89",
7+
"magento/module-sales": "0.1.0-alpha89",
8+
"magento/module-checkout": "0.1.0-alpha89",
9+
"magento/module-backend": "0.1.0-alpha89",
10+
"magento/module-core": "0.1.0-alpha89",
11+
"magento/module-payment": "0.1.0-alpha89",
12+
"magento/module-centinel": "0.1.0-alpha89",
13+
"magento/module-catalog": "0.1.0-alpha89",
14+
"magento/framework": "0.1.0-alpha89",
15+
"magento/magento-composer-installer": "*"
16+
},
17+
"type": "magento2-module",
18+
"version": "0.1.0-alpha89",
19+
"extra": {
20+
"map": [
21+
[
22+
"*",
23+
"Magento/Authorizenet"
24+
]
25+
]
26+
}
27+
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<module name="Magento_Backend"/>
3737
<module name="Magento_Core"/>
3838
<module name="Magento_Payment"/>
39-
<module name="Magento_Theme"/>
4039
<module name="Magento_Centinel"/>
4140
<module name="Magento_Catalog"/>
4241
</depends>

‎app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ $_helper = $this->helper('Magento\Authorizenet\Helper\HelperInterface');
3434
<html>
3535
<head>
3636
<script type="text/javascript">
37-
//<![CDATA[
3837
<?php if (isset($_params['redirect'])): ?>
3938
window.location="<?php echo $this->escapeUrl($_params['redirect']) ?>";
4039
<?php endif; ?>
@@ -47,7 +46,6 @@ window.top.directPostModel.showError(<?php echo $this->helper('Magento\Core\Help
4746
window.top.directPostModel.successUrl="<?php echo $_helper->getSuccessOrderUrl($_params) ?>";
4847
<?php endif; ?>
4948
<?php endif; ?>
50-
//]]>
5149
</script>
5250
</head>
5351
<body></body>

‎app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml

+6-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,12 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Backend')->getPlaceOrder
8383
<?php endif; ?>
8484
</ul>
8585
<script type="text/javascript">
86-
//<![CDATA[
86+
require([
87+
'prototype',
88+
'Magento_Sales/order/create/scripts',
89+
'Magento_Authorizenet/js/direct-post'
90+
], function(){
91+
8792
/**
8893
* Disable cart server validation in admin
8994
*/
@@ -151,5 +156,4 @@ directPostModel = new directPost(
151156
<?php if (!$this->isAjaxRequest()): ?>
152157
});
153158
<?php endif; ?>
154-
//]]>
155159
</script>

‎app/code/Magento/Authorizenet/view/adminhtml/templates/form/cc.phtml

+29-24
Original file line numberDiff line numberDiff line change
@@ -40,33 +40,38 @@
4040
</div>
4141
<?php echo $this->showNoticeMessage(__('Please enter a different credit card number to complete your purchase.')) ?>
4242
<script type="text/javascript">
43-
//<![CDATA[
44-
function cancelPaymentAuthorizations(){
45-
new Ajax.Request('<?php echo $this->getAdminCancelUrl() ?>', {
46-
onSuccess : function(transport) {
47-
try{
48-
response = eval('(' + transport.responseText + ')');
49-
} catch (e) {
50-
response = {};
51-
}
43+
require([
44+
"prototype",
45+
"Magento_Sales/order/create/form"
46+
], function(){
47+
48+
window.cancelPaymentAuthorizations = function(){
49+
new Ajax.Request('<?php echo $this->getAdminCancelUrl() ?>', {
50+
onSuccess : function(transport) {
51+
try{
52+
response = eval('(' + transport.responseText + ')');
53+
} catch (e) {
54+
response = {};
55+
}
5256

53-
if (response.success) {
54-
order.loadArea(['billing_method','totals'], true, []);
55-
} else {
56-
var msg = response.error_message;
57-
if (msg) {
58-
alert(msg);
57+
if (response.success) {
58+
order.loadArea(['billing_method','totals'], true, []);
59+
} else {
60+
var msg = response.error_message;
61+
if (msg) {
62+
alert(msg);
63+
}
5964
}
6065
}
61-
}
62-
});
63-
}
64-
<?php if ($_message = $this->getPartialAuthorizationConfirmationMessage()): ?>
65-
if (!confirm('<?php echo $this->escapeMessage($_message) ?>')) {
66-
cancelPaymentAuthorizations();
67-
}
68-
<?php endif;?>
69-
//]]>
66+
});
67+
}
68+
<?php if ($_message = $this->getPartialAuthorizationConfirmationMessage()): ?>
69+
if (!confirm('<?php echo $this->escapeMessage($_message) ?>')) {
70+
cancelPaymentAuthorizations();
71+
}
72+
<?php endif;?>
73+
74+
});
7075
</script>
7176
<?php endif;?>
7277
</div>

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

+14-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,19 @@
2020
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2121
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2222
*/
23-
var directPost = Class.create();
23+
(function (factory) {
24+
if (typeof define === 'function' && define.amd) {
25+
define([
26+
"jquery",
27+
"mage/backend/validation",
28+
"prototype"
29+
], factory);
30+
} else {
31+
factory(jQuery);
32+
}
33+
}(function (jQuery) {
34+
35+
window.directPost = Class.create();
2436
directPost.prototype = {
2537
initialize : function(methodCode, iframeId, controller, orderSaveUrl,
2638
cgiUrl, nativeAction) {
@@ -414,3 +426,4 @@ directPost.prototype = {
414426
}
415427
}
416428
};
429+
}));

‎app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml

-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@
2424
*/
2525
-->
2626
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_single.xsd">
27-
<referenceBlock name="head">
28-
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-authorizenet-js-direct-post-js">
29-
<arguments>
30-
<argument name="file" xsi:type="string">Magento_Authorizenet::js/direct-post.js</argument>
31-
</arguments>
32-
</block>
33-
</referenceBlock>
3427
<referenceBlock name="head.components">
3528
<block class="Magento\Framework\View\Element\Js\Components" name="authorizenet_page_head_components" template="Magento_Authorizenet::js/components.phtml"/>
3629
</referenceBlock>

0 commit comments

Comments
 (0)