Setup Bug

geoffhumphrey · May 12, 2016 · 6777b07 · 6777b07
1 parent f580603
commit 6777b07
Show file tree

Hide file tree

Showing 5 changed files with 397 additions and 280 deletions.
diff --git a/README.txt b/README.txt
@@ -6,7 +6,7 @@ Website:     http://www.brewcompetition.com
 GitHub:      https://github.com/geoffhumphrey/brewcompetitiononlineentry
 SourceForge: http://sourceforge.net/projects/brewcompetition
 
-Release 2.0.1, February 15, 2016
+Release 2.1.0, May 10, 2016
 
 Developed utilizing the following extensions and functions, with gratitude to their
 respective developers and online communities:

diff --git a/sections/brewer.sec.php b/sections/brewer.sec.php
@@ -73,7 +73,7 @@
             <span class="help-block">Please enter only <em>one</em> person&rsquo;s name. You will be able to identify a co-brewer when adding your entries.</span>
         </div>
     </div><!-- ./Form Group -->
-     <?php if ($go != "admin") { ?>
+     <?php if (($go != "admin") && ($section != "step2")) { ?>
     <div class="form-group"><!-- Form Group REQUIRED Radio Group -->
 		<label for="" class="col-lg-2 col-md-3 col-sm-4 col-xs-12 control-label">Security Question</label>
 		<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12">
@@ -114,7 +114,7 @@
 				<span class="input-group-addon" id="security-question-answer-addon1"><span class="fa fa-bullhorn"></span></span>
 				<!-- Input Here -->
 				<input class="form-control" name="userQuestionAnswer" id="userQuestionAnswer" type="text" placeholder="" value="<?php if ($action == "edit") echo $_SESSION['userQuestionAnswer']; ?>" required>
-				<span class="input-group-addon" id="security-question-answer-addon2"><span class="fa fa-star"></span>
+				<span class="input-group-addon" id="security-question-answer-addon2"><span class="fa fa-star"></span></span>
 			</div>
             <div class="help-block with-errors"></div>
 		</div>

diff --git a/sections/pay.sec.php b/sections/pay.sec.php
@@ -130,9 +130,9 @@
 
 			if ($_SESSION['prefsPaypal'] == "Y")  { 
 
-				if ($_SESSION['prefsTransFee'] == "Y") $payment_amount = $total_to_pay + number_format((($total_to_pay * .03) + .30), 2, '.', ''); 
+				$fee = number_format((($total_to_pay * .03) + .30), 2, '.', '') + .01; // Hack to resolve payments being off by a penny
+				if ($_SESSION['prefsTransFee'] == "Y") $payment_amount = $total_to_pay + $fee; 
 				else $payment_amount = number_format($total_to_pay, 2);
-				$fee = number_format((($total_to_pay * .03) + .30), 2, '.', ''); 
 
 				// Online
 				$header1_3 .= "<h2>Pay Online</h2>";

diff --git a/sections/register.sec.php b/sections/register.sec.php
@@ -284,7 +284,7 @@ function stateck() {
 				<span class="input-group-addon" id="password-addon1"><span class="fa fa-key"></span></span>
 				<!-- Input Here -->
 				<input class="form-control" name="password" id="password" type="password" placeholder="Password" value="<?php if ($msg > 0) echo $_COOKIE['password']; ?>" required>
-				<span class="input-group-addon" id="password-addon2"><span class="fa fa-star"></span>
+				<span class="input-group-addon" id="password-addon2"><span class="fa fa-star"></span></span>
 			</div>
             <div class="help-block with-errors"></div>
 		</div>