From eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 1 Aug 2007 22:26:52 +0000 Subject: event refactor, landing on HEAD! --- httemplate/view/cust_bill-logo.cgi | 3 +- httemplate/view/cust_bill.cgi | 59 +--- httemplate/view/cust_main.cgi | 78 +++-- httemplate/view/cust_main/order_pkg.html | 41 --- httemplate/view/cust_main/packages.html | 407 ++++++++++++++----------- httemplate/view/cust_main/payment_history.html | 12 +- httemplate/view/logo.cgi | 47 +++ httemplate/view/svc_Common.html | 12 +- 8 files changed, 354 insertions(+), 305 deletions(-) delete mode 100644 httemplate/view/cust_main/order_pkg.html create mode 100644 httemplate/view/logo.cgi (limited to 'httemplate/view') diff --git a/httemplate/view/cust_bill-logo.cgi b/httemplate/view/cust_bill-logo.cgi index e2f810c3f..9c1c1d71d 100755 --- a/httemplate/view/cust_bill-logo.cgi +++ b/httemplate/view/cust_bill-logo.cgi @@ -2,7 +2,8 @@ <%init> die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('View invoices'); + unless $FS::CurrentUser::CurrentUser->access_right('View invoices') + or $FS::CurrentUser::CurrentUser->access_right('Configuration'); my $conf = new FS::Conf; diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 42e1e6177..c5373ff19 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -60,63 +60,18 @@ View typeset invoice

% } -% #false laziness with search/cust_bill_event.cgi -% unless ( $templatename ) { - - - <% table() %> - - Event - Date - Status - -% foreach my $cust_bill_event ( -% sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event -% ) { -% -% my $status = $cust_bill_event->status; -% $status .= ': '. encode_entities($cust_bill_event->statustext) -% if $cust_bill_event->statustext; -% my $part_bill_event = $cust_bill_event->part_bill_event; -% - - - <% $part_bill_event->event %> -% if ( $part_bill_event->templatename ) { -% my $alt_templatename = $part_bill_event->templatename; -% my $alt_link = "$alt_templatename-$invnum"; -% - - ( view - | view - typeset - | re-print -% if ( grep { $_ ne 'POST' } -% $cust_bill->cust_main->invoicing_list ) { - - | re-email -% } -% if ( $conf->exists('hylafax') -% && length($cust_bill->cust_main->fax) ) { - | re-fax +% my $br = 0; +% if ( $cust_bill->num_cust_event ) { $br++; +( View invoice events ) % } +% if ( $cust_bill->num_cust_bill_event ) { $br++; +( View deprecated, old-style invoice events ) +% } - ) -% } +<% $br ? '

