Merge branch 'master' of github.com:hainatravel/information-system into master

# Conflicts:
#	application/views/mobile_first/ch-info-page-form.php

application/views/mobile_first/ah-lantern-form-info-page.php

@@ -1,3 +1,4 @@
+<script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <div class="tmbottom">
 
     <h3 style="font-size: 24px; line-height: 22px;">Get Your 2022 Chiang Mai CAD Lantern Mass Release
@@ -25,7 +26,7 @@
                 <label for="Premium">
                     Premium + Free Transfer
                     <div class="selectionMemo">
-                        US$170
+                        US$179
                     </div>
                 </label>
             </div>
@@ -727,7 +728,20 @@
     submit_ticket_button.addEventListener('click', function(event) {
         var validateResult = validateTicketForm();
         if (validateResult) {
+            if (typeof(grecaptcha) === "undefined") {
+            console.warn('grecaptcha is disabled.');
             ticket_form.submit();
+          } else {
+            grecaptcha.enterprise.ready(async () => {
+              const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
+              var el = document.createElement("input");
+              el.type = "hidden";
+              el.name = "__grecaptcha_token__";
+              el.value = token;
+              ticket_form.appendChild(el);
+              ticket_form.submit();
+            });
+          }
         }
     });
     function validateTicketForm() {  

application/views/mobile_first/ah-lantern-form.php

@@ -1,3 +1,4 @@
+<script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <div class="tmbottom">
 
     <h3 style="font-size: 24px; line-height: 22px;">Get Your 2022 Chiang Mai CAD Lantern Mass Release
@@ -25,7 +26,7 @@
                 <label for="Premium">
                     Premium + Free Transfer
                     <div class="selectionMemo">
-                        US$170
+                        US$179
                     </div>
                 </label>
             </div>
@@ -726,7 +727,20 @@
     submit_ticket_button.addEventListener('click', function(event) {
         var validateResult = validateTicketForm();
         if (validateResult) {
+            if (typeof(grecaptcha) === "undefined") {
+            console.warn('grecaptcha is disabled.');
             ticket_form.submit();
+          } else {
+            grecaptcha.enterprise.ready(async () => {
+              const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
+              var el = document.createElement("input");
+              el.type = "hidden";
+              el.name = "__grecaptcha_token__";
+              el.value = token;
+              ticket_form.appendChild(el);
+              ticket_form.submit();
+            });
+          }
         }
     });
     function validateTicketForm() {