diff options
| -rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
| -rw-r--r-- | httemplate/edit/cust_main/billing.html | 2 | ||||
| -rw-r--r-- | httemplate/edit/cust_main/contact.html | 13 | ||||
| -rw-r--r-- | httemplate/view/cust_main/billing.html | 2 | ||||
| -rw-r--r-- | httemplate/view/cust_main/contacts.html | 10 |
5 files changed, 34 insertions, 0 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index d83ac2f98..66616a07e 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -4444,6 +4444,13 @@ and customer address. Include units.', 'description' => 'Show a link to the payment history report in the Reports menu. DO NOT ENABLE THIS.', 'type' => 'checkbox', }, + + { + 'key' => 'cust-email-high-visibility', + 'section' => 'UI', + 'description' => 'Move the invoicing e-mail address field to the top of the billing address section and highlight it.', + 'type' => 'checkbox', + }, { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" }, { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" }, diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index 39a0b70ed..60a03d621 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -441,12 +441,14 @@ % } +% unless ( $conf->exists('cust-email-high-visibility')) { <TR> <TD ALIGN="right" WIDTH="200"> <% $conf->exists('cust_main-require_invoicing_list_email') ? $r : '' %>Email address(es) </TD> <TD WIDTH="408"><INPUT TYPE="text" NAME="invoicing_list" VALUE="<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>"></TD> </TR> +% } <TR> <TD ALIGN="right" WIDTH="200"><% mt('Invoice terms') |h %> </TD> diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html index 7adcde77f..a53c78905 100644 --- a/httemplate/edit/cust_main/contact.html +++ b/httemplate/edit/cust_main/contact.html @@ -18,6 +18,17 @@ </TR> +% if ( $conf->exists('cust-email-high-visibility') && !$pre ) { + <TR> + <TD ALIGN="right" WIDTH="200"> + <% $conf->exists('cust_main-require_invoicing_list_email') ? $r : '' %>Email address(es) + </TD> + <TD bgcolor="#FFFF00"> + <INPUT TYPE="text" NAME="invoicing_list" VALUE="<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>"> + </TD> + </TR> +% } + <TR> <TD ALIGN="right"><% mt('Company') |h %></TD> <TD COLSPAN=7> @@ -134,4 +145,6 @@ my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') =~ /^(stateid_st my $r = qq!<font color="#ff0000">*</font> !; +my @invoicing_list = $cust_main->invoicing_list; + </%init> diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 40ab3afbf..3d8adf985 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -203,12 +203,14 @@ <% ( grep { $_ eq 'FAX' } @invoicing_list ) ? $yes : $no %> </TD> </TR> +% unless ( $conf->exists('cust-email-high-visibility')) { <TR> <TD ALIGN="right"><% mt('Email invoices') |h %></TD> <TD BGCOLOR="#ffffff"> <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %> </TD> </TR> +% } <TR> <TD ALIGN="right"><% mt('Invoice terms') |h %></TD> <TD BGCOLOR="#ffffff"> diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index 9a55e5488..56fbac8c6 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -17,6 +17,14 @@ <TD BGCOLOR="#ffffff"><% $cust_main->masked('ss') || ' ' %></TD> % } </TR> +% if ( $conf->exists('cust-email-high-visibility') && $which eq '') { +<TR> + <TD ALIGN="right"><% mt('Email invoices') |h %></TD> + <TD BGCOLOR="#ffff00"> + <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %> + </TD> +</TR> +% } <TR> <TD ALIGN="right"><% mt('Company') |h %></TD> <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}company") |h %></TD> @@ -115,6 +123,8 @@ my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') =~ /^(stateid_st my( $cust_main ) = @_; my $conf = new FS::Conf; +my @invoicing_list = $cust_main->invoicing_list; +my $no = emt('no'); </%init> |