X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fpackage.html;h=d6431331cf5663bc14b903863ff57d906336ae09;hp=efc33712f855cdcdc54e76553d60970735240b3c;hb=b0fd49b9efe2a4340fafa80aacf424ed81de8a66;hpb=7f2d0815adb38e78ed46661e3e09d499fbcbe989 diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html index efc33712f..d6431331c 100644 --- a/httemplate/view/cust_main/packages/package.html +++ b/httemplate/view/cust_main/packages/package.html @@ -1,96 +1,63 @@ -> + + <% join('', @marker ) %> - - - - - - - - +% ### +% # Quantity +% ### +% if ( $cust_pkg->quantity > 1 ) { +% } - +% ### +% # Sales person +% ### +% if ( $cust_pkg->salesnum ) { +% } +% ### +% # Invoice details & comments +% ### % my $editi = $curuser->access_right('Edit customer package invoice details'); % my $editc = $curuser->access_right('Edit customer package comments'); % my @cust_pkg_detail = $cust_pkg->cust_pkg_detail; @@ -174,18 +142,6 @@ % } else { % } @@ -218,18 +174,6 @@ % } else { % } @@ -241,7 +185,7 @@ % if ( @cust_pkg_usage ) {
<% $opt{before_pkg_callback} ? &{ $opt{before_pkg_callback} }( $cust_pkg ) : '' %> + +% ### +% # Package +% ### <% $curuser->option('show_pkgnum') ? $cust_pkg->pkgnum.': ' : '' %><% $part_pkg->pkg |h %> -% my $custom_comment = $part_pkg->custom_comment(); - <% $custom_comment ? ' - ' : '' %> - <% $part_pkg->custom_comment |h %> -
- - -% if ( $part_pkg->freq eq '0' and !$opt{no_links} ) { -% # One-time charge. Nothing you can do with this, unless: -% if ( $curuser->access_right('Modify one-time charge') ) { - ( <%onetime_change_link($cust_pkg)%> ) -
-% } + ><% $opt{show_pkgnum} ? $cust_pkg->pkgnum.': ' : '' %><% $part_pkg->pkg |h %> % -% } elsif ( !$cust_pkg->get('cancel') and !$opt{no_links} ) { +% my $custom_comment; +% if ( 0 && FS::part_pkg::flat->can('price_info') eq $part_pkg->can('price_info') ) { +% #perf hack / disabled in 4.x (feature pricing / cust_pkg_usageprice incompatible, well, harder) % -% if ( $change_from ) { -% # This is the target package for a future change. -% # Nothing you can do with it besides modify/cancel the -% # future change, and that's on the current package. -% } elsif ( $supplemental ) { -% # Supplemental packages can't be changed independently. -% # Show only "Add comments" and "Add invoice details". -% } else { -% # the usual case: links to change package definition, -% # discount, and customization -% my $br = 0; -% if ( $curuser->access_right('Change customer package') ) { -% $br=1; - ( <%pkg_change_link($cust_pkg)%> ) -% } -% -% if ( $curuser->access_right('Discount customer package') -% && $part_pkg->can_discount -% && ! scalar($cust_pkg->cust_pkg_discount_active) -% && ! scalar($cust_pkg->part_pkg->part_pkg_discount) -% ) -% { -% $br=1; - ( <%pkg_discount_link($cust_pkg)%> ) -% } +% $part_pkg->{"_$_"} = $part_pkg->option($_) || 0 +% foreach grep !defined($part_pkg->{"_$_"} ), qw(setup_fee recur_fee); +% +% my $str = ''; +% $str = $opt{money_char} . $part_pkg->{_setup_fee}. +% ($part_pkg->{_recur_fee} ? ' setup' : ' one-time') +% if $part_pkg->{_setup_fee}; +% $str .= ', ' if $part_pkg->{_setup_fee} && $part_pkg->{_recur_fee}; +% $str .= $opt{money_char}. $part_pkg->{_recur_fee}. +% '/'. $part_pkg->freq_pretty +% if $part_pkg->{_recur_fee}; +% $str; % -% if ( $curuser->access_right('Customize customer package') ) { -% $br=1; - ( <%pkg_customize_link($cust_pkg,$part_pkg)%> ) -% } +% $custom_comment = +% ( $part_pkg->custom ? '(CUSTOM) ' : '' ). +% $part_pkg->comment. +% ( ($part_pkg->custom || $part_pkg->comment) ? ' - ' : '' ). +% ($str || 'No charge'); % - <% $br ? '
' : '' %> -% } - -% if ( $cust_pkg->num_cust_event -% && ( $curuser->access_right('Billing event reports') -% || $curuser->access_right('View customer billing events') -% ) -% ) { - ( <%pkg_event_link($cust_pkg)%> ) -% } -% } #!$supplemental - - +% } else { +% $custom_comment = $part_pkg->custom_comment('cust_pkg'=>$cust_pkg); +% } + <% $custom_comment ? ' - ' : '' %> + <% $custom_comment |h %>
- -% my $change_quan_label = 'Change quantity'; -% if ( $cust_pkg->quantity > 1 ) { -% $change_quan_label = 'change';       <% mt('Quantity:') |h %> <% $cust_pkg->quantity %> -% } % if ( $curuser->access_right('Change customer package') % && ! $cust_pkg->get('cancel') +% && ! $change_from % && ! $supplemental % && $part_pkg->freq ne '0' % && ! $opt{no_links} @@ -98,40 +65,41 @@ % ) % { - ( <% pkg_change_quantity_link($cust_pkg, $change_quan_label) %> ) + ( <% pkg_change_quantity_link($cust_pkg, 'change') %> ) % } -
- -% my $change_sales_label = 'Change sales person'; -% if ( $cust_pkg->salesnum ) { -% $change_sales_label = 'change';       <% mt('Sales Person:') |h %> <% $cust_pkg->salesperson |h %> -% } - % if ( $curuser->access_right('Change customer package') % && ! $cust_pkg->get('cancel') +% && ! $change_from % && ! $supplemental % #&& $part_pkg->freq ne '0' % && ! $opt{no_links} % ) % { - ( <% pkg_change_salesnum_link($cust_pkg, $change_sales_label) %> ) + ( <% pkg_change_salesnum_link($cust_pkg, 'change') %> ) % } -
-% if ( $editi && ! $cust_pkg->get('cancel') && ! $opt{no_links} ) { - - ( <% include('/elements/popup_link.html', { - 'action' => $editlink. 'I', - 'label' => emt('Add invoice details'), - 'actionlabel' => emt('Add invoice details'), - 'color' => '#333399', - 'width' => 763, - }) - %> ) - -% } -% if ( $editc && ! $opt{no_links} ) { - - ( <& /elements/popup_link.html, { - 'action' => $editlink. 'C', - 'label' => emt('Add comments'), - 'actionlabel' => emt('Add comments'), - 'color' => '#333399', - 'width' => 763, - } - &> ) - -% }
- + % foreach my $usage (@cust_pkg_usage) { % my $part = $usage->part_pkg_usage; % my $ratio = 255 * ($usage->minutes / $part->minutes); @@ -251,7 +195,7 @@ % $trstyle = ' CLASS="shared"' if $part->shared; > - + % if ( $part->shared ) { @@ -262,6 +206,414 @@
<% mt('Included usage') %>
<% emt('Included usage') %>
<% $part->description %>: ALIGN="right"><% $usage->minutes %> ALIGN="right"><% sprintf('%.1f', $usage->minutes) %> > / ><% $part->minutes %>
% } + +% ### +% # Package actions dropdown +% ### +% unless ( $opt{no_links} ) { + + + + + +
+ +% my $plink = "pkgnum=$pkgnum"; +% my $reg_recur_cond = sub { $part_pkg->freq ne '0' +% && ! $change_from +% && ! $supplemental +% && ! $cust_pkg->get('cancel') +% }; +% my $change_cond = sub { $part_pkg->freq ne '0' +% && ! $change_from +% && ! $supplemental +% && ! $cust_pkg->get('cancel') +% && $cust_pkg->change_to_pkgnum, +% }; + + <& /elements/dropdown-menu.html, + id => 'cust_pkg'. $cust_pkg->pkgnum. '_menu', + bgcolor => $opt{row} % 2 ? '#ffffff' : '#eeeeee', + menu => [ + [ + + #TODO: order/group these better + + { label => 'Package actions', + content => + ''. + 'Package actions'. + ' ', + }, + + { label => 'Modify one-time charge', + acl => 'Modify one-time charge', + condition => sub { $part_pkg->freq eq '0' }, + url => "edit/quick-charge.html?change_$plink", + }, + + { label => 'Change package', + acl => 'Change customer package', + condition => $reg_recur_cond, + popup => "misc/change_pkg.cgi?$plink". + ';locationnum='. $cust_pkg->locationnum, + actionlabel => emt('Change package'), + #width => 768, + width => 960, + height => 640, + }, + + { label => 'Discount package', + condition => sub { ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && $can_discount_pkg + }, + popup => "edit/cust_pkg_discount.html?$plink", + actionlabel => emt('Discount package'), + width => 616, + }, + + { label => 'Customize package', + acl => 'Customize customer package', + condition => $reg_recur_cond, + url => "edit/part_pkg.cgi?$plink". + ';clone='. $part_pkg->pkgpart, + }, + + { label => '-', + content => '-', + }, + + { label => 'View package events', + acl => [ 'Billing event reports', + 'View customer billing events', ], + condition => sub { $cust_pkg->exists_cust_event }, + url => "search/cust_event.html?$plink", + }, + + { label => '-', + condition => sub { $cust_pkg->exists_cust_event }, + content => '-', + }, + + { label => 'Change quantity', + acl => 'Change customer package', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && $opt{'invoice-unitprice'} + }, + popup => "edit/cust_pkg_quantity.html?$plink", + + actionlabel => emt('Change quantity'), + width => 390, + height => 220, + }, + + { label => 'Change sales person', + acl => 'Change customer package', + condition => sub { ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + }, + popup => "edit/cust_pkg_salesnum.html?$plink", + actionlabel => emt('Change sales persion'), + width => 390, + height => 220, + }, + + { label => '-', + content => '-', + }, + + { label => (@invoice_detail ? 'Edit' : 'Add'). + ' invoice details', + acl => 'Edit customer package invoice details', + condition => sub { ! $cust_pkg->get('cancel') }, + popup => "edit/cust_pkg_detail.html?$plink". + ';detailtype=I', + actionlabel => emt( (@invoice_detail ? 'Edit' : 'Add'). + ' invoice details' + ), + width => 768, + }, + + { label => (@comments ? 'Edit' : 'Add'). ' comments', + acl => 'Edit customer package comments', + popup => "edit/cust_pkg_detail.html?$plink". + ';detailtype=C', + actionlabel => emt( (@comments ? 'Edit' : 'Add'). + ' comments' + ), + width => 768, + }, + + { label => '-', + #condition => sub { $part_pkg->freq ne '0' }, + content => '-', + }, + + { label => 'Set start date', + acl => 'Change package start date', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && ! $cust_pkg->get('setup') + }, + popup => "misc/change_pkg_date.html?$plink". + ';field=start_date', + actionlabel => emt('Set start of billing for'), + width => 510, + height => 310, + }, + + { label => 'Set contract end', + acl => 'Change package contract end date', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && ! $cust_pkg->change_to_pkgnum + }, + popup => "misc/change_pkg_date.html?$plink". + ';field=contract_end', + actionlabel => emt('Set contract end for'), + width => 510, + height => 310, + }, + + { label => '-', + condition => sub { $part_pkg->freq ne '0' }, + content => '-', + }, + + { label => 'Change now', + acl => 'Change customer package', + condition => $change_cond, + url => "misc/change_pkg_now.cgi?$pkgnum", + }, + + { label => 'Reschedule', + acl => 'Change customer package', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && $cust_pkg->change_to_pkgnum, + }, + popup => "misc/change_pkg.html?$plink", + actionlabel => emt('Edit scheduled change for'), + url => "misc/change_pkg_now.cgi?$pkgnum", + width => 960, + height => 490, + + }, + + { label => 'Abort change', + acl => 'Change customer package', + condition => $change_cond, + url => "misc/do_not_change_pkg.cgi?$pkgnum", + }, + + { label => '-', + acl => 'Change customer package', + condition => $change_cond, + content => '-', + }, + + { label => 'Suspend now', + acl => 'Suspend customer package', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && ! $cust_pkg->get('susp') + }, + popup => "misc/cancel_pkg.html?method=suspend;$plink", + actionlabel => emt('Suspend now'), + color => '#FF9900', + width => 768, + height => 420, + }, + + { label => 'Suspend later', + acl => 'Suspend customer package later', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && ! $cust_pkg->get('susp') + }, + popup => "misc/cancel_pkg.html?method=adjourn;$plink", + actionlabel => emt('Suspend later'), + color => '#CC6600', + width => 768, + height => 445, + }, + + { label => $cust_pkg->dundate + ? 'Edit suspension delay' + : 'Delay suspend', + + acl => 'Delay suspension events', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && ! $cust_pkg->get('susp') + }, + popup => "misc/delay_susp_pkg.html?$plink", + actionlabel => emt('Delay suspend for'), + width => 768, + }, + + { label => 'Start billing', + acl => 'Unsuspend customer package', + condition => sub { ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && $cust_pkg->get('susp') + && $cust_pkg->order_date == $cust_pkg->get('susp') + }, + popup => "misc/unhold_pkg.html?$plink", + actionlabel => emt('Start billing'), + color => '#00CC00', + width => 510, + height => 310, + }, + + { label => 'Unsuspend now', + acl => 'Unsuspend customer package', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && $cust_pkg->get('susp') + && $cust_pkg->order_date != $cust_pkg->get('susp') + }, + 'url' => "misc/unsusp_pkg.cgi?$pkgnum", + }, + + { label => 'Unsuspend later', + acl => 'Unsuspend customer package', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && $cust_pkg->get('susp') + && $cust_pkg->order_date != $cust_pkg->get('susp') + }, + popup => "misc/cancel_pkg.html?method=resume;$plink", + actionlabel => emt('Unsuspend later'), + color => '#00CC00', + width => 768, + }, + + { label => '-', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->get('cancel') + && ! $cust_pkg->get('susp') + }, + content => '-', + }, + + { label => 'Cancel now', + acl => 'Cancel customer package immediately', + condition => sub { + ( $part_pkg->freq ne '0' || ! $cust_pkg->get('setup') ) + && ! $change_from + && ! $supplemental + && ! $cust_pkg->change_to_pkgnum + && ! $cust_pkg->get('cancel') + }, + popup => "misc/cancel_pkg.html?method=cancel;$plink", + actionlabel => emt('Cancel now'), + color => '#FF0000', + width => 768, + }, + + { label => 'Cancel later', + acl => 'Cancel customer package later', + condition => sub { $part_pkg->freq ne '0' + && ! $change_from + && ! $supplemental + && ! $cust_pkg->change_to_pkgnum + && ! $cust_pkg->get('cancel') + }, + popup => "misc/cancel_pkg.html?method=expire;$plink", + actionlabel => emt('Cancel later'), + color => '#CC0000', + width => 768, + }, + + { label => 'Un-cancel', + acl => 'Un-cancel customer package', + condition => sub { $part_pkg->freq ne '0' + && ! $supplemental + && ! $cust_pkg->change_custnum + && $cust_pkg->get('cancel') + }, + popup => "misc/cancel_pkg.html?method=uncancel;$plink", + actionlabel => emt('Un-cancel'), + width => 960, + height => 740, + + }, + + { label => '-', + condition => sub { + ( $part_pkg->freq ne '0' || ! $cust_pkg->get('setup') ) + && ! $change_from + && ! $cust_pkg->get('cancel') + }, + content => '-', + }, + + { label => 'Add contact', + #acl => 'Add package contact',#or something like that + condition => sub { ! $cust_pkg->get('cancel') }, + popup => "misc/change_pkg_contact.html?$plink", + actionlabel => emt('Add contact'), + width => 616, + height => 200, + }, + + { label => 'Change location', + acl => 'Change customer package', + condition => sub { ! $change_from }, + popup => "misc/change_pkg.cgi?locationnum=-1;$plink;". + "address1=;address2=;city=;county=;state=$statedefault;". + "zip=;country=$countrydefault", + actionlabel => emt('Change location'), + width => 960, + height => 640, + }, + + { label => 'Edit location', + acl => 'Change customer package', + condition => sub { ! $change_from && $cust_pkg->locationnum != $cust_pkg->cust_main->ship_locationnum }, + popup => 'edit/cust_location.cgi?locationnum='. + $cust_pkg->locationnum, + actionlabel => emt('Edit location'), + width => 700, + height => 355, + }, + + ], + ], + &> + +
+ +% } + + <% join('', map '', @marker ) %> + <%init> @@ -282,16 +634,12 @@ my $statedefault = $opt{'statedefault'} # if this package is somehow special my $supplemental = $opt{'supplemental'} || 0; my $change_from = $opt{'change_from'} || 0; -my $style = ''; -if ( $supplemental or $change_from ) { - $style = 'border-left-width: '.($supplemental + $change_from)*30 . 'px; '. - 'border-color: '; - if ( $supplemental ) { - $style .= '#bbbbff'; - } elsif ( $change_from ) { - $style .= '#bbffbb'; - } - $style = qq!STYLE="$style"!; +my @marker; +if ( $supplemental ) { + push @marker, '
'; +} +if ( $change_from ) { + push @marker, '
'; } $cust_pkg->pkgnum =~ /^(\d+)$/; @@ -313,32 +661,6 @@ sub pkg_link { qq!$label!; } -sub pkg_change_link { - my $cust_pkg = shift; - my $locationnum = $cust_pkg->locationnum; - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p. "misc/change_pkg.cgi?locationnum=$locationnum", - 'label' => emt('Change package'), - 'actionlabel' => emt('Change'), - 'cust_pkg' => $cust_pkg, - 'width' => 960, - 'height' => 490, - ); -} - -sub onetime_change_link { - my $cust_pkg = shift; - my $pkgnum = $cust_pkg->pkgnum; - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p. "edit/quick-charge.html?change_pkgnum=$pkgnum", - 'label' => emt('Modify one-time charge'), - 'actionlabel' => emt('Modify'), - 'cust_pkg' => $cust_pkg, - 'width' => 690, - 'height' => 380, - ); -} - sub pkg_change_location_link { my $cust_pkg = shift; my $pkgpart = $cust_pkg->pkgpart; @@ -350,7 +672,7 @@ sub pkg_change_location_link { 'actionlabel' => emt('Change'), 'cust_pkg' => $cust_pkg, 'width' => 960, - 'height' => 490, + 'height' => 530, ); } @@ -378,32 +700,27 @@ sub pkg_change_salesnum_link { ); } -sub pkg_discount_link { - my $cust_pkg = shift or return ''; - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p.'edit/cust_pkg_discount.html', - 'label' => emt('Discount'), - 'actionlabel' => emt('Discount'), - 'cust_pkg' => $cust_pkg, - 'width' => 616, - ); -} - -sub pkg_customize_link { - my $cust_pkg = shift or return ''; - my $part_pkg = shift; - my $custnum = $cust_pkg->custnum; - qq!!.emt('Customize').''; -} +# figure out if this user will be able to edit either the setup or recurring +# discounts for this package +my $can_discount_pkg = 0; + +if ( $part_pkg->can_discount ) { + #looking these up individually uses the ACL cache and is a big win for lots + # of packages + my $discount = $curuser->access_right('Discount customer package'); + my $waive = $curuser->access_right('Waive setup fee'); + + $can_discount_pkg = + ( ($discount || $waive) + && $cust_pkg->base_setup > 0 + && !$cust_pkg->setup + or + ( $discount + && $cust_pkg->base_recur > 0 + && $cust_pkg->freq ne '0' + ) + ); -sub pkg_event_link { - my($cust_pkg) = @_; - qq!!. - emt('View package events'). - ''; }