X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_bill.cgi;h=45e19d4365d47049d57d69b966086efec0fe3dd3;hb=c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9;hp=c217cc3896205bf886880df592963b11954358c9;hpb=18c025613fa052cf4ba8d484f1296cc2a1719a24;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index c217cc389..45e19d436 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,4 +1,3 @@
-
<%
#untaint invnum
@@ -9,78 +8,144 @@ my $invnum = $3;
my $conf = new FS::Conf;
+my @payby = grep /\w/, $conf->config('payby');
+#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
+@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
+ unless @payby;
+my %payby = map { $_=>1 } @payby;
+
my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
die "Invoice #$invnum not found!" unless $cust_bill;
my $custnum = $cust_bill->getfield('custnum');
#my $printed = $cust_bill->printed;
-print header('Invoice View', menubar(
+my $link = $templatename ? "$templatename-$invnum" : $invnum;
+
+%>
+<%= include("/elements/header.html",'Invoice View', menubar(
"Main Menu" => $p,
"View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-));
-
-print qq!Enter payments (check/cash) against this invoice | !
- if $cust_bill->owed > 0;
-
-print qq!Reprint this invoice!;
-if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
- print qq! | !.
- qq!Re-email this invoice!;
-}
-
-print qq! | Refax this invoice!
- if ($conf->exists('hylafax'));
-
-print '
';
-
-if ( $conf->exists('invoice_latex') ) {
- my $link = "${p}view/cust_bill-pdf.cgi?";
- $link .= "$templatename-" if $templatename;
- $link .= "$invnum.pdf";
- print menubar(
- 'View typeset invoice' => $link,
- ), '
';
-}
-
-#false laziness with search/cust_bill_event.cgi
-
-unless ( $templatename ) {
- print table(). '
Event | Date | Status |
';
- foreach my $cust_bill_event (
- sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
- ) {
+)) %>
+
+<% if ( $cust_bill->owed > 0
+ && ( $payby{'BILL'} || $payby{'CASH'} || $payby{'WEST'} || $payby{'MCRD'} )
+ )
+ {
+ my $s = 0;
+%>
+
+ Post
+
+ <% if ( $payby{'BILL'} ) { %>
+
+ <%= $s++ ? ' | ' : '' %>
+ check
+
+ <% } %>
+
+ <% if ( $payby{'CASH'} ) { %>
+
+ <%= $s++ ? ' | ' : '' %>
+ cash
+
+ <% } %>
+
+ <% if ( $payby{'WEST'} ) { %>
+
+ <%= $s++ ? ' | ' : '' %>
+ Western Union
+
+ <% } %>
+
+ <% if ( $payby{'MCRD'} ) { %>
+
+ <%= $s++ ? ' | ' : '' %>
+ manual credit card
+
+ <% } %>
+
+ payment against this invoice
+
+<% } %>
+
+Re-print this invoice
+
+<% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { %>
+ | Re-email
+ this invoice
+<% } %>
+
+<% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) { %>
+ | Re-fax
+ this invoice
+<% } %>
+
+
+
+<% if ( $conf->exists('invoice_latex') ) { %>
+ View typeset invoice
+
+<% } %>
+
+<% #false laziness with search/cust_bill_event.cgi
+ unless ( $templatename ) { %>
+
+ <%= table() %>
+
+ Event |
+ Date |
+ Status |
+
+
+ <% foreach my $cust_bill_event (
+ sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
+ ) {
+
my $status = $cust_bill_event->status;
$status .= ': '. encode_entities($cust_bill_event->statustext)
if $cust_bill_event->statustext;
my $part_bill_event = $cust_bill_event->part_bill_event;
- print ''. $part_bill_event->event;
+ %>
+ |
+ <%= $part_bill_event->event %>
- if (
- $part_bill_event->plan eq 'send_alternate'
- && $part_bill_event->plandata =~ /^templatename (.*)$/m
- ) {
- my $templatename = $1;
- print qq! ( !.
- 'view text | '.
- qq!!.
- 'view typeset )';
- }
+ <% if ( $part_bill_event->templatename ) {
+ my $alt_templatename = $part_bill_event->templatename;
+ my $alt_link = "$alt_templatename-$invnum";
+ %>
+ ( view
+ | view
+ typeset
+ | re-print
+ <% if ( grep { $_ ne 'POST' }
+ $cust_bill->cust_main->invoicing_list ) { %>
+ | re-email
+ <% } %>
+
+ <% if ( $conf->exists('hylafax')
+ && length($cust_bill->cust_main->fax) ) { %>
+ | re-fax
+ <% } %>
+
+ )
+ <% } %>
- print ' | '.
- time2str("%a %b %e %T %Y", $cust_bill_event->_date). ' | '.
- $status. ' |
';
- }
- print '
';
-}
-
-print '', $cust_bill->print_text('', $templatename);
-
- #formatting
- print <
-