[interchange-cvs] interchange - edl modified 2 files

[interchange-cvs at icdevgroup.org]

User:      edl
Date:      2004-02-13 20:44:59 GMT
Modified:  code/UserTag usps_query.tag
Modified:  dist/foundation/products shipping.asc
Log:
Guess I should have spent a bit more time playing with USPS international.
Fixing nested double-quoted tags in shipping.asc (parser was gagging on this)
and added caveat about country names to POD for usps_query.tag.

Revision  Changes    Path
1.2       +6 -2      interchange/code/UserTag/usps_query.tag


rev 1.2, prev_rev 1.1
Index: usps_query.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/usps_query.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- usps_query.tag	13 Feb 2004 20:01:38 -0000	1.1
+++ usps_query.tag	13 Feb 2004 20:44:59 -0000	1.2
@@ -319,10 +319,14 @@
 Default is $Variable->{USPS_MAILTYPE} or 'package'. See the USPS international 
 service guides for more information on this topic.
 
-=item country
+=item country (required for international services)
 
 Destination country. No default. You must pass the name of the country, not the ISO
-code or abbreviation (i.e. 'Canada', not 'CA').
+code or abbreviation (i.e. 'Canada', not 'CA'). Note that USPS maintains a table of
+valid country names which does not necessarily match all entries in the country
+table which is distributed with the foundation demo, so modifications may be needed
+if you intend to use USPS international services. Consult the USPS International
+Services guide for more information.
 
 =back 4
 



2.5       +4 -4      interchange/dist/foundation/products/shipping.asc


rev 2.5, prev_rev 2.4
Index: shipping.asc
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/products/shipping.asc,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- shipping.asc	13 Feb 2004 20:13:33 -0000	2.4
+++ shipping.asc	13 Feb 2004 20:44:59 -0000	2.5
@@ -86,16 +86,16 @@
 PARCEL	USPS Parcel Post	weight	0	70	f [usps-query service="PARCEL" weight="@@TOTAL@@"]		
 
 GXG	Global Express Gauranteed	weight	0	0	e Nothing to ship!		{ 'ui_ship_type' => "USPSE:GXG", 'ups' => "0", 'at_least' => "10", adder => "5.00" }
-GXG	Global Express Guaranteee	weight	0	70	f [usps-query service="GLOBAL EXPRESS GUARANTEED NON-DOCUMENT SERVICE" weight="@@TOTAL@@" country="[data base=country field=name key=code]"]		
+GXG	Global Express Guaranteee	weight	0	70	f [usps-query service="GLOBAL EXPRESS GUARANTEED NON-DOCUMENT SERVICE" weight="@@TOTAL@@" country="[data table=country field=name key='[value country]']"]		
 
 EMS	Global Express Mail	weight	0	0	e Nothing to ship!		{ 'ui_ship_type' => "USPSE:EMS", 'ups' => "0", 'at_least' => "10", adder => "5.00" }
-EMS	Global Express Mail	weight	0	70	f [usps-query service="GLOBAL EXPRESS MAIL (EMS)" weight="@@TOTAL@@" country="[data table=country col=name key="[value country]"]"]		
+EMS	Global Express Mail	weight	0	70	f [usps-query service="GLOBAL EXPRESS MAIL (EMS)" weight="@@TOTAL@@" country="[data table=country field=name key='[value country]']"]		
 
 APP	Airmail Parcel Post	weight	0	0	e Nothing to ship!		{ 'ui_ship_type' => "USPSE:APP", 'ups' => "0", 'at_least' => "10", adder => "5.00" }
-APP	Airmail Parcel Post	weight	0	70	f [usps-query service="AIRMAIL PARCEL POST" weight="@@TOTAL@@" country="[data table=country col=name key="[value country]"]"]		
+APP	Airmail Parcel Post	weight	0	70	f [usps-query service="AIRMAIL PARCEL POST" weight="@@TOTAL@@" country="[data table=country field=name key='[value country]']"]		
 
 SPP	Surface Parcel Post	weight	0	0	e Nothing to ship!		{ 'ui_ship_type' => "USPSE:SPP", 'ups' => "0", 'at_least' => "10", adder => "5.00" }
-SPP	Surface  Parcel Post	weight	0	70	f [usps-query service="ECONOMY (SURFACE) PARCEL POST" weight="@@TOTAL@@" country="[data table=country col=name key="[value country]"]"]		
+SPP	Surface  Parcel Post	weight	0	70	f [usps-query service="ECONOMY (SURFACE) PARCEL POST" weight="@@TOTAL@@" country="[data table=country field=name key='[value country]']"]		
 
 FLATD	Flat rate	quantity	0	0	e Nothing to ship!
 FLATD	Flat rate	quantity	1	100	f [var SHIP_FLAT_DOM_RATE]