diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index cac4df42b..2c1247297 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -1,5 +1,7 @@ 6.6.2 - fix [ 1210493 ] mistypo in query in thread.pm in table name + - Fixed a bug in the ITransact plugin that did not handle months with 31 days. + - fix [ 1200782 ] user.isModerator don't work - fix [ 1209539 ] RSS online help URL points to casino site diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 7763bf00d..84644e9fd 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -190,7 +190,7 @@ sub canEdit { #------------------------------------------------------------------- sub canModerate { my $self = shift; - return WebGUI::Grouping::isInGroup($self->get("moderateGroupId")) || $self->canEdit; + return WebGUI::Grouping::isInGroup($self->get("moderateGroupId")); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Commerce/Payment/ITransact.pm b/lib/WebGUI/Commerce/Payment/ITransact.pm index 78ba0244e..793a83738 100644 --- a/lib/WebGUI/Commerce/Payment/ITransact.pm +++ b/lib/WebGUI/Commerce/Payment/ITransact.pm @@ -603,6 +603,7 @@ sub recurringTransaction { if ($recurring) { # initial amount = (daysInMonth - dayInMonth) / daysInMonth * amount $initialAmount = (WebGUI::DateTime::getDaysInMonth(time) - (WebGUI::DateTime::localtime)[2])*$recurring->{amount}/WebGUI::DateTime::getDaysInMonth(time); + $initialAmount = $recurring->{amount} if ($initialAmount < 1); $self->{_recurring} = 1; $self->{_transactionParams} = { START => $recurring->{start} || WebGUI::DateTime::epochToHuman(WebGUI::DateTime::addToDate(time, 0, 0, 1), '%m%d%y'),