projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
untaint template source
[freeside.git]
/
FS
/
FS
/
cust_main.pm
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
26883d5
..
b863748
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-11,7
+11,7
@@
use Safe;
use Carp;
use Time::Local;
use Date::Format;
use Carp;
use Time::Local;
use Date::Format;
-use Date::Manip;
+
#
use Date::Manip;
use Mail::Internet;
use Mail::Header;
use Business::CreditCard;
use Mail::Internet;
use Mail::Header;
use Business::CreditCard;
@@
-312,9
+312,6
@@
sub check {
|| $self->ut_text('city')
|| $self->ut_textn('county')
|| $self->ut_textn('state')
|| $self->ut_text('city')
|| $self->ut_textn('county')
|| $self->ut_textn('state')
- || $self->ut_phonen('daytime')
- || $self->ut_phonen('night')
- || $self->ut_phonen('fax')
;
return $error if $error;
;
return $error if $error;
@@
-357,7
+354,14
@@
sub check {
} );
}
} );
}
- $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
+ $error =
+ $self->ut_phonen('daytime', $self->country)
+ || $self->ut_phonen('night', $self->country)
+ || $self->ut_phonen('fax', $self->country)
+ ;
+ return $error if $error;
+
+ $self->zip =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
or return "Illegal zip: ". $self->zip;
$self->zip($1);
or return "Illegal zip: ". $self->zip;
$self->zip($1);
@@
-450,15
+454,16
@@
Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
sub ncancelled_pkgs {
my $self = shift;
sub ncancelled_pkgs {
my $self = shift;
- qsearch( 'cust_pkg', {
- 'custnum' => $self->custnum,
- 'cancel' => '',
- }),
- qsearch( 'cust_pkg', {
- 'custnum' => $self->custnum,
- 'cancel' => 0,
- }),
- ;
+ @{ [ # force list context
+ qsearch( 'cust_pkg', {
+ 'custnum' => $self->custnum,
+ 'cancel' => '',
+ }),
+ qsearch( 'cust_pkg', {
+ 'custnum' => $self->custnum,
+ 'cancel' => 0,
+ }),
+ ] };
}
=item bill OPTIONS
}
=item bill OPTIONS
@@
-545,7
+550,8
@@
sub bill {
warn "Error reval-ing part_pkg->recur pkgpart ",
$part_pkg->pkgpart, ": $@";
} else {
warn "Error reval-ing part_pkg->recur pkgpart ",
$part_pkg->pkgpart, ": $@";
} else {
- #change this bit to use Date::Manip?
+ #change this bit to use Date::Manip? CAREFUL with timezones (see
+ # mailing list archive)
#$sdate=$cust_pkg->bill || time;
#$sdate=$cust_pkg->bill || $time;
$sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
#$sdate=$cust_pkg->bill || time;
#$sdate=$cust_pkg->bill || $time;
$sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
@@
-993,7
+999,7
@@
sub check_invoicing_list {
=head1 VERSION
=head1 VERSION
-$Id: cust_main.pm,v 1.
4 2000-02-02 20:22:18
ivan Exp $
+$Id: cust_main.pm,v 1.
7 2000-06-27 12:15:37
ivan Exp $
=head1 BUGS
=head1 BUGS