diff options
| -rw-r--r-- | FS/FS/cust_main.pm | 2 | ||||
| -rwxr-xr-x | httemplate/edit/part_pkg.cgi | 1 | ||||
| -rwxr-xr-x | httemplate/view/cust_main.cgi | 17 |
3 files changed, 12 insertions, 8 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 0283e3d04..2ba0ff046 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -1215,7 +1215,7 @@ sub bill { || $tax->recurtax =~ /^Y$/i; next unless $taxable_charged; - if ( $tax->exempt_amount ) { + if ( $tax->exempt_amount > 0 ) { my ($mon,$year) = (localtime($sdate) )[4,5]; $mon++; my $freq = $part_pkg->freq || 1; diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index daa5b7483..862e98ecf 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -66,6 +66,7 @@ print '<FORM NAME="dummy">'; #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!, print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)"; +#false laziness w/view/cust_main.cgi my %freq; tie %freq, 'Tie::IxHash', '0' => '(no recurring fee)', diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index fb3f0f111..83f114ef9 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -412,14 +412,17 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) { sub freq { + #false laziness w/edit/part_pkg.cgi my %freq = ( #move this - 1 => 'monthly', - 2 => 'bi-monthly', - 3 => 'quarterly', - 6 => 'semi-annually', - 12 => 'annually', - 24 => 'bi-annually', - 36 => 'tri-annually', + '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; |