Skip to content

Commit 0f4b919

Browse files
ucswiftucswift
authored
Merge pull request #315 from Resgrid/develop
RE1-T110 Adding videos to calls
2 parents dbbce63 + b1f8534 commit 0f4b919

133 files changed

Lines changed: 8832 additions & 35 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Core/Resgrid.Config/InfoConfig.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public static class InfoConfig
3333
LocationInfo =
3434
"This is the Resgrid system hosted in the Western United States (private datacenter). This system services most Resgrid customers.",
3535
IsDefault = true,
36+
AppUrl = "https://app.resgrid.com",
3637
ApiUrl = "https://api.resgrid.com",
3738
AllowsFreeAccounts = true
3839
},
@@ -41,9 +42,10 @@ public static class InfoConfig
4142
Name = "EU-Central",
4243
DisplayName = "Resgrid Europe",
4344
LocationInfo =
44-
"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.",
45+
"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.",
4546
IsDefault = false,
46-
ApiUrl = "https://api.eu.resgrid.com",
47+
AppUrl = "https://app.eu-central.resgrid.com",
48+
ApiUrl = "https://api-eu-central.resgrid.com",
4749
AllowsFreeAccounts = false
4850
}
4951
};
@@ -55,7 +57,13 @@ public class ResgridSystemLocation
5557
public string DisplayName { get; set; }
5658
public string LocationInfo { get; set; }
5759
public bool IsDefault { get; set; }
60+
public string AppUrl { get; set; }
5861
public string ApiUrl { get; set; }
5962
public bool AllowsFreeAccounts { get; set; }
63+
64+
public string GetLogonUrl()
65+
{
66+
return AppUrl + "/Account/LogOn";
67+
}
6068
}
6169
}

