From: ivan Date: Fri, 15 Sep 2006 19:15:34 +0000 (+0000) Subject: add link to customer tax exemptions to customer view page X-Git-Tag: TRIXBOX_2_6~957 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=d2062945973d28e65b942f37bbbd9a5ab4f4172c add link to customer tax exemptions to customer view page --- diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm index 309dab951..83291b8d4 100644 --- a/FS/FS/AccessRight.pm +++ b/FS/FS/AccessRight.pm @@ -78,7 +78,13 @@ assigned to users and/or groups. #well, this is what we have for now. could be ordered better, could be lots of # things better, but this ACL system does 99% of what folks need and the UI # isn't *that* bad +# +# okay, well it *really* needs some catgorization in the UI. badly. @rights = ( + +## +# basic customer rights +## 'New customer', 'View customer', #'View Customer | View tickets', @@ -87,6 +93,9 @@ assigned to users and/or groups. 'Complimentary customer', #aka users-allow_comp 'Delete customer', #aka. deletecustomers #Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customers' packages if they cancel service. +### +# customer package rights +### 'Order customer package', 'One-time charge', 'Change customer package', @@ -98,13 +107,23 @@ assigned to users and/or groups. 'Cancel customer package immediately', 'Cancel customer package later', +### +# customer service rights +### 'Provision customer service', 'Unprovision customer service', 'View/link unlinked services', #not agent-virtualizable without more work +### +# customer invoice/financial info rights +### 'View invoices', + 'View customer tax exemptions', #yow +### +# customer payment rights +### 'Post payment', 'Post payment batch', 'Unapply payment', #aka. unapplypayments Enable "unapplication" of unclosed payments. @@ -113,16 +132,25 @@ assigned to users and/or groups. 'Delete payment', #aka. deletepayments - Enable deletion of unclosed payments. Be very careful! Only delete payments that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted. +### +# customer credit rights +### 'Post credit', #'Apply credit', 'Unapply credit', #aka unapplycredits Enable "unapplication" of unclosed credits. 'Delete credit', #aka. deletecredits Enable deletion of unclosed credits. Be very careful! Only delete credits that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted. +### +# customer voiding rights.. +### 'Credit card void', #aka. cc-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway 'Echeck void', #aka. echeck-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway 'Regular void', 'Unvoid', #aka. unvoid #Enable unvoiding of voided payments +### +# report/listing rights... +### 'List customers', #'List zip codes', 'List invoices', @@ -133,10 +161,16 @@ assigned to users and/or groups. 'Billing event reports', 'Financial reports', +### +# misc rights +### 'Job queue', # these are not currently agent-virtualized 'Import', # 'Export', # +### +# setup/config rights +### 'Edit advertising sources', 'Edit global advertising sources', diff --git a/httemplate/search/cust_tax_exempt_pkg.cgi b/httemplate/search/cust_tax_exempt_pkg.cgi index 3cec04f92..990e344b7 100644 --- a/httemplate/search/cust_tax_exempt_pkg.cgi +++ b/httemplate/search/cust_tax_exempt_pkg.cgi @@ -1,92 +1,3 @@ -% -% -%my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); -% -%my $join_cust = " -% JOIN cust_bill USING ( invnum ) -% LEFT JOIN cust_main USING ( custnum ) -%"; -% -%my $join_pkg = " -% LEFT JOIN cust_pkg USING ( pkgnum ) -% LEFT JOIN part_pkg USING ( pkgpart ) -%"; -% -%my $join = " -% JOIN cust_bill_pkg USING ( billpkgnum ) -% $join_cust -% $join_pkg -%"; -% -%my $where = " -% WHERE _date >= $beginning AND _date <= $ending -%"; -%# AND payby != 'COMP' -% -%if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { -% $where .= " AND agentnum = $1 "; -%} -% -%if ( $cgi->param('out') ) { -% -% $where .= " -% AND 0 = ( -% SELECT COUNT(*) FROM cust_main_county AS county_out -% WHERE ( county_out.county = cust_main.county -% OR ( county_out.county IS NULL AND cust_main.county = '' ) -% OR ( county_out.county = '' AND cust_main.county IS NULL) -% OR ( county_out.county IS NULL AND cust_main.county IS NULL) -% ) -% AND ( county_out.state = cust_main.state -% OR ( county_out.state IS NULL AND cust_main.state = '' ) -% OR ( county_out.state = '' AND cust_main.state IS NULL ) -% OR ( county_out.state IS NULL AND cust_main.state IS NULL ) -% ) -% AND county_out.country = cust_main.country -% AND county_out.tax > 0 -% ) -% "; -% -%} elsif ( $cgi->param('country' ) ) { -% -% my $county = dbh->quote( $cgi->param('county') ); -% my $state = dbh->quote( $cgi->param('state') ); -% my $country = dbh->quote( $cgi->param('country') ); -% $where .= " -% AND ( county = $county OR $county = '' ) -% AND ( state = $state OR $state = '' ) -% AND country = $country -% "; -% $where .= ' AND taxclass = '. dbh->quote( $cgi->param('taxclass') ) -% if $cgi->param('taxclass'); -% -%} -% -%my $count_query = "SELECT COUNT(*), SUM(amount)". -% " FROM cust_tax_exempt_pkg $join $where"; -% -%my $query = { -% 'table' => 'cust_tax_exempt_pkg', -% 'addl_from' => $join, -% 'hashref' => {}, -% 'select' => join(', ', -% 'cust_tax_exempt_pkg.*', -% 'cust_bill_pkg.*', -% 'cust_bill.*', -% 'part_pkg.pkg', -% 'cust_main.custnum', -% FS::UI::Web::cust_sql_fields(), -% ), -% 'extra_sql' => $where, -%}; -% -%my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ]; -%my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ]; -% -%my $conf = new FS::Conf; -%my $money_char = $conf->config('money_char') || '$'; -% -% <% include( 'elements/search.html', 'title' => 'Tax exemptions', 'name' => 'tax exemptions', @@ -148,4 +59,101 @@ 'align' => 'rrrlrc', # 'rlrrrc', ) %> +<%once> +my $join_cust = " + JOIN cust_bill USING ( invnum ) + LEFT JOIN cust_main USING ( custnum ) +"; + +my $join_pkg = " + LEFT JOIN cust_pkg USING ( pkgnum ) + LEFT JOIN part_pkg USING ( pkgpart ) +"; + +my $join = " + JOIN cust_bill_pkg USING ( billpkgnum ) + $join_cust + $join_pkg +"; + + +<%init> + +my @where = (); + +my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); +if ( $beginning || $ending ) { + push @where, "_date >= $beginning", + "_date <= $ending"; + #"payby != 'COMP'; +} + +if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { + push @where, "agentnum = $1"; +} + +if ( $cgi->param('custnum') =~ /^(\d+)$/ ) { + push @where, "cust_main.custnum = $1"; +} + +if ( $cgi->param('out') ) { + + push @where, " + 0 = ( + SELECT COUNT(*) FROM cust_main_county AS county_out + WHERE ( county_out.county = cust_main.county + OR ( county_out.county IS NULL AND cust_main.county = '' ) + OR ( county_out.county = '' AND cust_main.county IS NULL) + OR ( county_out.county IS NULL AND cust_main.county IS NULL) + ) + AND ( county_out.state = cust_main.state + OR ( county_out.state IS NULL AND cust_main.state = '' ) + OR ( county_out.state = '' AND cust_main.state IS NULL ) + OR ( county_out.state IS NULL AND cust_main.state IS NULL ) + ) + AND county_out.country = cust_main.country + AND county_out.tax > 0 + ) + "; + +} elsif ( $cgi->param('country' ) ) { + + my $county = dbh->quote( $cgi->param('county') ); + my $state = dbh->quote( $cgi->param('state') ); + my $country = dbh->quote( $cgi->param('country') ); + push @where, "( county = $county OR $county = '' )", + "( state = $state OR $state = '' )", + " country = $country"; + push @where, 'taxclass = '. dbh->quote( $cgi->param('taxclass') ) + if $cgi->param('taxclass'); + +} + +my $where = scalar(@where) ? 'WHERE '.join(' AND ', @where) : ''; + +my $count_query = "SELECT COUNT(*), SUM(amount)". + " FROM cust_tax_exempt_pkg $join $where"; + +my $query = { + 'table' => 'cust_tax_exempt_pkg', + 'addl_from' => $join, + 'hashref' => {}, + 'select' => join(', ', + 'cust_tax_exempt_pkg.*', + 'cust_bill_pkg.*', + 'cust_bill.*', + 'part_pkg.pkg', + 'cust_main.custnum', + FS::UI::Web::cust_sql_fields(), + ), + 'extra_sql' => $where, +}; + +my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ]; +my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ]; + +my $conf = new FS::Conf; +my $money_char = $conf->config('money_char') || '$'; + + diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 244635c9a..a922cfc0a 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -1,25 +1,9 @@ -% -% my( $cust_main ) = @_; -% my $custnum = $cust_main->custnum; -% -% my $conf = new FS::Conf; -% -% my $curuser = $FS::CurrentUser::CurrentUser; -% -% 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 $s = 0; -% -%

Payment History
-% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { +% my $s = 0; +% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { <% $s++ ? ' | ' : '' %> Enter check payment @@ -61,16 +45,20 @@ Post manual (offline) credit card payment % } -
-% if ( $curuser->access_right('Post credit') ) { - +% if ( $curuser->access_right('Post credit') ) { Enter credit +
+% } +% if ( $curuser->access_right('View customer tax exemptions') ) { + View tax exemptions
% } -% + + + %#get payment history %my @history = (); % @@ -567,3 +555,20 @@ function show_history () { +<%init> + +my( $cust_main ) = @_; +my $custnum = $cust_main->custnum; + +my $conf = new FS::Conf; + +my $curuser = $FS::CurrentUser::CurrentUser; + +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; + + +