From 5189bf723e336468b1da67981c82d54932353250 Mon Sep 17 00:00:00 2001
From: Steven Walker <stevenwalker@Stevens-MacBook-Pro.local>
Date: Wed, 9 Mar 2016 13:26:11 -0500
Subject: [PATCH 1/5] Making login pages consistent and linking to
 register/login from each other.  Fixing messy plugin css

---
 .../idcommerce/templates/_protectedPage.php   |  6 +-
 .../plugins/idcommerce/templates/_regForm.php | 60 ++++++++++---------
 wordpress/wp-content/themes/backer/style.css  | 15 ++---
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/wordpress/wp-content/plugins/idcommerce/templates/_protectedPage.php b/wordpress/wp-content/plugins/idcommerce/templates/_protectedPage.php
index 4aaf2cb0..40d9f81c 100644
--- a/wordpress/wp-content/plugins/idcommerce/templates/_protectedPage.php
+++ b/wordpress/wp-content/plugins/idcommerce/templates/_protectedPage.php
@@ -1,6 +1,6 @@
-<div class="md-requiredlogin login">
-	<h3><?php _e('This content is restricted to members only', 'memberdeck'); ?>.</h3>
-	<p><?php _e('Please login or register for access', 'memberdeck'); ?>.</p>
+<div class="content-wrapper md-requiredlogin login">
+	<h2>Login</h2>
+	<p>If you don't have an account, you can <a href="/dashboard/?action=register" title="Register for an account">create an account</a>.</p>
 	<?php if (isset($_GET['login_failure']) && $_GET['login_failure'] == 1) {
 		echo '<p class="error">Login failed</p>';
 	} ?>
diff --git a/wordpress/wp-content/plugins/idcommerce/templates/_regForm.php b/wordpress/wp-content/plugins/idcommerce/templates/_regForm.php
index 8565fea0..d1c8af80 100644
--- a/wordpress/wp-content/plugins/idcommerce/templates/_regForm.php
+++ b/wordpress/wp-content/plugins/idcommerce/templates/_regForm.php
@@ -1,30 +1,34 @@
-<div class="memberdeck">
-	<form action="" method="POST" id="payment-form" name="reg-form" data-regkey="<?php echo (isset($reg_key) ? $reg_key : ''); ?>">
-		<div id="logged-input" class="no">
-			<div class="form-row third">
-				<label><?php _e('First Name', 'memberdeck'); ?></label>
-				<input type="text" size="20" class="first-name required" name="first-name" value="<?php echo (isset($user_firstname) ? $user_firstname : ''); ?>"/>
+<div class="content-wrapper">
+	<h2>Register</h2>
+	<p>If you already have an account, you can <a href="/dashboard/" title="Login">login</a>.</p>
+	<div class="memberdeck">
+		<form action="" method="POST" id="payment-form" name="reg-form" data-regkey="<?php echo (isset($reg_key) ? $reg_key : ''); ?>">
+			<div id="logged-input" class="no">
+				<div class="form-row third">
+					<label><?php _e('First Name', 'memberdeck'); ?></label>
+					<input type="text" size="20" class="first-name required" name="first-name" value="<?php echo (isset($user_firstname) ? $user_firstname : ''); ?>"/>
+				</div>
+				<div class="form-row twothird">
+					<label><?php _e('Last Name', 'memberdeck'); ?></label>
+					<input type="text" size="20" class="last-name required" name="last-name" value="<?php echo (isset($user_lastname) ? $user_lastname : ''); ?>"/>
+				</div>
+				<div class="form-row">
+					<label><?php _e('Email Address', 'memberdeck'); ?></label>
+					<input type="email" size="20" class="email required" name="email" value="<?php echo (isset($email) ? $email : ''); ?>"/>
+				</div>
+				<div class="form-row">
+					<label><?php _e('Password', 'memberdeck'); ?></label>
+					<input type="password" size="20" class="pw required" name="pw"/>
+				</div>
+				<div class="form-row">
+					<label><?php _e('Re-enter Password', 'memberdeck'); ?></label>
+					<input type="password" size="20" class="cpw required" name="cpw"/>
+				</div>
+				<?php echo do_action('md_register_extrafields'); ?>
 			</div>
-			<div class="form-row twothird">
-				<label><?php _e('Last Name', 'memberdeck'); ?></label>
-				<input type="text" size="20" class="last-name required" name="last-name" value="<?php echo (isset($user_lastname) ? $user_lastname : ''); ?>"/>
-			</div>
-			<div class="form-row">
-				<label><?php _e('Email Address', 'memberdeck'); ?></label>
-				<input type="email" size="20" class="email required" name="email" value="<?php echo (isset($email) ? $email : ''); ?>"/>
-			</div>
-			<div class="form-row">
-				<label><?php _e('Password', 'memberdeck'); ?></label>
-				<input type="password" size="20" class="pw required" name="pw"/>
-			</div>
-			<div class="form-row">
-				<label><?php _e('Re-enter Password', 'memberdeck'); ?></label>
-				<input type="password" size="20" class="cpw required" name="cpw"/>
-			</div>
-			<?php echo do_action('md_register_extrafields'); ?>
-		</div>
-		<span class="payment-errors"></span>
-		<button type="submit" id="id-reg-submit" class="submit-button"><?php _e('Complete Registration', 'memberdeck'); ?></button>
-		<?php do_action('idc_below_register_form'); ?>
-	</form>
+			<span class="payment-errors"></span>
+			<button type="submit" id="id-reg-submit" class="submit-button"><?php _e('Complete Registration', 'memberdeck'); ?></button>
+			<?php do_action('idc_below_register_form'); ?>
+		</form>
+	</div>
 </div>
\ No newline at end of file
diff --git a/wordpress/wp-content/themes/backer/style.css b/wordpress/wp-content/themes/backer/style.css
index 1c172f65..95459156 100644
--- a/wordpress/wp-content/themes/backer/style.css
+++ b/wordpress/wp-content/themes/backer/style.css
@@ -72,7 +72,10 @@ html:not(.ie8) body {
    margin: auto;
    position: relative;
 }
-
+.content-wrapper {
+   padding: 50px;
+   background: #fff;
+}
 .left {
    float:left;
 }
@@ -174,14 +177,6 @@ h3, .memberdeck h2, .id-purchase-form-full h4, h2.idst {
    font-weight: 400;
    text-transform: uppercase;
 }
-h3:after, .memberdeck h2:after, .id-purchase-form-full h4:after, h2.idst:after {
-   width: 25px;
-   height: 2px;
-   margin-top: 20px;
-   background: #1b1b1b;
-   display: block;
-   content: "";
-}
 h3[style="text-align: center;"]:after {
    margin: 20px auto 0;
 }
