X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_pay.cgi;h=f9f99de7e0d47f7f209fd3fcdf5d5c7bcb8146aa;hb=4639e25a658d9a0bf295415642fae8e8cdad846a;hp=f0826f65215c963bc8fa8028ca42f719924867e0;hpb=b3f48204012dd722912dcb3703908bd1eaf6df7b;p=freeside.git

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index f0826f652..f9f99de7e 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,91 +1,76 @@
 % if ( $link eq 'popup' ) { 
   <& /elements/header-popup.html, $title  &>
 % } else { 
-  <& /elements/header.html, $title, '' &>
+  <& /elements/header-cust_main.html, view=>'payment_history', custnum=>$custnum &>
+  <h2><% $title |h %></h2>
 % } 
 
 <& /elements/init_calendar.html &>
 
 <& /elements/error.html &>
 
-% unless ( $link eq 'popup' ) { 
-    <% small_custview($custnum, $conf->config('countrydefault')) %>
-% } 
-
-<FORM NAME="PaymentForm" ACTION="<% popurl(1) %>process/cust_pay.cgi" METHOD=POST onSubmit="document.PaymentForm.submit.disabled=true">
+<FORM NAME="PaymentForm" ACTION="<% popurl(1) %>process/cust_pay.cgi" METHOD=POST onSubmit="document.PaymentForm.submitButton.disabled=true">
 <INPUT TYPE="hidden" NAME="link" VALUE="<% $link %>">
 <INPUT TYPE="hidden" NAME="linknum" VALUE="<% $linknum %>">
 <INPUT TYPE="hidden" NAME="payby" VALUE="<% $payby %>">
 <INPUT TYPE="hidden" NAME="paybatch" VALUE="<% $paybatch %>">
 
-<BR>
+<TABLE CLASS="fsinnerbox">
 
-<% mt('Payment') |h %> 
-<% ntable("#cccccc", 2) %>
+% my %date_args = (
+%   'name'    =>  '_date',
+%   'label'   => emt('Date'),
+%   'value'   => $_date,
+%   'format'  => $date_format. ' %r',
+%   'colspan' => 2,
+% );
+% if ( $FS::CurrentUser::CurrentUser->access_right('Backdate payment') ) {
 
-% if ( $FS::CurrentUser::CurrentUser->access_right(['Backdate payment']) ) {
-<TR>
-  <TD ALIGN="right"><% mt('Date') |h %></TD>
-  <TD COLSPAN=2>
-    <INPUT TYPE="text" NAME="_date" ID="_date_text" VALUE="<% time2str($date_format.' %r',$_date) %>">
-    <IMG SRC="../images/calendar.png" ID="_date_button" STYLE="cursor: pointer" TITLE="<% mt('Select date') |h %>">
-  </TD>
-</TR>
+  <& /elements/tr-input-date-field.html, \%date_args &>
+
+% } else {
+
+  <& /elements/tr-fixed-date.html, \%date_args &>
 
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "_date_text",
-    ifFormat:   "<% $date_format %>",
-    button:     "_date_button",
-    align:      "BR"
-  });
-</SCRIPT>
-% }
-% else {
-<TR>
-  <TD ALIGN="right"><% mt('Date') |h %></TD>
-  <TD COLSPAN=2>
-    <% time2str($date_format.' %r',$_date) %>
-  </TD>
-</TR>
 % }
 
 <TR>
-  <TD ALIGN="right"><% mt('Amount') |h %></TD>
-  <TD BGCOLOR="#ffffff" ALIGN="right"><% $money_char %></TD>
-  <TD><INPUT TYPE="text" NAME="paid" ID="paid" VALUE="<% $paid %>" SIZE=8 MAXLENGTH=9> <% mt('by') |h %> <B><% mt(FS::payby->payname($payby)) |h %></B></TD>
+  <TH ALIGN="right"><% mt('Amount') |h %></TH>
+  <TD><% $money_char |h %><INPUT TYPE="text" NAME="paid" ID="paid" VALUE="<% $paid %>" SIZE=8 MAXLENGTH=9> <% mt('by') |h %> <B><% mt(FS::payby->payname($payby)) |h %></B></TD>
 </TR>
 
