projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better prospect -> customer conversion, RT#7111
[freeside.git]
/
FS
/
FS
/
cust_pkg.pm
diff --git
a/FS/FS/cust_pkg.pm
b/FS/FS/cust_pkg.pm
index
09b4629
..
2efd4fd
100644
(file)
--- a/
FS/FS/cust_pkg.pm
+++ b/
FS/FS/cust_pkg.pm
@@
-594,9
+594,13
@@
sub check {
|| $self->ut_numbern('adjourn')
|| $self->ut_numbern('expire')
|| $self->ut_enum('no_auto', [ '', 'Y' ])
|| $self->ut_numbern('adjourn')
|| $self->ut_numbern('expire')
|| $self->ut_enum('no_auto', [ '', 'Y' ])
+ || $self->ut_numbern('agent_pkgid')
;
return $error if $error;
;
return $error if $error;
+ return "A package with both start date (future start) and setup date (already started) will never bill"
+ if $self->start_date && $self->setup;
+
$self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
if ( $self->dbdef_table->column('manual_flag') ) {
$self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
if ( $self->dbdef_table->column('manual_flag') ) {
@@
-1770,7
+1774,7
@@
I<pkg_svc.hidden> flag will be omitted.
sub h_cust_svc {
my $self = shift;
warn "$me _h_cust_svc called on $self\n"
sub h_cust_svc {
my $self = shift;
warn "$me _h_cust_svc called on $self\n"
- if $DEBUG
> 1
;
+ if $DEBUG;
my ($end, $start, $mode) = @_;
my @cust_svc = $self->_sort_cust_svc(
my ($end, $start, $mode) = @_;
my @cust_svc = $self->_sort_cust_svc(
@@
-2125,7
+2129,7
@@
Returns a list of lists, calling the label method for all (historical) services
sub h_labels {
my $self = shift;
warn "$me _h_labels called on $self\n"
sub h_labels {
my $self = shift;
warn "$me _h_labels called on $self\n"
- if $DEBUG
> 1
;
+ if $DEBUG;
map { [ $_->label(@_) ] } $self->h_cust_svc(@_);
}
map { [ $_->label(@_) ] } $self->h_cust_svc(@_);
}
@@
-2159,13
+2163,13
@@
sub _labels_short {
my( $self, $method ) = ( shift, shift );
warn "$me _labels_short called on $self with $method method\n"
my( $self, $method ) = ( shift, shift );
warn "$me _labels_short called on $self with $method method\n"
- if $DEBUG
> 1
;
+ if $DEBUG;
my $conf = new FS::Conf;
my $max_same_services = $conf->config('cust_bill-max_same_services') || 5;
warn "$me _labels_short populating \%labels\n"
my $conf = new FS::Conf;
my $max_same_services = $conf->config('cust_bill-max_same_services') || 5;
warn "$me _labels_short populating \%labels\n"
- if $DEBUG
> 1
;
+ if $DEBUG;
my %labels;
#tie %labels, 'Tie::IxHash';
my %labels;
#tie %labels, 'Tie::IxHash';
@@
-2173,26
+2177,38
@@
sub _labels_short {
foreach $self->$method(@_);
warn "$me _labels_short populating \@labels\n"
foreach $self->$method(@_);
warn "$me _labels_short populating \@labels\n"
- if $DEBUG
> 1
;
+ if $DEBUG;
my @labels;
foreach my $label ( keys %labels ) {
my %seen = ();
my @values = grep { ! $seen{$_}++ } @{ $labels{$label} };
my $num = scalar(@values);
my @labels;
foreach my $label ( keys %labels ) {
my %seen = ();
my @values = grep { ! $seen{$_}++ } @{ $labels{$label} };
my $num = scalar(@values);
+ warn "$me _labels_short $num items for $label\n"
+ if $DEBUG;
+
if ( $num > $max_same_services ) {
if ( $num > $max_same_services ) {
+ warn "$me _labels_short more than $max_same_services, so summarizing\n"
+ if $DEBUG;
push @labels, "$label ($num)";
} else {
if ( $conf->exists('cust_bill-consolidate_services') ) {
push @labels, "$label ($num)";
} else {
if ( $conf->exists('cust_bill-consolidate_services') ) {
+ warn "$me _labels_short consolidating services\n"
+ if $DEBUG;
# push @labels, "$label: ". join(', ', @values);
while ( @values ) {
my $detail = "$label: ";
$detail .= shift(@values). ', '
# push @labels, "$label: ". join(', ', @values);
while ( @values ) {
my $detail = "$label: ";
$detail .= shift(@values). ', '
- while @values && length($detail.$values[0]) < 78;
+ while @values
+ && ( length($detail.$values[0]) < 78 || $detail eq "$label: " );
$detail =~ s/, $//;
push @labels, $detail;
}
$detail =~ s/, $//;
push @labels, $detail;
}
+ warn "$me _labels_short done consolidating services\n"
+ if $DEBUG;
} else {
} else {
+ warn "$me _labels_short adding service data\n"
+ if $DEBUG;
push @labels, map { "$label: $_" } @values;
}
}
push @labels, map { "$label: $_" } @values;
}
}