X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=ee5f86973b6c871ec4a9a350aebbdcd512c51efb;hb=0fd894c50eaa84169115ccbb682a53f5148a8c9c;hp=83f114ef98bbac76f0fe1dd0466916134ee2a33a;hpb=f6c14a1aa55d317747e56d4c0d669b4c902018c4;p=freeside.git
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 83f114ef9..ee5f86973 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, ' |
',
@@ -554,6 +554,11 @@ function cust_pay_unapply_areyousure(href) {
== true)
window.location.href = href;
}
+function cust_credit_areyousure(href) {
+ if (confirm("Are you sure you want to delete this credit?")
+ == true)
+ window.location.href = href;
+}
END
@@ -628,9 +633,13 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
$cust_credit->reason,
time2str("%D", $cust_credit_bill->_date),
);
+ my $delete =
+ $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits')
+ ? qq! (delete)!
+ : '';
push @history,
"$date\tCredit #$crednum: $reason
".
- "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
+ "(applied to invoice #$invnum on $app_date)$delete\t\t\t$amount\t";
}
}
@@ -659,12 +668,16 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
qsearch('cust_credit',{'custnum'=>$custnum});
foreach my $credit (@credits) {
my($cref)=$credit->hashref;
+ my $delete =
+ $credit->closed !~ /^Y/i && $conf->exists('deletecredits')
+ ? qq! (delete)!
+ : '';
push @history,
$cref->{_date} . "\t" .
qq!!.
'Unapplied credit #' .
$cref->{crednum} . ": ".
- $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
+ $cref->{reason} . "$delete\t\t\t" . $credit->credited . "\t";
}
my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );