X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=a94b5c15a91e38e3b1eb9e667f69e46c3703e92a;hp=84241d2978cc5d8bd7a010979c7791bc671d85f3;hb=24c164b829dce551badd130dba51b011342676f2;hpb=747949f05c140e23221b3a2364928431f58fc2d3 diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 84241d297..a94b5c15a 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -1,20 +1,8 @@ <% mt('Billing information') |h %> -%# If we can't see the unencrypted card, then bill now is an exercise in -%# frustration (without some sort of job queue magic to send it to a secure -%# machine, anyway) -%if ( $FS::CurrentUser::CurrentUser->access_right('Bill customer now') -% && ! $cust_main->is_encrypted($cust_main->payinfo) -% ) { -%# (<% mt('Bill now') |h %>) - <& /elements/bill.html, - custnum => $cust_main->custnum, - label => emt('Bill now'), - url => $p.'view/cust_main.cgi?'.$cust_main->custnum, - &> -% } - % my $yes = emt('yes'); % my $no = emt('no'); +% my $allowed = emt('allowed'); +% my $refused = emt('refused');
<% $balance %> | +||||
<% emt( 'Recurring' ) %> | ++ | |||
---|---|---|---|---|
<% mt('Prorate day of month') |h %> | @@ -85,7 +119,7 @@||||
<% mt('Tax location') |h %> | % my $tax_location = $conf->exists('tax-ship_address') @@ -96,34 +130,36 @@ % }||||
<% mt('Postal mail invoices') |h %> | -- <% ( grep { $_ eq 'POST' } @invoicing_list ) - ? $yes. ( $cust_main->invoice_attn +% if ( $cust_main->postal_invoice ) { + | <% $yes . ( $cust_main->invoice_attn ? ', attn: '. $cust_main->invoice_attn : '' - ) - : $no - %> + ) %> + | +% } elsif ( $cust_main->invoice_noemail +% or scalar(@invoicing_list) == 0 ) { +% # alert the user that this customer has no way to receive an invoice +<% $no %> | +% } else { +<% $no %> | +% }
<% mt('Email invoices') |h %> | -- <% $cust_main->invoice_noemail ? $no : $yes %> - | +% if ( $cust_main->invoice_noemail and ! $cust_main->postal_invoice ) { +% # as above, warn if the customer refuses both email and postal invoices +<% $refused %> | +% } else { +<% $cust_main->invoice_noemail ? $refused : $allowed %> | +% }|
<% mt('Email address(es)') |h %> | +<% mt('Other email notices') |h %> |
- <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %>
-% if ( $cust_main->message_noemail ) {
- - <% emt('(do not send notices)') %> -% } + <% $cust_main->message_noemail ? $refused : $allowed %> |
||
<% mt('Invoice terms') |h %> | @@ -172,9 +208,9 @@ | |||
<% mt('Email CDRs as CSV') |h %> | +<% mt('Email CDRs as '.uc($attach)) |h %> | <% $cust_main->email_csv_cdr ? $yes : $no %> |