diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-08-17 15:38:22 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-08-17 15:38:22 -0700 |
| commit | a618055d3a8cfc55a449847b433dcdc85df92bcd (patch) | |
| tree | b97040ca60379c2e8de10a8d9884dae1e80b3beb /httemplate/view/cust_main | |
| parent | 601432ca6836e10cc4e15b1c055d77ff7f4a0540 (diff) | |
| parent | d87c9f804b0cb7b6798bf770f753fb83022f5e6a (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/view/cust_main')
| -rw-r--r-- | httemplate/view/cust_main/packages/contact.html | 2 | ||||
| -rw-r--r-- | httemplate/view/cust_main/packages/hidden.html | 14 | ||||
| -rwxr-xr-x | httemplate/view/cust_main/packages/section.html | 11 |
3 files changed, 23 insertions, 4 deletions
diff --git a/httemplate/view/cust_main/packages/contact.html b/httemplate/view/cust_main/packages/contact.html index 151da01aa..88f8afb4c 100644 --- a/httemplate/view/cust_main/packages/contact.html +++ b/httemplate/view/cust_main/packages/contact.html @@ -10,10 +10,12 @@ ( <%pkg_detach_link($cust_pkg)%> ) </FONT> % } + <BR> % } elsif ( $show_contact_link && ! $opt{no_links} ) { <FONT SIZE=-1> ( <%pkg_add_contact_link($cust_pkg)%> ) </FONT> + <BR> % } <%init> diff --git a/httemplate/view/cust_main/packages/hidden.html b/httemplate/view/cust_main/packages/hidden.html index e3bd0fabf..35eda8c46 100644 --- a/httemplate/view/cust_main/packages/hidden.html +++ b/httemplate/view/cust_main/packages/hidden.html @@ -18,13 +18,13 @@ <B><% time2str('%b %o, %Y', $cust_pkg->get('cancel')) %></B> </TD><TD> % if ( $pkgpart_change ) { - from <B><% $part_pkg->pkg |h %></B></A> - <% $part_pkg->custom_comment |h %> + from <% $popup_link |n %><B><% $part_pkg->pkg |h %></B> - <% $part_pkg->custom_comment |h %></A> % } % if ( $pkgpart_change and $location_change ) { <BR> % } % if ( $location_change ) { - from <I><% $cust_pkg->location_label %></I> + from <I><% $popup_link |n %><% $cust_pkg->location_label %></A></I> % } </TD> </TR> @@ -52,4 +52,14 @@ my $pkgpart_change = ($next->pkgpart != $cust_pkg->pkgpart); my $location_change = ($next->locationnum != $cust_pkg->locationnum); my $both_change = $pkgpart_change && $location_change; +my $onclick = + include('/elements/popup_link_onclick.html', + 'action' => $fsurl.'view/cust_pkg-popup.html?' . $cust_pkg->pkgnum, + 'actionlabel' => 'Package #'.$cust_pkg->pkgnum, + 'width' => '1000', + 'height' => '310', + 'color' => $cust_pkg->statuscolor, + ); +my $popup_link = qq(<A HREF="#" onclick="$onclick">); + </%init> diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html index 4980feeac..217e8c556 100755 --- a/httemplate/view/cust_main/packages/section.html +++ b/httemplate/view/cust_main/packages/section.html @@ -4,17 +4,22 @@ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Package') |h %></TH> <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Status') |h %></TH> <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Contact/Location') |h %></TH> +% if (!$opt{no_services}) { <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Services') |h %></TH> +% } </TR> % #$FS::cust_pkg::DEBUG = 2; % foreach my $cust_pkg (@$packages) { +% # if requested, this can override cust_pkg-group_by_location <& .packagerow, $cust_pkg, + %conf_opt, ( map { $_ => $opt{$_} } qw( cust_main bgcolor no_links cust_location_cache before_pkg_callback before_svc_callback after_svc_callback + cust_pkg-group_by_location + no_services )), - %conf_opt &> % } % } else { # there are no packages @@ -30,10 +35,12 @@ <& package.html, %iopt &> <& status.html, %iopt &> <TD CLASS="inv" BGCOLOR="<% $iopt{bgcolor} %>" WIDTH="20%" VALIGN="top"> - <& contact.html, %iopt &><BR> + <& contact.html, %iopt &> <& location.html, %iopt &> </TD> +% if (!$iopt{no_services}) { <& services.html, %iopt &> +% } </TR> % # insert hidden predecessors to this package, if any % # and a rolldown button to show them |