[freeside-commits] freeside/httemplate/edit cust_refund.cgi, 1.4.2.3, 1.4.2.4 cust_pay.cgi, 1.24.2.2, 1.24.2.3
Ivan,,,
ivan at wavetail.420.am
Tue Sep 2 18:46:47 PDT 2008
Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv6706/httemplate/edit
Modified Files:
Tag: FREESIDE_1_7_BRANCH
cust_refund.cgi cust_pay.cgi
Log Message:
add back ability to post a check/cash refund. be more explicit about it instead of just being a checkbox when posting a credit. RT#3812
Index: cust_pay.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_pay.cgi,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -d -r1.24.2.2 -r1.24.2.3
--- cust_pay.cgi 13 Jan 2008 21:36:07 -0000 1.24.2.2
+++ cust_pay.cgi 3 Sep 2008 01:46:45 -0000 1.24.2.3
@@ -4,24 +4,22 @@
<% include("/elements/header.html", $title, '') %>
% }
-<% include('/elements/error.html') %>
-
-<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+<% include('/elements/init_calendar.html') %>
-<FORM ACTION="<% popurl(1) %>process/cust_pay.cgi" METHOD=POST>
-<INPUT TYPE="hidden" NAME="link" VALUE="<% $link %>">
-<INPUT TYPE="hidden" NAME="linknum" VALUE="<% $linknum %>">
+<% include('/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">
+<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><BR>
+
Payment
<% ntable("#cccccc", 2) %>
@@ -45,7 +43,7 @@
<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><% $payby{$payby} %></B></TD>
+ <TD><INPUT TYPE="text" NAME="paid" VALUE="<% $paid %>" SIZE=8 MAXLENGTH=8> by <B><% FS::payby->payname($payby) %></B></TD>
</TR>
% if ( $payby eq 'BILL' ) {
@@ -76,31 +74,24 @@
</TABLE>
-<INPUT TYPE="hidden" NAME="paybatch" VALUE="<% $paybatch %>">
-
<BR>
<INPUT TYPE="submit" VALUE="Post payment">
</FORM>
-</BODY>
-</HTML>
-<%once>
+% if ( $link eq 'popup' ) {
+ </BODY>
+ </HTML>
+% } else {
+ <% include('/elements/footer.html') %>
+% }
-my $conf = new FS::Conf;
+<%init>
-my %payby = (
- 'BILL' => 'Check',
- 'CASH' => 'Cash',
- 'WEST' => 'Western Union',
- 'MCRD' => 'Manual credit card',
-);
+my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
-</%once>
-<%init>
-
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Post payment');
@@ -132,7 +123,7 @@
my $paybatch = "webui-$_date-$$-". rand() * 2**32;
-my $title = 'Post '. $payby{$payby}. ' payment';
+my $title = 'Post '. FS::payby->payname($payby). ' payment';
$title .= " against Invoice #$linknum" if $link eq 'invnum';
my $custnum;
@@ -143,5 +134,5 @@
} elsif ( $link eq 'custnum' ) {
$custnum = $linknum;
}
-</%init>
+</%init>
Index: cust_refund.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_refund.cgi,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- cust_refund.cgi 13 Jan 2008 21:36:07 -0000 1.4.2.3
+++ cust_refund.cgi 3 Sep 2008 01:46:45 -0000 1.4.2.4
@@ -1,34 +1,37 @@
-<% include('/elements/header.html', 'Refund '. ucfirst(lc($payby)). ' payment', '') %>
+% if ( $link eq 'popup' ) {
+ <% include('/elements/header-popup.html', $title ) %>
+% } else {
+ <% include("/elements/header.html", $title, '') %>
+% }
<% include('/elements/error.html') %>
-<% small_custview($custnum, $conf->config('countrydefault')) %>
+% unless ( $link eq 'popup' ) {
+ <% small_custview($custnum, $conf->config('countrydefault')) %>
+% }
<FORM NAME="RefundForm" ACTION="<% $p1 %>process/cust_refund.cgi" METHOD=POST onSubmit="document.RefundForm.submit.disabled=true">
+<INPUT TYPE="hidden" NAME="popup" VALUE="<% $link %>">
<INPUT TYPE="hidden" NAME="refundnum" VALUE="">
<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
<INPUT TYPE="hidden" NAME="paynum" VALUE="<% $paynum %>">
<INPUT TYPE="hidden" NAME="_date" VALUE="<% $_date %>">
<INPUT TYPE="hidden" NAME="payby" VALUE="<% $payby %>">
-<INPUT TYPE="hidden" NAME="payinfo" VALUE="">
<INPUT TYPE="hidden" NAME="paybatch" VALUE="">
<INPUT TYPE="hidden" NAME="credited" VALUE="">
+
<BR>
+
% if ( $cust_pay ) {
%
% #false laziness w/FS/FS/cust_pay.pm
-% my $payby = $cust_pay->payby;
+% my $payby = FS::payby->payname($cust_pay->payby);
% my $paymask = $cust_pay->paymask;
% my $paydate = $cust_pay->paydate;
% if ( $cgi->param('error') ) {
% $paydate = $cgi->param('exp_year'). '-'. $cgi->param('exp_month'). '-01';
% $paydate = '' unless ($paydate =~ /^\d{2,4}-\d{1,2}-01$'/);
% }
-% $payby =~ s/^BILL$/Check/ if $paymask;
-% $payby =~ s/^CHEK$/Electronic check/;
-%
-%
-
<BR>Payment
<% ntable("#cccccc", 2) %>
@@ -42,7 +45,7 @@
</TR>
<TR>
- <TD ALIGN="right">Method</TD><TD BGCOLOR="#ffffff"><% ucfirst(lc($payby)) %> # <% $paymask %></TD>
+ <TD ALIGN="right">Method</TD><TD BGCOLOR="#ffffff"><% $payby %> # <% $paymask %></TD>
</TR>
% unless ( $paydate ) { # possibly other reasons: i.e. card has since expired
@@ -89,15 +92,27 @@
<% ntable("#cccccc", 2) %>
<TR>
- <TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff"><% time2str("%D",$_date) %></TD>
+ <TD ALIGN="right">Date</TD>
+ <TD BGCOLOR="#ffffff"><% time2str("%D",$_date) %></TD>
</TR>
<TR>
- <TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="refund" VALUE="<% $refund %>" SIZE=8 MAXLENGTH=8></TD>
+ <TD ALIGN="right">Amount</TD>
+ <TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="refund" VALUE="<% $refund %>" SIZE=8 MAXLENGTH=8> by <B><% FS::payby->payname($payby) %></B></TD>
</TR>
+% if ( $payby eq 'BILL' ) {
+ <TR>
+ <TD ALIGN="right">Check #</TD>
+ <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<% $payinfo %>" SIZE=10></TD>
+ </TR>
+% } else {
+ <INPUT TYPE="hidden" NAME="payinfo" VALUE="">
+% }
+
<TR>
- <TD ALIGN="right">Reason</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="<% $reason %>"></TD>
+ <TD ALIGN="right">Reason</TD>
+ <TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="<% $reason %>"></TD>
</TR>
</TABLE>
@@ -106,7 +121,12 @@
</FORM>
-<% include('/elements/footer.html') %>
+% if ( $link eq 'popup' ) {
+ </BODY>
+ </HTML>
+% } else {
+ <% include('/elements/footer.html') %>
+% }
<%init>
@@ -117,7 +137,9 @@
my $custnum = $cgi->param('custnum');
my $refund = $cgi->param('refund');
my $payby = $cgi->param('payby');
+my $payinfo = $cgi->param('payinfo');
my $reason = $cgi->param('reason');
+my $link = $cgi->param('popup') ? 'popup' : '';
my( $paynum, $cust_pay ) = ( '', '' );
if ( $cgi->param('paynum') =~ /^(\d+)$/ ) {
@@ -138,4 +160,6 @@
my $p1 = popurl(1);
+my $title = 'Refund '. FS::payby->payname($payby). ' payment';
+
</%init>
More information about the freeside-commits
mailing list