Skip to content

... #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 21, 2022
Merged

... #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4656fca
...
StuartFerguson Jan 21, 2022
20e507d
Merge branch 'master' into specflow/#204_investigatenightlyfailure
StuartFerguson Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TransactionProcessor.IntegrationTests/Shared/SharedSteps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,12 +939,12 @@ private DateTime GetSettlementDate(DateTime now,

if (nextSettlementDate == "NextWeek")
{
return now.AddDays(6).Date;
return now.AddDays(7).Date;
}

if (nextSettlementDate == "NextMonth")
{
return now.AddMonths(1).Date.AddDays(-1).Date;
return now.AddMonths(1).Date.Date;
}

return now.Date;
Expand Down
1 change: 0 additions & 1 deletion TransactionProcessor.IntegrationTests/projections/continuous/MerchantBalanceCalculator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ var depositMadeEventHandler = function (s, e) {
incrementBalanceFromDeposit(s, e.data.amount, e.data.depositDateTime);

// emit an balance changed event here
console.log(e);
s = emitBalanceChangedEvent(e.data.merchantId, e.eventId, s, e.data.amount, e.data.depositDateTime, "Merchant Deposit");
};

Expand Down