Index: openacs-4/packages/ecommerce/tcl/ec-style-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/Attic/ec-style-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/tcl/ec-style-procs.tcl 31 Jan 2002 06:41:59 -0000 1.3 +++ openacs-4/packages/ecommerce/tcl/ec-style-procs.tcl 31 Jan 2002 22:43:54 -0000 1.4 @@ -29,7 +29,7 @@ } ad_proc ec_style_template_root_internal {} { returns template root } { - set templateroot [util_memoize {ad_parameter -package_id [ec_id] TemplateRoot "style"} [ec_cache_refresh]] + set templateroot [ad_parameter -package_id [ec_id] TemplateRoot "style"] if {[empty_string_p $templateroot]} { return [ec_url_concat [ec_pageroot] templates] } @@ -104,17 +104,17 @@ # set defaults set user_preferred_language "" set user_preferred_plain_fancy "" - set site_default_language [util_memoize {ad_parameter -package_id [ec_id] LanguageSiteDefault style} [ec_cache_refresh]] - set site_default_plain_fancy [util_memoize {ad_parameter -package_id [ec_id] PlainFancySiteDefault style} [ec_cache_refresh]] + set site_default_language [ad_parameter -package_id [ec_id] LanguageSiteDefault style] + set site_default_plain_fancy [ad_parameter -package_id [ec_id] PlainFancySiteDefault style] # let's figure out first whether or not this is a logged-in person set user_id [ad_get_user_id] if { $user_id == 0 } { # not logged in, maybe cookied though - if [util_memoize {ad_parameter -package_id [ec_id] LanguageCookieP style} [ec_cache_refresh]] { + if [ad_parameter -package_id [ec_id] LanguageCookieP style] { # let's at least look for a cookie set user_preferred_language [ec_style_language_from_cookie] } - if [util_memoize {ad_parameter -package_id [ec_id] PlainFancyCookieP style} [ec_cache_refresh]] { + if [ad_parameter -package_id [ec_id] PlainFancyCookieP style] { set user_preferred_plain_fancy [ec_style_plain_fancy_from_cookie] } } else { Index: openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs.tcl 18 Jul 2001 18:19:01 -0000 1.2 +++ openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -63,7 +63,7 @@ return "authorized_plus_avs" } - set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] + set currency [ad_parameter -package_id [ec_id] Currency ecommerce] # The above decode, "youth", gives a 1 is the order is younger than 95% of # a day old and a 0 otherwise. It is used to determine whether the @@ -230,7 +230,7 @@ ns_log Notice "Eve debug 3" set cc_args [ns_set new] - set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] + set currency [ad_parameter -package_id [ec_id] Currency ecommerce] ns_set put $cc_args "amount" "$currency $transaction_amount" ns_set put $cc_args "order-id" "$transaction_id" @@ -307,7 +307,7 @@ set cc_args [ns_set new] - ns_set put $cc_args "amount" "[util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] $transaction_amount" + ns_set put $cc_args "amount" "[ad_parameter -package_id [ec_id] Currency ecommerce] $transaction_amount" ns_set put $cc_args "order-id" "$transaction_id" ns_set put $cc_args "card-number" "$creditcard_number" ns_set put $cc_args "card-exp" "$creditcard_expire" @@ -387,7 +387,7 @@ # variables are slightly renamed to stick with legal tcl variable # names and our own naming conventions. - set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] + set currency [ad_parameter -package_id [ec_id] Currency ecommerce] if { [ns_set get $cc_args "amount"] != "" } { # This is to take care of cases where the tax table has output an @@ -543,7 +543,7 @@ ns_set put $ttcc_output "batch_id" [ec_get_from_quasi_form $relevant_cc_data batch-id] set long_amount [ec_get_from_quasi_form $relevant_cc_data amount] regsub -all {[^0-9\.]} $long_amount "" numeric_amount - # regexp {^[util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] (.*)} $long_amount garbage numeric_amount + # regexp {^[ad_parameter -package_id [ec_id] Currency ecommerce] (.*)} $long_amount garbage numeric_amount if { [info exists numeric_amount] } { ns_set put $ttcc_output "amount" $numeric_amount } else { Index: openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl 22 Jul 2001 06:13:37 -0000 1.3 +++ openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl 31 Jan 2002 22:43:54 -0000 1.4 @@ -11,22 +11,22 @@ } ad_proc ec_customer_service_email_address { {user_identification_id ""} {issue_id ""}} { returns the customer server email address } { - return [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]] + return [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce] } ad_proc ec_customer_service_signature {-html:boolean} { if $html_p { - return "Customer Service
-[util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]
+ return "[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]
+[ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]
[ec_insecure_location][ec_url] " } else { - return "Customer Service -[util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]] + return "[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce] +[ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce] [ec_insecure_location][ec_url] " + } } -} ad_proc ec_customer_service_simple_issue { customer_service_rep interaction_originator interaction_type interaction_headers order_id issue_type_list action_details {user_id ""} {user_identification_id ""} {begin_new_transaction_p "f"} {gift_certificate_id ""} } { Creates an issue, interaction, and action and closes the issue. Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl 29 Jan 2002 00:11:46 -0000 1.3 +++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl 31 Jan 2002 22:43:54 -0000 1.4 @@ -23,7 +23,7 @@ ns_set merge $extra_headers $additional_headers } - set from "\"[util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce} [ec_cache_refresh]]\" <$reply_to>" + set from "\"[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]\" <$reply_to>" qmail $email_to $from $email_subject $email_body $extra_headers } @@ -78,7 +78,7 @@ db_transaction { # create a customer service issue/interaction/action - set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]\nSubject: $email_subject" $order_id $issue_type_list $email_body $user_id] + set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $email_subject" $order_id $issue_type_list $email_body $user_id] set user_identification_id [lindex $user_identification_and_issue_id 0] set issue_id [lindex $user_identification_and_issue_id 1] @@ -161,7 +161,7 @@ db_transaction { # create a customer service issue/interaction/action - set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]\nSubject: $email_subject" $order_id $issue_type_list $email_body $user_id] + set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $email_subject" $order_id $issue_type_list $email_body $user_id] set user_identification_id [lindex $user_identification_and_issue_id 0] set issue_id [lindex $user_identification_and_issue_id 1] @@ -245,7 +245,7 @@ db_transaction { # create a customer service issue/interaction/action - set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]\nSubject: $email_subject" $order_id $issue_type_list $email_body $user_id] + set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $email_subject" $order_id $issue_type_list $email_body $user_id] set user_identification_id [lindex $user_identification_and_issue_id 0] set issue_id [lindex $user_identification_and_issue_id 1] @@ -303,7 +303,7 @@ db_transaction { # create a customer service issue/interaction/action - set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]\nSubject: $email_subject" "" $issue_type_list $email_body $user_id "" "f" $gift_certificate_id] + set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $email_subject" "" $issue_type_list $email_body $user_id "" "f" $gift_certificate_id] set user_identification_id [lindex $user_identification_and_issue_id 0] set issue_id [lindex $user_identification_and_issue_id 1] @@ -375,7 +375,7 @@ db_transaction { # create a customer service issue/interaction/action - set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]\nSubject: $email_subject" "" $issue_type_list $email_body $user_id "" "f" $gift_certificate_id] + set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $email_subject" "" $issue_type_list $email_body $user_id "" "f" $gift_certificate_id] set user_identification_id [lindex $user_identification_and_issue_id 0] set issue_id [lindex $user_identification_and_issue_id 1] @@ -454,7 +454,7 @@ # create a customer service issue/interaction/action if { ![empty_string_p $user_id] } { - set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]\nSubject: $email_subject" "" $issue_type_list $email_body $user_id "" "f" $gift_certificate_id] + set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $email_subject" "" $issue_type_list $email_body $user_id "" "f" $gift_certificate_id] set user_identification_id [lindex $user_identification_and_issue_id 0] } else { # check if the recipient is an unregistered user of the system @@ -473,7 +473,7 @@ } - set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]\nSubject: $email_subject" "" $issue_type_list $email_body "" $user_identification_id "f" $gift_certificate_id] + set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $email_subject" "" $issue_type_list $email_body "" $user_identification_id "f" $gift_certificate_id] } set issue_id [lindex $user_identification_and_issue_id 1] Index: openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl 18 Jul 2001 18:19:01 -0000 1.2 +++ openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -27,7 +27,7 @@ set lowest_price_name "Our Price" } - if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { set additional_user_class_restriction "and m.user_class_approved_p = 't'" } else { set additional_user_class_restriction "and (m.user_class_approved_p is null or m.user_class_approved_p='t')" @@ -44,7 +44,7 @@ set lowest_price $price # only include the user_class_name in the name of the price if # the user is allowed to see what user classes they're in - if { [util_memoize {ad_parameter -package_id [ec_id] UserClassUserViewP ecommerce} [ec_cache_refresh]] == 1 } { + if { [ad_parameter -package_id [ec_id] UserClassUserViewP ecommerce] == 1 } { set lowest_price_name "$user_class_name Price" } else { set lowest_price_name "Special Price" @@ -147,7 +147,7 @@ set lowest_price $price # only include the user_class_name in the name of the price if # the user is allowed to see what user classes they're in - if { [util_memoize {ad_parameter -package_id [ec_id] UserClassUserViewP ecommerce} [ec_cache_refresh]] == 1 } { + if { [ad_parameter -package_id [ec_id] UserClassUserViewP ecommerce] == 1 } { set lowest_price_name "$user_class_name Price" } else { set lowest_price_name "Special Price" Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 31 Jan 2002 06:41:59 -0000 1.8 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 31 Jan 2002 22:43:54 -0000 1.9 @@ -29,7 +29,7 @@ } ad_proc -private ec_system_name_mem {} {} { - return [util_memoize {ad_parameter -package_id [ec_id] SystemName "" Store} [ec_cache_refresh]] + return [ad_parameter -package_id [ec_id] SystemName "" Store] } ad_proc ec_header_image {} { @@ -43,7 +43,7 @@ } ad_proc -private ec_header_image_mem {} {} { - return [util_memoize {ad_parameter -package_id [ec_id] HeaderAttributes "" "size=+2 face='arial' color=990000"} [ec_cache_refresh]] + return [ad_parameter -package_id [ec_id] HeaderAttributes "" "size=+2 face='arial' color=990000"] } ad_proc ec_system_owner {} { @@ -53,7 +53,7 @@ } ad_proc -private ec_system_owner_mem {} {} { - set so [util_memoize {ad_parameter -package_id [ec_id] SystemOwner "" ""} [ec_cache_refresh]] + set so [ad_parameter -package_id [ec_id] SystemOwner "" ""] if {[string equal "" $so]} { return [ad_system_owner] } else { @@ -202,7 +202,7 @@ ad_proc -private ec_product_directory_mem {} { } { - return [util_memoize {ad_parameter -package_id [ec_id] ProductDataDirectory "" product/} [ec_cache_refresh]] + return [ad_parameter -package_id [ec_id] ProductDataDirectory "" product/] } # current_location can be "Shopping Cart", "Your Account", "Home", or @@ -222,7 +222,7 @@ if { [string compare $current_location "Your Account"] == 0 } { append to_return "Your Account" } else { - append to_return "Your Account" + append to_return "Your Account" } append to_return " | " if { [string compare $current_location Home] == 0 } { @@ -247,7 +247,7 @@ # For administrators ad_proc ec_shipping_cost_summary { base_shipping_cost default_shipping_per_item weight_shipping_cost add_exp_base_shipping_cost add_exp_amount_per_item add_exp_amount_by_weight } { returns cost summary } { - set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] + set currency [ad_parameter -package_id [ec_id] Currency ecommerce] if { ([empty_string_p $base_shipping_cost] || $base_shipping_cost == 0) && ([empty_string_p $default_shipping_per_item] || $default_shipping_per_item == 0) && ([empty_string_p $weight_shipping_cost] || $weight_shipping_cost == 0) && ([empty_string_p $add_exp_base_shipping_cost] || $add_exp_base_shipping_cost == 0) && ([empty_string_p $add_exp_amount_per_item] || $add_exp_amount_per_item == 0) && ([empty_string_p $add_exp_amount_by_weight] || $add_exp_amount_by_weight == 0) } { return "The customers are not charged for shipping beyond what is specified for each product individually." @@ -264,7 +264,7 @@ } elseif { [empty_string_p $weight_shipping_cost] || $weight_shipping_cost == 0 } { append shipping_summary "the per-item cost is [ec_pretty_price $default_shipping_per_item $currency], unless the \"Shipping Price\" has been set for that product (or \"Shipping Price - Additional\", if more than one of the same product is ordered). " } else { - append shipping_summary "the per-item-cost is equal to [ec_pretty_price $weight_shipping_cost $currency] times its weight in [util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]], unless the \"Shipping Price\" has been set for that product (or \"Shipping Price - Additional\", if more than one of the same product is ordered). " + append shipping_summary "the per-item-cost is equal to [ec_pretty_price $weight_shipping_cost $currency] times its weight in [ad_parameter -package_id [ec_id] WeightUnits ecommerce], unless the \"Shipping Price\" has been set for that product (or \"Shipping Price - Additional\", if more than one of the same product is ordered). " } if { ([empty_string_p $add_exp_base_shipping_cost] || $add_exp_base_shipping_cost == 0) && ([empty_string_p $add_exp_amount_per_item] || $add_exp_amount_per_item == 0) && ([empty_string_p $add_exp_amount_by_weight] || $add_exp_amount_by_weight == 0) } { @@ -277,7 +277,7 @@ append express_part_of_shipping_summary "An additional amount of [ec_pretty_price $add_exp_amount_per_item $currency] is added for each item, on top of the amount charged for Regular Shipping. " } if { ![empty_string_p $add_exp_amount_by_weight] && $add_exp_amount_by_weight != 0 } { - append express_part_of_shipping_summary "An additional amount of [ec_pretty_price $add_exp_amount_by_weight $currency] times the weight in [util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]] of each item is added, on top of the amount charged for Regular Shipping. " + append express_part_of_shipping_summary "An additional amount of [ec_pretty_price $add_exp_amount_by_weight $currency] times the weight in [ad_parameter -package_id [ec_id] WeightUnits ecommerce] of each item is added, on top of the amount charged for Regular Shipping. " } } @@ -574,14 +574,14 @@ # this won't show anything if ProductCommentsAllowP=0 ad_proc ec_customer_comments { product_id {comments_sort_by ""} {prev_page_url ""} {prev_args_list ""} } { returns customer comments } { - if { [util_memoize {ad_parameter -package_id [ec_id] ProductCommentsAllowP ecommerce} [ec_cache_refresh]] == 0 } { + if { [ad_parameter -package_id [ec_id] ProductCommentsAllowP ecommerce] == 0 } { return "" } set end_of_comment_query "" set sort_blurb "" - if { [util_memoize {ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP ecommerce} [ec_cache_refresh]] == 1 } { + if { [ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP ecommerce] == 1 } { append end_of_comment_query "and c.approved_p = 't'" } else { append end_of_comment_query "and (c.approved_p = 't' or c.approved_p is null)\n" @@ -627,7 +627,7 @@ select avg(rating) from ec_product_comments where product_id = :product_id and approved_p = 't' }]]
Number of reviews: [db_string n_reviews_select " - select count(*) from ec_product_comments where product_id = :product_id and (approved_p='t' [ec_decode [util_memoize {ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP ecommerce} [ec_cache_refresh]] "0" "or approved_p is null" ""]) + select count(*) from ec_product_comments where product_id = :product_id and (approved_p='t' [ec_decode [ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP ecommerce] "0" "or approved_p is null" ""]) "] ($sort_blurb)

@@ -715,7 +715,7 @@ from ec_products where product_id = :product_id "] - if { [util_memoize {ad_parameter -package_id [ec_id] AllowPreOrdersP ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] AllowPreOrdersP ecommerce] } { set r "

[export_form_vars product_id] @@ -880,7 +880,7 @@ set options "$options; " } - append items_ul "
  • Quantity $quantity: $product_name; $options$price_name: [ec_pretty_price $price_charged [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]]\n" + append items_ul "
  • Quantity $quantity: $product_name; $options$price_name: [ec_pretty_price $price_charged [ad_parameter -package_id [ec_id] Currency ecommerce]]\n" if { $show_item_detail_p == "t" } { append items_ul "
    [ec_shipment_summary_sub $product_id $color_choice $size_choice $style_choice $price_charged $price_name $order_id] @@ -1076,7 +1076,7 @@ if {![string equal "" $lowest_price_description]} { append lowest_price_description : } - set currency [util_memoize {ad_parameter -package_id [ec_id] Currency} [ec_cache_refresh]] + set currency [ad_parameter -package_id [ec_id] Currency] return "$lowest_price_description [ec_pretty_price [lindex $lowest_price_and_price_name 0] $currency]" } @@ -1181,7 +1181,7 @@ set gift_certificate [lindex $price_shipping_gift_certificate_and_tax 2] set tax [lindex $price_shipping_gift_certificate_and_tax 3] - set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] + set currency [ad_parameter -package_id [ec_id] Currency ecommerce] set price_summary_line_1_list [list "Item(s) Subtotal:" [ec_pretty_price $price $currency]] set price_summary_line_2_list [list "Shipping & Handling:" [ec_pretty_price $shipping $currency]] set price_summary_line_3_list [list "" "-------"] @@ -1343,7 +1343,7 @@ set to_append "$user_class_name" } - if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { append to_append " ([ec_decode $user_class_approved_p "t" "approved" "unapproved"])" } lappend to_return $to_append @@ -1357,7 +1357,7 @@ } ad_proc ec_use_cybercash_p {} {Should we use cybercash? Use ad_parameter UseCyberCashP and default value 1 to find out.} { - return [util_memoize {ad_parameter -package_id [ec_id] UseCyberCashP ecommerce 1} [ec_cache_refresh]] + return [ad_parameter -package_id [ec_id] UseCyberCashP ecommerce 1] } ### concatenate two pieces of a url. Gets number of /s right. Index: openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl 31 Jan 2002 06:41:59 -0000 1.6 +++ openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl 31 Jan 2002 22:43:54 -0000 1.7 @@ -421,15 +421,15 @@ ad_proc ec_expire_old_carts {} { expires old carts } { db_transaction { - db_dml expired_carts_update "update ec_orders set order_state='expired', expired_date=sysdate where order_state='in_basket' and sysdate-in_basket_date > [util_memoize {ad_parameter -package_id [ec_id] CartDuration ecommerce} [ec_cache_refresh]]" + db_dml expired_carts_update "update ec_orders set order_state='expired', expired_date=sysdate where order_state='in_basket' and sysdate-in_basket_date > [ad_parameter -package_id [ec_id] CartDuration ecommerce]" db_dml item_state_update "update ec_items set item_state='expired', expired_date=sysdate where item_state='in_basket' and order_id in (select order_id from ec_orders where order_state='expired')" } } ad_proc ec_remove_creditcard_data {} { remove credit card data } { # if SaveCreditCardDataP=0 we should remove the creditcard_number for the cards whose numbers are # no longer needed (i.e. all their orders are fulfilled, returned, void, or expired) - if { [util_memoize {ad_parameter -package_id [ec_id] SaveCreditCardDataP ecommerce} [ec_cache_refresh]] == 0 } { + if { [ad_parameter -package_id [ec_id] SaveCreditCardDataP ecommerce] == 0 } { db_dml creditcard_update { update ec_creditcards set creditcard_number=null @@ -732,7 +732,7 @@ ## Schedule these procedures set ec_procs_scheduled_p 0 -set ep [util_memoize {ad_parameter -package_id [ec_id] EnabledP ecommerce 0} [ec_cache_refresh]] +set ep [ad_parameter -package_id [ec_id] EnabledP ecommerce 0] if { !$ec_procs_scheduled_p && $ep} { set ec_procs_scheduled_p 1 Index: openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl 23 Oct 2001 05:07:14 -0000 1.3 +++ openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl 31 Jan 2002 22:43:54 -0000 1.4 @@ -43,7 +43,7 @@ set nsunix [ns_config ns/server/[ns_info server]/modules nsunix] if {![empty_string_p $nssock] && ![empty_string_p $nsunix]} { - set driver [util_memoize {ad_parameter -package_id [ec_id] httpModule ecommerce nsunix} [ec_cache_refresh]] + set driver [ad_parameter -package_id [ec_id] httpModule ecommerce nsunix] } elseif {[empty_string_p $nssock]} { set driver nsunix } else { @@ -60,7 +60,7 @@ set nsopenssl [ns_config ns/server/[ns_info server]/modules nsopenssl] if {![empty_string_p $nsssl] && ![empty_string_p $nsopenssl]} { - set sdriver [util_memoize {ad_parameter -package_id [ec_id] httpsModule ecommerce nsopenssl} [ec_cache_refresh]] + set sdriver [ad_parameter -package_id [ec_id] httpsModule ecommerce nsopenssl] } elseif {[empty_string_p $nsssl]} { set sdriver nsopenssl } else { @@ -73,10 +73,10 @@ ad_proc ec_secure_location {} { @return the secure location https://host:port, favoring the https module specified as an ecommerce parameter. } { - # set loc [util_memoize {ad_parameter -package_id [ec_id] SecureLocation} [ec_cache_refresh]] + # set loc [ad_parameter -package_id [ec_id] SecureLocation] set loc [ad_parameter -package_id [ec_id] SecureLocation] if {[empty_string_p $loc] || [string equal -nocase $loc "No Value"]} { - # set sdriver [util_memoize {ad_parameter -package_id [ec_id] httpsModule} [ec_cache_refresh]] + # set sdriver [ad_parameter -package_id [ec_id] httpsModule] set sdriver [ad_parameter -package_id [ec_id] httpsModule] if {[empty_string_p $sdriver]} { array set drivers [ec_preferred_drivers] @@ -108,9 +108,9 @@ ad_proc ec_insecure_location {} { @return the insecure location, favoring the InsecureLocation ecommerce parameter. } { - set loc [util_memoize {ad_parameter -package_id [ec_id] InsecureLocation} [ec_cache_refresh]] + set loc [ad_parameter -package_id [ec_id] InsecureLocation] if {[empty_string_p $loc] || [string equal -nocase $loc "No Value"]} { - # set sdriver [util_memoize {ad_parameter -package_id [ec_id] httpsModule} [ec_cache_refresh]] + # set sdriver [ad_parameter -package_id [ec_id] httpsModule] set driver [ad_parameter -package_id [ec_id] httpModule] if {[empty_string_p $driver] || [string equal -nocase $loc "No Value"]} { array set drivers [ec_preferred_drivers] Index: openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl 31 Jan 2002 06:41:59 -0000 1.2 +++ openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -20,7 +20,7 @@ if { $purpose != "site_admin" } { return [list] } - if ![util_memoize {ad_parameter -package_id [ec_id] EnabledP ecommerce 0} [ec_cache_refresh]] { + if ![ad_parameter -package_id [ec_id] EnabledP ecommerce 0] { return [list] } set moby_string "" Index: openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl 29 Jan 2002 00:11:46 -0000 1.6 +++ openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl 31 Jan 2002 22:43:54 -0000 1.7 @@ -37,7 +37,7 @@ returns a nicely formatted price } { if { [empty_string_p $currency] } { - set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] + set currency [ad_parameter -package_id [ec_id] Currency ecommerce] } if { [empty_string_p $the_price] } { if { $zero_if_null_p == "t" } { Index: openacs-4/packages/ecommerce/www/account.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/account.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/account.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -73,13 +73,13 @@ # if any user classes exist set user_classes "" -if { [util_memoize {ad_parameter -package_id [ec_id] UserClassUserViewP ecommerce} [ec_cache_refresh]] == 1 && ![empty_string_p [db_string get_user_view_classes "select 1 from dual where exists (select 1 from ec_user_classes)" -default ""]]} { +if { [ad_parameter -package_id [ec_id] UserClassUserViewP ecommerce] == 1 && ![empty_string_p [db_string get_user_view_classes "select 1 from dual where exists (select 1 from ec_user_classes)" -default ""]]} { set user_classes_to_display [ec_user_class_display $user_id] append user_classes "

  • User Classes: $user_classes_to_display" - if { [util_memoize {ad_parameter -package_id [ec_id] UserClassAllowSelfPlacement ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] UserClassAllowSelfPlacement ecommerce] } { append user_classes " ([ec_decode $user_classes_to_display "" "sign up for one" "update"])" } Index: openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -18,7 +18,7 @@ category_id:notnull,naturalnum subcategory_id:optional,naturalnum subsubcategory_id:optional,naturalnum - {how_many:naturalnum {[util_memoize {ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce} [ec_cache_refresh]]}} + {how_many:naturalnum {[ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce]}} {start:naturalnum "0"} usca_p:optional } @@ -89,7 +89,7 @@ set header_to_print "We Recommend

    " set header_printed 0 -if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { +if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { set user_class_approved_p_clause "and user_class_approved_p = 't'" } else { set user_class_approved_p_clause "" Index: openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -18,7 +18,7 @@ category_id:naturalnum,notnull subcategory_id:optional,naturalnum subsubcategory_id:optional,naturalnum - {how_many:naturalnum {[util_memoize {ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce} [ec_cache_refresh]]}} + {how_many:naturalnum {[ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce]}} {start:naturalnum "0"} usca_p:optional } @@ -88,7 +88,7 @@ set header_to_print "We Recommend

    " set header_printed 0 -if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { +if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { set user_class_approved_p_clause "and user_class_approved_p = 't'" } else { set user_class_approved_p_clause "" Index: openacs-4/packages/ecommerce/www/category-browse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/category-browse.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/category-browse.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -18,7 +18,7 @@ category_id:notnull,naturalnum subcategory_id:optional,naturalnum subsubcategory_id:optional,naturalnum - {how_many:naturalnum {[util_memoize {ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce} [ec_cache_refresh]]}} + {how_many:naturalnum {[ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce]}} {start:naturalnum "0"} usca_p:optional } @@ -87,7 +87,7 @@ set header_to_print "We Recommend

    " set header_printed 0 -if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { +if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { set user_class_approved_p_clause "and user_class_approved_p = 't'" } else { set user_class_approved_p_clause "" Index: openacs-4/packages/ecommerce/www/checkout-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/checkout-2.tcl 23 Nov 2001 23:06:16 -0000 1.3 +++ openacs-4/packages/ecommerce/www/checkout-2.tcl 31 Jan 2002 22:43:54 -0000 1.4 @@ -176,7 +176,7 @@ set shipping_options "" set checkout_step verify -if { [util_memoize {ad_parameter -package_id [ec_id] ExpressShippingP ecommerce} [ec_cache_refresh]] } { +if { [ad_parameter -package_id [ec_id] ExpressShippingP ecommerce] } { if { $shipping_avail_p } { set checkout_step shipping append shipping_options "

    @@ -200,7 +200,7 @@ } set tax_exempt_options "" -if { [util_memoize {ad_parameter -package_id [ec_id] OfferTaxExemptStatusP ecommerce 0} [ec_cache_refresh]] } { +if { [ad_parameter -package_id [ec_id] OfferTaxExemptStatusP ecommerce 0] } { append tax_exempt_options "

  • Is your organization tax exempt? (If so, we will ask you to provide us with an exemption certificate.) Index: openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 29 Jan 2002 00:11:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -90,12 +90,12 @@ # incr exception_count # append exception_text "
  • The amount, $amount needs to be a number with no special characters." # } elseif -if { $amount < [util_memoize {ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce} [ec_cache_refresh]] } { +if { $amount < [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce] } { incr exception_count - append exception_text "
  • The amount, $amount needs to be at least [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce} [ec_cache_refresh]]]" -} elseif { $amount > [util_memoize {ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce} [ec_cache_refresh]] } { + append exception_text "
  • The amount, $amount needs to be at least [ec_pretty_price [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce]]" +} elseif { $amount > [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce] } { incr exception_count - append exception_text "
  • The amount, $amount cannot be higher than [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce} [ec_cache_refresh]]]" + append exception_text "
  • The amount, $amount cannot be higher than [ec_pretty_price [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce]]" } # if {![philg_email_valid_p $recipient_email]} { @@ -201,7 +201,7 @@ set peeraddr [ns_conn peeraddr] - set gc_months [util_memoize {ad_parameter -package_id [ec_id] GiftCertificateMonths ecommerce} [ec_cache_refresh]] + set gc_months [ad_parameter -package_id [ec_id] GiftCertificateMonths ecommerce] db_dml insert_new_gc_into_db "insert into ec_gift_certificates (gift_certificate_id, gift_certificate_state, amount, issue_date, purchased_by, expires, claim_check, certificate_message, certificate_to, certificate_from, recipient_email, last_modified, last_modifying_user, modified_ip_address) values @@ -221,7 +221,7 @@ # try to authorize the transaction set cc_args [ns_set new] - ns_set put $cc_args "amount" "[util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] $amount" + ns_set put $cc_args "amount" "[ad_parameter -package_id [ec_id] Currency ecommerce] $amount" ns_set put $cc_args "card-number" "$creditcard_number" ns_set put $cc_args "card-exp" "$creditcard_expire_1/$creditcard_expire_2" ns_set put $cc_args "card-zip" "$billing_zip_code" Index: openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -32,9 +32,9 @@ # wtem@olywa.net, 2001-03-29 # user login rolled into ec_redirect_to_https_if_possible_and_necessary -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] -set minimum_amount [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce} [ec_cache_refresh]]] -set maximum_amount [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce} [ec_cache_refresh]]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] +set minimum_amount [ec_pretty_price [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce]] +set maximum_amount [ec_pretty_price [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce]] ec_return_template Index: openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -48,12 +48,12 @@ append exception_text "
  • The recipient email address you entered is too long. It needs to contain fewer than 100 characters (the current length is [string length $recipient_email] characters)." } -if { $amount < [util_memoize {ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce} [ec_cache_refresh]] } { +if { $amount < [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce] } { incr exception_count - append exception_text "
  • The amount needs to be at least [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce} [ec_cache_refresh]]]" -} elseif { $amount > [util_memoize {ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce} [ec_cache_refresh]] } { + append exception_text "
  • The amount needs to be at least [ec_pretty_price [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce]]" +} elseif { $amount > [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce] } { incr exception_count - append exception_text "
  • The amount cannot be higher than [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce} [ec_cache_refresh]]]" + append exception_text "
  • The amount cannot be higher than [ec_pretty_price [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce]]" } # if { [empty_string_p $recipient_email] } { Index: openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl 29 Jan 2002 00:11:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -54,12 +54,12 @@ append exception_text "
  • The recipient email address you entered is too long. It needs to contain fewer than 100 characters (the current length is [string length $recipient_email] characters)." } -if { $amount < [util_memoize {ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce} [ec_cache_refresh]] } { +if { $amount < [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce] } { incr exception_count - append exception_text "
  • The amount needs to be at least [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce} [ec_cache_refresh]]]" -} elseif { $amount > [util_memoize {ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce} [ec_cache_refresh]] } { + append exception_text "
  • The amount needs to be at least [ec_pretty_price [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce]]" +} elseif { $amount > [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce] } { incr exception_count - append exception_text "
  • The amount cannot be higher than [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce} [ec_cache_refresh]]]" + append exception_text "
  • The amount cannot be higher than [ec_pretty_price [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce]]" } # if { [empty_string_p $recipient_email] } { Index: openacs-4/packages/ecommerce/www/gift-certificate-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/gift-certificate-order.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/gift-certificate-order.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -9,12 +9,10 @@ } - - set system_name [ad_system_name] -set expiration_time [ec_decode [util_memoize {ad_parameter -package_id [ec_id] GiftCertificateMonths ecommerce} [ec_cache_refresh]] "12" "1 year" "24" "2 years" "[util_memoize {ad_parameter -package_id [ec_id] GiftCertificateMonths ecommerce} [ec_cache_refresh]] months"] -set minimum_amount [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce} [ec_cache_refresh]]] -set maximum_amount [ec_pretty_price [util_memoize {ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce} [ec_cache_refresh]]] +set expiration_time [ec_decode [ad_parameter -package_id [ec_id] GiftCertificateMonths ecommerce] "12" "1 year" "24" "2 years" "[ad_parameter -package_id [ec_id] GiftCertificateMonths ecommerce] months"] +set minimum_amount [ec_pretty_price [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce]] +set maximum_amount [ec_pretty_price [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce]] # wtem@olywa.net, 2001-03-29 # changed to relative link from ec_securelink Index: openacs-4/packages/ecommerce/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/index.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/index.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -9,7 +9,7 @@ @author ported by Jerry Asher (jerry@theashergroup.com) } { usca_p:optional - {how_many:naturalnum {[util_memoize {ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce} [ec_cache_refresh]]}} + {how_many:naturalnum {[ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce]}} {start "0"} } @@ -54,7 +54,7 @@ set header_to_print "We Recommend

    " set header_printed 0 -if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { +if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { set user_class_approved_p_clause "and user_class_approved_p = 't'" } else { set user_class_approved_p_clause "" @@ -90,7 +90,7 @@ append recommendations_if_there_are_any "
    " -if { [util_memoize {ad_parameter -package_id [ec_id] SellGiftCertificatesP ecommerce} [ec_cache_refresh]] == 1 } { +if { [ad_parameter -package_id [ec_id] SellGiftCertificatesP ecommerce] == 1 } { set gift_certificates_are_allowed 1 } else { set gift_certificates_are_allowed 0 Index: openacs-4/packages/ecommerce/www/payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/payment.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/payment.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -131,7 +131,7 @@ set customer_can_use_old_credit_cards 1 # see if the administrator lets customers reuse their credit cards - if { [util_memoize {ad_parameter -package_id [ec_id] SaveCreditCardDataP ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] SaveCreditCardDataP ecommerce] } { # then see if we have any credit cards on file for this user # for this shipping address only (for security purposes) set to_print_before_creditcards " 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.1 -r1.2 --- openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -120,7 +120,7 @@ # 2. put the prices into ec_items # set some things to use as arguments when setting prices -if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { +if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { set additional_user_class_restriction "and user_class_approved_p = 't'" } else { set additional_user_class_restriction "and (user_class_approved_p is null or user_class_approved_p='t')" Index: openacs-4/packages/ecommerce/www/product.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/product.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/product.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -82,8 +82,8 @@ set offer_code "" } -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] -set allow_pre_orders_p [util_memoize {ad_parameter -package_id [ec_id] AllowPreOrdersP ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] +set allow_pre_orders_p [ad_parameter -package_id [ec_id] AllowPreOrdersP ecommerce] # get all the information from both the products table # and any custom product fields added by this publisher Index: openacs-4/packages/ecommerce/www/review-submit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-3.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/review-submit-3.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/review-submit-3.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -73,7 +73,7 @@ " } -set comments_need_approval [util_memoize {ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP} [ec_cache_refresh]] +set comments_need_approval [ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP] set system_owner_email [ec_system_owner] set product_link "product?[export_url_vars product_id]" db_release_unused_handles Index: openacs-4/packages/ecommerce/www/update-user-classes.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/update-user-classes.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/update-user-classes.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -29,7 +29,7 @@ ec_log_user_as_user_id_for_this_session # two variables for the ADP page -set user_classes_need_approval [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] +set user_classes_need_approval [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] set user_class_select_list [ec_user_class_select_widget [db_list get_user_class_list_for_uid "select user_class_id from ec_user_class_user_map Index: openacs-4/packages/ecommerce/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/index.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/index.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -57,7 +57,7 @@

    " -if { [util_memoize {ad_parameter -package_id [ec_id] ProductCommentsAllowP ecommerce} [ec_cache_refresh]] } { +if { [ad_parameter -package_id [ec_id] ProductCommentsAllowP ecommerce] } { doc_body_append "

  • Customer Reviews ([db_string non_approved_comments_select "select count(*) from ec_product_comments where approved_p is null"] not yet approved)

    " @@ -71,7 +71,7 @@

    " -set multiple_retailers_p [util_memoize {ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce} [ec_cache_refresh]] +set multiple_retailers_p [ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce] if { $multiple_retailers_p } { doc_body_append "

  • Retailers\n" Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/customer-reviews/index.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/customer-reviews/index.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -19,7 +19,7 @@
    " -if {[util_memoize {ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP ecommerce} [ec_cache_refresh]]} { +if {[ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP ecommerce]} { append doc_body "Comments must be approved before they will appear on the web site." } else { append doc_body "Your ecommerce system is set up so that comments automatically appear on the web site, unless you specifically Disapprove them. Even though it's not necessary, you may also wish to specifically Approve comments so that you can distinguish them from comments that you have not yet looked at." Index: openacs-4/packages/ecommerce/www/admin/customer-service/customer-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/customer-search.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/customer-search.tcl 26 Aug 2001 23:46:28 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/customer-search.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -47,7 +47,7 @@ [ad_admin_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "Customer Search"]
    -Customers who spent more than [ec_pretty_price $amount [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]] in the last $days days: +Customers who spent more than [ec_pretty_price $amount [ad_parameter -package_id [ec_id] Currency ecommerce]] in the last $days days:
      " Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl 29 Jan 2002 00:11:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -44,7 +44,7 @@ # 2. create action # 3. send email -set email_from [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]] +set email_from [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce] set action_details "From: $email_from To: $email_to_use @@ -84,9 +84,9 @@ set extra_headers [ns_set new] if { [info exists cc_to] && $cc_to != "" } { ns_set put $extra_headers "Cc" "$cc_to" - ec_sendmail_from_service $email_to_use [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]] $subject $message $extra_headers $bcc_to + ec_sendmail_from_service $email_to_use [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce] $subject $message $extra_headers $bcc_to } else { - ec_sendmail_from_service $email_to_use [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]] $subject $message "" $bcc_to + ec_sendmail_from_service $email_to_use [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce] $subject $message "" $bcc_to } db_release_unused_handles Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/customer-service/email-send.tcl 29 Jan 2002 00:11:46 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send.tcl 31 Jan 2002 22:43:54 -0000 1.4 @@ -75,7 +75,7 @@
    • - + Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-add.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-add.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-add.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -38,7 +38,7 @@ set expiration_to_print [db_string get_exipre_from_Db "select [ec_decode $expires "" "null" $expires] from dual"] set expiration_to_print [ec_decode $expiration_to_print "" "never" [util_AnsiDatetoPrettyDate $expiration_to_print]] -append doc_body "Please confirm that you wish to add [ec_pretty_price $amount [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]] to +append doc_body "Please confirm that you wish to add [ec_pretty_price $amount [ad_parameter -package_id [ec_id] Currency ecommerce]] to [db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"]'s gift certificate account (expires $expiration_to_print).

    Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -37,7 +37,7 @@

    From[util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]][ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]
    To
    - + Index: openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -116,7 +116,7 @@
  • Customers who have spent over -([util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]) +([ad_parameter -package_id [ec_id] Currency ecommerce]) in the last days Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl 29 Jan 2002 00:11:46 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl 31 Jan 2002 22:43:54 -0000 1.4 @@ -120,13 +120,13 @@
    • Amount ([util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]) ([ad_parameter -package_id [ec_id] Currency ecommerce])
    - + - +
    From[util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]][ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]
    Subject Line
    Message
    Gift Certificate*Amount ([util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]])     Expires [ec_gift_certificate_expires_widget "in 1 year"]Amount ([ad_parameter -package_id [ec_id] Currency ecommerce])     Expires [ec_gift_certificate_expires_widget "in 1 year"]
    Issue Type**[ec_issue_type_widget "spam"]
    Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl 29 Jan 2002 00:11:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -190,7 +190,7 @@ db_foreach get_users_for_spam $sql { # create a customer service issue/interaction/action - set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [util_memoize {ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce} [ec_cache_refresh]]\nSubject: $subject" "" $issue_type_list $message $user_id "" "f"] + set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $subject" "" $issue_type_list $message $user_id "" "f"] set user_identification_id [lindex $user_identification_and_issue_id 0] set issue_id [lindex $user_identification_and_issue_id 1] Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 29 Jan 2002 00:11:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -190,7 +190,7 @@ (ec_problem_id_sequence.nextval, sysdate, :problem_details, :order_id) " - if { [util_memoize {ad_parameter -package_id [ec_id] DisplayTransactionMessagesDuringFulfillmentP ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] DisplayTransactionMessagesDuringFulfillmentP ecommerce] } { ad_return_warning "Credit Card Failure" "Warning: the credit card authorization for this shipment (shipment_id $shipment_id) of order_id $order_id failed. You may wish to abort the shipment (if possible) until this is issue is resolved. A note has been made in the problems log.

    Continue with order fulfillment." return } Index: openacs-4/packages/ecommerce/www/admin/orders/items-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-add-3.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/orders/items-add-3.tcl 29 Jan 2002 00:11:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/orders/items-add-3.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -39,7 +39,7 @@

    - ([util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]) + ([ad_parameter -package_id [ec_id] Currency ecommerce])
    Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl 24 Nov 2001 03:29:24 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -73,7 +73,7 @@
    " -set shipping_refund_percent [util_memoize {ad_parameter -package_id [ec_id] ShippingRefundPercent ecommerce} [ec_cache_refresh]] +set shipping_refund_percent [ad_parameter -package_id [ec_id] ShippingRefundPercent ecommerce] if { ![info exists all_items_p] } { set item_id_list $item_id Index: openacs-4/packages/ecommerce/www/admin/products/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/add-2.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/add-2.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -182,8 +182,8 @@ # thumbnails are all jpg files # set thumbnail dimensions - if [catch {set thumbnail_width [util_memoize {ad_parameter -package_id [ec_id] ThumbnailWidth ecommerce} [ec_cache_refresh]]} ] { - if [catch {set thumbnail_height [util_memoize {ad_parameter -package_id [ec_id] ThumbnailHeight ecommerce} [ec_cache_refresh]]} ] { + if [catch {set thumbnail_width [ad_parameter -package_id [ec_id] ThumbnailWidth ecommerce]} ] { + if [catch {set thumbnail_height [ad_parameter -package_id [ec_id] ThumbnailHeight ecommerce]} ] { set convert_dimensions "100x10000" } else { set convert_dimensions "10000x$thumbnail_height" Index: openacs-4/packages/ecommerce/www/admin/products/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add-3.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/add-3.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/add-3.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -61,8 +61,8 @@

    Please confirm that the information below is correct:

    " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] -set multiple_retailers_p [util_memoize {ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] +set multiple_retailers_p [ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce] doc_body_append "
    @@ -230,7 +230,7 @@ Weight -[ec_message_if_null $weight] [ec_decode $weight "" "" [util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]]] +[ec_message_if_null $weight] [ec_decode $weight "" "" [ad_parameter -package_id [ec_id] WeightUnits ecommerce]] " Index: openacs-4/packages/ecommerce/www/admin/products/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/add.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/add.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -25,7 +25,7 @@ All fields are optional except Product Name.

    " -set multiple_retailers_p [util_memoize {ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce} [ec_cache_refresh]] +set multiple_retailers_p [ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce] @@ -106,7 +106,7 @@ doc_body_append " Regular Price - All prices are in [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]. The price should + All prices are in [ad_parameter -package_id [ec_id] Currency ecommerce]. The price should be written as a decimal number (no special characters like \$). " @@ -152,7 +152,7 @@ doc_body_append "[ec_hidden_input shipping ""]\n[ec_hidden_input shipping_additional ""]\n" } doc_body_append " -Weight ([util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]]) +Weight ([ad_parameter -package_id [ec_id] WeightUnits ecommerce]) Index: openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -170,8 +170,8 @@ # thumbnails are all jpg files # set thumbnail dimensions - if [catch {set thumbnail_width [util_memoize {ad_parameter -package_id [ec_id] ThumbnailWidth ecommerce} [ec_cache_refresh]]} ] { - if [catch {set thumbnail_height [util_memoize {ad_parameter -package_id [ec_id] ThumbnailHeight ecommerce} [ec_cache_refresh]]} ] { + if [catch {set thumbnail_width [ad_parameter -package_id [ec_id] ThumbnailWidth ecommerce]} ] { + if [catch {set thumbnail_height [ad_parameter -package_id [ec_id] ThumbnailHeight ecommerce]} ] { set convert_dimensions "100x10000" } else { set convert_dimensions "10000x$thumbnail_height" @@ -209,8 +209,8 @@

    Please confirm that the information below is correct:

    " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] -set multiple_retailers_p [util_memoize {ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] +set multiple_retailers_p [ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce] doc_body_append "
    @@ -378,7 +378,7 @@ Weight -[ec_message_if_null $weight] [ec_decode $weight "" "" [util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]]] +[ec_message_if_null $weight] [ec_decode $weight "" "" [ad_parameter -package_id [ec_id] WeightUnits ecommerce]] " Index: openacs-4/packages/ecommerce/www/admin/products/edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/products/edit.tcl 8 Jan 2002 23:12:32 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/products/edit.tcl 31 Jan 2002 22:43:54 -0000 1.4 @@ -30,7 +30,7 @@ All fields are optional except Product Name.

    " -set multiple_retailers_p [util_memoize {ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce} [ec_cache_refresh]] +set multiple_retailers_p [ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce] db_1row product_select " select product_id, sku, product_name, @@ -146,7 +146,7 @@ doc_body_append " Regular Price - All prices are in [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]. The price should + All prices are in [ad_parameter -package_id [ec_id] Currency ecommerce]. The price should be written as a decimal number (no special characters like \$). " @@ -216,7 +216,7 @@ doc_body_append "[export_form_vars shipping shipping_additional]\n" } doc_body_append " -Weight ([util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]]) +Weight ([ad_parameter -package_id [ec_id] WeightUnits ecommerce]) Index: openacs-4/packages/ecommerce/www/admin/products/offer-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-add.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/offer-add.tcl 29 Jan 2002 00:11:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/offer-add.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -120,7 +120,7 @@

    " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] doc_body_append " Index: openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -121,7 +121,7 @@
    " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] doc_body_append "
    Index: openacs-4/packages/ecommerce/www/admin/products/offer-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-edit.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/offer-edit.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/offer-edit.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -58,7 +58,7 @@ where offer_id=:offer_id " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] doc_body_append " Index: openacs-4/packages/ecommerce/www/admin/products/offers.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offers.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/offers.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/offers.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -83,7 +83,7 @@

    Current Offers

      " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] db_foreach offers_select " select o.offer_id, o.retailer_id, r.retailer_name, price, shipping, @@ -176,7 +176,7 @@
        " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] db_foreach non_current_offers_select " select o.offer_id, o.retailer_id, retailer_name, price, shipping, Index: openacs-4/packages/ecommerce/www/admin/products/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/one.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/one.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/one.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -28,8 +28,8 @@ set subsubcategory_list [db_list subsubcategories_select "select subsubcategory_id from ec_subsubcategory_product_map where product_id=:product_id"] -set multiple_retailers_p [util_memoize {ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce} [ec_cache_refresh]] -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set multiple_retailers_p [ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] set n_professional_reviews [db_string n_professional_reviews_select "select count(*) from ec_product_reviews where product_id = :product_id"] @@ -292,7 +292,7 @@ Weight:
    " Index: openacs-4/packages/ecommerce/www/admin/products/sale-price-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-price-add.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/sale-price-add.tcl 29 Jan 2002 00:11:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/sale-price-add.tcl 31 Jan 2002 22:43:54 -0000 1.3 @@ -89,7 +89,7 @@
    " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] set sale_price_id [db_nextval ec_sale_price_id_sequence] Index: openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-2.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-2.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -70,7 +70,7 @@
    " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] Index: openacs-4/packages/ecommerce/www/admin/products/sale-price-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-price-edit.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/sale-price-edit.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/sale-price-edit.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -33,7 +33,7 @@ doc_body_append "
    -[ec_message_if_null $weight] [ec_decode $weight "" "" [util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]]] +[ec_message_if_null $weight] [ec_decode $weight "" "" [ad_parameter -package_id [ec_id] WeightUnits ecommerce]]
    - + Index: openacs-4/packages/ecommerce/www/admin/products/sale-prices.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-prices.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/sale-prices.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/sale-prices.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -56,7 +56,7 @@

    Current Sale Prices

      " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] set sale_price_counter 0 @@ -126,7 +126,7 @@
        " -set currency [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +set currency [ad_parameter -package_id [ec_id] Currency ecommerce] set sale_price_counter 0 Index: openacs-4/packages/ecommerce/www/admin/shipping-costs/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/shipping-costs/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/shipping-costs/index.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/shipping-costs/index.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -42,7 +42,7 @@

        -All prices are in [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]. The price should +All prices are in [ad_parameter -package_id [ec_id] Currency ecommerce]. The price should be written as a decimal number (no special characters like \$). If a section is not applicable, just leave it blank. @@ -93,9 +93,9 @@
      • Weight Charge: -[util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +[ad_parameter -package_id [ec_id] Currency ecommerce] / -[util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]] +[ad_parameter -package_id [ec_id] WeightUnits ecommerce]
      @@ -123,9 +123,9 @@ Additional Amount by Weight: -[util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]] +[ad_parameter -package_id [ec_id] Currency ecommerce] / -[util_memoize {ad_parameter -package_id [ec_id] WeightUnits ecommerce} [ec_cache_refresh]] +[ad_parameter -package_id [ec_id] WeightUnits ecommerce]
    Index: openacs-4/packages/ecommerce/www/admin/user-classes/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/user-classes/index.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/user-classes/index.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -35,7 +35,7 @@ append page_html "
  • $user_class_name ($n_users user[ec_decode $n_users "1" "" "s"]" - if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { set n_approved_users [db_string get_n_approved_users " select count(*) as approved_n_users from ec_user_class_user_map Index: openacs-4/packages/ecommerce/www/admin/user-classes/members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/members.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/user-classes/members.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/user-classes/members.tcl 31 Jan 2002 22:43:54 -0000 1.2 @@ -33,13 +33,13 @@ append page_html "
  • $first_names $last_name ($email) " - if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { append page_html "[ec_decode $user_class_approved_p "t" "" "un"]approved " } append page_html "(remove" - if { [util_memoize {ad_parameter -package_id [ec_id] UserClassApproveP ecommerce} [ec_cache_refresh]] } { + if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { if { $user_class_approved_p == "t" } { append page_html " | unapprove" } else {
    • Sale Price (in [util_memoize {ad_parameter -package_id [ec_id] Currency ecommerce} [ec_cache_refresh]]) (in [ad_parameter -package_id [ec_id] Currency ecommerce])
    Name