[freeside-commits] branch FREESIDE_3_BRANCH updated. f5cc5eb0b51cf3c5e91fda0a47965cbe6f40496e
Jonathan Prykop
jonathan at 420.am
Wed Jul 8 19:34:07 PDT 2015
The branch, FREESIDE_3_BRANCH has been updated
via f5cc5eb0b51cf3c5e91fda0a47965cbe6f40496e (commit)
via c463320a7aa49cf01cd1d66b48739d4e9998dad6 (commit)
from 37029cf228bef0fe95ff5dbc62e7fb989eadd328 (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 f5cc5eb0b51cf3c5e91fda0a47965cbe6f40496e
Author: Jonathan Prykop <jonathan at freeside.biz>
Date: Wed Jul 8 21:33:10 2015 -0500
RT#34078: Payment History Report / Statement [menu fix, v3 only]
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index db2cf4f..69571c7 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -151,7 +151,7 @@
%# invoice reports, combined statement
% if ( $curuser->access_right('List invoices') ) {
-% if ( $curuser->access_right('Bulk send customer notices')
+% if ( $curuser->access_right('Resend invoices')
% && $cust_main->invoicing_list_emailonly ) {
<A HREF="<% $p %>misc/email-customer-statement.html?table=cust_main;agent_virt_agentnum=<% $cust_main->agentnum %>;custnum=<% $custnum %>"><% mt('Email statement to this customer') |h %></A>
commit c463320a7aa49cf01cd1d66b48739d4e9998dad6
Author: Jonathan Prykop <jonathan at freeside.biz>
Date: Wed Jul 8 19:15:33 2015 -0500
RT#34078: Payment History Report / Statement [backport of acl and preview fixes]
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1afacea..d1e9a22 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4595,6 +4595,8 @@ sub payment_history {
'description' => 'Previous balance',
'amount' => sprintf("%.2f",$previous),
'balance' => sprintf("%.2f",$previous),
+ 'date' => $$opt{'start_date'},
+ 'date_pretty' => $self->time2str_local('short', $$opt{'start_date'} ),
};
#false laziness with above
foreach my $key ( qw(amount balance) ) {
diff --git a/httemplate/misc/email-customer-statement.html b/httemplate/misc/email-customer-statement.html
index 65660f1..92ce1c4 100644
--- a/httemplate/misc/email-customer-statement.html
+++ b/httemplate/misc/email-customer-statement.html
@@ -5,13 +5,17 @@
'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';
+
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('View invoices');
+ unless $FS::CurrentUser::CurrentUser->access_right($acl);
my $alternate_form = sub {
# this could maaaybe be a separate element, for cleanliness
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index 3327303..57f451f 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -10,8 +10,12 @@ This may also be used as an element in other pages, enabling you to provide an
alternate initial form while using this for search freezing/thawing and
preview/send actions, with the following options:
+acl - the access right to use (defaults to 'Bulk send customer notices')
+
form_action - the URL to submit the form to
+process_url - the URL for starting the JSRPC process
+
title - the title of the page
no_search_fields - arrayref of additional fields that are not search parameters
@@ -50,7 +54,7 @@ should be used to set msgnum or from/subject/html_body cgi params
<% include('/elements/progress-init.html',
'OneTrueForm',
[ qw( search table from subject html_body text_body msgnum ) ],
- 'process/email-customers.html',
+ $process_url,
$pdest,
)
%>
@@ -90,7 +94,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 ALIGN="right" VALIGN="top">Message (HTML display): </TD>
+ <TH ALIGN="right" VALIGN="top">Message (HTML display): </TD>
<TD CLASS="background" ALIGN="left"><% $html_body %></TD>
</TR>
@@ -101,8 +105,11 @@ 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 ALIGN="right" VALIGN="top">Message (Text display): </TD>
- <TD CLASS="background" STYLE="background-color:white" ALIGN="left"><PRE><% $text_body %></PRE></TD>
+ <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>
+ <PRE id="email-message-text" style="display: none;"><% $text_body %></PRE>
+ </TD>
</TR>
</TABLE>
@@ -192,13 +199,16 @@ Template:
my %opt = @_;
+$opt{'acl'} ||= 'Bulk send customer notices';
+
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices');
+ unless $FS::CurrentUser::CurrentUser->access_right($opt{'acl'});
my $conf = FS::Conf->new;
my @no_search_fields = qw( action table from subject html_body text_body popup url );
my $form_action = $opt{'form_action'} || 'email-customers.html';
+my $process_url = $opt{'process_url'} || 'process/email-customers.html';
my $title = $opt{'title'} || 'Send customer notices';
push( @no_search_fields, @{$opt{'no_search_fields'}} ) if $opt{'no_search_fields'};
diff --git a/httemplate/misc/process/email-customer-statement.html b/httemplate/misc/process/email-customer-statement.html
new file mode 100644
index 0000000..40a8a70
--- /dev/null
+++ b/httemplate/misc/process/email-customer-statement.html
@@ -0,0 +1,9 @@
+<% $server->process %>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('Resend invoices');
+
+my $server = new FS::UI::Web::JSRPC 'FS::cust_main_Mixin::process_email_search_result', $cgi;
+
+</%init>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/cust_main.pm | 2 ++
httemplate/misc/email-customer-statement.html | 6 +++++-
httemplate/misc/email-customers.html | 20 +++++++++++++++-----
...ustomers.html => email-customer-statement.html} | 2 +-
httemplate/view/cust_main/payment_history.html | 2 +-
5 files changed, 24 insertions(+), 8 deletions(-)
copy httemplate/misc/process/{email-customers.html => email-customer-statement.html} (65%)
More information about the freeside-commits
mailing list