[freeside-commits] branch master updated. 2e7d4cbc5ce7bf9705bcb811315b94b0ee54288b

Ivan ivan at 420.am
Fri Mar 10 07:05:43 PST 2017


The branch, master has been updated
       via  2e7d4cbc5ce7bf9705bcb811315b94b0ee54288b (commit)
       via  f77cbf2281ef5ea2e0b81b64fdd1dd78fca3e543 (commit)
       via  c13b6c8f4b9876aa8f91e1c14d3c208ac0d189e9 (commit)
      from  4266969f2c69f6fc07672f118b86716f52a95b86 (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 2e7d4cbc5ce7bf9705bcb811315b94b0ee54288b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 10 07:05:33 2017 -0800

    remove old test files

diff --git a/FS/t/InitHandler.t b/FS/t/InitHandler.t
deleted file mode 100644
index 0ce60c8..0000000
--- a/FS/t/InitHandler.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::InitHandler;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission.t b/FS/t/part_pkg-flat_comission.t
deleted file mode 100644
index fefa57e..0000000
--- a/FS/t/part_pkg-flat_comission.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::flat_comission;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission_cust.t b/FS/t/part_pkg-flat_comission_cust.t
deleted file mode 100644
index 05d3ac4..0000000
--- a/FS/t/part_pkg-flat_comission_cust.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::flat_comission_cust;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission_pkg.t b/FS/t/part_pkg-flat_comission_pkg.t
deleted file mode 100644
index 851b58d..0000000
--- a/FS/t/part_pkg-flat_comission_pkg.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::flat_comission_pkg;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-sesmon_hour.t b/FS/t/part_pkg-sesmon_hour.t
deleted file mode 100644
index 4f02cfc..0000000
--- a/FS/t/part_pkg-sesmon_hour.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::sesmon_hour;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-sesmon_minute.t b/FS/t/part_pkg-sesmon_minute.t
deleted file mode 100644
index 6ceaa3c..0000000
--- a/FS/t/part_pkg-sesmon_minute.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::sesmon_minute;
-$loaded=1;
-print "ok 1\n";

commit f77cbf2281ef5ea2e0b81b64fdd1dd78fca3e543
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 10 07:04:12 2017 -0800

    Revert "remove old test files"
    
    This reverts commit c13b6c8f4b9876aa8f91e1c14d3c208ac0d189e9.

diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
index c36fd55..1fea28c 100644
--- a/FS/FS/ClientAPI.pm
+++ b/FS/FS/ClientAPI.pm
@@ -3,7 +3,6 @@ package FS::ClientAPI;
 use strict;
 use base 'Exporter';
 use vars qw( @EXPORT_OK %handler $domain $DEBUG $me );
-use FS::UID qw( dbh );
 
 @EXPORT_OK = qw( load_clientapi_modules );
 
@@ -36,17 +35,9 @@ sub dispatch {
   my ( $self, $name ) = ( shift, shift );
   $name =~ s(/)(::)g;
   my $sub = "FS::ClientAPI::$name";
-
-  dbh->{'private_profile'} = {};
-
   warn "$me dispatch: calling $sub with args @_\n" if $DEBUG;
   no strict 'refs';
-  my $rv = &{$sub}(@_);
-
-  warn dbh->sprintProfile if dbh->can('sprintProfile');
-  dbh->{'private_profile'} = {};
-
-  $rv;
+  &{$sub}(@_);
 }
 
 1;
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index e944099..01b2226 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -445,11 +445,11 @@ sub upgrade_set_cardtype {
   my $class = shift;
   my $table = $class->table or die "upgrade_set_cardtype needs a table";
 
-  if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype2") ) {
+  if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype") ) {
     my $job = FS::queue->new({ job => 'FS::payinfo_Mixin::process_set_cardtype' });
     my $error = $job->insert($table);
     die $error if $error;
-    FS::upgrade_journal->set_done("${table}__set_cardtype2");
+    FS::upgrade_journal->set_done("${table}__set_cardtype");
   }
 }
 
