projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
banned card hashing rewrite, RT#32290, RT#23741
[freeside.git]
/
FS
/
FS
/
Upgrade.pm
diff --git
a/FS/FS/Upgrade.pm
b/FS/FS/Upgrade.pm
index
f84e4e5
..
6333a83
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::Setup qw( enable_banned_pay_pad );
use FS::svc_domain;
$FS::svc_domain::whois_hack = 1;
use FS::svc_domain;
$FS::svc_domain::whois_hack = 1;
@@
-70,7
+71,7
@@
sub upgrade_config {
upgrade_invoice_from($conf);
foreach my $agent (@agents) {
upgrade_invoice_from($conf);
foreach my $agent (@agents) {
- upgrade_invoice_from($conf,$agent->agentnum);
+ upgrade_invoice_from($conf,$agent->agentnum
,1
);
}
my $DIST_CONF = '/usr/local/etc/freeside/default_conf/';#DIST_CONF in Makefile
}
my $DIST_CONF = '/usr/local/etc/freeside/default_conf/';#DIST_CONF in Makefile
@@
-146,6
+147,8
@@
If you need to continue using the old Form 477 report, turn on the
$conf->delete('tax-cust_exempt-groups-require_individual_nums');
}
$conf->delete('tax-cust_exempt-groups-require_individual_nums');
}
+ enable_banned_pay_pad() unless length($conf->config('banned_pay-pad'));
+
}
sub upgrade_overlimit_groups {
}
sub upgrade_overlimit_groups {
@@
-175,10
+178,10
@@
sub upgrade_overlimit_groups {
}
sub upgrade_invoice_from {
}
sub upgrade_invoice_from {
- my ($conf, $agentnum) = @_;
+ my ($conf, $agentnum
, $agentonly
) = @_;
if (
if (
- (!$conf->
config('invoice_from_name',$agentnum
)) &&
- ($conf->config('invoice_from',$agentnum) =~ /\<(.*)\>/)
+ (!$conf->
exists('invoice_from_name',$agentnum,$agentonly
)) &&
+ ($conf->config('invoice_from',$agentnum
,$agentonly
) =~ /\<(.*)\>/)
) {
my $realemail = $1;
$realemail =~ s/^\s*//; # remove leading spaces
) {
my $realemail = $1;
$realemail =~ s/^\s*//; # remove leading spaces
@@
-309,9
+312,18
@@
sub upgrade_data {
tie my %hash, 'Tie::IxHash',
tie my %hash, 'Tie::IxHash',
- #cust_main (remove paycvv from history)
+ #payby conditions to new ones
+ 'part_event_condition' => [],
+
+ #payby actions to new ones
+ 'part_event' => [],
+
+ #cust_main (remove paycvv from history, locations, cust_payby, etc)
'cust_main' => [],
'cust_main' => [],
+ #contact -> cust_contact / prospect_contact
+ 'contact' => [],
+
#msgcat
'msgcat' => [],
#msgcat
'msgcat' => [],