#102 fix express checkout in paypal case

alfio-event · Aug 20, 2016 · f851638 · f851638
1 parent e446496
commit f851638
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/alfio/controller/ReservationController.java b/src/main/java/alfio/controller/ReservationController.java
@@ -123,6 +123,7 @@ public String showPaymentPage(@PathVariable("eventName") String eventName,
                                   @RequestParam(value = "email", required = false) String email,
                                   @RequestParam(value = "billingAddress", required = false) String billingAddress,
                                   @RequestParam(value = "hmac", required = false) String hmac,
+                                  @RequestParam(value = "expressCheckoutRequested", required = false) Boolean expressCheckoutRequested,
                                   Model model,
                                   Locale locale) {
 
@@ -143,7 +144,8 @@ public String showPaymentPage(@PathVariable("eventName") String eventName,
                             .addAttribute("lastName", lastName)
                             .addAttribute("email", email)
                             .addAttribute("billingAddress", billingAddress)
-                            .addAttribute("hmac", hmac);
+                            .addAttribute("hmac", hmac)
+                            .addAttribute("expressCheckoutRequested", expressCheckoutRequested == Boolean.TRUE);
                     } else {
                         model.addAttribute("paypalCheckoutConfirmation", false);
                     }
@@ -384,7 +386,7 @@ public String handleReservation(@PathVariable("eventName") String eventName,
         if(paymentForm.getPaymentMethod() == PaymentProxy.PAYPAL && !paymentForm.hasPaypalTokens()) {
             OrderSummary orderSummary = ticketReservationManager.orderSummaryForReservationId(reservationId, event, locale);
             try {
-                String checkoutUrl = paypalManager.createCheckoutRequest(event, reservationId, orderSummary, customerName, paymentForm.getEmail(), paymentForm.getBillingAddress(), locale);
+                String checkoutUrl = paypalManager.createCheckoutRequest(event, reservationId, orderSummary, customerName, paymentForm.getEmail(), paymentForm.getBillingAddress(),paymentForm.getExpressCheckoutRequested(), locale);
                 return "redirect:" + checkoutUrl;
             } catch (Exception e) {
                 bindingResult.reject(ErrorsCode.STEP_2_PAYMENT_REQUEST_CREATION);

diff --git a/src/main/java/alfio/manager/PaypalManager.java b/src/main/java/alfio/manager/PaypalManager.java
@@ -134,7 +134,7 @@ private static Item fromSummaryRow(SummaryRow summaryRow, Event event) {
         return new Item(summaryRow.getName(), quantity, price, event.getCurrency());
     }
 
-    public String createCheckoutRequest(Event event, String reservationId, OrderSummary orderSummary, CustomerName customerName, String email, String billingAddress, Locale locale) throws Exception {
+    public String createCheckoutRequest(Event event, String reservationId, OrderSummary orderSummary, CustomerName customerName, String email, String billingAddress, Boolean expressCheckoutRequested, Locale locale) throws Exception {
 
         Optional<String> experienceProfileId = getOrCreateWebProfile(event, locale);
 
@@ -159,6 +159,7 @@ public String createCheckoutRequest(Event event, String reservationId, OrderSumm
             .queryParam("lastName", customerName.getLastName())
             .queryParam("email", email)
             .queryParam("billingAddress", billingAddress)
+            .queryParam("expressCheckoutRequested", expressCheckoutRequested)
             .queryParam("hmac", computeHMAC(customerName, email, billingAddress, event));
         String finalUrl = bookUrlBuilder.toUriString();
 

diff --git a/src/main/webapp/WEB-INF/templates/event/reservation-page.ms b/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
@@ -101,6 +101,7 @@
         <input type="hidden" name="paymentMethod" value="PAYPAL">
         <input type="hidden" name="paypalPaymentId" value="{{paypalPaymentId}}">
         <input type="hidden" name="paypalPayerID" value="{{paypalPayerID}}">
+        <input type="hidden" name="expressCheckoutRequested" value="{{expressCheckoutRequested}}">
         <input type="hidden" name="termAndConditionsAccepted" value="true">
         {{#i18n}}reservation-page.paypal.confirm{{/i18n}}
     {{/paypalCheckoutConfirmation}}