[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 2c84e08f294838e3bcac3a28b057b88006fa2de5

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  2c84e08f294838e3bcac3a28b057b88006fa2de5 (commit)
      from  7f9bbe7c83afc8e96ea160610f3a42d522c5da1b (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 2c84e08f294838e3bcac3a28b057b88006fa2de5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 2 00:39:40 2012 -0700

    journal parts of cust_pkg_reason upgrade, RT#17629

diff --git a/FS/FS/cust_pkg_reason.pm b/FS/FS/cust_pkg_reason.pm
index 7c68e62..2aa6a35 100644
--- a/FS/FS/cust_pkg_reason.pm
+++ b/FS/FS/cust_pkg_reason.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( $ignore_empty_action );
 use base qw( FS::otaker_Mixin FS::Record );
 use FS::Record qw( qsearch qsearchs );
+use FS::upgrade_journal;
 
 $ignore_empty_action = 0;
 
@@ -209,6 +210,25 @@ sub _upgrade_data { # class method
   }
 
   #remove nullability if scalar(@migrated) - $count == 0 && ->column('action');
+
+  unless ( FS::upgrade_journal->is_done('cust_pkg_reason__missing_reason') ) {
+    $class->_upgrade_missing_reason(%opts);
+    FS::upgrade_journal->set_done('cust_pkg_reason__missing_reason');
+  }
+
+  #still can't fill in an action?  don't abort the upgrade
+  local($ignore_empty_action) = 1;
+
+  $class->_upgrade_otaker(%opts);
+
+}
+
+sub _upgrade_missing_reason {
+  my ($class, %opts) = @_;
+
+  #false laziness w/above
+  my $action_replace =
+    " AND ( history_action = 'replace_old' OR history_action = 'replace_new' )";
   
   #seek expirations/adjourns without reason
   foreach my $field (qw( expire adjourn cancel susp )) {
@@ -309,10 +329,6 @@ sub _upgrade_data { # class method
     }
   }
 
-  #still can't fill in an action?  don't abort the upgrade
-  local($ignore_empty_action) = 1;
-
-  $class->_upgrade_otaker(%opts);
 }
 
 =back

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

Summary of changes:
 FS/FS/cust_pkg_reason.pm |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)