From c00273147a2d400779fcdaf34f171b2180faa453 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 21 Dec 2001 21:40:24 +0000 Subject: add name/address to post payment screen get rid of some $-0.00 yay for ieee fp --- httemplate/edit/cust_pay.cgi | 105 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 95 insertions(+), 10 deletions(-) (limited to 'httemplate/edit') diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi index 3c0dbb2fe..6669b9de4 100755 --- a/httemplate/edit/cust_pay.cgi +++ b/httemplate/edit/cust_pay.cgi @@ -1,13 +1,18 @@ <% -# +# use strict; use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid ); use Date::Format; use CGI; use CGI::Carp qw(fatalsToBrowser); +use FS::Conf; use FS::UID qw(cgisuidsetup); -use FS::CGI qw(header popurl); +use FS::CGI qw(header popurl ntable); + +my $conf = new FS::Conf; + +my $countrydefault = $conf->config('countrydefault') || 'US'; $cgi = new CGI; cgisuidsetup($cgi); @@ -44,32 +49,112 @@ print qq!Error: !, $cgi->param('error'), "" if $cgi->param('error'); -print < END +my $custnum; if ( $link eq 'invnum' ) { - print "Invoice #$linknum"; + + my $cust_bill = qsearchs('cust_bill', { 'invnum' => $linknum } ) + or die "unknown invnum $linknum"; + print "Invoice #$linknum". ntable("#cccccc",2). + 'Date'. + time2str("%D", $cust_bill->_date). ''. + 'Items'; + foreach ( $cust_bill->cust_bill_pkg ) { #false laziness with FS::cust_bill + if ( $_->pkgnum ) { + + my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } ); + my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart}); + my($pkg)=$part_pkg->pkg; + + if ( $_->setup != 0 ) { + print "$pkg Setup
"; # $money_char. sprintf("%10.2f",$_->setup); + print join('
', + map { " ". $_->[0]. ": ". $_->[1] } $cust_pkg->labels + ). '
'; + } + + if ( $_->recur != 0 ) { + print + "$pkg (" . time2str("%x",$_->sdate) . " - " . + time2str("%x",$_->edate) . ")
"; + #$money_char. sprintf("%10.2f",$_->recur) + print join('
', + map { '--->'. $_->[0]. ": ". $_->[1] } $cust_pkg->labels + ). '
'; + } + + } else { #pkgnum Tax + print "Tax
" # $money_char. sprintf("%10.2f",$_->setup) + if $_->setup != 0; + } + + } + print ''; + + $custnum = $cust_bill->custnum; + } elsif ( $link eq 'custnum' ) { - print "Customer #$linknum"; + $custnum = $linknum; } -print qq!
Date: !, time2str("%D",$_date), qq!!; +print "

Customer #$custnum". ntable('#e8e8e8'); +my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ) + or die "unknown custnum $custnum"; + +print ''. ntable("#cccccc",2). + 'Billing'. + $cust_main->getfield('last'). ', '. $cust_main->first. '
'; +print $cust_main->company. '
' if $cust_main->company; +print $cust_main->address1. '
'; +print $cust_main->address2. '
' if $cust_main->address2; +print $cust_main->city. ', '. $cust_main->state. ' '. $cust_main->zip. '
'; +print $cust_main->country. '
' if $cust_main->country + && $cust_main->country ne $countrydefault; + +print ''. + ''; + +if ( defined $cust_main->dbdef_table->column('ship_last') ) { + + print ''. ntable("#cccccc",2). + 'Service'. + $cust_main->getfield('ship_last'). ', '. $cust_main->ship_first. '
'; + print $cust_main->ship_company. '
' if $cust_main->ship_company; + print $cust_main->ship_address1. '
'; + print $cust_main->ship_address2. '
' if $cust_main->ship_address2; + print $cust_main->ship_city. ', '. $cust_main->ship_state. ' '. $cust_main->ship_zip. '
'; + print $cust_main->ship_country. '
' + if $cust_main->ship_country && $cust_main->ship_country ne $countrydefault; + + print ''. + ''; +} + +print ''; + + +print '

Payment'. ntable("#cccccc", 2). + 'Date'. + time2str("%D",$_date). ''. + qq!!; -print qq!
Amount \$!; +print qq!Amount\$!; -print qq!
Payby: $payby!; +print qq!Payby$payby!; #payinfo (check # now as payby="BILL" hardcoded.. what to do later?) -print qq!
Check #!; +print qq!Check #!; #paybatch print qq!!; print < +
END -- cgit v1.2.1