Skip to content

Commit 1116437

Browse files
authored
Merge pull request #5517 from magento-tsg/2.4-develop-pr18
[TSG] Fixes for 2.4 (pr18) (2.4-develop)
2 parents a18c914 + b11891d commit 1116437

File tree

219 files changed

+16
-17250
lines changed

Some content is hidden

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

219 files changed

+16
-17250
lines changed

app/code/Magento/Backend/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Before disabling or uninstalling this module, note that the following modules de
1616
- Magento_ReleaseNotification
1717
- Magento_Search
1818
- Magento_Security
19-
- Magento_Signifyd
2019
- Magento_Swatches
2120
- Magento_Ui
2221
- Magento_User

app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class SmartButton extends Template implements ShortcutInterface
2727
{
2828
private const ALIAS_ELEMENT_INDEX = 'alias';
2929

30+
const PAYPAL_BUTTON_ID = 'paypal-express-in-context-checkout-main';
31+
3032
/**
3133
* @var Config
3234
*/

app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
use Magento\Paypal\Block\Express\InContext\Minicart\Button;
6+
use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton;
77

88
/** @var \Magento\Paypal\Block\Express\InContext\Component $block */
99

1010
$configuration = [
11-
'id' => Button::PAYPAL_BUTTON_ID,
11+
'id' => SmartButton::PAYPAL_BUTTON_ID,
1212
'path' => $block->getUrl(
1313
'paypal/express/gettoken',
1414
[
@@ -21,17 +21,18 @@ $configuration = [
2121
'locale' => $block->getLocale(),
2222
'environment' => $block->getEnvironment(),
2323
'button' => [
24-
Button::PAYPAL_BUTTON_ID,
24+
SmartButton::PAYPAL_BUTTON_ID,
2525
]
2626
]
2727
];
2828

2929
?>
30-
<div style="display: none;" id="<?= /* @noEscape */ Button::PAYPAL_BUTTON_ID ?>"></div>
30+
<div style="display: none;" id="<?= /* @noEscape */ SmartButton::PAYPAL_BUTTON_ID ?>"></div>
3131
<script type="text/x-magento-init">
3232
{
3333
"*": {
34-
"Magento_Paypal/js/in-context/express-checkout": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($configuration) ?>
34+
"Magento_Paypal/js/in-context/express-checkout":
35+
<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($configuration) ?>
3536
}
3637
}
3738
</script>

app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php

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

app/code/Magento/Signifyd/Api/CaseManagementInterface.php

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

app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php

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

0 commit comments

Comments
 (0)