[freeside-commits] branch FREESIDE_4_BRANCH updated. af48faca3f0befe89523c88efbe89f29f5f58bb6

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  af48faca3f0befe89523c88efbe89f29f5f58bb6 (commit)
       via  60bc27e3eef4528aedf4e3c7a6e15432a0dfde1f (commit)
       via  8c0a1f2603a182b7a9b9ab5313a6fabc964de6c9 (commit)
       via  335561fccaaab8f17bbbc6470f7e25bca282c10f (commit)
      from  05e6daa0611183429ff7f3bbbc579cdb759f9ea5 (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 af48faca3f0befe89523c88efbe89f29f5f58bb6
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Apr 27 13:39:39 2016 -0700

    add Map::Splat to deps, #37802

diff --git a/debian/control b/debian/control
index 8924721..24ddea3 100644
--- a/debian/control
+++ b/debian/control
@@ -96,7 +96,8 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
  libdata-guid-perl, libparams-classify-perl (>= 0.013-5.1),
  libcpanel-json-xs-perl, libarchive-zip-perl,
  libtry-tiny-perl, libnumber-phone-perl, libxml-libxml-simple-perl,
- libxml-writer-perl, libio-socket-ssl-perl
+ libxml-writer-perl, libio-socket-ssl-perl,
+ libmap-splat-perl
 Conflicts: libparams-classify-perl (>= 0.013-6)
 Suggests: libbusiness-onlinepayment-perl
 Description: Libraries for Freeside billing and trouble ticketing

commit 60bc27e3eef4528aedf4e3c7a6e15432a0dfde1f
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Apr 27 13:43:40 2016 -0700

    restore conflict with libparams-classify-perl, accidentally removed in 18dc453

diff --git a/debian/control b/debian/control
index 191233d..8924721 100644
--- a/debian/control
+++ b/debian/control
@@ -97,6 +97,7 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
  libcpanel-json-xs-perl, libarchive-zip-perl,
  libtry-tiny-perl, libnumber-phone-perl, libxml-libxml-simple-perl,
  libxml-writer-perl, libio-socket-ssl-perl
+Conflicts: libparams-classify-perl (>= 0.013-6)
 Suggests: libbusiness-onlinepayment-perl
 Description: Libraries for Freeside billing and trouble ticketing
  Freeside is a web-based billing and trouble ticketing application.

commit 8c0a1f2603a182b7a9b9ab5313a6fabc964de6c9
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Apr 27 13:35:38 2016 -0700

    fix DST in prorate test

diff --git a/FS/t/suite/02-bill_customer.t b/FS/t/suite/02-bill_customer.t
index e3f6406..3fa908e 100755
--- a/FS/t/suite/02-bill_customer.t
+++ b/FS/t/suite/02-bill_customer.t
@@ -23,9 +23,10 @@ ok($error eq '', "billed on $date") or diag($error);
 my $cust_bill = $return[0];
 isa_ok($cust_bill, 'FS::cust_bill');
 
-# Apr 1 - Mar 20 = 12 days
-# 12/31 * $30 = 11.61 recurring, + 20.00 setup
-ok( $cust_bill->charged == 31.61, 'prorated first month correctly' );
+# Apr 1 - Mar 20 = 12 days = 288 hours
+# Apr 1 - Mar 1  = 31 days - 1 hour (DST) = 743 hours
+# 288/743 * $30 = $11.63 recur + $20.00 setup
+ok( $cust_bill->charged == 31.63, 'prorated first month correctly' );
 
 # the package bill date should now be 2016-04-01
 my @lineitems = $cust_bill->cust_bill_pkg;

commit 335561fccaaab8f17bbbc6470f7e25bca282c10f
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Apr 27 13:35:00 2016 -0700

    fix redirect on error in test environment

diff --git a/httemplate/elements/create_uri_query b/httemplate/elements/create_uri_query
index 414d53b..ce6249e 100644
--- a/httemplate/elements/create_uri_query
+++ b/httemplate/elements/create_uri_query
@@ -18,7 +18,7 @@ my $query = $cgi->query_string;
 
 if ( length($query) > 1920 || $opt{secure} ) { #stupid IE 2083 URL limit
 
-  my $session = random_id(9);
+  my $session = int(rand(4294967296)); #XXX
   my $pref = new FS::access_user_pref({
     'usernum'    => $FS::CurrentUser::CurrentUser->usernum,
     'prefname'   => "redirect$session",

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

Summary of changes:
 FS/t/suite/02-bill_customer.t        |    7 ++++---
 debian/control                       |    4 +++-
 httemplate/elements/create_uri_query |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)