Skip to content

Commit 77ad0b4

Browse files
rganinrganin
committed
Merge branch 'develop' of github.com:magento/magento2ce into troll_p2
2 parents 3cc4e0d + c20c8e9 commit 77ad0b4

File tree

193 files changed

+2222
-555
lines changed

Some content is hidden

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

193 files changed

+2222
-555
lines changed

‎app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
#ini_set('display_errors', 1);
1212

1313
/* PHP version validation */
14-
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID >= 70006)) {
14+
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
1515
if (PHP_SAPI == 'cli') {
16-
echo 'Magento supports PHP 5.6, 7.0.2, and 7.0.6 or later. ' .
16+
echo 'Magento supports PHP 5.6, 7.0.2, 7.0.4, and 7.0.6 or later. ' .
1717
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1818
} else {
1919
echo <<<HTML
2020
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<p>Magento supports PHP 5.6, 7.0.2, and 7.0.6 or later. Please read
21+
<p>Magento supports PHP 5.6, 7.0.2, 7.0.4, and 7.0.6 or later. Please read
2222
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
2323
Magento System Requirements</a>.
2424
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.0|7.0.2|~7.0.6",
5+
"php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-media-storage": "100.2.*",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.0|7.0.2|~7.0.6",
5+
"php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
66
"magento/module-catalog": "101.1.*",
77
"magento/module-catalog-inventory": "100.2.*",
88
"magento/module-eav": "100.2.*",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
5-
"php": "~5.6.0|7.0.2|~7.0.6",
5+
"php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
66
"magento/module-backend": "100.2.*",
77
"magento/framework": "100.2.*"
88
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorizenet",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.0|7.0.2|~7.0.6",
5+
"php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
66
"magento/module-sales": "100.2.*",
77
"magento/module-store": "100.2.*",
88
"magento/module-quote": "100.2.*",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-backend",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.0|7.0.2|~7.0.6",
5+
"php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
66
"magento/module-store": "100.2.*",
77
"magento/module-directory": "100.2.*",
88
"magento/module-developer": "100.2.*",

‎app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CountryModel.prototype = {
3737
var showMethodElement = $(applyCountryElement.id.replace(/sallowspecific/, 'showmethod'));
3838
//var specifErrMsgElement = $(applyCountryElement.id.replace(/sallowspecific/, 'specificerrmsg'));
3939
if (specifCountryElement) {
40-
if (applyCountryElement.value == 1) {
40+
if (applyCountryElement.value == 1 && !specifCountryElement.hasAttribute('disabled')) {
4141
//if specific country element selected
4242
specifCountryElement.enable();
4343
if (showMethodElement) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-backup",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.0|7.0.2|~7.0.6",
5+
"php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-cron": "100.2.*",

‎app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,13 @@ public function setCustomAttribute($attributeCode, $attributeValue)
115115
*/
116116
public function getCustomAttributes()
117117
{
118+
$shouldBeLocalized = ['paymentInstrumentType', 'type', 'status'];
118119
$output = [];
119120
foreach ($this->getMappedValues() as $key => $value) {
120121
$attribute = $this->attributeValueFactory->create();
122+
if(in_array($key, $shouldBeLocalized)) {
123+
$value = __($value);
124+
}
121125
$output[] = $attribute->setAttributeCode($key)->setValue($value);
122126
}
123127
return $output;

‎app/code/Magento/Braintree/Model/Ui/ConfigProvider.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public function getConfig()
7979
'payment' => [
8080
self::CODE => [
8181
'isActive' => $this->config->isActive(),
82-
'isSingleUse' => !$isPayPalActive,
8382
'clientToken' => $this->getClientToken(),
8483
'ccTypesMapper' => $this->config->getCctypesMapper(),
8584
'sdkUrl' => $this->config->getSdkUrl(),

0 commit comments

Comments
 (0)