‎Core/Resgrid.Config/PaymentProviderConfig.cs‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace Resgrid.Config
1+
using System;
2+
3+
namespace Resgrid.Config
24
{
35
public static class PaymentProviderConfig
46
{
@@ -36,6 +38,32 @@ public static class PaymentProviderConfig
3638
public static string PaddleProductionClientToken = "";
3739
public static string PaddleTestClientToken = "";
3840

41+
// Global toggle: 1 = Stripe (default), 7 = Paddle. Matches PaymentMethods enum values.
42+
// Set per-instance via ResgridConfig.json: "PaymentProviderConfig.ActivePaymentProvider": "7"
43+
public static int ActivePaymentProvider = 1;
44+
45+
public const int ProviderStripe = 1;
46+
public const int ProviderPaddle = 7;
47+
48+
public static int GetActivePaymentProvider()
49+
{
50+
if (ActivePaymentProvider != ProviderStripe && ActivePaymentProvider != ProviderPaddle)
51+
throw new InvalidOperationException(
52+
$"Unsupported ActivePaymentProvider value '{ActivePaymentProvider}'. Expected {ProviderStripe} (Stripe) or {ProviderPaddle} (Paddle).");
53+
54+
return ActivePaymentProvider;
55+
}
56+
57+
public static bool IsStripeActive()
58+
{
59+
return GetActivePaymentProvider() == ProviderStripe;
60+
}
61+
62+
public static bool IsPaddleActive()
63+
{
64+
return GetActivePaymentProvider() == ProviderPaddle;
65+
}
66+
3967
public static string GetStripeClientKey()
4068
{
4169
if (IsTestMode)

‎Core/Resgrid.Localization/Account/Login.en.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,4 +258,7 @@
258258
<data name="AffiliateCode" xml:space="preserve">
259259
<value>Affiliate Code</value>
260260
</data>
261+
<data name="Region" xml:space="preserve">
262+
<value>Region</value>
263+
</data>
261264
</root>

‎Core/Resgrid.Localization/Areas/User/CommunicationTest/CommunicationTest.ar.resx‎

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
4+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
5+
<xsd:element name="root" msdata:IsDataSet="true">
6+
<xsd:complexType>
7+
<xsd:choice maxOccurs="unbounded">
8+
<xsd:element name="metadata">
9+
<xsd:complexType>
10+
<xsd:sequence>
11+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
12+
</xsd:sequence>
13+
<xsd:attribute name="name" use="required" type="xsd:string" />
14+
<xsd:attribute name="type" type="xsd:string" />
15+
<xsd:attribute name="mimetype" type="xsd:string" />
16+
<xsd:attribute ref="xml:space" />
17+
</xsd:complexType>
18+
</xsd:element>
19+
<xsd:element name="assembly">
20+
<xsd:complexType>
21+
<xsd:attribute name="alias" type="xsd:string" />
22+
<xsd:attribute name="name" type="xsd:string" />
23+
</xsd:complexType>
24+
</xsd:element>
25+
<xsd:element name="data">
26+
<xsd:complexType>
27+
<xsd:sequence>
28+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
29+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
30+
</xsd:sequence>
31+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
32+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
33+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
34+
<xsd:attribute ref="xml:space" />
35+
</xsd:complexType>
36+
</xsd:element>
37+
<xsd:element name="resheader">
38+
<xsd:complexType>
39+
<xsd:sequence>
40+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
41+
</xsd:sequence>
42+
<xsd:attribute name="name" type="xsd:string" use="required" />
43+
</xsd:complexType>
44+
</xsd:element>
45+
</xsd:choice>
46+
</xsd:complexType>
47+
</xsd:element>
48+
</xsd:schema>
49+
<resheader name="resmimetype">
50+
<value>text/microsoft-resx</value>
51+
</resheader>
52+
<resheader name="version">
53+
<value>2.0</value>
54+
</resheader>
55+
<resheader name="reader">
56+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
57+
</resheader>
58+
<resheader name="writer">
59+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
60+
</resheader>
61+
<data name="CommunicationTestModule" xml:space="preserve">
62+
<value>Communication Tests</value>
63+
</data>
64+
<data name="CommunicationTestsHeader" xml:space="preserve">
65+
<value>Communication Tests</value>
66+
</data>
67+
<data name="NewTest" xml:space="preserve">
68+
<value>New Test</value>
69+
</data>
70+
<data name="EditTest" xml:space="preserve">
71+
<value>Edit Test</value>
72+
</data>
73+
<data name="DeleteTest" xml:space="preserve">
74+
<value>Delete Test</value>
75+
</data>
76+
<data name="DeleteTestWarning" xml:space="preserve">
77+
<value>Are you sure you want to delete this test?</value>
78+
</data>
79+
<data name="TestDefinitions" xml:space="preserve">
80+
<value>Test Definitions</value>
81+
</data>
82+
<data name="TestName" xml:space="preserve">
83+
<value>Name</value>
84+
</data>
85+
<data name="TestDescription" xml:space="preserve">
86+
<value>Description</value>
87+
</data>
88+
<data name="ScheduleType" xml:space="preserve">
89+
<value>Schedule Type</value>
90+
</data>
91+
<data name="OnDemand" xml:space="preserve">
92+
<value>On Demand</value>
93+
</data>
94+
<data name="Weekly" xml:space="preserve">
95+
<value>Weekly</value>
96+
</data>
97+
<data name="Monthly" xml:space="preserve">
98+
<value>Monthly</value>
99+
</data>
100+
<data name="DaysOfWeek" xml:space="preserve">
101+
<value>Days of Week</value>
102+
</data>
103+
<data name="DayOfMonth" xml:space="preserve">
104+
<value>Day of Month</value>
105+
</data>
106+
<data name="Time" xml:space="preserve">
107+
<value>Time</value>
108+
</data>
109+
<data name="ChannelsToTest" xml:space="preserve">
110+
<value>Channels to Test</value>
111+
</data>
112+
<data name="SMS" xml:space="preserve">
113+
<value>SMS</value>
114+
</data>
115+
<data name="Email" xml:space="preserve">
116+
<value>Email</value>
117+
</data>
118+
<data name="Voice" xml:space="preserve">
119+
<value>Voice</value>
120+
</data>
121+
<data name="Push" xml:space="preserve">
122+
<value>Push</value>
123+
</data>
124+
<data name="Active" xml:space="preserve">
125+
<value>Active</value>
126+
</data>
127+
<data name="Inactive" xml:space="preserve">
128+
<value>Inactive</value>
129+
</data>
130+
<data name="ResponseWindow" xml:space="preserve">
131+
<value>Response Window</value>
132+
</data>
133+
<data name="ResponseWindowMinutes" xml:space="preserve">
134+
<value>Response Window (minutes)</value>
135+
</data>
136+
<data name="CreateTest" xml:space="preserve">
137+
<value>Create Test</value>
138+
</data>
139+
<data name="SaveChanges" xml:space="preserve">
140+
<value>Save Changes</value>
141+
</data>
142+
<data name="Cancel" xml:space="preserve">
143+
<value>Cancel</value>
144+
</data>
145+
<data name="RecentTestRuns" xml:space="preserve">
146+
<value>Recent Test Runs</value>
147+
</data>
148+
<data name="RunNow" xml:space="preserve">
149+
<value>Run Now</value>
150+
</data>
151+
<data name="RunCode" xml:space="preserve">
152+
<value>Run Code</value>
153+
</data>
154+
<data name="Started" xml:space="preserve">
155+
<value>Started</value>
156+
</data>
157+
<data name="Status" xml:space="preserve">
158+
<value>Status</value>
159+
</data>
160+
<data name="UsersTested" xml:space="preserve">
161+
<value>Users Tested</value>
162+
</data>
163+
<data name="Responses" xml:space="preserve">
164+
<value>Responses</value>
165+
</data>
166+
<data name="ViewReport" xml:space="preserve">
167+
<value>View Report</value>
168+
</data>
169+
<data name="ReportHeader" xml:space="preserve">
170+
<value>Communication Test Report</value>
171+
</data>
172+
<data name="RunDetails" xml:space="preserve">
173+
<value>Run Details</value>
174+
</data>
175+
<data name="PerUserResults" xml:space="preserve">
176+
<value>Per-User Results</value>
177+
</data>
178+
<data name="User" xml:space="preserve">
179+
<value>User</value>
180+
</data>
181+
<data name="Contact" xml:space="preserve">
182+
<value>Contact</value>
183+
</data>
184+
<data name="Carrier" xml:space="preserve">
185+
<value>Carrier</value>
186+
</data>
187+
<data name="VerificationStatus" xml:space="preserve">
188+
<value>Verification Status</value>
189+
</data>
190+
<data name="Responded" xml:space="preserve">
191+
<value>Responded</value>
192+
</data>
193+
<data name="NoResponse" xml:space="preserve">
194+
<value>No Response</value>
195+
</data>
196+
<data name="NotSent" xml:space="preserve">
197+
<value>Not Sent</value>
198+
</data>
199+
<data name="ResponseRate" xml:space="preserve">
200+
<value>Response Rate</value>
201+
</data>
202+
<data name="ThankYouResponse" xml:space="preserve">
203+
<value>Your communication test response has been recorded. Thank you.</value>
204+
</data>
205+
<data name="TestResponseReceived" xml:space="preserve">
206+
<value>Resgrid received your communication test response. Thank you.</value>
207+
</data>
208+
</root>

‎Core/Resgrid.Localization/Areas/User/CommunicationTest/CommunicationTest.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace Resgrid.Localization.Areas.User.CommunicationTest
2+
{
3+
public class CommunicationTest
4+
{
5+
}
6+
}

0 commit comments

Comments
 (0)