X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=c5ee9203c5535825e58112c88ed8abe9c64f3e4b;hp=020c09dcfcad57483ee250a8be4a88b72a52e317;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=1cde870268b03197da75f089669d60a7ba3c5617

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 020c09dcf..c5ee9203c 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -5,7 +5,7 @@
              'nobr'  => 1,
           }
 &>
-<BR>
+
 % my @part_tag = $cust_main->part_tag;
 % if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) {
 <TABLE STYLE="margin-bottom:8px" CELLSPACING=2>
@@ -24,6 +24,8 @@
 % }
 
 <& cust_main/menu.html, cust_main => $cust_main, show => $view &>
+<BR>
+
 <DIV CLASS="fstabcontainer">
 
 <& /elements/init_overlib.html &>
@@ -33,20 +35,25 @@ function areyousure(href, message) {
   if (confirm(message) == true)
     window.location.href = href;
 }
+function areyousure_popup(message, action, actionlabel) {
+  if (confirm(message) == true) {
+<% include('/elements/popup_link_onclick.html',
+     'js_action' => 'action',
+     'js_actionlabel' => 'actionlabel',
+   ) %>
+  }
+}
 </SCRIPT>
 
-<br><br>
+<br>
 
 % ###
 % # 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 +76,6 @@ function areyousure(href, message) {
   <BR><BR>
 % } 
 
-<A NAME="cust_main"></A>
 <TABLE BORDER=0>
 <TR>
   <TD VALIGN="top">
@@ -89,6 +95,7 @@ function areyousure(href, message) {
   </TD>
 </TR>
 </TABLE>
+<BR>
 
 % }
 
@@ -96,30 +103,22 @@ function areyousure(href, message) {
 % ###
 % # Notes
 % ###
-
-% if ( $view eq 'notes' || $view eq 'jumbo' ) {
-
-<& cust_main/notes.html, 'cust_main' => $cust_main &>
-
-% }
-
-% if ( $view eq 'jumbo' ) {
-    <BR>
+% if ( $view eq 'notes' ) {
+  <& cust_main/notes.html, 'cust_main' => $cust_main &>
+  <BR>
 % }
 
-<BR>
-
 
 % ###
 % # Tickets
 % ###
 
-% if ( $view eq 'tickets' || $view eq 'jumbo' ) {
+% if ( $view eq 'tickets' ) {
 
 % if ( $conf->config('ticket_system') ) { 
   <& cust_main/tickets.html, $cust_main &>
 % } 
-  <BR><BR>
+  <BR>
 
 % }
 
@@ -127,13 +126,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 &>
 % } 
-  <BR><BR>
+  <BR>
 
 % }
 
@@ -142,11 +141,7 @@ function areyousure(href, message) {
 % # Quotations
 % ###
 
-% if ( $view eq 'jumbo' && $curuser->access_right('Generate quotation') ) { 
-  <A NAME="quotations"><FONT SIZE="+2"><% mt('Quotations') |h %></FONT></A><BR>
-% }
-
-% 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 +154,12 @@ function areyousure(href, message) {
 % # Packages
 % ###
 
-% if ( $view eq 'jumbo' ) { #XXX enable me && $curuser->access_right('View customer packages') { 
-
-  <A NAME="cust_pkg"><FONT SIZE="+2"><% mt('Packages') |h %></FONT></A><BR>
-% }
-
-% 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 &>
 % #}
+<BR>
 
 % }
 
@@ -177,15 +168,10 @@ function areyousure(href, message) {
 % # Payment History
 % ###
 
-% if ( $view eq 'jumbo' ) {
-    <BR><BR>
-    <A NAME="history"><FONT SIZE="+2"><% mt('Payment History') |h %></FONT></A>
-    <BR>
-% }
-
-% if ( $view eq 'payment_history' || $view eq 'jumbo' ) {
+% if ( $view eq 'payment_history' ) {
 
 <& cust_main/payment_history.html, $cust_main &>
+<BR>
 
 % }
 
@@ -194,8 +180,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 &>
+<BR>
 % }
 
 % if ( $view eq 'custom' ) { 
@@ -238,19 +225,19 @@ 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 $title = mt("Customer").' #'. $cust_main->display_custnum. ': ';
+my $title_noescape = $title. encode_entities($cust_main->name);
+$title .= $cust_main->name;
 
-my @agentnums = $curuser->agentnums;
-if (scalar(@agentnums) > 1 ) {
-  $title = encode_entities($cust_main->agent->agent). " $title";
+if ( $curuser->num_agents ) {
+  $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)
@@ -271,12 +258,21 @@ $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;
 
+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');
 my $head = '';
 if ( $ie_compat ) {