X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=4d27765d0125776d8e9a56a2614b6ae2922fe79d;hp=d392f8a39cd8edcacf8b516f649240cb88cbb20d;hb=b3e85cf7a5a514f185c7d9c5ba50550c759c9ab5;hpb=d60478318bc9c3d94703d1845c0b40504c51a8cb diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index d392f8a39..4d27765d0 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -3,7 +3,6 @@ my $conf = new FS::Conf; -#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so my %uiview = (); my %uiadd = (); foreach my $part_svc ( qsearch('part_svc',{}) ) { @@ -15,15 +14,15 @@ print header("Customer View", menubar( 'Main Menu' => popurl(2) )); -print < + -END + +<% die "No customer specified (bad URL)!" unless $cgi->keywords; my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array @@ -34,16 +33,18 @@ die "Customer not found!" unless $cust_main; print qq!Edit this customer!; -print < + -END -print qq! | !. +<% + +print qq! | !. 'Cancel this customer' if $cust_main->ncancelled_pkgs; @@ -77,7 +78,7 @@ print ''; print "Billing address", &ntable("#cccccc"), "", &ntable("#cccccc",2), - 'Contact name', + 'Contact name', '', $cust_main->last, ', ', $cust_main->first, ''; @@ -106,8 +107,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 || ' ', '', @@ -167,7 +168,7 @@ print ''; print ''; print &ntable("#cccccc"), "", &ntable("#cccccc",2), - 'Customer number', + 'Customer number', $custnum, '', ; @@ -185,13 +186,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 = @@ -221,22 +222,21 @@ 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 ', + my $payinfo = $cust_main->payinfo_masked; + print 'Credit card ', ( $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' ), '', 'Card number', @@ -248,7 +248,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', @@ -261,7 +261,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, '', ; @@ -277,7 +277,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, '', @@ -291,7 +291,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) { print ''; if ( defined $cust_main->dbdef_table->column('comments') - && $cust_main->comments ) + && $cust_main->comments =~ /[^\s\n\r]/ ) { print "
Comments". &ntable("#cccccc"). "". &ntable("#cccccc",2). @@ -300,13 +300,25 @@ if ( defined $cust_main->dbdef_table->column('comments') ''; } -print ''; +%> + + -print '
'. - '
'. - qq!!. - ' +

