Skip to content

RE1-T110 Adding videos to calls #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ucswift merged 6 commits into from
Apr 9, 2026
Merged

RE1-T110 Adding videos to calls #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c384a7
RE1-T110 Adding videos to calls
ucswift Mar 31, 2026
5068020
RE1-T110 PR#315 fixes
ucswift Mar 31, 2026
b041fc6
RE1-T109 Bug fixes
ucswift Apr 3, 2026
3e762e4
RE1-T111 Communication Tests
ucswift Apr 8, 2026
0cc55cb
RE1-T111 PR#315 fixes
ucswift Apr 9, 2026
b1f8534
RE1-T111 PR#315 fixes
ucswift Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Core/Resgrid.Config/InfoConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public static class InfoConfig
LocationInfo =
"This is the Resgrid system hosted in the Western United States (private datacenter). This system services most Resgrid customers.",
IsDefault = true,
AppUrl = "https://app.resgrid.com",
ApiUrl = "https://api.resgrid.com",
AllowsFreeAccounts = true
},
Expand All @@ -41,9 +42,10 @@ public static class InfoConfig
Name = "EU-Central",
DisplayName = "Resgrid Europe",
LocationInfo =
"This is the Resgrid system hosted in Central Europe (on OVH). This system services Resgrid customers in the European Union to help with data compliance requirements.",
"This is the Resgrid system hosted in Central Europe (on OVH). This system services Resgrid customers in the European Union to help with data (GDPR) compliance requirements.",
IsDefault = false,
ApiUrl = "https://api.eu.resgrid.com",
AppUrl = "https://app.eu-central.resgrid.com",
ApiUrl = "https://api-eu-central.resgrid.com",
AllowsFreeAccounts = false
}
};
Expand All @@ -55,7 +57,13 @@ public class ResgridSystemLocation
public string DisplayName { get; set; }
public string LocationInfo { get; set; }
public bool IsDefault { get; set; }
public string AppUrl { get; set; }
public string ApiUrl { get; set; }
public bool AllowsFreeAccounts { get; set; }

public string GetLogonUrl()
{
return AppUrl + "/Account/LogOn";
}
}
}
30 changes: 29 additions & 1 deletion Core/Resgrid.Config/PaymentProviderConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace Resgrid.Config
using System;

