Please confirm new address:
+" + +doc_body_append " + [ec_display_as_html [ec_pretty_mailing_address_from_args $line1 $line2 $city $usps_abbrev $zip_code $country_code $full_state_name $attn $phone $phone_time]] ++ + [ad_admin_footer]" Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add-3.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add-3.tcl 3 Aug 2005 22:45:46 -0000 1.1 @@ -0,0 +1,76 @@ +ad_page_contract { + + Insert the address. + + @author Eve Andersson (eveander@arsdigita.com) + @creation-date Summer 1999 + @author ported by Jerry Asher (jerry@theashergroup.com) + @author revised by Bart Teeuwisse (bart.teeuwisse@thecodemill.biz) + @revision-date April 2002 + +} { + order_id:integer,notnull + {creditcard_id:integer ""} + attn + line1 + line2 + city + {usps_abbrev ""} + {full_state_name ""} + zip_code + {country_code "US"} + phone + phone_time +} + +ad_require_permission [ad_conn package_id] admin + +if {[empty_string_p $creditcard_id]} { + + # Insert the address into ec_addresses, update the address in + # ec_orders + + db_transaction { + set address_id [db_nextval ec_address_id_sequence] + set user_id [db_string user_id_select " + select user_id + from ec_orders + where order_id = :order_id"] + + db_dml address_insert " + insert into ec_addresses + (address_id, user_id, address_type, attn, line1, line2, city, usps_abbrev, full_state_name, zip_code, country_code, phone, phone_time) + values + (:address_id, :user_id, 'shipping', :attn, :line1, :line2, :city, :usps_abbrev, :full_state_name, :zip_code, :country_code, :phone, :phone_time)" + + db_dml ec_orders_update " + update ec_orders + set shipping_address = :address_id + where order_id = :order_id" + } +} else { + + # Insert the address into ec_addresses, update the address in + # ec_creditcards + + db_transaction { + set address_id [db_nextval ec_address_id_sequence] + set user_id [db_string user_id_select " + select user_id + from ec_orders + where order_id = :order_id"] + + db_dml address_insert " + insert into ec_addresses + (address_id, user_id, address_type, attn, line1, line2, city, usps_abbrev, full_state_name, zip_code, country_code, phone, phone_time) + values + (:address_id, :user_id, 'shipping', :attn, :line1, :line2, :city, :usps_abbrev, :full_state_name, :zip_code, :country_code, :phone, :phone_time)" + + db_dml ec_creditcards_update " + update ec_creditcards + set billing_address = :address_id + where creditcard_id = :creditcard_id" + } +} + +ad_returnredirect "one?[export_url_vars order_id]" Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add-3.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add-3.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add-3.xql 3 Aug 2005 22:45:46 -0000 1.1 @@ -0,0 +1,37 @@ + +
Please enter a new domestic address or a new international address. All future shipments for this order will go to this address.
+ +New domestic address:
" + +set user_name [db_string user_name_select " + select first_names || ' ' || last_name + from cc_users, ec_orders + where ec_orders.user_id=cc_users.user_id + and order_id=:order_id" -default ""] + +doc_body_append " ++ ++ +
New international address:
+ ++ ++ + [ad_admin_footer]" + + Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/address-add.xql 3 Aug 2005 22:45:46 -0000 1.1 @@ -0,0 +1,11 @@ + +
Please confirm that this is correct:
+ +++ + + [ad_admin_footer]" Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/creditcard-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/creditcard-add-3.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/creditcard-add-3.tcl 3 Aug 2005 22:45:46 -0000 1.1 @@ -0,0 +1,38 @@ +ad_page_contract { + + @author Eve Andersson (eveander@arsdigita.com) + @creation-date Summer 1999 + @author ported by Jerry Asher (jerry@theashergroup.com) + @author revised by Bart Teeuwisse (bart.teeuwisse@thecodemill.biz) + @revision-date April 2002 + +} { + address_id + order_id:notnull + creditcard_number:notnull + creditcard_type:notnull + creditcard_expire_1 + creditcard_expire_2 +} + +ad_require_permission [ad_conn package_id] admin + +db_transaction { + set user_id [db_string user_id_select " + select user_id + from ec_orders + where order_id = :order_id"] + set creditcard_id [db_nextval ec_creditcard_id_sequence] + set creditcard_last_four [string range $creditcard_number [expr [string length $creditcard_number] -4] [expr [string length $creditcard_number] -1]] + set creditcard_expire "$creditcard_expire_1/$creditcard_expire_2" + db_dml creditcard_insert_select " + insert into ec_creditcards + (creditcard_id, user_id, creditcard_number, creditcard_last_four, creditcard_type, creditcard_expire, billing_address) + values + (:creditcard_id, :user_id, :creditcard_number, :creditcard_last_four, :creditcard_type, :creditcard_expire, :address_id)" + db_dml ec_orders_update " + update ec_orders + set creditcard_id = :creditcard_id + where order_id = :order_id" +} +ad_returnredirect "one?[export_url_vars order_id]" Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/creditcard-add-3.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/creditcard-add-3.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/creditcard-add-3.xql 3 Aug 2005 22:45:46 -0000 1.1 @@ -0,0 +1,29 @@ + ++[ec_pretty_creditcard_type $creditcard_type] +$creditcard_number +exp: $creditcard_expire_1/$creditcard_expire_2 ++
Entering a new credit card will cause all future transactions + involving this order to use this credit card. However, it will + not have any effect on transactions that are currently + underway (e.g., if a transaction has already been authorized + with a different credit card, that credit card will be used to + complete the transaction).
" + +db_0or1row select_billing_address " + select c.billing_address, a.country_code + from ec_creditcards c, ec_orders o, ec_addresses a + where o.creditcard_id = c.creditcard_id + and a.address_id = c.billing_address + and o.order_id = :order_id + limit 1" + +doc_body_append " +| + [ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $billing_address]] + | +" +doc_body_append " + | ++ | ++ + | +
Note: the customer's credit card is not going to be reauthorized when you add this item to the order + (their card was already found to be valid when they placed the intial order). + They will, as usual, be automatically billed for this item when it ships. + If the customer's credit limit is in question, just make a test authorization offline.
+No matching products were found.
" +} else { + doc_body_append "This order does not have an associated credit card, so new items cannot be added.
+Please create a new order instead.
" + ad_script_abort +} + +set shipping_method [db_string shipping_method_select " + select shipping_method + from ec_orders + where order_id = :order_id"] + +db_transaction { + db_dml ec_items_insert " + insert into ec_items + (item_id, product_id, color_choice, size_choice, style_choice, order_id, in_cart_date, item_state, price_charged, price_name) + values + (:item_id, :product_id, :color_choice, :size_choice, :style_choice, :order_id, sysdate, 'to_be_shipped', :price_charged, :price_name)" + + # Check if a shipping gateway has been selected. + + set shipping_gateway [ad_parameter ShippingGateway] + if {[acs_sc_binding_exists_p ShippingGateway $shipping_gateway]} { + + # Replace the default ecommerce shipping calculations with the + # charges from the shipping gateway. Contact the shipping + # gateway to recalculate the total shipping charges. + + db_1row select_shipping_address " + select country_code, zip_code + from ec_addresses a, ec_orders o + where address_id = o.shipping_address + and o.order_id = :order_id" + + # Calculate the total value of the shipment. + + set shipment_value [db_string select_shipment_value " + select sum(coalesce(i.price_charged, 0)) + from ec_products p, ec_items i + where i.product_id = p.product_id + and p.no_shipping_avail_p = 'f' + and i.item_state not in ('void', 'received_back', 'expired') + and i.order_id = :order_id"] + set value_currency_code [ad_parameter Currency ecommerce] + set weight_unit_of_measure [ad_parameter WeightUnits ecommerce] + + # Get the list of services and their charges. + + set rates_and_services [acs_sc_call "ShippingGateway" "RatesAndServicesSelection" \ + [list "" "" "$country_code" "$zip_code" "$shipment_value" "$value_currency_code" "" "$weight_unit_of_measure"] \ + "$shipping_gateway"] + + # Find the charges for the selected service for the order. + + foreach service $rates_and_services { + array set rate_and_service $service + set order_shipping_cost $rate_and_service(total_charges) + set service_code $rate_and_service(service_code) + set service_description [acs_sc_call "ShippingGateway" "ServiceDescription" \ + "$service_code" \ + "$shipping_gateway"] + + # Unfortunately checking on the description of the + # shipping service is required as only the description is + # stored with the order as the shipping method. + + if {[string equal $service_description $shipping_method]} { + break + } + } + + # Calculate the tax on shipping and update the shipping cost + # of the order. + + set tax_on_order_shipping_cost [db_string get_shipping_tax " + select ec_tax(0, :order_shipping_cost, :order_id)"] + + db_dml set_shipping_charges " + update ec_orders + set shipping_charged = round(:order_shipping_cost, 2), shipping_tax_charged = round(:tax_on_order_shipping_cost, 2) + where order_id=:order_id" + + } else { + + # I calculate the shipping after it's inserted because this + # procedure goes and checks whether this is the first instance + # of this product in this order. I know it's non-ideal + # efficiency-wise, but this procedure (written for the user + # pages) # is already written and it works. + + set shipping_price [ec_shipping_price_for_one_item $item_id $product_id $order_id $shipping_method] + + db_dml ec_items_update " + update ec_items + set shipping_charged = :shipping_price + where item_id = :item_id" + + } +} + +ad_returnredirect "one?[export_url_vars order_id]" Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-add-4.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-add-4.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-add-4.xql 3 Aug 2005 22:45:46 -0000 1.1 @@ -0,0 +1,32 @@ + +++ [ad_admin_footer]" + Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2-oracle.xql 3 Aug 2005 22:45:46 -0000 1.1 @@ -0,0 +1,34 @@ + + +Search for a product to add:
+ + +
| Order ID | +$order_id | +[ec_decode $order_state "void" "" "[ec_formatted_price_shipping_gift_certificate_and_tax_in_an_order $order_id]"] |
+
| Ordered by | +$first_names $last_name | +|
| Confirmed date | +[ec_formatted_full_date $confirmed_date] | +|
| Order state | +[ec_decode $order_state "void" "void" $order_state] | +
+ Voided by: [db_string voided_by_name_select " + select first_names || ' ' || last_name from cc_users where user_id = :voided_by" -default ""]" +} + +doc_body_append " + [ec_decode $cs_comments "" "" "
+ Date: [ec_formatted_full_date $voided_date]
+ [ec_decode $reason_for_void "" "" "Reason: [ec_display_as_html $reason_for_void]"] +
[ec_display_as_html $cs_comments]"] + + + +
| [ec_decode $shipping_method "pickup" "Address" "no shipping" "Address" "Ship to"] | +[ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $shipping_address]] " + +if { $order_state == "confirmed" || $order_state == "authorized" || $order_state == "partially_fulfilled" } { + doc_body_append " + (modify)" +} + +doc_body_append " + |
+ ||
| Bill to | +[ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $billing_address]] + (modify) |
+ Credit card | +[ec_display_as_html [ec_creditcard_summary $creditcard_id] ] + (modify) |
+
| In basket date | +[ec_formatted_full_date $in_basket_date] | +||
| Confirmed date | +[ec_formatted_full_date $confirmed_date] | +||
| Authorized date | +[ec_formatted_full_date $authorized_date] | +||
| Base shipping charged | +[ec_pretty_price $shipping_charged] [ec_decode $shipping_method "pickup" "(Pickup)" "no shipping" "(No Shipping)" ""] | +
| ID | +Date | +Creditcard Last 4 | +Amount | +Type | +To Be Captured | +Auth Date | +Mark Date | +Refund Date | +Failed | +
|---|---|---|---|---|---|---|---|---|---|
| $transaction_id | +[ec_nbsp_if_null [ec_formatted_full_date $inserted_date]] | +$creditcard_last_four | +[ec_pretty_price $transaction_amount] | +[ec_decode $transaction_type "charge" "authorization to charge" "intent to refund"] | +[ec_nbsp_if_null [ec_decode $transaction_type "refund" "Yes" [ec_decode $to_be_captured_p "t" "Yes" "f" "No" ""]]] | +[ec_nbsp_if_null [ec_formatted_full_date $authorized_date]] | +[ec_nbsp_if_null [ec_formatted_full_date $marked_date]] | +[ec_nbsp_if_null [ec_formatted_full_date $refunded_date]] | +[ec_nbsp_if_null [ec_decode $failed_p "t" "Yes" "f" "No" ""]] | +
This order was fully paid by ${method}." + } + cc { + doc_body_append "
No credit card transactions" + } + invoice - + scholarship {} + } +} + +doc_body_append " +
" + +set old_shipment_id 0 + +db_foreach shipments_items_products_select " + select s.shipment_id, s.address_id, s.shipment_date, s.expected_arrival_date, s.carrier, s.tracking_number, s.actual_arrival_date, s.actual_arrival_detail, + p.product_name, p.product_id, i.price_name, i.price_charged, count(*) as quantity + from ec_shipments s, ec_items i, ec_products p + where i.shipment_id=s.shipment_id + and i.product_id=p.product_id + and s.order_id=:order_id + group by s.shipment_id, s.address_id, s.shipment_date, s.expected_arrival_date, s.carrier, s.tracking_number, s.actual_arrival_date, s.actual_arrival_detail, + p.product_name, p.product_id, i.price_name, i.price_charged + order by s.shipment_id" { + if { $shipment_id != $old_shipment_id } { + if { $old_shipment_id != 0 } { + doc_body_append "" + } + doc_body_append " ++ ++
++ ++ Shipment ID: $shipment_id +
+ Date: [util_AnsiDatetoPrettyDate $shipment_date]
+ [ec_decode $expected_arrival_date "" "" "Expected Arrival: [util_AnsiDatetoPrettyDate $expected_arrival_date]
"] + [ec_decode $carrier "" "" "Carrier: $carrier
"] + [ec_decode $tracking_number "" "" "Tracking #: $tracking_number
"] + [ec_decode $actual_arrival_date "" "" "Actual Arrival Date: [util_AnsiDatetoPrettyDate $actual_arrival_date]
"] + [ec_decode $actual_arrival_detail "" "" "Actual Arrival Detail: $actual_arrival_detail
"] + (track) ++ [ec_display_as_html [ec_pretty_mailing_address_from_ec_addresses $address_id]] + +" + } + doc_body_append "
" +} + +doc_body_append " +- Quantity $quantity: $product_name
" + set old_shipment_id $shipment_id +} + +if { $old_shipment_id == 0 } { + doc_body_append "No Shipments Have Been Made" +} else { + doc_body_append "
" + +set old_refund_id 0 + +db_foreach refunds_select " + select r.refund_id, r.refund_date, r.refunded_by, r.refund_reasons, r.refund_amount, u.first_names, u.last_name, p.product_name, p.product_id, i.price_name, i.price_charged, count(*) as quantity + from ec_refunds r, cc_users u, ec_items i, ec_products p + where r.order_id=:order_id + and r.refunded_by=u.user_id + and i.refund_id=r.refund_id + and p.product_id=i.product_id + group by r.refund_id, r.refund_date, r.refunded_by, r.refund_reasons, r.refund_amount, u.first_names, u.last_name, p.product_name, p.product_id, i.price_name, i.price_charged" { + if { $refund_id != $old_refund_id } { + if { $old_refund_id != 0 } { + doc_body_append "" + } + doc_body_append " + Refund ID: $refund_id" + +if { $order_state != "void" } { + doc_body_append " +
+ Date: [ec_formatted_full_date $refund_date]
+ Amount: [ec_pretty_price $refund_amount]
+ Refunded by: $first_names $last_name
+ Reason: $refund_reasons +" + } + doc_body_append "
" +} + +doc_body_append "- Quantity $quantity: $product_name
" + set old_refund_id $refund_id +} + +if { $old_refund_id == 0 } { + doc_body_append "No Returns Have Been Made" +} else { + doc_body_append "