X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fimport-did-inventory;h=01fa2e8af8a1cc3d5930436b0f34c482268e2563;hp=ead4b746424808cd06e72b9f24acb26389b18fe7;hb=29d80a8582103ead0b5910391cabc45cb85fa836;hpb=38a0e1004c64aabd459465870a6b89a3edcc3520 diff --git a/bin/import-did-inventory b/bin/import-did-inventory index ead4b7464..01fa2e8af 100644 --- a/bin/import-did-inventory +++ b/bin/import-did-inventory @@ -97,7 +97,9 @@ $latas{524} = 'KANSAS CITY'; my $parser = new DateTime::Format::Natural( 'time_zone' => 'local' ); sub parsedt { my ($dt,$min,$max) = (shift,shift,shift); + $dt = "$dt 00:00:00"; my $epoch = $parser->parse_datetime($dt); + warn "dt='$dt' min=$min max=$max epoch=$epoch\n"; return $epoch->epoch if ($parser->success && $epoch->epoch >= $min && $epoch->epoch <= $max); fatal("invalid date $dt (min=$min, max=$max)"); @@ -356,11 +358,13 @@ sub order { my $o; if( exists $did_order{$vendor_order_id} ) { $o = $did_order{$vendor_order_id}; +# warn "$submitted $confirmed $received $vendor_order_id".Dumper($o); fatal("vendor order #$vendor_order_id - order data differs from one item to another") - unless ( ($o->submitted == $submitted + unless ( ( abs($o->submitted-$submitted) < 5 || $o->vendor_order_id == 293011) # yet another bad data hack - && $o->confirmed == $confirmed - && $o->received == $received); + && abs($o->confirmed-$confirmed) < 5 + && abs($o->received-$received) < 5 + ); # fatal("customer mismatch for vendor order #$vendor_order_id") # unless ( ($o->custnum && $cust{'custnum'} # && ($o->custnum == $cust{'custnum'}