Merge branch 'patch-7' of https://github.com/gjones2/Freeside (#13854 as this bug...

[freeside.git] / httemplate / edit / REAL_cust_pkg.cgi

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index fca58f5..166a3b7 100755 (executable)
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -46,6 +46,7 @@
     <TD BGCOLOR="#ffffff"><% $cust_pkg->otaker %></TD>
   </TR>
 
+  <& .row_display, cust_pkg=>$cust_pkg, column=>'order_date',     label=>'Order' &>
 % if ( $cust_pkg->setup && ! $cust_pkg->start_date ) {
   <& .row_display, cust_pkg=>$cust_pkg, column=>'start_date',   label=>'Start' &>
 % } else {
@@ -55,11 +56,12 @@
   <& .row_edit, cust_pkg=>$cust_pkg, column=>'setup',     label=>'Setup' &>
   <& .row_edit, cust_pkg=>$cust_pkg, column=>'last_bill', label=>$last_bill_or_renewed &>
   <& .row_edit, cust_pkg=>$cust_pkg, column=>'bill',      label=>$next_bill_or_prepaid_until &>
-% if ( $cust_pkg->contract_end or $part_pkg->option('contract_end_months',1) ) {
+%#if ( $cust_pkg->contract_end or $part_pkg->option('contract_end_months',1) ) {
     <& .row_edit, cust_pkg=>$cust_pkg, column=>'contract_end',label=>'Contract end' &>
-% }
+%#}
   <& .row_display, cust_pkg=>$cust_pkg, column=>'adjourn',  label=>'Adjournment', note=>'(will <b>suspend</b> this package when the date is reached)' &>
   <& .row_display, cust_pkg=>$cust_pkg, column=>'susp',     label=>'Suspension' &>
+  <& .row_display, cust_pkg=>$cust_pkg, column=>'resume',   label=>'Resumption', note=> '(will <b>unsuspend</b> this package when the date is reached' &>
 
   <& .row_display, cust_pkg=>$cust_pkg, column=>'expire',   label=>'Expiration', note=>'(will <b>cancel</b> this package when the date is reached)' &>
   <& .row_display, cust_pkg=>$cust_pkg, column=>'cancel',   label=>'Cancellation' &>
@@ -128,7 +130,7 @@
 </TABLE>
 
 <BR>
-<INPUT TYPE="submit" VALUE="Apply Changes">
+<INPUT TYPE="submit" VALUE="<% mt('Apply changes') |h %>">
 </FORM>
 
 <% include('/elements/footer.html') %>
@@ -173,10 +175,17 @@ if ( $cgi->param('error') ) {
     if ( $errors{'_setup_areyousure'} ) {
       push @errors,
         "You are attempting to remove the setup date.  This will re-charge the
-         customer for the setup fee. Are you sure you want to do this? ".
+         customer for the setup fee.  Are you sure you want to do this? ".
         '<INPUT TYPE="checkbox" NAME="setup_areyousure" VALUE="1">';
     }
 
+    if ( $errors{'_setupadd_areyousure'} ) {
+      push @errors,
+        "You are attempting to add a setup date.  This will prevent charging the
+         customer for the setup fee.  Are you sure you want to do this? ".
+        '<INPUT TYPE="checkbox" NAME="setupadd_areyousure" VALUE="1">';
+    }
+
     if ( $errors{'_start'} ) {
       push @errors,
         "You are attempting to add a start date to a package that has already
@@ -191,7 +200,7 @@ if ( $cgi->param('error') ) {
   $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   die "No package!" unless $cust_pkg;
 
-  foreach my $col (qw( start_date setup last_bill bill adjourn expire )) {
+  foreach my $col (qw( start_date setup last_bill bill )) {
     my $value = $cgi->param($col);
     $cust_pkg->set( $col, $value ? parse_datetime($value) : '' );
   }