[freeside-commits] branch FREESIDE_4_BRANCH updated. 1872f4b9846ea77589a45a6b38654fc157f1f6f4
Mark Wells
mark at 420.am
Sat Feb 27 21:12:42 PST 2016
The branch, FREESIDE_4_BRANCH has been updated
via 1872f4b9846ea77589a45a6b38654fc157f1f6f4 (commit)
via 8567decee40403c0cb821a8389bfe5c9618a27af (commit)
via c021c579347e160329f1eaf236efd9826f62bd22 (commit)
via dab31f70bf96c00cd88a18777619f8b4cf9b1ea6 (commit)
from 5e5506c2163ce976d20bfd95d8fc8eca13808cd3 (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 1872f4b9846ea77589a45a6b38654fc157f1f6f4
Author: Mark Wells <mark at freeside.biz>
Date: Thu Feb 25 13:39:17 2016 -0800
fix UI nit
diff --git a/httemplate/elements/tr-part_pkg-taxproducts.html b/httemplate/elements/tr-part_pkg-taxproducts.html
index ad464ca..c57232c 100644
--- a/httemplate/elements/tr-part_pkg-taxproducts.html
+++ b/httemplate/elements/tr-part_pkg-taxproducts.html
@@ -24,7 +24,7 @@ my $pkgpart = delete($opt{pkgpart});
my %pkg_options;
if ($pkgpart) {
my $part_pkg = FS::part_pkg->by_key($pkgpart);
- my %pkg_options = $part_pkg->options;
+ %pkg_options = $part_pkg->options;
$pkg_options{'usage_taxproductnum_'} = $part_pkg->taxproductnum;
}
commit 8567decee40403c0cb821a8389bfe5c9618a27af
Author: Mark Wells <mark at freeside.biz>
Date: Fri Feb 19 13:44:54 2016 -0800
clean up dangling cust_svc records, related to #32043
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 0223f93..13e2e0f 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -1300,13 +1300,19 @@ sub _upgrade_data {
my $svcdb = $cust_svc->part_svc->svcdb;
$h_search{'hashref'}{'svcnum'} = $svcnum;
$h_search{'table'} = "h_$svcdb";
- my $h_svc_x = qsearchs(\%h_search)
- or next;
- my $class = "FS::$svcdb";
- my $new_svc_x = $class->new({ $h_svc_x->hash });
- my $error = $new_svc_x->insert;
- warn "error repairing svcnum $svcnum ($svcdb) from history:\n$error\n"
- if $error;
+ my $h_svc_x = qsearchs(\%h_search);
+ if ( $h_svc_x ) {
+ my $class = "FS::$svcdb";
+ my $new_svc_x = $class->new({ $h_svc_x->hash });
+ my $error = $new_svc_x->insert;
+ warn "error repairing svcnum $svcnum ($svcdb) from history:\n$error\n"
+ if $error;
+ } else {
+ # can't be fixed, so remove the dangling cust_svc to avoid breaking
+ # stuff
+ my $error = $cust_svc->delete;
+ warn "error cleaning up missing svcnum $svcnum ($svcdb):\n$error\n";
+ }
}
'';
commit c021c579347e160329f1eaf236efd9826f62bd22
Author: Mark Wells <mark at freeside.biz>
Date: Tue Feb 23 12:23:54 2016 -0800
add index on cdr.detailnum, #32043
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e1ed43c..bfd3131 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -5537,6 +5537,7 @@ sub tables_hashref {
[ 'freesidestatus' ], [ 'freesiderewritestatus' ],
[ 'cdrbatch' ], [ 'cdrbatchnum' ],
[ 'src_ip_addr' ], [ 'dst_ip_addr' ], [ 'dst_term' ],
+ [ 'detailnum' ],
],
#no FKs on cdr table... choosing not to throw errors no matter what's
# thrown in here. better to have the data.
commit dab31f70bf96c00cd88a18777619f8b4cf9b1ea6
Author: Mark Wells <mark at freeside.biz>
Date: Thu Feb 25 12:44:14 2016 -0800
fix cust_paydate_within event condition vs. cust_payby, #23741
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index d6c7754..0586a80 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -28,6 +28,7 @@ use Date::Format;
#use Date::Manip;
use File::Temp; #qw( tempfile );
use Business::CreditCard 0.28;
+use List::Util qw(min);
use FS::UID qw( dbh driver_name );
use FS::Record qw( qsearchs qsearch dbdef regexp_sql );
use FS::Cursor;
@@ -2929,62 +2930,34 @@ sub payment_info {
=item paydate_epoch
-Returns the exact time in seconds corresponding to the payment method
-expiration date. For CARD/DCRD customers this is the end of the month;
-for others (COMP is the only other payby that uses paydate) it's the start.
-Returns 0 if the paydate is empty or set to the far future.
+Returns the next payment expiration date for this customer. If they have no
+payment methods that will expire, returns 0.
=cut
sub paydate_epoch {
my $self = shift;
- my ($month, $year) = $self->paydate_monthyear;
- return 0 if !$year or $year >= 2037;
- if ( $self->payby eq 'CARD' or $self->payby eq 'DCRD' ) {
- $month++;
- if ( $month == 13 ) {
- $month = 1;
- $year++;
- }
- return timelocal(0,0,0,1,$month-1,$year) - 1;
- }
- else {
- return timelocal(0,0,0,1,$month-1,$year);
- }
+ # filter out the ones that individually return 0, but then return 0 if
+ # there are no results
+ my @epochs = grep { $_ > 0 } map { $_->paydate_epoch } $self->cust_payby;
+ min( @epochs ) || 0;
}
=item paydate_epoch_sql
-Class method. Returns an SQL expression to obtain the payment expiration date
-as a number of seconds.
+Returns an SQL expression to get the next payment expiration date for a
+customer. Returns 2143260000 (2037-12-01) if there are no payment expiration
+dates, so that it's safe to test for "will it expire before date X" for any
+date up to then.
=cut
-# Special expiration date behavior for non-CARD/DCRD customers has been
-# carefully preserved. Do we really use that?
sub paydate_epoch_sql {
my $class = shift;
- my $table = shift || 'cust_main';
- my ($case1, $case2);
- if ( driver_name eq 'Pg' ) {
- $case1 = "EXTRACT( EPOCH FROM CAST( $table.paydate AS TIMESTAMP ) + INTERVAL '1 month') - 1";
- $case2 = "EXTRACT( EPOCH FROM CAST( $table.paydate AS TIMESTAMP ) )";
- }
- elsif ( lc(driver_name) eq 'mysql' ) {
- $case1 = "UNIX_TIMESTAMP( DATE_ADD( CAST( $table.paydate AS DATETIME ), INTERVAL 1 month ) ) - 1";
- $case2 = "UNIX_TIMESTAMP( CAST( $table.paydate AS DATETIME ) )";
- }
- else { return '' }
- return "CASE WHEN $table.payby IN('CARD','DCRD')
- THEN ($case1)
- ELSE ($case2)
- END"
+ my $paydate = FS::cust_payby->paydate_epoch_sql;
+ "(SELECT COALESCE(MIN($paydate), 2143260000) FROM cust_payby WHERE cust_payby.custnum = cust_main.custnum)";
}
-=item tax_exemption TAXNAME
-
-=cut
-
sub tax_exemption {
my( $self, $taxname ) = @_;
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index 56efbc4..4176818 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -4,6 +4,8 @@ use strict;
use Business::CreditCard;
use FS::payby;
use FS::Record qw(qsearch);
+use FS::UID qw(driver_name);
+use Time::Local qw(timelocal);
use vars qw($ignore_masked_payinfo);
@@ -348,6 +350,60 @@ sub paydate_monthyear {
}
}
+=item paydate_epoch
+
+Returns the exact time in seconds corresponding to the payment method
+expiration date. For CARD/DCRD customers this is the end of the month;
+for others (COMP is the only other payby that uses paydate) it's the start.
+Returns 0 if the paydate is empty or set to the far future.
+
+=cut
+
+sub paydate_epoch {
+ my $self = shift;
+ my ($month, $year) = $self->paydate_monthyear;
+ return 0 if !$year or $year >= 2037;
+ if ( $self->payby eq 'CARD' or $self->payby eq 'DCRD' ) {
+ $month++;
+ if ( $month == 13 ) {
+ $month = 1;
+ $year++;
+ }
+ return timelocal(0,0,0,1,$month-1,$year) - 1;
+ }
+ else {
+ return timelocal(0,0,0,1,$month-1,$year);
+ }
+}
+
+=item paydate_epoch_sql
+
+Class method. Returns an SQL expression to obtain the payment expiration date
+as a number of seconds.
+
+=cut
+
+# Special expiration date behavior for non-CARD/DCRD customers has been
+# carefully preserved. Do we really use that?
+sub paydate_epoch_sql {
+ my $class = shift;
+ my $table = $class->table;
+ my ($case1, $case2);
+ if ( driver_name eq 'Pg' ) {
+ $case1 = "EXTRACT( EPOCH FROM CAST( $table.paydate AS TIMESTAMP ) + INTERVAL '1 month') - 1";
+ $case2 = "EXTRACT( EPOCH FROM CAST( $table.paydate AS TIMESTAMP ) )";
+ }
+ elsif ( lc(driver_name) eq 'mysql' ) {
+ $case1 = "UNIX_TIMESTAMP( DATE_ADD( CAST( $table.paydate AS DATETIME ), INTERVAL 1 month ) ) - 1";
+ $case2 = "UNIX_TIMESTAMP( CAST( $table.paydate AS DATETIME ) )";
+ }
+ else { return '' }
+ return "CASE WHEN $table.payby IN('CARD','DCRD')
+ THEN ($case1)
+ ELSE ($case2)
+ END"
+}
+
=back
=head1 BUGS
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Schema.pm | 1 +
FS/FS/cust_main.pm | 53 +++++---------------
FS/FS/cust_svc.pm | 20 +++++---
FS/FS/payinfo_Mixin.pm | 56 ++++++++++++++++++++++
httemplate/elements/tr-part_pkg-taxproducts.html | 2 +-
5 files changed, 84 insertions(+), 48 deletions(-)
More information about the freeside-commits
mailing list