Index: openacs-4/packages/ecommerce/www/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index-oracle.xql,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/packages/ecommerce/www/index-oracle.xql 19 Sep 2002 23:40:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/index-oracle.xql 23 Dec 2004 06:39:05 -0000 1.4.8.1 @@ -6,15 +6,6 @@ 8.1.6 - - - select 1 - from dual - where exists (select 1 - from ec_categories) - - - select p.product_id, p.product_name, p.dirname, r.recommendation_text, o.offer_code Index: openacs-4/packages/ecommerce/www/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index-postgresql.xql,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/packages/ecommerce/www/index-postgresql.xql 19 Sep 2002 23:40:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/index-postgresql.xql 23 Dec 2004 06:39:05 -0000 1.4.8.1 @@ -6,13 +6,6 @@ 7.1 - - - select 1 where exists (select 1 - from ec_categories) - - - select p.product_id, p.product_name, p.dirname, r.recommendation_text, o.offer_code Index: openacs-4/packages/ecommerce/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.adp,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/index.adp 11 Mar 2004 04:11:52 -0000 1.6 +++ openacs-4/packages/ecommerce/www/index.adp 23 Dec 2004 06:39:05 -0000 1.6.2.1 @@ -1,5 +1,5 @@ - Welcome + @package_instance_name@ @context_bar;noquote@ t Index: openacs-4/packages/ecommerce/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/index.tcl 8 Mar 2004 19:46:11 -0000 1.6 +++ openacs-4/packages/ecommerce/www/index.tcl 23 Dec 2004 06:39:05 -0000 1.6.2.1 @@ -48,12 +48,9 @@ set ec_user_string "" set register_url "/register?return_url=[ns_urlencode [ec_url]]" -# we'll show a search widget at the top if there are categories to search in -if { ![empty_string_p [db_string get_check_of_categories "select 1 from dual where exists (select 1 from ec_categories)" -default ""]] } { - set search_widget [ec_search_widget] -} else { - set search_widget "" -} +# the base url allows us to switch connections to http from https if currently an https connection +# for saving computing SSL resources only when necessary +set baseurl "[ec_insecurelink [ad_conn url]]" set recommendations_if_there_are_any "" @@ -80,7 +77,7 @@
- @@ -111,7 +108,7 @@ append products " - + @@ -135,17 +132,17 @@ } if { $start >= $how_many } { - set prev_link "Previous $how_many" + set prev_link "Previous $how_many" } else { set prev_link "" } if { $have_how_many_more_p == "t" } { - set next_link "Next $how_many" + set next_link "Next $how_many" } else { set number_of_remaining_products [expr $count - $start - $how_many] if { $number_of_remaining_products > 0 } { - set next_link "Next $number_of_remaining_products" + set next_link "Next $number_of_remaining_products" } else { set next_link "" } @@ -156,7 +153,7 @@ } else { set separator "|" } - +set package_instance_name [apm_instance_name_from_id [apm_package_id_from_key ecommerce]] set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar ""] db_release_unused_handles ad_return_template Index: openacs-4/packages/ecommerce/www/payment.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.adp,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/ecommerce/www/payment.adp 1 Nov 2004 20:06:28 -0000 1.5.2.1 +++ openacs-4/packages/ecommerce/www/payment.adp 23 Dec 2004 06:39:05 -0000 1.5.2.2 @@ -1,12 +1,10 @@ - Completing Your Order + Completing Your Order: Payment information @context_bar;noquote@ @ec_system_owner;noquote@ -

Payment Info

-

Your order will not be complete until you have confirmed the Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/toolbar-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/toolbar-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/ecommerce/www/toolbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/toolbar.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/toolbar.tcl 8 Mar 2004 19:46:11 -0000 1.3 +++ openacs-4/packages/ecommerce/www/toolbar.tcl 23 Dec 2004 06:39:05 -0000 1.3.2.1 @@ -25,10 +25,16 @@ set ecommerce_base_url [ec_url] -# Create a context aware search widget to search for products. +# we'll show a search widget at the top if there are categories to search in +if { ![empty_string_p [db_string get_check_of_categories "select 1 from dual where exists (select 1 from ec_categories)" -default ""]] } { + # Create a context aware search widget to search for products. + set ec_search_widget [ec_search_widget "$category_id|$subcategory_id" $search_text] +} else { + set ec_search_widget "" +} -set ec_search_widget [ec_search_widget "$category_id|$subcategory_id" $search_text] + # Determine the URLs to the Shopping Cart and store Account. # set ec_cart_link (ec_insecurelink (ad_parameter -package_id (ec_id) EcommercePath)shopping-cart)

[ec_linked_thumbnail_if_it_exists $dirname "f" "t"]$product_name +$product_name

$recommendation_text

 [ec_price_line $product_id $user_id $offer_code]
[expr $count + 1]$product_name$product_name