X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fservices.html;h=fa193d636305847b0857848b57f0ae036570aaad;hp=512efccc435b8362e79f4b8ccb973cd430e9b61d;hb=0b425dc3033774ab661a348d8ac729a70be7f794;hpb=0a51b87d75f8c93de863f729ef1ca568ca227e32 diff --git a/httemplate/view/cust_main/packages/services.html b/httemplate/view/cust_main/packages/services.html index 512efccc4..fa193d636 100644 --- a/httemplate/view/cust_main/packages/services.html +++ b/httemplate/view/cust_main/packages/services.html @@ -3,28 +3,40 @@ % ### - +
-% #foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) { -% foreach my $part_svc ( $cust_pkg->part_svc ) { - +% foreach my $part_svc ( +% $cust_pkg->part_svc( +% 'summarize_size' => $opt{'cust_pkg-large_pkg_size'}, +% 'hide_discontinued' => $opt{'cust_pkg-hide_discontinued-part_svc'}, +% ) +% ) { +% +% my $num_cust_svc = $cust_pkg->num_cust_svc( $part_svc->svcpart ); +% % if ( $opt{'cust_pkg-large_pkg_size'} > 0 and -% $opt{'cust_pkg-large_pkg_size'} <= $cust_pkg->num_svcs ) { -% # summarize +% $opt{'cust_pkg-large_pkg_size'} <= $num_cust_svc ) { # summarize +% - + + % my $hint = $hints{$part_svc->svcdb}; % if ( $hint ) { -
+ + + -% } -% else { +% } #$hint +% +% } else { # don't summarize +% % foreach my $cust_svc ( @{ $part_svc->cust_pkg_svc } ) { - - - - - - - - - - - - - - - - +% if ( $cust_pkg->getfield('cancel') > 0 ) { + <& /elements/tr-cust_svc_cancel.html, + %opt, + 'part_svc' => $part_svc, + 'cust_svc' => $cust_svc, + 'cust_pkg' => $cust_pkg, + &> +% } +% else { + <& /elements/tr-cust_svc.html, + %opt, + 'part_svc' => $part_svc, + 'cust_svc' => $cust_svc, + 'cust_pkg' => $cust_pkg, + &> +% } #if cancel > 0 % } #foreach $cust_svc -% } - +% } #if summarizing % if ( ! $cust_pkg->get('cancel') % && $curuser->access_right('Provision customer service') % && $part_svc->num_avail @@ -103,7 +76,44 @@ function clearhint_search_cust_svc(obj, str) { @@ -121,58 +131,65 @@ my %opt = @_; my $bgcolor = $opt{'bgcolor'}; my $cust_pkg = $opt{'cust_pkg'}; my $part_pkg = $opt{'part_pkg'}; -my $curuser = $FS::CurrentUser::CurrentUser; +my $svc_phone_bulk_provision_simple = $opt{'svc_phone-bulk_provision_simple'}; -my $conf = new FS::Conf; +my $curuser = $FS::CurrentUser::CurrentUser; sub svc_provision_link { my ($cust_pkg, $part_svc, $opt, $curuser) = @_; - ( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/ /g; + + ( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/ /g; my $num_avail = $part_svc->num_avail; - my $pkgnum_svcpart = "pkgnum=". $cust_pkg->pkgnum. ';'. - "svcpart=". $part_svc->svcpart; + + my $query = "pkgnum=". $cust_pkg->pkgnum. ';'. + "svcpart=". $part_svc->svcpart; + $query .= ';bulk=1' if $opt->{bulk}; + my $url; if ( $part_svc->svcdb eq 'svc_external' #could be generalized && $opt->{'svc_external-skip_manual'} ) { - $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart"; + $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$query"; + } elsif ( $part_svc->svcdb eq 'svc_phone' && $opt->{bulk} + && $opt->{svc_phone_bulk_provision_simple} + ) + { + $query .= ';num_avail='. $opt->{num_avail}; + $url = "${p}edit/bulk-svc_phone.html?$query"; } else { $url = svc_url( 'm' => $m, 'action' => 'edit', 'part_svc' => $part_svc, - 'query' => $pkgnum_svcpart, + 'query' => $query, ); - #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart"; } + my $action = $opt->{bulk} ? 'Bulk provision' : 'Provision'; + my $link = qq!!. - "Provision $svc_nbsp ($num_avail)"; + emt("$action [_1] ([_2])",$svc_nbsp,$num_avail).''; + if ( $opt->{'legacy_link'} && $curuser->access_right('View/link unlinked services') + && ! $opt{bulk} ) { $link .= '
'. - qq!!. - "Link to legacy $svc_nbsp ($num_avail)"; + qq!!. + emt("Link to legacy [_1] ([_2])",$svc_nbsp,$num_avail).''; } - $link; -} -sub svc_unprovision_link { - my $cust_svc = shift or return ''; - qq!Unprovision!; + $link; } my %hints = ( -svc_acct => '(user or email)', -svc_domain => '(domain)', -svc_broadband => '(ip or mac)', -svc_forward => '(email)', -svc_phone => '(phone)', -svc_pbx => '(phone)', +svc_acct => emt('(user or email)'), +svc_domain => emt('(domain)'), +svc_broadband => emt('(ip or mac)'), +svc_forward => emt('(email)'), +svc_phone => emt('(phone)'), +svc_pbx => emt('(phone)'), );
+ % my $href="${p}search/cust_pkg_svc.html?svcpart=".$part_svc->svcpart. % ";pkgnum=".$cust_pkg->pkgnum; - <% $part_svc->svc %>  - (view all <% $cust_pkg->num_svcs %>) + <% $part_svc->svc |h %> + + (<% mt("view all [_1]", $num_cust_svc) |h %>) +
@@ -32,70 +44,31 @@ function clearhint_search_cust_svc(obj, str) {
-% } #$hint
<% FS::UI::Web::svc_link($m, $part_svc, $cust_svc) %><% FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc) %><% FS::UI::Web::svc_export_links($m, $part_svc, $cust_svc) %>
- - <% $cust_svc->overlimit ? "Overlimit: ". time2str('%b %o %Y' . ($opt{'cust_pkg-display_times'} ? ' %l:%M %P' : ''), $cust_svc->overlimit) : '' %> -
- -% if ( $curuser->access_right('Recharge customer service') -% && $part_svc->svcdb eq 'svc_acct' -% && ( $cust_svc->svc_x->seconds ne '' -% || $cust_svc->svc_x->upbytes ne '' -% || $cust_svc->svc_x->downbytes ne '' -% || $cust_svc->svc_x->totalbytes ne '' -% ) -% ) { - ( <%svc_recharge_link($cust_svc)%> ) -% } - - -% my $ip_addr = $cust_svc->svc_x->ip_addr; - -% if ( $part_svc->svcdb eq 'svc_broadband' ) { - ( <% include('/elements/popup_link-ping.html', 'ip'=> $ip_addr ) %> ) - -% } - -% my $manage_link = $opt{'svc_broadband-manage_link'}; -% if ( $manage_link && $part_svc->svcdb eq 'svc_broadband' ) { -% my $svc_manage_link = eval(qq("$manage_link")); - ( Manage Device ) - -% } - -% if ( $curuser->access_right('Unprovision customer service') ) { - ( <%svc_unprovision_link($cust_svc)%> ) -% } - -% if ( $part_svc->svcdb eq 'svc_pbx' && $opt{'maestro-status_test'} ){ - ( Test maestro status ) -% } - -
- <% svc_provision_link($cust_pkg, $part_svc, \%opt, $curuser) %> + + +% if ( $opt{no_links} ) { + <% $part_svc->svc |h %>: <% $part_svc->num_avail %> + <% mt('Available') |h %> +% } else { + <% svc_provision_link($cust_pkg, $part_svc, \%opt, $curuser) %> +% } + + +% if ( $curuser->access_right('Bulk provision customer service') +% && $part_svc->svcdb eq 'svc_phone' +% && ! $opt{no_links} +% ) +% { +% if ( $part_svc->num_avail > 5 ) { +% local $opt{'bulk'} = 1; +% local $opt{'svc_phone_bulk_provision_simple'} = $svc_phone_bulk_provision_simple; +% local $opt{'num_avail'} = $part_svc->num_avail; +
<% svc_provision_link($cust_pkg, $part_svc, \%opt, $curuser) %> +% } +% if ( +% qsearch({ +% 'table' => 'did_order', +% 'hashref' => { 'custnum' => $cust_pkg->custnum }, +% 'extra_sql' => ' LIMIT 1' +% }) +% || +% qsearch({ +% 'table' => 'did_order_item', +% 'hashref' => { 'custnum' => $cust_pkg->custnum }, +% 'addl_from' => ' INNER JOIN did_order ON did_order_item.ordernum = did_order.ordernum', +% 'extra_sql' => ' LIMIT 1' +% }) +% ) { +
<% mt('Browse Received DID Inventory') |h %> +% } +% }