diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-11-13 13:06:00 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-11-13 13:06:00 -0800 |
| commit | 2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d (patch) | |
| tree | 97bc37e32960f89b299f4b7efa49694e06e95243 /httemplate/edit | |
| parent | 156ce177ef4fb53cfcf688b6127a3c4cff9fb83d (diff) | |
| parent | fb5becb1a877994b897e737e983fae2c8da6a5ac (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/msg_template/email.html | 2 | ||||
| -rwxr-xr-x | httemplate/edit/process/svc_acct.cgi | 7 | ||||
| -rw-r--r-- | httemplate/edit/quotation_pkg_detail.html | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/httemplate/edit/msg_template/email.html b/httemplate/edit/msg_template/email.html index 12a4a6f56..53f538b11 100644 --- a/httemplate/edit/msg_template/email.html +++ b/httemplate/edit/msg_template/email.html @@ -300,6 +300,7 @@ my %substitutions = ( '$payby' => 'Payment method', '$date' => 'Payment date', '$payinfo' => 'Card/account# (masked)', + '$payinfo_end' => 'Card/account last 4 digits', '$error' => 'Decline reason', ], 'cust_refund' => [ @@ -308,6 +309,7 @@ my %substitutions = ( '$payby' => 'Refund method', '$date' => 'Refund date', '$payinfo' => 'Card/account# (masked)', + '$payinfo_end' => 'Card/account last 4 digits', ], 'system_log' => [ '$logmessage' => 'Log entry message', diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi index 9cac2c568..d75ff92c1 100755 --- a/httemplate/edit/process/svc_acct.cgi +++ b/httemplate/edit/process/svc_acct.cgi @@ -81,7 +81,12 @@ if ( $cgi->param('clear_password') eq '*HIDDEN*' || $cgi->param('clear_password') =~ /^\(.* encrypted\)$/ ) { die "fatal: no previous account to recall hidden password from!" unless $old; } else { - $error ||= $new->set_password($cgi->param('clear_password')); + my $newpass = $cgi->param('clear_password'); + if ( ! $old->check_password($newpass) ) { + # then the password is being changed + $error ||= $new->is_password_allowed($newpass) + || $new->set_password($newpass); + } } if ( ! $error ) { diff --git a/httemplate/edit/quotation_pkg_detail.html b/httemplate/edit/quotation_pkg_detail.html index b8f589a9a..80a904420 100644 --- a/httemplate/edit/quotation_pkg_detail.html +++ b/httemplate/edit/quotation_pkg_detail.html @@ -21,15 +21,11 @@ <TD BGCOLOR="#ffffff"><% $part_pkg->comment |h %></TD> </TR> - <TR> - <TD COLSPAN=2>Detail: </TD> - </TR> - % my $row = 0; % for ( @details ) { <TR> - <TD></TD> + <TD ALIGN="right"><% $row ? '' : 'Detail' %></TD> <TD> <INPUT TYPE="text" NAME="detail<% $row %>" SIZE="60" MAXLENGTH="65" VALUE="<% $_ |h %>" rownum="<% $row++ %>" onkeyup="possiblyAddRow" onchange="possiblyAddrow"> </TD> @@ -63,6 +59,10 @@ var row = document.createElement('TR'); var empty_cell = document.createElement('TD'); + if (!rownum) { + empty_cell.innerHTML = 'Detail:' + empty_cell.style.textAlign = 'right'; + } row.appendChild(empty_cell); var detail_cell = document.createElement('TD'); |