X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Fpayment.html;h=d7322a2d6ed8f07046ac68e97ab1ec67f322ed1e;hb=93ec97f7d887bfd8e172f476edd8477546b5d597;hp=61486518ee5bea19910196fb4786f6361fa0e1ce;hpb=170aa1e8078280e7c03a6ebfc67280de66fa1b9d;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 61486518e..d7322a2d6 100644
--- a/httemplate/view/cust_main/payment_history/payment.html
+++ b/httemplate/view/cust_main/payment_history/payment.html
@@ -7,22 +7,13 @@ 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 $payby = $cust_pay->payby;
-
-my $payinfo;
-if ( $payby eq 'CARD' ) {
-  $payinfo = $cust_pay->paymask;
-} elsif ( $payby eq 'CHEK' ) {
-  my( $account, $aba ) = split('@', $cust_pay->paymask );
-  $payinfo = mt("ABA [_1], Acct #[_2]",$aba,$account);
-} else {
-  $payinfo = $cust_pay->payinfo;
-}
 my @cust_bill_pay = $cust_pay->cust_bill_pay;
 my @cust_pay_refund = $cust_pay->cust_pay_refund;
 
+my ($payby,$payinfo) = translate_payinfo($cust_pay);
 my $target = "$payby$payinfo";
 $payby = translate_payby($payby,$payinfo);
 my $info = $payby ? "($payby$payinfo)" : '';
@@ -40,28 +31,36 @@ if ($conf->exists('cust_bill_pay_pkg-manual')) {
   %cust_bill_pay_height = ('height' => 436);
 }
 
-my( $apply, $ext ) = ( '', '', '', '' );
+my $apply = '';
 
+my $italicize_otaker = 0;
 my $otaker = $cust_pay->otaker;
-$otaker = '<i>auto billing</i>'          if $otaker eq 'fs_daily';
-$otaker = '<i>customer self-service</i>' if $otaker eq 'fs_selfservice';
+if ( $otaker eq 'fs_daily' ) {
+    $otaker = 'auto billing';
+    $italicize_otaker = 1;
+}
+if ( $otaker eq 'fs_selfservice' ) {
+    $otaker = 'customer self-service';
+    $italicize_otaker = 1;
+}
 
