projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'github/pr/55_reprise'
[freeside.git]
/
httemplate
/
edit
/
process
/
cust_pay.cgi
diff --git
a/httemplate/edit/process/cust_pay.cgi
b/httemplate/edit/process/cust_pay.cgi
index
a310c53
..
15b26f9
100755
(executable)
--- a/
httemplate/edit/process/cust_pay.cgi
+++ b/
httemplate/edit/process/cust_pay.cgi
@@
-7,13
+7,14
@@
% if ( $cgi->param('apply') eq 'yes' ) {
% my $cust_main = qsearchs('cust_main', { 'custnum' => $linknum })
% or die "unknown custnum $linknum";
% 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 );
+% $cust_main->apply_payments( 'manual' => 1,
+% 'backdate_application' => ($_date < time-86400) );
% }
% if ( $link eq 'popup' ) {
%
% }
% if ( $link eq 'popup' ) {
%
-<% header(
'Payment entered'
) %>
+<% header(
emt('Payment entered')
) %>
<SCRIPT TYPE="text/javascript">
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
</SCRIPT>
</BODY></HTML>
@@
-27,8
+28,7
@@
%}
<%init>
%}
<%init>
-die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('Post payment');
+my $conf = FS::Conf->new;
$cgi->param('linknum') =~ /^(\d+)$/
or die "Illegal linknum: ". $cgi->param('linknum');
$cgi->param('linknum') =~ /^(\d+)$/
or die "Illegal linknum: ". $cgi->param('linknum');
@@
-39,19
+39,36
@@
$cgi->param('link') =~ /^(custnum|invnum|popup)$/
my $field = my $link = $1;
$field = 'custnum' if $field eq 'popup';
my $field = my $link = $1;
$field = 'custnum' if $field eq 'popup';
-my $_date = str2time($cgi->param('_date'));
+my $_date;
+if ( $FS::CurrentUser::CurrentUser->access_right('Backdate payment') ) {
+ $_date = parse_datetime($cgi->param('_date'));
+}
+else {
+ $_date = time;
+}
my $new = new FS::cust_pay ( {
$field => $linknum,
_date => $_date,
my $new = new FS::cust_pay ( {
$field => $linknum,
_date => $_date,
+ no_auto_apply => ($cgi->param('apply') eq 'never') ? 'Y' : '',
map {
$_, scalar($cgi->param($_));
} qw( paid payby payinfo paybatch
map {
$_, scalar($cgi->param($_));
} qw( paid payby payinfo paybatch
- pkgnum
+ pkgnum discount_term
+ bank depositor account teller
)
#} fields('cust_pay')
)
#} fields('cust_pay')
+ # gatewaynum, processor, auth, order_number
+ # are for realtime payments only, and can't be entered manually
} );
} );
+my @rights = ('Post payment');
+push @rights, 'Post check payment' if $new->payby eq 'BILL';
+push @rights, 'Post cash payment' if $new->payby eq 'CASH';
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right(\@rights);
+
my $error = $new->insert( 'manual' => 1 );
</%init>
my $error = $new->insert( 'manual' => 1 );
</%init>