projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import torrus 1.0.9
[freeside.git]
/
httemplate
/
view
/
cust_main
/
payment_history
/
payment.html
diff --git
a/httemplate/view/cust_main/payment_history/payment.html
b/httemplate/view/cust_main/payment_history/payment.html
index
bcfa808
..
e745864
100644
(file)
--- a/
httemplate/view/cust_main/payment_history/payment.html
+++ b/
httemplate/view/cust_main/payment_history/payment.html
@@
-4,6
+4,8
@@
my( $cust_pay, %opt ) = @_;
my( $cust_pay, %opt ) = @_;
+my $date_format = $opt{'date_format'} || '%m/%d/%Y';
+
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
@@
-87,7
+89,7
@@
if ( scalar(@cust_bill_pay) == 0
&& scalar(@cust_pay_refund) == 1
&& $cust_pay->unapplied == 0 ) {
#applied to one refund
&& scalar(@cust_pay_refund) == 1
&& $cust_pay->unapplied == 0 ) {
#applied to one refund
- $desc .= ' refunded on '. time2str(
"%D"
, $cust_pay_refund[0]->_date);
+ $desc .= ' refunded on '. time2str(
$date_format
, $cust_pay_refund[0]->_date);
} else {
#complicated
$desc .= '<BR>';
} else {
#complicated
$desc .= '<BR>';
@@
-98,11
+100,11
@@
if ( scalar(@cust_bill_pay) == 0
'$'. $app->amount.
' '. $app->applied_to_invoice.
'<BR>';
'$'. $app->amount.
' '. $app->applied_to_invoice.
'<BR>';
- #' on '. time2str(
"%D"
, $cust_bill_pay->_date).
+ #' on '. time2str(
$date_format
, $cust_bill_pay->_date).
} elsif ( $app->isa('FS::cust_pay_refund') ) {
$desc .= ' '.
'$'. $app->amount.
} elsif ( $app->isa('FS::cust_pay_refund') ) {
$desc .= ' '.
'$'. $app->amount.
- ' refunded on '. time2str(
"%D"
, $app->_date).
+ ' refunded on '. time2str(
$date_format
, $app->_date).
'<BR>';
} else {
die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
'<BR>';
} else {
die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
@@
-153,11
+155,14
@@
my $view =
my $refund = '';
my $refund_days = $opt{'card_refund-days'} || 120;
my $refund = '';
my $refund_days = $opt{'card_refund-days'} || 120;
+my @rights = ('Refund payment');
+push @rights, 'Refund credit card payment' if $payby eq 'CARD';
+push @rights, 'Refund Echeck payment' if $payby eq 'CHEK';
if ( $cust_pay->closed !~ /^Y/i
&& $cust_pay->payby =~ /^(CARD|CHEK)$/
&& time-$cust_pay->_date < $refund_days*86400
&& $cust_pay->unrefunded > 0
if ( $cust_pay->closed !~ /^Y/i
&& $cust_pay->payby =~ /^(CARD|CHEK)$/
&& time-$cust_pay->_date < $refund_days*86400
&& $cust_pay->unrefunded > 0
- && $curuser->access_right(
'Refund payment'
)
+ && $curuser->access_right(
\@rights
)
) {
$refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
qq!paynum=!. $cust_pay->paynum. '"'.
) {
$refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
qq!paynum=!. $cust_pay->paynum. '"'.