From 4825bcb81bc96892230b3d862c9d4af39f4b0f6f Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Wed, 13 May 2015 16:45:55 -0400
Subject: [PATCH] Reorganized member fields

---
 simple-wp-membership/view.php | 116 ++++++++++++++++++++++++----------
 1 file changed, 84 insertions(+), 32 deletions(-)

diff --git a/simple-wp-membership/view.php b/simple-wp-membership/view.php
index 5cc3fd9..f64978f 100644
--- a/simple-wp-membership/view.php
+++ b/simple-wp-membership/view.php
@@ -69,15 +69,18 @@
 		foreach($this->items as $m) {
 		    if ($m['first_name'].$m['last_name'] != '') {
 			echo '
+				<!-- First, Last name -->
 				<div class="row">
 				        <div class="small-12 columns memberName"><h3>'.$m['first_name'].' '.$m['last_name'].'</h3></div>
 				</div>
 				<div class="row">
 			'.($m['email'] != '' ? '
-					<div class="small-5 medium-3 columns fieldPrompt">Email address:</div><div class="small-7 medium-3 columns fieldValue">'.$m['email'].'</div>
+					<!-- Email Address -->
+					<div class="small-5 medium-3 columns fieldPrompt">Email address:</div><div class="small-7 medium-4 columns fieldValue">'.$m['email'].'</div>
 			' : '').'
 			'.($m['phone'] != '' ? '
-				        <div class="small-5 medium-3 columns fieldPrompt">Phone:</div><div class="small-7 medium-3 columns fieldValue">'.$m['phone'].'</div>
+					<!-- Cell Phone -->
+				        <div class="small-5 medium-2 columns fieldPrompt">Phone:</div><div class="small-7 medium-3 columns fieldValue">'.$m['phone'].'</div>
 			' : '
 					<div class="small-1 columns end"> </div>
 			').'
@@ -86,75 +89,122 @@
 			'.($m['data']['Spouse name']->value != '' ? '
 				<div class="minorBreak"> </div>
 				<div class="row">
+					<!-- Spouse Name -->
 					<div class="small-3 columns fieldPrompt">Spouse:</div><div class="small-7 columns end fieldValue">'.$m['data']['Spouse name']->value.'</div>
 				</div>
 				<div class="row">
 			    '.($m['data']['Spouse email']->value != '' ? '
-					<div class="small-6 medium-3 columns fieldPrompt">Email:</div><div class="small-7 medium-3 columns fieldValue">'.$m['data']['Spouse email']->value.'</div>
+					<!-- Spouse Email -->
+					<div class="small-6 medium-3 columns fieldPrompt">Email:</div><div class="small-7 medium-4 columns fieldValue">'.$m['data']['Spouse email']->value.'</div>
 			    ' : '').'
 			    '.($m['data']['Spouse cell phone']->value != '' ? '
-					<div class="small-5 medium-3 columns fieldPrompt">Cell phone:</div><div class="small-7 medium-3 columns end fieldValue">'.$m['data']['Spouse cell phone']->value.'</div>
+					<!-- Spouse Cell Phone -->
+					<div class="small-5 medium-2 columns fieldPrompt">Cell phone:</div><div class="small-7 medium-3 columns end fieldValue">'.$m['data']['Spouse cell phone']->value.'</div>
 			    ' : '
 					<div class="small-1 columns end"> </div>
 			    ').'
 				</div>
 			' : '').'
-			'.($m['data']['Summer mailing address (P.O. Box)']->value.$m['data']['']->value.$m['data']['Cottage Address']->value != '' ? '
 				<div class="row"><div class="small-12 columns sectionTitle">Summer contact information</div></div>
-			    '.($m['data']['Summer mailing address (P.O. Box)']->value != '' ? '
+			    '.($m['data']['Summer mailing address (P.O Box)']->value != '' ? '
 				<div class="row">
-					<div class="small-3 columns fieldPrompt">Summer mailing address:</div><div class="small-7 columns end fieldValue">'.$m['data']['Summer mailing address (P.O. Box)']->value.'</div>
-				</div>
-			    ' : '').'
-			    '.($m['data']['Cottage Address']->value != '' ? '
-				<div class="row">
-					<div class="small-3 columns fieldPrompt">Cottage address:</div><div class="small-7 columns end fieldValue">'.$m['data']['Cottage Address']->value.'</div>
-				</div>
-			    ' : '').'
-			    '.($m['data']['911 Address']->value != '' ? '
-				<div class="row">
-					<div class="small-3 columns fieldPrompt">911 address:</div><div class="small-7 columns end fieldValue">'.$m['data']['911 Address']->value.'</div>
+					<!-- Summer Mailing Address -->
+					<div class="small-3 columns fieldPrompt">Summer mailing:</div><div class="small-7 columns end fieldValue">'.$m['data']['Summer mailing address (P.O Box)']->value.'</div>
 				</div>
 			    ' : '').'
 			    '.($m['data']['Summer City']->value != '' ? '
 				<div class="row">
 					<div class="small-3 columns">&nbsp;</div>
+					<!-- Summer City, State, ZIP -->
 					<div class="small-7 columns end fieldValue">
 						'.$m['data']['Summer City']->value.($m['data']['Summer State']->value != '' ? ', '.$m['data']['Summer State']->value : '').'
 						'.$m['data']['Summer ZIP/Postal Code']->value.'
 					</div>
 				</div>
 			    ' : '').'
-			    '.($m['data']['Additional Summer Address']->value != '' ? '
+			    '.($m['data']['Summer Home 1']->value != '' ? '
+				<div class="row">
+					<!-- Summer Home 1 -->
+					<div class="small-3 medium-3 columns fieldPrompt">Address 1:</div><div class="small-7 medium-4 columns end fieldValue">'.$m['data']['Summer Home 1']->value.'</div>
+		              '.($m['data']['Summer Phone 1']->value != '' ? '
+					<div class="small-5 medium-2 columns fieldPrompt">Phone:</div>
+					<!-- Summer Phone 1 -->
+					<div class="small-7 medium-3 columns end fieldValue">'.$m['data']['Summer Phone 1']->value.'</div>
+			      ' : '
+					<div class="small-1 columns end">&nbsp;</div>
+			      ').'
+				</div>
+			    ' : '').'
+			    '.($m['data']['Summer Home 2']->value != '' ? '
 				<div class="row">
-					<div class="small-3 columns fieldPrompt">Additional address:</div><div class="small-7 columns end fieldValue">'.$m['data']['Additional Summer Address']->value.'</div>
+					<!-- Summer Home 2 -->
+					<div class="small-3 medium-3 columns fieldPrompt">Address 2:</div><div class="small-7 medium-4 columns end fieldValue">'.$m['data']['Summer Home 2']->value.'</div>
+		              '.($m['data']['Summer Phone 2']->value != '' ? '
+					<div class="small-5 medium-2 columns fieldPrompt">Phone:</div>
+					<!-- Summer Phone 2 -->
+					<div class="small-7 medium-3 columns end fieldValue">'.$m['data']['Summer Phone 2']->value.'</div>
+			      ' : '
+					<div class="small-1 columns end">&nbsp;</div>
+			      ').'
 				</div>
 			    ' : '').'
-			    '.($m['data']['Home Phone']->value.$m['data']['Additional Phone']->value.$m['data']['Additional Phone #2']->value != '' ? '
-				<div class="row">
-			        '.($m['data']['Home Phone']->value != '' ? '
-					<div class="small-5 medium-3 columns fieldPrompt">Home Phone:</div><div class="small-7 medium-2 columns fieldValue">'.$m['data']['Home Phone']->value.'</div>
-			    	' : '').'
-			        '.($m['data']['Additional Phone']->value.$m['data']['Additional Phone #2']->value != '' ? '
-					<div class="small-5 medium-3 columns fieldPrompt">Other Phones:</div>
-					<div class="small-7 medium-4 columns fieldValue">'.$m['data']['Additional Phone']->value.' '.$m['data']['Additional Phone #2']->value.'</div>
-			    	' : '
+			    '.($m['data']['Summer Home 3']->value != '' ? '
+				<div class="row">
+					<!-- Summer Home 3 -->
+					<div class="small-3 medium-3 columns fieldPrompt">Address 3:</div><div class="small-7 medium-4 columns end fieldValue">'.$m['data']['Summer Home 3']->value.'</div>
+		              '.($m['data']['Summer Phone 3']->value != '' ? '
+					<div class="small-5 medium-2 columns fieldPrompt">Phone:</div>
+					<!-- Summer Phone 3 -->
+					<div class="small-7 medium-3 columns end fieldValue">'.$m['data']['Summer Phone 3']->value.'</div>
+			      ' : '
 					<div class="small-1 columns end">&nbsp;</div>
-				').'
+			      ').'
+				</div>
+			    ' : '').'
+
+
+			'.($m['data']['Home Address']->value != '' ? '
+				<div class="row"><div class="small-12 columns sectionTitle">Home contact information</div></div>
+				<div class="row">
+					<div class="small-3 columns fieldPrompt">Address:</div>
+					<!-- Home Address -->
+					<div class="small-7 columns end fieldValue">
+						'.$m['data']['Home Address']->value.'
+					</div>
+				</div>
+			    '.($m['data']['Home City']->value != '' ? '
+				<div class="row">
+					<div class="small-3 columns">&nbsp;</div>
+					<!-- Home City, State, ZIP -->
+					<div class="small-7 columns end fieldValue">
+						'.$m['data']['Home City']->value.($m['data']['Home State']->value != '' ? ', '.$m['data']['Home State']->value : '').'
+						'.$m['data']['Home ZIP']->value.'
+					</div>
+				</div>
+			    ' : '').'
+			    '.($m['data']['Home Phone']->value != '' ? '
+				<div class="row">
+					<div class="small-3 columns fieldPrompt">Phone:</div>
+					<!-- Home Phone -->
+					<div class="small-7 columns end fieldValue">
+						'.$m['data']['Home Phone']->value.'
+					</div>
 				</div>
 			    ' : '').'
 			' : '').'
-			'.($m['data']['Winter mailing address']->value.$m['data']['Winter Apt']->value.$m['data']['Winter Apt']->value != '' ? '
+			'.($m['data']['Winter mailing address']->value != '' ? '
 				<div class="row"><div class="small-12 columns sectionTitle">Winter contact information</div></div>
 				<div class="row">
 					<div class="small-3 columns fieldPrompt">Winter address:</div>
+					<!-- Winter Mailing Address -->
 					<div class="small-7 columns end fieldValue">
-					'.$m['data']['Winter mailing address']->value.($m['data']['Winter State']->value != '' ? ', '.$m['data']['Winter Apt']->value : '').'
+						'.$m['data']['Winter mailing address']->value.'
 					</div>
 				</div>
 			    '.($m['data']['Winter City']->value != '' ? '
 				<div class="row">
 					<div class="small-3 columns">&nbsp;</div>
+					<!-- Winter City, State, ZIP -->
 					<div class="small-7 columns end fieldValue">
 						'.$m['data']['Winter City']->value.($m['data']['Winter State']->value != '' ? ', '.$m['data']['Winter State']->value : '').'
 						'.$m['data']['Winter ZIP/Postal Code']->value.'
@@ -164,12 +214,14 @@
 			    '.($m['data']['Winter phone']->value != '' ? '
 				<div class="row">
 					<div class="small-3 columns fieldPrompt">Phone:</div>
+					<!-- Winter Phone -->
 					<div class="small-7 columns end fieldValue">
 						'.$m['data']['Winter phone']->value.'
 					</div>
 				</div>
 			    ' : '').'
 			' : '').'
+
 			<hr width="80%">
 			';
 		    }
@@ -178,6 +230,6 @@
 
 		// Uncomment to show fields or member data arrays
 		// echo "<pre>".print_r($this->fields,1)."</pre>";
-		// echo "<pre>".print_r($this->items,1)."</pre>";
+		 echo "<pre>".print_r($this->items,1)."</pre>";
 	?>
 </div><!-- end of wrap -->
-- 
2.17.1