enable CardFortress in test database, #71513

[freeside.git] / httemplate / view / cust_main.cgi

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 3cd7d2b..c5ee920 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -225,16 +225,19 @@ my $cust_main = qsearchs( {
 });
 die "Customer not found!" unless $cust_main;
 
-my $title = mt("Customer").' #'. $cust_main->display_custnum. ': '.
-            encode_entities($cust_main->name);
+my $title = mt("Customer").' #'. $cust_main->display_custnum. ': ';
+my $title_noescape = $title. encode_entities($cust_main->name);
+$title .= $cust_main->name;
 
 if ( $curuser->num_agents ) {
-  $title = encode_entities($cust_main->agent->agent). " $title";
+  $title_noescape =
+    encode_entities($cust_main->agent->agent). " $title_noescape";
+  $title = $cust_main->agent->agent. " $title";
 }
 
 my $status = $cust_main->status_label;
 $status .= ' (Cancelled)' if $cust_main->is_status_delay_cancel;
-my $title_noescape = $title. ' (<B><FONT COLOR="#'. $cust_main->statuscolor. '">'. $status.  '</FONT></B>)';
+$title_noescape .= ' (<B><FONT COLOR="#'. $cust_main->statuscolor. '">'. $status.  '</FONT></B>)';
 $title .= " ($status)";
 
 #false laziness w/pref/pref.html and Conf.pm (cust_main-default_view)
@@ -259,6 +262,15 @@ $views{$conf->config('cust_main-custom_title') || emt('Custom')} =  'custom'
 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';
 
 my $ie_compat = $conf->config('ie-compatibility_mode');