Index: openacs-4/packages/ecommerce/www/admin/orders/items-add-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-add-2.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/orders/items-add-2.adp 18 Aug 2008 06:59:05 -0000 1.1 @@ -0,0 +1,18 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ + +

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.

+

Product(s) that match your search.

+ + + +

No matching products were found.

+ Index: openacs-4/packages/ecommerce/www/admin/orders/items-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-add-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/items-add-2.tcl 9 Mar 2004 00:59:50 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/items-add-2.tcl 18 Aug 2008 06:59:05 -0000 1.6 @@ -14,47 +14,20 @@ ad_require_permission [ad_conn package_id] admin -doc_body_append " - [ad_admin_header "Add Items, Cont."] +set title "Add Items, continued" +set context [list [list index "Orders / Shipments / Refunds"] $title] -

Add Items, Cont.

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?order_id=$order_id" "One Order"] "Add Items, Cont."] - -
" - if { [exists_and_not_null sku] } { set additional_query_part "sku=:sku" } else { set additional_query_part "upper(product_name) like '%' || upper(:product_name) || '%'" } set product_counter 0 -db_foreach products_select " - select product_id, product_name +set products_select_html "" +db_foreach products_select "select product_id, product_name from ec_products where $additional_query_part" { - if { $product_counter == 0 } { - doc_body_append " -

Here are the product(s) that match your search.

-

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.

- " -} - -doc_body_append " - [ad_admin_footer]" 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.6 -r1.7 --- openacs-4/packages/ecommerce/www/admin/orders/items-add-3.tcl 9 Mar 2004 00:59:50 -0000 1.6 +++ openacs-4/packages/ecommerce/www/admin/orders/items-add-3.tcl 18 Aug 2008 06:59:05 -0000 1.7 @@ -18,34 +18,17 @@ ad_require_permission [ad_conn package_id] admin -doc_body_append " - [ad_admin_header "Add Items, Cont."] +set title "Add Items, continued" +set context [list [list index "Orders / Shipments / Refunds"] $title] -

Add Items, Cont.

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?order_id=$order_id" "One Order"] "Add Items, Cont."] - -
" - set item_id [db_nextval ec_item_id_sequence] set user_id [db_string user_id_select " select user_id from ec_orders where order_id=:order_id"] set lowest_price_and_price_name [ec_lowest_price_and_price_name_for_an_item $product_id $user_id ""] -doc_body_append " -
- [export_form_vars order_id product_id color_choice size_choice style_choice item_id] -
-

This is the price that this user would normally receive for this product. Make modifications as needed:

-
- - ([ad_parameter -package_id [ec_id] Currency ecommerce]) -
-
-
- -
-
- [ad_admin_footer]" +set price_name [lindex $lowest_price_and_price_name 1] +set price_charged [format "%0.2f" [lindex $lowest_price_and_price_name 0]] +set currency [parameter::get -package_id [ec_id] -parameter Currency -default "USD"] +set export_form_vars_html [export_form_vars order_id product_id color_choice size_choice style_choice item_id] Index: openacs-4/packages/ecommerce/www/admin/orders/items-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-add.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/orders/items-add.adp 18 Aug 2008 06:59:05 -0000 1.1 @@ -0,0 +1,19 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ +

Search for a product to add:

+
+ @export_form_vars_html;noquote@ +
    +
  • By Name:
    • +
+
+
+ @export_form_vars_html;noquote@ +
    +
  • By SKU:
    • +
+
+ Index: openacs-4/packages/ecommerce/www/admin/orders/items-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-add.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/items-add.tcl 9 Mar 2004 00:59:50 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/items-add.tcl 18 Aug 2008 06:59:05 -0000 1.6 @@ -14,28 +14,7 @@ ad_require_permission [ad_conn package_id] admin -doc_body_append " - [ad_admin_header "Add Items"] +set title "Add Items" +set context [list [list index "Orders / Shipments / Refunds"] $title] -

Add Items

- - [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?order_id=$order_id" "One Order"] "Add Items"] - -
-
-

Search for a product to add:

-
- [export_form_vars order_id] -
    -
  • By Name:
    • -
-
-
- [export_form_vars order_id] -
    -
  • By SKU:
    • -
-
-
- [ad_admin_footer]" - +set export_form_vars_html [export_form_vars order_id]