[freeside-commits] branch FREESIDE_4_BRANCH updated. 7018cfcd14a6ca0252c1e3aabf7ece4fb3f6af4b
Ivan
ivan at 420.am
Sat Jul 11 00:23:47 PDT 2015
The branch, FREESIDE_4_BRANCH has been updated
via 7018cfcd14a6ca0252c1e3aabf7ece4fb3f6af4b (commit)
from 6eb02169edfc7ef21b54d22737ed4668a076ec8e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7018cfcd14a6ca0252c1e3aabf7ece4fb3f6af4b
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sat Jul 11 00:23:44 2015 -0700
UI for emailing customer statements on v4, RT#34078
diff --git a/httemplate/elements/tr-fixed.html b/httemplate/elements/tr-fixed.html
index 373c0ab..dad8da0 100644
--- a/httemplate/elements/tr-fixed.html
+++ b/httemplate/elements/tr-fixed.html
@@ -1,6 +1,6 @@
<% include('tr-td-label.html', @_ ) %>
- <TD BGCOLOR="#dddddd" <% $style %> <% $colspan %>><% $value %></TD>
+ <TD <% $style %> <% $colspan %>><% $value %></TD>
</TR>
@@ -10,7 +10,9 @@
my %opt = @_;
-my $style = $opt{'cell_style'} ? ' STYLE="'. $opt{'cell_style'}. '" ' : '';
+my $style = $opt{'cell_style'}
+ ? ' STYLE="'. $opt{'cell_style'}. '" '
+ : ' STYLE="color:#666666" ';
my $colspan = $opt{'colspan'} ? ' COLSPAN="'. $opt{'colspan'}. '" ' : '';
diff --git a/httemplate/misc/email-customer-statement.html b/httemplate/misc/email-customer-statement.html
index 92ce1c4..df95d7f 100644
--- a/httemplate/misc/email-customer-statement.html
+++ b/httemplate/misc/email-customer-statement.html
@@ -1,15 +1,12 @@
-
- <% include('email-customers.html',
- 'form_action' => 'email-customer-statement.html',
- 'title' => 'Send statement to customer',
- 'no_search_fields' => [ 'start_date', 'end_date' ],
- 'alternate_form' => $alternate_form,
- 'post_search_hook' => $post_search_hook,
- 'acl' => $acl,
- 'process_url' => 'process/email-customer-statement.html',
- )
- %>
-
+<& email-customers.html,
+ 'form_action' => 'email-customer-statement.html',
+ 'title' => 'Send statement to customer',
+ 'no_search_fields' => [ 'start_date', 'end_date' ],
+ 'alternate_form' => $alternate_form,
+ 'post_search_hook' => $post_search_hook,
+ 'acl' => $acl,
+ 'process_url' => 'process/email-customer-statement.html',
+&>
<%init>
my $acl = 'Resend invoices';
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index 57f451f..0c90b07 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -29,15 +29,14 @@ gets passed options 'conf' and 'search' (a reference to the unfrozen %search has
should be used to set msgnum or from/subject/html_body cgi params
</%doc>
-
% if ($popup) {
-<% include('/elements/header-popup.html', $title) %>
+<& /elements/header-popup.html, $title &>
% } else {
-<% include('/elements/header.html', $title) %>
+<& /elements/header.html, $title &>
% }
-<FORM NAME="OneTrueForm" ACTION="<% $form_action %>" METHOD="POST">
+<FORM NAME="OneTrueForm" ACTION="<% $form_action %>" METHOD="GET">
<INPUT TYPE="hidden" NAME="table" VALUE="<% $table %>">
%# Mixing search params with from address, subject, etc. required special-case
%# handling of those, risked name conflicts, and caused massive problems with
@@ -67,7 +66,7 @@ should be used to set msgnum or from/subject/html_body cgi params
% if ( $cgi->param('action') ) {
- <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+ <TABLE CLASS="fsinnerbox">
<INPUT TYPE="hidden" NAME="msgnum" VALUE="<% $cgi->param('msgnum') %>">
% if ( $msg_template ) {
@@ -93,6 +92,7 @@ should be used to set msgnum or from/subject/html_body cgi params
%>
<INPUT TYPE="hidden" NAME="html_body" VALUE="<% $html_body |h %>">
+ <TR><TD COLSPAN=2> </TD></TR>
<TR>
<TH ALIGN="right" VALIGN="top">Message (HTML display): </TD>
<TD CLASS="background" ALIGN="left"><% $html_body %></TD>
@@ -104,10 +104,12 @@ should be used to set msgnum or from/subject/html_body cgi params
% )
% );
<INPUT TYPE="hidden" NAME="text_body" VALUE="<% $text_body |h %>">
+ <TR><TD COLSPAN=2> </TD></TR>
<TR>
<TH ALIGN="right" VALIGN="top">Message (Text display): </TD>
- <TD CLASS="background" STYLE="background-color:white" ALIGN="left">
- <a href="javascript:void(0)" onclick="this.style.display='none'; document.getElementById('email-message-text').style.display=''">click to view</a>
+ <TD CLASS="background" ALIGN="left">
+ <a href="javascript:void(0)" ID="email-message-text-view" style="color:#666666" onclick="showtext()">(view)</a>
+ <a href="javascript:void(0)" ID="email-message-text-hide" style="color:#666666; display: none;" onclick="hidetext()">(hide)</a>
<PRE id="email-message-text" style="display: none;"><% $text_body %></PRE>
</TD>
</TR>
@@ -117,6 +119,19 @@ should be used to set msgnum or from/subject/html_body cgi params
% if ( $cgi->param('action') eq 'preview' ) {
<SCRIPT>
+
+ function showtext() {
+ $('#email-message-text-view').css('display','none');
+ $('#email-message-text-hide').css('display','');
+ $('#email-message-text').slideDown();
+ }
+
+ function hidetext() {
+ $('#email-message-text-view').css('display','');
+ $('#email-message-text-hide').css('display','none');
+ $('#email-message-text').slideUp();
+ }
+
function areyousure(href) {
return confirm("Send this notice to <% ($num_cust > 1) ? "$num_cust customers" : '1 customer' %> ?");
}
-----------------------------------------------------------------------
Summary of changes:
httemplate/elements/tr-fixed.html | 6 +++--
httemplate/misc/email-customer-statement.html | 21 ++++++++----------
httemplate/misc/email-customers.html | 29 +++++++++++++++++++------
3 files changed, 35 insertions(+), 21 deletions(-)
More information about the freeside-commits
mailing list