[freeside-commits] branch FREESIDE_3_BRANCH updated. 2ab62f031f902a03bb4e3c54e7f47a35acffb5e1

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  2ab62f031f902a03bb4e3c54e7f47a35acffb5e1 (commit)
      from  7ec1684c70e24b4b16a903386edd7111212f6212 (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 2ab62f031f902a03bb4e3c54e7f47a35acffb5e1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Mar 26 22:45:32 2016 -0700

    freeside inc. web services for address normalizaion and printing, RT#33849

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 91793f9..8879500 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -184,6 +184,7 @@ tie my %rights, 'Tie::IxHash',
   'Customer invoice / financial info rights' => [
     'View invoices',
     'Resend invoices', #NEWNEW
+    { rightname=>'Print and mail invoices', desc=>"Print and mail via Freeside's web service", }, ##NEWER than NEWNEWNEW
     'Void invoices',
     'Unvoid invoices',
     'Delete invoices',
diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 121bd4a..880d6f3 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -253,6 +253,7 @@ sub _upgrade_data { # class method
     'Add on-the-fly void credit reason' => 'Add on-the-fly void credit reason',
     '_ALL' => 'Employee preference telephony integration',
     'Add on-the-fly credit reason' => 'Add on-the-fly refund reason',
+    'Resend invoices' => 'Print and mail invoices',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
diff --git a/httemplate/misc/post_fsinc-invoice.cgi b/httemplate/misc/post_fsinc-invoice.cgi
new file mode 100644
index 0000000..94eaf66
--- /dev/null
+++ b/httemplate/misc/post_fsinc-invoice.cgi
@@ -0,0 +1,43 @@
+% my $title = $error ? 'Error printing and mailing invoice' : 'Invoice printed and mailed';
+<% include('/elements/header-popup.html', $title ) %>
+<DIV STYLE="text-align: center;">
+<SPAN STYLE="color: red; font-weight: bold;"><% $error %></SPAN><BR>
+<BUTTON TYPE="button" onClick="parent.cClick();">Close</BUTTON>
+</DIV>
+<% include('/elements/footer-popup.html') %>
+
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Print and mail invoices');
+
+my $invnum      = $cgi->param('invnum');
+
+my $template    = $cgi->param('template');
+my $notice_name = $cgi->param('notice_name') if $cgi->param('notice_name');
+my $no_coupon   = $cgi->param('no_coupon');
+
+#XXX agent-virt
+my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum})
+  or die "Unknown invnum\n";
+
+my $mode;
+if ( $cgi->param('mode') =~ /^(\d+)$/ ) {
+  $mode = $1;
+}
+$cust_bill->set('mode' => $mode) if $mode;
+
+#these methods die instead of return errors, so, handle that without a backtrace
+local $@;
+my $letter_id = 
+  eval { $cust_bill->postal_mail_fsinc( 'template'    => $template,
+                                        'notice_name' => $notice_name,
+                                        'no_coupon'   => $no_coupon,
+                                      ); 
+       };
+my $error = "$@";
+
+$error ||= 'Unknown print and mail error: no letter ID returned'
+  unless $letter_id;
+
+</%init>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 1d5b767..97eff24 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -96,8 +96,18 @@ function areyousure(href, message) {
 % }
 
 % if ( $curuser->access_right('Resend invoices') ) {
+        <A HREF="<% $p %>misc/send-invoice.cgi?method=print;<% $link %>"><% mt('Print this invoice') |h %></A>
+% }
+
+% if ( $curuser->access_right('Print and mail invoices') ) {
+        | <& /elements/popup_link.html,
+               'action'      => $p."misc/post_fsinc-invoice.cgi?$link",
+               'label'       => 'Print and mail this invoice online',
+               'actionlabel' => 'Invoice printing and mailing',
+          &>
+% }
 
-    <A HREF="<% $p %>misc/send-invoice.cgi?method=print;<% $link %>"><% mt('Re-print this invoice') |h %></A>
+% if ( $curuser->access_right('Resend invoices') ) {
 
 %   if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { 
         | <A HREF="<% $p %>misc/send-invoice.cgi?method=email;<% $link %>"><% mt('Re-email this invoice') |h %></A>
@@ -107,8 +117,11 @@ function areyousure(href, message) {
         | <A HREF="<% $p %>misc/send-invoice.cgi?method=fax;<% $link %>"><% mt('Re-fax this invoice') |h %></A>
 %   } 
 
-    <BR><BR>
+% }
 
+% if (    $curuser->access_right('Resend invoices')
+%      || $curuser->access_right('Print and mail invoices') ) {
+        <BR><BR>
 % } 
 
 % my $br = 0;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/AccessRight.pm                   |    1 +
 FS/FS/access_right.pm                  |    1 +
 httemplate/misc/post_fsinc-invoice.cgi |   43 ++++++++++++++++++++++++++++++++
 httemplate/view/cust_bill.cgi          |   17 +++++++++++--
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 httemplate/misc/post_fsinc-invoice.cgi