Merge branch 'master' into bug/#182_duplicatedeposit

Author: StuartFerguson

EstateManagement.IntegrationTests/Common/DockerHelper.cs

@@ -278,6 +278,7 @@ protected async Task PopulateSubscriptionServiceConfiguration()
             await client.CreateAsync("$ce-EstateAggregate", "Reporting", settings);
             await client.CreateAsync("$ce-MerchantAggregate", "Reporting", settings);
             await client.CreateAsync("$ce-ContractAggregate", "Reporting", settings);
+            await client.CreateAsync("$ce-MerchantBalanceHistory", "Reporting", settings);
         }
     }
 }

EstateManagement.IntegrationTests/Merchant/Merchant.feature

@@ -128,13 +128,18 @@ Scenario: Make Manual Merchant Deposit - Estate User
 
 	When I make the following manual merchant deposits 
 	| Reference | Amount  | DateTime  | MerchantName    | EstateName    |
-	| Deposit1  | 1000.00 | Today     | Test Merchant 1 | Test Estate 1 |
-	| Deposit2  | 1000.00 | Yesterday | Test Merchant 1 | Test Estate 1 |
+	| Deposit1  | 1000.00 | Yesterday | Test Merchant 1 | Test Estate 1 |
+	| Deposit2  | 1000.00 | Today     | Test Merchant 1 | Test Estate 1 |
 
 	Then the merchant balances are as follows
 	| Balance | AvailableBalance | MerchantName    | EstateName    |
 	| 2000.00 | 2000.00          | Test Merchant 1 | Test Estate 1 |
 
+	Then the following entries appear in the merchants balance history
+	| DateTime  | Reference        | EntryType | In      | Out | ChangeAmount | Balance | MerchantName    | EstateName    |
+	| Yesterday | Opening Balance  | D         | 0       | 0   | 0            | 0       | Test Merchant 1 | Test Estate 1 |
+	| Yesterday | Merchant Deposit | C         | 1000.00 | 0   | 1000.00      | 1000.00 | Test Merchant 1 | Test Estate 1 |
+	| Today     | Merchant Deposit | C         | 1000.00 | 0   | 1000.00      | 2000.00 | Test Merchant 1 | Test Estate 1 |
 
 @PRTest
 Scenario: Get Merchants for Estate - System Login