diff --git a/Logic/Financial/Salaries.cs b/Logic/Financial/Salaries.cs index 5d9cfd01..87c9bc8d 100644 --- a/Logic/Financial/Salaries.cs +++ b/Logic/Financial/Salaries.cs @@ -128,7 +128,7 @@ namespace Swarmops.Logic.Financial // TODO: replace "bitcoin" with actual payout method - this is just for show at the moment - lineItem += String.Format (" {0,8:N2} {1,9:N2} {2,8:N2} bitcoin", + lineItem += String.Format (" {0,10:N2} {1,11:N2} {2,10:N2} bitcoin", monthSalary.GrossSalaryCents/100.0, -monthSalary.SubtractiveTaxCents/100.0, monthSalary.NetSalaryCents/100.0); @@ -147,9 +147,9 @@ namespace Swarmops.Logic.Financial notificationStrings[NotificationString.CurrencyCode] = organization.Currency.DisplayCode; notificationStrings[NotificationString.EmbeddedPreformattedText] = preFormattedStatement; customStrings["LastYear"] = year.ToString(CultureInfo.InvariantCulture); - customStrings["GrossSalaryTotal"] = String.Format("{0:N2,8}", grossTotal / 100.0); - customStrings["TaxDeductedTotal"] = String.Format("{0:N2,9}", -subTaxTotal / 100.0); - customStrings["NetSalaryTotal"] = String.Format("{0:N2,8}", netTotal / 100.0); + customStrings["GrossSalaryTotal"] = String.Format("{0:10,N2}", grossTotal / 100.0); + customStrings["TaxDeductedTotal"] = String.Format("{0:11,N2}", -subTaxTotal / 100.0); + customStrings["NetSalaryTotal"] = String.Format("{0:10,N2}", netTotal / 100.0); customStrings["TaxAdditiveTotalUnpadded"] = String.Format("{0:N2}", addTaxTotal / 100.0); // Send notification diff --git a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.Designer.cs b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.Designer.cs index bba692d5..58b0ccf1 100644 --- a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.Designer.cs +++ b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.Designer.cs @@ -688,9 +688,9 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to This is your summary salary statement for [LastYear]. It is not a statement of a new salary, but a statement of the monthly salaries paid to you over the course of the last year as well as any taxes deducted. The purpose of this statement is to serve as data for your records and/or for tax declaration purposes for last year. /// - ///Gross salary for [LastYear]: [CurrencyCode] [GrossSalaryTotal] + ///Gross salary for [LastYear]: [CurrencyCode] [GrossSalaryTotal] ///Tax deducted therefrom: [CurrencyCode] [TaxDeductedTotal] - ///Net salary paid out: [CurrencyCode] [NetSalaryTotal] [rest of string was truncated]";. + ///Net salary paid out: [CurrencyCode] [NetSalaryTotal] [rest of string was truncated]";. /// internal static string Salary_LastYearSummary_Body { get { diff --git a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx index abb8cf13..2cbb840f 100644 --- a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx +++ b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx @@ -385,9 +385,9 @@ Please log on to [InstallationName] at [ExternalUrl]Financial/ValidateReceipts t This is your summary salary statement for [LastYear]. It is not a statement of a new salary, but a statement of the monthly salaries paid to you over the course of the last year as well as any taxes deducted. The purpose of this statement is to serve as data for your records and/or for tax declaration purposes for last year. -Gross salary for [LastYear]: [CurrencyCode] [GrossSalaryTotal] +Gross salary for [LastYear]: [CurrencyCode] [GrossSalaryTotal] Tax deducted therefrom: [CurrencyCode] [TaxDeductedTotal] -Net salary paid out: [CurrencyCode] [NetSalaryTotal] +Net salary paid out: [CurrencyCode] [NetSalaryTotal] Month Gross Deducted Net Paid using @@ -398,7 +398,7 @@ TOTAL [GrossSalaryTotal] [TaxDeductedTotal] [NetSalaryTotal] In addition, [CurrencyCode] [TaxAdditiveTotalUnpadded] have been paid in taxes by the organization for your employment. This is also a tax on your salary, even if its nature as such has been bureaucratically concealed. - Note the hard spacing - maintain character count to align columns and elements. + Note the hard spacing - maintain character count to align columns and elements in a monospace font rendering. [[OrganizationName]] Salary summary statement for [LastYear]