X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=fb015671f6a5e1c14b2fe59a96688917effb40db;hp=fb3f0f11129d01a192fa04c9fd58d929ccae3e61;hb=cc19608aa931a3f57e3f4a899e0ef49b2590877e;hpb=c0e55cc3cd861b082b1318829cdd0780fe8b934c
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index fb3f0f111..fb015671f 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -76,7 +76,7 @@ print '| ';
print "Billing address", &ntable("#cccccc"), " | | ",
&ntable("#cccccc",2),
- ' |
| Contact name | ',
+ '
| Contact name | ',
'',
$cust_main->last, ', ', $cust_main->first,
' | ';
@@ -105,8 +105,8 @@ print '
',
$cust_main->country,
'',
;
- my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
- my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
+ my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
+ my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
print '| '. $daytime_label.
' | ',
$cust_main->daytime || ' ', ' |
',
@@ -166,7 +166,7 @@ print '';
print '';
print &ntable("#cccccc"), " | | ", &ntable("#cccccc",2),
- ' |
| Customer number | ',
+ ' |
| Customer number | ',
$custnum, ' |
',
;
@@ -184,13 +184,13 @@ print '';
my $referral = qsearchs('part_referral', {
'refnum' => $cust_main->refnum
} );
- print ' | | Advertising source | ',
+ print ' |
| Advertising source | ',
$referral->refnum, ": ", $referral->referral, ' |
';
}
print '| Order taker | ',
$cust_main->otaker, ' |
';
- print '| Referring Customer | ';
+ print ' |
| Referring Customer | ';
my $referring_cust_main = '';
if ( $cust_main->referral_custnum
&& ( $referring_cust_main =
@@ -220,22 +220,22 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
print "Billing information (",
qq!!, "Bill now)",
&ntable("#cccccc"), " |
| ", &ntable("#cccccc",2),
- ' |
| Tax exempt | ',
+ ' |
| Tax exempt | ',
$cust_main->tax ? 'yes' : 'no',
' |
',
- '| Postal invoices | ',
+ ' |
| Postal invoices | ',
( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no',
' |
',
- '| Email invoices | ',
+ ' |
| Email invoices | ',
join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no',
' |
',
- '| Billing type | ',
+ ' |
| Billing type | ',
;
if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) {
my $payinfo = $cust_main->payinfo;
$payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
- print 'Credit card ',
+ print 'Credit card ',
( $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' ),
' |
',
'| Card number | ',
@@ -247,7 +247,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
;
} elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
my( $account, $aba ) = split('@', $cust_main->payinfo );
- print 'Electronic check',
+ print 'Electronic check ',
( $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' ),
' |
',
'| Account number | ',
@@ -260,7 +260,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
} elsif ( $cust_main->payby eq 'LECB' ) {
$cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
my $payinfo = "$1-$2-$3";
- print 'Phone bill billing |
',
+ print 'Phone bill billing',
'| Phone number | ',
$payinfo, ' |
',
;
@@ -276,7 +276,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
;
} elsif ( $cust_main->payby eq 'COMP' ) {
print 'Complimentary',
- '| Authorized by | ',
+ ' |
| Authorized by | ',
$cust_main->payinfo, ' |
',
'| Expiration | ',
$cust_main->paydate, ' |
',
@@ -412,14 +412,17 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
sub freq {
+ #false laziness w/edit/part_pkg.cgi
my %freq = ( #move this
- 1 => 'monthly',
- 2 => 'bi-monthly',
- 3 => 'quarterly',
- 6 => 'semi-annually',
- 12 => 'annually',
- 24 => 'bi-annually',
- 36 => 'tri-annually',
+ '1d' => 'daily',
+ '1w' => 'weekly',
+ '2w' => 'biweekly (every 2 weeks)',
+ '1' => 'monthly',
+ '2' => 'bimonthly (every 2 months)',
+ '3' => 'quarterly (every 3 months)',
+ '6' => 'semiannually (every 6 months)',
+ '12' => 'annually',
+ '24' => 'biannually (every 2 years)',
);
my $freq = shift;