' : '' %> - - - <% time2str("%a %b %e %T %Y", $cust_bill_event->_date) %> - <% $status %> - -% } - - - -
-% } % if ( $conf->exists('invoice_html') ) { <% join('', $cust_bill->print_html('', $templatename) ) %> diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 850b48b27..4ca777d6a 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -16,52 +16,38 @@ function areyousure(href, message) { } - % if ( $curuser->access_right('Cancel customer') % && $cust_main->ncancelled_pkgs % ) { -% - Cancel this customer | + <% cust_cancel_link($cust_main) %> | + % } + % if ( $conf->exists('deletecustomers') % && $curuser->access_right('Delete customer') % ) { -% - Delete this customer | % } -% unless ( $conf->exists('disable_customer_referrals') ) { - Refer a new customer | - View this customer's referrals +% unless ( $conf->exists('disable_customer_referrals') ) { + Refer a new customer | + View this customer's referrals % } +

+% if ( $curuser->access_right('Billing event reports') +% || $curuser->access_right('View customer billing events') +% ) { + + View billing events for this customer +

+ +% } -

-% %my $signupurl = $conf->config('signupurl'); %if ( $signupurl ) { -% - This customer's signup URL: <% $signupurl %>?ref=<% $custnum %>

% } @@ -161,11 +147,41 @@ die "No customer specified (bad URL)!" unless $cgi->keywords; my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array $query =~ /^(\d+)$/; my $custnum = $1; -my $cust_main = qsearchs({ +my $cust_main = qsearchs( { 'table' => 'cust_main', - 'hashref' => {'custnum'=>$custnum}, + 'hashref' => { 'custnum' => $custnum }, 'extra_sql' => ' AND '. $curuser->agentnums_sql, }); die "Customer not found!" unless $cust_main; +<%once> + + +sub cust_cancel_link { cust_popup_link( 'misc/cancel_cust.html', + 'Cancel this customer', + 'Confirm Cancellation', + '#ff0000', + @_, + ); +} + +#false laziness w/view/cust_main/packages.html + +sub cust_popup_link { + my($action, $label, $actionlabel, $color, $cust_main) = @_; + $action .= '?'. $cust_main->custnum; + popup_link($action, $label, $actionlabel, $color); +} + +sub popup_link { + my($action, $label, $actionlabel, $color) = @_; + $color ||= '#333399'; + qq!$label!; + +# CLOSETEXT, '', +#WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, +#BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' +} + + diff --git a/httemplate/view/cust_main/order_pkg.html b/httemplate/view/cust_main/order_pkg.html deleted file mode 100644 index f48bf0929..000000000 --- a/httemplate/view/cust_main/order_pkg.html +++ /dev/null @@ -1,41 +0,0 @@ -% -% my( $cust_main ) = @_; -% - - - - -
- - - - - - - -
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 5890726ae..f424425a7 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,22 +1,17 @@ -% my( $cust_main ) = @_; -% my $conf = new FS::Conf; -% -% my $curuser = $FS::CurrentUser::CurrentUser; -% -% my $packages = get_packages($cust_main, $conf); - +Packages
-Packages +% my $s = 0; % if ( $curuser->access_right('Order customer package') ) { - - <% include('order_pkg.html', $cust_main ) %> + <% $s++ ? ' | ' : '' %> + <% order_pkg_link($cust_main) %> % } + % if ( $curuser->access_right('One-time charge') % && $conf->config('payby-default') ne 'HIDE' % ) { % - <% popup_link('edit/quick-charge.html?custnum='. $cust_main->custnum, 'One-time charge', 'One-time charge', 545) %> + <% popup_link('edit/quick-charge.html?custnum='. $cust_main->custnum, 'One-time charge', 'One-time charge', '#333399', 545) %>
% } % if ( $curuser->access_right('Bulk change customer packages') ) { @@ -77,27 +72,43 @@ Current packages + - <% $cust_pkg->pkgnum %>: - <% $part_pkg->pkg %> - <% $part_pkg->comment %>
+ + <% $cust_pkg->pkgnum %>: + <% $part_pkg->pkg %> - <% $part_pkg->comment %> +
+ % unless ( $cust_pkg->get('cancel') ) { -% if ( $curuser->access_right('Change customer package') ) { +% my $br = 0; +% if ( $curuser->access_right('Change customer package') ) { $br=1; ( <%pkg_change_link($cust_pkg)%> ) -% } -% if ( $curuser->access_right('Edit customer package dates') ) { +% } +% if ( $curuser->access_right('Edit customer package dates') ) { $br=1; ( <%pkg_dates_link($cust_pkg)%> ) -% } -% if ( $curuser->access_right('Customize customer package') ) { +% } +% if ( $curuser->access_right('Customize customer package') ) { $br=1; ( <%pkg_customize_link($cust_pkg,$cust_main->custnum)%> ) +% } + <% $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)%> ) +% } + + % @@ -417,157 +428,207 @@ Current packages
% } -% -%#subroutines -% -%sub get_packages { -% my $cust_main = shift or return undef; -% 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'; -% } -% -% [ $cust_main->$method() ]; -%} -% -%sub svc_provision_link { -% my ($cust_pkg, $part_svc, $conf, $curuser) = @_; -% ( 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 $url; -% if ( $part_svc->svcdb eq 'svc_external' #could be generalized -% && $conf->exists('svc_external-skip_manual') -% ) { -% $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart"; -% } else { -% $url = svc_url( -% 'm' => $m, -% 'action' => 'edit', -% 'part_svc' => $part_svc, -% 'query' => $pkgnum_svcpart, -% ); -% #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart"; -% } -% -% my $link = qq!!. -% "Provision $svc_nbsp ($num_avail)"; -% if ( $conf->exists('legacy_link') -% && $curuser->access_right('View/link unlinked services') -% ) -% { -% $link .= '
'. -% qq!!. -% "Link to legacy $svc_nbsp ($num_avail)"; -% } -% $link; -%} -% -%sub svc_unprovision_link { -% my $cust_svc = shift or return ''; -% qq!Unprovision!; -%} -% -%sub pkg_datestr { -% my($cust_pkg, $field, $conf) = @_ or return ''; -% return ' ' unless $cust_pkg->get($field); -% my $format = ''. -% ''. -% ''; -% #$format .= ' %l:%M:%S%P %z' -% $format .= ''. -% ''. -% ''. -% '' -% if $conf->exists('cust_pkg-display_times'); -% my $strip = time2str($format, $cust_pkg->get($field) ); -% $strip =~ s/ (\d)/$1/g; -% $strip; -%} -% -%sub pkg_change_link { pkg_link('misc/change_pkg', 'Change package', @_ ); } -% -%sub pkg_suspend_link { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend', -% 'Suspend now', -% 'Suspend', -% @_ -% ); -% } -% -%sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', 'Unsuspend', @_ ); } -%sub pkg_expire_link { pkg_link('misc/expire_pkg', 'Cancel later', @_ ); } -%sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', 'Edit dates', @_ ); } -% -%sub pkg_cancel_link { pkg_popup_link( 'misc/cancel_pkg.html?method=cancel', -% 'Cancel now', -% 'Cancel', -% @_ -% ); -% } -%sub pkg_adjourn_link { pkg_popup_link( 'misc/cancel_pkg.html?method=adjourn', -% 'Suspend later', -% 'Adjourn', -% @_ -% ); -% } -% -%sub pkg_expire_link { pkg_popup_link( 'misc/cancel_pkg.html?method=expire', -% 'Cancel later', -% 'Expire', #"Cancel package $num later" -% @_ -% ); -% } -% -%sub svc_recharge_link { svc_popup_link( 'misc/recharge_svc.html', -% 'Recharge', -% 'Recharge', -% @_ -% ); -% } -% -%sub pkg_link { -% my($action, $label, $cust_pkg) = @_; -% return '' unless $cust_pkg; -% qq!$label!; -%} -% -%sub pkg_popup_link { -% my($action, $label, $actionlabel, $cust_pkg) = @_; -% $action .= '&pkgnum='. $cust_pkg->pkgnum; -% $actionlabel .= ' package '. $cust_pkg->pkgnum; -% popup_link($action, $label, $actionlabel, 392); -%} -% -%sub svc_popup_link { -% my($action, $label, $actionlabel, $cust_svc) = @_; -% $action .= '?svcnum='. $cust_svc->svcnum; -% $actionlabel .= ' service '. $cust_svc->svcnum; -% popup_link($action, $label, $actionlabel, 392); -%} -% -%sub popup_link { -% my($action, $label, $actionlabel, $width) = @_; -% qq!$label!; -%} -% -%sub pkg_customize_link { -% my $cust_pkg = shift or return ''; -% my $custnum = $cust_pkg->custnum; -% qq!Customize!; -%} +% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) { + +% } +<%init> + +my( $cust_main ) = @_; +my $conf = new FS::Conf; + +my $curuser = $FS::CurrentUser::CurrentUser; + +my $packages = get_packages($cust_main, $conf); + +<%once> + +#subroutines + +sub get_packages { + my $cust_main = shift or return undef; + 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'; + } + + [ $cust_main->$method() ]; +} + +sub svc_provision_link { + my ($cust_pkg, $part_svc, $conf, $curuser) = @_; + ( 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 $url; + if ( $part_svc->svcdb eq 'svc_external' #could be generalized + && $conf->exists('svc_external-skip_manual') + ) { + $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart"; + } else { + $url = svc_url( + 'm' => $m, + 'action' => 'edit', + 'part_svc' => $part_svc, + 'query' => $pkgnum_svcpart, + ); + #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart"; + } + + my $link = qq!!. + "Provision $svc_nbsp ($num_avail)"; + if ( $conf->exists('legacy_link') + && $curuser->access_right('View/link unlinked services') + ) + { + $link .= '
'. + qq!!. + "Link to legacy $svc_nbsp ($num_avail)"; + } + $link; +} + +sub svc_unprovision_link { + my $cust_svc = shift or return ''; + qq!Unprovision!; +} + +sub pkg_datestr { + my($cust_pkg, $field, $conf) = @_ or return ''; + return ' ' unless $cust_pkg->get($field); + my $format = ''. + ''. + ''; + #$format .= ' %l:%M:%S%P %z' + $format .= ''. + ''. + ''. + '' + if $conf->exists('cust_pkg-display_times'); + my $strip = time2str($format, $cust_pkg->get($field) ); + $strip =~ s/ (\d)/$1/g; + $strip; +} + +sub pkg_change_link { pkg_link('misc/change_pkg', 'Change package', @_ ); } + +sub pkg_suspend_link { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend', + 'Suspend now', + 'Suspend', + '#FF9900', + @_ + ); + } + +sub pkg_adjourn_link { pkg_popup_link( 'misc/cancel_pkg.html?method=adjourn', + 'Suspend later', + 'Adjourn', + '#CC6600', + @_ + ); + } + +sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', 'Unsuspend', @_ ); } +sub pkg_expire_link { pkg_link('misc/expire_pkg', 'Cancel later', @_ ); } +sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', 'Edit dates', @_ ); } + +sub pkg_cancel_link { pkg_popup_link( 'misc/cancel_pkg.html?method=cancel', + 'Cancel now', + 'Cancel', + '#ff0000', + @_ + ); + } + +sub pkg_expire_link { pkg_popup_link( 'misc/cancel_pkg.html?method=expire', + 'Cancel later', + 'Expire', #"Cancel package $num later" + '#CC0000', + @_ + ); + } + +sub svc_recharge_link { svc_popup_link( 'misc/recharge_svc.html', + 'Recharge', + 'Recharge', + '#333399', + @_ + ); + } + +sub order_pkg_link { cust_popup_link( 'misc/order_pkg.html', + 'Order new package', + 'Order new package', + '#333399', + @_ + ); + } + +sub pkg_event_link { + my($cust_pkg) = @_; + qq!!. + 'View package events'. + ''; +} + +sub pkg_link { + my($action, $label, $cust_pkg) = @_; + return '' unless $cust_pkg; + qq!$label!; +} + +sub pkg_popup_link { + my($action, $label, $actionlabel, $color, $cust_pkg) = @_; + $action .= '&pkgnum='. $cust_pkg->pkgnum; + $actionlabel .= ' package '. $cust_pkg->pkgnum; + popup_link($action, $label, $actionlabel, $color); +} + +sub svc_popup_link { + my($action, $label, $actionlabel, $color, $cust_svc) = @_; + $action .= '?svcnum='. $cust_svc->svcnum; + $actionlabel .= ' service '. $cust_svc->svcnum; + popup_link($action, $label, $actionlabel, $color); +} + +sub cust_popup_link { + my($action, $label, $actionlabel, $color, $cust_main) = @_; + $action .= '?'. $cust_main->custnum; + popup_link($action, $label, $actionlabel, $color); +} + +sub popup_link { + my($action, $label, $actionlabel, $color, $width) = @_; + $color ||= '#333399'; + $width ||= 540; + qq!$label!; +} + +sub pkg_customize_link { + my $cust_pkg = shift or return ''; + my $custnum = $cust_pkg->custnum; + qq!Customize!; +} + + diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index b2d98cc55..099bc4f2b 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -73,11 +73,21 @@ % my $link = $curuser->access_right('View invoices') % ? qq!! % : ''; +% my $events = ''; +% if ( $cust_bill->num_cust_event +% && ( $curuser->access_right('Billing event reports') +% || $curuser->access_right('View customer billing events') +% ) +% ) { +% $events = +% qq!
( View invoice events )'; +% } % push @history, { % 'date' => $cust_bill->_date, % 'desc' => $link. $pre. % "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'. -% $post. ( $link ? '' : '' ), +% $post. ( $link ? '' : '' ). $events, % 'charge' => $cust_bill->charged, % }; %} diff --git a/httemplate/view/logo.cgi b/httemplate/view/logo.cgi new file mode 100644 index 000000000..aeca0f3b3 --- /dev/null +++ b/httemplate/view/logo.cgi @@ -0,0 +1,47 @@ +<% $data %> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); + +my $conf = new FS::Conf; + +my $type; +if ( $cgi->param('type') eq 'png' ) { + $type = 'png'; +} elsif ( $cgi->param('type') eq 'eps' ) { + $type = 'eps'; +} else { + die "unknown logo type ". $cgi->param('type'); +} + +my $data; +if ( $cgi->param('preview_session') =~ /^(\w+)$/ ) { + + my $session = $1; + my $curuser = $FS::CurrentUser::CurrentUser; + $data = decode_base64( $curuser->option("logo_preview$session") ); + +} elsif ( $cgi->param('name') =~ /^([^\.\/]*)$/ ) { + + my $templatename = $1; + if ( $templatename && $conf->exists("logo_$templatename.$type") ) { + $templatename = "_$templatename"; + } else { + $templatename = ''; + } + + if ( $type eq 'png' ) { + $data = $conf->config_binary("logo$templatename.png"); + } elsif ( $type eq 'eps' ) { + #convert EPS to a png... punting on that for now + } + +} else { + die "neither a valid name nor a valid preview_session specified"; +} + +http_header('Content-Type' => 'image/png' ); + + + diff --git a/httemplate/view/svc_Common.html b/httemplate/view/svc_Common.html index defbee974..bb3a6dd33 100644 --- a/httemplate/view/svc_Common.html +++ b/httemplate/view/svc_Common.html @@ -1,9 +1,3 @@ -<% include('elements/svc_Common.html', - 'table' => $table, - 'edit_url' => $p."edit/svc_Common.html?svcdb=$table;svcnum=", - %opt, - ) -%> <%init> # false laziness w/edit/svc_Common.html @@ -27,3 +21,9 @@ if ( UNIVERSAL::can("FS::$table", 'table_info') ) { } +<% include('elements/svc_Common.html', + 'table' => $table, + 'edit_url' => $p."edit/svc_Common.html?svcdb=$table;svcnum=", + %opt, + ) +%> -- cgit v1.2.1
%b %o, %Y %l:%M %P%b %o, %Y %l:%M %P