X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_pay.cgi;h=638679a46302765bc29dff277efcd4af55a38b5a;hb=5c0d47bfe554a35c8906d97b9fabd9999be4f67e;hp=3c28774988367861ec73a799bf52e0c914a22803;hpb=46a7257273fdae101658c8a1ee74f654ca0876b5;p=freeside.git

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 3c2877498..638679a46 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -26,7 +26,7 @@ Payment
 <TR>
   <TD ALIGN="right">Date</TD>
   <TD COLSPAN=2>
-    <INPUT TYPE="text" NAME="_date" ID="_date_text" VALUE="<% time2str("%m/%d/%Y %r",$_date) %>">
+    <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="Select date">
   </TD>
 </TR>
@@ -34,7 +34,7 @@ Payment
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "_date_text",
-    ifFormat:   "%m/%d/%Y",
+    ifFormat:   "<% $date_format %>",
     button:     "_date_button",
     align:      "BR"
   });
@@ -43,9 +43,15 @@ Payment
 <TR>
   <TD ALIGN="right">Amount</TD>
   <TD BGCOLOR="#ffffff" ALIGN="right"><% $money_char %></TD>
-  <TD><INPUT TYPE="text" NAME="paid" VALUE="<% $paid %>" SIZE=8 MAXLENGTH=8> by <B><% FS::payby->payname($payby) %></B></TD>
+  <TD><INPUT TYPE="text" NAME="paid" VALUE="<% $paid %>" SIZE=8 MAXLENGTH=9> by <B><% FS::payby->payname($payby) %></B></TD>
 </TR>
 
+  <% include('/elements/tr-select-discount_term.html',
+               'custnum' => $custnum,
+               'cgi'     => $cgi
+            )
+  %>
+
 % if ( $payby eq 'BILL' ) { 
   <TR>
     <TD ALIGN="right">Check #</TD>
@@ -72,6 +78,16 @@ Payment
 % } 
 </TR>
 
+% if ( $conf->exists('pkg-balances') ) {
+  <% include('/elements/tr-select-cust_pkg-balances.html',
+               'custnum' => $custnum,
+               'cgi'     => $cgi
+            )
+  %>
+% } else {
+  <INPUT TYPE="hidden" NAME="pkgnum" VALUE="">
+% }
+
 </TABLE>
 
 <BR>
@@ -90,19 +106,17 @@ Payment
 
 my $conf = new FS::Conf;
 
-my $money_char = $conf->config('money_char') || '$';
-
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Post payment');
+my $money_char  = $conf->config('money_char')  || '$';
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
-my($link, $linknum, $paid, $payby, $payinfo, $_date); 
+my($link, $linknum, $paid, $payby, $payinfo, $_date);
 if ( $cgi->param('error') ) {
   $link     = $cgi->param('link');
   $linknum  = $cgi->param('linknum');
   $paid     = $cgi->param('paid');
   $payby    = $cgi->param('payby');
   $payinfo  = $cgi->param('payinfo');
-  $_date    = $cgi->param('_date') ? str2time($cgi->param('_date')) : time;
+  $_date    = $cgi->param('_date') ? parse_datetime($cgi->param('_date')) : time;
 } elsif ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
   $link     = $cgi->param('popup') ? 'popup' : 'custnum';
   $linknum  = $1;
@@ -121,6 +135,13 @@ if ( $cgi->param('error') ) {
   die "illegal query ". $cgi->keywords;
 }
 
+my @rights = ('Post payment');
+push @rights, 'Post check payment' if $payby eq 'BILL';
+push @rights, 'Post cash payment'  if $payby eq 'CASH';
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right(\@rights);
+
 my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 
 my $title = 'Post '. FS::payby->payname($payby). ' payment';
@@ -131,7 +152,7 @@ if ( $link eq 'invnum' ) {
   my $cust_bill = qsearchs('cust_bill', { 'invnum' => $linknum } )
     or die "unknown invnum $linknum";
   $custnum = $cust_bill->custnum;
-} elsif ( $link eq 'custnum' ) {
+} elsif ( $link eq 'custnum' || $link eq 'popup' ) {
   $custnum = $linknum;
 }