-  <& /elements/tr-select-discount_term.html,
-               'custnum' => $custnum,
-               'amount_id' => 'paid',
-  &>
+% if ( $conf->exists('part_pkg-term_discounts') ) {
+    <& /elements/tr-select-discount_term.html,
+         'custnum'   => $custnum,
+         'amount_id' => 'paid',
+    &>
+% }
 
 % if ( $payby eq 'BILL' ) { 
   <TR>
-    <TD ALIGN="right"><% mt('Check #') |h %></TD>
+    <TH ALIGN="right"><% mt('Check #') |h %></TH>
     <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<% $payinfo %>" SIZE=10></TD>
   </TR>
 % }
 % elsif ( $payby eq 'CASH' and $conf->exists('require_cash_deposit_info') ) {
   <TR>
-    <TD ALIGN="right"><% mt('Bank') |h %></TD>
+    <TH ALIGN="right"><% mt('Bank') |h %></TH>
     <TD COLSPAN=3><INPUT TYPE="text" NAME="bank" VALUE="<% $cgi->param('bank') %>"></TD>
   </TR>
   <TR>
-    <TD ALIGN="right"><% mt('Check #') |h %></TD>
+    <TH ALIGN="right"><% mt('Check #') |h %></TH>
     <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<% $payinfo %>" SIZE=10></TD>
   </TR>
   <TR>
-    <TD ALIGN="right"><% mt('Teller #') |h %></TD>
+    <TH ALIGN="right"><% mt('Teller #') |h %></TH>
     <TD COLSPAN=2><INPUT TYPE="text" NAME="teller" VALUE="<% $cgi->param('teller') %>" SIZE=10></TD>
   </TR>
   <TR>
-    <TD ALIGN="right"><% mt('Depositor') |h %></TD>
+    <TH ALIGN="right"><% mt('Depositor') |h %></TH>
     <TD COLSPAN=3><INPUT TYPE="text" NAME="depositor" VALUE="<% $cgi->param('depositor') %>"></TD>
   </TR>
   <TR>
-    <TD ALIGN="right"><% mt('Account #') |h %></TD>
+    <TH ALIGN="right"><% mt('Account #') |h %></TH>
     <TD COLSPAN=2><INPUT TYPE="text" NAME="account" VALUE="<% $cgi->param('account') %>" SIZE=18></TD>
   </TR>
 % }
@@ -96,15 +81,17 @@
   <TD ALIGN="right"><% mt('Auto-apply to invoices') |h %></TD>
   <TD COLSPAN=2>
     <SELECT NAME="apply">
-      <OPTION VALUE="yes" SELECTED><% mt('yes') |h %> 
-      <OPTION><% mt('no') |h %></SELECT>
-    </TD>
+      <OPTION VALUE="yes" SELECTED><% mt('yes') |h %></OPTION> 
+      <OPTION VALUE=""><% mt('not now') |h %></OPTION>
+      <OPTION VALUE="never"><% mt('never') |h %></OPTION>
+    </SELECT>
+  </TD>
 
 % } elsif ( $link eq 'invnum' ) { 
 
-  <TD ALIGN="right"><% mt('Apply to') |h %></TD>
-  <TD COLSPAN=2 BGCOLOR="#ffffff">Invoice #<B><% $linknum %></B> only</TD>
-  <INPUT TYPE="hidden" NAME="apply" VALUE="no">
+  <TH ALIGN="right"><% mt('Apply to') |h %></TH>
+  <TD COLSPAN=2>Invoice #<B><% $linknum %></B> only</TD>
+  <INPUT TYPE="hidden" NAME="apply" VALUE="">
 
 % } 
 </TR>
@@ -121,7 +108,7 @@
 </TABLE>
 
 <BR>
-<INPUT TYPE="submit" VALUE="<% mt('Post payment') |h %>">
+<INPUT NAME="submitButton" TYPE="submit" VALUE="<% mt('Post payment') |h %>">
 
 </FORM>
 
@@ -129,7 +116,7 @@
     </BODY>
     </HTML>
 % } else { 
-    <& /elements/footer.html &>
+    <& /elements/footer-cust_main.html &>
 % } 
 
 <%init>