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

Release/ad 136 merge #367

Merged
merged 787 commits into from
Mar 22, 2024
Merged

Release/ad 136 merge #367

merged 787 commits into from
Mar 22, 2024

Conversation

kpieloch
Copy link
Collaborator

Description

Tested scenarios

Fixed issue:

saquibsayyad and others added 30 commits February 23, 2022 09:27
PE-184 Fixed ApplePay bug
PE-223 Fixed Paypal auth flow error
…b and all services that are used by this job
AD-4 [SQ] Fix bugs reported in SonarQube
[AD-2] Added exception capture to crashing places
[AD-5] Fix for security hotspots
Lukasz756 and others added 27 commits March 7, 2024 12:38
AD-210 Implement Place Order Functionality with Selected Payment Method in ReactJS Storefront
# Conflicts:
#	adyenv6b2ccheckoutaddonv2/acceleratoraddon/web/src/com/adyen/v6/controllers/api/AdyenPlaceOrderController.java
#	adyenv6b2ccheckoutaddonv2/acceleratoraddon/web/src/com/adyen/v6/response/PlaceOrderResponse.java
#	adyenv6b2ccheckoutaddonv2/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/components/payment/Payment.tsx
#	adyenv6b2ccheckoutaddonv2/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/service/paymentService.ts
AD-215 Implement Redirection to Previous Checkout Step for Incomplete…
AD-216 Error handling for payment method
AD-212 Develop Endpoint for Retrieving Payment Status
AD-217 Develop Checkout Group Bean for ReactJS Checkout with Storefro…
AD-218 Integrate Address Book with Billing Address Form
# Conflicts:
#	README.md
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/adyenLibrary.tag
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
#	adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
#	adyenv6b2ccheckoutaddon/project.properties
#	adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon/web/spring/adyenv6b2ccheckoutaddon-web-spring.xml
#	adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
#	adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties
#	adyenv6core/resources/adyenv6core-items.xml
#	adyenv6core/resources/adyenv6core-spring.xml
#	adyenv6core/resources/localization/adyenv6core-locales_en.properties
#	adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
#	adyenv6core/src/com/adyen/v6/facades/AdyenExpressCheckoutFacade.java
#	adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenCheckoutFacade.java
#	adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
#	adyenv6core/src/com/adyen/v6/forms/AddressForm.java
#	adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
#	adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
#	adyenv6notification/extensioninfo.xml
#	adyenv6notificationv2/extensioninfo.xml
#	adyenv6notificationv2/project.properties
#	adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties
@kpieloch kpieloch requested a review from a team as a code owner March 22, 2024 06:31
@kpieloch kpieloch changed the base branch from develop to develop_merge March 22, 2024 06:51
@kpieloch kpieloch merged commit b2c9259 into develop_merge Mar 22, 2024
2 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.

8 participants