'; +
+ +<% if ( $conf->config('payby-default') ne 'HIDE' ) { - print '
'. + print qq!
!. qq!!. qq!Description:!. @@ -349,21 +363,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) { } -print < -function cust_pkg_areyousure(href) { - if (confirm("Permanently delete included services and cancel this package?") == true) - window.location.href = href; -} -function svc_areyousure(href) { - if (confirm("Permanently unprovision and delete this service?") == true) - window.location.href = href; -} - -END - -print qq!
Packages !, -# qq!
Click on package number to view/edit package.!, +print qq!Packages !, qq!( Order and cancel packages (preserves services) )!, ; @@ -371,23 +371,15 @@ print qq!
Packages !, #get package info -my $packages = get_packages($cust_main); +my $packages = get_packages($cust_main, $conf); if ( @$packages ) { %> - - - - - - - - - - - + + + <% foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) { @@ -405,20 +397,127 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) { %> - <% - foreach (qw(setup last_bill next_bill susp expire cancel)) { - print qq! \n!; + #foreach (qw(setup last_bill next_bill susp expire cancel)) { + # print qq! \n!; + #} + print "'. + ''; + unless ( $pkg->{setup} ) { + print ''; + } else { + print "'; + print "' + if $pkg->{'last_bill'}; + print "' + if $pkg->{'susp'}; + } + + } else { + + if ( $pkg->{susp} ) { #status: suspended + print ''. + ''; + unless ( $pkg->{setup} ) { + print ''; + } else { + print "'; + } + print "' + if $pkg->{'last_bill'}; + # next bill ?? + print "' + if $pkg->{'expire'}; + print ''; + + } else { #status: active + + unless ( $pkg->{setup} ) { #not setup + + print ''; + print ''; + } + + } else { #setup + + unless ( $pkg->{freq} ) { + print "". + ''; + } else { + print ''. + ''; + } + + } + + print "' + if $pkg->{'last_bill'}; + print "' + if $pkg->{'next_bill'}; + print "' + if $pkg->{'expire'}; + if ( $pkg->{freq} ) { + print ''; + } + + } + } + print "
PackageDatesServices
SetupLast billNext billSusp.ExpireCancelPackageStatusServices
CLASS="pkgnum"><%=$pkg->{pkgnum}%> > - <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> ( <%=pkg_details_link($pkg)%> )
+ <%=$pkg->{pkgnum}%>: + <%=$pkg->{pkg}%> - <%=$pkg->{comment}%>
<% unless ($pkg->{cancel}) { %> ( <%=pkg_change_link($pkg)%> ) - ( <%=($pkg->{susp}) ? pkg_unsuspend_link($pkg) : pkg_suspend_link($pkg)%> | <%=pkg_cancel_link($pkg)%> ) - ( <%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg)%> ) + ( <%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg,$custnum)%> ) <% } %> 		! . pkg_datestr($pkg,$_) . qq!! . pkg_datestr($pkg,$_,$conf) . qq!". &itable(''); + + sub freq { + + #false laziness w/edit/part_pkg.cgi + my %freq = ( #move this + '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; + exists $freq{$freq} ? $freq{$freq} : "every $freq months"; + } + + #eomove + + if ( $pkg->{cancel} ) { #status: cancelled + + print '
Cancelled '. pkg_datestr($pkg,'cancel',$conf). '
Never billed
Setup ". + pkg_datestr($pkg, 'setup',$conf). '
Last bill ". + pkg_datestr($pkg, 'last_bill',$conf). '
Suspended ". + pkg_datestr($pkg, 'susp',$conf). '
Suspended '. pkg_datestr($pkg,'susp',$conf). '
Never billed
Setup ". + pkg_datestr($pkg, 'setup',$conf). '
Last bill ". + pkg_datestr($pkg, 'last_bill',$conf). '
Expires ". + pkg_datestr($pkg, 'expire',$conf). '
( '. pkg_unsuspend_link($pkg). + ' | '. pkg_cancel_link($pkg). ' )
Not yet billed ('; + unless ( $pkg->{freq} ) { + print 'one-time charge)
( '. pkg_cancel_link($pkg). + ' )'; + } else { + print 'billed '. freq($pkg->{freq}). ')
One-time charge
Billed '. + pkg_datestr($pkg,'setup',$conf). '
Active'. + ', billed '. freq($pkg->{freq}). '
Setup '. + pkg_datestr($pkg, 'setup',$conf). '
Last bill ". + pkg_datestr($pkg, 'last_bill',$conf). '
Next bill ". + pkg_datestr($pkg, 'next_bill',$conf). '
Expires ". + pkg_datestr($pkg, 'expire',$conf). '
( '. pkg_suspend_link($pkg). + ' | '. pkg_cancel_link($pkg). ' )
\n"; + if ($rowspan == 0) { print qq!\n!; next; } my $cnt = 0; @@ -434,180 +533,283 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) { } if ($svcpart->{count} < $svcpart->{quantity}) { print qq!\n! if ($cnt > 0); - print qq! !.svc_provision_link($pkg,$svcpart).qq!\n\n!; + print qq! !.svc_provision_link($pkg, $svcpart, $conf).qq!\n\n!; } } } -print '' +print ''; } #end display packages +%> - -print < -function cust_pay_areyousure(href) { - if (confirm("Are you sure you want to delete this payment?") - == true) - window.location.href = href; -} -function cust_pay_unapply_areyousure(href) { - if (confirm("Are you sure you want to unapply this payment?") - == true) - window.location.href = href; -} - -END - -if ( $conf->config('payby-default') ne 'HIDE' ) { - - #formatting - print qq!

