[freeside-commits] branch FREESIDE_4_BRANCH updated. 6bb14ffd47dad8f874a74938fc992f9ea90b3104

[Christopher Burger]

The branch, FREESIDE_4_BRANCH has been updated
       via  6bb14ffd47dad8f874a74938fc992f9ea90b3104 (commit)
       via  a8944edbf9043e38df231ad6495f375f8655b585 (commit)
      from  e5ae3c8ec436d52a9e437d5bf0b2a1bf12dc46fe (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 6bb14ffd47dad8f874a74938fc992f9ea90b3104
Merge: a8944edbf e5ae3c8ec
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Nov 16 09:10:58 2018 -0500

    Merge branch 'FREESIDE_4_BRANCH' of ssh://git.freeside.biz/home/git/freeside into FREESIDE_4_BRANCH


commit a8944edbf9043e38df231ad6495f375f8655b585
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Thu Nov 15 11:37:27 2018 -0500

    RT# 80138 - Added config option to display/edit customer option to send or not send payment receipts

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a2436aacd..87e5838c0 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1718,6 +1718,15 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'allow_payment_receipt_noemail',
+    'section'     => 'notification',
+    'description' => 'Add option on customer edit/view page to disable emailing of payment receipts.  If this option is set to NO it will override customer specific option, so when set to NO system will not check for payment_receipt_noemail option at customer level.',
+    'type'        => 'checkbox',
+    'per_agent'   => 1,
+    'agent_bool'  => 1,
+  },
+
+  {
     'key'         => 'payment_receipt',
     'section'     => 'notification',
     'description' => 'Send payment receipts.',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 8d54326af..b092063e8 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1664,6 +1664,7 @@ sub tables_hashref {
         'invoice_attn', 'varchar', 'NULL', $char_d, '', '',
         'invoice_ship_address', 'char', 'NULL', 1, '', '',
         'postal_invoice', 'char', 'NULL', 1, '', '',
+        'paymentreceipt_noemail', 'char', 'NULL', 1, '', '',
       ],
       'primary_key'  => 'custnum',
       'unique'       => [ [ 'agentnum', 'agent_custid' ] ],
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 4c82d106e..915cb3303 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -241,6 +241,8 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  my $conf = new FS::Conf;
+
   my $cust_bill;
   if ( $self->invnum ) {
     $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
@@ -650,6 +652,8 @@ sub send_receipt {
 
   return '' unless $conf->config_bool('payment_receipt', $cust_main->agentnum);
 
+  return '' if ($conf->config_bool('allow_payment_receipt_noemail', $cust_main->agentnum) && $cust_main->paymentreceipt_noemail);
+
   my @invoicing_list = $cust_main->invoicing_list_emailonly;
   return '' unless @invoicing_list;
 
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 4dddb831a..d98927488 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -105,6 +105,16 @@
       box_first   => 1,
     &>
 
+% if ( $conf->config_bool('allow_payment_receipt_noemail', $cust_main->agentnum) ) {
+    <& /elements/tr-checkbox.html,
+      field       => 'paymentreceipt_noemail',
+      label       => emt('Do not send email payment receipts'),
+      value       => 'Y',
+      curr_value  => $cust_main->paymentreceipt_noemail,
+      box_first   => 1,
+    &>
+% }
+
     <& /elements/tr-checkbox.html,
       field       => 'message_noemail',
       label       => emt('Do not send other email notices'),
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index e5e91fdbb..766b17ebb 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -167,6 +167,12 @@ set_display_recurring(<% encode_json({'display_recurring' => [ $cust_main->displ
   <TD><% $cust_main->invoice_noemail ? $refused : $allowed %></TD>
 % }
 </TR>
+% if ( $conf->config_bool('allow_payment_receipt_noemail', $cust_main->agentnum) ) {
+<TR>
+  <TH ALIGN="right"><% mt('Email payment receipts') |h %></TH>
+  <TD><% $cust_main->paymentreceipt_noemail ? $refused : $allowed %></TD>
+</TR>
+% }
 <TR>
   <TH ALIGN="right"><% mt('Other email notices') |h %></TH>
   <TD>

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

Summary of changes:
 FS/FS/Conf.pm                          |  9 +++++++++
 FS/FS/Schema.pm                        |  1 +
 FS/FS/cust_pay.pm                      |  4 ++++
 httemplate/edit/cust_main/billing.html | 10 ++++++++++
 httemplate/view/cust_main/billing.html |  6 ++++++
 5 files changed, 30 insertions(+)