Fixed ExpireSubcriptionCode workflow activity to use the new system.
Added code to remove the ProcessRecurringPayments workflow activity from the config file.
This commit is contained in:
parent
7bdf22e412
commit
156252af6e
2 changed files with 25 additions and 2 deletions
|
|
@ -66,6 +66,7 @@ addDBLinkAccessToSQLMacro($session);
|
|||
addAssetManager( $session );
|
||||
removeSqlForm($session);
|
||||
migratePaymentPlugins( $session );
|
||||
removeRecurringPaymentActivity( $session );
|
||||
|
||||
finish($session); # this line required
|
||||
|
||||
|
|
@ -1440,6 +1441,21 @@ sub migratePaymentPlugins {
|
|||
print "Done\n" unless $quiet;
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
sub removeRecurringPaymentActivity {
|
||||
my $session = shift;
|
||||
print "\tRemoving the recurring payment workflow activity...";
|
||||
|
||||
my $activities = $session->config->get( 'workflowActivities' );
|
||||
|
||||
my $none = $activities->{ None };
|
||||
$activities->{ None } = [ grep { !/^WebGUI::Workflow::Activity::ProcessRecurringPayments$/ } @{ $none } ];
|
||||
|
||||
$session->config->set( 'workflowActivities', $activities );
|
||||
|
||||
print "Done.\n";
|
||||
}
|
||||
|
||||
# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ sub definition {
|
|||
my $class = shift;
|
||||
my $session = shift;
|
||||
my $definition = shift;
|
||||
my $i18n = WebGUI::International->new($session, "Subscription");
|
||||
my $i18n = WebGUI::International->new($session, "Asset_Subscription");
|
||||
push(@{$definition}, {
|
||||
name=>$i18n->get("expire subscription codes"),
|
||||
properties=> { }
|
||||
|
|
@ -71,7 +71,14 @@ See WebGUI::Workflow::Activity::execute() for details.
|
|||
|
||||
sub execute {
|
||||
my $self = shift;
|
||||
$self->session->db->write("update subscriptionCode set status='Expired' where status = 'Unused' and dateCreated + expires < ?", [time()]);
|
||||
$self->session->db->write(
|
||||
"update Subscription_code set status='Expired' where status = 'Unused' and batchId in"
|
||||
." ( select batchId from Subscription_codeBatch where expirationDate < ? )",
|
||||
[
|
||||
time()
|
||||
]
|
||||
);
|
||||
|
||||
return $self->COMPLETE;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue