X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main.cgi;h=2e8d74625cedd795542c6e2bcf601e2b5367a5f5;hb=929783d1045757abbe5c84ff2439547b0f8eca23;hp=fda4db0d920de051fb8e2c7e360db40d222a4166;hpb=83f70978574fef3401020cb11cf651d12c139b3b;p=freeside.git
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index fda4db0d9..2e8d74625 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,113 +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 ) {
-
-
-<& /elements/init_overlib.html &>
-
-
+% ###
+% # Basics
+% ###
-% if ( $view eq 'basics' || $view eq 'jumbo' ) {
-
-% if ( $curuser->access_right('Edit customer') ) {
-
<% mt('Edit this customer') |h %> |
-% }
-
-% if ( $curuser->access_right('Cancel customer')
-% && $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' => 366,
- }
- &> |
-
-% }
-
-% if ( $curuser->access_right('Merge customer') ) {
-
- <& /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' => 480,
- 'height' => 192,
- }
- &> |
-
-% }
-
-% if ( $conf->exists('deletecustomers')
-% && $curuser->access_right('Delete customer')
-% ) {
-
<% mt('Delete this customer') |h %> |
-% }
-
-% 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 },
-% 'label' => 'Email a notice to this customer',
-% );
-% if ( $email_link and $br ) {
- |
-% }
-<% $email_link || '' %>
% if ( $conf->config('cust_main-external_links') ) {
<% $br++ ? ' | ' : '' %>
@@ -122,7 +21,6 @@ function areyousure(href, message) {
% if ( $br ) {
% }
-%doc>
%my $signupurl = $conf->config('signupurl');
%if ( $signupurl ) {
@@ -131,23 +29,17 @@ function areyousure(href, message) {
% }
-%if ( $conf->exists('maestro-status_test') ) {
-
<% mt('Test maestro status') |h %>
-
-% }
-
-
<& 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 &>
|
@@ -156,132 +48,107 @@ function areyousure(href, message) {
+
% }
-% if ( $view eq 'notes' || $view eq 'jumbo' ) {
-%if ( $cust_main->comments =~ /[^\s\n\r]/ ) {
-
<% mt('Comments') |h %>
-<% 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(0));
-% if ( ! $conf->exists('cust_main-disable_notes') || $notecount) {
-% unless ( $view eq 'notes' && $cust_main->comments !~ /[^\s\n\r]/ ) {
-
- <% mt('Notes') |h %>
-% }
-% if ( $curuser->access_right('Add customer note') &&
-% ! $conf->exists('cust_main-disable_notes')
-% ) {
+% ###
+% # Tickets
+% ###
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Add customer note'),
- 'action' => $p. 'edit/cust_main_note.cgi',
- 'actionlabel' => emt('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 &>
+% }
+
-
+% }
-<& 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')) {
-<& /elements/popup_link-cust_main.html,
- 'label' => emt('Attach file'),
- 'action' => $p.'edit/cust_main_attach.cgi',
- 'actionlabel' => emt('Upload file'),
- 'cust_main' => $cust_main,
- 'width' => 480,
- 'height' => 296,
-&>
-% }
-% if( $curuser->access_right('View attachments') ) {
-<& cust_main/attachments.html, 'custnum' => $cust_main->custnum &>
-% if ($cgi->param('show_deleted')) {
-
">(<% mt('Show active attachments') |h %>)
-% }
-% elsif($curuser->access_right('View deleted attachments')) {
-
">(<% mt('Show deleted attachments') |h %>)
-% }
-% }
-
+% if ( $conf->config('ticket_system')
+% && $curuser->access_right('View appointments') ) {
+ <& cust_main/appointments.html, $cust_main &>
+% }
+
% }
-% if ( $view eq 'jumbo' ) {
-
-
<% mt('Tickets') |h %>
-% }
-% if ( $view eq 'tickets' || $view eq 'jumbo' ) {
+% ###
+% # Quotations
+% ###
-% if ( $conf->config('ticket_system') ) {
- <& 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') {
-
<% mt('Packages') |h %>
-% }
+% ###
+% # Packages
+% ###
-% 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 &>
% #}
+
% }
-% if ( $view eq 'jumbo' ) {
-
-
<% mt('Payment History') |h %>
-
-% }
-% if ( $view eq 'payment_history' || $view eq 'jumbo' ) {
+% ###
+% # Payment History
+% ###
-% if ( $conf->config('payby-default') ne 'HIDE' ) {
- <& 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'
-<& 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' ) {
+% 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?";
+% }
% }
-
-<& /elements/footer.html &>
+<& /elements/footer-cust_main.html &>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
@@ -299,6 +166,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( {
@@ -308,35 +177,37 @@ 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',
- emt('Notes') => 'notes', #notes and files?
+ emt('Basics') => 'basics',
+ emt('Notes') => 'notes', #notes and files?
;
-$views{emt('Tickets')} = 'tickets'
- if $conf->config('ticket_system');
-$views{emt('Packages')} = 'packages';
-$views{emt('Payment History')} = 'payment_history'
- unless $conf->config('payby-default' eq 'HIDE');
+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') || emt('Custom')} = 'custom'
- if $conf->config('cust_main-custom_link');
-$views{emt('Jumbo')} = 'jumbo';
+ 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;
-my $ie_compat = $conf->config('ie-compatibility_mode');
-my $head = '';
-if ( $ie_compat ) {
- $head = qq(