-my $payment = mt("Payment by [_1]",$otaker);
+my $payment = emt("Payment by [_1]",$otaker);
+$payment =~ s/$otaker/<i>$otaker<\/i>/ if $italicize_otaker;
 
 if (    scalar(@cust_bill_pay)   == 0
      && scalar(@cust_pay_refund) == 0 ) {
   #completely unapplied
-  $payment = '<B><FONT COLOR="#FF0000">' 
-                . mt("Unapplied Payment by [_1]",$otaker)
-                . '</FONT></B>';
+  $payment = emt("Unapplied Payment by [_1]",$otaker);
+  $payment =~ s/$otaker/<i>$otaker<\/i>/ if $italicize_otaker;
+  $payment = '<B><FONT COLOR="#FF0000">'.$payment.'</FONT></B>';
   if ( $curuser->access_right('Apply payment') ) {
     if ( $cust_pay->cust_main->total_owed > 0 ) {
       $apply = ' ('.
                include( '/elements/popup_link.html',
-                          'label'       => mt('apply'),
+                          'label'       => emt('apply'),
                           'action'      => "${p}edit/cust_bill_pay.cgi?".
                                            $cust_pay->paynum,
-                          'actionlabel' => mt('Apply payment'),
+                          'actionlabel' => emt('Apply payment'),
                           %cust_bill_pay_width,
                           %cust_bill_pay_height,
                       ).
@@ -70,10 +69,10 @@ if (    scalar(@cust_bill_pay)   == 0
     if ( $cust_pay->cust_main->total_unapplied_refunds > 0 ) {
       $apply.= ' ('.
                include( '/elements/popup_link.html',
-                          'label'       => mt('apply to refund'),
+                          'label'       => emt('apply to refund'),
                           'action'      => "${p}edit/cust_pay_refund.cgi?".
                                            $cust_pay->paynum,
-                          'actionlabel' => mt('Apply payment to refund'),
+                          'actionlabel' => emt('Apply payment to refund'),
                           'width'       => 392,
                       ).
                ')';
@@ -88,39 +87,36 @@ if (    scalar(@cust_bill_pay)   == 0
           && scalar(@cust_pay_refund) == 1
           && $cust_pay->unapplied == 0     ) {
   #applied to one refund
-  $desc .= mt(" refunded on [_1]", time2str($date_format, $cust_pay_refund[0]->_date) );
+  $desc .= emt(" refunded on [_1]", time2str($date_format, $cust_pay_refund[0]->_date) );
 } else {
   #complicated
   $desc .= '<BR>';
   foreach my $app ( sort { $a->_date <=> $b->_date }
                          ( @cust_bill_pay, @cust_pay_refund ) ) {
     if ( $app->isa('FS::cust_bill_pay') ) {
-      $desc .= '&nbsp;&nbsp;'.
-               '$'. $app->amount.
-               ' '. $app->applied_to_invoice.
-               '<BR>';
-               #' on '. time2str($date_format, $cust_bill_pay->_date).
+      $desc .= '&nbsp;&nbsp;' . $money_char . $app->amount . ' ' .
+                $app->applied_to_invoice . '<BR>';
     } elsif ( $app->isa('FS::cust_pay_refund') ) {
-      $desc .= '&nbsp;&nbsp;'.
-               '$'. $app->amount.
-               mt(" refunded on [_1]", time2str($date_format, $app->_date) ) .
-               '<BR>';
+      $desc .= '&nbsp;&nbsp;' .
+               emt("[_1][_2] refunded on [_3]", $money_char, $app->amount,
+                        time2str($date_format, $app->_date) ) . '<BR>';
     } else {
       die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
     }
   }
   if ( $cust_pay->unapplied > 0 ) {
     $desc .= '&nbsp;&nbsp;'.
-             '<B><FONT COLOR="#FF0000">$'.
-             $cust_pay->unapplied. ' unapplied</FONT></B>';
+             '<B><FONT COLOR="#FF0000">' .
+             emt("[_1][_2] unapplied", $money_char, $cust_pay->unapplied) .
+             '</FONT></B>';
     if ( $curuser->access_right('Apply payment') ) {
       if ( $cust_pay->cust_main->total_owed > 0 ) {
         $apply = ' ('.
                  include( '/elements/popup_link.html',
-                            'label'      => mt('apply'),
+                            'label'      => emt('apply'),
                             'action'     => "${p}edit/cust_bill_pay.cgi?".
                                             $cust_pay->paynum,
-                            'actionlabel' => mt('Apply payment'),
+                            'actionlabel' => emt('Apply payment'),
                             %cust_bill_pay_width,
                             %cust_bill_pay_height,
                         ).
@@ -129,10 +125,10 @@ if (    scalar(@cust_bill_pay)   == 0
       if ( $cust_pay->cust_main->total_unapplied_refunds > 0 ) {
         $apply.= ' ('.
                  include( '/elements/popup_link.html',
-                            'label'      => mt('apply to refund'),
+                            'label'      => emt('apply to refund'),
                             'action'     => "${p}edit/cust_pay_refund.cgi?".
                                             $cust_pay->paynum,
-                            'actionlabel' => mt('Apply payment to refund'),
+                            'actionlabel' => emt('Apply payment to refund'),
                             'width'      => 392,
                         ).
                  ')';
@@ -144,10 +140,10 @@ if (    scalar(@cust_bill_pay)   == 0
 
 my $view =
   ' ('. include('/elements/popup_link.html',
-                  'label'     => mt('view receipt'),
+                  'label'     => emt('view receipt'),
                   'action'    => "${p}view/cust_pay.html?link=popup;paynum=".
                                   $cust_pay->paynum,
-                  'actionlabel' => mt('Payment Receipt'),
+                  'actionlabel' => emt('Payment Receipt'),
                ).
    ')';
 
@@ -164,12 +160,20 @@ if (    $cust_pay->closed !~ /^Y/i
 ) {
   $refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
             qq!paynum=!. $cust_pay->paynum. '"'.
-            qq! TITLE="Send a refund for this payment to the payment gateway"!.
-            qq!>refund</A>)!;
+            qq! TITLE="! .emt('Send a refund for this payment to the payment gateway') 
+            . '">' . emt('refund') . '</A>)';
 }
 
 my $void = '';
-if (    $cust_pay->closed !~ /^Y/i
+my $voidmsg = $cust_pay->payby =~ /^(CARD|CHEK)$/
+              ? ' (' . emt('do not send anything to the payment gateway').')'
+              : '';
+$void = areyousure_link("${p}misc/void-cust_pay.cgi?".$cust_pay->paynum,
+                        emt('Are you sure you want to void this payment?'),
+                        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')
              )
@@ -180,43 +184,24 @@ if (    $cust_pay->closed !~ /^Y/i
                && $curuser->access_right('Regular void')
              )
         )
-   )
-{
-  $void = qq! (<A HREF="javascript:areyousure('!.
-          qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
-          qq!', 'Are you sure you want to void this payment?')"!.
-          qq! TITLE="Void this payment from the database!.
-            ( $cust_pay->payby =~ /^(CARD|CHEK)$/
-              ? ' (do not send anything to the payment gateway)'
-              : '' 
-            ). '"'.
-          qq!>void</A>)!;
-}
+   );
 
 my $delete = '';
-if ( $cust_pay->closed !~ /^Y/i
-     && $opt{'deletepayments'}
-     && $curuser->access_right('Delete payment')
-   )
-{
-  $delete = qq! (<A HREF="javascript:areyousure('!.
-            qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum.
-            qq!', 'Are you sure you want to delete this payment?')"!.
-            qq! TITLE="Delete this payment from the database completely - not recommended"!.
-            qq!>delete</A>)!;
-}
+$delete = areyousure_link("${p}misc/delete-cust_pay.cgi?".$cust_pay->paynum,
+                            emt('Are you sure you want to delete this payment?'),
+                            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') );
 
 my $unapply = '';
-if (    $cust_pay->closed !~ /^Y/i
-     && scalar(@cust_bill_pay)           
-     && $curuser->access_right('Unapply payment')
-   )
-{
-  $unapply = qq! (<A HREF="javascript:areyousure('!.
-             qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum.
-             qq!', 'Are you sure you want to unapply this payment?')"!.
-             qq! TITLE="Keep this payment, but dissociate it from the invoices it is currently applied against"!.
-             qq!>unapply</A>)!;
-}
+$unapply = areyousure_link("${p}misc/unapply-cust_pay.cgi?".$cust_pay->paynum,
+                            emt('Are you sure you want to unapply this payment?'),
+                            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') );
 
 </%init>