diff options
| author | ivan <ivan> | 2004-07-06 17:26:02 +0000 | 
|---|---|---|
| committer | ivan <ivan> | 2004-07-06 17:26:02 +0000 | 
| commit | 4ae85517a9c3a8a2f61e87bc27a74eb616e396a4 (patch) | |
| tree | 6f6c57f1719b34a9b59cc25ac1fcc7298d69daa5 /httemplate | |
| parent | c0c6e34a0818945d86165b47adcddfea91f3f7e4 (diff) | |
payment voiding part deux & credit card refunds!
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/edit/cust_refund.cgi | 93 | ||||
| -rwxr-xr-x | httemplate/edit/process/cust_credit.cgi | 4 | ||||
| -rwxr-xr-x | httemplate/edit/process/cust_refund.cgi | 37 | ||||
| -rwxr-xr-x | httemplate/view/cust_main.cgi | 127 | 
4 files changed, 202 insertions, 59 deletions
| diff --git a/httemplate/edit/cust_refund.cgi b/httemplate/edit/cust_refund.cgi new file mode 100755 index 000000000..425c17738 --- /dev/null +++ b/httemplate/edit/cust_refund.cgi @@ -0,0 +1,93 @@ +<!-- mason kludge --> +<% + +my $conf = new FS::Conf; +my $custnum = $cgi->param('custnum'); +my $refund  = $cgi->param('refund'); +my $payby   = $cgi->param('payby'); +my $reason  = $cgi->param('reason'); + +my( $paynum, $cust_pay ) = ( '', '' ); +if ( $cgi->param('paynum') =~ /^(\d+)$/ ) { +  $paynum = $1; +  $cust_pay = qsearchs('cust_pay', { paynum=>$paynum } ) +    or die "unknown payment # $paynum"; +  $refund ||= $cust_pay->unrefunded; +  if ( $custnum ) { +    die "payment # $paynum is not for specified customer # $custnum" +      unless $custnum == $cust_pay->custnum; +  } else { +    $custnum = $cust_pay->custnum; +  } +} +die "no custnum or paynum specified!" unless $custnum; + +my $_date = time; + +my $p1 = popurl(1); + +print header('Refund '. ucfirst(lc($payby)). ' payment', ''); +print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'), +      "</FONT>" +  if $cgi->param('error'); +print <<END, small_custview($custnum, $conf->config('countrydefault')); +    <FORM ACTION="${p1}process/cust_refund.cgi" METHOD=POST> +    <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> +END + +if ( $cust_pay ) { + +  #false laziness w/FS/FS/cust_pay.pm +  my $payby = $cust_pay->payby; +  my $payinfo = $cust_pay->payinfo; +  $payby =~ s/^BILL$/Check/ if $payinfo; +  $payinfo = $cust_pay->payinfo_masked if $payby eq 'CARD'; + +  print '<BR>Payment'. ntable("#cccccc", 2). +        '<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">$'. +          $cust_pay->paid. '</TD></TR>'. +        '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'. +          time2str("%D",$cust_pay->_date). '</TD></TR>'. +        '<TR><TD ALIGN="right">Method</TD><TD BGCOLOR="#ffffff">'. +          ucfirst(lc($payby)). ' # '. $payinfo. '</TD></TR>'; +  #false laziness w/FS/FS/cust_main::realtime_refund_bop +  if ( $cust_pay->paybatch =~ /^(\w+):(\w+)(:(\w+))?$/ ) { +    my ( $processor, $auth, $order_number ) = ( $1, $2, $4 ); +    print '<TR><TD ALIGN="right">Processor</TD><TD BGCOLOR="#ffffff">'. +          $processor. '</TD></TR>'; +    print '<TR><TD ALIGN="right">Authorization</TD><TD BGCOLOR="#ffffff">'. +          $auth. '</TD></TR>' +      if length($auth); +    print '<TR><TD ALIGN="right">Order number</TD><TD BGCOLOR="#ffffff">'. +          $order_number. '</TD></TR>' +      if length($order_number); +  } +  print '</TABLE>'; +} + +print '<BR>Refund'. ntable("#cccccc", 2). +      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'. +      time2str("%D",$_date). '</TD></TR>'; + +print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="refund" VALUE="$refund" SIZE=8 MAXLENGTH=8></TD></TR>!; + +print qq!<TR><TD ALIGN="right">Reason</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="$reason"></TD></TR>!; + +print <<END; +</TABLE> +<BR> +<INPUT TYPE="submit" VALUE="Post refund"> +    </FORM> +  </BODY> +</HTML> +END + +%> diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi index ac92631f8..85bfd4489 100755 --- a/httemplate/edit/process/cust_credit.cgi +++ b/httemplate/edit/process/cust_credit.cgi @@ -3,12 +3,9 @@  $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";  my $custnum = $1; -$cgi->param('otaker',getotaker); -  my $new = new FS::cust_credit ( {    map {      $_, scalar($cgi->param($_)); -  #} qw(custnum _date amount otaker reason)    } fields('cust_credit')  } ); @@ -26,5 +23,4 @@ if ( $error ) {    print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");  } -  %> diff --git a/httemplate/edit/process/cust_refund.cgi b/httemplate/edit/process/cust_refund.cgi new file mode 100755 index 000000000..fc1635781 --- /dev/null +++ b/httemplate/edit/process/cust_refund.cgi @@ -0,0 +1,37 @@ +<% + +$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!"; +my $custnum = $1; +my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ) +  or die "unknown custnum $custnum"; + +my $error = ''; +if ( $cgi->param('payby') eq 'CARD' ) {  +  $cgi->param('refund') =~ /^(\d*)(\.\d{2})?$/ +    or die "illegal refund amount ". $cgi->param('refund'); +  my $refund = "$1$2"; +  $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!"; +  my $paynum = $1; +  my $reason = $cgi->param('reason'); +  $error = $cust_main->realtime_refund_bop( 'CC', 'amount' => $refund, +                                                  'paynum' => $paynum, +                                                  'reason' => $reason, ); +} else { +  die 'unimplemented'; +  #my $new = new FS::cust_refund ( { +  #  map { +  #    $_, scalar($cgi->param($_)); +  #  } ( fields('cust_refund'), 'paynum' ) +  #} ); +  #$error = $new->insert; +} + + +if ( $error ) { +  $cgi->param('error', $error); +  print $cgi->redirect(popurl(2). "cust_refund.cgi?". $cgi->query_string ); +} else { +  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum"); +} + +%> diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 125c51aef..a34ddc429 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -36,15 +36,15 @@ print qq!<A HREF="${p}edit/cust_main.cgi?$custnum">Edit this customer</A>!;  %>  <SCRIPT> -function cancel_areyousure(href) { -    if (confirm("Perminantly delete all services and cancel this customer?") == true) +function areyousure(href, message) { +    if (confirm(message) == true)          window.location.href = href;  }  </SCRIPT>  <% -print qq! | <A HREF="javascript:cancel_areyousure('${p}misc/cust_main-cancel.cgi?$custnum')">!. +print qq! | <A HREF="javascript:areyousure('${p}misc/cust_main-cancel.cgi?$custnum', 'Perminantly delete all services and cancel this customer?')">!.        'Cancel this customer</A>'    if $cust_main->ncancelled_pkgs; @@ -349,21 +349,6 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {  } -%> - -<SCRIPT> -function cust_pkg_areyousure(href) { -    if (confirm("Permanently delete included services and cancel this package?") == true) -        window.location.href = href; -} -function svc_areyousure(href) { -    if (confirm("Permanently unprovision and delete this service?") == true) -        window.location.href = href; -} -</SCRIPT> - -<% -  print qq!<A NAME="cust_pkg">Packages</A> !,        qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> (preserves services) )!,  ; @@ -544,29 +529,6 @@ print '</TABLE>';  #end display packages  %> -<SCRIPT> -function cust_pay_areyousure(href) { -    if (confirm("Are you sure you want to delete this payment?") - == true) -        window.location.href = href; -} -function cust_pay_unapply_areyousure(href) { -    if (confirm("Are you sure you want to unapply this payment?") - == true) -        window.location.href = href; -} -function cust_credit_unapply_areyousure(href) { -    if (confirm("Are you sure you want to unapply this credit?") - == true) -        window.location.href = href; -} -function cust_credit_areyousure(href) { -    if (confirm("Are you sure you want to delete this credit?") - == true) -        window.location.href = href; -} -</SCRIPT> -  <% if ( $conf->config('payby-default') ne 'HIDE' ) { %>    <BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR> @@ -660,31 +622,77 @@ function cust_credit_areyousure(href) {        }      } +    my $refund = ''; +    my $refund_days = $conf->config('card_refund-days') || 120; +    if (    $cust_pay->closed !~ /^Y/i +         && $cust_pay->payby eq 'CARD'  +         && time-$cust_pay->_date < $refund_days*86400 +         && $cust_pay->unrefunded > 0 +    ) { +      $refund = qq! (<A HREF="!. qq!${p}edit/cust_refund.cgi?payby=CARD;!. +                qq!paynum=!. $cust_pay->paynum. qq!">refund</A>)!; +    } + +    my $void = ''; +    if (    $cust_pay->closed !~ /^Y/i +         && $cust_pay->payby ne 'CARD' +       ) { +      $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!void</A>)!; +    } +      my $delete = '';      if ( $cust_pay->closed !~ /^Y/i && $conf->exists('deletepayments') ) { -      $delete = qq! (<A HREF="javascript:cust_pay_areyousure('!. +      $delete = qq! (<A HREF="javascript:areyousure('!.                  qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum. -                qq!')">delete</A>)!; +                qq!', 'Are you sure you want to delete this payment?')">!. +                qq!delete</A>)!;      }      my $unapply = '';      if (    $cust_pay->closed !~ /^Y/i           && $conf->exists('unapplypayments')           && scalar(@cust_bill_pay)           ) { -      $unapply = qq! (<A HREF="javascript:cust_pay_unapply_areyousure('!. +      $unapply = qq! (<A HREF="javascript:areyousure('!.                   qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum. -                 qq!')">unapply</A>)!; +                 qq!', 'Are you sure you want to unapply this payment?')">!. +                 qq!unapply</A>)!;      }      push @history, {        'date'    => $cust_pay->_date,        'desc'    => $pre. "Payment$post$info$desc". -                   "$apply$delete$unapply", +                   "$apply$refund$void$delete$unapply",        'payment' => $cust_pay->paid,        'target'  => $target,      };    } +  #voided payments +  foreach my $cust_pay_void ($cust_main->cust_pay_void) { + +    my $payby = $cust_pay_void->payby; +    my $payinfo = $payby eq 'CARD' +                    ? $cust_pay_void->payinfo_masked +                    : $cust_pay_void->payinfo; + +    $payby =~ s/^BILL$/Check #/ if $payinfo; +    $payby =~ s/^BILL$//; +    $payby =~ s/^(CARD|COMP)$/$1 /; +    my $info = $payby ? " ($payby$payinfo)" : ''; + +    push @history, { +      'date'   => $cust_pay_void->_date, +      'desc'   => "Payment $info <I>voided ". +                  time2str("%D", $cust_pay_void->void_date). +                  " by ". $cust_pay_void->otaker. '</i>', +      'void_payment' => $cust_pay_void->paid, +    }; +   +  } +    #credits (some false laziness w/payments)    foreach my $cust_credit ($cust_main->cust_credit) { @@ -740,18 +748,20 @@ function cust_credit_areyousure(href) {  #      my $delete = '';      if ( $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits') ) { -      $delete = qq! (<A HREF="javascript:cust_credit_areyousure('!. +      $delete = qq! (<A HREF="javascript:areyousure('!.                  qq!${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum. -                qq!')">delete</A>)!; +                qq!', 'Are you sure you want to delete this credit?')">!. +                qq!delete</A>)!;      }      my $unapply = '';      if (    $cust_credit->closed !~ /^Y/i           && $conf->exists('unapplycredits')           && scalar(@cust_credit_bill)       ) { -      $unapply = qq! (<A HREF="javascript:cust_credit_unapply_areyousure('!. +      $unapply = qq! (<A HREF="javascript:areyousure('!.                   qq!${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum. -                 qq!')">unapply</A>)!; +                 qq!', 'Are you sure you want to unapply this credit?')">!. +                 qq!unapply</A>)!;      }      push @history, { @@ -809,6 +819,8 @@ function cust_credit_areyousure(href) {      my $payment = exists($item->{'payment'})                      ? sprintf('- $%.2f', $item->{'payment'})                      : ''; +    $payment ||= sprintf('<DEL>- $%.2f</DEL>', $item->{'void_payment'}) +      if exists($item->{'void_payment'});      my $credit  = exists($item->{'credit'})                      ? sprintf('- $%.2f', $item->{'credit'})                      : ''; @@ -976,7 +988,8 @@ sub svc_provision_link {  sub svc_unprovision_link {    my $svc = shift or return ''; -  return qq!<A HREF="javascript:svc_areyousure('${p}misc/unprovision.cgi?$svc->{svcnum}')">Unprovision</A>!; +  qq!<A HREF="javascript:areyousure('${p}misc/unprovision.cgi?$svc->{svcnum}',!. +  qq!'Permanently unprovision and delete this service?')">Unprovision</A>!;  }  # This should be generalized to use config options to determine order. @@ -1004,7 +1017,8 @@ sub pkg_datestr {  sub pkg_change_link {    my $pkg = shift or return ''; -  return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">Change package</a>!; +  return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">!. +         qq!Change package</a>!;  }  sub pkg_suspend_link { @@ -1019,19 +1033,22 @@ sub pkg_unsuspend_link {  sub pkg_cancel_link {    my $pkg = shift or return ''; -  qq!<A HREF="javascript:cust_pkg_areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}')">Cancel now</A> | !. +  qq!<A HREF="javascript:areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}', !. +  qq!'Permanently delete included services and cancel this package?')">!. +  qq!Cancel now</A> | !.    qq!<A HREF="${p}misc/expire_pkg.cgi?$pkg->{pkgnum}">Cancel later</A>!;  }  sub pkg_dates_link {    my $pkg = shift or return ''; -  return qq!<A HREF="${p}edit/REAL_cust_pkg.cgi?$pkg->{pkgnum}">Edit dates</A>!; +  qq!<A HREF="${p}edit/REAL_cust_pkg.cgi?$pkg->{pkgnum}">Edit dates</A>!;  }  sub pkg_customize_link {    my $pkg = shift or return '';    my $custnum = shift; -  return qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};pkgnum=$pkg->{pkgnum}">Customize</A>!; +  qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};!. +  qq!pkgnum=$pkg->{pkgnum}">Customize</A>!;  }  %> | 
