[interchange-cvs] interchange - heins modified 2 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Fri Apr 11 14:53:01 2003
User: heins
Date: 2003-04-11 18:52:29 GMT
Modified: dist/foundation catalog.cfg
Modified: dist/foundation/etc profiles.order
Log:
* All of the order profiles had common information. Made a
Variable called COMMON_ORDER_PROFILE to hold that info
to remove duplication.
Could be set in variable.txt, but I don't think I will.
Revision Changes Path
2.17 +14 -0 interchange/dist/foundation/catalog.cfg
rev 2.17, prev_rev 2.16
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/catalog.cfg,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -r2.16 -r2.17
--- catalog.cfg 10 Apr 2003 18:04:24 -0000 2.16
+++ catalog.cfg 11 Apr 2003 18:52:28 -0000 2.17
@@ -214,6 +214,20 @@
## Set this if you have a different secure server
#AlwaysSecure order ord/checkout ord/basket login change_password process
+ifndef COMMON_ORDER_PROFILE
+Variable COMMON_ORDER_PROFILE <<EOV
+ fname=required
+ lname=required
+ address1=required
+ city=required
+ country=required
+ state=multistate
+ zip=multizip
+ &or phone_day=phone, phone_night=phone Must have day or evening phone number
+ email=required
+EOV
+endif
+
## Payment-related stuff
EncryptKey __PGP_KEY__
2.2 +17 -72 interchange/dist/foundation/etc/profiles.order
rev 2.2, prev_rev 2.1
Index: profiles.order
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/etc/profiles.order,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- profiles.order 14 Aug 2002 14:20:45 -0000 2.1
+++ profiles.order 11 Apr 2003 18:52:28 -0000 2.2
@@ -5,17 +5,8 @@
__END__
__NAME__ shipping_address
-fname=required
-lname=required
-address1=required
-city=required
-country=required
-[if value country =~ /^(US|CA)$/i]
- state=state_province
- zip=postcode
-[/if]
-&or phone_day=phone, phone_night=phone Must have day or evening phone number
-email=required
+
+ __COMMON_ORDER_PROFILE__
&fatal = yes
@@ -25,33 +16,17 @@
__NAME__ account_change
-fname=required
-lname=required
-address1=required
-city=required
-country=required
-[if value country =~ /^(US|CA)$/i]
- state=state_province
- zip=postcode
-[/if]
-&or phone_day=phone, phone_night=phone Must have day or evening phone number
-email=required
+
+ __COMMON_ORDER_PROFILE__
+
&fatal = yes
email=email
__END__
__NAME__ credit_card
-fname=required
-lname=required
-address1=required
-city=required
-country=required
-[if value country =~ /^(US|CA)$/i]
- state=state_province
- zip=postcode
-[/if]
-&or phone_night=phone, phone_day=phone Must have day or evening phone number
+
+__COMMON_ORDER_PROFILE__
&fatal = yes
email=required
@@ -77,16 +52,8 @@
__END__
__NAME__ purchase_order
-fname=required
-lname=required
-address1=required
-city=required
-country=required
-[if value country =~ /^(US|CA)$/i]
- state=state_province
- zip=postcode
-[/if]
-&or phone_night=phone, phone_day=phone Must have day or evening phone number
+
+ __COMMON_ORDER_PROFILE__
&fatal = yes
email=required
@@ -127,16 +94,8 @@
__END__
__NAME__ postal
-fname=required
-lname=required
-address1=required
-city=required
-country=required
-[if value country =~ /^(US|CA)$/i]
- state=state_province
- zip=postcode
-[/if]
-&or phone_night=phone, phone_day=phone Must have day or evening phone number
+
+ __COMMON_ORDER_PROFILE__
&set = prof_mode_accepted [var POSTAL_ACCEPTED]
@@ -153,22 +112,16 @@
__END__
__NAME__ cod
-fname=required
-lname=required
+
+ __COMMON_ORDER_PROFILE__
+
+[cgi set="" name=not_po_box]
[if value address1 =~ /p\.?o\.?\s*box\b/i]
not_po_box=mandatory No PO boxes allowed for COD.
[/if]
[if value address2 =~ /p\.?o\.?\s*box\b/i]
not_po_box=mandatory No PO boxes allowed for COD.
[/if]
-address1=required
-city=required
-country=required
-[if value country =~ /^(US|CA)$/i]
- state=state_province
- zip=postcode
-[/if]
-&or phone_night=phone, phone_day=phone Must have day or evening phone number
&set = prof_mode_accepted [var COD_ACCEPTED]
@@ -187,16 +140,8 @@
__END__
__NAME__ online_check
-fname=required
-lname=required
-address1=required
-city=required
-country=required
-[if value country =~ /^(US|CA)$/i]
- state=state_province
- zip=postcode
-[/if]
-&or phone_night=phone, phone_day=phone Must have day or evening phone number
+
+ __COMMON_ORDER_PROFILE__
&set = prof_mode_accepted [var CHECK_ACCEPTED]