Skip to content

MCLOUD-6683: BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 8 commits into from
Closed

MCLOUD-6683: BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load #65

wants to merge 8 commits into from

Conversation

magterskine
Copy link
Contributor

@magterskine magterskine commented Jul 29, 2020 •
edited by mveeramneni
Loading

Description:

https://jira.corp.magento.com/browse/MCLOUD-6683:
Adds patch to fix issue for Braintree VBE where Braintree Virtual Terminal page throws console errors and displays loading spinner forever

Fixed Issues:

https://jira.corp.magento.com/browse/BUNDLE-2670

Manual Testing Scenarios

  1. Enable Braintree
  2. Navigate to: Sales > Braintree Virtual Terminal
  3. Page should load correctly without errors

BarnyShergold
BarnyShergold suggested changes Jul 30, 2020
View reviewed changes
Copy link

@BarnyShergold BarnyShergold left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The is no proper description for the PR - please add one with correct format and full description
Tests are failing

@BarnyShergold BarnyShergold self-assigned this Jul 30, 2020
@viktym
Copy link
Contributor

viktym commented Jul 30, 2020

Please, fix patch filename (use __ after ticket number and before the version):

  Correct format: <TICKET_NUMBER>__<TITLE>__<PACKAGE_VERSION>.patch                                 
  Example: MAGECLOUD-2899__fix_redis_slave_configuration__2.3.0.patch

@shiftedreality
Copy link
Member

@viktym @magterskine please re-create this PR into https://github.com/magento/quality-patches

@magterskine magterskine changed the title Patch for BUNDLE-2670 BUNDLE-2670 - Braintree VBE - Virtual Terminal Page errors and will not load Jul 30, 2020
@shiftedreality shiftedreality added the Progress: review PR/issue status label Jul 30, 2020
BarnyShergold
BarnyShergold previously approved these changes Jul 30, 2020
View reviewed changes
NadiyaS
NadiyaS reviewed Aug 4, 2020
View reviewed changes
patches/BUNDLE-2670__braintree_virtual_terminal_ui_fix__4.1.0.patch Outdated
@@ -0,0 +1,132 @@
diff --git a/vendor/paypal/module-braintree-core/view/adminhtml/web/css/source/_module.less b/vendor/paypal/module-braintree-core/view/adminhtml/web/css/source/_module.less
new file mode 100755
index 0000000..efb2e66
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove index. It is redundant information.

NadiyaS
NadiyaS reviewed Aug 4, 2020
View reviewed changes
shiftedreality
shiftedreality suggested changes Aug 4, 2020
View reviewed changes
@shiftedreality shiftedreality changed the title BUNDLE-2670 - Braintree VBE - Virtual Terminal Page errors and will not load BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load Aug 4, 2020
@BaDos
Copy link
Contributor

BaDos commented Aug 7, 2020

FT fails:

Error Output:
================
error: vendor/paypal/module-braintree-core/view/adminhtml/web/css/source/_module.less: already exists in working directory
Patch BUNDLE-2670 can't be applied to clean Magento instance
[2020-08-07 17:19:09] ERROR: [12] The command "php ./vendor/bin/ece-patches apply --no-interaction" failed. Error: patch conflict happened
Applying patch BUNDLE-2670 (/app/vendor/magento/magento-cloud-patches/patches/BUNDLE-2670__braintree_virtual_terminal_ui_fix__4.1.0.patch) failed.
Error Output:
================
error: vendor/paypal/module-braintree-core/view/adminhtml/web/css/source/_module.less: already exists in working directory
Patch BUNDLE-2670 can't be applied to clean Magento instance

@mveeramneni mveeramneni changed the title BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load MCLOUD-6683: BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load Aug 9, 2020
@BaDos
Copy link
Contributor

BaDos commented Aug 10, 2020

@magterskine Please check your patch.
There is some conflicts.

Error Output:
================
error: vendor/paypal/module-braintree-core/view/adminhtml/web/css/source/_module.less: already exists in working directory
Patch BUNDLE-2670 can't be applied to clean Magento instance
[2020-08-10 18:38:47] ERROR: [12] The command "php ./vendor/bin/ece-patches apply --no-interaction" failed. Patch MCLOUD-6659 has been applied
Title: Redis improvements
File: MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch
Affected components: magento/framework
Error: patch conflict happened
Start of rollback
Patch MCLOUD-6659 has been reverted
End of rollback
Applying patch BUNDLE-2670 (/app/vendor/magento/magento-cloud-patches/patches/BUNDLE-2670__braintree_virtual_terminal_ui_fix__4.1.0.patch) failed.
Error Output:
================
error: vendor/paypal/module-braintree-core/view/adminhtml/web/css/source/_module.less: already exists in working directory
Patch BUNDLE-2670 can't be applied to clean Magento instance
returned non-zero exit status 12  Time 01:49

@shiftedreality shiftedreality changed the title MCLOUD-6683: BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load Aug 11, 2020
@shiftedreality
Copy link
Member

@rganin please re-open this PR once it's ready for review

@mveeramneni mveeramneni changed the title BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load MCLOUD-6683: BUNDLE-2670: Braintree VBE - Virtual Terminal Page errors and will not load Aug 31, 2020
magento-devops-reposync-svc pushed a commit that referenced this pull request Oct 24, 2022
@BaDos
Merge pull request #65 from magento-commerce/develop
39d1968 
MCLOUD-9560: October cloud tools release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
3 more reviewers

@BarnyShergold BarnyShergold BarnyShergold approved these changes

@shiftedreality shiftedreality shiftedreality approved these changes

@NadiyaS NadiyaS NadiyaS approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@BarnyShergold BarnyShergold

@shiftedreality shiftedreality

@NadiyaS NadiyaS

@magterskine magterskine

Labels
Progress: changes requested Release: 1.0.7
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@magterskine @viktym @shiftedreality @BaDos @BarnyShergold @NadiyaS @mveeramneni