diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-08-25 21:25:15 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-08-25 23:44:00 -0500 |
| commit | 8550a95443b6e3ddc9d8438d65b5e38e45b638c0 (patch) | |
| tree | 9a8f43382872c9b4c9ab6d1c855620707fbead76 | |
| parent | fec109316e1aa49651b72fd31cc938d2ea6ee5cf (diff) | |
RT#18361: Delay package from billing until services are provisioned [v3 merge]
| -rw-r--r-- | httemplate/elements/tr-pkg_svc.html | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/httemplate/elements/tr-pkg_svc.html b/httemplate/elements/tr-pkg_svc.html index c355c2051..9aa14b870 100644 --- a/httemplate/elements/tr-pkg_svc.html +++ b/httemplate/elements/tr-pkg_svc.html @@ -1,15 +1,14 @@ <TR> <TD CLASS="background" COLSPAN=99> -<% itable('', 4, 1) %><TR><TD VALIGN="top"> -<% $thead %> - <SCRIPT> var provision_hold_td = []; var provision_hold_input = []; -provision_hold_td.push(document.getElementById('th_provision_hold')); </SCRIPT> +<% itable('', 4, 1) %><TR><TD VALIGN="top"> +<% pkg_svc_thead() %> + %foreach my $part_svc ( @part_svc ) { % my $svcpart = $part_svc->svcpart; % my $pkg_svc = $pkg_svc{$svcpart} @@ -80,7 +79,7 @@ provision_hold_input.push(document.getElementById('input_provision_hold<% $svcpa % if ( $count == int( $_ * scalar(@part_svc) / $columns ) ) { % - </TABLE></TD><TD VALIGN="top"><% $thead %> + </TABLE></TD><TD VALIGN="top"><% pkg_svc_thead() %> % } % } % $count++; @@ -144,13 +143,20 @@ provision_hold_init(); my %opt = @_; my $cgi = $opt{'cgi'}; -my $thead = "\n\n". ntable('#cccccc', 2). - '<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>'. - '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-2>Primary</FONT></TH>'. - '<TH BGCOLOR="#dcdcdc">Service</TH>'. - '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Hide</FONT></TH>'. - '<TH BGCOLOR="#dcdcdc" ID="th_provision_hold"><FONT SIZE=-1>Remove Hold After Provisioning</FONT></TH>'. - '</TR>'; +my $thead_count = 0; +sub pkg_svc_thead { + $thead_count += 1; + return "\n\n". ntable('#cccccc', 2). + '<TR>'. + '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>'. + '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'. + '<TH BGCOLOR="#dcdcdc">Service</TH>'. + '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Hide<BR>from<BR>Invoices</FONT></TH>'. + '<TH BGCOLOR="#dcdcdc" ID="th_provision_hold' . $thead_count . '"><FONT SIZE=-1>Remove Hold After Provisioning</FONT></TH>'. + '</TR>'. + qq!<SCRIPT>provision_hold_td.push(document.getElementById('th_provision_hold$thead_count'))</SCRIPT>!; +; +} my $part_pkg = $opt{'object'}; my $pkgpart = $part_pkg->pkgpart; |