diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-11-11 15:02:25 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-11-11 15:02:25 -0800 |
| commit | a078c5a126b4a4cac8aa259dd04e51f302787a18 (patch) | |
| tree | 17bfb9e1b1740d285f5897d16fc3236049c13d23 | |
| parent | 3e01be6fff8c2717256b15d43ac72fb278f79438 (diff) | |
UX: one-time charge - clarify quotation vs. real charge, acknowledge addition instead of silently redirecting
| -rw-r--r-- | httemplate/edit/process/quick-charge.cgi | 23 | ||||
| -rw-r--r-- | httemplate/edit/quick-charge.html | 11 |
2 files changed, 25 insertions, 9 deletions
diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi index d1b8e10..39628ca 100644 --- a/httemplate/edit/process/quick-charge.cgi +++ b/httemplate/edit/process/quick-charge.cgi @@ -1,4 +1,4 @@ -<% $cgi->redirect($redirect) %> +<% $cgi->redirect(@redirect) %> <%init> my $curuser = $FS::CurrentUser::CurrentUser; @@ -148,14 +148,27 @@ if ( $param->{'pkgnum'} =~ /^(\d+)$/ ) { #modifying an existing one-time charge } -my $redirect; +my @redirect = (); if ( $error ) { $cgi->param('error', $error ); - $redirect = $p.'quick-charge.html?'. $cgi->query_string; + @redirect = ( $p.'quick-charge.html?'. $cgi->query_string ); } elsif ( $quotation ) { - $redirect = $fsurl.'view/quotation.html?' . $quotation->quotationnum; + @redirect = ( + -uri => $fsurl.'view/quotation.html?' . $quotation->quotationnum, + -cookie => CGI::Cookie->new( -name => 'freeside_status', + -value => mt('One-time charge added to quotation'), + -expires => '+5m', + ), + ); } else { - $redirect = $fsurl.'view/cust_main.cgi?custnum=' . $cust_main->custnum . ';show=last'; + @redirect = ( + -uri => $fsurl.'view/cust_main.cgi?custnum='. $cust_main->custnum. + ';show=last', + -cookie => CGI::Cookie->new( -name => 'freeside_status', + -value => mt('One-time charge ordered'), + -expires => '+5m', + ), + ); } </%init> diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index 896e8b2..af6fd41 100644 --- a/httemplate/edit/quick-charge.html +++ b/httemplate/edit/quick-charge.html @@ -1,12 +1,15 @@ -% if ( $quotationnum ) { -<& /elements/header.html, mt('One-time charge') &> +% if ( $quotationnum && ! $cust_main ) { +<& /elements/header.html, mt('Quotation #[_1]: add one-time charge', $quotationnum) &> % } else { <& /elements/header-cust_main.html, - view => 'packages', + view => $quotationnum ? 'quotations' : 'packages', cust_main => $cust_main, etc => $cgi->param('error') ? '' : 'onload="addRow()"', &> -<h2>One-time charge</h2> +<h2><% $quotationnum + ? emt('Quotation #[_1]: add one-time charge', $quotationnum) + : mt('One-time charge') + %></h2> % } <& /elements/init_calendar.html &> |