[freeside-commits] branch master updated. 1d63c6b68d172caa53bacc2cc811cdb34a2c80ae

[Ivan Kohler]

The branch, master has been updated
       via  1d63c6b68d172caa53bacc2cc811cdb34a2c80ae (commit)
      from  474e879c6c47d23aa155d6f4b9c7a51b8badf8d9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d63c6b68d172caa53bacc2cc811cdb34a2c80ae
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Mar 3 18:35:17 2022 -0800

    Revert "update warnings re: census tract length so real errors are easier to spot, RT#86245"
    
    This reverts commit c71e63352e02433369be15591a89765f83cddd0c.

diff --git a/FS/FS/Report/FCC_477.pm b/FS/FS/Report/FCC_477.pm
index 29505f8e9..760f6f22d 100644
--- a/FS/FS/Report/FCC_477.pm
+++ b/FS/FS/Report/FCC_477.pm
@@ -320,7 +320,7 @@ sub report {
   my $num_errors = 0;
   foreach my $row (@$data) {
     if ( $class->can($check_method) ) { # they don't all have these
-      my $eh = $class->$check_method( $row, 'date'=>$opt{'date'} );
+      my $eh = $class->$check_method( $row );
       $num_errors++ if keys(%$eh);
       push @$error, $eh
     }
@@ -442,19 +442,12 @@ sub fbs_sql {
 sub fbs_check {
   my $class = shift;
   my $row = shift;
-
-  my %opt = @_;
-  my $date = $opt{date} || time;
-  my $census_digits = ($date < 1601449200) ? 11 : 15; # 9/30/2020, halfway
-                                                      # between the two filing
-                                                      # dates when it changed
-
   my %e;
   #censustract
   if ( length($row->[0]) == 0 ) {
     $e{'censustract_null'} = 'The package location has no census tract.';
-  } elsif ($row->[0] !~ /^\d{$census_digits}$/) {
-    $e{'censustract_bad'} = "The census tract must be exactly $census_digits digits.";
+  } elsif ($row->[0] !~ /^\d{11}$/) {
+    $e{'censustract_bad'} = 'The census tract must be exactly 11 digits.';
   }
 
   #technology
@@ -522,18 +515,12 @@ sub fvs_sql {
 sub fvs_check {
   my $class = shift;
   my $row = shift;
-  my %opt = @_;
-  my $date = $opt{date} || time;
-  my $census_digits = ($date < 1601449200) ? 11 : 15; # 9/30/2020, halfway
-                                                      # between the two filing
-                                                      # dates when it changed
-
   my %e;
   #censustract
   if ( length($row->[0]) == 0 ) {
     $e{'censustract_null'} = 'The package location has no census tract.';
-  } elsif ($row->[0] !~ /^\d{$census_digits}$/) {
-    $e{'censustract_bad'} = "The census tract must be exactly $census_digits digits.";
+  } elsif ($row->[0] !~ /^\d{11}$/) {
+    $e{'censustract_bad'} = 'The census tract must be exactly 11 digits.';
   }
   return \%e;
 }

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Report/FCC_477.pm | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)