X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=2254df489b37f164ac202844e32685818a168954;hp=0b6148da06a9e7e172a63cf44742ded29d567916;hb=06c85c354d546ca68320c8c2a4fb3dbc34750e0a;hpb=720cf723d2c8e88760704e2fdc50ebf48e0574f2 diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 0b6148da0..2254df489 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -1,244 +1,155 @@ -<% include('/elements/header.html', { - 'title' => "Customer: ". $cust_main->name, - 'nobr' => 1, - }) -%> -
-% my @part_tag = $cust_main->part_tag; -% if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) { - -% foreach my $part_tag ( @part_tag ) { - - - -% } -
- tagcolor) - ? 'STYLE="background-color:#'.$part_tag->tagcolor.'"' - : '' - %>><% $part_tag->tagname.': '. $part_tag->tagdesc |h %> -
-% } +<& /elements/header-cust_main.html, view=>$view, cust_main=>$cust_main &> -<% include('/elements/menubar.html', - { 'newstyle' => 1, - 'selected' => $viewname{$view}, - 'url_base' => $cgi->url. "?custnum=$custnum;show=", - }, - %views, - ) -%> -
- -<% include('/elements/init_overlib.html') %> - - +% ### +% # Basics +% ### -% if ( $view eq 'basics' || $view eq 'jumbo' ) { +% if ( $view eq 'basics' ) { -% if ( $curuser->access_right('Edit customer') ) { - Edit this customer | -% } - -% if ( $curuser->access_right('Cancel customer') -% && $cust_main->ncancelled_pkgs -% ) { - - <% include( '/elements/popup_link-cust_main.html', - { 'action' => $p. 'misc/cancel_cust.html', - 'label' => 'Cancel this customer', - 'actionlabel' => 'Confirm Cancellation', - 'color' => '#ff0000', - 'cust_main' => $cust_main, - 'width' => 616, #make room for reasons - } - ) - %> | +% my $br = 0; +% if ( $conf->config('cust_main-external_links') ) { + <% $br++ ? ' | ' : '' %> +% my @links = split(/\n/, $conf->config('cust_main-external_links')); +% foreach my $link (@links) { +% $link =~ /^\s*(\S+)\s+(.*?)(\s*\(([^\)]*)\))?$/ or next; +% my($url, $label, $alt) = ($1, $2, $4); + <% $label |h %> +% } % } -% 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 -% } - -

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

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

