fix #404: generate invoice also for PayPal payments

alfio-event · Mar 16, 2018 · 0f380d6 · 0f380d6
1 parent ab15661
commit 0f380d6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/src/main/java/alfio/controller/ReservationController.java b/src/main/java/alfio/controller/ReservationController.java
@@ -101,6 +101,7 @@ public String showPaymentPage(@PathVariable("eventName") String eventName,
                                   @RequestParam(value = "billingAddress", required = false) String billingAddress,
                                   @RequestParam(value = "hmac", required = false) String hmac,
                                   @RequestParam(value = "postponeAssignment", required = false) Boolean postponeAssignment,
+                                  @RequestParam(value = "invoiceRequested", required = false) Boolean invoiceRequested,
                                   Model model,
                                   Locale locale) {
 
@@ -124,6 +125,7 @@ public String showPaymentPage(@PathVariable("eventName") String eventName,
                             .addAttribute("billingAddress", billingAddress)
                             .addAttribute("hmac", hmac)
                             .addAttribute("postponeAssignment", Boolean.TRUE.equals(postponeAssignment))
+                            .addAttribute("invoiceRequested", Boolean.TRUE.equals(invoiceRequested))
                             .addAttribute("showPostpone", Boolean.TRUE.equals(postponeAssignment));
                     } else {
                         model.addAttribute("paypalCheckoutConfirmation", false)
@@ -435,8 +437,9 @@ public String handleReservation(@PathVariable("eventName") String eventName,
         if(paymentForm.getPaymentMethod() == PaymentProxy.PAYPAL && !paymentForm.hasPaypalTokens()) {
             OrderSummary orderSummary = ticketReservationManager.orderSummaryForReservationId(reservationId, event, locale);
             try {
-                String checkoutUrl = paymentManager.createPaypalCheckoutRequest(event, reservationId, orderSummary, customerName,
-                    paymentForm.getEmail(), paymentForm.getBillingAddress(), locale, paymentForm.isPostponeAssignment());
+                String checkoutUrl = paymentManager.createPayPalCheckoutRequest(event, reservationId, orderSummary, customerName,
+                    paymentForm.getEmail(), paymentForm.getBillingAddress(), locale, paymentForm.isPostponeAssignment(),
+                    paymentForm.isInvoiceRequested());
                 assignTickets(eventName, reservationId, paymentForm, bindingResult, request, true);
                 return "redirect:" + checkoutUrl;
             } catch (Exception e) {

diff --git a/src/main/java/alfio/manager/PaymentManager.java b/src/main/java/alfio/manager/PaymentManager.java
@@ -156,8 +156,11 @@ public String getStripePublicKey(Event event) {
         return stripeManager.getPublicKey(event);
     }
 
-    public String createPaypalCheckoutRequest(Event event, String reservationId, OrderSummary orderSummary, CustomerName customerName, String email, String billingAddress, Locale locale, boolean postponeAssignment) throws Exception {
-        return paypalManager.createCheckoutRequest(event, reservationId, orderSummary, customerName, email, billingAddress, locale, postponeAssignment);
+    public String createPayPalCheckoutRequest(Event event, String reservationId, OrderSummary orderSummary,
+                                              CustomerName customerName, String email, String billingAddress,
+                                              Locale locale, boolean postponeAssignment, boolean invoiceRequested) throws Exception {
+        return paypalManager.createCheckoutRequest(event, reservationId, orderSummary, customerName, email,
+                                                   billingAddress, locale, postponeAssignment, invoiceRequested);
     }
 
     public boolean refund(TicketReservation reservation, Event event, Optional<Integer> amount, String username) {

diff --git a/src/main/java/alfio/manager/PaypalManager.java b/src/main/java/alfio/manager/PaypalManager.java
@@ -126,8 +126,9 @@ private List<Transaction> buildPaymentDetails(Event event, OrderSummary orderSum
         return transactions;
     }
 
-    public String createCheckoutRequest(Event event, String reservationId, OrderSummary orderSummary, CustomerName customerName,
-                                        String email, String billingAddress, Locale locale, boolean postponeAssignment) throws Exception {
+    public String createCheckoutRequest(Event event, String reservationId, OrderSummary orderSummary,
+                                        CustomerName customerName, String email, String billingAddress,
+                                        Locale locale, boolean postponeAssignment, boolean invoiceRequested) throws Exception {
 
 
         APIContext apiContext = getApiContext(event);
@@ -156,6 +157,7 @@ public String createCheckoutRequest(Event event, String reservationId, OrderSumm
             .queryParam("email", email)
             .queryParam("billingAddress", billingAddress)
             .queryParam("postponeAssignment", postponeAssignment)
+            .queryParam("invoiceRequested", invoiceRequested)
             .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
@@ -119,6 +119,7 @@
         <input type="hidden" name="paypalPaymentId" value="{{paypalPaymentId}}">
         <input type="hidden" name="paypalPayerID" value="{{paypalPayerID}}">
         <input type="hidden" name="termAndConditionsAccepted" value="true">
+        <input type="hidden" name="invoiceRequested" value="{{invoiceRequested}}">
     <div class="alert alert-success">
         <h3><i class="fa fa-check"></i> {{#i18n}}reservation-page.paypal.confirm{{/i18n}}</h3>
     </div>

diff --git a/src/test/java/alfio/controller/ReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/ReservationFlowIntegrationTest.java
@@ -256,7 +256,7 @@ public void reservationFlowTest() throws Exception{
 
 
         // check that the payment page is shown
-        String reservationPage = reservationController.showPaymentPage(eventName, reservationIdentifier, null, null, null, null, null, null, null, null, null, null, null, new BindingAwareModelMap(), Locale.ENGLISH);
+        String reservationPage = reservationController.showPaymentPage(eventName, reservationIdentifier, null, null, null, null, null, null, null, null, null, null, null, null, new BindingAwareModelMap(), Locale.ENGLISH);
         assertEquals("/event/reservation-page", reservationPage);
         //