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.4 -r1.5 --- openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl 16 Feb 2002 23:32:06 -0000 1.4 +++ openacs-4/packages/ecommerce/tcl/ecommerce-money-computations-procs.tcl 19 Mar 2002 00:34:25 -0000 1.5 @@ -99,7 +99,7 @@ set reg_shipping [expr $weight * $weight_shipping_cost] } else { set reg_shipping 0 - } test [list bart tatyana] + } set total_shipping_cost $reg_shipping # see if we have to add something for express shipping Index: openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.xql 24 Nov 2001 03:50:55 -0000 1.3 +++ openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.xql 19 Mar 2002 00:34:25 -0000 1.4 @@ -77,6 +77,7 @@ from ec_cybercash_log where transaction_id = :transaction_id and avs_code != '' + and txn_attempted_type != 'query' and txn_attempted_time = (select MAX(txn_attempted_time) from ec_cybercash_log log2 where log2.transaction_id = :transaction_id) Index: openacs-4/packages/ecommerce/tcl/ecommerce-styles-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/Attic/ecommerce-styles-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/tcl/ecommerce-styles-procs.tcl 21 Feb 2002 21:07:15 -0000 1.2 +++ openacs-4/packages/ecommerce/tcl/ecommerce-styles-procs.tcl 19 Mar 2002 00:34:25 -0000 1.3 @@ -43,7 +43,6 @@ upvar search_text search_text if { ![info exists category_id] || $category_id == ""} { - ns_log debug "BART category_id does not exist or is empty" set category [ns_set get $tagset "category"] if {$category == ""} { set category_id "" Index: openacs-4/packages/ecommerce/www/shipping-address-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/shipping-address-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/shipping-address-2.tcl 16 Feb 2002 23:32:06 -0000 1.4 +++ openacs-4/packages/ecommerce/www/shipping-address-2.tcl 19 Mar 2002 00:34:25 -0000 1.5 @@ -60,7 +60,7 @@ return } -if { [info exists address_id] } { +if { [info exists address_id] && $address_id != "" } { # This is an existing address that has been edited. db_transaction { db_dml update_address "update ec_addresses Index: openacs-4/packages/ecommerce/www/admin/orders/items-add-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-add-4.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/orders/items-add-4.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/orders/items-add-4.tcl 19 Mar 2002 00:34:25 -0000 1.2 @@ -27,7 +27,7 @@ } # must have associated credit card -if [empty_string_p [db_string creditcard_id_select "select creditcard_id from ec_orders where order_id=:order_id"]] { +if {[empty_string_p [db_string creditcard_id_select "select creditcard_id from ec_orders where order_id=:order_id"]]} { ad_return_error "Unable to add items to this order." " This order does not have an associated credit card, so new items cannot be added.
Please create a new order instead."