Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.adp 21 Aug 2008 10:43:40 -0000 1.1
@@ -0,0 +1,15 @@
+<master>
+ <property name="doc(title)">@title;noquote@</property>
+ <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>Please explain why you are voiding this gift certificate:</p>
+
+<form method=post action=gift-certificate-void-2>
+@export_form_vars_html;noquote@
+<textarea wrap name=reason_for_void rows=3 cols=50></textarea>
+<center>
+ <input type=submit value="Continue">
+</center>
+</form>
+
Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.tcl 9 Mar 2004 00:59:47 -0000 1.4
+++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.tcl 21 Aug 2008 10:43:40 -0000 1.5
@@ -1,5 +1,4 @@
# gift-certificate-void.tcl
-
ad_page_contract {
@param gift_certificate_id
@author
@@ -20,31 +19,7 @@
ad_script_abort
}
+set title "Void Gift Certificate"
+set context [list [list index "Customer Service"] $title]
-
-set page_title "Void Gift Certificate"
-append doc_body "[ad_admin_header $page_title]
-<h2>$page_title</h2>
-
-[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] $page_title]
-
-<hr>
-Please explain why you are voiding this gift certificate:
-
-<form method=post action=gift-certificate-void-2>
-[export_form_vars gift_certificate_id]
-
-<blockquote>
-<textarea wrap name=reason_for_void rows=3 cols=50></textarea>
-</blockquote>
-
-<center>
-<input type=submit value=\"Continue\">
-</center>
-
-</form>
-
-[ad_admin_footer]
-"
-
-doc_return 200 text/html $doc_body
\ No newline at end of file
+set export_form_vars_html [export_form_vars gift_certificate_id]
Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.adp 21 Aug 2008 10:43:40 -0000 1.1
@@ -0,0 +1,24 @@
+<master>
+ <property name="doc(title)">@title;noquote@</property>
+ <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p><b>Customer:</b> @customer_info_html;noquote@</p>
+<b>Gift Certificate Account Balance:</b> @gift_cert_account_bal_html;noquote@</p>
+<p><b>Grant a gift certificate</b></p>
+<form method=post action=gift-certificate-add>
+@export_form_vars_html;noquote@
+ <table>
+ <tr>
+ <td>Amount</td>
+ <td><input type=text name=amount size=5> ()</td>
+ <td rowspan=2><input type=submit value=\"Grant\"></td>
+ </tr>
+ <tr>
+ <td>Expires</td>
+ <td>@gc_expires_widget_html;noquote</td>
+ </tr>
+ </table>
+</form>
+@gift_certs_for_users_html;noquote@
+
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.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.tcl 9 Mar 2004 00:59:47 -0000 1.4
+++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificates.tcl 21 Aug 2008 10:43:40 -0000 1.5
@@ -1,5 +1,4 @@
# gift-certificates.tcl
-
ad_page_contract {
@param user_id
@author
@@ -12,44 +11,17 @@
ad_require_permission [ad_conn package_id] admin
-set page_title "Gift Certificates"
-append doc_body "[ad_admin_header $page_title]
-<h2>$page_title</h2>
+set title "Gift Certificates"
+set context [list [list index "Customer Service"] $title]
-[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] $page_title]
+set customer_info_html "<a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">[db_string get_customer_info "select first_names || ' ' || last_name from cc_users where user_id=:user_id"]</a>"
-<hr>
-"
+set gift_cert_account_bal_html "[ec_pretty_price [db_string get_pretty_price "select ec_gift_certificate_balance(:user_id) from dual"]]"
+set export_form_vars_html [export_form_vars user_id]
+set currency [parameter::get -package_id [ec_id] -parameter Currency -default "USD"]
+set gc_expires_widget_html [ec_gift_certificate_expires_widget "in 1 year"]
-
-append doc_body "<b>Customer:</b> <a href=\"[ec_acs_admin_url]users/one?user_id=$user_id\">[db_string get_customer_info "select first_names || ' ' || last_name from cc_users where user_id=:user_id"]</a>
-
-<p>
-
-<b>Gift Certificate Account Balance: [ec_pretty_price [db_string get_pretty_price "select ec_gift_certificate_balance(:user_id) from dual"]]</b>
-
-<p>
-<b>Grant a gift certificate</b>
-<blockquote>
-<form method=post action=gift-certificate-add>
-[export_form_vars user_id]
-<table>
-<tr>
-<td>Amount</td>
-<td><input type=text name=amount size=5> ([ad_parameter -package_id [ec_id] Currency ecommerce])</td>
-<td rowspan=2><input type=submit value=\"Grant\"></td>
-</tr>
-<tr>
-<td>Expires</td>
-<td>[ec_gift_certificate_expires_widget "in 1 year"]</td>
-</tr>
-</table>
-</form>
-</blockquote>
-
-"
-
set sql "select c.*, i.first_names || ' ' || i.last_name as issuer, i.user_id as issuer_user_id, p.first_names || ' ' || p.last_name as purchaser, p.user_id as purchaser_user_id, gift_certificate_amount_left(c.gift_certificate_id) as amount_left, decode(sign(sysdate-expires),1,'t',0,'t','f') as expired_p, v.first_names as voided_by_first_names, v.last_name as voided_by_last_name
from ec_gift_certificates c, cc_users i, cc_users p, cc_users v
where c.issued_by=i.user_id(+)
@@ -61,60 +33,36 @@
set gift_certificate_counter 0
set current_printed 0
set old_printed 0
+set gift_certs_for_users_html
db_foreach get_gift_certificates_for_user $sql {
-
if { $current_printed == 0 && $expired_p == "f" && $amount_left > 0 && $gift_certificate_state != "void"} {
- append doc_body "<b>Currently Available Gift Certificates</b>
- <blockquote>
- "
- set current_printed 1
+ append gift_certs_for_users_html "<p><b>Currently Available Gift Certificates</b></p>"
+ set current_printed 1
} elseif { $old_printed == 0 && ($expired_p == "t" || $amount_left == 0 || $gift_certificate_state == "void") } {
- if { $current_printed == 1 } {
- append doc_body "</blockquote>"
- }
- append doc_body "<b>Expired or Used Gift Certificates</b>
- <blockquote>
- "
- set old_printed 1
+ if { $current_printed == 1 } {
+ # do nothing
+ }
+ append gift_certs_for_users_html "<p><b>Expired or Usded Gift Certificates</b></p>"
+ set old_printed 1
}
-
incr gift_certificate_counter
- append doc_body "
- <table>
- <tr><td>Gift Certificate ID </td><td>$gift_certificate_id</td></tr>
- <tr><td>Amount Left</td><td>[ec_pretty_price $amount_left] <font size=-1>(out of [ec_pretty_price $amount])</font></td></tr>
- <tr><td>Issue Date</td><td>[util_AnsiDatetoPrettyDate $issue_date]</td></tr>
- "
+ append gift_certs_for_users_html "<table>\n<tr><td>Gift Certificate ID </td><td>$gift_certificate_id"
+ if { $expired_p == "f" && $amount_left > 0 && $gift_certificate_state != "void"} {
+ append gift_certs_for_users_html " (<a href=\"gift-certificate-void?[export_url_vars gift_certificate_id]\">void this</a>) "
+ }
+ append gift_certs_for_users_html "</td></tr>
+ <tr><td>Amount Left</td><td>[ec_pretty_price $amount_left] (out of [ec_pretty_price $amount])</td></tr>
+ <tr><td>Issue Date</td><td>[util_AnsiDatetoPrettyDate $issue_date]</td></tr>\n"
if { ![empty_string_p $issuer_user_id] } {
- append doc_body "<tr><td>Issued By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$issuer_user_id\">$issuer</a></td></tr>"
+ append gift_certs_for_users_html "<tr><td>Issued By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$issuer_user_id\">$issuer</a></td></tr>\n"
} else {
- append doc_body "<tr><td>Purchased By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$purchaser_user_id\">$purchaser</a></td></tr>"
+ append gift_certs_for_users_html "<tr><td>Purchased By</td><td><a href=\"[ec_acs_admin_url]users/one?user_id=$purchaser_user_id\">$purchaser</a></td></tr>\n"
}
- append doc_body "<tr><td>[ec_decode $expired_p "t" "Expired" "Expires"]</td><td>[ec_decode $expires "" "never" [util_AnsiDatetoPrettyDate $expires]]</td></tr>
- "
-
+ append gift_certs_for_users_html "<tr><td>[ec_decode $expired_p "t" "Expired" "Expires"]</td><td>[ec_decode $expires "" "never" [util_AnsiDatetoPrettyDate $expires]]</td></tr>\n"
if { $gift_certificate_state == "void" } {
- append doc_body "<tr><td><font color=red>Voided</font></td><td>[util_AnsiDatetoPrettyDate $voided_date] by <a href=\"[ec_acs_admin_url]users/one?user_id=$voided_by\">$voided_by_first_names $voided_by_last_name</a> because: $reason_for_void</td></tr>"
+ append gift_certs_for_users_html "<tr><td><b>Voided</td><td>[util_AnsiDatetoPrettyDate $voided_date] by <a href=\"[ec_acs_admin_url]users/one?user_id=$voided_by\">$voided_by_first_names $voided_by_last_name</a> because: $reason_for_void</td></tr>\n"
}
-
- append doc_body "</table>"
-
- if { $expired_p == "f" && $amount_left > 0 && $gift_certificate_state != "void"} {
- append doc_body "<font size=-1>(<a href=\"gift-certificate-void?[export_url_vars gift_certificate_id]\">void this</a>)</font>
- "
- }
-
- append doc_body "<p>
- "
+ append gift_certs_for_users_html "</table><br>"
}
-if { $current_printed == 1 || $old_printed == 1 } {
- append doc_body "</blockquote>"
-}
-
-append doc_body "[ad_admin_footer]
-"
-
-
-doc_return 200 text/html $doc_body