diff options
-rwxr-xr-x | httemplate/misc/process/void-cust_bill.html | 2 | ||||
-rwxr-xr-x | httemplate/misc/void-cust_bill.cgi | 46 | ||||
-rwxr-xr-x[-rw-r--r--] | httemplate/misc/void-cust_bill.html | 9 | ||||
-rwxr-xr-x | httemplate/misc/void-cust_credit.html (renamed from httemplate/misc/void-cust_credit.cgi) | 2 | ||||
-rwxr-xr-x | httemplate/misc/void-cust_pay.html (renamed from httemplate/misc/void-cust_pay.cgi) | 2 | ||||
-rwxr-xr-x | httemplate/view/cust_bill.cgi | 2 | ||||
-rw-r--r-- | httemplate/view/cust_main/payment_history/credit.html | 2 | ||||
-rw-r--r-- | httemplate/view/cust_main/payment_history/invoice.html | 2 | ||||
-rw-r--r-- | httemplate/view/cust_main/payment_history/payment.html | 2 |
9 files changed, 12 insertions, 57 deletions
diff --git a/httemplate/misc/process/void-cust_bill.html b/httemplate/misc/process/void-cust_bill.html index c0f432b70..7773b0ba9 100755 --- a/httemplate/misc/process/void-cust_bill.html +++ b/httemplate/misc/process/void-cust_bill.html @@ -1,6 +1,6 @@ %if ( $error ) { % $cgi->param('error', $error); -<% $cgi->redirect(popurl(2). "void-cust_bill.cgi?". $cgi->query_string ) %> +<% $cgi->redirect(popurl(2). "void-cust_bill.html?". $cgi->query_string ) %> %} else { <& /elements/header-popup.html, 'Invoice voided' &> <SCRIPT TYPE="text/javascript"> diff --git a/httemplate/misc/void-cust_bill.cgi b/httemplate/misc/void-cust_bill.cgi deleted file mode 100755 index e4e4705d7..000000000 --- a/httemplate/misc/void-cust_bill.cgi +++ /dev/null @@ -1,46 +0,0 @@ -<& /elements/header-popup.html, mt('Void invoice') &> - -<% include('/elements/error.html') %> - -<% emt('Are you sure you want to void this invoice?') %> -<BR><BR> - -<% emt("Invoice #[_1] ([_2])",$cust_bill->display_invnum, $money_char. $cust_bill->owed) %> -<BR><BR> - -<FORM METHOD="POST" ACTION="process/void-cust_bill.html"> -<INPUT TYPE="hidden" NAME="invnum" VALUE="<% $invnum %>"> - -<% ntable("#cccccc", 2) %> -<& /elements/tr-select-reason.html, - 'field' => 'reasonnum', - 'reason_class' => 'I', - 'cgi' => $cgi -&> - -</TABLE> - -<BR> -<CENTER> -<BUTTON TYPE="submit">Yes, void invoice</BUTTON> \ -<BUTTON TYPE="button" onClick="parent.cClick();">No, do not void invoice</BUTTON> -</CENTER> - -</FORM> -</BODY> -</HTML> -<%init> - -die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Void invoices'); - -my $conf = new FS::Conf; -my $money_char = $conf->config('money_char') || '$'; - -#untaint invnum -$cgi->param('invnum') =~ /^(\d+)$/ || die "Illegal invnum"; -my $invnum = $1; - -my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum}); - -</%init> diff --git a/httemplate/misc/void-cust_bill.html b/httemplate/misc/void-cust_bill.html index 39b071229..e4e4705d7 100644..100755 --- a/httemplate/misc/void-cust_bill.html +++ b/httemplate/misc/void-cust_bill.html @@ -12,10 +12,11 @@ <INPUT TYPE="hidden" NAME="invnum" VALUE="<% $invnum %>"> <% ntable("#cccccc", 2) %> -<TR> - <TD ALIGN="right">Reason</TD> - <TD><INPUT TYPE="text" NAME="reason" VALUE="<% scalar($cgi->param('reason')) |h %>"></TD> -</TR> +<& /elements/tr-select-reason.html, + 'field' => 'reasonnum', + 'reason_class' => 'I', + 'cgi' => $cgi +&> </TABLE> diff --git a/httemplate/misc/void-cust_credit.cgi b/httemplate/misc/void-cust_credit.html index f352e6090..1e71f0030 100755 --- a/httemplate/misc/void-cust_credit.cgi +++ b/httemplate/misc/void-cust_credit.html @@ -12,7 +12,7 @@ <P ALIGN="center"><B><% mt('Void this credit?') |h %></B> -<FORM action="<% ${p} %>misc/void-cust_credit.cgi"> +<FORM action="<% ${p} %>misc/void-cust_credit.html"> <INPUT TYPE="hidden" NAME="crednum" VALUE="<% $crednum %>"> <TABLE BGCOLOR="#cccccc" BORDER="0" CELLSPACING="2" STYLE="margin-left:auto; margin-right:auto"> diff --git a/httemplate/misc/void-cust_pay.cgi b/httemplate/misc/void-cust_pay.html index dc0ff4d35..205d93aa3 100755 --- a/httemplate/misc/void-cust_pay.cgi +++ b/httemplate/misc/void-cust_pay.html @@ -12,7 +12,7 @@ <P ALIGN="center"><B><% mt('Void this payment?') |h %></B> -<FORM action="<% ${p} %>misc/void-cust_pay.cgi"> +<FORM action="<% ${p} %>misc/void-cust_pay.html"> <INPUT TYPE="hidden" NAME="paynum" VALUE="<% $paynum %>"> <TABLE BGCOLOR="#cccccc" BORDER="0" CELLSPACING="2" STYLE="margin-left:auto; margin-right:auto"> diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 6d139747a..d73edbd79 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -17,7 +17,7 @@ function areyousure(href, message) { <& /elements/popup_link.html, 'label' => emt('Void this invoice'), 'actionlabel' => emt('Void this invoice'), - 'action' => $p.'misc/void-cust_bill.cgi?invnum='.$invnum, + 'action' => $p.'misc/void-cust_bill.html?invnum='.$invnum, &> % } % if ( $can_void and $can_delete ) { diff --git a/httemplate/view/cust_main/payment_history/credit.html b/httemplate/view/cust_main/payment_history/credit.html index 81be1cd7a..db2e5e582 100644 --- a/httemplate/view/cust_main/payment_history/credit.html +++ b/httemplate/view/cust_main/payment_history/credit.html @@ -130,7 +130,7 @@ my $void = ''; $void = ' ('. include( '/elements/popup_link.html', 'label' => emt('void'), - 'action' => "${p}misc/void-cust_credit.cgi?". + 'action' => "${p}misc/void-cust_credit.html?". $cust_credit->crednum, 'actionlabel' => emt('Void credit'), ). diff --git a/httemplate/view/cust_main/payment_history/invoice.html b/httemplate/view/cust_main/payment_history/invoice.html index ca59c15fd..613936e00 100644 --- a/httemplate/view/cust_main/payment_history/invoice.html +++ b/httemplate/view/cust_main/payment_history/invoice.html @@ -27,7 +27,7 @@ if ( $cust_bill->closed !~ /^Y/i && $opt{'Void invoices'} ) { $void = ' ('. include('/elements/popup_link.html', 'label' => emt('void'), - 'action' => "${p}misc/void-cust_bill.cgi?;invnum=". + 'action' => "${p}misc/void-cust_bill.html?;invnum=". $cust_bill->invnum, 'actionlabel' => emt('Void Invoice'), ). diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html index 77013140e..6c93f7b27 100644 --- a/httemplate/view/cust_main/payment_history/payment.html +++ b/httemplate/view/cust_main/payment_history/payment.html @@ -186,7 +186,7 @@ my $voidmsg = $cust_pay->payby =~ /^(CARD|CHEK|TOKN)$/ $void = ' ('. include( '/elements/popup_link.html', 'label' => emt('void'), - 'action' => "${p}misc/void-cust_pay.cgi?".$cust_pay->paynum, + 'action' => "${p}misc/void-cust_pay.html?".$cust_pay->paynum, 'actionlabel' => emt('Void payment'), ). ')' |