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;
my $conf = new FS::Conf;
- if ($conf->config('invoice_from') =~ /\<(.*)\>/) {
- my $realemail = $1;
- $realemail =~ s/^\s*//; # remove leading spaces
- $realemail =~ s/\s*$//; # remove trailing spaces
- my $realname = $conf->config('invoice_from');
- $realname =~ s/\<.*\>//; # remove email address
- $realname =~ s/^\s*//; # remove leading spaces
- $realname =~ s/\s*$//; # remove trailing spaces
- # properly quote names that contain punctuation
- if (($realname =~ /[^[:alnum:][:space:]]/) && ($realname !~ /^\".*\"$/)) {
- $realname = '"' . $realname . '"';
- }
- $conf->set('invoice_from_name', $realname);
- $conf->set('invoice_from', $realemail);
- }
+ # to simplify tokenization upgrades
+ die "Conf selfservice-payment_gateway no longer supported"
+ if $conf->config('selfservice-payment_gateway');
$conf->touch('payment_receipt')
if $conf->exists('payment_receipt_email')
}
}
+ my @agents = qsearch('agent', {});
+
upgrade_overlimit_groups($conf);
- map { upgrade_overlimit_groups($conf,$_->agentnum) } qsearch('agent', {});
+ map { upgrade_overlimit_groups($conf,$_->agentnum) } @agents;
+
+ upgrade_invoice_from($conf);
+ foreach my $agent (@agents) {
+ upgrade_invoice_from($conf,$agent->agentnum,1);
+ }
my $DIST_CONF = '/usr/local/etc/freeside/default_conf/';#DIST_CONF in Makefile
$conf->set($_, scalar(read_file( "$DIST_CONF/$_" )) )
$conf->set($newname, 'location');
}
- # boolean enable_taxproducts is now enable_taxproducts = 'cch'
- if ( $conf->exists('enable_taxproducts') and
- $conf->config('enable_taxproducts') eq '' ) {
+ # boolean enable_taxproducts is now tax_data_vendor = 'cch'
+ if ( $conf->exists('enable_taxproducts') ) {
- $conf->set('enable_taxproducts', 'cch');
+ $conf->delete('enable_taxproducts');
+ $conf->set('tax_data_vendor', 'cch');
}
$conf->delete('tax-cust_exempt-groups-require_individual_nums');
}
+ # boolean+text previous_balance-exclude_from_total is now two separate options
+ my $total_new_charges = $conf->config('previous_balance-exclude_from_total');
+ if (length($total_new_charges) > 0) {
+ $conf->set('previous_balance-text-total_new_charges', $total_new_charges);
+ $conf->set('previous_balance-exclude_from_total', '');
+ }
+
+ # switch from specifying an email address to boolean check
+ if ( $conf->exists('batch-errors_to') ) {
+ $conf->touch('batch-errors_not_fatal');
+ $conf->delete('batch-errors_to');
+ }
+
+ if ( $conf->exists('voip-cust_email_csv_cdr') ) {
+ $conf->set('voip_cdr_email_attach', 'csv');
+ $conf->delete('voip-cust_email_csv_cdr') ;
+ }
+
+ if ($conf->exists('unsuspendauto') && !$conf->config('unsuspend_balance')) {
+ $conf->set('unsuspend_balance','Zero');
+ $conf->delete('unsuspendauto');
+ }
+
+ if ($conf->config('cust-fields') =~ / \| Payment Type/) {
+ my $cust_fields = $conf->config('cust-fields');
+ # so we can potentially use 'Payment Types' or somesuch in the future
+ $cust_fields =~ s/ \| Payment Type( \|)/$1/;
+ $cust_fields =~ s/ \| Payment Type$//;
+ $conf->set('cust-fields',$cust_fields);
+ }
+
+ enable_banned_pay_pad() unless length($conf->config('banned_pay-pad'));
+
+ # if translate-auto-insert is enabled for a locale, ensure that invoice
+ # terms are in the msgcat (is there a better place for this?)
+ if (my $auto_locale = $conf->config('translate-auto-insert')) {
+ my $lh = FS::L10N->get_handle($auto_locale);
+ foreach (@FS::Conf::invoice_terms) {
+ $lh->maketext($_) if length($_);
+ }
+ }
}
sub upgrade_overlimit_groups {
}
}
+sub upgrade_invoice_from {
+ my ($conf, $agentnum, $agentonly) = @_;
+ if (
+ ! $conf->exists('invoice_from_name',$agentnum,$agentonly)
+ && $conf->exists('invoice_from',$agentnum,$agentonly)
+ && $conf->config('invoice_from',$agentnum,$agentonly) =~ /\<(.*)\>/
+ ) {
+ my $realemail = $1;
+ $realemail =~ s/^\s*//; # remove leading spaces
+ $realemail =~ s/\s*$//; # remove trailing spaces
+ my $realname = $conf->config('invoice_from',$agentnum);
+ $realname =~ s/\<.*\>//; # remove email address
+ $realname =~ s/^\s*//; # remove leading spaces
+ $realname =~ s/\s*$//; # remove trailing spaces
+ # properly quote names that contain punctuation
+ if (($realname =~ /[^[:alnum:][:space:]]/) && ($realname !~ /^\".*\"$/)) {
+ $realname = '"' . $realname . '"';
+ }
+ $conf->set('invoice_from_name', $realname, $agentnum);
+ $conf->set('invoice_from', $realemail, $agentnum);
+ }
+}
+
=item upgrade
=cut
# decrypt inadvertantly-encrypted payinfo where payby != CARD,DCRD,CHEK,DCHK
# kind of a weird spot for this, but it's better than duplicating
# all this code in each class...
- my @decrypt_tables = qw( cust_main cust_pay_void cust_pay cust_refund cust_pay_pending );
+ my @decrypt_tables = qw( cust_payby cust_pay_void cust_pay cust_refund cust_pay_pending );
foreach my $table ( @decrypt_tables ) {
my @objects = qsearch({
'table' => $table,
tie my %hash, 'Tie::IxHash',
- #cust_main (remove paycvv from history)
+ #remap log levels
+ 'log' => [],
+
+ #fix whitespace - before cust_main
+ 'cust_location' => [],
+
+ # need before cust_main tokenization upgrade,
+ # blocks tokenization upgrade if deprecated features still in use
+ 'agent_payment_gateway' => [],
+
+ #cust_main (tokenizes cards, remove paycvv from history, locations, cust_payby, etc)
+ # (handles payinfo encryption/tokenization across all relevant tables)
'cust_main' => [],
+ #contact -> cust_contact / prospect_contact
+ 'contact' => [],
+
#msgcat
'msgcat' => [],
#customer credits
'cust_credit' => [],
+ # reason / void_reason migration to reasonnum / void_reasonnum
+ 'cust_credit_void' => [],
+ 'cust_bill_void' => [],
+ # also fix some tax allocation records
+ 'cust_bill_pkg_void' => [],
+
#duplicate history records
'h_cust_svc' => [],
'cust_refund' => [],
'banned_pay' => [],
+ #paycardtype
+ 'cust_payby' => [],
+
#default namespace
'payment_gateway' => [],
#populate state FIPS codes if not already done
'state' => [],
+ #set default locations on quoted packages
+ 'quotation_pkg' => [],
+
#populate tax statuses
'tax_status' => [],
+
+ #mark certain taxes as system-maintained,
+ # and fix whitespace
+ 'cust_main_county' => [],
+
+ #'compliance solutions' -> 'compliance_solutions'
+ 'tax_rate' => [],
+ 'tax_rate_location' => [],
+
+ #upgrade part_event_condition_option agentnum to a multiple hash value
+ 'part_event_condition_option' =>[],
+
+ #fix ip format
+ 'svc_circuit' => [],
+
+ #fix ip format
+ 'svc_hardware' => [],
+
+ #fix ip format
+ 'svc_pbx' => [],
+
+ #fix ip format
+ 'tower_sector' => [],
+
+
;
\%hash;
sub upgrade_schema_data {
my %opt = @_;
+ #auto-find tables/classes with an _update_schema method?
+
tie my %hash, 'Tie::IxHash',
#fix classnum character(1)
'cust_bill_pkg_detail' => [],
#add necessary columns to RT schema
'TicketSystem' => [],
-
+ #remove h_access_user_log if it exists (since our regular auto schema
+ # upgrade doesn't have the drop tables flag turned on)
+ 'access_user_log' => [],
+ #remove possible dangling records
+ 'password_history' => [],
+ 'cust_pay_pending' => [],
+ #remove records referencing removed things with their FKs
+ 'pkg_referral' => [],
+ 'cust_bill_pkg_discount' => [],
+ 'cust_msg' => [],
+ 'cust_bill_pay_batch' => [],
+ 'cust_event_fee' => [],
+ 'radius_attr' => [],
+ 'queue_depend' => [],
+ 'cust_main_invoice' => [],
+ #update records referencing removed things with their FKs
+ 'cust_pkg' => [],
;
\%hash;
=cut
1;
-
projects / freeside.git / blobdiff