Index: openacs-4/packages/ecommerce/www/admin/orders/address-add-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/address-add-2.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/orders/address-add-2.adp 16 Aug 2008 21:13:48 -0000 1.1 @@ -0,0 +1,16 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ +

Please confirm new address:

+
+ @pretty_mailing_address_html;noquote@ +
+
+ @export_entire_form_html;noquote@ +
+ +
+
+ Index: openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl 9 Mar 2004 00:59:50 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl 16 Aug 2008 21:13:48 -0000 1.6 @@ -25,24 +25,8 @@ ad_require_permission [ad_conn package_id] admin -doc_body_append " - [ad_admin_header "Confirm Shipping Address"] +set title "Confirm Shipping Address" +set context [list [list index "Orders / Shipments / Refunds"] $title] -

Confirm Shipping Address

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One Order"] "Confirm Shipping Address"] - -
-

Please confirm new address:

-
" - -doc_body_append " - [ec_display_as_html [ec_pretty_mailing_address_from_args $line1 $line2 $city $usps_abbrev $zip_code $country_code $full_state_name $attn $phone $phone_time]] -
-
- [export_entire_form] -
- -
-
- [ad_admin_footer]" +set export_entire_form_html [export_entire_form] +set pretty_mailing_address_html "[ec_display_as_html [ec_pretty_mailing_address_from_args $line1 $line2 $city $usps_abbrev $zip_code $country_code $full_state_name $attn $phone $phone_time]]" Index: openacs-4/packages/ecommerce/www/admin/orders/address-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/address-add.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/orders/address-add.adp 16 Aug 2008 21:13:48 -0000 1.1 @@ -0,0 +1,90 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ +

Please enter a new domestic address or a new international address. +All future shipments for this order will go to this address.

+ +

New domestic address:

+
+
+@export_domestic_form_vars_html;noquote@ + + + + + + + + + + + + + + + + + + + + + + + + + +
Name
Address
2nd line (optional)
City  State @state_widget_html;noquote@
Zip
Phone day     + evening
+
+ +
+
+
+ +

New international address:

+ +
+
+@export_international_form_vars;noquote@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name
Address
2nd line (optional)
City
Province or Region
Postal Code
Country@country_widget_html;noqute@
Phone day     + evening
+
+ +
+
+
Index: openacs-4/packages/ecommerce/www/admin/orders/address-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/address-add.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/admin/orders/address-add.tcl 9 Mar 2004 00:59:50 -0000 1.6 +++ openacs-4/packages/ecommerce/www/admin/orders/address-add.tcl 16 Aug 2008 21:13:48 -0000 1.7 @@ -14,107 +14,16 @@ ad_require_permission [ad_conn package_id] admin -doc_body_append " - [ad_admin_header "New Shipping Address"] +set title "New Shipping Address" +set context [list [list index "Orders / Shipments / Refunds"] $title] -

New Shipping Address

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One Order"] "New Shipping Address"] - -
-

Please enter a new domestic address or a new international address. All future shipments for this order will go to this address.

- -

New domestic address:

" - set user_name [db_string user_name_select " select first_names || ' ' || last_name from cc_users, ec_orders where ec_orders.user_id=cc_users.user_id and order_id=:order_id" -default ""] -doc_body_append " -
-
- [export_form_vars order_id creditcard_id] - - - - - - - - - - - - - - - - - - - - - - - - - -
Name
Address
2nd line (optional)
City  State [state_widget]
Zip
Phone day     - evening
-
- -
-
-
- -

New international address:

- -
-
- [export_form_vars order_id creditcard_id] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name
Address
2nd line (optional)
City
Province or Region
Postal Code
Country[ec_country_widget]
Phone day     - evening
-
- -
-
-
- - [ad_admin_footer]" - - +set export_domestic_form_vars_html [export_form_vars order_id creditcard_id] +set export_international_form_vars_html [export_form_vars order_id creditcard_id] +set state_widget_html [state_widget] +set country_widget_html [ec_country_widget]