Skip to content

Commit 4e6eb59

Browse files
author
Bohdan Korablov
committed
Merge remote-tracking branch 'mainlinec/develop' into pullr
2 parents adeab43 + f578e54 commit 4e6eb59

File tree

333 files changed

+6041
-2955
lines changed

Some content is hidden

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

333 files changed

+6041
-2955
lines changed

‎.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,13 @@
129129

130130
</IfModule>
131131

132+
############################################
133+
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
134+
## Please, set it on virtual host configuration level
135+
136+
## SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
137+
############################################
138+
132139
<IfModule mod_rewrite.c>
133140

134141
############################################

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
</container>
6868
</container>
6969
</referenceContainer>
70-
<referenceContainer name="backend.page">
71-
<block class="Magento\Framework\View\Element\Template" name="page.loader" template="Magento_Backend::admin/loader.phtml" after="-"/>
72-
</referenceContainer>
7370
<referenceContainer name="after.body.start">
7471
<block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
7572
<block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>

‎app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml

Lines changed: 104 additions & 136 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Braintree/Controller/PayPal/GetButtonData.php

Lines changed: 0 additions & 61 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
class ConfigProvider extends CcGenericConfigProvider
1414
{
15+
1516
/**
1617
* @var string[]
1718
*/
@@ -97,8 +98,7 @@ public function getStoredCards()
9798
*/
9899
protected function getCcAvailableCcTypes()
99100
{
100-
$country = $this->checkoutSession->getQuote()->getBillingAddress()->getCountryId();
101-
return $this->dataHelper->getCcAvailableCardTypes($country);
101+
return $this->dataHelper->getCcAvailableCardTypes();
102102
}
103103

104104
/**
@@ -185,7 +185,7 @@ public function getConfig()
185185
'isCcDetectionEnabled' => $this->config->isCcDetectionEnabled(),
186186
'availableCardTypes' => $this->getCcAvailableCcTypes(),
187187
'braintreeDataJs'=> $this->config->getBraintreeDataJs(),
188-
'ajaxGenerateNonceUrl' => $this->getAjaxGenerateNonceUrl(),
188+
'ajaxGenerateNonceUrl' => $this->getAjaxGenerateNonceUrl()
189189
],
190190
],
191191
]);

‎app/code/Magento/Braintree/Model/PaymentMethod.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -918,8 +918,8 @@ protected function processSuccessResult(
918918
*/
919919
public function canVoid()
920920
{
921-
if (($order = $this->_registry->registry('current_order'))
922-
&& $order->getId() && $order->hasInvoices() ) {
921+
if ((($order = $this->_registry->registry('current_order'))
922+
&& $order->getId() && $order->hasInvoices()) || $this->_registry->registry('current_invoice')) {
923923
return false;
924924
}
925925
return $this->_canVoid;

‎app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ public function __construct(
4242
*/
4343
public function execute(\Magento\Framework\Event\Observer $observer)
4444
{
45+
$isMiniCart = !$observer->getEvent()->getIsCatalogProduct();
46+
4547
//Don't display shortcut on product view page
4648
if (!$this->methodPayPal->isActive() ||
47-
!$this->paypalConfig->isShortcutCheckoutEnabled()) {
49+
!$this->paypalConfig->isShortcutCheckoutEnabled() ||
50+
!$isMiniCart) {
4851
return;
4952
}
5053

@@ -57,7 +60,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
5760
'',
5861
[
5962
'data' => [
60-
Shortcut::MINI_CART_FLAG_KEY => !$observer->getEvent()->getIsCatalogProduct()
63+
Shortcut::MINI_CART_FLAG_KEY => $isMiniCart
6164
]
6265
]
6366
);

‎app/code/Magento/Braintree/Test/Unit/Controller/PayPal/GetButtonDataTest.php

Lines changed: 0 additions & 190 deletions
This file was deleted.

‎app/code/Magento/Braintree/Test/Unit/Model/ConfigProviderTest.php

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\Braintree\Test\Unit\Model;
88

9+
use Magento\Braintree\Model\ConfigProvider;
910
use Magento\Braintree\Model\PaymentMethod;
1011
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
1112

@@ -193,16 +194,6 @@ public function testGetConfig(
193194
->method('generatePaymentMethodToken')
194195
->willReturnMap($tokenNonceMap);
195196

196-
$quoteMock = $this->getMockBuilder('\Magento\Quote\Model\Quote')
197-
->disableOriginalConstructor()
198-
->getMock();
199-
$quoteMock->expects($this->once())
200-
->method('getBillingAddress')
201-
->willReturn(new \Magento\Framework\DataObject(['country_id' => 'US']));
202-
$this->checkoutSessionMock->expects($this->once())
203-
->method('getQuote')
204-
->willReturn($quoteMock);
205-
206197
$cardTypeMap = [
207198
['Visa', 'VI'],
208199
['Master Card', 'MA'],
@@ -272,7 +263,7 @@ public function getConfigDataProvider()
272263
'isCcDetectionEnabled' => true,
273264
'availableCardTypes' => $this->availableCardTypes,
274265
'braintreeDataJs'=> 'https://js.braintreegateway.com/v1/braintree-data.js',
275-
'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL,
266+
'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL
276267
],
277268
],
278269
]
@@ -347,7 +338,7 @@ public function getConfigDataProvider()
347338
'isCcDetectionEnabled' => true,
348339
'availableCardTypes' => $this->availableCardTypes,
349340
'braintreeDataJs'=> 'https://js.braintreegateway.com/v1/braintree-data.js',
350-
'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL,
341+
'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL
351342
],
352343
],
353344
]
@@ -422,7 +413,7 @@ public function getConfigDataProvider()
422413
'isCcDetectionEnabled' => true,
423414
'availableCardTypes' => $this->availableCardTypes,
424415
'braintreeDataJs'=> 'https://js.braintreegateway.com/v1/braintree-data.js',
425-
'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL,
416+
'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL
426417
],
427418
],
428419
]
@@ -466,7 +457,7 @@ public function getConfigDataProvider()
466457
'isCcDetectionEnabled' => true,
467458
'availableCardTypes' => $this->availableCardTypes,
468459
'braintreeDataJs'=> 'https://js.braintreegateway.com/v1/braintree-data.js',
469-
'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL,
460+
'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL
470461
],
471462
],
472463
]

0 commit comments

Comments
 (0)