From 55017a988ebdd9456d66b23f973b560733abfb55 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 3 Mar 2017 10:18:01 -0800
Subject: successful spelling, RT#74993

---
 httemplate/misc/process/payment.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index 6226ebd2f..717d57c85 100644
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -256,7 +256,7 @@ if ( $cgi->param('batch') ) {
 
     #and generate an invoice for it now too
     $error = $cust_main->bill( 'pkg_list' => [ $cust_pkg ] );
-    errorpage("payment processed and fee ordered sucessfully, but error billing fee: $error")
+    errorpage("payment processed and fee ordered successfully, but error billing fee: $error")
       if $error;
 
   }
-- 
cgit v1.2.1


From c56b3fce5486b08d986743d1c2a9cc2e6aafa5bc Mon Sep 17 00:00:00 2001
From: Justin DeVuyst <justin@devuyst.com>
Date: Fri, 3 Mar 2017 19:24:14 -0500
Subject: Add warning of svc unprovisioning on pkg cancel.  See RT#29087.

---
 httemplate/misc/cancel_pkg.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html
index d3ca9964f..7af106d85 100755
--- a/httemplate/misc/cancel_pkg.html
+++ b/httemplate/misc/cancel_pkg.html
@@ -8,6 +8,8 @@
 
 <BR>
 <% emt(ucfirst($method)." [_1]", $part_pkg->pkg_comment(cust_pkg=>$cust_pkg) ) %>
+<BR>
+<font color="red"><% $unprovision_warning |h %></font>
 <table style="background-color: #cccccc; border-spacing: 2; width: 100%">
 
 % my $date_init = 0;
@@ -191,6 +193,23 @@ my $cust_pkg = qsearchs('cust_pkg', {'pkgnum' => $pkgnum})
 
 my $part_pkg = $cust_pkg->part_pkg;
 
+my $unprovision_warning = '';
+{
+    my @services_w_export;
+    for ( $cust_pkg->cust_svc ) {
+        push( @services_w_export, ($_->label)[0] . ': ' . ($_->label)[1], )
+          if $_->part_svc->export_svc;
+    }
+    if ( @services_w_export ) {
+        $unprovision_warning = 'NOTE: This package has ' . @services_w_export
+          . ' ' . PL( "service", @services_w_export )
+          . ' that will be unprovisioned';
+        $unprovision_warning .= ' (' . join( ', ', @services_w_export, ) . ')'
+          if @services_w_export < 10;
+        $unprovision_warning .= '.';
+    }
+}
+
 $date ||= $cust_pkg->get($method);
 $date ||= time;
 
-- 
cgit v1.2.1