#464 hide billing fields for _not_ invoice only mode

alfio-event · Jul 2, 2018 · 4df0731 · 4df0731
1 parent ef7b44f
commit 4df0731
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/src/main/webapp/WEB-INF/templates/event/reservation-page.ms b/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
@@ -85,6 +85,8 @@
     <div class="page-header">
         <h2>{{#i18n}}reservation-page.your-details{{/i18n}}</h2>
     </div>
+
+    {{#onlyInvoice}}
     <div class="row">
         <div class="col-xs-12">
             <div class="form-group {{#field-has-error}}[billingAddressCompany] has-error{{/field-has-error}}">
@@ -94,6 +96,7 @@
             </div>
         </div>
     </div>
+    {{/onlyInvoice}}
 
 
     {{#useFirstAndLastName}}
@@ -133,6 +136,7 @@
         </div>
     </div>
 
+    {{#onlyInvoice}}
     <div class="row">
         <div class="col-xs-12">
             <div class="form-group {{#field-has-error}}[billingAddressLine1] has-error{{/field-has-error}}">
@@ -185,17 +189,41 @@
                     </optgroup>
                 </select>
             </div>
-
         </div>
-    </div>
-
-    {{#customerReferenceEnabled}}
+        {{#customerReferenceEnabled}}
         <div class="form-group {{#field-has-error}}[customerReference] has-error{{/field-has-error}}">
             <label for="customerReference" class="control-label">{{#i18n}}common.customer-reference{{/i18n}}</label>
             <input type="text" name="customerReference" id="customerReference" class="form-control" maxlength="255" value="{{paymentForm.customerReference}}">
             {{#field-has-error}}[customerReference]<span class="help-block text-danger">{{#i18n}}{{#field-error}}customerReference{{/field-error}}{{/i18n}}</span>{{/field-has-error}}
         </div>
-    {{/customerReferenceEnabled}}
+        {{/customerReferenceEnabled}}
+    </div>
+    <div class="row">
+        <div class="col-xs-12">
+            <input type="hidden" name="invoiceRequested" id="invoice-requested" value="true">
+            <div class="checkbox wMarginTop">
+                <label>
+                    <input type="checkbox" name="addCompanyBillingDetails" id="add-company-billing-details" value="true" {{#paymentForm.addCompanyBillingDetails}}checked{{/paymentForm.addCompanyBillingDetails}}>
+                    {{#i18n}}reservation.add-company-billing-details [{{vatTranslation}}]{{/i18n}}
+                </label>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div id="vat-number-container">
+            <div class="col-xs-12">
+                <div class="form-group {{#field-has-error}}[vatNr] has-error{{/field-has-error}}">
+                    <label for="vatNr">{{#i18n}}invoice.vat [{{vatTranslation}}]{{/i18n}}</label>
+                    <div class="input-group">
+                        <div class="input-group-addon" id="selected-country-code"></div>
+                        <input id="vatNr" type="text" name="vatNr" class="form-control" value="{{paymentForm.vatNr}}"/>
+                    </div>
+                    {{#field-has-error}}[vatNr]<span class="help-block text-danger">{{#i18n}}{{#field-error}}vatNr{{/field-error}}{{/i18n}}</span>{{/field-has-error}}
+                </div>
+            </div>
+        </div>
+    </div>
+    {{/onlyInvoice}}
 
     <div class="page-header">
         <h2>{{#i18n}}reservation-page.attendees{{/i18n}}</h2>

diff --git a/src/main/webapp/resources/js/event/reservation-page.js b/src/main/webapp/resources/js/event/reservation-page.js
@@ -200,7 +200,7 @@
         }
 
 
-        function disableBillingFields() {
+        /*function disableBillingFields() {
             $('#vatNr,#vatCountryCode').attr('required', false).attr('disabled', '');
         }
 
@@ -344,7 +344,7 @@
                 },
                 data:frm.serialize()
             });
-        });
+        });*/
 
         $("select").map(function() {
             var value = $(this).attr('value');
@@ -355,7 +355,7 @@
 
     });
 
-    window.recaptchaLoadCallback = function() {
+    /*window.recaptchaLoadCallback = function() {
         window.recaptchaReady = true;
         var methods = $('input[name=paymentMethod]');
         if(methods.length === 1) {
@@ -381,7 +381,7 @@
                 });
             } catch(x) {}
         }
-    };
+    };*/
 
 
 })();