X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Fpayment.html;h=0ed2f8003512e96d54c9437a52bf4c064ec60793;hb=f3738a9fcd588d32eea9b0af6a3e884293c0c6e5;hp=ff269bfaf14f082711364ed61ff6c26ffdd03064;hpb=0af38652da3b3be7da2d35b048285ef6f2194e1a;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html index ff269bfaf..0ed2f8003 100644 --- a/httemplate/view/cust_main/payment_history/payment.html +++ b/httemplate/view/cust_main/payment_history/payment.html @@ -1,17 +1,15 @@ -<% $payment %> -<% "$info$desc$view$apply$refund$void$delete$unapply" %> +<% $payment. ' '. $info. $desc. + $view. $change_pkg. $apply. $refund. $void. $delete. $unapply +%> <%init> my( $cust_pay, %opt ) = @_; my $date_format = $opt{'date_format'} || '%m/%d/%Y'; -my $conf = new FS::Conf; -my $money_char = $conf->config('money_char') || '$'; -my $curuser = $FS::CurrentUser::CurrentUser; - my @cust_bill_pay = $cust_pay->cust_bill_pay; my @cust_pay_refund = $cust_pay->cust_pay_refund; +my $unapplied = $cust_pay->unapplied; my ($payby,$payinfo) = translate_payinfo($cust_pay); my $target = "$payby$payinfo"; @@ -26,7 +24,7 @@ if ( $opt{'pkg-balances'} && $cust_pay->pkgnum ) { my %cust_bill_pay_width = ('width' => 392); my %cust_bill_pay_height = (); -if ($conf->exists('cust_bill_pay_pkg-manual')) { +if ( $opt{'cust_bill_pay_pkg-manual'} ) { %cust_bill_pay_width = ('width' => 592); %cust_bill_pay_height = ('height' => 436); } @@ -53,39 +51,14 @@ if ( scalar(@cust_bill_pay) == 0 $payment = emt("Unapplied Payment by [_1]",$otaker); $payment =~ s/$otaker/$otaker<\/i>/ if $italicize_otaker; $payment = ''.$payment.''; - if ( $curuser->access_right('Apply payment') ) { - if ( $cust_pay->cust_main->total_owed > 0 ) { - $apply = ' ('. - include( '/elements/popup_link.html', - 'label' => emt('apply'), - 'action' => "${p}edit/cust_bill_pay.cgi?". - $cust_pay->paynum, - 'actionlabel' => emt('Apply payment'), - %cust_bill_pay_width, - %cust_bill_pay_height, - ). - ')'; - } - if ( $cust_pay->cust_main->total_unapplied_refunds > 0 ) { - $apply.= ' ('. - include( '/elements/popup_link.html', - 'label' => emt('apply to refund'), - 'action' => "${p}edit/cust_pay_refund.cgi?". - $cust_pay->paynum, - 'actionlabel' => emt('Apply payment to refund'), - 'width' => 392, - ). - ')'; - } - } } elsif ( scalar(@cust_bill_pay) == 1 && scalar(@cust_pay_refund) == 0 - && $cust_pay->unapplied == 0 ) { + && $unapplied == 0 ) { #applied to one invoice, the usual situation $desc .= ' '. $cust_bill_pay[0]->applied_to_invoice; } elsif ( scalar(@cust_bill_pay) == 0 && scalar(@cust_pay_refund) == 1 - && $cust_pay->unapplied == 0 ) { + && $unapplied == 0 ) { #applied to one refund $desc .= emt(" refunded on [_1]", time2str($date_format, $cust_pay_refund[0]->_date) ); } else { @@ -94,50 +67,69 @@ if ( scalar(@cust_bill_pay) == 0 foreach my $app ( sort { $a->_date <=> $b->_date } ( @cust_bill_pay, @cust_pay_refund ) ) { if ( $app->isa('FS::cust_bill_pay') ) { - $desc .= '  ' . $money_char . $app->amount . ' ' . + $desc .= '  ' . $opt{money_char} . $app->amount . ' ' . $app->applied_to_invoice . '
'; } elsif ( $app->isa('FS::cust_pay_refund') ) { $desc .= '  ' . - emt("[_1][_2] refunded on [_3]", $money_char, $app->amount, + emt("[_1][_2] refunded on [_3]", $opt{money_char}, $app->amount, time2str($date_format, $app->_date) ) . '
'; } else { die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund"; } } - if ( $cust_pay->unapplied > 0 ) { + if ( $unapplied > 0 ) { $desc .= '  '. - '' . - emt("[_1][_2] unapplied", $money_char, $cust_pay->unapplied) . + ''. + emt("[_1][_2] unapplied", $opt{money_char}, $unapplied). ''; - if ( $curuser->access_right('Apply payment') ) { - if ( $cust_pay->cust_main->total_owed > 0 ) { - $apply = ' ('. - include( '/elements/popup_link.html', - 'label' => emt('apply'), - 'action' => "${p}edit/cust_bill_pay.cgi?". - $cust_pay->paynum, - 'actionlabel' => emt('Apply payment'), - %cust_bill_pay_width, - %cust_bill_pay_height, - ). - ')'; - } - if ( $cust_pay->cust_main->total_unapplied_refunds > 0 ) { - $apply.= ' ('. - include( '/elements/popup_link.html', - 'label' => emt('apply to refund'), - 'action' => "${p}edit/cust_pay_refund.cgi?". - $cust_pay->paynum, - 'actionlabel' => emt('Apply payment to refund'), - 'width' => 392, - ). - ')'; - } - } $desc .= '
'; } } +if ($unapplied > 0) { + if ( $opt{'Apply payment'} ) { + if ( $opt{total_owed} > 0 ) { + $apply = ' ('. + include( '/elements/popup_link.html', + 'label' => emt('apply'), + 'action' => "${p}edit/cust_bill_pay.cgi?". + $cust_pay->paynum, + 'actionlabel' => emt('Apply payment'), + %cust_bill_pay_width, + %cust_bill_pay_height, + ). + ')'; + } + if ( $opt{total_unapplied_refunds} > 0 ) { + $apply.= ' ('. + include( '/elements/popup_link.html', + 'label' => emt('apply to refund'), + 'action' => "${p}edit/cust_pay_refund.cgi?". + $cust_pay->paynum, + 'actionlabel' => emt('Apply payment to refund'), + 'width' => 392, + ). + ')'; + } + $apply .= ' (auto‑apply: ' + . ($cust_pay->no_auto_apply ? 'no' : 'yes') + . ' | ' + . include( '/elements/popup_link.html', + 'label' => emt($cust_pay->no_auto_apply ? 'yes' : 'no'), + 'action' => "${p}edit/process/cust_pay-no_auto_apply.cgi?paynum=" + . $cust_pay->paynum + . '&no_auto_apply=' + . ($cust_pay->no_auto_apply ? '' : 'Y'), + 'actionlabel' => emt('Toggle Auto-Apply'), + 'width' => 392, + 'height' => 200, + ) + . ')'; + } else { # end if $opt('Apply payment') + $apply .= ' (no auto-apply)' if $cust_pay->no_auto_apply; + } +} # end if $unapplied > 0 + my $view = ' ('. include('/elements/popup_link.html', 'label' => emt('view receipt'), @@ -147,20 +139,34 @@ my $view = ). ')'; +my $change_pkg = ''; +if ( $apply && $opt{'pkg-balances'} && $cust_pay->pkgnum ) { + $change_pkg = + ' ('. include('/elements/popup_link.html', + 'label' => emt('change package'), + 'action' => "${p}edit/cust_pay-pkgnum.html?paynum=". + $cust_pay->paynum, + 'actionlabel' => emt('Change payment package'), + 'width' => 763, + ). + ')'; +} + 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'; +my @refund_right = grep { $opt{$_} } $FS::CurrentUser::CurrentUser->refund_rights($cust_pay->payby); if ( $cust_pay->closed !~ /^Y/i - && $cust_pay->payby =~ /^(CARD|CHEK)$/ + && $cust_pay->payby =~ /^(CARD|CHEK|BILL)$/ && time-$cust_pay->_date < $refund_days*86400 && $cust_pay->unrefunded > 0 - && $curuser->access_right(\@rights) + && scalar(@refund_right) ) { + my $refundtitle = ($cust_pay->payby =~ /^(CARD|CHEK)$/) + ? emt('Send a refund for this payment to the payment gateway') + : emt('Record a refund for this payment'); $refund = qq! (' . emt('refund') . ')'; } @@ -173,18 +179,11 @@ $void = areyousure_link("${p}misc/void-cust_pay.cgi?".$cust_pay->paynum, emt('Void this payment from the database') . $voidmsg, emt('void') ) - if ( $cust_pay->closed !~ /^Y/i - && ( ( $cust_pay->payby eq 'CARD' - && $curuser->access_right('Credit card void') - ) - || ( $cust_pay->payby eq 'CHEK' - && $curuser->access_right('Echeck void') - ) - || ( $cust_pay->payby !~ /^(CARD|CHEK)$/ - && $curuser->access_right('Void payments') - ) - ) - ); + if $cust_pay->closed !~ /^Y/i + && ( ( $cust_pay->payby eq 'CARD' && $opt{'Credit card void'} ) + || ( $cust_pay->payby eq 'CHEK' && $opt{'Echeck void'} ) + || ( $cust_pay->payby !~ /^(CARD|CHEK)$/ && $opt{'Void payments'} ) + ); my $delete = ''; $delete = areyousure_link("${p}misc/delete-cust_pay.cgi?".$cust_pay->paynum, @@ -192,8 +191,9 @@ $delete = areyousure_link("${p}misc/delete-cust_pay.cgi?".$cust_pay->paynum, emt('Delete this payment from the database completely - not recommended'), emt('delete') ) - if ( $cust_pay->closed !~ /^Y/i && $opt{'deletepayments'} - && $curuser->access_right('Delete payment') ); + if $cust_pay->closed !~ /^Y/i + && $opt{'deletepayments'} + && $opt{'Delete payment'}; my $unapply = ''; $unapply = areyousure_link("${p}misc/unapply-cust_pay.cgi?".$cust_pay->paynum, @@ -201,7 +201,8 @@ $unapply = areyousure_link("${p}misc/unapply-cust_pay.cgi?".$cust_pay->paynum, emt('Keep this payment, but dissociate it from the invoices it is currently applied against'), emt('unapply') ) - if ( $cust_pay->closed !~ /^Y/i && scalar(@cust_bill_pay) - && $curuser->access_right('Unapply payment') ); + if $cust_pay->closed !~ /^Y/i + && scalar(@cust_bill_pay) + && $opt{'Unapply payment'};