multiple payment options, RT#23741

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

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 782556b..081b96b 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -40,6 +40,11 @@ function areyousure(href, message) {
 }
 </SCRIPT>
 
+
+% ###
+% # Basics
+% ###
+
 % if ( $view eq 'basics' || $view eq 'jumbo' ) {
 
 % if ( $curuser->access_right('Edit customer') ) { 
@@ -55,8 +60,8 @@ function areyousure(href, message) {
                 'actionlabel' => emt('Confirm Suspension'),
                 'color'       => '#ff9900',
                 'cust_main'   => $cust_main,
-                'width'       => 616, #make room for reasons
-                'height'      => 366,
+                'width'       => 768, #make room for reasons
+                'height'      => 450, 
               }
   &> | 
 % }
@@ -86,7 +91,7 @@ function areyousure(href, message) {
                 'color'       => '#ff0000',
                 'cust_main'   => $cust_main,
                 'width'       => 616, #make room for reasons
-                'height'      => 366,
+                'height'      => 410,
               }
   &> | 
 % }
@@ -164,14 +169,12 @@ function areyousure(href, message) {
 <TABLE BORDER=0>
 <TR>
   <TD VALIGN="top">
-    <& cust_main/contacts.html, $cust_main &>
+    <& cust_main/misc.html, $cust_main &>
+    <BR><& cust_main/contacts.html, $cust_main &>
   </TD>
   <TD VALIGN="top" STYLE="padding-left: 54px">
-    <& cust_main/misc.html, $cust_main &>
-% if ( $conf->config('payby-default') ne 'HIDE' ) { 
-      <BR><& cust_main/billing.html, $cust_main &>
-% } 
-
+    <& cust_main/billing.html, $cust_main &>
+    <BR><& cust_main/cust_payby.html, $cust_main &>
   </TD>
 </TR>
 <TR>
@@ -183,6 +186,11 @@ function areyousure(href, message) {
 
 % }
 
+
+% ###
+% # Notes
+% ###
+
 % if ( $view eq 'notes' || $view eq 'jumbo' ) {
 
 <& cust_main/notes.html, 'cust_main' => $cust_main &>
@@ -195,6 +203,11 @@ function areyousure(href, message) {
 
 <BR>
 
+
+% ###
+% # Tickets
+% ###
+
 % if ( $view eq 'tickets' || $view eq 'jumbo' ) {
 
 % if ( $conf->config('ticket_system') ) { 
@@ -204,6 +217,10 @@ function areyousure(href, message) {
 
 % }
 
+% ###
+% # Appointments
+% ###
+
 % if ( $view eq 'appointments' || $view eq 'jumbo' ) {
 
 % if ( $conf->config('ticket_system')
@@ -214,6 +231,28 @@ 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 ( $curuser->access_right('Generate quotation') ) { 
+      <& cust_main/quotations.html, $cust_main &>
+%   }
+
+% }
+
+
+% ###
+% # 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>
@@ -227,6 +266,11 @@ function areyousure(href, message) {
 
 % }
 
+
+% ###
+% # Payment History
+% ###
+
 % if ( $view eq 'jumbo' ) {
     <BR><BR>
     <A NAME="history"><FONT SIZE="+2"><% mt('Payment History') |h %></FONT></A>
@@ -235,12 +279,15 @@ function areyousure(href, message) {
 
 % if ( $view eq 'payment_history' || $view eq 'jumbo' ) {
 
-% if ( $conf->config('payby-default') ne 'HIDE' ) { 
-  <& cust_main/payment_history.html, $cust_main &>
-% } 
+<& cust_main/payment_history.html, $cust_main &>
 
 % }
 
+
+% ###
+% # Change History
+% ###
+
 % if ( $view eq 'change_history' ) { #  || $view eq 'jumbo'     
 <& cust_main/change_history.html, $cust_main &>         
 % }
@@ -299,9 +346,9 @@ if ( $conf->config('ticket_system') ) {
   $views{emt('Appointments')}  =  'appointments'
     if $curuser->access_right('View appointments');
 }
+$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'