X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=068a8276f4f027f79255d37f033e0d5729eec863;hb=34647c32b50ce3b8ee1b6d3d7aef4ba9d0297bdb;hp=c5a0706d65b42418e9c8cd7520e39788b97c50ba;hpb=c21b6e69583bec632de7fcd340c29982c868f73d;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index c5a0706d6..068a8276f 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -5,8 +5,38 @@
my $packages = get_packages($cust_main, $conf);
%>
-Packages
-( Bulk order and cancel packages (preserves services) )
+Packages
+
+<%= include('order_pkg.html', $cust_main ) %>
+
+<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
+ <%= include('quick-charge.html', $cust_main ) %>
+<% } %>
+
+Bulk order and cancel packages (preserves services)
+
+
+<% if ( @$packages ) { %>
+Current packages
+<% } %>
+
+<% if ( $cust_main->num_cancelled_pkgs ) {
+ if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
+ || ( $conf->exists('hidecancelledpackages')
+ && ! $cgi->param('showcancelledpackages')
+ )
+ )
+ {
+ $cgi->param('showcancelledpackages', 1);
+%>
+ ( show
+<% } else {
+ $cgi->param('showcancelledpackages', 0);
+%>
+ ( hide
+<% } %>
+ cancelled packages )
+<% } %>
<% if ( @$packages ) { %>
@@ -159,12 +189,14 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
}
}
}
-print '';
-}
-
#end display packages
%>
+
+<% } else { %>
+
+<% } %>
+
<%
#subroutines
@@ -173,12 +205,18 @@ sub get_packages {
my $conf = shift;
my @packages = ();
+ my $method;
+ if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
+ || ( $conf->exists('hidecancelledpackages')
+ && ! $cgi->param('showcancelledpackages') )
+ )
+ {
+ $method = 'ncancelled_pkgs';
+ } else {
+ $method = 'all_pkgs';
+ }
- foreach my $cust_pkg (
- $conf->exists('hidecancelledpackages')
- ? $cust_main->ncancelled_pkgs
- : $cust_main->all_pkgs
- ) {
+ foreach my $cust_pkg ( $cust_main->$method() ) {
my $part_pkg = $cust_pkg->part_pkg;