X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fgraph%2Fmoney_time.cgi;h=aa17eb2f45b16186ce4fbebb940fa68359f2acab;hp=fbc31c0687ba6d98654fe4edf9c0e1b884519ec4;hb=3f2a7b01b59902faed5767d81e2959e131bdbdfd;hpb=978fea1c303551f90c95ae852b6463951b78246b diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi index fbc31c068..aa17eb2f4 100644 --- a/httemplate/graph/money_time.cgi +++ b/httemplate/graph/money_time.cgi @@ -1,5 +1,5 @@ <% include('elements/monthly.html', - 'title' => $agentname. + 'title' => $agentname. $referralname. 'Sales, Credits and Receipts Summary', 'items' => \@items, 'labels' => \%label, @@ -7,6 +7,8 @@ 'colors' => \%color, 'links' => \%link, 'agentnum' => $agentnum, + 'refnum' => $refnum, + 'cust_classnum'=> \@classnums, 'nototal' => scalar($cgi->param('12mo')), ) %> @@ -22,35 +24,52 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { $agent = qsearchs('agent', { 'agentnum' => $agentnum } ); die "agentnum $agentnum not found!" unless $agent; } - my $agentname = $agent ? $agent->agent.' ' : ''; -my @items = qw( invoiced netsales +my @classnums; +if ( $cgi->param('cust_classnum') ) { + @classnums = grep /^\d+$/, $cgi->param('cust_classnum'); +} + +my( $refnum, $part_referral ) = ('', ''); +if ( $cgi->param('refnum') =~ /^(\d+)$/ ) { + $refnum = $1; + $part_referral = qsearchs('part_referral', { 'refnum' => $refnum } ); + die "refnum $refnum not found!" unless $part_referral; +} +my $referralname = $part_referral ? $part_referral->referral.' ' : ''; + +# need to clean this up. the false symmetry of "gross" and "net" everything +# makes it aesthetically hard to make this report more useful. +my @items = ($cgi->param('exclude_discount') ? 'invoiced' : 'gross'); +push @items, + qw( discounted netsales credits netcredits payments receipts refunds netrefunds cashflow netcashflow - ); -if ( $cgi->param('12mo') == 1 ) { - @items = map $_.'_12mo', @items; -} + ); my %label = ( - 'invoiced' => 'Gross Sales', - 'netsales' => 'Net Sales', + 'gross' => 'Gross Sales', + 'invoiced' => 'Invoiced Sales', + 'netsales' => 'Net Sales', + 'discounted' => 'Discounts', 'credits' => 'Gross Credits', - 'netcredits' => 'Net Credits', + 'netcredits' => 'Net Credits', 'payments' => 'Gross Receipts', - 'receipts' => 'Net Receipts', + 'receipts' => 'Net Receipts', 'refunds' => 'Gross Refunds', - 'netrefunds' => 'Net Refunds', + 'netrefunds' => 'Net Refunds', 'cashflow' => 'Gross Cashflow', - 'netcashflow' => 'Net Cashflow', + 'netcashflow' => 'Net Cashflow', ); my %graph_suffix = ( - 'invoiced' => ' (invoiced)', + 'gross' => ' (invoiced + discounts)', + 'invoiced' => '', 'netsales' => ' (invoiced - applied credits)', + 'discounted' => '', 'credits' => ' (credited)', 'netcredits' => ' (applied credits)', 'payments' => ' (payments)', @@ -62,13 +81,8 @@ my %graph_suffix = ( ); my %graph_label = map { $_ => $label{$_}.$graph_suffix{$_} } keys %label; -$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)" - foreach keys %label; - -$graph_label{$_.'_12mo'} = $graph_label{$_}. " (previous 12 months)" - foreach keys %graph_label; - my %color = ( + 'gross' => '9999ff', #light blue 'invoiced' => '9999ff', #light blue 'netsales' => '0000cc', #blue 'credits' => 'ff9999', #light red @@ -79,20 +93,34 @@ my %color = ( 'netrefunds' => 'ff9900', #orange 'cashflow' => '99cc33', #light olive 'netcashflow' => '339900', #olive + 'discounted' => 'cc33cc', #purple-ish? ); $color{$_.'_12mo'} = $color{$_} foreach keys %color; +my $ar = "agentnum=$agentnum;refnum=$refnum"; +$ar .= ";cust_classnum=$_" foreach @classnums; + my %link = ( - 'invoiced' => "${p}search/cust_bill.html?agentnum=$agentnum;", - 'netsales' => "${p}search/cust_bill.html?agentnum=$agentnum;net=1;", - 'credits' => "${p}search/cust_credit.html?agentnum=$agentnum;", - 'netcredits' => "${p}search/cust_credit_bill.html?agentnum=$agentnum;", - 'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;", - 'receipts' => "${p}search/cust_bill_pay.html?agentnum=$agentnum;", - 'refunds' => "${p}search/cust_refund.html?magic=_date;agentnum=$agentnum;", - 'netrefunds' => "${p}search/cust_credit_refund.html?agentnum=$agentnum;", + 'gross' => "${p}search/cust_bill.html?$ar;", + 'invoiced' => "${p}search/cust_bill.html?$ar;invoiced=1;", + 'netsales' => "${p}search/cust_bill.html?$ar;net=1;", + 'credits' => "${p}search/cust_credit.html?$ar;", + 'netcredits' => "${p}search/cust_credit_bill.html?$ar;", + 'payments' => "${p}search/cust_pay.html?magic=_date;$ar;", + 'receipts' => "${p}search/cust_bill_pay.html?$ar;", + 'refunds' => "${p}search/cust_refund.html?magic=_date;$ar;", + 'netrefunds' => "${p}search/cust_credit_refund.html?$ar;", + 'discounted' => "${p}search/cust_bill_pkg_discount.html?$ar;", ); # XXX link 12mo? +if ( $cgi->param('12mo') ) { + $label{$_} .= " (prev 12 months)" + foreach keys %label; + + $graph_label{$_} .= " (prev 12 months)" + foreach keys %graph_label; +} +