@@ -1782,7 +1777,7 @@ ul.md-projects-list {
    color: #5a5a5a;
    margin-top: 40px;
    clear: left;
-   padding: 50px;
+   /*padding: 50px;*/
    text-align: left;
 }
 .memberdeck .md-profile, .wrap-md div.memberdeck {
-- 
GitLab


From 6fc1708c8c0ebb65f378dfa6a9e44c0afd5985f2 Mon Sep 17 00:00:00 2001
From: Steven Walker <stevenwalker@Stevens-MacBook-Pro.local>
Date: Wed, 9 Mar 2016 14:06:14 -0500
Subject: [PATCH 2/5] Fixing/removing colliding styles on checkout between
 Backer and IgnitionDeck.

---
 .../plugins/idcommerce/css/style.css          |  22 +-
 .../idcommerce/templates/_checkoutForm.php    | 302 +++++++++---------
 .../idcommerce/templates/_protectedPage.php   |   2 +-
 .../plugins/idcommerce/templates/_regForm.php |   2 +-
 wordpress/wp-content/themes/backer/style.css  |   9 +-
 5 files changed, 161 insertions(+), 176 deletions(-)

diff --git a/wordpress/wp-content/plugins/idcommerce/css/style.css b/wordpress/wp-content/plugins/idcommerce/css/style.css
index a8e9453e..42c38fbc 100644
--- a/wordpress/wp-content/plugins/idcommerce/css/style.css
+++ b/wordpress/wp-content/plugins/idcommerce/css/style.css
@@ -21,7 +21,6 @@
     margin: 0 auto;
     font-size: 0; }
   .memberdeck .instant-checkout-note {
-    color: #2B95B2;
     width: 75%;
     max-width: 650px;
     font-size: 24px;
@@ -34,29 +33,17 @@
     line-height: 48px;
     font-weight: 200; }
   .memberdeck a {
-    color: #217389;
     text-decoration: none; }
     .memberdeck a:hover {
-      color: #2B95B2;
       text-decoration: none; }
     .memberdeck a i {
-      color: #2a2a2a;
       text-decoration: none !important; }
       .memberdeck a i:hover {
-        color: #2B95B2; }
+      }
   .memberdeck .inline {
     display: inline-block;
     margin: 0; }
-  .memberdeck a.reveal-login, .memberdeck a.hide-login {
-    display: block;
-    margin: 0 auto 20px auto;
-    width: 30%;
-    padding: 1px 5px;
-    text-align: center;
-    border-radius: 3px;
-    font-size: 90%;
-    text-transform: uppercase;
-    background-color: rgba(255, 255, 255, 0.65); }
+
   .memberdeck h3.big {
     font-size: 32px;
     line-height: 40px;
@@ -206,11 +193,9 @@
     border-radius: 6px;
     font-weight: 400;
     font-size: 19px;
-    color: #2B95B2;
     padding: 11px 19px;
     margin: 8px auto;
     background-color: #fbfbfb;
-    border: 1px solid #2B95B2;
     cursor: pointer;
     display: block; }
     .memberdeck button i, .memberdeck input[type="submit"] i, .memberdeck form .form-row input[type="submit"] i, .memberdeck .button i {
@@ -810,8 +795,7 @@
     margin: 0; }
 .memberdeck form {
   /* Custom Dropdown Styling */ }
