projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
multiple payment options (event action migration), RT#23741
[freeside.git]
/
FS
/
FS
/
Upgrade.pm
diff --git
a/FS/FS/Upgrade.pm
b/FS/FS/Upgrade.pm
index
f84e4e5
..
35a1e19
100644
(file)
--- a/
FS/FS/Upgrade.pm
+++ b/
FS/FS/Upgrade.pm
@@
-70,7
+70,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
@@
-175,10
+175,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
+309,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' => [],