[freeside-commits] branch master updated. b1f912afdb22b59e8849cc4db7c6d46a8a49c124

[Ivan]

The branch, master has been updated
       via  b1f912afdb22b59e8849cc4db7c6d46a8a49c124 (commit)
       via  b6b3cfc0f5967d9c2c73202ab73cadfce2a63b67 (commit)
       via  5d3f0bee89466e382851b8d0f0c76de3f35bb6b6 (commit)
      from  d08a4af5ba980ca3df5f821f63500e282d442f73 (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 b1f912afdb22b59e8849cc4db7c6d46a8a49c124
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 12 15:04:52 2013 -0700

    add package class selection to package summary report, RT#23555

diff --git a/httemplate/search/cust_pkg_summary.cgi b/httemplate/search/cust_pkg_summary.cgi
index fbeeb92..d327489 100644
--- a/httemplate/search/cust_pkg_summary.cgi
+++ b/httemplate/search/cust_pkg_summary.cgi
@@ -71,6 +71,15 @@ my $agentnums_sql = $curuser->agentnums_sql(
 
 my $extra_sql = " WHERE $agentnums_sql";
 
+#tiny bit of false laziness w/cust_pkg.pm::search
+if ( grep { $_ eq 'classnum' } $cgi->param ) {
+  if ( $cgi->param('classnum') eq '' ) {
+    $extra_sql .= ' AND part_pkg.classnum IS NULL';
+  } elsif ( $cgi->param('classnum') =~ /^(\d+)$/ && $1 ne '0' ) {
+    $extra_sql .= " AND part_pkg.classnum = $1 ";
+  }
+}
+
 foreach my $part_pkg (qsearch({ 'table'     => 'part_pkg',
                                 'hashref'   => {},
                                 'extra_sql' => $extra_sql,
diff --git a/httemplate/search/cust_pkg_summary.html b/httemplate/search/cust_pkg_summary.html
index 8c05f73..18a5690 100644
--- a/httemplate/search/cust_pkg_summary.html
+++ b/httemplate/search/cust_pkg_summary.html
@@ -1,4 +1,4 @@
-<% include( '/elements/header.html', 'Package Summary Report' ) %>
+<& /elements/header.html, 'Package Summary Report' &>
 
 <FORM ACTION="cust_pkg_summary.cgi" METHOD="GET">
 
@@ -10,7 +10,12 @@
     </TH>
   </TR>
 
-  <% include ('/elements/tr-input-beginning_ending.html') %>
+  <& /elements/tr-input-beginning_ending.html &>
+
+  <& /elements/tr-select-pkg_class.html,
+       'pre_options' => [ '0' => 'all' ],
+       'empty_label' => '(empty class)',
+  &>
 
 </TABLE>
 
@@ -19,7 +24,7 @@
 
 </FORM>
 
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
 <%init>
 
 die "access denied"

commit b6b3cfc0f5967d9c2c73202ab73cadfce2a63b67
Merge: 5d3f0be d08a4af
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 12 13:28:41 2013 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 5d3f0bee89466e382851b8d0f0c76de3f35bb6b6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 12 13:28:38 2013 -0700

    EZLocate 0.02 required for proper error handling

diff --git a/FS/FS/Misc/Geo.pm b/FS/FS/Misc/Geo.pm
index 2ad8311..71098eb 100644
--- a/FS/FS/Misc/Geo.pm
+++ b/FS/FS/Misc/Geo.pm
@@ -363,7 +363,7 @@ sub standardize_ezlocate {
   #}
 
   $class = 'Geo::EZLocate'; # use our own library
-  eval "use $class";
+  eval "use $class 0.02"; #Geo::EZLocate 0.02 for error handling
   die $@ if $@;
 
   my $userid = $conf->config('ezlocate-userid')

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

Summary of changes:
 FS/FS/Misc/Geo.pm                       |    2 +-
 httemplate/search/cust_pkg_summary.cgi  |    9 +++++++++
 httemplate/search/cust_pkg_summary.html |   11 ++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)