-  .memberdeck form a {
-    color: #2B95B2; }
+
   .memberdeck form a.delete, .memberdeck form a.delete i {
     color: #D0011B; }
   .memberdeck form p {
diff --git a/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php b/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
index 63df7296..31f64de4 100644
--- a/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
+++ b/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
@@ -1,33 +1,23 @@
-<div class="memberdeck">
-	<form action="" method="POST" id="payment-form" data-currency-code="<?php echo $pp_currency; ?>" data-product="<?php echo (isset($product_id) ? $product_id : ''); ?>" data-type="<?php echo (isset($type) ? $type : ''); ?>" <?php echo (isset($type) && $type == 'recurring' ? 'data-recurring="'.$recurring.'"' : ''); ?> data-free="<?php echo ($level_price == 0 ? 'free' : 'premium'); ?>" data-txn-type="<?php echo (isset($txn_type) ? $txn_type : 'capture'); ?>" data-renewable="<?php echo (isset($renewable) ? $renewable : 0); ?>" data-limit-term="<?php echo (isset($type) && $type == 'recurring' ? $limit_term : 0); ?>" data-term-limit="<?php echo(isset($limit_term) && $limit_term ? $term_length : ''); ?>" data-scpk="<?php echo (isset($sc_pubkey) ? apply_filters('idc_sc_pubkey', $sc_pubkey) : ''); ?>" data-claimedpp="<?php echo (isset($claimed_paypal) ? apply_filters('idc_claimed_paypal', $claimed_paypal) : ''); ?>" <?php echo ($es == 1 || $eb == 1 ? 'style="display: none;"' : ''); ?> data-pay-by-credits="<?php echo ((isset($paybycrd) && $paybycrd == 1) ? '1' : '') ?>">
-		<h3 class="checkout-header"><?php echo (isset($level_name) ? $level_name : ''); ?> <?php _e('Checkout', 'memberdeck'); ?></h3>
-		<?php if (!is_user_logged_in()) { ?>
-			<span class="login-help"><a href="#" class="reveal-login"><?php _e('Already have an account?', 'memberdeck'); ?></a></span>
-			<div id="logged-input" class="no">
-				<div class="form-row third">
-					<label for="first-name"><?php _e('First Name', 'memberdeck'); ?></label>
-					<input type="text" size="20" class="first-name required" name="first-name"/>
-				</div>
-				<div class="form-row twothird">
-					<label for="last-name"><?php _e('Last Name', 'memberdeck'); ?></label>
-					<input type="text" size="20" class="last-name required" name="last-name"/>
-				</div>
-				<div class="form-row">
-					<label for="email"><?php _e('Email Address', 'memberdeck'); ?></label>
-					<input type="email" pattern="[^ @]*@[^ @]*" size="20" class="email required" name="email"/>
-				</div>
-				<?php if (!$guest_checkout) { ?>
-					<div class="form-row">
-						<label for="pw"><?php _e('Password', 'memberdeck'); ?></label>
-						<input type="password" size="20" class="pw required" name="pw"/>
+<div class="content-wrapper">
+	<div class="memberdeck">
+		<form action="" method="POST" id="payment-form" data-currency-code="<?php echo $pp_currency; ?>" data-product="<?php echo (isset($product_id) ? $product_id : ''); ?>" data-type="<?php echo (isset($type) ? $type : ''); ?>" <?php echo (isset($type) && $type == 'recurring' ? 'data-recurring="'.$recurring.'"' : ''); ?> data-free="<?php echo ($level_price == 0 ? 'free' : 'premium'); ?>" data-txn-type="<?php echo (isset($txn_type) ? $txn_type : 'capture'); ?>" data-renewable="<?php echo (isset($renewable) ? $renewable : 0); ?>" data-limit-term="<?php echo (isset($type) && $type == 'recurring' ? $limit_term : 0); ?>" data-term-limit="<?php echo(isset($limit_term) && $limit_term ? $term_length : ''); ?>" data-scpk="<?php echo (isset($sc_pubkey) ? apply_filters('idc_sc_pubkey', $sc_pubkey) : ''); ?>" data-claimedpp="<?php echo (isset($claimed_paypal) ? apply_filters('idc_claimed_paypal', $claimed_paypal) : ''); ?>" <?php echo ($es == 1 || $eb == 1 ? 'style="display: none;"' : ''); ?> data-pay-by-credits="<?php echo ((isset($paybycrd) && $paybycrd == 1) ? '1' : '') ?>">
+			<h2 class="checkout-header"><?php echo (isset($level_name) ? $level_name : ''); ?> <?php _e('Checkout', 'memberdeck'); ?></h2>
+			<?php if (!is_user_logged_in()) { ?>
+				<p><a href="/dashboard"><?php _e('Already have an account?', 'memberdeck'); ?></a></p>
+				<div id="logged-input" class="no">
+					<div class="form-row third">
+						<label for="first-name"><?php _e('First Name', 'memberdeck'); ?></label>
+						<input type="text" size="20" class="first-name required" name="first-name"/>
+					</div>
+					<div class="form-row twothird">
+						<label for="last-name"><?php _e('Last Name', 'memberdeck'); ?></label>
+						<input type="text" size="20" class="last-name required" name="last-name"/>
 					</div>
 					<div class="form-row">
-						<label for="cpw"><?php _e('Re-enter Password', 'memberdeck'); ?></label>
-						<input type="password" size="20" class="cpw required" name="cpw"/>
+						<label for="email"><?php _e('Email Address', 'memberdeck'); ?></label>
+						<input type="email" pattern="[^ @]*@[^ @]*" size="20" class="email required" name="email"/>
 					</div>
-				<?php }	else { ?>
-					<a href="#" class="reveal-account"><?php _e('Create an account', 'memberdeck'); ?></a>
-					<div id="create_account" style="display: none">
+					<?php if (!$guest_checkout) { ?>
 						<div class="form-row">
 							<label for="pw"><?php _e('Password', 'memberdeck'); ?></label>
 							<input type="password" size="20" class="pw required" name="pw"/>
@@ -36,141 +26,153 @@
 							<label for="cpw"><?php _e('Re-enter Password', 'memberdeck'); ?></label>
 							<input type="password" size="20" class="cpw required" name="cpw"/>
 						</div>
-					</div>
-				<?php } ?>
-			</div>
-		<?php }
-		else { ?>
-		<div id="logged-input" class="yes">
-			<div class="form-row third" style="display: none;">
-				<label for="first-name"><?php _e('First Name', 'memberdeck'); ?></label>
-				<input type="text" size="20" class="first-name required" name="first-name" value="<?php echo (isset($fname) ? $fname : ''); ?>"/>
+					<?php }	else { ?>
+						<a href="#" class="reveal-account"><?php _e('Create an account', 'memberdeck'); ?></a>
+						<div id="create_account" style="display: none">
+							<div class="form-row">
+								<label for="pw"><?php _e('Password', 'memberdeck'); ?></label>
+								<input type="password" size="20" class="pw required" name="pw"/>
+							</div>
+							<div class="form-row">
+								<label for="cpw"><?php _e('Re-enter Password', 'memberdeck'); ?></label>
+								<input type="password" size="20" class="cpw required" name="cpw"/>
+							</div>
+						</div>
+					<?php } ?>
+				</div>
+			<?php }
+			else { ?>
+			<div id="logged-input" class="yes">
+				<div class="form-row third" style="display: none;">
+					<label for="first-name"><?php _e('First Name', 'memberdeck'); ?></label>
+					<input type="text" size="20" class="first-name required" name="first-name" value="<?php echo (isset($fname) ? $fname : ''); ?>"/>
+				</div>
+				<div class="form-row twothird" style="display: none;">
+					<label for="last-name"><?php _e('Last Name', 'memberdeck'); ?></label>
+					<input type="text" size="20" class="last-name required" name="last-name" value="<?php echo (isset($lname) ? $lname : ''); ?>"/>
+				</div>
+				<div class="form-row" style="display: none;">
+					<label for="email"><?php _e('Email Address', 'memberdeck'); ?></label>
+					<input type="email" pattern="[^ @]*@[^ @]*" size="20" class="email required" name="email" value="<?php echo (isset($email) ? $email : ''); ?>"/>
+				</div>
 			</div>
-			<div class="form-row twothird" style="display: none;">
-				<label for="last-name"><?php _e('Last Name', 'memberdeck'); ?></label>
-				<input type="text" size="20" class="last-name required" name="last-name" value="<?php echo (isset($lname) ? $lname : ''); ?>"/>
+			<?php } ?>
+			<div id="extra_fields" class="form-row">
+			<?php echo do_action('md_purchase_extrafields'); ?>
 			</div>
-			<div class="form-row" style="display: none;">
-				<label for="email"><?php _e('Email Address', 'memberdeck'); ?></label>
-				<input type="email" pattern="[^ @]*@[^ @]*" size="20" class="email required" name="email" value="<?php echo (isset($email) ? $email : ''); ?>"/>
+			<?php if ($level_price !== '' && $level_price > 0) { ?>
+			<div class="payment-type-selector">
+				<?php if ($epp == 1) { ?>
+				<a id="pay-with-paypal" class="pay_selector" href="#">
+					<span><?php _e('Pay with Paypal', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
+				<?php if (isset($eppadap) && $eppadap == 1) { ?>
+				<a id="pay-with-ppadaptive" class="pay_selector" href="#">
+					<span><?php _e('Pay with PayPal', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
+				<?php if ($es == 1) { ?>
+				<a id="pay-with-stripe" class="pay_selector" href="#">
+					<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
+				<?php if ($eb == 1) { ?>
+				<a id="pay-with-balanced" class="pay_selector" href="#">
+					<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
+				<?php if (isset($efd) && $efd == 1) { ?>
+				<a id="pay-with-fd" class="pay_selector" href="#">
+					<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
+				<?php if (isset($eauthnet) && $eauthnet == 1) { ?>
+				<a id="pay-with-authorize" class="pay_selector" href="#">
+					<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
+				<?php if (isset($mc) && $mc == 1) { ?>
+				<a id="pay-with-mc" class="pay_selector" href="#">
+					<span><?php _e('Offline Payment', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
+				<?php if (isset($paybycrd) && $paybycrd == 1) { ?>
+				<a id="pay-with-credits" class="pay_selector" href="#">
+					<span><?php _e('Pay with Credits', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
+				<?php if (isset($ecb) && $ecb == 1) { ?>
+				<a id="pay-with-coinbase" class="pay_selector" href="#">
+					<span><?php _e('Pay with Bitcoin', 'memberdeck'); ?></span>
+				</a>
+				<?php } ?>
 			</div>
-		</div>
-		<?php } ?>
-		<div id="extra_fields" class="form-row">
-		<?php echo do_action('md_purchase_extrafields'); ?>
-		</div>
-		<?php if ($level_price !== '' && $level_price > 0) { ?>
-		<div class="payment-type-selector">
-			<?php if ($epp == 1) { ?>
-			<a id="pay-with-paypal" class="pay_selector" href="#">
-				<span><?php _e('Pay with Paypal', 'memberdeck'); ?></span>
-			</a>
-			<?php } ?>
-			<?php if (isset($eppadap) && $eppadap == 1) { ?>
-			<a id="pay-with-ppadaptive" class="pay_selector" href="#">
-				<span><?php _e('Pay with PayPal', 'memberdeck'); ?></span>
-			</a>
-			<?php } ?>
-			<?php if ($es == 1) { ?>
-			<a id="pay-with-stripe" class="pay_selector" href="#">
-				<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
-			</a>
-			<?php } ?>
-			<?php if ($eb == 1) { ?>
-			<a id="pay-with-balanced" class="pay_selector" href="#">
-				<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
-			</a>
-			<?php } ?>
-			<?php if (isset($efd) && $efd == 1) { ?>
-			<a id="pay-with-fd" class="pay_selector" href="#">
-				<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
-			</a>
-			<?php } ?>
-			<?php if (isset($eauthnet) && $eauthnet == 1) { ?>
-			<a id="pay-with-authorize" class="pay_selector" href="#">
-				<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
-			</a>
-			<?php } ?>
-			<?php if (isset($mc) && $mc == 1) { ?>
-			<a id="pay-with-mc" class="pay_selector" href="#">
-				<span><?php _e('Offline Payment', 'memberdeck'); ?></span>
-			</a>
 			<?php } ?>
-			<?php if (isset($paybycrd) && $paybycrd == 1) { ?>
-			<a id="pay-with-credits" class="pay_selector" href="#">
-				<span><?php _e('Pay with Credits', 'memberdeck'); ?></span>
-			</a>
-			<?php } ?>
-			<?php if (isset($ecb) && $ecb == 1) { ?>
-			<a id="pay-with-coinbase" class="pay_selector" href="#">
-				<span><?php _e('Pay with Bitcoin', 'memberdeck'); ?></span>
-			</a>
-			<?php } ?>
-		</div>
-		<?php } ?>
-		<div id="stripe-input" data-idset="<?php echo (isset($instant_checkout) && $instant_checkout == true ? true : false); ?>" data-symbol="<?php echo (isset($stripe_symbol) ? $stripe_symbol : ''); ?>" data-customer-id="<?php echo ((isset($customer_id) && !empty($customer_id)) ? $customer_id : '') ?>" style="display:none;">
-			<div class="form-row">
-				<label><?php _e('Card Number', 'memberdeck'); ?> <span class="cards"><img src="https://ignitiondeck.com/id/wp-content/themes/id2/images/creditcards-full2.png" alt="<?php _e('Credit Cards Accepted', 'memberdeck'); ?>" /></span></label>
-				<input type="text" size="20" autocomplete="off" class="card-number required"/>
-			</div>
-			<div class="form-row half">
-				<label><?php _e('CVC', 'memberdeck'); ?></label>
-				<input type="text" size="4" autocomplete="off" class="card-cvc required"/>
+			<div id="stripe-input" data-idset="<?php echo (isset($instant_checkout) && $instant_checkout == true ? true : false); ?>" data-symbol="<?php echo (isset($stripe_symbol) ? $stripe_symbol : ''); ?>" data-customer-id="<?php echo ((isset($customer_id) && !empty($customer_id)) ? $customer_id : '') ?>" style="display:none;">
+				<div class="form-row">
+					<label><?php _e('Card Number', 'memberdeck'); ?> <span class="cards"><img src="https://ignitiondeck.com/id/wp-content/themes/id2/images/creditcards-full2.png" alt="<?php _e('Credit Cards Accepted', 'memberdeck'); ?>" /></span></label>
+					<input type="text" size="20" autocomplete="off" class="card-number required"/>
+				</div>
+				<div class="form-row half">
+					<label><?php _e('CVC', 'memberdeck'); ?></label>
+					<input type="text" size="4" autocomplete="off" class="card-cvc required"/>
+				</div>
+				<div class="form-row half date">
+					<label><?php _e('Expiration (MM/YYYY)', 'memberdeck'); ?></label>
+					<input type="text" size="2" class="card-expiry-month"/><span> / </span><input type="text" size="4" class="card-expiry-year required"/>
+				</div>
 			</div>
-			<div class="form-row half date">
-				<label><?php _e('Expiration (MM/YYYY)', 'memberdeck'); ?></label>
-				<input type="text" size="2" class="card-expiry-month"/><span> / </span><input type="text" size="4" class="card-expiry-year required"/>
+			<?php if ($level_price == 0) {?>
+			<div id="finaldescFree" class="finaldesc"><p><?php _e('This is a free product.', 'memberdeck'); ?><br/><?php _e('Click continue to add it to your account', 'memberdeck'); ?>.</p></div>
+			<?php } ?>
+			<?php if ($receipt_settings['show_terms'] == 1) { ?>
+			<div class="idc-terms-checkbox">
+				<div class="form-row checklist">
+					
+					<label><input type="checkbox" class="terms-checkbox-input required"/><?php _e('By checking this box, I agree to the', 'memberdeck'); ?> <a href="#"><?php echo $terms_content->post_title; ?></a> &amp; <a href="#"><?php echo $privacy_content->post_title; ?></a></label>
+					<input type="hidden" id="idc-hdn-error-terms-privacy" value="<?php echo $terms_content->post_title; ?> &amp; <?php echo $privacy_content->post_title; ?>" />
+				</div>
 			</div>
-		</div>
-		<?php if ($level_price == 0) {?>
-		<div id="finaldescFree" class="finaldesc"><p><?php _e('This is a free product.', 'memberdeck'); ?><br/><?php _e('Click continue to add it to your account', 'memberdeck'); ?>.</p></div>
-		<?php } ?>
-		<?php if ($receipt_settings['show_terms'] == 1) { ?>
-		<div class="idc-terms-checkbox">
-			<div class="form-row checklist">
-				
-				<label><input type="checkbox" class="terms-checkbox-input required"/><?php _e('By checking this box, I agree to the', 'memberdeck'); ?> <a href="#"><?php echo $terms_content->post_title; ?></a> &amp; <a href="#"><?php echo $privacy_content->post_title; ?></a></label>
-				<input type="hidden" id="idc-hdn-error-terms-privacy" value="<?php echo $terms_content->post_title; ?> &amp; <?php echo $privacy_content->post_title; ?>" />
+			<?php } ?>
+			<div id="finaldescPayPal" class="finaldesc" style="display:none; word-wrap: none;"><p><?php _e('You will be redirected to PayPal to complete your payment of', 'memberdeck'); ?> <span class="currency-symbol"><?php echo $pp_symbol; ?></span><?php echo (isset($level_price) ? apply_filters('idc_price_format', $level_price) : ''); ?>. <?php (!is_user_logged_in() ? __('Once complete, check your email for registration information', 'memberdeck').'.' : ''); ?></p></div>
+			<div id="finaldescStripe" class="finaldesc" style="display:none;"><?php _e('Your card will be billed', 'memberdeck'); ?> <span class="currency-symbol"><?php echo $pp_symbol; ?></span><?php echo (isset($level_price) ? apply_filters('idc_price_format', $level_price) : ''); ?> <?php echo (isset($type) && $type == 'recurring' && isset($limit_term) && $limit_term == '1' ? __('in ', 'memberdeck').$term_length.' ' : ''); ?><?php echo (isset($type) && $type == 'recurring' ? $recurring : ''); ?> <?php echo (isset($type) && $type == 'recurring' && isset($limit_term) && $limit_term == '1' ? __('installments', 'memberdeck') : ''); ?> <?php echo (isset($customer_id) ? __('using the card on file', 'memberdeck') : ''); ?> <?php _e('and will appear on your statement as', 'memberdeck'); ?>: <em><?php echo (isset($coname) ? $coname : ''); ?></em>.</div>
+			<div id="finaldescCredits" class="finaldesc" style="display:none; word-wrap: none;"><p><?php _e('This product costs', 'memberdeck'); ?> <?php echo apply_filters('idc_price_format', $credit_value).' '.apply_filters('idc_credits_label', __('credits', 'memberdeck'), ($credit_value > 0 ? true : false)); ?>.
+				<br /> <?php _e('Your current account credits are', 'memberdeck'); ?> <?php echo apply_filters('idc_price_format', $user_data->credits); ?>. <?php _e('After the purchase your remaining credits will be') ?> <?php echo apply_filters('idc_price_format', ($user_data->credits - $credit_value)); ?>.</p></div>
+			<div id="finaldescCoinbase" class="finaldesc" style="display:none; word-wrap: none;">
+				<p><?php _e('You will be directed to Coinbase to authenticate and complete your payment of', 'memberdeck'); ?> <?php echo (isset($level_price) ? apply_filters('idc_price_format', $level_price) : ''); ?> <span class="currency-symbol"><?php echo $cb_currency; ?></span>.</p>
 			</div>
+			<div><?php echo apply_filters('md_purchase_footer', ''); ?></div>
+			<span class="payment-errors"></span>
+			<input type="hidden" name="reg-price" value="<?php echo (isset($return->level_price) ? $return->level_price : ''); ?>"/>
+			<input type="hidden" name="pwyw-price" value="<?php echo (isset($pwyw_price) && $pwyw_price > 0 ? $pwyw_price : ''); ?>"/>
+			<button type="submit" id="id-main-submit" class="submit-button"><?php _e('Submit Payment', 'memberdeck'); ?></button>
+		</form>
+		<div class="md-requiredlogin login login-form" style="display: none;">
+			<h3 class="checkout-header"><?php _e('Login', 'memberdeck'); ?></h3>
+			<span class="login-help"><a href="#" class="hide-login"><?php _e('Need to register?', 'memberdeck'); ?></a></span>
+			<?php
+			$args = array('redirect' => $url);
+			echo wp_login_form($args);
+			?>
 		</div>
-		<?php } ?>
-		<div id="finaldescPayPal" class="finaldesc" style="display:none; word-wrap: none;"><p><?php _e('You will be redirected to PayPal to complete your payment of', 'memberdeck'); ?> <span class="currency-symbol"><?php echo $pp_symbol; ?></span><?php echo (isset($level_price) ? apply_filters('idc_price_format', $level_price) : ''); ?>. <?php (!is_user_logged_in() ? __('Once complete, check your email for registration information', 'memberdeck').'.' : ''); ?></p></div>
-		<div id="finaldescStripe" class="finaldesc" style="display:none;"><?php _e('Your card will be billed', 'memberdeck'); ?> <span class="currency-symbol"><?php echo $pp_symbol; ?></span><?php echo (isset($level_price) ? apply_filters('idc_price_format', $level_price) : ''); ?> <?php echo (isset($type) && $type == 'recurring' && isset($limit_term) && $limit_term == '1' ? __('in ', 'memberdeck').$term_length.' ' : ''); ?><?php echo (isset($type) && $type == 'recurring' ? $recurring : ''); ?> <?php echo (isset($type) && $type == 'recurring' && isset($limit_term) && $limit_term == '1' ? __('installments', 'memberdeck') : ''); ?> <?php echo (isset($customer_id) ? __('using the card on file', 'memberdeck') : ''); ?> <?php _e('and will appear on your statement as', 'memberdeck'); ?>: <em><?php echo (isset($coname) ? $coname : ''); ?></em>.</div>
-		<div id="finaldescCredits" class="finaldesc" style="display:none; word-wrap: none;"><p><?php _e('This product costs', 'memberdeck'); ?> <?php echo apply_filters('idc_price_format', $credit_value).' '.apply_filters('idc_credits_label', __('credits', 'memberdeck'), ($credit_value > 0 ? true : false)); ?>.
-			<br /> <?php _e('Your current account credits are', 'memberdeck'); ?> <?php echo apply_filters('idc_price_format', $user_data->credits); ?>. <?php _e('After the purchase your remaining credits will be') ?> <?php echo apply_filters('idc_price_format', ($user_data->credits - $credit_value)); ?>.</p></div>
-		<div id="finaldescCoinbase" class="finaldesc" style="display:none; word-wrap: none;">
-			<p><?php _e('You will be directed to Coinbase to authenticate and complete your payment of', 'memberdeck'); ?> <?php echo (isset($level_price) ? apply_filters('idc_price_format', $level_price) : ''); ?> <span class="currency-symbol"><?php echo $cb_currency; ?></span>.</p>
+		<div class="disclaimer">
+			<?php echo (isset($id_disclaimer) ? '<p>'.$id_disclaimer.'</p>' : ''); ?>
 		</div>
-		<div><?php echo apply_filters('md_purchase_footer', ''); ?></div>
-		<span class="payment-errors"></span>
-		<input type="hidden" name="reg-price" value="<?php echo (isset($return->level_price) ? $return->level_price : ''); ?>"/>
-		<input type="hidden" name="pwyw-price" value="<?php echo (isset($pwyw_price) && $pwyw_price > 0 ? $pwyw_price : ''); ?>"/>
-		<button type="submit" id="id-main-submit" class="submit-button"><?php _e('Submit Payment', 'memberdeck'); ?></button>
-	</form>
-	<div class="md-requiredlogin login login-form" style="display: none;">
-		<h3 class="checkout-header"><?php _e('Login', 'memberdeck'); ?></h3>
-		<span class="login-help"><a href="#" class="hide-login"><?php _e('Need to register?', 'memberdeck'); ?></a></span>
-		<?php
-		$args = array('redirect' => $url);
-		echo wp_login_form($args);
-		?>
-	</div>
-	<div class="disclaimer">
-		<?php echo (isset($id_disclaimer) ? '<p>'.$id_disclaimer.'</p>' : ''); ?>
-	</div>
 
-	<?php if ($receipt_settings['show_terms'] == 1) { ?>
-	<div class="idc-terms-conditions idc_lightbox mfp-hide">
-		<div class="idc_lightbox_wrapper">
-			<?php echo wpautop($terms_content->post_content); ?>
+		<?php if ($receipt_settings['show_terms'] == 1) { ?>
+		<div class="idc-terms-conditions idc_lightbox mfp-hide">
+			<div class="idc_lightbox_wrapper">
+				<?php echo wpautop($terms_content->post_content); ?>
+			</div>
 		</div>
-	</div>
-	<div class="idc-privacy-policy idc_lightbox mfp-hide">
-		<div class="idc_lightbox_wrapper">
-			<?php echo wpautop($privacy_content->post_content); ?>
+		<div class="idc-privacy-policy idc_lightbox mfp-hide">
+			<div class="idc_lightbox_wrapper">
+				<?php echo wpautop($privacy_content->post_content); ?>
+			</div>
 		</div>
+		<?php } ?>
 	</div>
-	<?php } ?>
 </div>
 <!-- 
     The easiest way to indicate that the form requires JavaScript is to show
@@ -196,4 +198,4 @@ if (window.Stripe) jQuery("#payment-form").show();
 	// For mini browser
 	/*echo '<script src="https://www.paypalobjects.com/js/external/apdg.js"></script>';*/
 }
-?>
\ No newline at end of file
+?>
diff --git a/wordpress/wp-content/plugins/idcommerce/templates/_protectedPage.php b/wordpress/wp-content/plugins/idcommerce/templates/_protectedPage.php
index 40d9f81c..92d0dbba 100644
--- a/wordpress/wp-content/plugins/idcommerce/templates/_protectedPage.php
+++ b/wordpress/wp-content/plugins/idcommerce/templates/_protectedPage.php
@@ -1,6 +1,6 @@
 <div class="content-wrapper md-requiredlogin login">
 	<h2>Login</h2>
-	<p>If you don't have an account, you can <a href="/dashboard/?action=register" title="Register for an account">create an account</a>.</p>
+	<p>If you don't have an account, you can <a href="/dashboard/?action=register" title="Sign up for an account">sign up</a>.</p>
 	<?php if (isset($_GET['login_failure']) && $_GET['login_failure'] == 1) {
 		echo '<p class="error">Login failed</p>';
 	} ?>
diff --git a/wordpress/wp-content/plugins/idcommerce/templates/_regForm.php b/wordpress/wp-content/plugins/idcommerce/templates/_regForm.php
index d1c8af80..69719ca9 100644
--- a/wordpress/wp-content/plugins/idcommerce/templates/_regForm.php
+++ b/wordpress/wp-content/plugins/idcommerce/templates/_regForm.php
@@ -1,5 +1,5 @@
 <div class="content-wrapper">
-	<h2>Register</h2>
+	<h2>Sign Up</h2>
 	<p>If you already have an account, you can <a href="/dashboard/" title="Login">login</a>.</p>
 	<div class="memberdeck">
 		<form action="" method="POST" id="payment-form" name="reg-form" data-regkey="<?php echo (isset($reg_key) ? $reg_key : ''); ?>">
diff --git a/wordpress/wp-content/themes/backer/style.css b/wordpress/wp-content/themes/backer/style.css
index 95459156..e3935680 100644
--- a/wordpress/wp-content/themes/backer/style.css
+++ b/wordpress/wp-content/themes/backer/style.css
@@ -175,7 +175,6 @@ h3, .memberdeck h2, .id-purchase-form-full h4, h2.idst {
    margin-bottom: 38px;
    margin-top: 78px;
    font-weight: 400;
-   text-transform: uppercase;
 }
 h3[style="text-align: center;"]:after {
    margin: 20px auto 0;
@@ -1805,9 +1804,9 @@ ul.md-projects-list {
 .ignitiondeck .form-row p {
    margin: 0;
 }
-.memberdeck form a, .memberdeck a {
+/*.memberdeck form a, .memberdeck a {
    color: #333;
-}
+}*/
 /*.memberdeck .idc-terms-checkbox {
    background: #eee;
    border-radius: 5px;
@@ -1895,9 +1894,9 @@ input.terms-checkbox-input {
    margin: 0;
    padding: 0;
 }
-.memberdeck #payment-form .checkout-header {
+/*.memberdeck #payment-form .checkout-header {
    margin-bottom: 50px;
-}
+}*/
 
 /* Notices */
 
-- 
GitLab


From 18f2afe195b1322a45c19bf4e03c51549f5e3a0a Mon Sep 17 00:00:00 2001
From: Steven Walker <stevenwalker@Stevens-MacBook-Pro.local>
Date: Wed, 9 Mar 2016 15:38:28 -0500
Subject: [PATCH 3/5] removing styles for checkout

---
 .../plugins/idcommerce/css/style.css          | 19 +++++++++++--------
 .../css/themes/theme-IgnitionDeck.css         |  8 ++++----
 .../idcommerce/templates/_checkoutForm.php    | 17 ++++++++++-------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/wordpress/wp-content/plugins/idcommerce/css/style.css b/wordpress/wp-content/plugins/idcommerce/css/style.css
index 42c38fbc..dfbb2a5b 100644
--- a/wordpress/wp-content/plugins/idcommerce/css/style.css
+++ b/wordpress/wp-content/plugins/idcommerce/css/style.css
@@ -879,9 +879,12 @@
     width: 234px;
     margin: 0;
     padding: 0; }
-  .memberdeck form .payment-type-selector {
-    text-align: center; }
-  .memberdeck form .payment-type-selector a {
+  a.pay_selector.active{
+    display: none;
+  }
+/*  .memberdeck form .payment-type-selector {
+    text-align: center; }*/
+  /*.memberdeck form .payment-type-selector a {
     display: inline-block;
     padding: 5px 15px;
     padding-bottom: 48px;
@@ -900,12 +903,12 @@
     background: -ms-linear-gradient(top, rgba(43, 149, 178, 0.8) 0%, #0aa8d3 100%);
     background: linear-gradient(to bottom, rgba(43, 149, 178, 0.8) 0%, #0aa8d3 100%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC2B95B2', endColorstr='#FF0AA8D3',GradientType=0);
-    opacity: .6; }
-  .memberdeck form .payment-type-selector a:hover {
+    opacity: .6; }*/
+ /* .memberdeck form .payment-type-selector a:hover {
     border: 1px solid #2B95B2;
     color: white;
-    opacity: 1; }
-  .memberdeck form .payment-type-selector a.active {
+    opacity: 1; }*/
+  /*.memberdeck form .payment-type-selector a.active {
     border: 1px solid #2B95B2;
     color: white;
     opacity: 1; }
@@ -943,7 +946,7 @@
     background-repeat: no-repeat;
     padding-bottom: 48px; }
   .memberdeck form #stripe-input {
-    margin-top: 20px; }
+    margin-top: 20px; }*/
 /*  .memberdeck form .checklist input[type='checkbox'], .memberdeck form .checklist input[type='radio'] {
     display: inline-block;
     width: auto;
diff --git a/wordpress/wp-content/plugins/idcommerce/css/themes/theme-IgnitionDeck.css b/wordpress/wp-content/plugins/idcommerce/css/themes/theme-IgnitionDeck.css
index ca4b42af..5eba01e3 100644
--- a/wordpress/wp-content/plugins/idcommerce/css/themes/theme-IgnitionDeck.css
+++ b/wordpress/wp-content/plugins/idcommerce/css/themes/theme-IgnitionDeck.css
@@ -156,7 +156,7 @@
 #idmember #payment-form .payment-type-selector {
 	text-align: center;
 }
-#idmember #payment-form .payment-type-selector a {
+/*#idmember #payment-form .payment-type-selector a {
 	display: inline-block;
 	padding: 5px 15px;
 	padding-bottom: 48px;
@@ -177,8 +177,8 @@
 	-webkit-transition: all 500ms;
 	-moz-transition: all 500ms;
 	transition: all 500ms;
-}
-#idmember #payment-form .payment-type-selector a:hover {
+}*/
+/*#idmember #payment-form .payment-type-selector a:hover {
 	border: 1px solid #0069c5;
 	color: #0067c2;
 	opacity: 1;
@@ -206,7 +206,7 @@
 }
 #idmember #payment-form #stripe-input {
 	margin-top: 20px;
-}
+}*/
 
 /* @group Dashboard */
 
diff --git a/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php b/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
index 31f64de4..404e0745 100644
--- a/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
+++ b/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
@@ -62,6 +62,13 @@
 			</div>
 			<?php if ($level_price !== '' && $level_price > 0) { ?>
 			<div class="payment-type-selector">
+				<a id="pay-with-mc" class="pay_selector" href="#">
+					<span><?php _e('Make an offline payment', 'memberdeck'); ?></span>
+				</a>
+				<a id="pay-with-stripe" class="pay_selector" href="#" >
+					<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
+				</a>
+				
 				<?php if ($epp == 1) { ?>
 				<a id="pay-with-paypal" class="pay_selector" href="#">
 					<span><?php _e('Pay with Paypal', 'memberdeck'); ?></span>
@@ -73,9 +80,7 @@
 				</a>
 				<?php } ?>
 				<?php if ($es == 1) { ?>
-				<a id="pay-with-stripe" class="pay_selector" href="#">
-					<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
-				</a>
+				
 				<?php } ?>
 				<?php if ($eb == 1) { ?>
 				<a id="pay-with-balanced" class="pay_selector" href="#">
@@ -93,9 +98,7 @@
 				</a>
 				<?php } ?>
 				<?php if (isset($mc) && $mc == 1) { ?>
-				<a id="pay-with-mc" class="pay_selector" href="#">
-					<span><?php _e('Offline Payment', 'memberdeck'); ?></span>
-				</a>
+
 				<?php } ?>
 				<?php if (isset($paybycrd) && $paybycrd == 1) { ?>
 				<a id="pay-with-credits" class="pay_selector" href="#">
@@ -109,7 +112,7 @@
 				<?php } ?>
 			</div>
 			<?php } ?>
-			<div id="stripe-input" data-idset="<?php echo (isset($instant_checkout) && $instant_checkout == true ? true : false); ?>" data-symbol="<?php echo (isset($stripe_symbol) ? $stripe_symbol : ''); ?>" data-customer-id="<?php echo ((isset($customer_id) && !empty($customer_id)) ? $customer_id : '') ?>" style="display:none;">
+			<div id="stripe-input" data-idset="<?php echo (isset($instant_checkout) && $instant_checkout == true ? true : false); ?>" data-symbol="<?php echo (isset($stripe_symbol) ? $stripe_symbol : ''); ?>" data-customer-id="<?php echo ((isset($customer_id) && !empty($customer_id)) ? $customer_id : '') ?>" style="">
 				<div class="form-row">
 					<label><?php _e('Card Number', 'memberdeck'); ?> <span class="cards"><img src="https://ignitiondeck.com/id/wp-content/themes/id2/images/creditcards-full2.png" alt="<?php _e('Credit Cards Accepted', 'memberdeck'); ?>" /></span></label>
 					<input type="text" size="20" autocomplete="off" class="card-number required"/>
-- 
GitLab


From eb3891405d02c71c5d6e3cac38cf6cf270c45dbc Mon Sep 17 00:00:00 2001
From: Steven Walker <stevenwalker@Stevens-MacBook-Pro.local>
Date: Fri, 11 Mar 2016 12:15:07 -0500
Subject: [PATCH 4/5] styling edits to checkout pages/conditionals

---
 wordpress/wp-content/plugins/idcommerce/css/style.css  |  6 +++---
 .../wp-content/plugins/idcommerce/js/idcommerce.js     | 10 ++++++++++
 .../plugins/idcommerce/templates/_checkoutForm.php     | 10 ++++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/wordpress/wp-content/plugins/idcommerce/css/style.css b/wordpress/wp-content/plugins/idcommerce/css/style.css
index dfbb2a5b..8562982e 100644
--- a/wordpress/wp-content/plugins/idcommerce/css/style.css
+++ b/wordpress/wp-content/plugins/idcommerce/css/style.css
@@ -17,7 +17,7 @@
     width: -webkit-calc(100% - 2px);
     width: -moz-calc(100% - 2px);
     width: calc(100% - 2px);
-    padding: 0;
+    padding: 50px;
     margin: 0 auto;
     font-size: 0; }
   .memberdeck .instant-checkout-note {
@@ -879,9 +879,9 @@
     width: 234px;
     margin: 0;
     padding: 0; }
-  a.pay_selector.active{
+/*  a.pay_selector.active{
     display: none;
-  }
+  }*/
 /*  .memberdeck form .payment-type-selector {
     text-align: center; }*/
   /*.memberdeck form .payment-type-selector a {
diff --git a/wordpress/wp-content/plugins/idcommerce/js/idcommerce.js b/wordpress/wp-content/plugins/idcommerce/js/idcommerce.js
index 65ed6f55..2a185632 100644
--- a/wordpress/wp-content/plugins/idcommerce/js/idcommerce.js
+++ b/wordpress/wp-content/plugins/idcommerce/js/idcommerce.js
@@ -203,6 +203,7 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentStripe");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
+		console.log('2');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").show();
 		jQuery("#finaldescPayPal").hide();
@@ -231,6 +232,7 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentBalanced");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
+		console.log('3');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").show();
 		jQuery("#finaldescPayPal").hide();
@@ -257,6 +259,7 @@ jQuery(document).ready(function() {
 		jQuery(".pw").parents('.form-row').hide();
 		jQuery(".cpw").parents('.form-row').hide();
 		jQuery(".pay_selector").removeClass('active');
+		console.log('4');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescPayPal").show();
 		jQuery("#finaldescStripe").hide();
@@ -286,6 +289,7 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentFD");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
+		console.log('1');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").show();
 		jQuery("#finaldescPayPal").hide();
@@ -302,6 +306,7 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentMC");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
+		console.log('5');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").hide();
 		jQuery("#finaldescPayPal").hide();
@@ -318,6 +323,7 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentCredits");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
+		console.log('6');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").hide();
 		jQuery("#finaldescPayPal").hide();
@@ -333,12 +339,14 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").text("Pay with Coinbase");
 		
 		jQuery(".pay_selector").removeClass('active');
+		console.log('7');
 		jQuery(this).addClass("active");
 		
 		jQuery("#stripe-input").hide();
 		jQuery(".pw").parents('.form-row').hide();
 		jQuery(".cpw").parents('.form-row').hide();
 		jQuery(".pay_selector").removeClass('active');
+		console.log('8');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescCoinbase").show();
 		jQuery("#finaldescPayPal").hide();
@@ -354,6 +362,7 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").removeAttr("disabled");
 		
 		jQuery(".pay_selector").removeClass('active');
+		console.log('9');
 		jQuery(this).addClass("active");
 		//console.log('idset: ', idset, ', customerId: ', customerId, ', !idset: ', !idset, ', !customerId: ', !customerId);
 		if (!idset || !customerId) {
@@ -378,6 +387,7 @@ jQuery(document).ready(function() {
 		jQuery(".pw").parents('.form-row').hide();
 		jQuery(".cpw").parents('.form-row').hide();
 	    jQuery(".pay_selector").removeClass('active');
+	    console.log('10');
 	    jQuery(this).addClass("active");
 		// Loading the form and setting the payment key
 		if (type == 'recurring' || txnType == 'preauth') {
diff --git a/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php b/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
index 404e0745..e56aa005 100644
--- a/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
+++ b/wordpress/wp-content/plugins/idcommerce/templates/_checkoutForm.php
@@ -62,13 +62,15 @@
 			</div>
 			<?php if ($level_price !== '' && $level_price > 0) { ?>
 			<div class="payment-type-selector">
-				<a id="pay-with-mc" class="pay_selector" href="#">
-					<span><?php _e('Make an offline payment', 'memberdeck'); ?></span>
-				</a>
+				<p>
 				<a id="pay-with-stripe" class="pay_selector" href="#" >
 					<span><?php _e('Pay with Credit Card', 'memberdeck'); ?></span>
 				</a>
-				
+				or
+				<a id="pay-with-mc" class="pay_selector" href="#">
+					<span><?php _e('Make an offline payment', 'memberdeck'); ?></span>
+				</a>
+				</p>
 				<?php if ($epp == 1) { ?>
 				<a id="pay-with-paypal" class="pay_selector" href="#">
 					<span><?php _e('Pay with Paypal', 'memberdeck'); ?></span>
-- 
GitLab


From 334f9d5c9271b306e2edffff51c8281922673372 Mon Sep 17 00:00:00 2001
From: Steven Walker <stevenwalker@Stevens-MacBook-Pro.local>
Date: Fri, 11 Mar 2016 12:18:51 -0500
Subject: [PATCH 5/5] removing console logs

---
 .../wp-content/plugins/idcommerce/js/idcommerce.js     | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/wordpress/wp-content/plugins/idcommerce/js/idcommerce.js b/wordpress/wp-content/plugins/idcommerce/js/idcommerce.js
index 2a185632..65ed6f55 100644
--- a/wordpress/wp-content/plugins/idcommerce/js/idcommerce.js
+++ b/wordpress/wp-content/plugins/idcommerce/js/idcommerce.js
@@ -203,7 +203,6 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentStripe");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
-		console.log('2');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").show();
 		jQuery("#finaldescPayPal").hide();
@@ -232,7 +231,6 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentBalanced");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
-		console.log('3');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").show();
 		jQuery("#finaldescPayPal").hide();
@@ -259,7 +257,6 @@ jQuery(document).ready(function() {
 		jQuery(".pw").parents('.form-row').hide();
 		jQuery(".cpw").parents('.form-row').hide();
 		jQuery(".pay_selector").removeClass('active');
-		console.log('4');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescPayPal").show();
 		jQuery("#finaldescStripe").hide();
@@ -289,7 +286,6 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentFD");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
-		console.log('1');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").show();
 		jQuery("#finaldescPayPal").hide();
@@ -306,7 +302,6 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentMC");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
-		console.log('5');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").hide();
 		jQuery("#finaldescPayPal").hide();
@@ -323,7 +318,6 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").attr("name", "submitPaymentCredits");
 		jQuery("#id-main-submit").text("Complete Checkout");
 		jQuery(".pay_selector").removeClass('active');
-		console.log('6');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescStripe").hide();
 		jQuery("#finaldescPayPal").hide();
@@ -339,14 +333,12 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").text("Pay with Coinbase");
 		
 		jQuery(".pay_selector").removeClass('active');
-		console.log('7');
 		jQuery(this).addClass("active");
 		
 		jQuery("#stripe-input").hide();
 		jQuery(".pw").parents('.form-row').hide();
 		jQuery(".cpw").parents('.form-row').hide();
 		jQuery(".pay_selector").removeClass('active');
-		console.log('8');
 		jQuery(this).addClass("active");
 		jQuery("#finaldescCoinbase").show();
 		jQuery("#finaldescPayPal").hide();
@@ -362,7 +354,6 @@ jQuery(document).ready(function() {
 		jQuery("#id-main-submit").removeAttr("disabled");
 		
 		jQuery(".pay_selector").removeClass('active');
-		console.log('9');
 		jQuery(this).addClass("active");
 		//console.log('idset: ', idset, ', customerId: ', customerId, ', !idset: ', !idset, ', !customerId: ', !customerId);
 		if (!idset || !customerId) {
@@ -387,7 +378,6 @@ jQuery(document).ready(function() {
 		jQuery(".pw").parents('.form-row').hide();
 		jQuery(".cpw").parents('.form-row').hide();
 	    jQuery(".pay_selector").removeClass('active');
-	    console.log('10');
 	    jQuery(this).addClass("active");
 		// Loading the form and setting the payment key
 		if (type == 'recurring' || txnType == 'preauth') {
-- 
GitLab