Index: openacs-4/packages/ecommerce/www/address.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/address.tcl 5 Aug 2002 12:41:25 -0000 1.2
+++ openacs-4/packages/ecommerce/www/address.tcl 15 Sep 2002 01:50:50 -0000 1.3
@@ -2,6 +2,7 @@
@param address_type
@param usca_p:optional
@param address_id:optional
+ @param referer
@author
@creation-date
@@ -13,6 +14,7 @@
address_type
usca_p:optional
address_id:optional
+ referer
}
ec_redirect_to_https_if_possible_and_necessary
@@ -64,18 +66,17 @@
ec_create_new_session_if_necessary
ec_log_user_as_user_id_for_this_session
-# Get the location from which delete-address was called.
+# Get the location from which address was called.
-set header_set [ns_conn headers]
-set action [ns_set get [ns_conn headers] Referer]
-# This will set "action" to be "foo" out of "http://bar.com/baz/foo"
-set action [string range $action [expr [string last "/" $action] + 1] end]
+# set header_set [ns_conn headers]
+# set referer [ns_set get [ns_conn headers] Referer]
+# # This will set "referer" to be "foo" out of "http://bar.com/baz/foo"
+# set referer [string range $referer [expr [string last "/" $referer] + 1] end]
# Get the form vars that were passed on delete-address so that they
# can be passed back to the calling url. gift-certificate-billing has
# a bunch of form vars that should not be lost.
-set hidden_form_vars "[export_form_vars action]"
set form_set [ns_getform]
for {set i 0} {$i < [ns_set size $form_set]} {incr i} {
set [ns_set key $form_set $i] [ns_set value $form_set $i]
Index: openacs-4/packages/ecommerce/www/billing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/billing.adp 26 May 2002 05:09:57 -0000 1.1
+++ openacs-4/packages/ecommerce/www/billing.adp 15 Sep 2002 01:50:50 -0000 1.2
@@ -105,7 +105,7 @@
or
-
Index: openacs-4/packages/ecommerce/www/billing.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/billing.tcl 26 May 2002 05:09:57 -0000 1.1
+++ openacs-4/packages/ecommerce/www/billing.tcl 15 Sep 2002 01:50:50 -0000 1.2
@@ -106,6 +106,7 @@
# information
set address_type "billing"
+set referer "billing"
# Present all saved addresses
@@ -117,8 +118,8 @@
set row(formatted) [ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $row(address_id)]]
set address_id $row(address_id)
- set row(delete) "[export_form_vars address_id]"
- set row(edit) "[export_form_vars address_id address_type]"
+ set row(delete) "[export_form_vars address_id referer]"
+ set row(edit) "[export_form_vars address_id address_type referer]"
set row(use) "[export_form_vars address_id]"
}
@@ -135,6 +136,6 @@
set row(use) "[export_form_vars address_id]"
}
}
-set hidden_form_vars [export_form_vars address_type]
+set hidden_form_vars [export_form_vars address_type referer]
db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/checkout.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/checkout.tcl 13 Sep 2002 02:03:57 -0000 1.6
+++ openacs-4/packages/ecommerce/www/checkout.tcl 15 Sep 2002 01:50:50 -0000 1.7
@@ -57,6 +57,11 @@
set shipping_required true
+ # Set the referer to the name of this page so that the user
+ # returns to this page when the changes to the address have been
+ # checked.
+
+ set referer checkout
# Present all saved addresses
template::query get_user_addresses addresses multirow "
@@ -68,11 +73,11 @@
set row(formatted) [ec_display_as_html [ec_pretty_mailing_address_from_args $row(line1) $row(line2) $row(city) $row(usps_abbrev) $row(zip_code) $row(country_code) \
$row(full_state_name) $row(attn) $row(phone) $row(phone_time)]]
set address_id $row(address_id)
- set row(delete) "[export_form_vars address_id]"
- set row(edit) "[export_form_vars address_id address_type]"
+ set row(delete) "[export_form_vars address_id referer]"
+ set row(edit) "[export_form_vars address_id address_type referer]"
set row(use) "[export_form_vars address_id]"
}
- set hidden_form_vars [export_form_vars address_type]
+ set hidden_form_vars [export_form_vars address_type referer]
} else {
set shipping_required false
Index: openacs-4/packages/ecommerce/www/checkout.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/checkout.xql 26 May 2002 04:36:50 -0000 1.2
+++ openacs-4/packages/ecommerce/www/checkout.xql 15 Sep 2002 01:50:50 -0000 1.3
@@ -2,6 +2,17 @@
+
+
+ select p.no_shipping_avail_p
+ from ec_items i, ec_products p
+ where i.product_id = p.product_id
+ and p.no_shipping_avail_p = 'f'
+ and i.order_id = :order_id
+ group by no_shipping_avail_p
+
+
+
select order_id
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/delete-address.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/ecommerce/www/delete-address.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/delete-address.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/delete-address.tcl 5 Aug 2002 12:41:25 -0000 1.2
+++ openacs-4/packages/ecommerce/www/delete-address.tcl 15 Sep 2002 01:50:50 -0000 1.3
@@ -4,11 +4,13 @@
it will no longer be available.
@param address_id
+ @param referer
@author Bart Teeuwisse
@creation-date April 2002
} {
address_id
+ referer
}
# Can't remove the address from the database as old orders might refer
@@ -28,23 +30,9 @@
set deleted_address [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]]
+db_release_unused_handles
-# Get the location from which delete-address was called.
+# Return to the calling page (E.g. checkout, billing,
+# giftcertificate-billing).
-set header_set [ns_conn headers]
-set action [ns_set get [ns_conn headers] Referer]
-# This will set "action" to be "foo" out of "http://bar.com/baz/foo"
-set action [string range $action [expr [string last "/" $action] + 1] end]
-
-# Get the form vars that were passed on delete-address so that they
-# can be passed back to the calling url. gift-certificate-billing has
-# a bunch of form vars that should not be lost.
-
-set hidden_form_vars ""
-set form_set [ns_getform]
-for {set i 0} {$i < [ns_set size $form_set]} {incr i} {
- set [ns_set key $form_set $i] [ns_set value $form_set $i]
- append hidden_form_vars "[export_form_vars [ns_set key $form_set $i]]"
-}
-
-db_release_unused_handles
+rp_internal_redirect $referer
Index: openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl 26 May 2002 05:09:57 -0000 1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl 15 Sep 2002 01:50:50 -0000 1.2
@@ -91,6 +91,7 @@
# Present all saved addresses
set address_type "billing"
+set referer "gift-certificate-billing"
template::query get_user_addresses addresses multirow "
select address_id, attn, line1, line2, city, usps_abbrev, zip_code, phone, country_code, full_state_name, phone_time, address_type
@@ -101,9 +102,9 @@
set row(formatted) [ec_display_as_html [ec_pretty_mailing_address_from_args $row(line1) $row(line2) $row(city) $row(usps_abbrev) $row(zip_code) $row(country_code) \
$row(full_state_name) $row(attn) $row(phone) $row(phone_time)]]
set address_id $row(address_id)
- set row(delete) "[export_form_vars address_id certificate_to certificate_from certificate_message amount recipient_email]"
- set row(edit) "[export_form_vars address_id address_type certificate_to certificate_from certificate_message amount recipient_email]"
+ set row(delete) "[export_form_vars address_id certificate_to certificate_from certificate_message amount recipient_email referer]"
+ set row(edit) "[export_form_vars address_id address_type certificate_to certificate_from certificate_message amount recipient_email referer]"
set row(use) "[export_form_vars address_id certificate_to certificate_from certificate_message amount recipient_email]"
}
-set hidden_form_vars [export_form_vars address_type certificate_to certificate_from certificate_message amount recipient_email]
+set hidden_form_vars [export_form_vars address_type certificate_to certificate_from certificate_message amount recipient_email referer]
Index: openacs-4/packages/ecommerce/www/payment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/payment.adp 26 May 2002 05:09:57 -0000 1.1
+++ openacs-4/packages/ecommerce/www/payment.adp 15 Sep 2002 01:50:50 -0000 1.2
@@ -25,7 +25,7 @@
- Click here to claim a
+ Click here to claim a
new gift certificate
Index: openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 27 May 2002 03:15:12 -0000 1.5
+++ openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 15 Sep 2002 01:50:50 -0000 1.6
@@ -84,7 +84,7 @@
# Then they probably got here by pushing "Back", so just redirect
# them to index.tcl
- ad_returnredirect index.tcl
+ ad_returnredirect index
return
}
@@ -96,7 +96,7 @@
select count(*)
from ec_items
where order_id = :order_id"] == 0 } {
- ad_returnredirect shopping-cart.tcl
+ ad_returnredirect shopping-cart
db_release_unused_handles
return
}
@@ -111,7 +111,7 @@
where order_id = :order_id"]
if { $order_owner != $user_id } {
- ad_returnredirect checkout.tcl
+ ad_returnredirect checkout
return
}
@@ -136,7 +136,7 @@
and i.order_id = :order_id
group by no_shipping_avail_p"]} {
- ad_returnredirect checkout.tcl
+ ad_returnredirect checkout
return
}
}
@@ -284,4 +284,4 @@
where order_id=:order_id"
db_release_unused_handles
-ad_returnredirect billing.tcl
+ad_returnredirect billing
Index: openacs-4/packages/ecommerce/www/review-submit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/review-submit-2.adp 26 May 2002 05:09:57 -0000 1.1
+++ openacs-4/packages/ecommerce/www/review-submit-2.adp 15 Sep 2002 01:50:50 -0000 1.2
@@ -4,7 +4,7 @@
Check your review of @product_name@
-
-
\ No newline at end of file
+
Index: openacs-4/packages/ecommerce/www/review-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/review-submit.adp 26 May 2002 05:09:57 -0000 1.1
+++ openacs-4/packages/ecommerce/www/review-submit.adp 15 Sep 2002 01:50:50 -0000 1.2
@@ -3,7 +3,7 @@
Write your own review of @product_name@
-
-Continue Shopping
\ No newline at end of file
+Continue Shopping
Index: openacs-4/packages/ecommerce/www/shopping-cart-save.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/shopping-cart-save.adp 26 May 2002 05:09:57 -0000 1.1
+++ openacs-4/packages/ecommerce/www/shopping-cart-save.adp 15 Sep 2002 01:50:50 -0000 1.2
@@ -6,9 +6,9 @@
We think that you are @user_name@. If not, please log in . Otherwise,
-
+
-
\ No newline at end of file
+
Index: openacs-4/packages/ecommerce/www/update-user-classes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/update-user-classes.adp 26 May 2002 05:09:57 -0000 1.1
+++ openacs-4/packages/ecommerce/www/update-user-classes.adp 15 Sep 2002 01:50:50 -0000 1.2
@@ -3,7 +3,7 @@
Your Account
-
+
Submit a request to be in the following user classes:
@@ -17,4 +17,4 @@
-
\ No newline at end of file
+
Index: openacs-4/packages/ecommerce/www/doc/audit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/audit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/audit.adp 26 May 2002 04:36:50 -0000 1.2
+++ openacs-4/packages/ecommerce/www/doc/audit.adp 15 Sep 2002 01:50:49 -0000 1.3
@@ -1,5 +1,3 @@
-
-
Audit Trail Package
@signatory@
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp 26 May 2002 04:36:50 -0000 1.2
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp 15 Sep 2002 01:50:49 -0000 1.3
@@ -1,5 +1,3 @@
-
-
@title@
@signatory@
Index: openacs-4/packages/ecommerce/www/doc/porting-diary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/porting-diary.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/porting-diary.adp 26 May 2002 04:36:50 -0000 1.2
+++ openacs-4/packages/ecommerce/www/doc/porting-diary.adp 15 Sep 2002 01:50:49 -0000 1.3
@@ -1,5 +1,3 @@
-
-
@title@
@signatory@
Index: openacs-4/packages/ecommerce/www/register/email-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/email-confirm.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/register/email-confirm.adp 20 Apr 2001 20:51:14 -0000 1.1
+++ openacs-4/packages/ecommerce/www/register/email-confirm.adp 15 Sep 2002 01:50:46 -0000 1.2
@@ -17,7 +17,7 @@
Note: If you've forgotten your password, ask this server to email it
+ href="email-password?user_id=@user_id@">ask this server to email it
to @email@ .
Index: openacs-4/packages/ecommerce/www/register/email-password-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/email-password-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/register/email-password-2.adp 20 Apr 2001 20:51:14 -0000 1.1
+++ openacs-4/packages/ecommerce/www/register/email-password-2.adp 15 Sep 2002 01:50:46 -0000 1.2
@@ -18,7 +18,7 @@
-
+
Index: openacs-4/packages/ecommerce/www/register/restore-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/restore-user.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/register/restore-user.adp 20 Apr 2001 20:51:14 -0000 1.1
+++ openacs-4/packages/ecommerce/www/register/restore-user.adp 15 Sep 2002 01:50:46 -0000 1.2
@@ -21,7 +21,7 @@
Note: If you've forgotten your password, ask this server to email it
+href="email-password?user_id=@user_id@">ask this server to email it
to @email@ .