X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=f1125c0087e175b3c5a48cd7cc35de066a4d6cd5;hp=b863a734bcff80e1ebe474c2fb6cd28c6899124b;hb=a4d4d3df88b33a6db30b565921f6d62efb252351;hpb=dfc85a4245f2d15f258d840b98f0508c50228e40
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index b863a734b..f1125c008 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -32,165 +32,25 @@
% }
% if ( $conf->exists('cust_main-select-billday')
-% && ($cust_main->payby eq 'CARD' || $cust_main->payby eq 'CHEK') ) {
-
- | <% mt('Billing day of month') |h %> |
- <% $cust_main->billday %>
- |
-
-% }
-
-
- | <% mt('Billing type') |h %> |
-
-% if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) {
-
-% my $autodemand = $cust_main->payby eq 'CARD' ? 'automatic' : 'on-demand';
- <% mt("Credit card ([_1])",$autodemand) |h %>
- |
-
-
- | <% mt('Card number') |h %> |
- <% $cust_main->paymask %> |
-
-%
-%#false laziness w/elements/select-month_year.html & edit/cust_main/billing.html
-%my( $mon, $year );
-%my $date = $cust_main->paydate || '12-2037';
-%if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-% ( $mon, $year ) = ( $2, $1 );
-%} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-% ( $mon, $year ) = ( $1, $3 );
-%} else {
-% warn "unrecognized expiration date format: $date";
-% ( $mon, $year ) = ( '', '' );
-%}
-%
-
-
- | <% mt('Expiration') |h %> |
- <% "$mon/$year" %> |
-
-% if ( $cust_main->paystart_month ) {
-
-
- | <% mt('Start date') |h %> |
- <% $cust_main->paystart_month. '/'. $cust_main->paystart_year %>
- |
-% } elsif ( $cust_main->payissue ) {
-
-
- | <% mt('Issue #') |h %> |
- <% $cust_main->payissue %>
- |
-% }
-
-
-
- | <% mt('Name on card') |h %> |
- <% $cust_main->payname %> |
-
-% } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
-% my( $account, $aba ) = split('@', $cust_main->paymask );
-% my $branch = '';
-% ($branch,$aba) = split('\.',$aba) if $conf->config('echeck-country') eq 'CA';
-
-
-% my $autodemand = $cust_main->payby eq 'CHEK' ? 'automatic' : 'on-demand';
- <% mt("Electronic check ([_1])",$autodemand) |h %>
-
-
-
-% #false laziness w/edit/cust_main/billing.html and misc/payment.cgi
-% my $routing_label = $conf->config('echeck-country') eq 'US'
-% ? 'ABA/Routing number'
-% : 'Routing number';
-
-
- | <% mt($routing_label) |h %> |
- <% $aba %> |
-
-
-% if ( $conf->config('echeck-country') eq 'CA' ) {
-
- | <% mt('Branch number') |h %> |
- <% $branch %> |
-
-% }
-
- | <% mt('Account number') |h %> |
- <% $account %> |
-
-
- | <% mt('Account type') |h %> |
- <% $cust_main->paytype %> |
-
-
- | <% mt('Bank name') |h %> |
- <% $cust_main->payname %> |
-
-% if ( $conf->exists('show_bankstate') ) {
-
- | <% $paystate_label %> |
- <% $cust_main->paystate || ' ' %> |
-
+% && qsearch({ 'table' => 'cust_payby',
+% 'hashref' => { 'custnum' => $cust_main->custnum, },
+% 'extra_sql' => "AND payby IN ( 'CARD', 'CHEK' )",
+% 'order_by' => 'LIMIT 1',
+% })
+% )
+% {
+
+ | <% mt('Payment day of month') |h %> |
+ <% $cust_main->billday %>
+ |
+
% }
-% } elsif ( $cust_main->payby eq 'LECB' ) {
-% $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
-% my $payinfo = "$1-$2-$3";
-
- <% mt('Phone bill billing') |h %>
-
-
-
- | <% mt('Phone number') |h %> |
- <% $payinfo %> |
-
-% } elsif ( $cust_main->payby eq 'BILL' ) {
-
- <% mt('Billing') |h %>
-
-
-% if ( $cust_main->payinfo ) {
-
- | <% mt('P.O.') |h %> |
- <% $cust_main->payinfo %> |
-
-% }
-
-
-
- | <% mt('Attention') |h %> |
- <% $cust_main->payname |h %> |
-
-% } elsif ( $cust_main->payby eq 'COMP' ) {
-
- <% mt('Complimentary') |h %>
-
-
-
- | <% mt('Authorized by') |h %> |
- <% $cust_main->payinfo %> |
-
-%
-%#false laziness w/above etc.
-%my( $mon, $year );
-%my $date = $cust_main->paydate || '12-2037';
-%if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-% ( $mon, $year ) = ( $2, $1 );
-%} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-% ( $mon, $year ) = ( $1, $3 );
-%} else {
-% warn "unrecognized expiration date format: $date";
-% ( $mon, $year ) = ( '', '' );
-%}
-%
-
-
- | <% mt('Expiration') |h %> |
- <% "$mon/$year" %> |
-
+% if ( $cust_main->po_number ) {
+
+ | <% mt('Purchase Order #') |h %> |
+ <% $cust_main->po_number %> |
+
% }
% my $yes = emt('yes');
@@ -221,19 +81,22 @@
% if ( $conf->exists('enable_taxproducts') ) {
| <% mt('Tax location') |h %> |
- <% $cust_main->geocode('cch') %> |
+% my $tax_location = $conf->exists('tax-ship_address')
+% ? $cust_main->ship_location
+% : $cust_main->bill_location;
+ <% $tax_location->geocode('cch') %> |
% }
| <% mt('Postal mail invoices') |h %> |
- <% ( grep { $_ eq 'POST' } @invoicing_list ) ? $yes : $no %>
- |
-
-
- | <% mt('Fax invoices') |h %> |
-
- <% ( grep { $_ eq 'FAX' } @invoicing_list ) ? $yes : $no %>
+ <% ( grep { $_ eq 'POST' } @invoicing_list )
+ ? $yes. ( $cust_main->invoice_attn
+ ? ', attn: '. $cust_main->invoice_attn
+ : ''
+ )
+ : $no
+ %>
|
@@ -257,15 +120,27 @@
| <% mt('Invoice terms') |h %> |
- <% $cust_main->invoice_terms || emt('Default').' ('. ( $conf->config('invoice_default_terms') || emt('Payable upon receipt') ). ')' %>
+ <% $cust_main->invoice_terms
+ || emt('Default').' ('. ( $conf->config('invoice_default_terms', $cust_main->agentnum)
+ || emt('Payable upon receipt')
+ ).
+ ')'
+ %>
|
| <% mt('Credit limit') |h %> |
- <% length($cust_main->credit_limit) ?
- $money_char.sprintf("%.2f", $cust_main->credit_limit) :
- emt('Unlimited') %>
+% my $default_credit_limit = $conf->config('default_credit_limit');
+ <% length($cust_main->credit_limit)
+ ? $money_char. sprintf("%.2f", $cust_main->credit_limit)
+ : $default_credit_limit
+ ? "Default ($money_char". sprintf("%.2f", $default_credit_limit). ")"
+ : emt('Unlimited')
+ %>
+% if ( $cust_main->num_cust_main_credit_limit ) {
+ (incidents)
+% }
|
@@ -304,6 +179,13 @@
% }
+% if ( $cust_main->currency ) {
+
+ | <% mt('Invoicing currency') |h %> |
+ <% $cust_main->currency. ': '. code2currency($cust_main->currency) %> |
+
+% }
+
% if ( $cust_main->locale ) {
% my %locale_info = FS::Locales->locale_info($cust_main->locale);
@@ -314,12 +196,6 @@
-<%once>
-
-my $paystate_label = FS::Msgcat::_gettext('paystate');
-$paystate_label = 'Bank state' if $paystate_label =~/^paystate$/;
-
-
<%init>
my( $cust_main ) = @_;