-% } - -%if ( $conf->exists('maestro-status_test') ) { - Test maestro status

+ <% mt('This customer\'s signup URL:') |h %> + <% $signupurl %>?ref=<% $custnum %> +

% } - + + +
- <% include('cust_main/contacts.html', $cust_main ) %> + <& cust_main/contacts.html, $cust_main &> +
+ <& cust_main/misc.html, $cust_main &>
- <% include('cust_main/misc.html', $cust_main ) %> -% if ( $conf->config('payby-default') ne 'HIDE' ) { - -
- <% include('cust_main/billing.html', $cust_main ) %> -% } - + <& cust_main/billing.html, $cust_main &> +
+ <& cust_main/cust_payby.html, $cust_main &> +
+ <& cust_main/contacts_new.html, $cust_main &>
+
% } -% if ( $view eq 'notes' || $view eq 'jumbo' ) { -%if ( $cust_main->comments =~ /[^\s\n\r]/ ) { -
-Comments -<% ntable("#cccccc") %><% ntable("#cccccc",2) %> - - -
<% encode_entities($cust_main->comments) %>
- - - -

+% ### +% # Notes +% ### +% if ( $view eq 'notes' ) { + <& cust_main/notes.html, 'cust_main' => $cust_main &> +
% } - -% my $notecount = scalar($cust_main->notes()); -% if ( ! $conf->exists('cust_main-disable_notes') || $notecount) { -% unless ( $view eq 'notes' && $cust_main->comments !~ /[^\s\n\r]/ ) { -
-
Notes
-% } -% if ( $curuser->access_right('Add customer note') && -% ! $conf->exists('cust_main-disable_notes') -% ) { +% ### +% # Tickets +% ### - <% include( '/elements/popup_link-cust_main.html', - 'label' => 'Add customer note', - 'action' => $p. 'edit/cust_main_note.cgi', - 'actionlabel' => 'Enter customer note', - 'cust_main' => $cust_main, - 'width' => 616, - 'height' => 538, #575 - ) - %> +% if ( $view eq 'tickets' ) { -% } +% if ( $conf->config('ticket_system') ) { + <& cust_main/tickets.html, $cust_main &> +% } +
-
+% } -<% include('cust_main/notes.html', 'custnum' => $cust_main->custnum ) %> +% ### +% # Appointments +% ### -% } -
+% if ( $view eq 'appointments' ) { -% if(! $conf->config('disable_cust_attachment') -% and $curuser->access_right('Add attachment')) { -<% include( '/elements/popup_link-cust_main.html', - 'label' => 'Attach file', - 'action' => $p.'edit/cust_main_attach.cgi', - 'actionlabel' => 'Upload file', - 'cust_main' => $cust_main, - 'width' => 480, - 'height' => 296, - ) -%> -% } -% if( $curuser->access_right('View attachments') ) { -<% include('cust_main/attachments.html', 'custnum' => $cust_main->custnum ) %> -% if ($cgi->param('show_deleted')) { -">(Show active attachments) -% } -% elsif($curuser->access_right('View deleted attachments')) { -">(Show deleted attachments) -% } -% } -
+% if ( $conf->config('ticket_system') +% && $curuser->access_right('View appointments') ) { + <& cust_main/appointments.html, $cust_main &> +% } +
% } -% if ( $view eq 'jumbo' ) { -

- Tickets
-% } -% if ( $view eq 'tickets' || $view eq 'jumbo' ) { +% ### +% # Quotations +% ### -% if ( $conf->config('ticket_system') ) { - <% include('cust_main/tickets.html', $cust_main ) %> -% } -

+% if ( $view eq 'quotations' ) { + +% if ( $curuser->access_right('Generate quotation') ) { + <& cust_main/quotations.html, $cust_main &> +% } % } -% if ( $view eq 'jumbo' ) { #XXX enable me && $curuser->access_right('View customer packages') { - Packages
-% } +% ### +% # Packages +% ### -% if ( $view eq 'packages' || $view eq 'jumbo' ) { +% if ( $view eq 'packages' ) { % #XXX enable me# if ( $curuser->access_right('View customer packages') { -<% include('cust_main/packages.html', $cust_main ) %> +<& cust_main/packages.html, $cust_main &> % #} +
% } -% if ( $view eq 'jumbo' ) { -

- Payment History
-% } -% if ( $view eq 'payment_history' || $view eq 'jumbo' ) { +% ### +% # Payment History +% ### -% if ( $conf->config('payby-default') ne 'HIDE' ) { - <% include('cust_main/payment_history.html', $cust_main ) %> -% } +% if ( $view eq 'payment_history' ) { + +<& cust_main/payment_history.html, $cust_main &> +
% } -% if ( $view eq 'change_history' ) { # || $view eq 'jumbo' -<% include('cust_main/change_history.html', $cust_main ) %> + +% ### +% # Change History +% ### + +% if ( $view eq 'change_history' ) { +<& cust_main/change_history.html, $cust_main &> +
% } % if ( $view eq 'custom' ) { -<% include('cust_main/custom.html', $cust_main ) %> +% if ( $conf->config('cust_main-custom_link') ) { +<& cust_main/custom.html, $cust_main &> +% } elsif ( $conf->config('cust_main-custom_content') ) { + <& cust_main/custom_content.html, $cust_main &> +% #} else { +% # warn "custom view without cust_main-custom_link or -custom_content?"; +% } % }
-<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> my $curuser = $FS::CurrentUser::CurrentUser; @@ -256,6 +167,8 @@ if ( $cgi->param('custnum') =~ /^(\d+)$/ ) { my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array $query =~ /^(\d+)$/; $custnum = $1; + $cgi->delete('keywords'); + $cgi->param('custnum', $1); } my $cust_main = qsearchs( { @@ -267,22 +180,35 @@ die "Customer not found!" unless $cust_main; #false laziness w/pref/pref.html and Conf.pm (cust_main-default_view) tie my %views, 'Tie::IxHash', - 'Basics' => 'basics', - 'Notes' => 'notes', #notes and files? + emt('Basics') => 'basics', + emt('Notes') => 'notes', #notes and files? ; -$views{'Tickets'} = 'tickets' - if $conf->config('ticket_system'); -$views{'Packages'} = 'packages'; -$views{'Payment History'} = 'payment_history' - unless $conf->config('payby-default' eq 'HIDE'); -$views{'Change History'} = 'change_history' +if ( $conf->config('ticket_system') ) { + $views{emt('Tickets')} = 'tickets'; + $views{emt('Appointments')} = 'appointments' + if $curuser->access_right('View appointments'); +} +$views{emt('Quotations')} = 'quotations'; +$views{emt('Packages')} = 'packages'; +$views{emt('Payment History')} = 'payment_history'; +$views{emt('Change History')} = 'change_history' if $curuser->access_right('View customer history'); -$views{$conf->config('cust_main-custom_title') || 'Custom'} = 'custom' - if $conf->config('cust_main-custom_link'); -$views{'Jumbo'} = 'jumbo'; +$views{$conf->config('cust_main-custom_title') || emt('Custom')} = 'custom' + if $conf->config('cust_main-custom_link') + || $conf->config('cust_main-custom_content'); my %viewname = reverse %views; my $view = $cgi->param('show') || $curuser->default_customer_view; +if ($view eq 'last') { + # something took us away from the page and is now bouncing back + $view = get_page_pref('last_view', $custnum); +} else { + # remember which view is open so we _can_ bounce back + set_page_pref('last_view', $custnum, $view); +} + +$view = 'basics' if $view eq 'jumbo'; +