Index: openacs-4/packages/ecommerce/www/shopping-cart.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/ecommerce/www/shopping-cart.tcl 25 Sep 2010 19:50:12 -0000 1.20 +++ openacs-4/packages/ecommerce/www/shopping-cart.tcl 13 Oct 2010 09:59:24 -0000 1.21 @@ -11,8 +11,7 @@ usca_p:optional product_id:optional } - - set logout_url "/register/logout?return_url=[ns_urlencode "[ec_url]"]" +set logout_url "/register/logout?return_url=[ns_urlencode "[ec_url]"]" # bottom links: # 1) continue shopping (always) @@ -56,6 +55,12 @@ # where o.order_id=i.order_id # and o.user_session_id=:user_session_id and o.order_state='in_basket'"] +set order_id [db_string get_order_id " + select order_id + from ec_orders + where user_session_id = :user_session_id + and order_state = 'in_basket'" -default ""] + # calculate shipping charge options when not using shipping-gateway, # and then include the value with each option (for an informed choice) @@ -78,9 +83,16 @@ set max_add_quantity_length [string length [parameter::get -parameter CartMaxToAdd]] set offer_express_shipping_p [parameter::get -parameter ExpressShippingP] set offer_pickup_option_p [parameter::get -parameter PickupP] +set paypal_business [parameter::get -parameter PayPalBusiness] +set paypal_standard_mode [parameter::get -parameter PayPalStandardMode] +set store_name [parameter::get -parameter SystemName] set total_reg_shipping_price 0 set total_exp_shipping_price 0 +set total_weight 0 set no_shipping_options "t" +set paypal_shipping_mode 1 +# papal_shipping_mode should mirror no_shipping_options + # Check if a shipping gateway has been selected. set shipping_gateway [parameter::get -parameter ShippingGateway] set shipping_gateway_in_use [acs_sc_binding_exists_p ShippingGateway $shipping_gateway] @@ -141,7 +153,7 @@ # basically collect shipping information for any items where ec_products.no_shipping_avail_p = 't' db_multirow -extend { line_subtotal } in_cart get_products_in_cart " - select p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additonal, p.weight, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price + select p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additonal, p.weight, p.product_id, p.sku, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price from ec_orders o join ec_items i on (o.order_id=i.order_id) join ec_products p on (i.product_id=p.product_id) @@ -153,12 +165,23 @@ group by p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additional, p.weight, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice" { set line_subtotal "$quantity" } +# not used? +set paypal_checkout_button "