[interchange-cvs] interchange - heins modified 2 files

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2005-04-17 19:33:05 GMT
Modified:  dist/standard/include/checkout billing_address
Modified:           shipping_address
Log:
* Change some more standard demo stuff to use country_select
  and state_select.

Revision  Changes    Path
1.3       +2 -2      interchange/dist/standard/include/checkout/billing_address


rev 1.3, prev_rev 1.2
Index: billing_address
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/billing_address,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- billing_address	26 Jan 2005 17:51:13 -0000	1.2
+++ billing_address	17 Apr 2005 19:33:05 -0000	1.3
@@ -105,7 +105,7 @@
 		  </td>
 		  <td align="right" class="contentbar1"><b>[L]State/Province[/L]</b></td>
 		  <td class="contentbar1">
-			<input type="text" name="b_state" value="[value b_state]" size="5" maxlength="5">
+			[display name=b_state type=state_select value="[value b_state]"]
 		  </td>
 		</tr>
 		<tr>
@@ -121,7 +121,7 @@
 			<b>[L]Country[/L]</b>
 		  </td>
 		  <td class="contentbar1" colspan="3">
-			<input type="text" name="b_country" value="[value b_country]" size="10" maxlength="10">
+			[display name=b_country type=country_select value="[value b_country]"]
 		  </td>
 		</tr>
 		<tr>



1.4       +2 -40     interchange/dist/standard/include/checkout/shipping_address


rev 1.4, prev_rev 1.3
Index: shipping_address
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/shipping_address,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shipping_address	26 Jan 2005 17:51:13 -0000	1.3
+++ shipping_address	17 Apr 2005 19:33:05 -0000	1.4
@@ -57,26 +57,7 @@
 			[error name=state std_label="[L]State/Province[/L]" required=1]
 		</td>
 		<td align="left" class="contentbar1" colspan=3>
-		  [loop search="
-			fi=state.txt
-			sf=country
-			se=[default country US]
-			rf=state,name,country
-			un=yes
-			tf=sorder,name
-			ml=100
-		  "
-		  option=state]
-		  [on-match]<select onChange="check_tax(this.form)" name=state>[/on-match]
-		  [list]
-		  [loop-change 1][condition][loop-param country][/condition]
-		  <optgroup label="[data table=country col=name key='[loop-param country]']">
-		  [/loop-change 1]
-		  <option value="[loop-code]">[loop-pos 1]
-		  [/list]
-		  [on-match]</select>[/on-match]
-		  [no-match]<input name=state value="[value state]" size=20>[/no-match]
-		  [/loop]
+		  [display name=state type=state_select value="[value state]"]
 		</td>
 	  </tr>
 	  <tr>
@@ -100,26 +81,7 @@
 		  [L]Country[/L]
 		</td>
 		<td colspan="3" class="contentbar1">
-		  <select name=country onChange="this.form.submit()">
-		  [if value country =~ /(^$|US|CA)/]
-		  <option value="US"> [L]United States[/L]
-		  <option [selected country CA] value="CA"> [L]Canada[/L]
-		  <option value="JP"> [L]Other[/L]
-		  [else]
-		  [loop option=country search="
-			ra=yes
-			fi=country
-			st=db
-			rf=code,name
-			ml=1000
-			tf=name
-		  "]
-		  <option value="[loop-code]"> [loop-data country name] 
-		  [/loop]
-		  [/else]
-		  [/if]
-		  </select>
-		  <small>([L]will update display[/L])</small>
+		  [display name=country type=country_select value="[value country]"]
 		</td>
 	  </tr>
 	  <tr>