From bb8f4a9707597c7c6475a259ff4350039be1dd31 Mon Sep 17 00:00:00 2001
From: Sylvain Jermini <sylvain.jermini@syjer.com>
Date: Tue, 26 Jun 2018 16:16:11 +0200
Subject: [PATCH] #464 remove term and condition links from reservation-page +
 handle them correctly after paypal redirect

---
 .../controller/ReservationController.java      |  9 ---------
 .../webapp/WEB-INF/templates/event/overview.ms |  4 +++-
 .../templates/event/reservation-page.ms        | 18 ------------------
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/main/java/alfio/controller/ReservationController.java b/src/main/java/alfio/controller/ReservationController.java
index f2da276bfe..35b5d5ef48 100644
--- a/src/main/java/alfio/controller/ReservationController.java
+++ b/src/main/java/alfio/controller/ReservationController.java
@@ -167,11 +167,6 @@ public String showBookingPage(@PathVariable("eventName") String eventName,
                         .addAttribute("billingAddressLabel", invoiceAllowed ? "reservation-page.billing-address" : "reservation-page.receipt-address")
                         .addAttribute("customerReferenceEnabled", configurationManager.getBooleanConfigValue(partialConfig.apply(ENABLE_CUSTOMER_REFERENCE), false));
 
-                    boolean includeStripe = !orderSummary.getFree() && activePaymentMethods.contains(PaymentProxy.STRIPE);
-                    model.addAttribute("includeStripe", includeStripe);
-                    if (includeStripe) {
-                        model.addAttribute("stripe_p_key", paymentManager.getStripePublicKey(event));
-                    }
                     Map<String, Object> modelMap = model.asMap();
                     modelMap.putIfAbsent("paymentForm", paymentForm);
                     modelMap.putIfAbsent("hasErrors", false);
@@ -615,10 +610,6 @@ public String handleReservation(@PathVariable("eventName") String eventName,
         sendReservationCompleteEmailToOrganizer(request, event, reservation);
         //
 
-        if(paymentForm.getPaymentMethod() != PaymentProxy.PAYPAL) {
-            //assignTickets(eventName, reservationId, paymentForm, bindingResult, request, paymentForm.getPaymentMethod() == PaymentProxy.OFFLINE, false);
-        }
-
         return "redirect:/event/" + eventName + "/reservation/" + reservationId + "/success";
     }
 
diff --git a/src/main/webapp/WEB-INF/templates/event/overview.ms b/src/main/webapp/WEB-INF/templates/event/overview.ms
index 3f083de712..71641f38f5 100644
--- a/src/main/webapp/WEB-INF/templates/event/overview.ms
+++ b/src/main/webapp/WEB-INF/templates/event/overview.ms
@@ -170,7 +170,7 @@
         </div>
     {{/event.privacyPolicyLinkOrNull}}
 
-    {{/paypalCheckoutConfirmation}}
+
 
     <div class="checkbox wMarginTop wMarginBottom">
         <label>
@@ -179,6 +179,8 @@
         </label>
     </div>
 
+    {{/paypalCheckoutConfirmation}}
+
 
     {{#orderSummary.free}}
         <div class="row">
diff --git a/src/main/webapp/WEB-INF/templates/event/reservation-page.ms b/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
index a103ba6742..beb6705bcd 100644
--- a/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
+++ b/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
@@ -166,24 +166,6 @@
     </div>
     <div class="clearfix"></div>
 
-    <hr/>
-
-{{#event.privacyPolicyLinkOrNull}}
-    <div class="checkbox wMarginTop wMarginBottom">
-        <label>
-            <input type="checkbox" required name="privacyPolicyAccepted" value="true">
-            {{#i18n}}reservation-page.privacy.prefix{{/i18n}} <a href="{{event.privacyPolicyLinkOrNull}}" target="_blank">{{#i18n}}reservation-page.privacy.link.text{{/i18n}}</a>{{#i18n}}reservation-page.privacy.suffix{{/i18n}}
-        </label>
-    </div>
-{{/event.privacyPolicyLinkOrNull}}
-
-    <div class="checkbox wMarginTop wMarginBottom">
-        <label>
-            <input type="checkbox" required name="termAndConditionsAccepted" value="true">
-            {{#i18n}}reservation-page.tc.prefix{{/i18n}} <a href="{{event.termsAndConditionsUrl}}" target="_blank">{{#i18n}}reservation-page.tc.link.text{{/i18n}}</a>{{#i18n}}reservation-page.tc.suffix{{/i18n}}
-        </label>
-    </div>
-
     <div class="row">
         <div class="col-md-4 col-md-push-8 col-xs-12 wMarginBottom"><button type="submit" class="btn btn-success btn-block" id="continue-button">{{#i18n}}reservation-page.continue{{/i18n}}</button></div>
         <div class="col-md-4 col-md-pull-4 col-xs-12"><button type="submit" class="btn btn-default btn-block" id="cancel-reservation">{{#i18n}}reservation-page.cancel{{/i18n}}</button></div>