summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2017-03-10 07:04:12 -0800
committerIvan Kohler <ivan@freeside.biz>2017-03-10 07:04:12 -0800
commitf77cbf2281ef5ea2e0b81b64fdd1dd78fca3e543 (patch)
tree36068bd5ddb2295dd9608f36831a3232a6f0e6bc /httemplate
parentc13b6c8f4b9876aa8f91e1c14d3c208ac0d189e9 (diff)
Revert "remove old test files"
This reverts commit c13b6c8f4b9876aa8f91e1c14d3c208ac0d189e9.
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/docs/cvv2.html2
-rw-r--r--httemplate/edit/access_user.html8
-rwxr-xr-xhttemplate/search/cust_pkg.cgi5
-rwxr-xr-xhttemplate/view/cust_pkg.cgi15
4 files changed, 8 insertions, 22 deletions
diff --git a/httemplate/docs/cvv2.html b/httemplate/docs/cvv2.html
index de176d80c..653e1ff9a 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 2350917f1..9d2585366 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 4724ce61f..df1d7e589 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 4e036496a..d8a0041ee 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>