Committing pre-Easter work on resync

This commit is contained in:
Rick Falkvinge
2014-04-16 09:15:15 +00:00
parent 7946a66bdc
commit 365daaf3b2
8 changed files with 390 additions and 86 deletions
+27
View File
@@ -180,6 +180,19 @@ namespace Swarmops.Logic.Financial
recordList.Add(newRecord);
}
if (Profile.LatestTransactionLocation == LatestTransactionLocation.Top)
{
LatestAccountBalanceCents = recordList[0].AccountBalanceCents;
}
else if (Profile.LatestTransactionLocation == LatestTransactionLocation.Bottom)
{
LatestAccountBalanceCents = recordList [recordList.Count- 1].AccountBalanceCents;
}
else
{
throw new ArgumentException("LatestTransactionLocation is undefined");
}
recordList.Sort(new ExternalBankDataRecord());
this.Records = recordList.ToArray();
@@ -187,5 +200,19 @@ namespace Swarmops.Logic.Financial
public ExternalBankDataProfile Profile { get; set; }
public ExternalBankDataRecord[] Records { get; private set; }
public long LatestAccountBalanceCents;
}
// Helper datakeeping classes for frontend below
public class ExternalBankMismatchingDateTime
{
public DateTime DateTime;
public int MasterTransactionCount;
public long MasterDeltaCents;
public int SwarmopsTransactionCount;
public long SwarmopsDeltaCents;
}
}
@@ -31,6 +31,8 @@ namespace Swarmops.Logic.Financial
result.FieldNames[ExternalBankDataFieldName.AccountBalance] = "Saldo";
result.FieldNames[ExternalBankDataFieldName.NotUniqueId] = "Verifikationsnummer";
result.LatestTransactionLocation = LatestTransactionLocation.Top;
return result;
}
@@ -51,6 +53,8 @@ namespace Swarmops.Logic.Financial
result.FieldNames[ExternalBankDataFieldName.AccountBalance] = "Balance";
result.FieldNames[ExternalBankDataFieldName.UniqueId] = "Transaction ID";
result.LatestTransactionLocation = LatestTransactionLocation.Top;
return result;
}
@@ -64,6 +68,7 @@ namespace Swarmops.Logic.Financial
public Country Country { get; set; }
public string Culture { get; set; }
public string Currency { get; set; }
public LatestTransactionLocation LatestTransactionLocation;
public Dictionary<ExternalBankDataFieldName, string> FieldNames { get; private set; }
}
@@ -84,4 +89,17 @@ namespace Swarmops.Logic.Financial
TimeZone,
Currency
}
public enum LatestTransactionLocation
{
Unknown = 0,
/// <summary>
/// Latest transaction is at the top of the file (the first record, meaning reverse chrono order).
/// </summary>
Top,
/// <summary>
/// Latest transaction is at the bottom of the file (last record, chrono order).
/// </summary>
Bottom
}
}
+1 -4
View File
@@ -44,11 +44,8 @@ namespace Swarmops.Logic.Financial
string commentKey = Description.ToLowerInvariant();
string hashKey = NotUniqueId + commentKey + (TransactionNetCents / 100.0).ToString(CultureInfo.InvariantCulture) + (AccountBalanceCents / 100.0).ToString(CultureInfo.InvariantCulture) +
DateTime.ToString("yyyy-MM-dd-00-00-00");
DateTime.ToString("yyyy-MM-dd-HH-mm-ss");
// the 00-00-00 used to be hh-mm-ss but is replaced this way for backward hash compatibility
// maybe replace cleanly at a certain year to include seconds in hash or so
importKey = SHA1.Hash(hashKey).Replace(" ", "");
}
@@ -0,0 +1 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Json-ResyncPreview.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.Ledgers.ResyncDataPreview" %>
@@ -0,0 +1,247 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Swarmops.Basic.Enums;
using Swarmops.Logic.Financial;
using Swarmops.Logic.Security;
namespace Swarmops.Frontend.Pages.v5.Ledgers
{
public partial class ResyncDataPreview : DataV5Base
{
protected void Page_Load(object sender, EventArgs e)
{
_authenticationData = GetAuthenticationDataAndCulture();
_year = DateTime.Today.Year;
string guid = Request.QueryString["Guid"];
ExternalBankMismatchingDateTime[] mismatchArray =
(ExternalBankMismatchingDateTime[]) Session["LedgersResync" + guid + "MismatchArray"];
if (!_authenticationData.CurrentUser.HasAccess(new Access(_authenticationData.CurrentOrganization, AccessAspect.Bookkeeping, AccessType.Read)))
{
throw new UnauthorizedAccessException();
}
// TODO: Get and cache account tree and account balances
Response.ContentType = "application/json";
string currentOrganizationCurrency = this.CurrentOrganization.Currency.Code;
string response = string.Empty;
List<string> items = new List<string>();
foreach (ExternalBankMismatchingDateTime mismatch in mismatchArray)
{
string childrenString = string.Empty; // Room for next step here
string rowId = mismatch.DateTime.ToString("yyyyMMddHHmmss");
string rowName = mismatch.DateTime.ToString("yyyy-MMM-dd HH:mm:ss");
string swarmopsData = ((double) mismatch.SwarmopsDeltaCents/100.0).ToString("N2") + " " +
currentOrganizationCurrency;
string masterData = ((double)mismatch.MasterDeltaCents / 100.0).ToString("N2") + " " +
currentOrganizationCurrency;
string notes = "Diff: " + ((double)(mismatch.MasterDeltaCents - mismatch.SwarmopsDeltaCents) / 100.0).ToString("N2");
items.Add("{\"id\":\"" + rowId + "\",\"rowName\":\"" + rowName + "\",\"swarmopsData\":\"" + JsonSanitize(swarmopsData) + "\",\"masterData\":\"" + JsonSanitize(masterData) + "\",\"notes\":\"" + JsonSanitize(notes) + "\",\"state\":\"closed\",\"children\":[" + childrenString + "]}");
}
Response.Output.WriteLine("[" + String.Join(",", items.ToArray()) + "]");
Response.End();
}
private int _year = 2012;
private CultureInfo _renderCulture;
private AuthenticationData _authenticationData;
private Dictionary<int, FinancialAccounts> _hashedAccounts;
private string GetAccountGroup (FinancialAccountType type, string localizedGroupName)
{
string childrenString = GetAccountsRecurse(type, 0);
return "{\"id\":\"" + -((int) type) + "\",\"accountName\":\"" + JsonSanitize(localizedGroupName) +
"\",\"state\":\"open\",\"children\":[" + childrenString + "]}";
}
private string GetAccountsRecurse (FinancialAccountType accountType, int rootNodeId)
{
List<string> childStrings = new List<string>();
if (!_hashedAccounts.ContainsKey(rootNodeId))
{
return string.Empty;
}
if (_hashedAccounts [rootNodeId].Count == 1)
{
// No children
return string.Empty;
}
foreach (FinancialAccount account in _hashedAccounts[rootNodeId])
{
if (account.Identity == rootNodeId || account.AccountType != accountType)
{
continue;
}
string ownerString = "&nbsp;";
if (account.AccountType == FinancialAccountType.Income || account.AccountType == FinancialAccountType.Cost)
{
if (account.OwnerPersonId != 0)
{
// TODO: add zoom, write capability
ownerString =
"<span style=\\\"padding-left:20px;background-repeat:no-repeat;background-image:url('" +
account.Owner.GetSecureAvatarLink(16) + "')\\\">" +
JsonSanitize(Server.HtmlEncode(account.Owner.Canonical)) + "</span>";
}
else
{
// TODO: add write capability
ownerString =
"<span style=\\\"padding-left:20px;background-repeat:no-repeat;background-position:center left;background-image:url('/Images/Icons/iconshock-warning-16x12px.png')\\\">" +
JsonSanitize(Server.HtmlEncode(Resources.Global.Global_NoOwner)) + "</span>";
}
}
string grandChildren = GetAccountsRecurse(accountType, account.Identity);
if (!string.IsNullOrEmpty(grandChildren))
{
grandChildren = ",\"state\":\"closed\",\"children\":[" + grandChildren + "]";
}
string editString = String.Format("<img class=\\\"IconEdit\\\" accountId=\\\"{0}{1}\\\" src=\\\"/Images/Icons/iconshock-wrench-16px.png\\\" />", accountType.ToString().Substring(0,1), account.Identity);
childStrings.Add('{' + String.Format("\"id\":\"{0}\",\"accountName\":\"{1}\",\"owner\":\"{2}\",\"balance\":\"{3}\",\"budget\":\"{4}\",\"action\":\"{5}\"",
account.Identity,
Server.HtmlEncode(JsonSanitize(account.Name)),
ownerString,
_hashedAccounts[account.Identity].Count > 1 ? JsonDualString(account.Identity, _treeBalanceLookup[account.Identity], _singleBalanceLookup[account.Identity]) : (_singleBalanceLookup [account.Identity] / 100.0).ToString("N0"),
account.AccountType == FinancialAccountType.Income || account.AccountType == FinancialAccountType.Cost?
_hashedAccounts[account.Identity].Count > 1 ? (JsonDualString(account.Identity, _treeBudgetLookup[account.Identity], _singleBudgetLookup[account.Identity])) :
(_singleBudgetLookup[account.Identity] / 100.0).ToString("N0") :
string.Empty,
editString
) + grandChildren + '}');
}
return String.Join(",", childStrings.ToArray());
}
private class DisplayedAccount
{
public string Name;
public int Identity;
};
private class DisplayedAccounts : List<DisplayedAccount>
{
// typedef
};
private Dictionary<int, List<FinancialAccount>> _treeMap;
private Dictionary<int, Int64> _singleBalanceLookup;
private Dictionary<int, Int64> _treeBalanceLookup;
private Dictionary<int, Int64> _singleBudgetLookup;
private Dictionary<int, Int64> _treeBudgetLookup;
private void PopulateLookups(FinancialAccounts accounts)
{
_singleBalanceLookup = new Dictionary<int, Int64>();
_treeBalanceLookup = new Dictionary<int, Int64>();
_singleBudgetLookup = new Dictionary<int, Int64>();
_treeBudgetLookup = new Dictionary<int, Int64>();
// 1) Actually, the accounts are already sorted. Or are supposed to be, anyway,
// since FinancialAccounts.ForOrganization gets the _tree_ rather than the flat list.
// 2) Add all values to the accounts.
foreach (FinancialAccount account in accounts)
{
// Get current balances
// TODO: There must be a more optimized way to do this, like with a database optimization. This
// is a HORRIBLY expensive operation, as it performs one complex database query PER ACCOUNT.
if (account.AccountType == FinancialAccountType.Cost || account.AccountType == FinancialAccountType.Income)
{
_singleBalanceLookup[account.Identity] = -account.GetDeltaCents(new DateTime(_year, 1, 1),
new DateTime(_year + 1, 1, 1));
_singleBudgetLookup[account.Identity] = account.GetBudgetCents(_year);
}
else if (account.AccountType == FinancialAccountType.Asset || account.AccountType == FinancialAccountType.Debt)
{
_singleBalanceLookup[account.Identity] = account.GetDeltaCents(new DateTime(1900, 1, 1),
new DateTime(_year + 1, 1, 1));
_singleBudgetLookup[account.Identity] = 0; // balance accounts don't have budgets
}
else
{
throw new InvalidOperationException("Account with invalid type encountered - " + account.AccountType.ToString());
}
// copy to treeLookups
_treeBalanceLookup[account.Identity] = _singleBalanceLookup[account.Identity];
_treeBudgetLookup[account.Identity] = _singleBudgetLookup[account.Identity];
}
// 3) Add all children's values to parents
AddChildrenValuesToParents(_treeBalanceLookup, accounts);
AddChildrenValuesToParents(_treeBudgetLookup, accounts);
// Done.
}
private void AddChildrenValuesToParents(Dictionary<int, Int64> lookup, FinancialAccounts accounts)
{
// Iterate backwards and add any value to its parent's value, as they are sorted in tree order.
for (int index = accounts.Count - 1; index >= 0; index--)
{
int parentFinancialAccountId = accounts[index].ParentFinancialAccountId;
int accountId = accounts[index].Identity;
if (parentFinancialAccountId != 0)
{
lookup[parentFinancialAccountId] += lookup[accountId];
}
}
}
private string JsonDualString(int accountId, Int64 treeValue, Int64 singleValue)
{
if (treeValue != 0 && singleValue == 0)
{
return string.Format(_renderCulture,
"<span class=\\\"accountplandata-collapsed-{0}\\\"><strong>&Sigma;</strong> {1:N0}</span><span class=\\\"accountplandata-expanded-{0}\\\" style=\\\"display:none\\\">&nbsp;</span>",
accountId, treeValue / 100.00);
}
return string.Format(_renderCulture,
"<span class=\\\"accountplandata-collapsed-{0}\\\"><strong>&Sigma;</strong> {1:N0}</span><span class=\\\"accountplandata-expanded-{0}\\\" style=\\\"display:none\\\">{2:N0}</span>",
accountId, treeValue / 100.0, singleValue / 100.0);
}
}
}
@@ -15,8 +15,9 @@
$(document).ready(function () {
$('#tableProfitLoss').treegrid(
$('#tableResyncPreview').treegrid(
{
/*
onBeforeExpand: function (foo) {
$('span.profitlossdata-collapsed-' + foo.id).fadeOut('fast', function () {
$('span.profitlossdata-expanded-' + foo.id).fadeIn('slow');
@@ -28,7 +29,7 @@
$('span.profitlossdata-collapsed-' + foo.id).fadeIn('slow');
});
},
onLoadSuccess: function () {
$('div.datagrid').css('opacity', 1);
$('#imageLoadIndicator').hide();
@@ -54,7 +55,7 @@
}
$('span.commonHeader').show();
}
}*/
});
$('#<%=DropAccounts.ClientID %>').change(function () {
@@ -74,8 +75,6 @@
$('#tableProfitLoss').treegid('reload');
});
$('div.datagrid').css('opacity', 0.4);
});
function uploadCompletedCallback() {
@@ -111,7 +110,10 @@
{
width: "100%"
}, { queue: false });
$(".buttonNext").click();
$("#tableResyncPreview").treegrid(
{url: 'Json-ResyncPreview.aspx?Guid=<%= this.UploadFile.GuidString %>'});
$('#DivStepPreview').fadeIn();
$('#DivStepProcessing').slideUp();
} else {
// We're not done yet. Keep the progress bar on-screen and keep re-checking.
@@ -189,30 +191,34 @@
</ul>
</div>
<h2>Step 3/4: Comparison results - Resync?</h2>
<div id="DivStepPreview" style="display:none">
<h2>Step 3/4: Comparison results - Resync?</h2>
<h2>Step 4/4: Resynchronizing with master...</h2>
<table id="tableResyncPreview" title="" class="easyui-treegrid" style="width:680px;height:600px"
url=""
rownumbers="false"
animate="true"
fitColumns="true"
idField="id" treeField="rowName">
<thead>
<tr>
<th field="rowName" width="180">Date / Transaction</th>
<th field="swarmopsData" width="140" align="left">Our Database</th>
<th field="masterData" width="140" align="left">Master File</span></th>
<th field="resyncAction" width="120" align="left">Resync Action</span></th>
<th field="notes" width="100" align="left">Notes</th>
</tr>
</thead>
</table>
</div>
<h2>Resynchronization complete</h2>
<table id="tableProfitLoss" title="" class="easyui-treegrid" style="width:680px;height:600px"
url=""
rownumbers="false"
animate="true"
fitColumns="true"
idField="id" treeField="name">
<thead>
<tr>
<th field="name" width="178"><asp:Literal ID="LiteralHeaderAccountName" runat="server"/></th>
<th field="lastYear" width="80" align="right"><span class="commonHeader" id="headerStartYear" style="display:none"></span><span class="loadingHeader">&mdash;</span></th>
<th field="q1" width="80" align="right"><span class="commonHeader" id="headerQ1" style="display:none"><asp:Literal ID="LiteralHeaderQ1" runat="server" /></span><span class="loadingHeader">&mdash;</span></th>
<th field="q2" width="80" align="right"><span class="commonHeader" id="headerQ2" style="display:none"><asp:Literal ID="LiteralHeaderQ2" runat="server" /></span><span class="loadingHeader">&mdash;</span></th>
<th field="q3" width="80" align="right"><span class="commonHeader" id="headerQ3" style="display:none"><asp:Literal ID="LiteralHeaderQ3" runat="server" /></span><span class="loadingHeader">&mdash;</span></th>
<th field="q4" width="80" align="right"><span class="commonHeader" id="headerQ4" style="display:none"><asp:Literal ID="LiteralHeaderQ4" runat="server" /></span><span class="loadingHeader">&mdash;</span></th>
<th field="ytd" width="80" align="right"><span class="previousYearsHeader" id="previousYtd" style="display:none"></span><span class="currentYearHeader" style="display:none"><asp:Literal ID="LiteralHeaderYtd" runat="server" /></span><span class="loadingHeader">&mdash;</span></th>
</tr>
</thead>
</table>
<div id="DivStepResynchronizing" style="display:none">
<h2>Step 4/4: Resynchronizing with master...</h2>
</div>
<div id="DivStepComplete" style="display:none">
<h2>Resynchronization complete</h2>
</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="PlaceHolderSide" Runat="Server">
@@ -80,7 +80,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
[WebMethod(true)]
[WebMethod(EnableSession = true)]
public static int GetProcessingProgress(string guid)
{
// Get data from static variables
@@ -92,7 +92,21 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
return 0;
}
return (int)_staticDataLookup[key];
lock (_staticDataLookup)
{
int percentReady = (int)_staticDataLookup[key];
if (percentReady >= 100)
{
// copy result from static class-scope variable to session-scope variable
HttpContext.Current.Session["LedgersResync" + guid + "MismatchArray"] =
_staticDataLookup[guid + "MismatchArray"];
_staticDataLookup[guid + "MismatchArray"] = null; // clear the static object, which will otherwise live on
}
return percentReady;
}
}
[WebMethod(true)]
@@ -256,23 +270,26 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
int percentProcessed = (int) (currentRecordIndex*100L/externalData.Records.Length);
if (percentProcessed > 1)
lock (_staticDataLookup)
{
_staticDataLookup[guid + "PercentRead"] = percentProcessed; // for the progress bar to update async
if (percentProcessed > 1)
{
_staticDataLookup[guid + "PercentRead"] = percentProcessed;
// for the progress bar to update async
}
if (percentProcessed > 99)
{
// Placed inside loop to have a contiguous lock block, even though it decreases performance.
// Should normally be placed just outside.
_staticDataLookup[guid + "MismatchArray"] = mismatchList.ToArray();
}
}
}
}
private static Dictionary<string, object> _staticDataLookup;
}
public class ExternalBankMismatchingDateTime
{
public DateTime DateTime;
public int MasterTransactionCount;
public long MasterDeltaCents;
public int SwarmopsTransactionCount;
public long SwarmopsDeltaCents;
}
}
+32 -41
View File
@@ -229,7 +229,7 @@ namespace Swarmops.Site.Pages.Ledgers
// Interpret and then import the data
ImportedBankData bankData = null;
ExternalBankData bankData = new ExternalBankData();
try
{
@@ -240,13 +240,15 @@ namespace Swarmops.Site.Pages.Ledgers
switch(this.HiddenFileType.Value)
{
case "Seb":
bankData = ImportSebText(file.InputStream);
bankData.Profile = ExternalBankDataProfile.FromIdentity(ExternalBankDataProfile.SESebId);
bankData.LoadData(new StreamReader(file.InputStream, Encoding.GetEncoding(1252)), this.CurrentOrganization);
break;
case "PayPal":
bankData = ImportPaypal(file.InputStream);
throw new NotImplementedException("Todo - fix after Easter");
// bankData = ImportPaypal(file.InputStream);
break;
case "Payson":
bankData = ImportPayson(file.InputStream);
throw new NotImplementedException("Won't reimplement");
break;
case "BankgiroSE": // Payment file, not transaction file
ImportedPaymentData paymentData = ImportBankgiroSE(file.InputStream);
@@ -256,7 +258,7 @@ namespace Swarmops.Site.Pages.Ledgers
throw new InvalidOperationException("File type value not set to a valid filter name");
}
this.LabelProcessing.Text = bankData.Rows.Count.ToString();
this.LabelProcessing.Text = bankData.Records.ToString();
ImportResults results = ProcessImportedData(bankData);
if (results.AccountBalanceMatchesBank)
@@ -360,7 +362,7 @@ namespace Swarmops.Site.Pages.Ledgers
}
protected ImportResults ProcessImportedData(ImportedBankData import)
protected ImportResults ProcessImportedData(ExternalBankData import)
{
FinancialAccount assetAccount = FinancialAccount.FromIdentity(Int32.Parse(this.DropAccounts.SelectedValue));
FinancialAccount autoDepositAccount = this.CurrentOrganization.FinancialAccounts.IncomeDonations;
@@ -368,21 +370,21 @@ namespace Swarmops.Site.Pages.Ledgers
ImportResults result = new ImportResults();
int count = 0;
int progressUpdateInterval = import.Rows.Count/40;
int progressUpdateInterval = import.Records.Length/40;
if (progressUpdateInterval > 100)
{
progressUpdateInterval = 100;
}
foreach (ImportedBankRow row in import.Rows)
foreach (ExternalBankDataRecord row in import.Records)
{
// Update progress.
count++;
if (progressUpdateInterval < 2 || count % progressUpdateInterval == 0)
{
int percent = (count*99)/import.Rows.Count;
int percent = (count*99)/import.Records.Length;
UpdateImportProgressBar(percent);
}
@@ -399,41 +401,30 @@ namespace Swarmops.Site.Pages.Ledgers
}
// Each row is at least a stub, probably more.
string importKey = row.ImportHash;
string importKey = row.SuppliedTransactionId;
// If importKey is empty, construct a hash from the data fields.
if (string.IsNullOrEmpty(importKey))
{
string commentKey = row.Comment;
if (row.DateTime.Year >= 2012)
{
commentKey = commentKey.ToLowerInvariant();
}
string hashKey = row.HashBase + commentKey + (row.AmountCentsNet / 100.0).ToString(CultureInfo.InvariantCulture) + (row.CurrentBalanceCents / 100.0).ToString(CultureInfo.InvariantCulture) +
row.DateTime.ToString("yyyy-MM-dd-hh-mm-ss");
importKey = SHA1.Hash(hashKey).Replace(" ", "");
}
if (importKey.Length > 30)
{
importKey = importKey.Substring(0, 30);
}
Int64 amountCents = row.AmountCentsNet;
Int64 amountCents = row.TransactionNetCents;
if (amountCents == 0)
{
amountCents = row.AmountCentsGross;
amountCents = row.TransactionGrossCents;
}
if (this.CurrentOrganization.Identity == 1 && assetAccount.Identity == 1 && this.CurrentOrganization.Name == "Piratpartiet SE")
{
// This is an ugly-as-fuck hack that sorts under the category "just bring our pilots the fuck back to operational
// status right fucking now".
if (row.DateTime < new DateTime(2014,03,22))
{
result.DuplicateTransactions++;
continue;
}
}
FinancialTransaction transaction = FinancialTransaction.ImportWithStub(this.CurrentOrganization.Identity, row.DateTime,
assetAccount.Identity, amountCents,
row.Comment, importKey,
row.Description, importKey,
this.CurrentUser.Identity);
if (transaction != null)
@@ -442,7 +433,7 @@ namespace Swarmops.Site.Pages.Ledgers
result.TransactionsImported++;
FinancialAccounts accounts = FinancialAccounts.FromBankTransactionTag(row.Comment);
FinancialAccounts accounts = FinancialAccounts.FromBankTransactionTag(row.Description);
if (accounts.Count == 1)
{
@@ -461,13 +452,13 @@ namespace Swarmops.Site.Pages.Ledgers
geography.Identity, 0,
transaction.Identity, localAccount.Identity.ToString());
}
else if (row.Comment.ToLowerInvariant().StartsWith(this.CurrentOrganization.IncomingPaymentTag))
else if (row.Description.ToLowerInvariant().StartsWith(this.CurrentOrganization.IncomingPaymentTag))
{
// Check for previously imported payment group
PaymentGroup group = PaymentGroup.FromTag(this.CurrentOrganization,
"SEBGM" + DateTime.Today.Year.ToString() + // TODO: Get tags from org
row.Comment.Substring(this.CurrentOrganization.IncomingPaymentTag.Length).Trim());
row.Description.Substring(this.CurrentOrganization.IncomingPaymentTag.Length).Trim());
if (group != null && group.Open)
{
@@ -490,7 +481,7 @@ namespace Swarmops.Site.Pages.Ledgers
// This is always an autodeposit, if there is a fee (which is never > 0.0)
transaction.AddRow(this.CurrentOrganization.FinancialAccounts.CostsBankFees, -row.FeeCents, this.CurrentUser);
transaction.AddRow(autoDepositAccount, -row.AmountCentsGross, this.CurrentUser);
transaction.AddRow(autoDepositAccount, -row.TransactionGrossCents, this.CurrentUser);
}
else if (amountCents < autoDepositLimit * 100)
{
@@ -519,7 +510,7 @@ namespace Swarmops.Site.Pages.Ledgers
Int64 beyondEofCents = assetAccount.GetDeltaCents(result.LatestTransaction.AddSeconds(1), DateTime.Now.AddDays(2)); // Caution: the "AddSeconds(1)" is not foolproof, there may be other new txs on the same second.
if (databaseAccountBalanceCents - beyondEofCents == import.CurrentBalanceCents)
if (databaseAccountBalanceCents - beyondEofCents == import.LatestAccountBalanceCents)
{
Payouts.AutomatchAgainstUnbalancedTransactions(this.CurrentOrganization);
result.AccountBalanceMatchesBank = true;