X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_county.pm;h=17f346071963e45bd42d2dda4760584f0da5f546;hb=4e35589e637aa3a3615a780d4086085c5ecb1782;hp=a9a4a85bd30c2821f584375d29f0fdcf6acac564;hpb=f36b6a178c9811357ff5d5291874aa239d22bc2a;p=freeside.git
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index a9a4a85bd..17f346071 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -61,6 +61,12 @@ currently supported:
=item exempt_amount
+=item taxname - if defined, printed on invoices instead of "Tax"
+
+=item setuptax - if 'Y', this tax does not apply to setup fees
+
+=item recurtax - if 'Y', this tax does not apply to recurring fees
+
=back
=head1 METHODS
@@ -101,32 +107,65 @@ methods.
sub check {
my $self = shift;
- $self->amount(0) unless $self->amount;
+ $self->exempt_amount(0) unless $self->exempt_amount;
$self->ut_numbern('taxnum')
- || $self->ut_textn('state')
+ || $self->ut_anything('state')
|| $self->ut_textn('county')
|| $self->ut_text('country')
|| $self->ut_float('tax')
|| $self->ut_textn('taxclass') # ...
- || $self->ut_money('amount')
- ;
+ || $self->ut_money('exempt_amount')
+ || $self->ut_textn('taxname')
+ || $self->ut_enum('setuptax', [ '', 'Y' ] )
+ || $self->ut_enum('recurtax', [ '', 'Y' ] )
+ || $self->SUPER::check
+ ;
}
+sub taxname {
+ my $self = shift;
+ if ( $self->dbdef_table->column('taxname') ) {
+ return $self->setfield('taxname', $_[0]) if @_;
+ return $self->getfield('taxname');
+ }
+ return '';
+}
+
+sub setuptax {
+ my $self = shift;
+ if ( $self->dbdef_table->column('setuptax') ) {
+ return $self->setfield('setuptax', $_[0]) if @_;
+ return $self->getfield('setuptax');
+ }
+ return '';
+}
+
+sub recurtax {
+ my $self = shift;
+ if ( $self->dbdef_table->column('recurtax') ) {
+ return $self->setfield('recurtax', $_[0]) if @_;
+ return $self->getfield('recurtax');
+ }
+ return '';
+}
+
=back
=head1 SUBROUTINES
=over 4
-=item regionselector [ COUNTY STATE COUNTRY [ PREFIX [ ONCHANGE ] ] ]
+=item regionselector [ COUNTY STATE COUNTRY [ PREFIX [ ONCHANGE [ DISABLED ] ] ] ]
=cut
sub regionselector {
my ( $selected_county, $selected_state, $selected_country,
- $prefix, $onchange ) = @_;
+ $prefix, $onchange, $disabled ) = @_;
+
+ $prefix = '' unless defined $prefix;
$countyflag = 0;
@@ -134,7 +173,8 @@ sub regionselector {
@cust_main_county = qsearch('cust_main_county', {} );
foreach my $c ( @cust_main_county ) {
$countyflag=1 if $c->county;
- push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
+ #push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
+ $cust_main_county{$c->country}{$c->state}{$c->county} = 1;
}
# }
$countyflag=1 if $selected_county;
@@ -156,8 +196,9 @@ END
foreach my $country ( sort keys %cust_main_county ) {
$script_html .= "\nif ( country == \"$country\" ) {\n";
foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
- my $text = $state || '(n/a)';
- $script_html .= qq!opt(what.form.${prefix}state, "$state", "$text");\n!;
+ ( my $dstate = $state ) =~ s/[\n\r]//g;
+ my $text = $dstate || '(n/a)';
+ $script_html .= qq!opt(what.form.${prefix}state, "$dstate", "$text");\n!;
}
$script_html .= "}\n";
}
@@ -179,7 +220,8 @@ END
$script_html .= "\nif ( country == \"$country\" ) {\n";
foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
$script_html .= "\nif ( state == \"$state\" ) {\n";
- foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
+ #foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) {
+ foreach my $county ( sort keys %{$cust_main_county{$country}{$state}} ) {
my $text = $county || '(n/a)';
$script_html .=
qq!opt(what.form.${prefix}county, "$county", "$text");\n!;
@@ -197,7 +239,7 @@ END
my $county_html = $script_html;
if ( $countyflag ) {
- $county_html .= qq!';
my $country_html = qq!!;
+ qq!onChange="${prefix}country_changed(this); $onchange" $disabled>!;
my $countrydefault = $conf->config('countrydefault') || 'US';
foreach my $country (
sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
keys %cust_main_county
) {
my $selected = $country eq $selected_country ? ' SELECTED' : '';
- $country_html .= "\n"
+ $country_html .= qq(\n");
}
$country_html .= '';