From 2babebf7a9a91763f192d9a2c35fc588bef1af71 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 24 Nov 2012 08:03:38 +0000 Subject: [PATCH] Committing for deployment --- Backend/OneOffs.cs | 19 +- Basic/Basic.csproj | 1 + Basic/Enums/ObjectOptionalDataType.cs | 18 +- .../Enums/OrganizationFinancialAccountType.cs | 95 +++++++ .../Database-OrganizationFinancialAccounts.cs | 136 ++++++++++ Database/Database.csproj | 1 + Logic/Financial/FinancialAccount.cs | 35 ++- Logic/Financial/FinancialTransaction.cs | 1 + Logic/Financial/FinancialTransactionRow.cs | 2 + Logic/Financial/FinancialTransactionRows.cs | 2 + .../OrganizationFinancialAccounts.cs | 256 ++++++++++-------- Logic/Financial/Payouts.cs | 2 +- Logic/Structure/Organization.cs | 79 ++++++ Site5/Default.aspx.cs | 5 + Site5/Pages/v5/Init/Default.aspx | 15 +- Site5/Pages/v5/Init/Default.aspx.cs | 2 +- Utility/BotCode/EventProcessor.cs | 16 +- 17 files changed, 553 insertions(+), 132 deletions(-) create mode 100644 Basic/Enums/OrganizationFinancialAccountType.cs create mode 100644 Database/Database-OrganizationFinancialAccounts.cs diff --git a/Backend/OneOffs.cs b/Backend/OneOffs.cs index 8b7767ba..ae1c95ea 100644 --- a/Backend/OneOffs.cs +++ b/Backend/OneOffs.cs @@ -55,6 +55,8 @@ namespace Activizr.Backend } } + /* -- commented out - this is 1) fixed and 2) calls obsolete double-precision financial code. + public static void DebugExpensesAgain() { ExpenseClaims claims = ExpenseClaims.ForOrganization(Organization.PPSE); @@ -111,7 +113,7 @@ namespace Activizr.Backend } - /* + foreach (ExpenseClaim claim in claims) { Console.WriteLine("#{0,-5} {1,-30} {2,8:N2} {3}", claim.Identity, claim.Description, claim.Amount, claim.AmountCents); @@ -132,8 +134,8 @@ namespace Activizr.Backend Console.WriteLine(" - {1,-30} {2,8:N2} {3}", row.Identity, row.AccountName, row.Amount, row.AmountCents); } - }*/ - } + } + } */ public static void SmsMembersOnElectionDay2010() { @@ -360,6 +362,7 @@ namespace Activizr.Backend public static void CloseBooksForYear (int year) { + /* FinancialAccounts accounts = FinancialAccounts.ForOrganization(Organization.PPSE); decimal balanceDelta = 0.0m; decimal resultsDelta = 0.0m; @@ -402,7 +405,7 @@ namespace Activizr.Backend Console.WriteLine("balanceDelta > 0.0: {0}", balanceDelta > 0.0m); Console.WriteLine("balanceDelta == -resultsDelta: {0}", balanceDelta == -resultsDelta); Console.WriteLine("{0} {1}", balanceDelta, resultsDelta); - } + }*/ } @@ -423,6 +426,9 @@ namespace Activizr.Backend public static bool EconomyHasMismatches (DateTime untilDate) { + return false; + + /* FinancialAccounts accounts = FinancialAccounts.ForOrganization(Organization.PPSE); decimal balanceDelta = 0.0m; decimal resultsDelta = 0.0m; @@ -468,11 +474,12 @@ namespace Activizr.Backend Console.WriteLine("balanceDelta == -resultsDelta: {0}", balanceDelta == -resultsDelta); Console.WriteLine("{0} {1}", balanceDelta, resultsDelta); } - + */ } public static void CarryOver2010LocalBudgets() { + /* FinancialAccount rootAccount = FinancialAccount.FromIdentity(29); FinancialAccount tempAccount = FinancialAccount.FromIdentity(98); @@ -502,7 +509,7 @@ namespace Activizr.Backend transaction2011.AddRow(account, (double) -carryOver, null); transaction2011.AddRow(tempAccount, (double) carryOver, null); - } + }*/ } diff --git a/Basic/Basic.csproj b/Basic/Basic.csproj index 2b0c02e8..f40a6512 100644 --- a/Basic/Basic.csproj +++ b/Basic/Basic.csproj @@ -55,6 +55,7 @@ + diff --git a/Basic/Enums/ObjectOptionalDataType.cs b/Basic/Enums/ObjectOptionalDataType.cs index cbbe2057..32d33320 100644 --- a/Basic/Enums/ObjectOptionalDataType.cs +++ b/Basic/Enums/ObjectOptionalDataType.cs @@ -159,6 +159,10 @@ namespace Activizr.Basic.Enums /// OCR sequence on tax payments (to the tax account) for an organization /// OrgTaxOcr, + /// + /// True if the organization declares inbound/outbound Value Added Tax + /// + OrgValueAddedTaxEnabled, OrgFinancialMailName, OrgFinancialMailAddress, /// @@ -172,7 +176,19 @@ namespace Activizr.Basic.Enums /// /// If invoice is to a person id, this is the person id /// - OutboundInvoiceToPersonId + OutboundInvoiceToPersonId, + /// + /// If "1", this financial account may be charged for conferences + /// + FinancialAccountEnabledForConferences, + /// + /// If "1", this financial account may be charged with expenses + /// + FinancialAccountEnabledForExpensing, + /// + /// If "1", this financial account may be charged with invoices + /// + FinancialAccountEnabledForInvoicing } diff --git a/Basic/Enums/OrganizationFinancialAccountType.cs b/Basic/Enums/OrganizationFinancialAccountType.cs new file mode 100644 index 00000000..b0907720 --- /dev/null +++ b/Basic/Enums/OrganizationFinancialAccountType.cs @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Activizr.Basic.Enums +{ + public enum OrganizationFinancialAccountType + { + /// + /// Undefined + /// + Unknown, + /// + /// Main bank transaction account - not a savings account or similar + /// + AssetsBankAccountMain, + /// + /// The account where outbound invoices are kept + /// + AssetsOutboundInvoices, + /// + /// If org has a PayPal account, this is where is goes + /// + AssetsPaypal, + /// + /// Any outstanding cash advances that have been paid out and not cleared against receipts or paid back + /// + AssetsOutstandingCashAdvances, + /// + /// Value Added Tax (inbound) that hasn't been declared yet and put on overall tax balance + /// + AssetsVat, + /// + /// Any expense claims on the organization that have not been paid back + /// + DebtsExpenseClaims, + /// + /// Invoices sent to the organization until paid against bank account + /// + DebtsInboundInvoices, + /// + /// Salaries due for payout until cleared against bank account + /// + DebtsSalary, + /// + /// Taxes due for payout until cleared against bank account + /// + DebtsTax, + /// + /// Own capital - asset balancing yearly result, accumulating year after year + /// + DebtsCapital, + /// + /// Undeclared Value Added Tax (outbound) before putting it on tax balance + /// + DebtsVat, + /// + /// Other debts in general + /// + DebtsOther, + /// + /// Main income account + /// + IncomeGeneral, + /// + /// Income specifically from sales - default outbound invoices to this acct + /// + IncomeSales, + /// + /// Income from donations - default autodonates here + /// + IncomeDonations, + /// + /// Bank fees - default small minus posts on bank statements here + /// + CostsBankFees, + /// + /// IT and such - default SMS charges, etc, here + /// + CostsInfrastructure, + /// + /// If virtual banking is enabled, this is a counterbalance account + /// + CostsLocalDonationTransfers, + /// + /// No description + /// + CostsAllocatedFunds, + /// + /// When closing books, this is the yearly result (balanced against DebtsCapital) + /// + CostsYearlyResult // multi-account type + }; +} diff --git a/Database/Database-OrganizationFinancialAccounts.cs b/Database/Database-OrganizationFinancialAccounts.cs new file mode 100644 index 00000000..bfc69a80 --- /dev/null +++ b/Database/Database-OrganizationFinancialAccounts.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.Common; +using System.Text; +using Activizr.Basic.Enums; +using Activizr.Basic.Interfaces; +using Activizr.Basic.Types; + +namespace Activizr.Database +{ + public partial class PirateDb + { + private const string organizationFinancialAccountsDataFieldSequence = + " OrganizationFinancialAccountTypes.Name AS OrganizationFinancialAccountType,OrganizationFinancialAccounts.OrganizationId,OrganizationFinancialAccounts.FinancialAccountId FROM OrganizationFinancialAccounts " + + "JOIN OrganizationFinancialAccountTypes ON (OrganizationFinancialAccounts.OrganizationFinancialAccountTypeId=OrganizationFinancialAccountTypes.OrganizationFinancialAccountTypeId) "; + + + #region Select statements - reading data + + public int GetOrganizationFinancialAccountId(int organizationId, OrganizationFinancialAccountType organizationFinancialAccountType) + { + using (DbConnection connection = GetMySqlDbConnection()) + { + connection.Open(); + + DbCommand command = + GetDbCommand( + "SELECT" + organizationFinancialAccountsDataFieldSequence + "WHERE OrganizationFinancialAccountTypes.Name='" + organizationFinancialAccountType.ToString() + "' " + + "AND OrganizationFinancialAccounts.Organizationid=" + organizationId.ToString() + ";", connection); + + using (DbDataReader reader = command.ExecuteReader()) + { + if (reader.Read()) + { + // account Id is third in select list, just return it + + return reader.GetInt32(2); + } + + // TODO: Throw instead if requested account not found? + + return 0; + } + } + } + /* + + public int[] GetObjectsByOptionalData(ObjectType objectType, ObjectOptionalDataType dataType, string data) + { + List objectIds = new List(); + + using (DbConnection connection = GetMySqlDbConnection()) + { + connection.Open(); + + DbCommand command = + GetDbCommand( + "SELECT" + objectOptionalDataFieldSequence + "WHERE ObjectTypes.Name='" + objectType.ToString() + "' " + + "AND ObjectOptionalDataTypes.Name='" + dataType.ToString() + "' " + + "AND ObjectOptionalData.Data='" + data.Replace("'", "''") + "';", connection); + + using (DbDataReader reader = command.ExecuteReader()) + { + while (reader.Read()) + { + objectIds.Add(reader.GetInt32(1)); + } + + return objectIds.ToArray(); + } + } + } + + + static private ObjectType GetObjectTypeForObject(IHasIdentity objectToIdentify) + { + //string objectTypeString = objectToIdentify.GetType().ToString(); + + //// Strip namespace + + //int lastPeriodIndex = objectTypeString.LastIndexOf('.'); + //objectTypeString = objectTypeString.Substring(lastPeriodIndex + 1); + + string objectTypeString = objectToIdentify.GetType().Name; + + // At this point, we should be able to cast the string to an ObjectType enum + try + { + return (ObjectType)Enum.Parse(typeof(ObjectType), objectTypeString); + } + catch + { + //That failed. This could be a subclass, try upwards. + Type parentType = objectToIdentify.GetType().BaseType; + while (parentType != typeof(Object)) + { + try + { + return (ObjectType)Enum.Parse(typeof(ObjectType), parentType.Name); + } + catch + { + parentType = parentType.BaseType; + } + } + } + throw new InvalidCastException("GetObjectTypeForObject could not identify object of type " + objectToIdentify.GetType().Name); + }*/ + + #endregion + + + #region Stored procedures for modifying data + + public void SetOrganizationFinancialAccountId(int organizationId, OrganizationFinancialAccountType accountType, int financialAccountId) + { + using (DbConnection connection = GetMySqlDbConnection()) + { + connection.Open(); + + DbCommand command = GetDbCommand("SetOrganizationFinancialAccount", connection); + command.CommandType = CommandType.StoredProcedure; + + AddParameterWithName(command, "organizationId", organizationId); + AddParameterWithName(command, "organizationFinancialAccountTypeName", accountType.ToString()); + AddParameterWithName(command, "financialAccountId", financialAccountId); + + command.ExecuteNonQuery(); + } + } + + + #endregion + } +} diff --git a/Database/Database.csproj b/Database/Database.csproj index fd7786b5..e887a1e1 100644 --- a/Database/Database.csproj +++ b/Database/Database.csproj @@ -89,6 +89,7 @@ + diff --git a/Logic/Financial/FinancialAccount.cs b/Logic/Financial/FinancialAccount.cs index 4a1b940d..6251f5fd 100644 --- a/Logic/Financial/FinancialAccount.cs +++ b/Logic/Financial/FinancialAccount.cs @@ -16,7 +16,7 @@ namespace Activizr.Logic.Financial { } - [Obsolete("This method uses floating point for financials. Deprecated. Do not use.")] + [Obsolete("This method uses floating point for financials. Deprecated. Do not use; use BalanceTotalCents instead.", true)] public double BalanceTotal { get { return PirateDb.GetDatabaseForReading().GetFinancialAccountBalanceTotal(Identity); } @@ -27,17 +27,22 @@ namespace Activizr.Logic.Financial get { return PirateDb.GetDatabaseForReading().GetFinancialAccountBalanceTotalCents(Identity); } } - public static FinancialAccount FromIdentity (int identity) + public static FinancialAccount FromIdentity(int identity) { return FromBasic(PirateDb.GetDatabaseForReading().GetFinancialAccount(identity)); } - public static FinancialAccount FromBasic (BasicFinancialAccount basic) + public static FinancialAccount FromIdentityAggressive(int identity) + { + return FromBasic(PirateDb.GetDatabaseForWriting().GetFinancialAccount(identity)); // Note "for writing". Intentional; this bypasses the replication lag from master to slave. + } + + public static FinancialAccount FromBasic(BasicFinancialAccount basic) { return new FinancialAccount(basic); } - [Obsolete("This method uses floating point for financials. Deprecated. Do not use.")] + [Obsolete("This method uses floating point for financials. Deprecated. Do not use; use GetDeltaCents instead.", true)] public decimal GetDelta(DateTime start, DateTime end) { return PirateDb.GetDatabaseForReading().GetFinancialAccountBalanceDelta(Identity, start, end); @@ -60,7 +65,7 @@ namespace Activizr.Logic.Financial return FinancialAccountRows.FromArray(basicRows); } - [Obsolete("This method uses floating point for financials. Deprecated. Do not use.")] + [Obsolete("This method uses floating point for financials. Deprecated. Do not use; use GetBudgetCents instead.")] public double GetBudget(int year) { return PirateDb.GetDatabaseForReading().GetFinancialAccountBudget(this.Identity, year); @@ -92,10 +97,10 @@ namespace Activizr.Logic.Financial PirateDb.GetDatabaseForWriting().SetFinancialAccountBudgetMonthly(this.Identity, year, month, amountCents); } - public static FinancialAccount Create (int pOrganizationId, string pName, FinancialAccountType pAccountType, int pParentFinancialAccountId) + public static FinancialAccount Create (int organizationId, string name, FinancialAccountType accountType, int parentFinancialAccountId) { - int accountId = PirateDb.GetDatabaseForWriting().CreateFinancialAccount(pOrganizationId, pName, pAccountType, pParentFinancialAccountId); - return FromIdentity(accountId); + int accountId = PirateDb.GetDatabaseForWriting().CreateFinancialAccount(organizationId, name, accountType, parentFinancialAccountId); + return FromIdentityAggressive(accountId); } public Organization Organization @@ -140,6 +145,20 @@ namespace Activizr.Logic.Financial } + public bool IsConferenceParent + { + get + { + return + this.OptionalData.GetOptionalDataBool(ObjectOptionalDataType.FinancialAccountEnabledForConferences); + } + set + { + this.OptionalData.SetOptionalDataBool(ObjectOptionalDataType.FinancialAccountEnabledForConferences, value); + } + } + + #region ITreeNode Members diff --git a/Logic/Financial/FinancialTransaction.cs b/Logic/Financial/FinancialTransaction.cs index 72dd2011..73afe8bf 100644 --- a/Logic/Financial/FinancialTransaction.cs +++ b/Logic/Financial/FinancialTransaction.cs @@ -92,6 +92,7 @@ namespace Activizr.Logic.Financial } } + [Obsolete("Do not use double-precision methods. They leak cents. Use AddRow (FinancialAccount, Int64, Person).", true)] public void AddRow (FinancialAccount account, double amount, Person person) { AddRow (account, (Int64) (amount * 100), person); diff --git a/Logic/Financial/FinancialTransactionRow.cs b/Logic/Financial/FinancialTransactionRow.cs index 064ad34e..8529997d 100644 --- a/Logic/Financial/FinancialTransactionRow.cs +++ b/Logic/Financial/FinancialTransactionRow.cs @@ -1,3 +1,4 @@ +using System; using Activizr.Basic.Types; using Activizr.Database; @@ -54,6 +55,7 @@ namespace Activizr.Logic.Financial get { return Account.Name; } } + [Obsolete ("Do not use. Use Int64 AmountCents.", true)] public decimal Amount { get { return AmountCents/100.0m; } diff --git a/Logic/Financial/FinancialTransactionRows.cs b/Logic/Financial/FinancialTransactionRows.cs index 65e8d7cb..04fb03b1 100644 --- a/Logic/Financial/FinancialTransactionRows.cs +++ b/Logic/Financial/FinancialTransactionRows.cs @@ -7,6 +7,7 @@ namespace Activizr.Logic.Financial { public class FinancialTransactionRows : List { + [Obsolete("Do not use. Use AmountCentsTotal.", true)] public decimal AmountTotal { get @@ -35,6 +36,7 @@ namespace Activizr.Logic.Financial } } + [Obsolete("Do not use. Use Int64 BalanceCentsDelta.", true)] public decimal BalanceDelta { get diff --git a/Logic/Financial/OrganizationFinancialAccounts.cs b/Logic/Financial/OrganizationFinancialAccounts.cs index 7ad71d80..2260f372 100644 --- a/Logic/Financial/OrganizationFinancialAccounts.cs +++ b/Logic/Financial/OrganizationFinancialAccounts.cs @@ -1,6 +1,9 @@ using System; using System.Collections.Generic; using System.Text; +using Activizr.Basic.Enums; +using Activizr.Database; +using Activizr.Logic.Structure; namespace Activizr.Logic.Financial { @@ -9,161 +12,202 @@ namespace Activizr.Logic.Financial /// public class OrganizationFinancialAccounts { - static OrganizationFinancialAccounts() + public static void PrimePiratpartietSE() // One-off. Once this has been run once, delete it. { - organizationAccounts = new Dictionary(); + if (PirateDb.GetDatabaseForReading().GetOrganizationFinancialAccountId(1, OrganizationFinancialAccountType.AssetsBankAccountMain) != 0) + { + return; + } + + if (!Organization.PPSE.Name.StartsWith("Piratpartiet")) + { + return; // not PP installation + } + + OrganizationFinancialAccounts organizationAccounts = new OrganizationFinancialAccounts(1); // HACK HACK HACK - organizationAccounts[OrganizationFinancialAccountType.CostsBankFees] = 26; - organizationAccounts[OrganizationFinancialAccountType.AssetsBankAccountMain] = 1; - organizationAccounts[OrganizationFinancialAccountType.IncomeDonations] = 4; - organizationAccounts[OrganizationFinancialAccountType.CostsInfrastructure] = 21; - organizationAccounts[OrganizationFinancialAccountType.CostsLocalDonationTransfers] = 88; - organizationAccounts[OrganizationFinancialAccountType.CostsAllocatedFunds] = 124; - organizationAccounts[OrganizationFinancialAccountType.DebtsExpenseClaims] = 3; - organizationAccounts[OrganizationFinancialAccountType.DebtsSalary] = 25; - organizationAccounts[OrganizationFinancialAccountType.DebtsTax] = 86; - organizationAccounts[OrganizationFinancialAccountType.DebtsInboundInvoices] = 25; - organizationAccounts[OrganizationFinancialAccountType.DebtsOther] = 25; - organizationAccounts[OrganizationFinancialAccountType.AssetsOutboundInvoices] = 28; - organizationAccounts[OrganizationFinancialAccountType.DebtsCapital] = 96; - organizationAccounts[OrganizationFinancialAccountType.AssetsPaypal] = 2; - organizationAccounts[OrganizationFinancialAccountType.CostsYearlyResult] = 97; + organizationAccounts[OrganizationFinancialAccountType.CostsBankFees] = FinancialAccount.FromIdentity(26); // + organizationAccounts[OrganizationFinancialAccountType.AssetsBankAccountMain] = FinancialAccount.FromIdentity(1); // + organizationAccounts[OrganizationFinancialAccountType.IncomeDonations] = FinancialAccount.FromIdentity(4); // + organizationAccounts[OrganizationFinancialAccountType.IncomeGeneral] = FinancialAccount.FromIdentity(131); // + organizationAccounts[OrganizationFinancialAccountType.IncomeSales] = FinancialAccount.FromIdentity(5); // + organizationAccounts[OrganizationFinancialAccountType.CostsInfrastructure] = FinancialAccount.FromIdentity(21); // + organizationAccounts[OrganizationFinancialAccountType.CostsLocalDonationTransfers] = FinancialAccount.FromIdentity(88); // + organizationAccounts[OrganizationFinancialAccountType.CostsAllocatedFunds] = FinancialAccount.FromIdentity(124); // + organizationAccounts[OrganizationFinancialAccountType.DebtsExpenseClaims] = FinancialAccount.FromIdentity(3); // + organizationAccounts[OrganizationFinancialAccountType.DebtsSalary] = FinancialAccount.FromIdentity(25); // + organizationAccounts[OrganizationFinancialAccountType.DebtsTax] = FinancialAccount.FromIdentity(86); // + organizationAccounts[OrganizationFinancialAccountType.DebtsInboundInvoices] = FinancialAccount.FromIdentity(25); // + organizationAccounts[OrganizationFinancialAccountType.DebtsOther] = FinancialAccount.FromIdentity(25); // + organizationAccounts[OrganizationFinancialAccountType.AssetsOutboundInvoices] = FinancialAccount.FromIdentity(28); // + organizationAccounts[OrganizationFinancialAccountType.DebtsCapital] = FinancialAccount.FromIdentity(96); // + organizationAccounts[OrganizationFinancialAccountType.AssetsPaypal] = FinancialAccount.FromIdentity(2); // + organizationAccounts[OrganizationFinancialAccountType.CostsYearlyResult] = FinancialAccount.FromIdentity(97); // + organizationAccounts[OrganizationFinancialAccountType.AssetsOutstandingCashAdvances] = FinancialAccount.FromIdentity(156); // + organizationAccounts[OrganizationFinancialAccountType.AssetsVat] = FinancialAccount.FromIdentity(86); // + organizationAccounts[OrganizationFinancialAccountType.DebtsVat] = FinancialAccount.FromIdentity(86); // + + FinancialAccount.FromIdentity(80).IsConferenceParent = true; + FinancialAccount.FromIdentity(27).IsConferenceParent = true; + + Organization.PPSE.IsEconomyEnabled = true; // Kill this function in base, too } public OrganizationFinancialAccounts (int organizationId) { - if (organizationId != 1) - { - throw new NotImplementedException(); - - // TODO: Move to database. For now, only org 1 is supported. - } - - this.organizationId = organizationId; + this._organizationId = organizationId; } - private readonly static Dictionary organizationAccounts; + public OrganizationFinancialAccounts (Organization organization) + : this (organization.Identity) + { + + } - private int organizationId; + private readonly int _organizationId; + + + public FinancialAccount this[OrganizationFinancialAccountType accountType] + { + get + { + return FinancialAccount.FromIdentity(PirateDb.GetDatabaseForReading().GetOrganizationFinancialAccountId(_organizationId, accountType)); + } + set + { + PirateDb.GetDatabaseForWriting().SetOrganizationFinancialAccountId(_organizationId, accountType, + value.Identity); + } + } + + + // -- SHORTCUTS TO GET ACCOUNTS, FOR CODE READABILITY -- public FinancialAccount AssetsBankAccountMain { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.AssetsBankAccountMain]); } - } - - public FinancialAccount AssetsPaypal - { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.AssetsPaypal]); } + get { return this[OrganizationFinancialAccountType.AssetsBankAccountMain]; } } public FinancialAccount AssetsOutboundInvoices { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.AssetsOutboundInvoices]); } + get { return this[OrganizationFinancialAccountType.AssetsOutboundInvoices]; } } - public FinancialAccount DebtsExpenseClaims + public FinancialAccount AssetsOutstandingCashAdvances { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.DebtsExpenseClaims]); } + get { return this[OrganizationFinancialAccountType.AssetsOutstandingCashAdvances]; } } - public FinancialAccount DebtsInboundInvoices + public FinancialAccount AssetsPaypal { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.DebtsInboundInvoices]); } + get { return this[OrganizationFinancialAccountType.AssetsPaypal]; } } - public FinancialAccount DebtsSalary + public FinancialAccount AssetsVat { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.DebtsSalary]); } - } - - public FinancialAccount DebtsTax - { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.DebtsTax]); } - } - - public FinancialAccount DebtsCapital - { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.DebtsCapital]); } - } - - public FinancialAccount DebtsOther - { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.DebtsOther]); } - } - - public FinancialAccount IncomeDonations - { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.IncomeDonations]); } - } - - public FinancialAccount CostsAllocatedFunds - { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.CostsAllocatedFunds]); } - } - - public FinancialAccount CostsInfrastructure - { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.CostsInfrastructure]); } + get { return this[OrganizationFinancialAccountType.AssetsVat]; } } public FinancialAccount CostsBankFees { - get { return FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.CostsBankFees]); } + get { return this[OrganizationFinancialAccountType.CostsBankFees]; } + } + + public FinancialAccount CostsAllocatedFunds + { + get { return this[OrganizationFinancialAccountType.CostsAllocatedFunds]; } + } + + public FinancialAccount CostsInfrastructure + { + get { return this[OrganizationFinancialAccountType.CostsInfrastructure]; } } public FinancialAccount CostsLocalDonationTransfers { - get { - return - FinancialAccount.FromIdentity( - organizationAccounts[OrganizationFinancialAccountType.CostsLocalDonationTransfers]); } + get { return this[OrganizationFinancialAccountType.CostsLocalDonationTransfers]; } } public FinancialAccount CostsYearlyResult { - get - { - return - FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.CostsYearlyResult]); - } + get { return this[OrganizationFinancialAccountType.CostsYearlyResult]; } } + public FinancialAccount DebtsCapital + { + get { return this[OrganizationFinancialAccountType.DebtsCapital]; } + } + + public FinancialAccount DebtsExpenseClaims + { + get { return this[OrganizationFinancialAccountType.DebtsExpenseClaims]; } + } + + public FinancialAccount DebtsInboundInvoices + { + get { return this[OrganizationFinancialAccountType.DebtsInboundInvoices]; } + } + + public FinancialAccount DebtsSalary + { + get { return this[OrganizationFinancialAccountType.DebtsSalary]; } + } + + public FinancialAccount DebtsTax + { + get { return this[OrganizationFinancialAccountType.DebtsTax]; } + } + + public FinancialAccount DebtsVat + { + get { return this[OrganizationFinancialAccountType.DebtsVat]; } + } + + public FinancialAccount DebtsOther + { + get { return this[OrganizationFinancialAccountType.DebtsSalary]; } + } + + public FinancialAccount IncomeGeneral + { + get { return this[OrganizationFinancialAccountType.IncomeGeneral]; } + } + + public FinancialAccount IncomeDonations + { + get { return this[OrganizationFinancialAccountType.IncomeDonations]; } + } + + public FinancialAccount IncomeSales + { + get { return this[OrganizationFinancialAccountType.IncomeSales]; } + } + + public FinancialAccounts CostsConferences { get { - if (this.organizationId != 1) + FinancialAccounts result = new FinancialAccounts(); + + // THIS SERIOUSLY NEEDS OPTIMIZATION, MMMKAY? + + FinancialAccounts costAccounts = + FinancialAccounts.ForOrganization(Organization.FromIdentity(this._organizationId), + FinancialAccountType.Cost); + + foreach (FinancialAccount account in costAccounts) { - throw new NotImplementedException(); + if (account.IsConferenceParent) + { + result.Add(account); + } } - return FinancialAccounts.FromIdentities(new int[] {80, 27, 15, 16, 17, 18, 19}); + return result; } } } - - - //TODO: Move to database - public enum OrganizationFinancialAccountType - { - Unknown, - AssetsBankAccountMain, - AssetsOutboundInvoices, - AssetsPaypal, - DebtsExpenseClaims, - DebtsInboundInvoices, - DebtsSalary, - DebtsTax, - DebtsCapital, - DebtsOther, - IncomeDonations, - CostsBankFees, - CostsInfrastructure, - CostsLocalDonationTransfers, - CostsAllocatedFunds, - CostsConferences, - CostsYearlyResult // multi-account type - } } diff --git a/Logic/Financial/Payouts.cs b/Logic/Financial/Payouts.cs index a324ff01..d8024f6e 100644 --- a/Logic/Financial/Payouts.cs +++ b/Logic/Financial/Payouts.cs @@ -264,7 +264,7 @@ namespace Activizr.Logic.Financial foreach (FinancialTransaction possiblyCompetingTransaction in transactions) { - if (possiblyCompetingTransaction.Rows.AmountTotal == transaction.Rows.AmountTotal && + if (possiblyCompetingTransaction.Rows.AmountCentsTotal == transaction.Rows.AmountCentsTotal && possiblyCompetingTransaction.DateTime >= timeLow && possiblyCompetingTransaction.DateTime <= timeHigh && possiblyCompetingTransaction.Identity != transaction.Identity) diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs index 8f34a580..5536456b 100644 --- a/Logic/Structure/Organization.cs +++ b/Logic/Structure/Organization.cs @@ -146,6 +146,85 @@ namespace Activizr.Logic.Structure } } + public bool IsEconomyEnabled + { + get { return OptionalData.GetOptionalDataBool(ObjectOptionalDataType.OrgEconomyEnabled); } + set { OptionalData.SetOptionalDataBool(ObjectOptionalDataType.OrgEconomyEnabled, value);} + } + + public void EnableEconomy() + { + if (IsEconomyEnabled) + { + throw new InvalidOperationException("Economy data already enabled"); + } + + // First, set hardwired accounts + + + // TODO: Set names according to org default culture + + FinancialAccounts[OrganizationFinancialAccountType.AssetsBankAccountMain] = + FinancialAccount.Create(this.Identity, "Bank Account", FinancialAccountType.Asset, 0); + FinancialAccounts[OrganizationFinancialAccountType.AssetsOutboundInvoices] = + FinancialAccount.Create(this.Identity, "Outbound Invoices", FinancialAccountType.Asset, 0); + FinancialAccounts[OrganizationFinancialAccountType.AssetsOutstandingCashAdvances] = + FinancialAccount.Create(this.Identity, "Cash Advances", FinancialAccountType.Asset, 0); + FinancialAccounts[OrganizationFinancialAccountType.AssetsPaypal] = + FinancialAccount.Create(this.Identity, "Paypal Account", FinancialAccountType.Asset, 0); + FinancialAccounts[OrganizationFinancialAccountType.AssetsVat] = + FinancialAccount.Create(this.Identity, "Inbound Value Added Tax", FinancialAccountType.Asset, 0); + FinancialAccounts[OrganizationFinancialAccountType.CostsAllocatedFunds] = + FinancialAccount.Create(this.Identity, "Allocated funds", FinancialAccountType.Cost, 0); + FinancialAccounts[OrganizationFinancialAccountType.CostsBankFees] = + FinancialAccount.Create(this.Identity, "Bank Fees", FinancialAccountType.Cost, 0); + FinancialAccounts[OrganizationFinancialAccountType.CostsInfrastructure] = + FinancialAccount.Create(this.Identity, "ICT and Infrastructure", FinancialAccountType.Cost, 0); + FinancialAccounts[OrganizationFinancialAccountType.CostsLocalDonationTransfers] = + FinancialAccount.Create(this.Identity, "Local donations (virtual balancing)", FinancialAccountType.Cost, 0); + FinancialAccounts[OrganizationFinancialAccountType.CostsYearlyResult] = + FinancialAccount.Create(this.Identity, "Yearly result", FinancialAccountType.Cost, 0); + FinancialAccounts[OrganizationFinancialAccountType.DebtsCapital] = + FinancialAccount.Create(this.Identity, "Own Capital", FinancialAccountType.Debt, 0); + FinancialAccounts[OrganizationFinancialAccountType.DebtsExpenseClaims] = + FinancialAccount.Create(this.Identity, "Expense Claims", FinancialAccountType.Debt, 0); + FinancialAccounts[OrganizationFinancialAccountType.DebtsInboundInvoices] = + FinancialAccount.Create(this.Identity, "Inbound Invoices", FinancialAccountType.Debt, 0); + FinancialAccounts[OrganizationFinancialAccountType.DebtsOther] = + FinancialAccount.Create(this.Identity, "General Debt", FinancialAccountType.Debt, 0); + FinancialAccounts[OrganizationFinancialAccountType.DebtsSalary] = + FinancialAccount.Create(this.Identity, "Salaries Due", FinancialAccountType.Debt, 0); + FinancialAccounts[OrganizationFinancialAccountType.DebtsTax] = + FinancialAccount.Create(this.Identity, "Taxes Due", FinancialAccountType.Debt, 0); + FinancialAccounts[OrganizationFinancialAccountType.DebtsVat] = + FinancialAccount.Create(this.Identity, "Outbound Value Added Tax", FinancialAccountType.Debt, 0); + FinancialAccounts[OrganizationFinancialAccountType.IncomeGeneral] = + FinancialAccount.Create(this.Identity, "Income", FinancialAccountType.Income, 0); + FinancialAccounts[OrganizationFinancialAccountType.IncomeDonations] = + FinancialAccount.Create(this.Identity, "Donations", FinancialAccountType.Income, FinancialAccounts.IncomeGeneral.Identity); + FinancialAccounts[OrganizationFinancialAccountType.IncomeSales] = + FinancialAccount.Create(this.Identity, "Sales", FinancialAccountType.Income, FinancialAccounts.IncomeGeneral.Identity); + + // Then, create various cost accounts that are probably needed, or that could be used as a starting point + + FinancialAccount.Create(this.Identity, "Offices", FinancialAccountType.Cost, 0); + FinancialAccount.Create(this.Identity, "Unforeseen", FinancialAccountType.Cost, 0); + FinancialAccount.Create(this.Identity, "Staff", FinancialAccountType.Cost, 0); + FinancialAccount.Create(this.Identity, "Marketing and Campaigns", FinancialAccountType.Cost, 0); + FinancialAccount.Create(this.Identity, "Research and Development", FinancialAccountType.Cost, 0); + + // Finally, create the first conference parent + + FinancialAccount conferenceBase = FinancialAccount.Create(this.Identity, "Conferences", + FinancialAccountType.Cost, 0); + conferenceBase.IsConferenceParent = true; + + // Finally, flag the org as enabled + + this.OptionalData.SetOptionalDataBool(ObjectOptionalDataType.OrgEconomyEnabled, true); + } + + #endregion #region Public properties diff --git a/Site5/Default.aspx.cs b/Site5/Default.aspx.cs index bcc02a10..a65318a2 100644 --- a/Site5/Default.aspx.cs +++ b/Site5/Default.aspx.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using Activizr.Logic.Financial; public partial class Default : PageV5Base { @@ -27,5 +28,9 @@ public partial class Default : PageV5Base this.LabelDashboardTemporaryContent.Text = Resources.Global.Dashboard_Main_Temporary; this.LabelDashboardInfo.Text = Resources.Global.Dashboard_Info_Temporary; this.LabelGoThere2.Text = Resources.Global.Global_GoThere; + + // THIS IS A ONE-OFF, DELETE: + + OrganizationFinancialAccounts.PrimePiratpartietSE(); } } diff --git a/Site5/Pages/v5/Init/Default.aspx b/Site5/Pages/v5/Init/Default.aspx index 445134f4..f527615e 100644 --- a/Site5/Pages/v5/Init/Default.aspx +++ b/Site5/Pages/v5/Init/Default.aspx @@ -31,6 +31,14 @@ $("a[rel*=leanModal]").leanModal(); }); + + + + +
@@ -40,7 +48,12 @@ $(document).ready(function () { // Initialize Smart Wizard - $('#wizard').smartWizard({ transitionEffect: 'fade', onLeaveStep: leaveAStepCallback, onFinish: onFinishCallback }); + $('#wizard').smartWizard({ + transitionEffect: 'fade', + keyNavigation: false, + onLeaveStep: leaveAStepCallback, + onFinish: onFinishCallback + }); function leaveAStepCallback(obj) { var stepNum = obj.attr('rel'); diff --git a/Site5/Pages/v5/Init/Default.aspx.cs b/Site5/Pages/v5/Init/Default.aspx.cs index 0c6c99a8..cf65ffbc 100644 --- a/Site5/Pages/v5/Init/Default.aspx.cs +++ b/Site5/Pages/v5/Init/Default.aspx.cs @@ -527,7 +527,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page Activizr.Logic.Structure.Organization.Create(0, "Sandbox", "Sandbox", "Sandbox", "activizr.com", "Act", rootGeographyId, true, - true, 0); + true, 0).EnableEconomy(); _initProgress = 100; _initMessage = "Complete."; diff --git a/Utility/BotCode/EventProcessor.cs b/Utility/BotCode/EventProcessor.cs index 425d6e78..cffebe86 100644 --- a/Utility/BotCode/EventProcessor.cs +++ b/Utility/BotCode/EventProcessor.cs @@ -1729,13 +1729,13 @@ namespace Activizr.Utility.BotCode CultureInfo culture = new CultureInfo(organization.DefaultCountry.Culture); DateTime today = DateTime.Today; - decimal amount = transaction.Rows[0].Amount; // just pick any transaction row, it'll have the amount - double budget = -(account.GetBudget(DateTime.Today.Year)); - decimal curBalance = account.GetDelta(new DateTime(today.Year, 1, 1), new DateTime(today.Year, 12, 31)); + Int64 amount = transaction.Rows[0].AmountCents; // just pick any transaction row, it'll have the amount + Int64 budget = -(account.GetBudgetCents(DateTime.Today.Year)); + Int64 curBalance = account.GetDeltaCents(new DateTime(today.Year, 1, 1), new DateTime(today.Year, 12, 31)); - decimal fundsAvailable = (decimal) budget - curBalance; + Int64 fundsAvailable = budget - curBalance; - if (amount < 0.0m) + if (amount < 0) { amount = -amount; // though possibly in the negative so let's make sure it's positive } @@ -1748,7 +1748,7 @@ namespace Activizr.Utility.BotCode body += amount.ToString("N2", culture) + " received on " + transaction.DateTime.ToString("yyyy-MMM-dd") + ".\r\n\r\n"; - body += "Total funds available in the local budget: " + fundsAvailable.ToString("N2", culture) + ".\r\n"; + body += "Total funds available in the local budget: " + (fundsAvailable/100.0).ToString("N2", culture) + ".\r\n"; // Determine who to send to (local leads and vices, plus Rick for debugging) @@ -2064,8 +2064,8 @@ namespace Activizr.Utility.BotCode // Charge budget FinancialTransaction newTransaction = FinancialTransaction.Create(Organization.PPSEid, DateTime.Now, "Activist SMS transmission"); - newTransaction.AddRow(budget, cost, sender); - newTransaction.AddRow(Organization.PPSE.FinancialAccounts.CostsInfrastructure, -cost, sender); + newTransaction.AddRow(budget, (Int64) (cost*100), sender); + newTransaction.AddRow(Organization.PPSE.FinancialAccounts.CostsInfrastructure, (Int64) (-cost * 100), sender); }