Payment History!. - qq! ( !. - qq!!. - qq!Post payment | !. - qq!!. - qq!Post credit )!; +<% if ( $conf->config('payby-default') ne 'HIDE' ) { %> +

Payment History
+ Post cash/check payment + | Process credit card payment + | Process electronic check (ACH) payment +
Post credit +
+ + <% #get payment history - # - # major problem: this whole thing is way too sloppy. - # minor problem: the description lines need better formatting. - - my @history = (); #needed for mod_perl :) - - my %target = (); - - my @bills = qsearch('cust_bill',{'custnum'=>$custnum}); - foreach my $bill (@bills) { - my($bref)=$bill->hashref; - my $bpre = ( $bill->owed > 0 ) - ? ' Open ' - : ''; - my $bpost = ( $bill->owed > 0 ) ? '' : ''; - push @history, - $bref->{_date} . qq!\t${bpre}Invoice #! . $bref->{invnum} . - qq! (Balance \$! . $bill->owed . qq!)$bpost\t! . - $bref->{charged} . qq!\t\t\t!; - - my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } ); - # my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } ); - # my($payment); - foreach my $cust_bill_pay (@cust_bill_pay) { - my $payment = $cust_bill_pay->cust_pay; - my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date, - $cust_bill_pay->invnum, - $payment->payby, - $payment->payinfo, - $cust_bill_pay->amount, - ); - $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4)) - if $payby eq 'CARD'; - my $target = "$payby$payinfo"; - $payby =~ s/^BILL$/Check #/ if $payinfo; - $payby =~ s/^(CARD|COMP)$/$1 /; - my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments') - ? qq! (delete)! - : ''; - my $unapply = - $payment->closed !~ /^Y/i && $conf->exists('unapplypayments') - ? qq! (unapply)! - : ''; - push @history, - "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete$unapply\t\t$paid\t\t\t$target"; + my @history = (); + + #invoices + foreach my $cust_bill ($cust_main->cust_bill) { + my $pre = ( $cust_bill->owed > 0 ) + ? 'Open ' + : ''; + my $post = ( $cust_bill->owed > 0 ) ? '' : ''; + my $invnum = $cust_bill->invnum; + push @history, { + 'date' => $cust_bill->_date, + 'desc' => qq!!. $pre. + "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'. + $post. '', + 'charge' => $cust_bill->charged, + }; + } + + #payments (some false laziness w/credits) + foreach my $cust_pay ($cust_main->cust_pay) { + + my $payby = $cust_pay->payby; + my $payinfo = $payby eq 'CARD' + ? $cust_pay->payinfo_masked + : $cust_pay->payinfo; + my @cust_bill_pay = $cust_pay->cust_bill_pay; + my @cust_pay_refund = $cust_pay->cust_pay_refund; + + my $target = "$payby$payinfo"; + $payby =~ s/^BILL$/Check #/ if $payinfo; + $payby =~ s/^BILL$//; + $payby =~ s/^(CARD|COMP)$/$1 /; + my $info = $payby ? " ($payby$payinfo)" : ''; + + my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' ); + if ( scalar(@cust_bill_pay) == 0 + && scalar(@cust_pay_refund) == 0 ) { + #completely unapplied + $pre = 'Unapplied '; + $post = ''; + $apply = qq! (apply)'; + } elsif ( scalar(@cust_bill_pay) == 1 + && scalar(@cust_pay_refund) == 0 + && $cust_pay->unapplied == 0 ) { + #applied to one invoice, the usual situation + $desc = ' applied to Invoice #'. $cust_bill_pay[0]->invnum; + } elsif ( scalar(@cust_bill_pay) == 0 + && scalar(@cust_pay_refund) == 1 + && $cust_pay->unapplied == 0 ) { + #applied to one refund + $desc = ' refunded on '. time2str("%D", $cust_pay_refund[0]->_date); + } else { + #complicated + $desc = '
'; + foreach my $app ( sort { $a->_date <=> $b->_date } + ( @cust_bill_pay, @cust_pay_refund ) ) { + if ( $app->isa('FS::cust_bill_pay') ) { + $desc .= '  '. + '$'. $app->amount. + ' applied to Invoice #'. $app->invnum. + '
'; + #' on '. time2str("%D", $cust_bill_pay->_date). + } elsif ( $app->isa('FS::cust_pay_refund') ) { + $desc .= '  '. + '$'. $app->amount. + ' refunded on'. time2str("%D", $app->_date). + '
'; + } else { + die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund"; + } + } + if ( $cust_pay->unapplied > 0 ) { + $desc .= '  '. + '$'. + $cust_pay->unapplied. ' unapplied'. + qq! (apply)'. + '
'; + } } - - my(@cust_credit_bill)= - qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } ); - foreach my $cust_credit_bill (@cust_credit_bill) { - my $cust_credit = $cust_credit_bill->cust_credit; - my($date, $invnum, $crednum, $amount, $reason, $app_date ) = ( - $cust_credit->_date, - $cust_credit_bill->invnum, - $cust_credit_bill->crednum, - $cust_credit_bill->amount, - $cust_credit->reason, - time2str("%D", $cust_credit_bill->_date), - ); - push @history, - "$date\tCredit #$crednum: $reason
". - "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t"; + + my $refund = ''; + my $refund_days = $conf->config('card_refund-days') || 120; + if ( $cust_pay->closed !~ /^Y/i + && $cust_pay->payby =~ /^(CARD|CHEK)$/ + && time-$cust_pay->_date < $refund_days*86400 + && $cust_pay->unrefunded > 0 + ) { + $refund = qq! (refund)!; } - } - - my @credits = grep { scalar(my @array = $_->cust_credit_refund) } - qsearch('cust_credit',{'custnum'=>$custnum}); - foreach my $credit (@credits) { - my($cref)=$credit->hashref; - my(@cust_credit_refund)= - qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } ); - foreach my $cust_credit_refund (@cust_credit_refund) { - my $cust_refund = $cust_credit_refund->cust_credit; - my($date, $crednum, $amount, $reason, $app_date ) = ( - $credit->_date, - $credit->crednum, - $cust_credit_refund->amount, - $credit->reason, - time2str("%D", $cust_credit_refund->_date), - ); - push @history, - "$date\tCredit #$crednum: $reason
". - "(applied to refund on $app_date)\t\t\t$amount\t"; + + my $void = ''; + if ( $cust_pay->closed !~ /^Y/i + && $cust_pay->payby !~ /^(CARD|CHEK)$/ + ) { + $void = qq! (!. + qq!void)!; } + + my $delete = ''; + if ( $cust_pay->closed !~ /^Y/i && $conf->exists('deletepayments') ) { + $delete = qq! (!. + qq!delete)!; + } + + my $unapply = ''; + if ( $cust_pay->closed !~ /^Y/i + && $conf->exists('unapplypayments') + && scalar(@cust_bill_pay) ) { + $unapply = qq! (!. + qq!unapply)!; + } + + push @history, { + 'date' => $cust_pay->_date, + 'desc' => $pre. "Payment$post$info$desc". + "$apply$refund$void$delete$unapply", + 'payment' => $cust_pay->paid, + 'target' => $target, + }; } + + #voided payments + foreach my $cust_pay_void ($cust_main->cust_pay_void) { + + my $payby = $cust_pay_void->payby; + my $payinfo = $payby eq 'CARD' + ? $cust_pay_void->payinfo_masked + : $cust_pay_void->payinfo; + + $payby =~ s/^BILL$/Check #/ if $payinfo; + $payby =~ s/^BILL$//; + $payby =~ s/^(CARD|COMP)$/$1 /; + my $info = $payby ? " ($payby$payinfo)" : ''; + + push @history, { + 'date' => $cust_pay_void->_date, + 'desc' => "Payment $info voided ". + time2str("%D", $cust_pay_void->void_date). + " by ". $cust_pay_void->otaker. '', + 'void_payment' => $cust_pay_void->paid, + }; - @credits = grep { $_->credited > 0 } - qsearch('cust_credit',{'custnum'=>$custnum}); - foreach my $credit (@credits) { - my($cref)=$credit->hashref; - push @history, - $cref->{_date} . "\t" . - qq!!. - 'Unapplied credit #' . - $cref->{crednum} . ": ". - $cref->{reason} . "\t\t\t" . $credit->credited . "\t"; } - - my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } ); - foreach my $refund (@refunds) { - my($rref)=$refund->hashref; - my($refundnum) = ( - $refund->refundnum, - ); - - push @history, - $rref->{_date} . "\tRefund #$refundnum, (" . - $rref->{payby} . " " . $rref->{payinfo} . ") by " . - $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" . - $rref->{refund}; + + #credits (some false laziness w/payments) + foreach my $cust_credit ($cust_main->cust_credit) { + + my @cust_credit_bill = $cust_credit->cust_credit_bill; + my @cust_credit_refund = $cust_credit->cust_credit_refund; + + my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' ); + if ( scalar(@cust_credit_bill) == 0 + && scalar(@cust_credit_refund) == 0 ) { + #completely unapplied + $pre = 'Unapplied '; + $post = ''; + $apply = qq! (apply)'; + } elsif ( scalar(@cust_credit_bill) == 1 + && scalar(@cust_credit_refund) == 0 + && $cust_credit->credited == 0 ) { + #applied to one invoice, the usual situation + $desc = ' applied to Invoice #'. $cust_credit_bill[0]->invnum; + } elsif ( scalar(@cust_credit_bill) == 0 + && scalar(@cust_credit_refund) == 1 + && $cust_credit->credited == 0 ) { + #applied to one refund + $desc = ' refunded on '. time2str("%D", $cust_credit_refund[0]->_date); + } else { + #complicated + $desc = '
'; + foreach my $app ( sort { $a->_date <=> $b->_date } + ( @cust_credit_bill, @cust_credit_refund ) ) { + if ( $app->isa('FS::cust_credit_bill') ) { + $desc .= '  '. + '$'. $app->amount. + ' applied to Invoice #'. $app->invnum. + '
'; + #' on '. time2str("%D", $app->_date). + } elsif ( $app->isa('FS::cust_credit_refund') ) { + $desc .= '  '. + '$'. $app->amount. + ' refunded on'. time2str("%D", $app->_date). + '
'; + } else { + die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund"; + } + } + if ( $cust_credit->credited > 0 ) { + $desc .= '  $'. + $cust_credit->credited. ' unapplied'. + qq! (apply)'. + '
'; + } + } +# + my $delete = ''; + if ( $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits') ) { + $delete = qq! (!. + qq!delete)!; + } + + my $unapply = ''; + if ( $cust_credit->closed !~ /^Y/i + && $conf->exists('unapplycredits') + && scalar(@cust_credit_bill) ) { + $unapply = qq! (!. + qq!unapply)!; + } + + push @history, { + 'date' => $cust_credit->_date, + 'desc' => $pre. "Credit$post by ". $cust_credit->otaker. + ' ('. $cust_credit->reason. ')'. + "$desc$apply$delete$unapply", + 'credit' => $cust_credit->amount, + }; + } - - my @unapplied_payments = - grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } ); - foreach my $payment (@unapplied_payments) { - my $payby = $payment->payby; - my $payinfo = $payment->payinfo; - #false laziness w/above - $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4)) - if $payby eq 'CARD'; - my $target = "$payby$payinfo"; + + #refunds + foreach my $cust_refund ($cust_main->cust_refund) { + + my $payby = $cust_refund->payby; + my $payinfo = $payby eq 'CARD' + ? $cust_refund->payinfo_masked + : $cust_refund->payinfo; + $payby =~ s/^BILL$/Check #/ if $payinfo; $payby =~ s/^(CARD|COMP)$/$1 /; - my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments') - ? qq! (delete)! - : ''; - push @history, - $payment->_date. "\t". - 'Unapplied payment #' . - $payment->paynum . " ($payby$payinfo) ". - '('. - "apply)$delete". - "\t\t" . $payment->unapplied . "\t\t\t$target"; + + push @history, { + 'date' => $cust_refund->_date, + 'desc' => "Refund ($payby$payinfo) by ". $cust_refund->otaker, + 'refund' => $cust_refund->refund, + }; + } - #formatting - print &table(), < + + <%= table() %> Date Description @@ -617,149 +819,173 @@ if ( $conf->config('payby-default') ne 'HIDE' ) { Refund Balance -END - + + <% #display payment history - + + my %target; my $balance = 0; - foreach my $item (sort keyfield_numerically @history) { - my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item); - $charge ||= 0; - $payment ||= 0; - $credit ||= 0; - $refund ||= 0; - $balance += $charge - $payment; - $balance -= $credit - $refund; + foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) { + + my $charge = exists($item->{'charge'}) + ? sprintf('$%.2f', $item->{'charge'}) + : ''; + my $payment = exists($item->{'payment'}) + ? sprintf('- $%.2f', $item->{'payment'}) + : ''; + $payment ||= sprintf('- $%.2f', $item->{'void_payment'}) + if exists($item->{'void_payment'}); + my $credit = exists($item->{'credit'}) + ? sprintf('- $%.2f', $item->{'credit'}) + : ''; + my $refund = exists($item->{'refund'}) + ? sprintf('$%.2f', $item->{'refund'}) + : ''; + + my $target = exists($item->{'target'}) ? $item->{'target'} : ''; + + $balance += $item->{'charge'} if exists $item->{'charge'}; + $balance -= $item->{'payment'} if exists $item->{'payment'}; + $balance -= $item->{'credit'} if exists $item->{'credit'}; + $balance += $item->{'refund'} if exists $item->{'refund'}; $balance = sprintf("%.2f", $balance); $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp - $target = '' unless defined $target; + ( my $showbalance = '$'. $balance ) =~ s/^\$\-/- \$/; + + %> - print ""; - print qq!! unless $target && $target{$target}++; - print time2str("%D",$date); - print '' if $target && $target{$target} == 1; - print "", - "$desc", - "", - ( $charge ? "\$".sprintf("%.2f",$charge) : '' ), - "", - "", - ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ), - "", - "", - ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ), - "", - "", - ( $refund ? "\$".sprintf("%.2f",$refund) : '' ), - "", - "\$" . $balance, - "", - "\n"; - } + + + <% unless ( !$target || $target{$target}++ ) { %> + + <% } %> + <%= time2str("%D",$item->{'date'}) %> + <% if ( $target && $target{$target} == 1 ) { %> + + <% } %> + + + <%= $item->{'desc'} %> + <%= $charge %> + <%= $payment %> + <%= $credit %> + <%= $refund %> + <%= $showbalance %> + + + <% } %> - print ""; - -} + -print ''; - -#subroutiens -sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; } +<% } %> -%> + <% - +#subroutines sub get_packages { - -my $cust_main = shift or return undef; - -my @packages = (); - -foreach my $cust_pkg (($conf->exists('hidecancelledpackages') ? ($cust_main->ncancelled_pkgs) - : ($cust_main->all_pkgs))) { - - my $part_pkg = $cust_pkg->part_pkg; - - my %pkg = (); - $pkg{pkgnum} = $cust_pkg->pkgnum; - $pkg{pkg} = $part_pkg->pkg; - $pkg{pkgpart} = $part_pkg->pkgpart; - $pkg{comment} = $part_pkg->getfield('comment'); - $pkg{setup} = $cust_pkg->getfield('setup'); - $pkg{last_bill} = $cust_pkg->getfield('last_bill'); - $pkg{next_bill} = $cust_pkg->getfield('bill'); - $pkg{susp} = $cust_pkg->getfield('susp'); - $pkg{expire} = $cust_pkg->getfield('expire'); - $pkg{cancel} = $cust_pkg->getfield('cancel'); - - $pkg{svcparts} = []; - - foreach my $pkg_svc (qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })) { - - next if ($pkg_svc->quantity == 0); - - my $part_svc = qsearchs('part_svc', { 'svcpart' => $pkg_svc->svcpart }); - - my $svcpart = {}; - $svcpart->{svcpart} = $part_svc->svcpart; - $svcpart->{svc} = $part_svc->svc; - $svcpart->{svcdb} = $part_svc->svcdb; - $svcpart->{quantity} = $pkg_svc->quantity; - $svcpart->{count} = 0; - - $svcpart->{services} = []; - - foreach my $cust_svc (qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum, - 'svcpart' => $part_svc->svcpart } )) { - - my $svc = {}; - $svc->{svcnum} = $cust_svc->svcnum; - $svc->{label} = ($cust_svc->label)[1]; + my $cust_main = shift or return undef; + my $conf = shift; + + my @packages = (); + + foreach my $cust_pkg ( + $conf->exists('hidecancelledpackages') + ? $cust_main->ncancelled_pkgs + : $cust_main->all_pkgs + ) { + + my $part_pkg = $cust_pkg->part_pkg; + + my %pkg = (); + $pkg{pkgnum} = $cust_pkg->pkgnum; + $pkg{pkg} = $part_pkg->pkg; + $pkg{pkgpart} = $part_pkg->pkgpart; + $pkg{comment} = $part_pkg->getfield('comment'); + $pkg{freq} = $part_pkg->freq; + $pkg{setup} = $cust_pkg->getfield('setup'); + $pkg{last_bill} = $cust_pkg->getfield('last_bill'); + $pkg{next_bill} = $cust_pkg->getfield('bill'); + $pkg{susp} = $cust_pkg->getfield('susp'); + $pkg{expire} = $cust_pkg->getfield('expire'); + $pkg{cancel} = $cust_pkg->getfield('cancel'); + + my %svcparts = map { + $_->svcpart => { + $_->part_svc->hash, + 'quantity' => $_->quantity, + 'count' => $cust_pkg->num_cust_svc($_->svcpart), + #'services' => [], + }; + } $part_pkg->pkg_svc; + + foreach my $cust_svc ( $cust_pkg->cust_svc ) { + #warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n"; + my $svc = { + 'svcnum' => $cust_svc->svcnum, + 'label' => ($cust_svc->label)[1], + }; + + #false laziness with above, to catch extraneous services. whole + #damn thing should be OO... + my $svcpart = ( $svcparts{$cust_svc->svcpart} ||= { + $cust_svc->part_svc->hash, + 'quantity' => 0, + 'count' => $cust_pkg->num_cust_svc($cust_svc->svcpart), + #'services' => [], + } ); push @{$svcpart->{services}}, $svc; - $svcpart->{count}++; - } - push @{$pkg{svcparts}}, $svcpart; + $pkg{svcparts} = [ values %svcparts ]; + push @packages, \%pkg; + } - - push @packages, \%pkg; - -} - -return \@packages; + + return \@packages; } sub svc_link { - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svcpart->{svc}!; + my ($svcpart, $svc) = (shift,shift) or return ''; + return qq!$svcpart->{svc}!; } sub svc_label_link { - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svc->{label}!; + my ($svcpart, $svc) = (shift,shift) or return ''; + return qq!$svc->{label}!; } sub svc_provision_link { - my ($pkg, $svcpart) = (shift,shift) or return ''; - return qq!! . - qq!Provision $svcpart->{svc} (! . ($svcpart->{quantity} - $svcpart->{count}) . qq!)!; + my ($pkg, $svcpart, $conf) = @_; + ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/ /g; + my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}"; + my $num_left = $svcpart->{quantity} - $svcpart->{count}; + + my $link = qq!!. + "Provision $svc_nbsp ($num_left)"; + if ( $conf->exists('legacy_link') ) { + $link .= '
'. + qq!!. + "Link to legacy $svc_nbsp ($num_left)"; + } + $link; } sub svc_unprovision_link { my $svc = shift or return ''; - return qq!Unprovision!; + qq!Unprovision!; } # This should be generalized to use config options to determine order. @@ -776,20 +1002,19 @@ sub pkgsort_pkgnum_cancel { } sub pkg_datestr { - my ($pkg,$field) = (shift,shift) or return ''; - return $pkg->{$field} ? time2str('%D
%l:%M:%S%P %z', - $pkg->{$field}) - : ' '; -} - -sub pkg_details_link { - my $pkg = shift or return ''; - return qq!Details!; + my($pkg, $field, $conf) = @_ or return ''; + return ' ' unless $pkg->{$field}; + my $format = $conf->exists('pkg_showtimes') + ? '%D %l:%M:%S%P %z' + : '%b %o, %Y'; + ( my $strip = time2str($format, $pkg->{$field}) ) =~ s/ (\d)/$1/g; + $strip; } sub pkg_change_link { my $pkg = shift or return ''; - return qq!Change package!; + return qq!!. + qq!Change package!; } sub pkg_suspend_link { @@ -804,17 +1029,22 @@ sub pkg_unsuspend_link { sub pkg_cancel_link { my $pkg = shift or return ''; - return qq!Cancel!; + qq!!. + qq!Cancel now | !. + qq!Cancel later!; } sub pkg_dates_link { my $pkg = shift or return ''; - return qq!Edit dates!; + qq!Edit dates!; } sub pkg_customize_link { my $pkg = shift or return ''; - return qq!Customize!; + my $custnum = shift; + qq!Customize!; } %>