X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fcust_pay.cgi;h=d6bbf06b023c225cc1da91a1fbc6e3546b46f7c7;hp=cecccb59e1d779b240a9640def6efb46078a7bf3;hb=74e058c8a010ef6feb539248a550d0bb169c1e94;hpb=8e3dfb380406e145494a5fffa7a0e4aab7b38253

diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index cecccb59e..d6bbf06b0 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,4 +1,31 @@
-<%
+%if ($error) {
+%  $cgi->param('error', $error);
+<% $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string ) %>
+%} elsif ( $field eq 'invnum' ) {
+<% $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum") %>
+%} elsif ( $field eq 'custnum' ) {
+%  if ( $cgi->param('apply') eq 'yes' ) {
+%    my $cust_main = qsearchs('cust_main', { 'custnum' => $linknum })
+%      or die "unknown custnum $linknum";
+%    $cust_main->apply_payments( 'manual' => 1 );
+%  }
+%  if ( $link eq 'popup' ) {
+%    
+<% header('Payment entered') %>
+    <SCRIPT TYPE="text/javascript">
+      window.top.location.reload();
+    </SCRIPT>
+
+    </BODY></HTML>
+%
+%  } elsif ( $link eq 'custnum' ) {
+<% $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum") %>
+%  } else {
+%    die "unknown link $link";
+%  }
+%
+%}
+<%init>
 
 $cgi->param('linknum') =~ /^(\d+)$/
   or die "Illegal linknum: ". $cgi->param('linknum');
@@ -9,46 +36,26 @@ $cgi->param('link') =~ /^(custnum|invnum|popup)$/
 my $field = my $link = $1;
 $field = 'custnum' if $field eq 'popup';
 
-my $_date = str2time($cgi->param('_date'));
+my $_date = parse_datetime($cgi->param('_date'));
 
 my $new = new FS::cust_pay ( {
   $field => $linknum,
   _date  => $_date,
   map {
     $_, scalar($cgi->param($_));
-  } qw(paid payby payinfo paybatch)
+  } qw( paid payby payinfo paybatch
+        pkgnum discount_term
+      )
   #} fields('cust_pay')
 } );
 
-my $error = $new->insert;
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
-} elsif ( $field eq 'invnum' ) {
-  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
-} elsif ( $field eq 'custnum' ) {
-  if ( $cgi->param('apply') eq 'yes' ) {
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $linknum })
-      or die "unknown custnum $linknum";
-    $cust_main->apply_payments;
-  }
-  if ( $link eq 'popup' ) {
-
-    %><%= header('Payment entered') %>
-    <SCRIPT TYPE="text/javascript">
-      window.top.location.reload();
-    </SCRIPT>
-
-    </BODY></HTML>
-    <%
+my @rights = ('Post payment');
+push @rights, 'Post check payment' if $new->payby eq 'BILL';
+push @rights, 'Post cash payment'  if $new->payby eq 'CASH';
 
-  } elsif ( $link eq 'custnum' ) {
-    print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
-  } else {
-    die "unknown link $link";
-  }
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right(\@rights);
 
-}
+my $error = $new->insert( 'manual' => 1 );
 
-%>
+</%init>