projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sha512 crypt() export
[freeside.git]
/
FS
/
FS
/
Upgrade.pm
diff --git
a/FS/FS/Upgrade.pm
b/FS/FS/Upgrade.pm
index
8b7d733
..
86f51f8
100644
(file)
--- a/
FS/FS/Upgrade.pm
+++ b/
FS/FS/Upgrade.pm
@@
-10,6
+10,7
@@
use FS::Conf;
use FS::Record qw(qsearchs qsearch str2time_sql);
use FS::queue;
use FS::upgrade_journal;
use FS::Record qw(qsearchs qsearch str2time_sql);
use FS::queue;
use FS::upgrade_journal;
+use FS::DBI;
use FS::svc_domain;
$FS::svc_domain::whois_hack = 1;
use FS::svc_domain;
$FS::svc_domain::whois_hack = 1;
@@
-311,7
+312,10
@@
sub upgrade {
});
foreach my $object ( @objects ) {
my $payinfo = $object->decrypt($object->payinfo);
});
foreach my $object ( @objects ) {
my $payinfo = $object->decrypt($object->payinfo);
- die "error decrypting payinfo" if $payinfo eq $object->payinfo;
+ if ( $payinfo eq $object->payinfo ) {
+ warn "error decrypting payinfo for $table: $payinfo\n";
+ next;
+ }
$object->payinfo($payinfo);
my $error = $object->replace;
die $error if $error;
$object->payinfo($payinfo);
my $error = $object->replace;
die $error if $error;
@@
-329,10
+333,17
@@
sub upgrade_data {
tie my %hash, 'Tie::IxHash',
tie my %hash, 'Tie::IxHash',
+ #remap log levels
+ 'log' => [],
+
#fix whitespace - before cust_main
'cust_location' => [],
#fix whitespace - before cust_main
'cust_location' => [],
- #cust_main (remove paycvv from history)
+ #remove bad source_paynum before cust_main
+ 'cust_refund' => [],
+
+ #cust_main (tokenizes cards, remove paycvv from history, locations, cust_payby, etc)
+ # (handles payinfo encryption/tokenization across all relevant tables)
'cust_main' => [],
#msgcat
'cust_main' => [],
#msgcat
@@
-348,6
+359,9
@@
sub upgrade_data {
#customer credits
'cust_credit' => [],
#customer credits
'cust_credit' => [],
+ # fix some tax allocation records
+ 'cust_bill_pkg_void' => [],
+
#duplicate history records
'h_cust_svc' => [],
#duplicate history records
'h_cust_svc' => [],
@@
-391,7
+405,7
@@
sub upgrade_data {
'cust_pkg' => [],
#'cust_pkg_reason' => [],
'cust_pkg_discount' => [],
'cust_pkg' => [],
#'cust_pkg_reason' => [],
'cust_pkg_discount' => [],
- 'cust_refund' => [],
+
#
'cust_refund' => [],
'banned_pay' => [],
#default namespace
'banned_pay' => [],
#default namespace
@@
-447,6
+461,10
@@
sub upgrade_data {
#mark certain taxes as system-maintained,
# and fix whitespace
'cust_main_county' => [],
#mark certain taxes as system-maintained,
# and fix whitespace
'cust_main_county' => [],
+
+ #upgrade part_event_condition_option agentnum to a multiple hash value
+ 'part_event_condition_option' =>[],
+
;
\%hash;
;
\%hash;
@@
-530,11
+548,11
@@
sub upgrade_sqlradius {
my $errmsg = 'Error adding FreesideStatus to '.
$part_export->option('datasrc'). ': ';
my $errmsg = 'Error adding FreesideStatus to '.
$part_export->option('datasrc'). ': ';
- my $dbh = DBI->connect(
+ my $dbh =
FS::
DBI->connect(
( map $part_export->option($_), qw ( datasrc username password ) ),
{ PrintError => 0, PrintWarn => 0 }
) or do {
( map $part_export->option($_), qw ( datasrc username password ) ),
{ PrintError => 0, PrintWarn => 0 }
) or do {
- warn $errmsg.$DBI::errstr;
+ warn $errmsg.$
FS::
DBI::errstr;
next;
};
next;
};