namespace Resgrid.Config
{
public static class PaymentProviderConfig
{
Expand Down Expand Up @@ -36,6 +38,32 @@ public static class PaymentProviderConfig
public static string PaddleProductionClientToken = "";
public static string PaddleTestClientToken = "";

// Global toggle: 1 = Stripe (default), 7 = Paddle. Matches PaymentMethods enum values.
// Set per-instance via ResgridConfig.json: "PaymentProviderConfig.ActivePaymentProvider": "7"
public static int ActivePaymentProvider = 1;

public const int ProviderStripe = 1;
public const int ProviderPaddle = 7;

public static int GetActivePaymentProvider()
{
if (ActivePaymentProvider != ProviderStripe && ActivePaymentProvider != ProviderPaddle)
throw new InvalidOperationException(
$"Unsupported ActivePaymentProvider value '{ActivePaymentProvider}'. Expected {ProviderStripe} (Stripe) or {ProviderPaddle} (Paddle).");

return ActivePaymentProvider;
}

public static bool IsStripeActive()
{
return GetActivePaymentProvider() == ProviderStripe;
}

public static bool IsPaddleActive()
{
return GetActivePaymentProvider() == ProviderPaddle;
}

public static string GetStripeClientKey()
{
if (IsTestMode)
Expand Down
3 changes: 3 additions & 0 deletions Core/Resgrid.Localization/Account/Login.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,7 @@
<data name="AffiliateCode" xml:space="preserve">
<value>Affiliate Code</value>
</data>
<data name="Region" xml:space="preserve">
<value>Region</value>
</data>
</root>
208 changes: 208 additions & 0 deletions Core/Resgrid.Localization/Areas/User/CommunicationTest/CommunicationTest.ar.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CommunicationTestModule" xml:space="preserve">
<value>Communication Tests</value>
</data>
<data name="CommunicationTestsHeader" xml:space="preserve">
<value>Communication Tests</value>
</data>
<data name="NewTest" xml:space="preserve">
<value>New Test</value>
</data>
<data name="EditTest" xml:space="preserve">
<value>Edit Test</value>
</data>
<data name="DeleteTest" xml:space="preserve">
<value>Delete Test</value>
</data>
<data name="DeleteTestWarning" xml:space="preserve">
<value>Are you sure you want to delete this test?</value>
</data>
<data name="TestDefinitions" xml:space="preserve">
<value>Test Definitions</value>
</data>
<data name="TestName" xml:space="preserve">
<value>Name</value>
</data>
<data name="TestDescription" xml:space="preserve">
<value>Description</value>
</data>
<data name="ScheduleType" xml:space="preserve">
<value>Schedule Type</value>
</data>
<data name="OnDemand" xml:space="preserve">
<value>On Demand</value>
</data>
<data name="Weekly" xml:space="preserve">
<value>Weekly</value>
</data>
<data name="Monthly" xml:space="preserve">
<value>Monthly</value>
</data>
<data name="DaysOfWeek" xml:space="preserve">
<value>Days of Week</value>
</data>
<data name="DayOfMonth" xml:space="preserve">
<value>Day of Month</value>
</data>
<data name="Time" xml:space="preserve">
<value>Time</value>
</data>
<data name="ChannelsToTest" xml:space="preserve">
<value>Channels to Test</value>
</data>
<data name="SMS" xml:space="preserve">
<value>SMS</value>
</data>
<data name="Email" xml:space="preserve">
<value>Email</value>
</data>
<data name="Voice" xml:space="preserve">
<value>Voice</value>
</data>
<data name="Push" xml:space="preserve">
<value>Push</value>
</data>
<data name="Active" xml:space="preserve">
<value>Active</value>
</data>
<data name="Inactive" xml:space="preserve">
<value>Inactive</value>
</data>
<data name="ResponseWindow" xml:space="preserve">
<value>Response Window</value>
</data>
<data name="ResponseWindowMinutes" xml:space="preserve">
<value>Response Window (minutes)</value>
</data>
<data name="CreateTest" xml:space="preserve">
<value>Create Test</value>
</data>
<data name="SaveChanges" xml:space="preserve">
<value>Save Changes</value>
</data>
<data name="Cancel" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="RecentTestRuns" xml:space="preserve">
<value>Recent Test Runs</value>
</data>
<data name="RunNow" xml:space="preserve">
<value>Run Now</value>
</data>
<data name="RunCode" xml:space="preserve">
<value>Run Code</value>
</data>
<data name="Started" xml:space="preserve">
<value>Started</value>
</data>
<data name="Status" xml:space="preserve">
<value>Status</value>
</data>
<data name="UsersTested" xml:space="preserve">
<value>Users Tested</value>
</data>
<data name="Responses" xml:space="preserve">
<value>Responses</value>
</data>
<data name="ViewReport" xml:space="preserve">
<value>View Report</value>
</data>
<data name="ReportHeader" xml:space="preserve">
<value>Communication Test Report</value>
</data>
<data name="RunDetails" xml:space="preserve">
<value>Run Details</value>
</data>
<data name="PerUserResults" xml:space="preserve">
<value>Per-User Results</value>
</data>
<data name="User" xml:space="preserve">
<value>User</value>
</data>
<data name="Contact" xml:space="preserve">
<value>Contact</value>
</data>
<data name="Carrier" xml:space="preserve">
<value>Carrier</value>
</data>
<data name="VerificationStatus" xml:space="preserve">
<value>Verification Status</value>
</data>
<data name="Responded" xml:space="preserve">
<value>Responded</value>
</data>
<data name="NoResponse" xml:space="preserve">
<value>No Response</value>
</data>
<data name="NotSent" xml:space="preserve">
<value>Not Sent</value>
</data>
<data name="ResponseRate" xml:space="preserve">
<value>Response Rate</value>
</data>
<data name="ThankYouResponse" xml:space="preserve">
<value>Your communication test response has been recorded. Thank you.</value>
</data>
<data name="TestResponseReceived" xml:space="preserve">
<value>Resgrid received your communication test response. Thank you.</value>
</data>
</root>
6 changes: 6 additions & 0 deletions Core/Resgrid.Localization/Areas/User/CommunicationTest/CommunicationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Resgrid.Localization.Areas.User.CommunicationTest
{
public class CommunicationTest
{
}
}
Loading
Loading