[interchange-cvs] interchange - heins modified 4 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Mon Jan 24 23:13:13 EST 2005
User: heins
Date: 2005-01-25 04:13:13 GMT
Modified: dist/standard/pages/ord billing.html finalize.html
Modified: shipping.html
Modified: dist/standard/products country.txt
Log:
* Add column no_state to country table, allowing presentation of no state
entry field in the shipping page.
* Minor changes to finalize page to make this look better with no state
Revision Changes Path
1.4 +13 -1 interchange/dist/standard/pages/ord/billing.html
rev 1.4, prev_rev 1.3
Index: billing.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/billing.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- billing.html 13 Jul 2004 20:37:58 -0000 1.3
+++ billing.html 25 Jan 2005 04:13:13 -0000 1.4
@@ -181,6 +181,7 @@
<INPUT TYPE=text NAME=b_address2 VALUE="[value b_address2]" size=40 maxlength="64">
</td>
</tr>
+ [if type=!data term="country::no_state::[value country]"]
<tr>
<td align=right>
[error name=b_city std_label="[L]City[/L]" required=1]
@@ -195,6 +196,17 @@
<INPUT TYPE=text NAME=b_state VALUE="[value b_state]" size="5" maxlength="5">
</td>
</tr>
+ [else]
+ <tr>
+ <td align=right>
+ [error name=b_city std_label="[L]City[/L]" required=1]
+ </td>
+ <td colspan=3>
+ <INPUT TYPE=text NAME=b_city VALUE="[value b_city]" size="20">
+ </td>
+ </tr>
+ [/else]
+ [/if]
<tr>
<td align=right>
[error name=b_zip std_label="[L]Zip/Postal Code[/L]" required=1]
@@ -211,7 +223,7 @@
[display
name=b_country
type=select
- default=__SHIP_DEFAULT_COUNTRY__
+ value="[either][value b_country][or]__SHIP_DEFAULT_COUNTRY__[/either]"
lookup_query="select code,name from country where shipmodes != '' order by name"
]
</td>
1.3 +2 -2 interchange/dist/standard/pages/ord/finalize.html
rev 1.3, prev_rev 1.2
Index: finalize.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/finalize.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- finalize.html 13 Jul 2004 20:37:58 -0000 1.2
+++ finalize.html 25 Jan 2005 04:13:13 -0000 1.3
@@ -240,7 +240,7 @@
[value fname] [value lname]<br>
[value address1]<br>
[if value address2][value address2]<br>[/if]
- [value city], [value state] [value zip]<br>
+ [value city][if value state], [value state][/if] [value zip]<br>
[value country]
</blockquote>
</td>
@@ -251,7 +251,7 @@
[value b_fname] [value b_lname]<br>
[value b_address1]<br>
[if value b_address2][value b_address2]<br>[/if]
- [value b_city], [value b_state] [value b_zip]<br>
+ [value b_city][if value b_state], [value b_state][/if] [value b_zip]<br>
[value b_country]
</blockquote>
</td>
1.4 +3 -0 interchange/dist/standard/pages/ord/shipping.html
rev 1.4, prev_rev 1.3
Index: shipping.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/shipping.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shipping.html 13 Jul 2004 20:37:58 -0000 1.3
+++ shipping.html 25 Jan 2005 04:13:13 -0000 1.4
@@ -128,6 +128,7 @@
<INPUT TYPE=text NAME=city VALUE="[value city]" size="20" maxlength="20">
</td>
</tr>
+ [if type=!data term="country::no_state::[value country]"]
<tr>
<td align=right>
[error name=state std_label="[L]State/Province[/L]" required=1]
@@ -155,6 +156,7 @@
[/loop]
</td>
</tr>
+ [/if]
<tr>
<td align="right">
[error name=zip std_label="[L]Zip/Postal Code[/L]" required=1]
@@ -289,5 +291,6 @@
<!-- END CONTENT -->
+<!-- Version: $Id: shipping.html,v 1.4 2005/01/25 04:13:13 mheins Exp $ -->
@_NOLEFT_BOTTOM_@
1.2 +1 -1 interchange/dist/standard/products/country.txt
rev 1.2, prev_rev 1.1
Index: country.txt
===================================================================
RCS file: /var/cvs/interchange/dist/standard/products/country.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- country.txt 25 Apr 2004 17:07:52 -0000 1.1
+++ country.txt 25 Jan 2005 04:13:13 -0000 1.2
@@ -1,4 +1,4 @@
-code sorder region selector shipmodes name iso isonum tax
+code sorder region selector shipmodes name iso isonum tax no_state
AF 9 Other AF surf_pp air_pp Afghanistan AFG 004
AL 9 Other AL surf_pp air_pp Albania ALB 008
DZ 9 Other DZ surf_pp air_pp Algeria DZA 012
More information about the interchange-cvs
mailing list