[freeside-commits] branch master updated. 879ad5135754ec2968e39cf98f7958f0db50d359

[Ivan]

The branch, master has been updated
       via  879ad5135754ec2968e39cf98f7958f0db50d359 (commit)
       via  bf4e71db6af0d0a86edcec8b447d8b5444d45f6c (commit)
      from  9f97c81b19a3184ea68df32aaea43808b22e10f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 879ad5135754ec2968e39cf98f7958f0db50d359
Merge: bf4e71d 9f97c81
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 23 11:21:19 2012 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit bf4e71db6af0d0a86edcec8b447d8b5444d45f6c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 23 11:21:10 2012 -0700

    warn if adding a setup date too

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 0e18a52..166a3b7 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -175,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
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 9c36c8b..6f5b38f 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -34,7 +34,11 @@ push @errors, '_setup_areyousure'
   if ! $hash{'setup'} && $old->setup         # if the setup date was removed
   && ! $cgi->param('setup_areyousure');      # and it wasn't confirmed 
 
-push @errors, '_start'
+push @errors, '_setupadd_areyousure'
+  if $hash{'setup'} && ! $old->setup         # if the setup date was added
+  && ! $cgi->param('setupadd_areyousure');   # and it wasn't confirmed 
+
+rors, '_start'
   if $hash{'start_date'} && !$old->start_date # if a start date was added
   && $hash{'setup'};                          # but there's a setup date
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/REAL_cust_pkg.cgi         |    9 ++++++++-
 httemplate/edit/process/REAL_cust_pkg.cgi |    6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)