diff --git a/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs b/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs
index bac65cad..37d958be 100644
--- a/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs
+++ b/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs
@@ -99,6 +99,26 @@ namespace Swarmops.Logic.App_GlobalResources {
}
}
+ ///
+ /// Looks up a localized string similar to Your request for a cash advance with [OrganizationName] for [CurrencyCode] [BudgetAmountFloat], concerning [RequestPurpose], has been marked as paid out by the organization's accountants.
+ ///
+ ///This means you should see the amount on your account shortly..
+ ///
+ internal static string CashAdvance_PaidOut_Body {
+ get {
+ return ResourceManager.GetString("CashAdvance_PaidOut_Body", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to [OrganizationName] Cash Advance Paid: [CurrencyCode] [BudgetAmountFloat].
+ ///
+ internal static string CashAdvance_PaidOut_Subject {
+ get {
+ return ResourceManager.GetString("CashAdvance_PaidOut_Subject", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to [ConcernedPersonName] has requested a cash advance of [CurrencyCode] [BudgetAmountFloat] for the purpose of [RequestPurpose]. This money is part of your budget, [BudgetName].
///
@@ -215,6 +235,26 @@ namespace Swarmops.Logic.App_GlobalResources {
}
}
+ ///
+ /// Looks up a localized string similar to Your expense claim with [OrganizationName] for [CurrencyCode] [BudgetAmountFloat], concerning [RequestPurpose], has been marked as paid out by the organization's accountants.
+ ///
+ ///This means you should see the amount on your account shortly..
+ ///
+ internal static string ExpenseClaim_PaidOut_Body {
+ get {
+ return ResourceManager.GetString("ExpenseClaim_PaidOut_Body", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to [OrganizationName] Expense Claim Paid: [CurrencyCode] [BudgetAmountFloat].
+ ///
+ internal static string ExpenseClaim_PaidOut_Subject {
+ get {
+ return ResourceManager.GetString("ExpenseClaim_PaidOut_Subject", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to The receipts for your expense claim with [OrganizationName] for [CurrencyCode] [BudgetAmountFloat], concerning [RequestPurpose], have been validated by people responsible for keeping the records in order.
///
diff --git a/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.resx b/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.resx
index 2f4d1123..57f9b686 100644
--- a/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.resx
+++ b/Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.resx
@@ -112,10 +112,10 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
Your requested cash advance with [OrganizationName] for [CurrencyCode] [BudgetAmountFloat], concerning [RequestPurpose], has been attested by the budget owner. It will now proceed to payout to you.
@@ -131,6 +131,14 @@ Expect more communication from the budget owner to follow on the matter.
[OrganizationName] Cash Advance DE-attested: [CurrencyCode] [BudgetAmountFloat]
+
+ Your request for a cash advance with [OrganizationName] for [CurrencyCode] [BudgetAmountFloat], concerning [RequestPurpose], has been marked as paid out by the organization's accountants.
+
+This means you should see the amount on your account shortly.
+
+
+ [OrganizationName] Cash Advance Paid: [CurrencyCode] [BudgetAmountFloat]
+
[ConcernedPersonName] has requested a cash advance of [CurrencyCode] [BudgetAmountFloat] for the purpose of [RequestPurpose]. This money is part of your budget, [BudgetName].
@@ -181,6 +189,14 @@ Expect more communication to follow on the matter. If you don't hear from record
[OrganizationName] Expense Claim Receipts DE-validated: [CurrencyCode] [BudgetAmountFloat]
+
+ Your expense claim with [OrganizationName] for [CurrencyCode] [BudgetAmountFloat], concerning [RequestPurpose], has been marked as paid out by the organization's accountants.
+
+This means you should see the amount on your account shortly.
+
+
+ [OrganizationName] Expense Claim Paid: [CurrencyCode] [BudgetAmountFloat]
+
The receipts for your expense claim with [OrganizationName] for [CurrencyCode] [BudgetAmountFloat], concerning [RequestPurpose], have been validated by people responsible for keeping the records in order.
diff --git a/Logic/Communications/Transmission/NotificationPayload.cs b/Logic/Communications/Transmission/NotificationPayload.cs
index 9d482602..a2679f37 100644
--- a/Logic/Communications/Transmission/NotificationPayload.cs
+++ b/Logic/Communications/Transmission/NotificationPayload.cs
@@ -95,6 +95,7 @@ namespace Swarmops.Logic.Communications.Transmission
CashAdvance_Denied,
CashAdvance_Adjusted,
CashAdvance_Rebudgeted,
+ CashAdvance_PaidOut,
ExpenseClaim_Created,
ExpenseClaim_Attested,
ExpenseClaim_Deattested,
@@ -103,6 +104,7 @@ namespace Swarmops.Logic.Communications.Transmission
ExpenseClaim_Denied,
ExpenseClaim_Adjusted,
ExpenseClaim_Rebudgeted,
+ ExpenseClaim_PaidOut,
Payout_Settled,
InboundInvoice_Created,
Receipts_Filed
diff --git a/Logic/Financial/Payout.cs b/Logic/Financial/Payout.cs
index 7bd01f1f..dbdfdf93 100644
--- a/Logic/Financial/Payout.cs
+++ b/Logic/Financial/Payout.cs
@@ -6,6 +6,8 @@ using Swarmops.Basic.Enums;
using Swarmops.Basic.Types;
using Swarmops.Basic.Types.Financial;
using Swarmops.Database;
+using Swarmops.Logic.Communications;
+using Swarmops.Logic.Communications.Transmission;
using Swarmops.Logic.Support.LogEntries;
using Swarmops.Logic.Swarm;
using Swarmops.Logic.Structure;
@@ -229,6 +231,8 @@ namespace Swarmops.Logic.Financial
"Cash Advance Paid Out"),
advance.Person, advance);
+
+ OutboundComm.CreateNotificationOfFinancialValidation(advance.Budget, advance.Person, (double)advance.AmountCents / 100.0, advance.Description, NotificationResource.CashAdvance_PaidOut);
}
string referenceString = string.Empty;
@@ -289,6 +293,8 @@ namespace Swarmops.Logic.Financial
claim.Repaid = true;
claim.Close();
+
+ OutboundComm.CreateNotificationOfFinancialValidation(claim.Budget, claim.Claimer, (double)claim.AmountCents / 100.0, claim.Description, NotificationResource.ExpenseClaim_PaidOut);
}
else if (component[0] == 'a')
{