From c01c0065f9de3428af812638f6e3bb9e02fb725f Mon Sep 17 00:00:00 2001
From: Irina Todeva <itodeva@hostgator.com>
Date: Wed, 30 Sep 2015 14:37:18 -0600
Subject: [PATCH] When void / unvoid / apply / unapply is called stay on the
 same page (payment_history)

Keep consistent void credits with other void methods (invoices, payments)
regarding the method interface

    cust_credit->void
    cust_credit->void('reason string')
    cust_credit->void(FS::reason)
---
 FS/FS/cust_credit.pm                     | 2 +-
 httemplate/misc/unapply-cust_credit.cgi  | 2 +-
 httemplate/misc/unapply-cust_pay.cgi     | 2 +-
 httemplate/misc/unvoid-cust_pay_void.cgi | 2 +-
 httemplate/misc/void-cust_pay.cgi        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 2f2338ee4..032953532 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -377,7 +377,7 @@ sub void {
   my $cust_credit_void = new FS::cust_credit_void ( {
       map { $_ => $self->get($_) } $self->fields
     } );
-  $cust_credit_void->set('void_reasonnum', $reason->reasonnum);
+  $cust_credit_void->set('void_reasonnum', $reason->reasonnum) if $reason;
   my $error = $cust_credit_void->insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
diff --git a/httemplate/misc/unapply-cust_credit.cgi b/httemplate/misc/unapply-cust_credit.cgi
index ed739ac1b..aa1a3a9c2 100755
--- a/httemplate/misc/unapply-cust_credit.cgi
+++ b/httemplate/misc/unapply-cust_credit.cgi
@@ -1,4 +1,4 @@
-<% $cgi->redirect($p. "view/cust_main.cgi?". $custnum) %>
+<% $cgi->redirect($p. "view/cust_main.cgi?custnum=". $custnum. ";show=payment_history") %>
 <%init>
 
 die "access denied"
diff --git a/httemplate/misc/unapply-cust_pay.cgi b/httemplate/misc/unapply-cust_pay.cgi
index b0343d034..34c1ecfd3 100755
--- a/httemplate/misc/unapply-cust_pay.cgi
+++ b/httemplate/misc/unapply-cust_pay.cgi
@@ -1,4 +1,4 @@
-<% $cgi->redirect($p. "view/cust_main.cgi?". $custnum) %>
+<% $cgi->redirect($p. "view/cust_main.cgi?custnum=". $custnum. ";show=payment_history") %>
 <%init>
 
 die "access denied"
diff --git a/httemplate/misc/unvoid-cust_pay_void.cgi b/httemplate/misc/unvoid-cust_pay_void.cgi
index 4726ee576..84b7879fb 100755
--- a/httemplate/misc/unvoid-cust_pay_void.cgi
+++ b/httemplate/misc/unvoid-cust_pay_void.cgi
@@ -1,7 +1,7 @@
 %if ( $error ) {
 %  errorpage($error);
 %} else {
-<% $cgi->redirect($p. "view/cust_main.cgi?". $custnum) %>
+<% $cgi->redirect($p. "view/cust_main.cgi?custnum=". $custnum. ";show=payment_history") %>
 %}
 <%init>
 
diff --git a/httemplate/misc/void-cust_pay.cgi b/httemplate/misc/void-cust_pay.cgi
index 31b7a6201..376fb5652 100755
--- a/httemplate/misc/void-cust_pay.cgi
+++ b/httemplate/misc/void-cust_pay.cgi
@@ -1,7 +1,7 @@
 %if ( $error ) {
 %  errorpage($error);
 %} else {
-<% $cgi->redirect($p. "view/cust_main.cgi?". $custnum) %>
+<% $cgi->redirect($p. "view/cust_main.cgi?custnum=". $custnum. ";show=payment_history") %>
 %}
 <%init>
 
-- 
2.11.0