diff --git a/nbproject/mplheader.txt b/nbproject/mplheader.txt deleted file mode 100644 index f7703e8..0000000 --- a/nbproject/mplheader.txt +++ /dev/null @@ -1,9 +0,0 @@ -<#if licenseFirst??> -${licenseFirst} - -${licensePrefix}This Source Code Form is subject to the terms of the Mozilla Public -${licensePrefix}License, v. 2.0. If a copy of the MPL was not distributed with this -${licensePrefix}file, You can obtain one at http://mozilla.org/MPL/2.0/. -<#if licenseLast??> -${licenseLast} - \ No newline at end of file diff --git a/nbproject/project.properties b/nbproject/project.properties index 044602b..cc0417d 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,7 +1,5 @@ -auxiliary.org-netbeans-modules-html-editor-lib.default-html-public-id=-//W3C//DTD HTML 4.01 Transitional//EN include.path=${php.global.include.path} -php.version=PHP_70 -project.licensePath=./nbproject/mplheader.txt +php.version=PHP_82 source.encoding=UTF-8 src.dir=. tags.asp=false diff --git a/nbproject/project.xml b/nbproject/project.xml index 75ab9c3..2924169 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.php.project - CampPortal + PPDCampRegistrationPortal diff --git a/public/parts/signup.php b/public/parts/signup.php index 25260a7..dbe1a10 100644 --- a/public/parts/signup.php +++ b/public/parts/signup.php @@ -211,7 +211,7 @@ if (isset($_SESSION['familyid']) && $database->has('families', ['familyid' => $_
- +
diff --git a/public/parts/template_person.php b/public/parts/template_person.php index b903801..db8313f 100644 --- a/public/parts/template_person.php +++ b/public/parts/template_person.php @@ -406,7 +406,7 @@ if (isset($personid) && $database->has('people', ['personid' => $personid])) {
- Tigers (boys entering the first grade in the Fall) must be accompanied by a parent or guardian. + Tigers (scouts entering the first grade in the Fall) must be accompanied by a parent or guardian.
\ No newline at end of file diff --git a/public/static/signup.js b/public/static/signup.js index 3b16b8d..28737fb 100644 --- a/public/static/signup.js +++ b/public/static/signup.js @@ -119,6 +119,10 @@ function updateTotal() { }).length * prices.tshirt; var couponcharge = ($("input[name=campcoupons]").val() * 1.0); + if (couponcharge > totalcharge) { + couponcharge = totalcharge; + $("input[name=campcoupons]").val(couponcharge); + } var cardcharge = Math.max(totalcharge - couponcharge, 0); if (prices.add_stripe_fees && cardcharge > 0) { cardcharge = (cardcharge + 0.3) / (1 - 0.029); @@ -127,7 +131,7 @@ function updateTotal() { totalcharge = Math.max(cardcharge + couponcharge, 0).toFixed(2); // The server will refuse to finish the registration if this doesn't match - // the backend-calculated amount, don't bother being a haxxor + // the backend-calculated amount $("#total").text(totalcharge); $("input[name=totalcharge]").val(totalcharge); if (totalcharge <= 0) { @@ -216,7 +220,7 @@ $("#registrationform").on("submit", function (event) { $("#savebutton-text").removeClass("d-none"); $("#savebutton-wait").addClass("d-none"); } - }, 1000 * 60); + }, 1000 * 15); } else { console.log("Submitting without card..."); document.getElementById('registrationform').submit();