@@ -461,7 +461,7 @@ sub process_set_cardtype {
   local $ignore_masked_payinfo = 1;
   my $search = FS::Cursor->new({
     table     => $table,
-    extra_sql => q[ WHERE payby IN('CARD','DCRD') AND ( paycardtype IS NULL or paycardtype = 'Not a credit card' ) ],
+    extra_sql => q[ WHERE payby IN('CARD','DCRD') AND paycardtype IS NULL ],
   });
   while (my $record = $search->fetch) {
     my $error = $record->replace;
diff --git a/FS/FS/pkg_referral.pm b/FS/FS/pkg_referral.pm
index 0983ff6..a5ac795 100644
--- a/FS/FS/pkg_referral.pm
+++ b/FS/FS/pkg_referral.pm
@@ -1,9 +1,11 @@
 package FS::pkg_referral;
-use base qw( FS::Record );
 
 use strict;
+use vars qw( @ISA );
 use FS::Record qw( dbh );
 
+ at ISA = qw(FS::Record);
+
 =head1 NAME
 
 FS::pkg_referral - Object methods for pkg_referral records
diff --git a/FS/bin/freeside-selfservice-xmlrpcd b/FS/bin/freeside-selfservice-xmlrpcd
index e96f65a..7e373a0 100755
--- a/FS/bin/freeside-selfservice-xmlrpcd
+++ b/FS/bin/freeside-selfservice-xmlrpcd
@@ -29,11 +29,6 @@ my $conf = new FS::Conf;
 die "not running; selfservice-xmlrpc conf option is off\n"
   unless $conf->exists('selfservice-xmlrpc');
 
-if ( $conf->exists('selfservice-db_profile') ) {
-  eval "use DBIx::Profile";
-  warn $@ if $@;
-}
-
 daemon_run( 'port' => 8080, 'handle_request' =>
   sub {
     my $request = shift;
diff --git a/FS/t/InitHandler.t b/FS/t/InitHandler.t
new file mode 100644
index 0000000..0ce60c8
--- /dev/null
+++ b/FS/t/InitHandler.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::InitHandler;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission.t b/FS/t/part_pkg-flat_comission.t
new file mode 100644
index 0000000..fefa57e
--- /dev/null
+++ b/FS/t/part_pkg-flat_comission.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::flat_comission;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission_cust.t b/FS/t/part_pkg-flat_comission_cust.t
new file mode 100644
index 0000000..05d3ac4
--- /dev/null
+++ b/FS/t/part_pkg-flat_comission_cust.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::flat_comission_cust;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission_pkg.t b/FS/t/part_pkg-flat_comission_pkg.t
new file mode 100644
index 0000000..851b58d
--- /dev/null
+++ b/FS/t/part_pkg-flat_comission_pkg.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::flat_comission_pkg;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-sesmon_hour.t b/FS/t/part_pkg-sesmon_hour.t
new file mode 100644
index 0000000..4f02cfc
--- /dev/null
+++ b/FS/t/part_pkg-sesmon_hour.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::sesmon_hour;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/part_pkg-sesmon_minute.t b/FS/t/part_pkg-sesmon_minute.t
new file mode 100644
index 0000000..6ceaa3c
--- /dev/null
+++ b/FS/t/part_pkg-sesmon_minute.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg::sesmon_minute;
+$loaded=1;
+print "ok 1\n";
diff --git a/Makefile b/Makefile
index 6ebd1ce..c6eef91 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ API_USER = fs_api
 
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
-SELFSERVICE_MACHINES = localhost
+SELFSERVICE_MACHINES = 
 # SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
diff --git a/httemplate/docs/cvv2.html b/httemplate/docs/cvv2.html
index de176d8..653e1ff 100644
--- a/httemplate/docs/cvv2.html
+++ b/httemplate/docs/cvv2.html
@@ -1,4 +1,4 @@
-<& /elements/header-popup.html &>
+<& /elements/header-popup.html, '' &>
 
   <% mt('The CVV2 number (also called CVC2 or CID) is a three- or four-digit security code used to reduce credit card fraud') |h %>
   <BR><BR>
diff --git a/httemplate/edit/access_user.html b/httemplate/edit/access_user.html
index 2350917..9d25853 100644
--- a/httemplate/edit/access_user.html
+++ b/httemplate/edit/access_user.html
@@ -83,14 +83,6 @@ sub edit_callback {
     if $sched_item[0] && ! $sched_item[0]->disabled;
 }
 
-sub error_callback {
-  my ($cgi, $access_user) = @_;
-warn $access_user->sched_item_enabled;
-warn $cgi->param('sched_item_enabled');
-  $access_user->sched_item_enabled('Y')
-    if $cgi->param('sched_item_enabled');  
-}
-
 sub field_callback {
   my ($c, $o, $f) = @_;
   if($f->{'type'} eq 'password' and $o->is_system_user) {
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 4724ce6..df1d7e5 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -151,10 +151,7 @@ my $money_char = $conf->config('money_char') || '$';
 
 my %search_hash = ();
 
-#some false laziness w/misc/bulk_change_pkg.cgi and bulk_pkg_increment_bill.cgi
-# and misc/process/
-# with shitty results (bulk doing things to wrong packages) if you don't update
-# those too :/
+#some false laziness w/misc/bulk_change_pkg.cgi
   
 $search_hash{'query'} = $cgi->keywords;
 
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 4e03649..d8a0041 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,14 +1,11 @@
-<& /elements/header-cust_main.html,
-     view    => 'packages',
-     custnum => $cust_pkg->custnum,
-&>
-
-<& /elements/footer-cust_main.html &>
+<% $cgi->redirect($path) %>
 <%init>
-
+# since cust_pkgs can't be viewed directly, just throw a redirect
 my ($pkgnum) = $cgi->keywords;
 $pkgnum =~ /^\d+$/ or die "invalid pkgnum '$pkgnum'";
+my $show = $FS::CurrentUser::CurrentUser->default_customer_view =~ /^(jumbo|packages)$/ ? '' : ';show=packages';
 
-my $cust_pkg = FS::cust_pkg->by_key($pkgnum) or die "pkgnum $pkgnum not found";
-
+my $self = FS::cust_pkg->by_key($pkgnum) or die "pkgnum $pkgnum not found";
+my $frag = 'cust_pkg'. $self->pkgnum;
+my $path = $p.'view/cust_main.cgi?custnum='.$self->custnum.";$show#$frag";
 </%init>

commit c13b6c8f4b9876aa8f91e1c14d3c208ac0d189e9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 10 07:03:36 2017 -0800

    remove old test files

diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
index 1fea28c..c36fd55 100644
--- a/FS/FS/ClientAPI.pm
+++ b/FS/FS/ClientAPI.pm
@@ -3,6 +3,7 @@ package FS::ClientAPI;
 use strict;
 use base 'Exporter';
 use vars qw( @EXPORT_OK %handler $domain $DEBUG $me );
+use FS::UID qw( dbh );
 
 @EXPORT_OK = qw( load_clientapi_modules );
 
@@ -35,9 +36,17 @@ sub dispatch {
   my ( $self, $name ) = ( shift, shift );
   $name =~ s(/)(::)g;
   my $sub = "FS::ClientAPI::$name";
+
+  dbh->{'private_profile'} = {};
+
   warn "$me dispatch: calling $sub with args @_\n" if $DEBUG;
   no strict 'refs';
-  &{$sub}(@_);
+  my $rv = &{$sub}(@_);
+
+  warn dbh->sprintProfile if dbh->can('sprintProfile');
+  dbh->{'private_profile'} = {};
+
+  $rv;
 }
 
 1;
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index 01b2226..e944099 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -445,11 +445,11 @@ sub upgrade_set_cardtype {
   my $class = shift;
   my $table = $class->table or die "upgrade_set_cardtype needs a table";
 
-  if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype") ) {
+  if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype2") ) {
     my $job = FS::queue->new({ job => 'FS::payinfo_Mixin::process_set_cardtype' });
     my $error = $job->insert($table);
     die $error if $error;
-    FS::upgrade_journal->set_done("${table}__set_cardtype");
+    FS::upgrade_journal->set_done("${table}__set_cardtype2");
   }
 }
 
@@ -461,7 +461,7 @@ sub process_set_cardtype {
   local $ignore_masked_payinfo = 1;
   my $search = FS::Cursor->new({
     table     => $table,
-    extra_sql => q[ WHERE payby IN('CARD','DCRD') AND paycardtype IS NULL ],
+    extra_sql => q[ WHERE payby IN('CARD','DCRD') AND ( paycardtype IS NULL or paycardtype = 'Not a credit card' ) ],
   });
   while (my $record = $search->fetch) {
     my $error = $record->replace;
diff --git a/FS/FS/pkg_referral.pm b/FS/FS/pkg_referral.pm
index a5ac795..0983ff6 100644
--- a/FS/FS/pkg_referral.pm
+++ b/FS/FS/pkg_referral.pm
@@ -1,11 +1,9 @@
 package FS::pkg_referral;
+use base qw( FS::Record );
 
 use strict;
-use vars qw( @ISA );
 use FS::Record qw( dbh );
 
- at ISA = qw(FS::Record);
-
 =head1 NAME
 
 FS::pkg_referral - Object methods for pkg_referral records
diff --git a/FS/bin/freeside-selfservice-xmlrpcd b/FS/bin/freeside-selfservice-xmlrpcd
index 7e373a0..e96f65a 100755
--- a/FS/bin/freeside-selfservice-xmlrpcd
+++ b/FS/bin/freeside-selfservice-xmlrpcd
@@ -29,6 +29,11 @@ my $conf = new FS::Conf;
 die "not running; selfservice-xmlrpc conf option is off\n"
   unless $conf->exists('selfservice-xmlrpc');
 
+if ( $conf->exists('selfservice-db_profile') ) {
+  eval "use DBIx::Profile";
+  warn $@ if $@;
+}
+
 daemon_run( 'port' => 8080, 'handle_request' =>
   sub {
     my $request = shift;
diff --git a/FS/t/InitHandler.t b/FS/t/InitHandler.t
deleted file mode 100644
index 0ce60c8..0000000
--- a/FS/t/InitHandler.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::InitHandler;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission.t b/FS/t/part_pkg-flat_comission.t
deleted file mode 100644
index fefa57e..0000000
--- a/FS/t/part_pkg-flat_comission.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::flat_comission;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission_cust.t b/FS/t/part_pkg-flat_comission_cust.t
deleted file mode 100644
index 05d3ac4..0000000
--- a/FS/t/part_pkg-flat_comission_cust.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::flat_comission_cust;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-flat_comission_pkg.t b/FS/t/part_pkg-flat_comission_pkg.t
deleted file mode 100644
index 851b58d..0000000
--- a/FS/t/part_pkg-flat_comission_pkg.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::flat_comission_pkg;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-sesmon_hour.t b/FS/t/part_pkg-sesmon_hour.t
deleted file mode 100644
index 4f02cfc..0000000
--- a/FS/t/part_pkg-sesmon_hour.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::sesmon_hour;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_pkg-sesmon_minute.t b/FS/t/part_pkg-sesmon_minute.t
deleted file mode 100644
index 6ceaa3c..0000000
--- a/FS/t/part_pkg-sesmon_minute.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_pkg::sesmon_minute;
-$loaded=1;
-print "ok 1\n";
diff --git a/Makefile b/Makefile
index c6eef91..6ebd1ce 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ API_USER = fs_api
 
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
-SELFSERVICE_MACHINES = 
+SELFSERVICE_MACHINES = localhost
 # SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
diff --git a/httemplate/docs/cvv2.html b/httemplate/docs/cvv2.html
index 653e1ff..de176d8 100644
--- a/httemplate/docs/cvv2.html
+++ b/httemplate/docs/cvv2.html
@@ -1,4 +1,4 @@
-<& /elements/header-popup.html, '' &>
+<& /elements/header-popup.html &>
 
   <% mt('The CVV2 number (also called CVC2 or CID) is a three- or four-digit security code used to reduce credit card fraud') |h %>
   <BR><BR>
diff --git a/httemplate/edit/access_user.html b/httemplate/edit/access_user.html
index 9d25853..2350917 100644
--- a/httemplate/edit/access_user.html
+++ b/httemplate/edit/access_user.html
@@ -83,6 +83,14 @@ sub edit_callback {
     if $sched_item[0] && ! $sched_item[0]->disabled;
 }
 
+sub error_callback {
+  my ($cgi, $access_user) = @_;
+warn $access_user->sched_item_enabled;
+warn $cgi->param('sched_item_enabled');
+  $access_user->sched_item_enabled('Y')
+    if $cgi->param('sched_item_enabled');  
+}
+
 sub field_callback {
   my ($c, $o, $f) = @_;
   if($f->{'type'} eq 'password' and $o->is_system_user) {
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index df1d7e5..4724ce6 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -151,7 +151,10 @@ my $money_char = $conf->config('money_char') || '$';
 
 my %search_hash = ();
 
-#some false laziness w/misc/bulk_change_pkg.cgi
+#some false laziness w/misc/bulk_change_pkg.cgi and bulk_pkg_increment_bill.cgi
+# and misc/process/
+# with shitty results (bulk doing things to wrong packages) if you don't update
+# those too :/
   
 $search_hash{'query'} = $cgi->keywords;
 
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index d8a0041..4e03649 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,11 +1,14 @@
-<% $cgi->redirect($path) %>
+<& /elements/header-cust_main.html,
+     view    => 'packages',
+     custnum => $cust_pkg->custnum,
+&>
+
+<& /elements/footer-cust_main.html &>
 <%init>
-# since cust_pkgs can't be viewed directly, just throw a redirect
+
 my ($pkgnum) = $cgi->keywords;
 $pkgnum =~ /^\d+$/ or die "invalid pkgnum '$pkgnum'";
-my $show = $FS::CurrentUser::CurrentUser->default_customer_view =~ /^(jumbo|packages)$/ ? '' : ';show=packages';
 
-my $self = FS::cust_pkg->by_key($pkgnum) or die "pkgnum $pkgnum not found";
-my $frag = 'cust_pkg'. $self->pkgnum;
-my $path = $p.'view/cust_main.cgi?custnum='.$self->custnum.";$show#$frag";
+my $cust_pkg = FS::cust_pkg->by_key($pkgnum) or die "pkgnum $pkgnum not found";
+
 </%init>

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

Summary of changes:
 FS/t/InitHandler.t                  |    5 -----
 FS/t/part_pkg-flat_comission.t      |    5 -----
 FS/t/part_pkg-flat_comission_cust.t |    5 -----
 FS/t/part_pkg-flat_comission_pkg.t  |    5 -----
 FS/t/part_pkg-sesmon_hour.t         |    5 -----
 FS/t/part_pkg-sesmon_minute.t       |    5 -----
 6 files changed, 30 deletions(-)
 delete mode 100644 FS/t/InitHandler.t
 delete mode 100644 FS/t/part_pkg-flat_comission.t
 delete mode 100644 FS/t/part_pkg-flat_comission_cust.t
 delete mode 100644 FS/t/part_pkg-flat_comission_pkg.t
 delete mode 100644 FS/t/part_pkg-sesmon_hour.t
 delete mode 100644 FS/t/part_pkg-sesmon_minute.t




More information about the freeside-commits mailing list