Merge pull request #165 from TransactionProcessing/task/#160_domainservicerefactor

Possible fix to nightly build

Author: StuartFerguson

TransactionProcessor.IntegrationTests/Settlement/Settlement.feature

@@ -46,6 +46,7 @@ Background:
 	| EstateName    | OperatorName | ContractDescription | ProductName    | CalculationType | FeeDescription      | Value |
 	| Test Estate 1 | Safaricom    | Safaricom Contract  | Variable Topup | Fixed           | Merchant Commission | 2.50  |
 
+@PRTest
 Scenario: Get Pending Settlement
 	Given I create the following merchants
 	| MerchantName    | AddressLine1   | Town     | Region      | Country        | ContactName    | EmailAddress                 | EstateName    | SettlementSchedule |

TransactionProcessor.IntegrationTests/Shared/SharedSteps.cs

@@ -939,12 +939,12 @@ private DateTime GetSettlementDate(DateTime now,
 
             if (nextSettlementDate == "NextWeek")
             {
-                return now.AddDays(7).Date;
+                return now.AddDays(6).Date;
             }
 
             if (nextSettlementDate == "NextMonth")
             {
-                return now.AddMonths(1).Date;
+                return now.AddMonths(1).Date.AddDays(-1).Date;
             }
 
             return now.Date;