X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=2254df489b37f164ac202844e32685818a168954;hp=833b6d08c93f3eaa1cedb8a5c93d656d4b8b6f85;hb=06c85c354d546ca68320c8c2a4fb3dbc34750e0a;hpb=3cda3a85eb0daa5b8b9f4d30cd0896da6ccf4a9b diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 833b6d08c..2254df489 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -1,148 +1,12 @@ -<& /elements/header.html, { - 'title' => $title, - '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 %> -
-% } - -<& /elements/menubar.html, - { 'newstyle' => 1, - 'selected' => $viewname{$view}, - 'url_base' => $cgi->url. "?custnum=$custnum;show=", - }, - %views, -&> -
- -<& /elements/init_overlib.html &> - - - +<& /elements/header-cust_main.html, view=>$view, cust_main=>$cust_main &> % ### % # Basics % ### -% if ( $view eq 'basics' || $view eq 'jumbo' ) { - -% if ( $curuser->access_right('Edit customer') ) { - <% mt('Edit this customer') |h %> | -% } - -% if ( $curuser->access_right('Suspend customer') -% && scalar($cust_main->unsuspended_pkgs) -% ) { - <& /elements/popup_link-cust_main.html, - { 'action' => $p. 'misc/suspend_cust.html', - 'label' => emt('Suspend this customer'), - 'actionlabel' => emt('Confirm Suspension'), - 'color' => '#ff9900', - 'cust_main' => $cust_main, - 'width' => 768, #make room for reasons - 'height' => 450, - } - &> | -% } - -% if ( $curuser->access_right('Unsuspend customer') -% && scalar($cust_main->suspended_pkgs) -% ) { - <& /elements/popup_link-cust_main.html, - { 'action' => $p. 'misc/unsuspend_cust.html', - 'label' => emt('Unsuspend this customer'), - 'actionlabel' => emt('Confirm Unsuspension'), - #'color' => '#ff9900', - 'cust_main' => $cust_main, - #'width' => 616, #make room for reasons - #'height' => 366, - } - &> | -% } - -% if ( $curuser->access_right('Cancel customer') -% && scalar($cust_main->ncancelled_pkgs) -% ) { - <& /elements/popup_link-cust_main.html, - { 'action' => $p. 'misc/cancel_cust.html', - 'label' => emt('Cancel this customer'), - 'actionlabel' => emt('Confirm Cancellation'), - 'color' => '#ff0000', - 'cust_main' => $cust_main, - 'width' => 616, #make room for reasons - 'height' => 410, - } - &> | -% } - -% if ( $curuser->access_right('Merge customer') -% and ( scalar($cust_main->ncancelled_pkgs) -% # || we start supporting payment info merge again in some way -% ) -% ) -% { - <& /elements/popup_link-cust_main.html, - { 'action' => $p. 'misc/merge_cust.html', - 'label' => emt('Merge this customer'), - 'actionlabel' => emt('Merge customer'), - 'cust_main' => $cust_main, - 'width' => 569, - 'height' => 210, - } - &> | -% } - -% unless ( $conf->exists('disable_customer_referrals') ) { - <% mt('Refer a new customer') |h %> | - <% mt('View this customer\'s referrals') |h %> -% } - -

+% if ( $view eq 'basics' ) { % my $br = 0; -% if ( $curuser->access_right('Billing event reports') -% || $curuser->access_right('View customer billing events') -% ) { -% $br=1; - <% mt('View billing events for this customer') |h %> -% } -% -% my $email_link = ($cust_main->invoicing_list_emailonly) && -% include('/elements/email-link.html', -% 'table' => 'cust_main', -% 'search_hash' => { 'custnum' => $custnum }, -% 'agent_virt_agentnum' => $cust_main->agentnum, -% 'label' => 'Email a notice to this customer', -% ); -% if ( $email_link and $br ) { - | -% } -<% $email_link || '' %> - -% 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++ ? ' | ' : '' %> @@ -165,18 +29,17 @@ function areyousure(href, message) {

% } - @@ -185,6 +48,7 @@ function areyousure(href, message) {
<& cust_main/contacts.html, $cust_main &> +
+ <& cust_main/misc.html, $cust_main &>
- <& cust_main/misc.html, $cust_main &> -% if ( $conf->config('payby-default') ne 'HIDE' ) { -
<& cust_main/billing.html, $cust_main &> -% } - + <& cust_main/billing.html, $cust_main &> +
+ <& cust_main/cust_payby.html, $cust_main &>
+
% } @@ -192,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 &> % } -

+
% } @@ -223,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 &> % } -

+
% } @@ -238,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 &> @@ -255,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 &> % #} +
% } @@ -273,17 +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' ) { -% if ( $conf->config('payby-default') ne 'HIDE' ) { - <& cust_main/payment_history.html, $cust_main &> -% } +<& cust_main/payment_history.html, $cust_main &> +
% } @@ -292,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' ) { @@ -325,6 +167,7 @@ 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); } @@ -335,11 +178,6 @@ my $cust_main = qsearchs( { }); die "Customer not found!" unless $cust_main; -my $title = $cust_main->name; -$title = '('. $cust_main->display_custnum. ") $title" - if $conf->exists('cust_main-title-display_custnum'); -$title = mt("Customer:")." ".$title; - #false laziness w/pref/pref.html and Conf.pm (cust_main-default_view) tie my %views, 'Tie::IxHash', emt('Basics') => 'basics', @@ -352,23 +190,25 @@ if ( $conf->config('ticket_system') ) { } $views{emt('Quotations')} = 'quotations'; $views{emt('Packages')} = 'packages'; -$views{emt('Payment History')} = 'payment_history' - unless $conf->config('payby-default' eq 'HIDE'); +$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') || 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'; +