X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Fcredit.html;h=db2e5e582c1f0c901d8bda676bb6a9a60a893964;hb=15a4e1674694b76ecc2af87de479aabe370ac03d;hp=6dd8970c80c5096505b660a8d73737514a696247;hpb=998f029ef805c73e90543b34192e16d38a23c69c;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history/credit.html b/httemplate/view/cust_main/payment_history/credit.html
index 6dd8970c8..db2e5e582 100644
--- a/httemplate/view/cust_main/payment_history/credit.html
+++ b/httemplate/view/cust_main/payment_history/credit.html
@@ -1,15 +1,10 @@
-<% $credit %>
-<% "$reason$desc$apply$delete$unapply" %>
+<% $credit. ' '. $reason. $desc. $change_pkg. $apply . $unapply. $void %>
 <%init>
 
 my( $cust_credit, %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_credit_bill = $cust_credit->cust_credit_bill;
 my @cust_credit_refund = $cust_credit->cust_credit_refund;
 
@@ -21,7 +16,7 @@ if ( $opt{'pkg-balances'} && $cust_credit->pkgnum ) {
 
 my %cust_credit_bill_width = ('width' => 392);
 my %cust_credit_bill_height = ();
-if ($conf->exists('cust_credit_bill_pkg-manual')) {
+if ( $opt{'cust_credit_bill_pkg-manual'} ) {
   %cust_credit_bill_width = ('width' => 592);
   %cust_credit_bill_height = ('height' => 436);
 }
@@ -34,8 +29,8 @@ if (    scalar(@cust_credit_bill)   == 0
   $credit = '<B><FONT COLOR="#FF0000">'
         . emt("Unapplied Credit by [_1]", $cust_credit->otaker )
         . '</FONT></B>';
-  if ( $curuser->access_right('Apply credit') ) {
-    if ( $cust_credit->cust_main->total_owed > 0 ) {
+  if ( $opt{'Apply credit'} ) {
+    if ( $opt{total_owed} > 0 ) {
       $apply = ' ('.
                include( '/elements/popup_link.html',
                           'label'    => emt('apply'),
@@ -47,7 +42,7 @@ if (    scalar(@cust_credit_bill)   == 0
                       ).
                 ')';
     }
-    if ( $cust_credit->cust_main->total_unapplied_refunds > 0 ) {
+    if ( $opt{total_unapplied_refunds} > 0 ) {
       $apply.= ' ('.
                include( '/elements/popup_link.html',
                           'label'    => emt('apply to refund'),
@@ -75,22 +70,22 @@ if (    scalar(@cust_credit_bill)   == 0
   foreach my $app ( sort { $a->_date <=> $b->_date }
                          ( @cust_credit_bill, @cust_credit_refund ) ) {
     if ( $app->isa('FS::cust_credit_bill') ) {
-      $desc .= '&nbsp;&nbsp;' . $money_char . $app->amount . ' '
+      $desc .= '&nbsp;&nbsp;' . $opt{money_char} . $app->amount . ' '
                     . $app->applied_to_invoice . '<BR>';
     } elsif ( $app->isa('FS::cust_credit_refund') ) {
       $desc .= '&nbsp;&nbsp;' .
-               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) ) . '<BR>';
     } else {
       die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
     }
   }
   if ( $cust_credit->credited > 0 ) {
-    $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">' .
-              emt("[_1][_2] unapplied", $money_char, $cust_credit->credited) .
+    $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">'.
+              emt("[_1][_2] unapplied",$opt{money_char},$cust_credit->credited).
               '</FONT></B>';
-    if ( $curuser->access_right('Apply credit') ) {
-      if ( $cust_credit->cust_main->total_owed > 0 ) {
+    if ( $opt{'Apply credit'} ) {
+      if ( $opt{total_owed} > 0 ) {
         $apply = ' ('.
                  include( '/elements/popup_link.html',
                             'label'       => emt('apply'),
@@ -102,7 +97,7 @@ if (    scalar(@cust_credit_bill)   == 0
                         ).
                  ')';
       }
-      if ( $cust_credit->cust_main->total_unapplied_refunds > 0 ) {
+      if ( $opt{total_unapplied_refunds} > 0 ) {
         $apply.= ' ('.
                  include( '/elements/popup_link.html',
                             'label'       => emt('apply to refund'),
@@ -117,14 +112,31 @@ if (    scalar(@cust_credit_bill)   == 0
     $desc .= '<BR>';
   }
 }
-#
-my $delete = '';
-$delete = areyousure_link("${p}misc/delete-cust_credit.cgi?".$cust_credit->crednum,
-                            emt('Are you sure you want to delete this credit?'),
-                            '',
-                            emt('delete')
-                          )
-if ( $cust_credit->closed !~ /^Y/i && $curuser->access_right('Delete credit') );
+
+my $change_pkg = '';
+if ( $apply && $opt{'pkg-balances'} && $cust_credit->pkgnum ) {
+  $change_pkg =
+  ' ('. include('/elements/popup_link.html',
+                  'label'       => emt('change package'),
+                  'action'      => "${p}edit/cust_credit-pkgnum.html?crednum=".
+                                    $cust_credit->crednum,
+                  'actionlabel' => emt('Change credit package'),
+                  'width'       => 763,
+               ).
+   ')';
+}
+
+my $void = '';
+$void = ' ('.
+               include( '/elements/popup_link.html',
+                    'label'    => emt('void'),
+                    'action'   => "${p}misc/void-cust_credit.html?".
+                                  $cust_credit->crednum,
+                    'actionlabel' => emt('Void credit'),
+                ).
+          ')'
+  if $cust_credit->closed !~ /^Y/i
+  && $opt{'Void credit'};
 
 my $unapply = '';
 $unapply = areyousure_link("${p}misc/unapply-cust_credit.cgi?".$cust_credit->crednum,
@@ -132,12 +144,12 @@ $unapply = areyousure_link("${p}misc/unapply-cust_credit.cgi?".$cust_credit->cre
                             '',
                             emt('unapply')
                           )
-if ( $cust_credit->closed !~ /^Y/i && scalar(@cust_credit_bill)
-     && $curuser->access_right('Unapply credit') );
+  if $cust_credit->closed !~ /^Y/i
+  && scalar(@cust_credit_bill)
+  && $opt{'Unapply credit'};
 
-my $reason = $cust_credit->reason
-               ? ' ('. $cust_credit->reason. ')'
-               : '';
+my $reason = $cust_credit->reason;
+$reason = $reason ? " ($reason)" : '';
 
 </%init>