From f5158f30ad19d8bc2dbd637610ff0460b9a514e7 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremyd@freeside.biz>
Date: Fri, 9 Aug 2013 10:37:01 -0400
Subject: #24429 Fixed suspending reasons when suspending customers

---
 httemplate/misc/suspend_cust.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/suspend_cust.html b/httemplate/misc/suspend_cust.html
index b41f36f8c..e0d17f30b 100644
--- a/httemplate/misc/suspend_cust.html
+++ b/httemplate/misc/suspend_cust.html
@@ -40,7 +40,7 @@ toggle(false);
 STYLE="margin-left:auto; margin-right:auto">
 <& /elements/tr-select-reason.html,
              'field'          => 'reasonnum',
-             'reason_class'   => 'C',
+             'reason_class'   => 'S',
              'cgi'            => $cgi,
              'control_button' => "document.getElementById('confirm_suspend_cust_button')",
 &>
-- 
cgit v1.2.1


From 98ea745e4b55a38ad8b5ba3749c56327d641d65d Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Fri, 9 Aug 2013 13:36:43 -0700
Subject: preserve quantity when changing package type/location, #24259

---
 httemplate/misc/change_pkg.cgi |  6 +++++-
 httemplate/misc/order_pkg.html | 11 +----------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index 7425fbfaf..923be71b1 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -22,6 +22,10 @@
                'cust_main'  => $cust_main,
   &>
 
+  <& /elements/tr-input-pkg-quantity.html,
+               'curr_value' => $cust_pkg->quantity
+  &>
+
   <& /elements/tr-select-cust_location.html,
                'cgi'       => $cgi,
                'cust_main' => $cust_main,
@@ -94,7 +98,7 @@ my $title = "Change Package";
 if ( $cust_pkg->change_to_pkgnum ) {
   my $change_to = FS::cust_pkg->by_key($cust_pkg->change_to_pkgnum);
   $cgi->param('delay', 1);
-  foreach(qw( start_date pkgpart locationnum )) {
+  foreach(qw( start_date pkgpart locationnum quantity )) {
     $cgi->param($_, $change_to->get($_));
   }
   $title = "Edit Scheduled Package Change";
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index a257e53e3..66c405ac1 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -37,16 +37,7 @@
     &>
 % }
 
-% if ( $conf->exists('invoice-unitprice') ) {
-    <TR>
-      <TH ALIGN="right"><% mt('Quantity') |h %> </TD>
-      <TD>
-        <INPUT TYPE="text" NAME="quantity" SIZE=4 VALUE="<% $quantity %>">
-      </TD>
-    </TR>
-% } else {
-    <INPUT TYPE="hidden" NAME="quantity" VALUE="1">
-% }
+<& /elements/tr-input-pkg-quantity.html, curr_value => $quantity &>
 
 <TR>
   <TH ALIGN="right"><% mt('Start date') |h %> </TD>
-- 
cgit v1.2.1