X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=2254df489b37f164ac202844e32685818a168954;hp=020c09dcfcad57483ee250a8be4a88b72a52e317;hb=06c85c354d546ca68320c8c2a4fb3dbc34750e0a;hpb=1cde870268b03197da75f089669d60a7ba3c5617 diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 020c09dcf..2254df489 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -1,52 +1,12 @@ -<& /elements/header.html, { - 'title' => $title, - 'title_noescape' => $title_noescape, - 'head' => $head, - '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 %> -
-% } - -<& cust_main/menu.html, cust_main => $cust_main, show => $view &> -
- -<& /elements/init_overlib.html &> - - - -

+<& /elements/header-cust_main.html, view=>$view, cust_main=>$cust_main &> % ### % # Basics % ### -% if ( $view eq 'basics' || $view eq 'jumbo' ) { +% if ( $view eq 'basics' ) { % my $br = 0; -% if ( $curuser->access_right('Order customer package') && $conf->exists('cust_main-enable_order_package') ) { - | <& /elements/order_pkg_link.html, 'cust_main'=>$cust_main &> -% } % if ( $conf->config('cust_main-external_links') ) { <% $br++ ? ' | ' : '' %> @@ -69,7 +29,6 @@ function areyousure(href, message) {

% } -
@@ -89,6 +48,7 @@ function areyousure(href, message) {
+
% } @@ -96,30 +56,22 @@ function areyousure(href, message) { % ### % # Notes % ### - -% if ( $view eq 'notes' || $view eq 'jumbo' ) { - -<& cust_main/notes.html, 'cust_main' => $cust_main &> - +% if ( $view eq 'notes' ) { + <& cust_main/notes.html, 'cust_main' => $cust_main &> +
% } -% if ( $view eq 'jumbo' ) { -
-% } - -
- % ### % # Tickets % ### -% if ( $view eq 'tickets' || $view eq 'jumbo' ) { +% if ( $view eq 'tickets' ) { % if ( $conf->config('ticket_system') ) { <& cust_main/tickets.html, $cust_main &> % } -

+
% } @@ -127,13 +79,13 @@ function areyousure(href, message) { % # Appointments % ### -% if ( $view eq 'appointments' || $view eq 'jumbo' ) { +% if ( $view eq 'appointments' ) { % if ( $conf->config('ticket_system') % && $curuser->access_right('View appointments') ) { <& cust_main/appointments.html, $cust_main &> % } -

+
% } @@ -142,11 +94,7 @@ function areyousure(href, message) { % # Quotations % ### -% if ( $view eq 'jumbo' && $curuser->access_right('Generate quotation') ) { - <% mt('Quotations') |h %>
-% } - -% if ( $view eq 'quotations' || $view eq 'jumbo' ) { +% if ( $view eq 'quotations' ) { % if ( $curuser->access_right('Generate quotation') ) { <& cust_main/quotations.html, $cust_main &> @@ -159,16 +107,12 @@ function areyousure(href, message) { % # Packages % ### -% if ( $view eq 'jumbo' ) { #XXX enable me && $curuser->access_right('View customer packages') { - - <% mt('Packages') |h %>
-% } - -% if ( $view eq 'packages' || $view eq 'jumbo' ) { +% if ( $view eq 'packages' ) { % #XXX enable me# if ( $curuser->access_right('View customer packages') { <& cust_main/packages.html, $cust_main &> % #} +
% } @@ -177,15 +121,10 @@ function areyousure(href, message) { % # Payment History % ### -% if ( $view eq 'jumbo' ) { -

- <% mt('Payment History') |h %> -
-% } - -% if ( $view eq 'payment_history' || $view eq 'jumbo' ) { +% if ( $view eq 'payment_history' ) { <& cust_main/payment_history.html, $cust_main &> +
% } @@ -194,8 +133,9 @@ function areyousure(href, message) { % # Change History % ### -% if ( $view eq 'change_history' ) { # || $view eq 'jumbo' -<& cust_main/change_history.html, $cust_main &> +% if ( $view eq 'change_history' ) { +<& cust_main/change_history.html, $cust_main &> +
% } % if ( $view eq 'custom' ) { @@ -238,21 +178,6 @@ my $cust_main = qsearchs( { }); die "Customer not found!" unless $cust_main; -my $title = encode_entities($cust_main->name); -$title = '#'. $cust_main->display_custnum. " $title"; -# if $conf->exists('cust_main-title-display_custnum'); -$title = mt("Customer")." ".$title; - -my @agentnums = $curuser->agentnums; -if (scalar(@agentnums) > 1 ) { - $title = encode_entities($cust_main->agent->agent). " $title"; -} - -my $status = $cust_main->status_label; -$status .= ' (Cancelled)' if $cust_main->is_status_delay_cancel; -my $title_noescape = $title. ' ('. $status. ')'; -$title .= " ($status)"; - #false laziness w/pref/pref.html and Conf.pm (cust_main-default_view) tie my %views, 'Tie::IxHash', emt('Basics') => 'basics', @@ -271,16 +196,19 @@ $views{emt('Change History')} = 'change_history' $views{$conf->config('cust_main-custom_title') || emt('Custom')} = 'custom' if $conf->config('cust_main-custom_link') || $conf->config('cust_main-custom_content'); -$views{emt('Jumbo')} = 'jumbo'; my %viewname = reverse %views; my $view = $cgi->param('show') || $curuser->default_customer_view; -my $ie_compat = $conf->config('ie-compatibility_mode'); -my $head = ''; -if ( $ie_compat ) { - $head = qq(); +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'; +