Skip to content

Commit a772887

Browse files
MCLOUD-9137: Add patch BUNDLE-3137
1 parent e1ce8dc commit a772887

File tree

5 files changed

+30
-1
lines changed

5 files changed

+30
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento-cloud-patches",
33
"description": "Provides critical fixes for Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "1.0.17",
5+
"version": "1.0.18",
66
"license": "OSL-3.0",
77
"repositories": {
88
"repo.magento.com": {

patches.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,9 @@
345345
"paypal/module-braintree-core": {
346346
"Fix Braintree Settlement report error": {
347347
"4.1.0": "BUNDLE-2683__braintree_settlement_report_fix__4.1.0.patch"
348+
},
349+
"Fix creating orders when Braintree is enabled": {
350+
"4.4.0": "BUNDLE-3137__braintree_create_order_fix__2.4.5.patch"
348351
}
349352
},
350353
"magento/magento2-b2b-base": {
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/vendor/paypal/module-braintree-core/Block/Form.php b/vendor/paypal/module-braintree-core/Block/Form.php
2+
index 4bc1bdf1..70559bbe 100755
3+
--- a/vendor/paypal/module-braintree-core/Block/Form.php
4+
+++ b/vendor/paypal/module-braintree-core/Block/Form.php
5+
@@ -66,6 +66,7 @@ public function __construct(
6+
GatewayConfig $gatewayConfig,
7+
CcType $ccType,
8+
LoggerInterface $logger,
9+
+ Data $paymentDataHelper,
10+
array $data = []
11+
) {
12+
parent::__construct($context, $paymentConfig, $data);
13+
@@ -74,6 +75,7 @@ public function __construct(
14+
$this->gatewayConfig = $gatewayConfig;
15+
$this->ccType = $ccType;
16+
$this->logger = $logger;
17+
+ $this->paymentDataHelper = $paymentDataHelper;
18+
}
19+
20+
/**

src/Test/Functional/Acceptance/Acceptance74CeCest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ protected function patchesDataProvider(): array
3434
// ['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3'],
3535
// ['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3-p1'],
3636
// ['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3-p2'],
37+
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4'],
38+
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
39+
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
3740
];
3841
}
3942
}

src/Test/Functional/Acceptance/Acceptance74Cest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ protected function patchesDataProvider(): array
2828
['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3'],
2929
['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3-p1'],
3030
['templateVersion' => '2.4.3', 'magentoVersion' => '2.4.3-p2'],
31+
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4'],
32+
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
33+
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
3134
];
3235
}
3336
}

0 commit comments

Comments
 (0)