From b907ba45004f1de0cdea0c67334737fb807af93f Mon Sep 17 00:00:00 2001 From: PJaneta Date: Tue, 28 Jan 2025 15:28:08 +0100 Subject: [PATCH] AD-337 Add PayPal Express Button with Frontend Logic and API Calls to CMS Components on PDP and Cart Pages - PR fixes --- .../checkout/AdyenPayPalExpressCheckoutController.java | 8 ++++---- .../impl/DefaultAdyenPayPalExpressCheckoutFacade.java | 10 +--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/checkout/AdyenPayPalExpressCheckoutController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/checkout/AdyenPayPalExpressCheckoutController.java index 5c3e3994..44974abd 100644 --- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/checkout/AdyenPayPalExpressCheckoutController.java +++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/checkout/AdyenPayPalExpressCheckoutController.java @@ -26,8 +26,8 @@ @Controller @RequestMapping("/express-checkout/paypal/") -public class AdyenPayPalExpressCheckoutController extends AdyenExpressCheckoutControllerBase { - private static final Logger LOG = Logger.getLogger(AdyenApplePayExpressCheckoutController.class); +public class AdyenPayPalExpressCheckoutController extends AdyenExpressCheckoutControllerBase { + private static final Logger LOG = Logger.getLogger(AdyenPayPalExpressCheckoutController.class); @Autowired private AdyenPayPalExpressCheckoutFacade adyenPayPalExpressCheckoutFacade; @@ -59,7 +59,7 @@ public ResponseEntity onSubmitPDP(final HttpServletRequest request, final HttpSe LOG.error(e.getError()); LOG.error(e.getMessage()); - return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST); + return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } } @@ -81,7 +81,7 @@ public ResponseEntity onSubmitCart(final HttpServletRequest request, final HttpS LOG.error(e.getError()); LOG.error(e.getMessage()); - return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST); + return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } } diff --git a/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenPayPalExpressCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenPayPalExpressCheckoutFacade.java index 55573bf1..bbb1aa62 100644 --- a/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenPayPalExpressCheckoutFacade.java +++ b/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenPayPalExpressCheckoutFacade.java @@ -33,17 +33,9 @@ public class DefaultAdyenPayPalExpressCheckoutFacade extends DefaultAdyenExpressCheckoutFacade implements AdyenPayPalExpressCheckoutFacade { private static final Logger LOG = Logger.getLogger(DefaultAdyenPayPalExpressCheckoutFacade.class); - // private ProductService productService; -// private CartFactory cartFactory; -// private CartService cartService; -// private ModelService modelService; private CalculationService calculationService; - // private AdyenCheckoutFacade adyenCheckoutFacade; -// private UserService userService; private BaseSiteService baseSiteService; -// private CommerceCartService commerceCartService; -// private DeliveryModeService deliveryModeService; -// private SessionService sessionService; + @Override