Skip to content
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.

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

Feature/ad 337 #513

Merged
merged 7 commits into from
Jan 30, 2025
Merged

Feature/ad 337 #513

merged 7 commits into from
Jan 30, 2025

Conversation

pjaneta
Copy link
Collaborator

@pjaneta pjaneta commented Jan 28, 2025

Description

Tested scenarios

Fixed issue:

# Conflicts:
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/expressCheckoutConfig.tag
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js
… CMS Components on PDP and Cart Pages - add configuration support
… CMS Components on PDP and Cart Pages - remove console log
# Conflicts:
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/cms/AdyenAccCartExpressCheckoutComponentController.java
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/cms/AdyenAccProductExpressCheckoutComponentController.java
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/expressCheckoutConfig.tag
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js
#	adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
#	adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenCheckoutFacade.java
#	adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java
#	adyenv6core/testsrc/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacadeTest.java
@pjaneta pjaneta requested a review from kpieloch January 28, 2025 14:13
@pjaneta pjaneta requested a review from a team as a code owner January 28, 2025 14:13
… CMS Components on PDP and Cart Pages - PR fixes
@kpieloch kpieloch merged commit 904d4e1 into develop Jan 30, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants