From 96b69dd1aa5c8045b5a4297ecea510d60f575251 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 9 Nov 2015 17:05:36 -0600
Subject: RT#34960: Quotations [changed billpkgnum to quotationpkgnum]

---
 httemplate/edit/quotation_pkg_detail.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

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');
-- 
cgit v1.2.1


From d719b00e871830c3b8d48d4f713ae455b4c1b5b5 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 9 Nov 2015 19:58:47 -0600
Subject: RT#36806: Add message template substitution to show last four digits
 of credit card number

---
 httemplate/edit/msg_template/email.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'httemplate/edit')

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',
-- 
cgit v1.2.1


From c44432a5f0f1c1841ff8b50e734a30bd9aeef945 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Thu, 12 Nov 2015 16:49:39 -0800
Subject: limit password reuse, core and svc_acct, #29354

---
 httemplate/edit/process/svc_acct.cgi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

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 ) {
-- 
cgit v1.2.1


From 2f4eb8cfbb07170dff09474e84adbf1c87284620 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Fri, 13 Nov 2015 14:28:34 -0800
Subject: point all links to browse/reason_type.html instead of reason.html,
 cleanup from #38532

---
 httemplate/edit/process/reason.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/reason.html b/httemplate/edit/process/reason.html
index cb79ed254..dfc18624e 100644
--- a/httemplate/edit/process/reason.html
+++ b/httemplate/edit/process/reason.html
@@ -1,6 +1,6 @@
 <% include( 'elements/process.html',
                'table'    => 'reason',
-               'redirect' => popurl(3) . 'browse/reason.html?class=' .
+               'redirect' => popurl(3) . 'browse/reason_type.html?class=' .
 	                      $cgi->param('class') . '&',
            )
 %>
-- 
cgit v1.2.1