projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9c7942
)
optional better visibility for invoicing email field, RT12944
author
levinse
<levinse>
Mon, 30 May 2011 23:27:09 +0000
(23:27 +0000)
committer
levinse
<levinse>
Mon, 30 May 2011 23:27:09 +0000
(23:27 +0000)
FS/FS/Conf.pm
patch
|
blob
|
history
httemplate/edit/cust_main/billing.html
patch
|
blob
|
history
httemplate/edit/cust_main/contact.html
patch
|
blob
|
history
httemplate/view/cust_main/billing.html
patch
|
blob
|
history
httemplate/view/cust_main/contacts.html
patch
|
blob
|
history
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
d83ac2f
..
66616a0
100644
(file)
--- 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',
},
'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" },
{ 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
39a0b70
..
60a03d6
100644
(file)
--- 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">
<% $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>
<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
7adcde7
..
a53c789
100644
(file)
--- a/
httemplate/edit/cust_main/contact.html
+++ b/
httemplate/edit/cust_main/contact.html
@@
-18,6
+18,17
@@
</TR>
</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>
<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 $r = qq!<font color="#ff0000">*</font> !;
+my @invoicing_list = $cust_main->invoicing_list;
+
</%init>
</%init>
diff --git
a/httemplate/view/cust_main/billing.html
b/httemplate/view/cust_main/billing.html
index
40ab3af
..
3d8adf9
100644
(file)
--- 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>
<% ( 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('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">
<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
9a55e54
..
56fbac8
100644
(file)
--- 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>
<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>
<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( $cust_main ) = @_;
my $conf = new FS::Conf;
+my @invoicing_list = $cust_main->invoicing_list;
+my $no = emt('no');
</%init>
</%init>