diff --git a/docs/developer/db-docs/schemas/core.md b/docs/developer/db-docs/schemas/core.md index b7895c1a..d691282f 100644 --- a/docs/developer/db-docs/schemas/core.md +++ b/docs/developer/db-docs/schemas/core.md @@ -8,7 +8,6 @@ | 2 | [apps](../tables/core/apps.md) | frapid_db_user | DEFAULT | | | 3 | [countries](../tables/core/countries.md) | frapid_db_user | DEFAULT | | | 4 | [currencies](../tables/core/currencies.md) | frapid_db_user | DEFAULT | | -| 5 | [frequencies](../tables/core/frequencies.md) | frapid_db_user | DEFAULT | | | 6 | [genders](../tables/core/genders.md) | frapid_db_user | DEFAULT | | | 7 | [marital_statuses](../tables/core/marital_statuses.md) | frapid_db_user | DEFAULT | | | 8 | [menus](../tables/core/menus.md) | frapid_db_user | DEFAULT | | diff --git a/docs/developer/db-docs/sequences.md b/docs/developer/db-docs/sequences.md index 545cdd94..c8666dcf 100644 --- a/docs/developer/db-docs/sequences.md +++ b/docs/developer/db-docs/sequences.md @@ -56,7 +56,6 @@ | 52 | core.app_dependencies_app_dependency_id_seq | frapid_db_user | bigint | 1 | 1 | | | 53 | core.apps_app_id_seq | frapid_db_user | bigint | 1 | 1 | | | 54 | core.currencies_currency_id_seq | frapid_db_user | bigint | 1 | 1 | | -| 55 | core.frequencies_frequency_id_seq | frapid_db_user | bigint | 1 | 1 | | | 56 | core.marital_statuses_marital_status_id_seq | frapid_db_user | bigint | 1 | 1 | | | 57 | core.menus_menu_id_seq | frapid_db_user | bigint | 1 | 1 | | | 58 | core.offices_office_id_seq | frapid_db_user | bigint | 1 | 1 | | diff --git a/docs/developer/db-docs/tables.md b/docs/developer/db-docs/tables.md index f794bd28..66034139 100644 --- a/docs/developer/db-docs/tables.md +++ b/docs/developer/db-docs/tables.md @@ -76,7 +76,6 @@ | 72 | [core](schemas/core.md) | [apps](tables/core/apps.md) | frapid_db_user | DEFAULT | | | 73 | [core](schemas/core.md) | [countries](tables/core/countries.md) | frapid_db_user | DEFAULT | | | 74 | [core](schemas/core.md) | [currencies](tables/core/currencies.md) | frapid_db_user | DEFAULT | | -| 75 | [core](schemas/core.md) | [frequencies](tables/core/frequencies.md) | frapid_db_user | DEFAULT | | | 76 | [core](schemas/core.md) | [genders](tables/core/genders.md) | frapid_db_user | DEFAULT | | | 77 | [core](schemas/core.md) | [marital_statuses](tables/core/marital_statuses.md) | frapid_db_user | DEFAULT | | | 78 | [core](schemas/core.md) | [menus](tables/core/menus.md) | frapid_db_user | DEFAULT | | diff --git a/docs/developer/db-docs/tables/core/frequencies.md b/docs/developer/db-docs/tables/core/frequencies.md deleted file mode 100644 index cf8deb8a..00000000 --- a/docs/developer/db-docs/tables/core/frequencies.md +++ /dev/null @@ -1,68 +0,0 @@ -# core.frequencies table - - - -| # | Column Name | Nullable | Data Type | Max Length | Description | -| --- | --- | --- | --- | --- | --- | -| 1 | frequency_id | [ ] | integer | 0 | | -| 1 | frequency_id | [ ] | integer | 0 | | -| 2 | frequency_code | [ ] | character varying | 12 | | -| 2 | frequency_code | [ ] | character varying | 12 | | -| 3 | frequency_name | [ ] | character varying | 50 | | -| 3 | frequency_name | [ ] | character varying | 50 | | -| 4 | audit_user_id | [x] | integer | 0 | | -| 4 | audit_user_id | [x] | integer | 0 | | -| 5 | audit_ts | [x] | timestamp with time zone | 0 | | -| 5 | audit_ts | [x] | timestamp with time zone | 0 | | -| 6 | deleted | [x] | boolean | 0 | | -| 6 | deleted | [x] | boolean | 0 | | - - - -**Foreign Keys** - -| # | Column Name | Key Name | References | -| --- | --- | --- | --- | - - - -**Indices** - -| Index Name | Owner | Access Method | Definition | Description | -| --- | --- | --- | --- | --- | -| frequencies_pkey | frapid_db_user | btree | frequency_id | | -| frequencies_frequency_code_uix | frapid_db_user | btree | upper(frequency_code::text) | | -| frequencies_frequency_name_uix | frapid_db_user | btree | upper(frequency_name::text) | | - - - -**Check Constraints** - -| Constraint Name | Description | -| --- | --- | - - - -**Default Values** - -| # | Column Name | Default | -| --- | --- | --- | -| 1 | frequency_id | nextval('core.frequencies_frequency_id_seq'::regclass) | -| 1 | frequency_id | nextval('finance.frequencies_frequency_id_seq'::regclass) | -| 5 | audit_ts | now() | -| 5 | audit_ts | now() | -| 6 | deleted | false | -| 6 | deleted | false | - - -**Triggers** - -| Trigger Name | Targets | On Event | Timing | Condition | Order | Orientation | Description | -| --- | --- | --- | --- | --- | --- | --- | --- | - - -### Related Contents -* [Schema List](../../schemas.md) -* [Table List](../../tables.md) -* [Sequence List](../../sequences.md) -* [Table of Contents](../../README.md) diff --git a/docs/developer/db-docs/tables/finance/frequencies.md b/docs/developer/db-docs/tables/finance/frequencies.md index 389b5835..8cfa1961 100644 --- a/docs/developer/db-docs/tables/finance/frequencies.md +++ b/docs/developer/db-docs/tables/finance/frequencies.md @@ -50,11 +50,8 @@ | # | Column Name | Default | | --- | --- | --- | | 1 | frequency_id | nextval('finance.frequencies_frequency_id_seq'::regclass) | -| 1 | frequency_id | nextval('core.frequencies_frequency_id_seq'::regclass) | -| 5 | audit_ts | now() | -| 5 | audit_ts | now() | -| 6 | deleted | false | -| 6 | deleted | false | +| 2 | audit_ts | now() | +| 3 | deleted | false | **Triggers** diff --git a/src/Frapid.Web/Areas/.gitignore b/src/Frapid.Web/Areas/.gitignore index cad5b706..f1e8bae7 100644 --- a/src/Frapid.Web/Areas/.gitignore +++ b/src/Frapid.Web/Areas/.gitignore @@ -1,2 +1,7 @@ /Ticketing /TheSmsCentral + +MixCBS.Banking +MixCBS.Deposits +MixCBS.Lendings +MixCBS.Shares diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/ConfigurationProfiles.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/ConfigurationProfiles.cs index 54e959dd..41207061 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/DAL/ConfigurationProfiles.cs +++ b/src/Frapid.Web/Areas/Frapid.Account/DAL/ConfigurationProfiles.cs @@ -16,6 +16,7 @@ public static async Task GetActiveProfileAsync(string tena { var sql = new Sql("SELECT * FROM account.configuration_profiles"); sql.Where("is_active=@0", true); + sql.And("deleted=@0",false); var awaiter = await db.SelectAsync(sql).ConfigureAwait(false); return awaiter.FirstOrDefault(); diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/Offices.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/Offices.cs index a4194c31..767a4d31 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/DAL/Offices.cs +++ b/src/Frapid.Web/Areas/Frapid.Account/DAL/Offices.cs @@ -9,8 +9,8 @@ public static class Offices { public static async Task> GetOfficesAsync(string tenant) { - const string sql = "SELECT office_id, office_name FROM core.offices;"; - return await Factory.GetAsync(tenant, sql).ConfigureAwait(false); + const string sql = "SELECT office_id, office_name FROM core.offices WHERE core.offices.deleted = @0;"; + return await Factory.GetAsync(tenant, sql, false).ConfigureAwait(false); } } } \ No newline at end of file diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/Registrations.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/Registrations.cs index 54188f99..9af859ef 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/DAL/Registrations.cs +++ b/src/Frapid.Web/Areas/Frapid.Account/DAL/Registrations.cs @@ -39,8 +39,8 @@ public static async Task ConfirmRegistrationAsync(string tenant, Guid toke public static async Task GetAsync(string tenant, Guid token) { - const string sql = "SELECT * FROM account.registrations WHERE registration_id=@0;"; - return (await Factory.GetAsync(tenant, sql, token).ConfigureAwait(false)).FirstOrDefault(); + const string sql = "SELECT * FROM account.registrations WHERE registration_id=@0 AND deleted=@1;"; + return (await Factory.GetAsync(tenant, sql, token, false).ConfigureAwait(false)).FirstOrDefault(); } } } \ No newline at end of file diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/ResetRequests.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/ResetRequests.cs index a5404eb0..7741ce06 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/DAL/ResetRequests.cs +++ b/src/Frapid.Web/Areas/Frapid.Account/DAL/ResetRequests.cs @@ -12,8 +12,8 @@ public static class ResetRequests { public static async Task GetIfActiveAsync(string tenant, string token) { - const string sql = "SELECT * FROM account.reset_requests WHERE request_id=@0 AND expires_on >= @1 AND confirmed=@2;"; - return (await Factory.GetAsync(tenant, sql, token, DateTimeOffset.UtcNow, false).ConfigureAwait(false)).FirstOrDefault(); + const string sql = "SELECT * FROM account.reset_requests WHERE request_id=@0 AND expires_on >= @1 AND confirmed=@2 AND deleted=@3;"; + return (await Factory.GetAsync(tenant, sql, token, DateTimeOffset.UtcNow, false, false).ConfigureAwait(false)).FirstOrDefault(); } public static async Task CompleteResetAsync(string tenant, string requestId, string password) diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/Users.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/Users.cs index 784e2de5..9e82454f 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/DAL/Users.cs +++ b/src/Frapid.Web/Areas/Frapid.Account/DAL/Users.cs @@ -21,6 +21,8 @@ public static async Task GetAsync(string tenant, string email) { var sql = new Sql("SELECT * FROM account.users"); sql.Where("email=@0", email); + sql.And("deleted=@0",false); + sql.Limit(db.DatabaseType, 1, 0, "user_id"); var awaiter = await db.SelectAsync(sql).ConfigureAwait(false); diff --git a/src/Frapid.Web/Areas/Frapid.Account/I18N.cs b/src/Frapid.Web/Areas/Frapid.Account/I18N.cs index 34fad041..74193773 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/I18N.cs +++ b/src/Frapid.Web/Areas/Frapid.Account/I18N.cs @@ -164,14 +164,14 @@ static I18N() public static string LastBrowser => I18NResource.GetString(ResourceDirectory, "LastBrowser"); /// - ///Facebook Scope + ///Fb User Id /// - public static string FacebookScope => I18NResource.GetString(ResourceDirectory, "FacebookScope"); + public static string FbUserId => I18NResource.GetString(ResourceDirectory, "FbUserId"); /// - ///Fb User Id + ///Facebook Scope /// - public static string FbUserId => I18NResource.GetString(ResourceDirectory, "FbUserId"); + public static string FacebookScope => I18NResource.GetString(ResourceDirectory, "FacebookScope"); /// ///Version Number diff --git a/src/Frapid.Web/Areas/Frapid.Account/Overrides/Frapid.Account/Views/SignIn/Index.cshtml b/src/Frapid.Web/Areas/Frapid.Account/Overrides/Frapid.Account/Views/SignIn/Index.cshtml index 254e3176..aadab257 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/Overrides/Frapid.Account/Views/SignIn/Index.cshtml +++ b/src/Frapid.Web/Areas/Frapid.Account/Overrides/Frapid.Account/Views/SignIn/Index.cshtml @@ -7,29 +7,28 @@ - - + + @Resources.SignIn @if (CultureManager.IsRtl()) { - - + } else { - - + } - @if(!string.IsNullOrWhiteSpace(Model.GoogleSigninClientId)){ - - - - + @if (!string.IsNullOrWhiteSpace(Model.GoogleSigninClientId)) + { + + + + } - + @@ -41,84 +40,88 @@
- +
- +
- Create an Account + @I18N.CreateAnAccount
/
- Reset My Password + @I18N.ResetMyPassword
- @Html.GetAntiForgeryToken(this.Request.Url) - -
- +@Html.GetAntiForgeryToken(Request.Url) + +
+ - @if(!string.IsNullOrWhiteSpace(Model.FacebookAppId)){ +@if (!string.IsNullOrWhiteSpace(Model.FacebookAppId)) +{ - } +} - @if(!string.IsNullOrWhiteSpace(Model.GoogleSigninClientId)){ +@if (!string.IsNullOrWhiteSpace(Model.GoogleSigninClientId)) +{ - } +} \ No newline at end of file diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/account-blank.sql b/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/account-blank.sql index 332f5504..7119ec67 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/account-blank.sql +++ b/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/account-blank.sql @@ -1300,6 +1300,7 @@ SELECT core.offices.state, core.offices.zip_code, core.offices.country, + core.offices.email AS office_email, core.offices.phone, core.offices.fax, core.offices.url, diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/src/05.views/account.sign_in_view.sql b/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/src/05.views/account.sign_in_view.sql index 8e2e1166..e2805f01 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/src/05.views/account.sign_in_view.sql +++ b/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/src/05.views/account.sign_in_view.sql @@ -29,6 +29,7 @@ SELECT core.offices.state, core.offices.zip_code, core.offices.country, + core.offices.email AS office_email, core.offices.phone, core.offices.fax, core.offices.url, diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/account-blank.sql b/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/account-blank.sql index 332f5504..7119ec67 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/account-blank.sql +++ b/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/account-blank.sql @@ -1300,6 +1300,7 @@ SELECT core.offices.state, core.offices.zip_code, core.offices.country, + core.offices.email AS office_email, core.offices.phone, core.offices.fax, core.offices.url, diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/account-blank.sql b/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/account-blank.sql index 87c08737..438bf117 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/account-blank.sql +++ b/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/account-blank.sql @@ -1597,6 +1597,7 @@ SELECT core.offices.state, core.offices.zip_code, core.offices.country, + core.offices.email AS office_email, core.offices.phone, core.offices.fax, core.offices.url, diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/src/05.views/account.sign_in_view.sql b/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/src/05.views/account.sign_in_view.sql index 94e10f1e..91b2d682 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/src/05.views/account.sign_in_view.sql +++ b/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/src/05.views/account.sign_in_view.sql @@ -32,6 +32,7 @@ SELECT core.offices.state, core.offices.zip_code, core.offices.country, + core.offices.email AS office_email, core.offices.phone, core.offices.fax, core.offices.url, diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/account-blank.sql b/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/account-blank.sql index 87c08737..438bf117 100644 --- a/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/account-blank.sql +++ b/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/account-blank.sql @@ -1597,6 +1597,7 @@ SELECT core.offices.state, core.offices.zip_code, core.offices.country, + core.offices.email AS office_email, core.offices.phone, core.offices.fax, core.offices.url, diff --git a/src/Frapid.Web/Areas/Frapid.AddressBook/I18N.cs b/src/Frapid.Web/Areas/Frapid.AddressBook/I18N.cs index a413b9fa..76e77569 100644 --- a/src/Frapid.Web/Areas/Frapid.AddressBook/I18N.cs +++ b/src/Frapid.Web/Areas/Frapid.AddressBook/I18N.cs @@ -44,174 +44,174 @@ static I18N() public static string Deleted => I18NResource.GetString(ResourceDirectory, "Deleted"); /// - ///Gender + ///First Name /// - public static string Gender => I18NResource.GetString(ResourceDirectory, "Gender"); + public static string FirstName => I18NResource.GetString(ResourceDirectory, "FirstName"); /// - ///Middle Name + ///Email Addresses /// - public static string MiddleName => I18NResource.GetString(ResourceDirectory, "MiddleName"); + public static string EmailAddresses => I18NResource.GetString(ResourceDirectory, "EmailAddresses"); /// - ///Nick Name + ///Audit Ts /// - public static string NickName => I18NResource.GetString(ResourceDirectory, "NickName"); + public static string AuditTs => I18NResource.GetString(ResourceDirectory, "AuditTs"); /// - ///Time Zone + ///Mobile Numbers /// - public static string TimeZone => I18NResource.GetString(ResourceDirectory, "TimeZone"); + public static string MobileNumbers => I18NResource.GetString(ResourceDirectory, "MobileNumbers"); /// - ///Note + ///Address Line 2 /// - public static string Note => I18NResource.GetString(ResourceDirectory, "Note"); + public static string AddressLine2 => I18NResource.GetString(ResourceDirectory, "AddressLine2"); /// - ///Created By + ///Gender /// - public static string CreatedBy => I18NResource.GetString(ResourceDirectory, "CreatedBy"); + public static string Gender => I18NResource.GetString(ResourceDirectory, "Gender"); /// - ///Postal Code + ///Associated User Id /// - public static string PostalCode => I18NResource.GetString(ResourceDirectory, "PostalCode"); + public static string AssociatedUserId => I18NResource.GetString(ResourceDirectory, "AssociatedUserId"); /// - ///Url + ///Role /// - public static string Url => I18NResource.GetString(ResourceDirectory, "Url"); + public static string Role => I18NResource.GetString(ResourceDirectory, "Role"); /// - ///Kind + ///Middle Name /// - public static string Kind => I18NResource.GetString(ResourceDirectory, "Kind"); + public static string MiddleName => I18NResource.GetString(ResourceDirectory, "MiddleName"); /// - ///Suffix + ///Nick Name /// - public static string Suffix => I18NResource.GetString(ResourceDirectory, "Suffix"); + public static string NickName => I18NResource.GetString(ResourceDirectory, "NickName"); /// - ///Title + ///Time Zone /// - public static string Title => I18NResource.GetString(ResourceDirectory, "Title"); + public static string TimeZone => I18NResource.GetString(ResourceDirectory, "TimeZone"); /// - ///Telephones + ///Note /// - public static string Telephones => I18NResource.GetString(ResourceDirectory, "Telephones"); + public static string Note => I18NResource.GetString(ResourceDirectory, "Note"); /// - ///Country + ///Created By /// - public static string Country => I18NResource.GetString(ResourceDirectory, "Country"); + public static string CreatedBy => I18NResource.GetString(ResourceDirectory, "CreatedBy"); /// - ///Is Private + ///Birth Day /// - public static string IsPrivate => I18NResource.GetString(ResourceDirectory, "IsPrivate"); + public static string BirthDay => I18NResource.GetString(ResourceDirectory, "BirthDay"); /// - ///Language + ///Organization /// - public static string Language => I18NResource.GetString(ResourceDirectory, "Language"); + public static string Organization => I18NResource.GetString(ResourceDirectory, "Organization"); /// - ///Tags + ///Prefix /// - public static string Tags => I18NResource.GetString(ResourceDirectory, "Tags"); + public static string Prefix => I18NResource.GetString(ResourceDirectory, "Prefix"); /// - ///Last Name + ///State /// - public static string LastName => I18NResource.GetString(ResourceDirectory, "LastName"); + public static string State => I18NResource.GetString(ResourceDirectory, "State"); /// - ///Street + ///Fax Numbers /// - public static string Street => I18NResource.GetString(ResourceDirectory, "Street"); + public static string FaxNumbers => I18NResource.GetString(ResourceDirectory, "FaxNumbers"); /// - ///First Name + ///Postal Code /// - public static string FirstName => I18NResource.GetString(ResourceDirectory, "FirstName"); + public static string PostalCode => I18NResource.GetString(ResourceDirectory, "PostalCode"); /// - ///Email Addresses + ///Url /// - public static string EmailAddresses => I18NResource.GetString(ResourceDirectory, "EmailAddresses"); + public static string Url => I18NResource.GetString(ResourceDirectory, "Url"); /// - ///Audit Ts + ///Kind /// - public static string AuditTs => I18NResource.GetString(ResourceDirectory, "AuditTs"); + public static string Kind => I18NResource.GetString(ResourceDirectory, "Kind"); /// - ///Mobile Numbers + ///Address Line 1 /// - public static string MobileNumbers => I18NResource.GetString(ResourceDirectory, "MobileNumbers"); + public static string AddressLine1 => I18NResource.GetString(ResourceDirectory, "AddressLine1"); /// - ///Address Line 2 + ///Suffix /// - public static string AddressLine2 => I18NResource.GetString(ResourceDirectory, "AddressLine2"); + public static string Suffix => I18NResource.GetString(ResourceDirectory, "Suffix"); /// - ///Associated User Id + ///Title /// - public static string AssociatedUserId => I18NResource.GetString(ResourceDirectory, "AssociatedUserId"); + public static string Title => I18NResource.GetString(ResourceDirectory, "Title"); /// - ///Role + ///Telephones /// - public static string Role => I18NResource.GetString(ResourceDirectory, "Role"); + public static string Telephones => I18NResource.GetString(ResourceDirectory, "Telephones"); /// - ///Birth Day + ///Contact Id /// - public static string BirthDay => I18NResource.GetString(ResourceDirectory, "BirthDay"); + public static string ContactId => I18NResource.GetString(ResourceDirectory, "ContactId"); /// - ///Organization + ///Country /// - public static string Organization => I18NResource.GetString(ResourceDirectory, "Organization"); + public static string Country => I18NResource.GetString(ResourceDirectory, "Country"); /// - ///Prefix + ///Is Private /// - public static string Prefix => I18NResource.GetString(ResourceDirectory, "Prefix"); + public static string IsPrivate => I18NResource.GetString(ResourceDirectory, "IsPrivate"); /// - ///State + ///Language /// - public static string State => I18NResource.GetString(ResourceDirectory, "State"); + public static string Language => I18NResource.GetString(ResourceDirectory, "Language"); /// - ///Fax Numbers + ///Tags /// - public static string FaxNumbers => I18NResource.GetString(ResourceDirectory, "FaxNumbers"); + public static string Tags => I18NResource.GetString(ResourceDirectory, "Tags"); /// - ///Address Line 1 + ///Organizational Unit /// - public static string AddressLine1 => I18NResource.GetString(ResourceDirectory, "AddressLine1"); + public static string OrganizationalUnit => I18NResource.GetString(ResourceDirectory, "OrganizationalUnit"); /// - ///Contact Id + ///City /// - public static string ContactId => I18NResource.GetString(ResourceDirectory, "ContactId"); + public static string City => I18NResource.GetString(ResourceDirectory, "City"); /// - ///Organizational Unit + ///Last Name /// - public static string OrganizationalUnit => I18NResource.GetString(ResourceDirectory, "OrganizationalUnit"); + public static string LastName => I18NResource.GetString(ResourceDirectory, "LastName"); /// - ///City + ///Street /// - public static string City => I18NResource.GetString(ResourceDirectory, "City"); + public static string Street => I18NResource.GetString(ResourceDirectory, "Street"); /// ///Tasks diff --git a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/AccessPolicy.cs b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/AccessPolicy.cs index 6fa4b2af..d24583b0 100644 --- a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/AccessPolicy.cs +++ b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/AccessPolicy.cs @@ -21,6 +21,7 @@ public static async Task> GetGroupPolicyAsy var sql = new Sql("SELECT * FROM auth.group_entity_access_policy"); sql.Where("office_id=@0", officeId); sql.And("role_id=@0", roleId); + sql.And("deleted=@0", false); return await db.SelectAsync(sql).ConfigureAwait(false); } @@ -74,6 +75,7 @@ public static async Task> GetPolicyAsync(string var sql = new Sql("SELECT * FROM auth.entity_access_policy"); sql.Where("office_id=@0", officeId); sql.And("user_id=@0", userId); + sql.And("deleted=@0", false); return await db.SelectAsync(sql).ConfigureAwait(false); } diff --git a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Menus.cs b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Menus.cs index cb6b91f8..9d292709 100644 --- a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Menus.cs +++ b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Menus.cs @@ -17,6 +17,7 @@ public static async Task> GetMenusAsync(string tenant) using (var db = DbProvider.Get(FrapidDbServer.GetConnectionString(tenant), tenant).GetDatabase()) { var sql = new Sql("SELECT * FROM core.menus"); + sql.Where("deleted=@0", false); sql.OrderBy("sort, menu_id"); return await db.SelectAsync(sql).ConfigureAwait(false); @@ -30,6 +31,7 @@ public static async Task GetGroupPolicyAsync(string tenant, int officeId, var sql = new Sql("SELECT * FROM auth.group_menu_access_policy"); sql.Where("office_id=@0", officeId); sql.And("role_id=@0", roleId); + sql.And("deleted=@0",false); var awaiter = await db.SelectAsync(sql).ConfigureAwait(false); @@ -44,6 +46,7 @@ public static async Task> GetPolicyAsync(string te var sql = new Sql("SELECT * FROM auth.menu_access_policy"); sql.Where("office_id=@0", officeId); sql.And("user_id=@0", userId); + sql.And("deleted=@0",false); return await db.SelectAsync(sql).ConfigureAwait(false); } diff --git a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Offices.cs b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Offices.cs index 2319a077..ffd105cc 100644 --- a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Offices.cs +++ b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Offices.cs @@ -15,6 +15,7 @@ public static async Task> GetOfficesAsync(string tenant) using (var db = DbProvider.Get(FrapidDbServer.GetConnectionString(tenant), tenant).GetDatabase()) { var sql = new Sql("SELECT * FROM core.offices"); + sql.Where("deleted=@0", false); sql.OrderBy("office_id"); return await db.SelectAsync(sql).ConfigureAwait(false); diff --git a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Roles.cs b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Roles.cs index e3c9867e..fe682ee6 100644 --- a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Roles.cs +++ b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Roles.cs @@ -15,6 +15,7 @@ public static async Task> GetRolesAsync(string tenant) using (var db = DbProvider.Get(FrapidDbServer.GetConnectionString(tenant), tenant).GetDatabase()) { var sql = new Sql("SELECT * FROM account.roles"); + sql.Where("deleted=@0", false); sql.OrderBy("role_id DESC"); return await db.SelectAsync(sql).ConfigureAwait(false); diff --git a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Users.cs b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Users.cs index 1e91ae3e..9ad54bba 100644 --- a/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Users.cs +++ b/src/Frapid.Web/Areas/Frapid.Authorization/DAL/Users.cs @@ -16,6 +16,7 @@ public static async Task> GetUsersAsync(string tenant) { var sql = new Sql("SELECT * FROM account.users"); sql.Where("status=@0", true); + sql.And("deleted=@0", false); return await db.SelectAsync(sql).ConfigureAwait(false); } diff --git a/src/Frapid.Web/Areas/Frapid.Authorization/I18N.cs b/src/Frapid.Web/Areas/Frapid.Authorization/I18N.cs index 5733b0bc..d3f47069 100644 --- a/src/Frapid.Web/Areas/Frapid.Authorization/I18N.cs +++ b/src/Frapid.Web/Areas/Frapid.Authorization/I18N.cs @@ -44,79 +44,74 @@ static I18N() public static string MenuAccessPolicyId => I18NResource.GetString(ResourceDirectory, "MenuAccessPolicyId"); /// - ///Deleted - /// - public static string Deleted => I18NResource.GetString(ResourceDirectory, "Deleted"); - - /// - ///Table Name + ///Role Id /// - public static string TableName => I18NResource.GetString(ResourceDirectory, "TableName"); + public static string RoleId => I18NResource.GetString(ResourceDirectory, "RoleId"); /// - ///Table Schema + ///Deleted /// - public static string TableSchema => I18NResource.GetString(ResourceDirectory, "TableSchema"); + public static string Deleted => I18NResource.GetString(ResourceDirectory, "Deleted"); /// - ///Group Menu Access Policy Id + ///Menu Id /// - public static string GroupMenuAccessPolicyId => I18NResource.GetString(ResourceDirectory, "GroupMenuAccessPolicyId"); + public static string MenuId => I18NResource.GetString(ResourceDirectory, "MenuId"); /// - ///Entity Name + ///Table Name /// - public static string EntityName => I18NResource.GetString(ResourceDirectory, "EntityName"); + public static string TableName => I18NResource.GetString(ResourceDirectory, "TableName"); /// - ///Entity Access Policy Id + ///Audit Ts /// - public static string EntityAccessPolicyId => I18NResource.GetString(ResourceDirectory, "EntityAccessPolicyId"); + public static string AuditTs => I18NResource.GetString(ResourceDirectory, "AuditTs"); /// - ///Access Type Id + ///Table Schema /// - public static string AccessTypeId => I18NResource.GetString(ResourceDirectory, "AccessTypeId"); + public static string TableSchema => I18NResource.GetString(ResourceDirectory, "TableSchema"); /// - ///Office Id + ///User Id /// - public static string OfficeId => I18NResource.GetString(ResourceDirectory, "OfficeId"); + public static string UserId => I18NResource.GetString(ResourceDirectory, "UserId"); /// - ///Table Type + ///Group Menu Access Policy Id /// - public static string TableType => I18NResource.GetString(ResourceDirectory, "TableType"); + public static string GroupMenuAccessPolicyId => I18NResource.GetString(ResourceDirectory, "GroupMenuAccessPolicyId"); /// - ///Role Id + ///Entity Name /// - public static string RoleId => I18NResource.GetString(ResourceDirectory, "RoleId"); + public static string EntityName => I18NResource.GetString(ResourceDirectory, "EntityName"); /// - ///Menu Id + ///Entity Access Policy Id /// - public static string MenuId => I18NResource.GetString(ResourceDirectory, "MenuId"); + public static string EntityAccessPolicyId => I18NResource.GetString(ResourceDirectory, "EntityAccessPolicyId"); /// - ///Audit Ts + ///Object Name /// - public static string AuditTs => I18NResource.GetString(ResourceDirectory, "AuditTs"); + public static string ObjectName => I18NResource.GetString(ResourceDirectory, "ObjectName"); /// - ///User Id + ///Access Type Name /// - public static string UserId => I18NResource.GetString(ResourceDirectory, "UserId"); + public static string AccessTypeName => I18NResource.GetString(ResourceDirectory, "AccessTypeName"); /// - ///Object Name + ///Access Type Id /// - public static string ObjectName => I18NResource.GetString(ResourceDirectory, "ObjectName"); + public static string AccessTypeId => I18NResource.GetString(ResourceDirectory, "AccessTypeId"); /// - ///Access Type Name + ///Office Id /// - public static string AccessTypeName => I18NResource.GetString(ResourceDirectory, "AccessTypeName"); + public static string OfficeId => I18NResource.GetString(ResourceDirectory, "OfficeId"); /// ///Disallow Access @@ -128,6 +123,11 @@ static I18N() /// public static string GroupEntityAccessPolicyId => I18NResource.GetString(ResourceDirectory, "GroupEntityAccessPolicyId"); + /// + ///Table Type + /// + public static string TableType => I18NResource.GetString(ResourceDirectory, "TableType"); + /// ///Entity Access Policy /// diff --git a/src/Frapid.Web/Areas/Frapid.Calendar/I18N.cs b/src/Frapid.Web/Areas/Frapid.Calendar/I18N.cs index 32c2e170..c64f52f4 100644 --- a/src/Frapid.Web/Areas/Frapid.Calendar/I18N.cs +++ b/src/Frapid.Web/Areas/Frapid.Calendar/I18N.cs @@ -28,11 +28,21 @@ static I18N() /// public static string Calendar => I18NResource.GetString(ResourceDirectory, "Calendar"); + /// + ///Is Local Calendar + /// + public static string IsLocalCalendar => I18NResource.GetString(ResourceDirectory, "IsLocalCalendar"); + /// ///Audit User Id /// public static string AuditUserId => I18NResource.GetString(ResourceDirectory, "AuditUserId"); + /// + ///Starts At + /// + public static string StartsAt => I18NResource.GetString(ResourceDirectory, "StartsAt"); + /// ///Ends On /// @@ -53,6 +63,11 @@ static I18N() /// public static string EventId => I18NResource.GetString(ResourceDirectory, "EventId"); + /// + ///Audit Ts + /// + public static string AuditTs => I18NResource.GetString(ResourceDirectory, "AuditTs"); + /// ///Alarm /// @@ -79,69 +94,54 @@ static I18N() public static string CategoryId => I18NResource.GetString(ResourceDirectory, "CategoryId"); /// - ///Location - /// - public static string Location => I18NResource.GetString(ResourceDirectory, "Location"); - - /// - ///Url - /// - public static string Url => I18NResource.GetString(ResourceDirectory, "Url"); - - /// - ///Reminder Types - /// - public static string ReminderTypes => I18NResource.GetString(ResourceDirectory, "ReminderTypes"); - - /// - ///Category Name + ///Name /// - public static string CategoryName => I18NResource.GetString(ResourceDirectory, "CategoryName"); + public static string Name => I18NResource.GetString(ResourceDirectory, "Name"); /// - ///Is Private + ///Category Order /// - public static string IsPrivate => I18NResource.GetString(ResourceDirectory, "IsPrivate"); + public static string CategoryOrder => I18NResource.GetString(ResourceDirectory, "CategoryOrder"); /// - ///Is Local Calendar + ///Location /// - public static string IsLocalCalendar => I18NResource.GetString(ResourceDirectory, "IsLocalCalendar"); + public static string Location => I18NResource.GetString(ResourceDirectory, "Location"); /// - ///Starts At + ///User Id /// - public static string StartsAt => I18NResource.GetString(ResourceDirectory, "StartsAt"); + public static string UserId => I18NResource.GetString(ResourceDirectory, "UserId"); /// - ///Audit Ts + ///Url /// - public static string AuditTs => I18NResource.GetString(ResourceDirectory, "AuditTs"); + public static string Url => I18NResource.GetString(ResourceDirectory, "Url"); /// - ///Name + ///Color Code /// - public static string Name => I18NResource.GetString(ResourceDirectory, "Name"); + public static string ColorCode => I18NResource.GetString(ResourceDirectory, "ColorCode"); /// - ///Category Order + ///Recurrence /// - public static string CategoryOrder => I18NResource.GetString(ResourceDirectory, "CategoryOrder"); + public static string Recurrence => I18NResource.GetString(ResourceDirectory, "Recurrence"); /// - ///User Id + ///Reminder Types /// - public static string UserId => I18NResource.GetString(ResourceDirectory, "UserId"); + public static string ReminderTypes => I18NResource.GetString(ResourceDirectory, "ReminderTypes"); /// - ///Color Code + ///Category Name /// - public static string ColorCode => I18NResource.GetString(ResourceDirectory, "ColorCode"); + public static string CategoryName => I18NResource.GetString(ResourceDirectory, "CategoryName"); /// - ///Recurrence + ///Is Private /// - public static string Recurrence => I18NResource.GetString(ResourceDirectory, "Recurrence"); + public static string IsPrivate => I18NResource.GetString(ResourceDirectory, "IsPrivate"); /// ///Is Local diff --git a/src/Frapid.Web/Areas/Frapid.Config/I18N.cs b/src/Frapid.Web/Areas/Frapid.Config/I18N.cs index 302ae9a8..9a8552ca 100644 --- a/src/Frapid.Web/Areas/Frapid.Config/I18N.cs +++ b/src/Frapid.Web/Areas/Frapid.Config/I18N.cs @@ -213,6 +213,11 @@ static I18N() /// public static string FromName => I18NResource.GetString(ResourceDirectory, "FromName"); + /// + ///Field Order + /// + public static string FieldOrder => I18NResource.GetString(ResourceDirectory, "FieldOrder"); + /// ///Kanban Name /// @@ -328,11 +333,6 @@ static I18N() /// public static string ReplyToName => I18NResource.GetString(ResourceDirectory, "ReplyToName"); - /// - ///Field Order - /// - public static string FieldOrder => I18NResource.GetString(ResourceDirectory, "FieldOrder"); - /// ///Offices /// diff --git a/src/Frapid.Web/Areas/Frapid.Reports/AppInfo.json b/src/Frapid.Web/Areas/Frapid.Reports/AppInfo.json index 8a84d036..fe6c77a9 100644 --- a/src/Frapid.Web/Areas/Frapid.Reports/AppInfo.json +++ b/src/Frapid.Web/Areas/Frapid.Reports/AppInfo.json @@ -19,7 +19,7 @@ "PatchFilePath" : null, "InstallSample": false, "My": null, - "OverrideTemplatePath": "", - "OverrideDestination":"", + "OverrideTemplatePath": "~/Areas/Frapid.Reports/Overrides", + "OverrideDestination":"~/Tenants/{0}/Areas", "DependsOn": ["Frapid", "Frapid.Config"] } \ No newline at end of file diff --git a/src/Frapid.Web/Areas/Frapid.Reports/I18N.cs b/src/Frapid.Web/Areas/Frapid.Reports/I18N.cs index 90ed2d24..daf912cd 100644 --- a/src/Frapid.Web/Areas/Frapid.Reports/I18N.cs +++ b/src/Frapid.Web/Areas/Frapid.Reports/I18N.cs @@ -194,14 +194,14 @@ static I18N() public static string DisplayContactForm => I18NResource.GetString(ResourceDirectory, "DisplayContactForm"); /// - ///Unsubscribed + ///Seo Description /// - public static string Unsubscribed => I18NResource.GetString(ResourceDirectory, "Unsubscribed"); + public static string SeoDescription => I18NResource.GetString(ResourceDirectory, "SeoDescription"); /// - ///Seo Description + ///Unsubscribed /// - public static string SeoDescription => I18NResource.GetString(ResourceDirectory, "SeoDescription"); + public static string Unsubscribed => I18NResource.GetString(ResourceDirectory, "Unsubscribed"); /// ///Parent Menu Item Id @@ -304,14 +304,14 @@ static I18N() public static string WebsiteName => I18NResource.GetString(ResourceDirectory, "WebsiteName"); /// - ///Is Default + ///Is Homepage /// - public static string IsDefault => I18NResource.GetString(ResourceDirectory, "IsDefault"); + public static string IsHomepage => I18NResource.GetString(ResourceDirectory, "IsHomepage"); /// - ///Is Homepage + ///Is Default /// - public static string IsHomepage => I18NResource.GetString(ResourceDirectory, "IsHomepage"); + public static string IsDefault => I18NResource.GetString(ResourceDirectory, "IsDefault"); /// ///Subscription Type @@ -359,14 +359,14 @@ static I18N() public static string AuditUserId => I18NResource.GetString(ResourceDirectory, "AuditUserId"); /// - ///Confirmed On + ///Deleted /// - public static string ConfirmedOn => I18NResource.GetString(ResourceDirectory, "ConfirmedOn"); + public static string Deleted => I18NResource.GetString(ResourceDirectory, "Deleted"); /// - ///Deleted + ///Confirmed On /// - public static string Deleted => I18NResource.GetString(ResourceDirectory, "Deleted"); + public static string ConfirmedOn => I18NResource.GetString(ResourceDirectory, "ConfirmedOn"); /// ///Created On diff --git a/src/Frapid.Web/Areas/Frapid.Reports/Overrides/Frapid.Reports/Assets/Header.html b/src/Frapid.Web/Areas/Frapid.Reports/Overrides/Frapid.Reports/Assets/Header.html new file mode 100644 index 00000000..c5e3add8 --- /dev/null +++ b/src/Frapid.Web/Areas/Frapid.Reports/Overrides/Frapid.Reports/Assets/Header.html @@ -0,0 +1,21 @@ +
+

+ Logo +

+

{Meta.OfficeName}

+

+ {Meta.Street}, {Meta.City}, {Meta.State}, {Meta.Country}. + {i18n.Phone} : {Meta.Phone}. {i18n.Fax} : {Meta.Fax}. +
+ {i18n.Email} : {Meta.Email} + {i18n.Url} : + {Meta.Url} +

+ +{i18n.PreparedOn} : {PrintDate}. +{i18n.User} : {Meta.UserName} +
+{i18n.OfficeCode} : {Meta.OfficeCode} +
+
+
\ No newline at end of file diff --git a/src/Frapid.Web/Areas/Frapid.Reports/Overrides/Frapid.Reports/Assets/Print.html b/src/Frapid.Web/Areas/Frapid.Reports/Overrides/Frapid.Reports/Assets/Print.html new file mode 100644 index 00000000..fc608dce --- /dev/null +++ b/src/Frapid.Web/Areas/Frapid.Reports/Overrides/Frapid.Reports/Assets/Print.html @@ -0,0 +1,50 @@ + + + + Frapid + + + + + {Header} +
+ + Print + +   + + Close + +
+

+ {ReportHeading} +

+
+ Printed On: {PrintDate}
+ User: {UserName}
+ Office Code: {OfficeCode} +
+
+ {Table} +
+ + Close This Report + +
+ + + + \ No newline at end of file diff --git a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Controllers/WebsiteBuilderController.cs b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Controllers/WebsiteBuilderController.cs index 7899e99b..095c7155 100644 --- a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Controllers/WebsiteBuilderController.cs +++ b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Controllers/WebsiteBuilderController.cs @@ -97,9 +97,7 @@ protected string GetRazorView(string areaName, string path, string tenant) Log.Verbose($"Resolved tenant \"{tenant}\" and theme \"{theme}\"."); - string overridePath = "~/Tenants/{0}/Areas/Frapid.WebsiteBuilder/Themes/{1}/Areas/{2}/Views/" + path; - overridePath = string.Format(CultureInfo.InvariantCulture, overridePath, tenant, theme, areaName); - + string overridePath = $"~/Tenants/{tenant}/Areas/Frapid.WebsiteBuilder/Themes/{theme}/Areas/{areaName}/Views/" + path; Log.Verbose($"Checking if there is an overridden view present on the theme path \"{overridePath}\"."); if (System.IO.File.Exists(HostingEnvironment.MapPath(overridePath))) @@ -108,8 +106,7 @@ protected string GetRazorView(string areaName, string path, string tenant) return overridePath; } - overridePath = "~/Tenants/{0}/Areas/{1}/Themes/{2}/Views/" + path; - overridePath = string.Format(CultureInfo.InvariantCulture, overridePath, tenant, areaName, theme); + overridePath = $"~/Tenants/{tenant}/Areas/{areaName}/Views/" + path; Log.Verbose($"Checking if there is an overridden view present on the tenant path \"{overridePath}\"."); @@ -119,9 +116,7 @@ protected string GetRazorView(string areaName, string path, string tenant) return overridePath; } - string defaultPath = "~/Areas/{0}/Views/{1}"; - defaultPath = string.Format(CultureInfo.InvariantCulture, defaultPath, areaName, path); - + string defaultPath = $"~/Areas/{areaName}/Views/{path}"; Log.Verbose($"The view \"{path}\" was located on area \"{areaName}\" on path \"{defaultPath}\"."); return defaultPath; diff --git a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/DAL/Configurations.cs b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/DAL/Configurations.cs index a44c39a4..97b28d31 100644 --- a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/DAL/Configurations.cs +++ b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/DAL/Configurations.cs @@ -15,6 +15,8 @@ public class Configurations { var sql = new Sql("SELECT * FROM website.configurations"); sql.Where("is_default=@0", true); + sql.And("deleted=@0",false); + sql.Limit(db.DatabaseType, 1, 0, "configuration_id"); var awaiter = await db.SelectAsync(sql).ConfigureAwait(false); diff --git a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/DAL/Contents.cs b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/DAL/Contents.cs index 4f5d6d1d..a9999b75 100644 --- a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/DAL/Contents.cs +++ b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/DAL/Contents.cs @@ -21,6 +21,7 @@ public static async Task> GetContentsAsync(string tenant) { var sql = new Sql("SELECT * FROM website.contents"); sql.Where("is_homepage=@0", true); + sql.And("deleted=@0",false); return await db.SelectAsync(sql).ConfigureAwait(false); } @@ -56,6 +57,7 @@ public static async Task GetAsync(string tenant, int contentId) { var sql = new Sql("SELECT * FROM website.contents"); sql.Where("content_id=@0", contentId); + sql.And("deleted=@0",false); var awaiter = await db.SelectAsync(sql).ConfigureAwait(false); return awaiter.FirstOrDefault(); diff --git a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Resources.cs b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Resources.cs index 0671d303..0aca3808 100644 --- a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Resources.cs +++ b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Resources.cs @@ -199,14 +199,14 @@ static Resources() public static string DisplayContactForm => I18NResource.GetString(ResourceDirectory, "DisplayContactForm"); /// - ///Unsubscribed + ///Seo Description /// - public static string Unsubscribed => I18NResource.GetString(ResourceDirectory, "Unsubscribed"); + public static string SeoDescription => I18NResource.GetString(ResourceDirectory, "SeoDescription"); /// - ///Seo Description + ///Unsubscribed /// - public static string SeoDescription => I18NResource.GetString(ResourceDirectory, "SeoDescription"); + public static string Unsubscribed => I18NResource.GetString(ResourceDirectory, "Unsubscribed"); /// ///Parent Menu Item Id @@ -309,14 +309,14 @@ static Resources() public static string WebsiteName => I18NResource.GetString(ResourceDirectory, "WebsiteName"); /// - ///Is Default + ///Is Homepage /// - public static string IsDefault => I18NResource.GetString(ResourceDirectory, "IsDefault"); + public static string IsHomepage => I18NResource.GetString(ResourceDirectory, "IsHomepage"); /// - ///Is Homepage + ///Is Default /// - public static string IsHomepage => I18NResource.GetString(ResourceDirectory, "IsHomepage"); + public static string IsDefault => I18NResource.GetString(ResourceDirectory, "IsDefault"); /// ///Subscription Type @@ -364,14 +364,14 @@ static Resources() public static string AuditUserId => I18NResource.GetString(ResourceDirectory, "AuditUserId"); /// - ///Confirmed On + ///Deleted /// - public static string ConfirmedOn => I18NResource.GetString(ResourceDirectory, "ConfirmedOn"); + public static string Deleted => I18NResource.GetString(ResourceDirectory, "Deleted"); /// - ///Deleted + ///Confirmed On /// - public static string Deleted => I18NResource.GetString(ResourceDirectory, "Deleted"); + public static string ConfirmedOn => I18NResource.GetString(ResourceDirectory, "ConfirmedOn"); /// ///Created On diff --git a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Views/Frontend/ContactUs/ContactForm.cshtml b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Views/Frontend/ContactUs/ContactForm.cshtml index 30967216..97fc188c 100644 --- a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Views/Frontend/ContactUs/ContactForm.cshtml +++ b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/Views/Frontend/ContactUs/ContactForm.cshtml @@ -1,5 +1,4 @@ -@using Frapid.i18n -@using Frapid.WebsiteBuilder +@using Frapid.WebsiteBuilder @model Frapid.WebsiteBuilder.ViewModels.ContactForm - + \ No newline at end of file diff --git a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/scripts/layout/Index.js b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/scripts/layout/Index.js index f56b9139..fa6346da 100644 --- a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/scripts/layout/Index.js +++ b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/scripts/layout/Index.js @@ -53,7 +53,7 @@ uploadButton.click(function() { }); function confirmAction() { - const areYouSure = window.Resources.AreYouSure || "Are you sure?"; + const areYouSure = window.translate("AreYouSure") || "Are you sure?"; return confirm(areYouSure); }; diff --git a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/scripts/layout/index.js b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/scripts/layout/index.js index f56b9139..fa6346da 100644 --- a/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/scripts/layout/index.js +++ b/src/Frapid.Web/Areas/Frapid.WebsiteBuilder/scripts/layout/index.js @@ -53,7 +53,7 @@ uploadButton.click(function() { }); function confirmAction() { - const areYouSure = window.Resources.AreYouSure || "Are you sure?"; + const areYouSure = window.translate("AreYouSure") || "Are you sure?"; return confirm(areYouSure); }; diff --git a/src/Frapid.Web/Areas/MixERP.Social/Resources.cs b/src/Frapid.Web/Areas/MixERP.Social/Resources.cs index 044729d2..934a5616 100644 --- a/src/Frapid.Web/Areas/MixERP.Social/Resources.cs +++ b/src/Frapid.Web/Areas/MixERP.Social/Resources.cs @@ -33,11 +33,26 @@ static Resources() /// public static string IsPublic => I18NResource.GetString(ResourceDirectory, "IsPublic"); + /// + ///Role Id + /// + public static string RoleId => I18NResource.GetString(ResourceDirectory, "RoleId"); + /// ///Deleted /// public static string Deleted => I18NResource.GetString(ResourceDirectory, "Deleted"); + /// + ///Audit Ts + /// + public static string AuditTs => I18NResource.GetString(ResourceDirectory, "AuditTs"); + + /// + ///Scope + /// + public static string Scope => I18NResource.GetString(ResourceDirectory, "Scope"); + /// ///Attachments /// @@ -59,64 +74,49 @@ static Resources() public static string LikedByName => I18NResource.GetString(ResourceDirectory, "LikedByName"); /// - ///Feed Id - /// - public static string FeedId => I18NResource.GetString(ResourceDirectory, "FeedId"); - - /// - ///Deleted On - /// - public static string DeletedOn => I18NResource.GetString(ResourceDirectory, "DeletedOn"); - - /// - ///Unliked - /// - public static string Unliked => I18NResource.GetString(ResourceDirectory, "Unliked"); - - /// - ///Unliked On + ///Formatted Text /// - public static string UnlikedOn => I18NResource.GetString(ResourceDirectory, "UnlikedOn"); + public static string FormattedText => I18NResource.GetString(ResourceDirectory, "FormattedText"); /// - ///Role Id + ///User Id /// - public static string RoleId => I18NResource.GetString(ResourceDirectory, "RoleId"); + public static string UserId => I18NResource.GetString(ResourceDirectory, "UserId"); /// - ///Audit Ts + ///Liked By /// - public static string AuditTs => I18NResource.GetString(ResourceDirectory, "AuditTs"); + public static string LikedBy => I18NResource.GetString(ResourceDirectory, "LikedBy"); /// - ///Scope + ///Feed Id /// - public static string Scope => I18NResource.GetString(ResourceDirectory, "Scope"); + public static string FeedId => I18NResource.GetString(ResourceDirectory, "FeedId"); /// - ///Formatted Text + ///Deleted On /// - public static string FormattedText => I18NResource.GetString(ResourceDirectory, "FormattedText"); + public static string DeletedOn => I18NResource.GetString(ResourceDirectory, "DeletedOn"); /// - ///User Id + ///Deleted By /// - public static string UserId => I18NResource.GetString(ResourceDirectory, "UserId"); + public static string DeletedBy => I18NResource.GetString(ResourceDirectory, "DeletedBy"); /// - ///Liked By + ///Parent Feed Id /// - public static string LikedBy => I18NResource.GetString(ResourceDirectory, "LikedBy"); + public static string ParentFeedId => I18NResource.GetString(ResourceDirectory, "ParentFeedId"); /// - ///Deleted By + ///Unliked /// - public static string DeletedBy => I18NResource.GetString(ResourceDirectory, "DeletedBy"); + public static string Unliked => I18NResource.GetString(ResourceDirectory, "Unliked"); /// - ///Parent Feed Id + ///Unliked On /// - public static string ParentFeedId => I18NResource.GetString(ResourceDirectory, "ParentFeedId"); + public static string UnlikedOn => I18NResource.GetString(ResourceDirectory, "UnlikedOn"); /// ///Event Timestamp diff --git a/src/Frapid.Web/Reports/Assets/Header.html b/src/Frapid.Web/Reports/Assets/Header.html index c5e3add8..50779522 100644 --- a/src/Frapid.Web/Reports/Assets/Header.html +++ b/src/Frapid.Web/Reports/Assets/Header.html @@ -7,7 +7,7 @@

{Meta.OfficeName}

{Meta.Street}, {Meta.City}, {Meta.State}, {Meta.Country}. {i18n.Phone} : {Meta.Phone}. {i18n.Fax} : {Meta.Fax}.
- {i18n.Email} : {Meta.Email} + {i18n.Email} : {Meta.OfficeEmail} {i18n.Url} : {Meta.Url}

diff --git a/src/Frapid.Web/db/PostgreSQL/1.x/1.0/core-blank.sql b/src/Frapid.Web/db/PostgreSQL/1.x/1.0/core-blank.sql index d8be5594..80196691 100644 --- a/src/Frapid.Web/db/PostgreSQL/1.x/1.0/core-blank.sql +++ b/src/Frapid.Web/db/PostgreSQL/1.x/1.0/core-blank.sql @@ -677,24 +677,6 @@ CREATE TABLE core.offices deleted boolean DEFAULT(false) ); -CREATE TABLE core.frequencies -( - frequency_id SERIAL PRIMARY KEY, - frequency_code national character varying(12) NOT NULL, - frequency_name national character varying(50) NOT NULL, - audit_user_id integer, - audit_ts TIMESTAMP WITH TIME ZONE DEFAULT(NOW()), - deleted boolean DEFAULT(false) -); - - -CREATE UNIQUE INDEX frequencies_frequency_code_uix -ON core.frequencies(UPPER(frequency_code)) -WHERE NOT deleted; - -CREATE UNIQUE INDEX frequencies_frequency_name_uix -ON core.frequencies(UPPER(frequency_name)) -WHERE NOT deleted; CREATE TABLE core.verification_statuses diff --git a/src/Frapid.Web/db/PostgreSQL/1.x/1.0/src/01.types-domains-tables-and-constraints/tables-and-constraints.sql b/src/Frapid.Web/db/PostgreSQL/1.x/1.0/src/01.types-domains-tables-and-constraints/tables-and-constraints.sql index cae738bc..a404d361 100644 --- a/src/Frapid.Web/db/PostgreSQL/1.x/1.0/src/01.types-domains-tables-and-constraints/tables-and-constraints.sql +++ b/src/Frapid.Web/db/PostgreSQL/1.x/1.0/src/01.types-domains-tables-and-constraints/tables-and-constraints.sql @@ -102,25 +102,6 @@ CREATE TABLE core.offices deleted boolean DEFAULT(false) ); -CREATE TABLE core.frequencies -( - frequency_id SERIAL PRIMARY KEY, - frequency_code national character varying(12) NOT NULL, - frequency_name national character varying(50) NOT NULL, - audit_user_id integer, - audit_ts TIMESTAMP WITH TIME ZONE DEFAULT(NOW()), - deleted boolean DEFAULT(false) -); - - -CREATE UNIQUE INDEX frequencies_frequency_code_uix -ON core.frequencies(UPPER(frequency_code)) -WHERE NOT deleted; - -CREATE UNIQUE INDEX frequencies_frequency_name_uix -ON core.frequencies(UPPER(frequency_name)) -WHERE NOT deleted; - CREATE TABLE core.verification_statuses ( diff --git a/src/Frapid.Web/db/PostgreSQL/core-blank.sql b/src/Frapid.Web/db/PostgreSQL/core-blank.sql index d8be5594..1159d81c 100644 --- a/src/Frapid.Web/db/PostgreSQL/core-blank.sql +++ b/src/Frapid.Web/db/PostgreSQL/core-blank.sql @@ -677,25 +677,6 @@ CREATE TABLE core.offices deleted boolean DEFAULT(false) ); -CREATE TABLE core.frequencies -( - frequency_id SERIAL PRIMARY KEY, - frequency_code national character varying(12) NOT NULL, - frequency_name national character varying(50) NOT NULL, - audit_user_id integer, - audit_ts TIMESTAMP WITH TIME ZONE DEFAULT(NOW()), - deleted boolean DEFAULT(false) -); - - -CREATE UNIQUE INDEX frequencies_frequency_code_uix -ON core.frequencies(UPPER(frequency_code)) -WHERE NOT deleted; - -CREATE UNIQUE INDEX frequencies_frequency_name_uix -ON core.frequencies(UPPER(frequency_name)) -WHERE NOT deleted; - CREATE TABLE core.verification_statuses ( diff --git a/src/Frapid.Web/db/SQL Server/1.x/1.0/core-blank.sql b/src/Frapid.Web/db/SQL Server/1.x/1.0/core-blank.sql index 8bdbceb6..dc4124b8 100644 --- a/src/Frapid.Web/db/SQL Server/1.x/1.0/core-blank.sql +++ b/src/Frapid.Web/db/SQL Server/1.x/1.0/core-blank.sql @@ -778,25 +778,6 @@ CREATE TABLE core.offices deleted bit DEFAULT(0) ); -CREATE TABLE core.frequencies -( - frequency_id int IDENTITY PRIMARY KEY, - frequency_code national character varying(12) NOT NULL, - frequency_name national character varying(50) NOT NULL, - audit_user_id integer, - audit_ts DATETIMEOFFSET NULL DEFAULT(GETUTCDATE()), - deleted bit DEFAULT(0) -); - - -CREATE UNIQUE INDEX frequencies_frequency_code_uix -ON core.frequencies(frequency_code) -WHERE deleted = 0; - -CREATE UNIQUE INDEX frequencies_frequency_name_uix -ON core.frequencies(frequency_name) -WHERE deleted = 0; - CREATE TABLE core.verification_statuses ( diff --git a/src/Frapid.Web/db/SQL Server/1.x/1.0/src/01.types-domains-tables-and-constraints/1. tables-and-constraints.sql b/src/Frapid.Web/db/SQL Server/1.x/1.0/src/01.types-domains-tables-and-constraints/1. tables-and-constraints.sql index 04f2f24b..df0e60b4 100644 --- a/src/Frapid.Web/db/SQL Server/1.x/1.0/src/01.types-domains-tables-and-constraints/1. tables-and-constraints.sql +++ b/src/Frapid.Web/db/SQL Server/1.x/1.0/src/01.types-domains-tables-and-constraints/1. tables-and-constraints.sql @@ -100,25 +100,6 @@ CREATE TABLE core.offices deleted bit DEFAULT(0) ); -CREATE TABLE core.frequencies -( - frequency_id int IDENTITY PRIMARY KEY, - frequency_code national character varying(12) NOT NULL, - frequency_name national character varying(50) NOT NULL, - audit_user_id integer, - audit_ts DATETIMEOFFSET NULL DEFAULT(GETUTCDATE()), - deleted bit DEFAULT(0) -); - - -CREATE UNIQUE INDEX frequencies_frequency_code_uix -ON core.frequencies(frequency_code) -WHERE deleted = 0; - -CREATE UNIQUE INDEX frequencies_frequency_name_uix -ON core.frequencies(frequency_name) -WHERE deleted = 0; - CREATE TABLE core.verification_statuses ( diff --git a/src/Frapid.Web/db/SQL Server/core-blank.sql b/src/Frapid.Web/db/SQL Server/core-blank.sql index 8bdbceb6..dc4124b8 100644 --- a/src/Frapid.Web/db/SQL Server/core-blank.sql +++ b/src/Frapid.Web/db/SQL Server/core-blank.sql @@ -778,25 +778,6 @@ CREATE TABLE core.offices deleted bit DEFAULT(0) ); -CREATE TABLE core.frequencies -( - frequency_id int IDENTITY PRIMARY KEY, - frequency_code national character varying(12) NOT NULL, - frequency_name national character varying(50) NOT NULL, - audit_user_id integer, - audit_ts DATETIMEOFFSET NULL DEFAULT(GETUTCDATE()), - deleted bit DEFAULT(0) -); - - -CREATE UNIQUE INDEX frequencies_frequency_code_uix -ON core.frequencies(frequency_code) -WHERE deleted = 0; - -CREATE UNIQUE INDEX frequencies_frequency_name_uix -ON core.frequencies(frequency_name) -WHERE deleted = 0; - CREATE TABLE core.verification_statuses ( diff --git a/src/Libraries/Frapid.ApplicationState/Cache/AppUsers.cs b/src/Libraries/Frapid.ApplicationState/Cache/AppUsers.cs index c1dab321..3c7dd492 100644 --- a/src/Libraries/Frapid.ApplicationState/Cache/AppUsers.cs +++ b/src/Libraries/Frapid.ApplicationState/Cache/AppUsers.cs @@ -118,6 +118,7 @@ private static Dictionary GetDictionary(string database, LoginVi dictionary.Add("Database", database); dictionary.Add("Culture", metaLogin.Culture); dictionary.Add("Email", metaLogin.Email); + dictionary.Add("OfficeEmail", metaLogin.OfficeEmail); dictionary.Add("Office", metaLogin.Office); dictionary.Add("OfficeId", metaLogin.OfficeId); dictionary.Add("OfficeCode", metaLogin.OfficeCode); diff --git a/src/Libraries/Frapid.ApplicationState/Models/LoginView.cs b/src/Libraries/Frapid.ApplicationState/Models/LoginView.cs index 860bb1bb..ff623704 100644 --- a/src/Libraries/Frapid.ApplicationState/Models/LoginView.cs +++ b/src/Libraries/Frapid.ApplicationState/Models/LoginView.cs @@ -30,6 +30,7 @@ public class LoginView : IPoco public string State { get; set; } public string ZipCode { get; set; } public string Country { get; set; } + public string OfficeEmail { get; set; } public string Phone { get; set; } public string Fax { get; set; } public string Url { get; set; } diff --git a/src/Libraries/Frapid.Messaging/DAL/MailQueue.cs b/src/Libraries/Frapid.Messaging/DAL/MailQueue.cs index 52e6d0f4..ab8a1876 100644 --- a/src/Libraries/Frapid.Messaging/DAL/MailQueue.cs +++ b/src/Libraries/Frapid.Messaging/DAL/MailQueue.cs @@ -23,6 +23,7 @@ public static async Task> GetMailInQueueAsync(string dat { var sql = new Sql("SELECT * FROM config.email_queue"); sql.Where("is_test=@0", false); + sql.And("deleted=@0",false); sql.Append("AND delivered=@0", false); sql.Append("AND canceled=@0", false); sql.Append("AND send_on<=" + FrapidDbServer.GetDbTimestampFunction(database)); diff --git a/src/Libraries/Frapid.Messaging/DAL/Smtp.cs b/src/Libraries/Frapid.Messaging/DAL/Smtp.cs index 78c4f775..6e2cbdea 100644 --- a/src/Libraries/Frapid.Messaging/DAL/Smtp.cs +++ b/src/Libraries/Frapid.Messaging/DAL/Smtp.cs @@ -15,6 +15,7 @@ public static async Task GetConfigAsync(string tenant) { var sql = new Sql("SELECT * FROM config.smtp_configs"); sql.Where("enabled=@0", true); + sql.And("deleted=@0",false); sql.And("is_default=@0", true); sql.Limit(db.DatabaseType, 1, 0, "smtp_config_id"); diff --git a/src/Libraries/Frapid.Messaging/DAL/TextMessageQueue.cs b/src/Libraries/Frapid.Messaging/DAL/TextMessageQueue.cs index b717667c..61998ea7 100644 --- a/src/Libraries/Frapid.Messaging/DAL/TextMessageQueue.cs +++ b/src/Libraries/Frapid.Messaging/DAL/TextMessageQueue.cs @@ -23,6 +23,7 @@ public static async Task> GetMailInQueueAsync(string datab { var sql = new Sql("SELECT * FROM config.sms_queue"); sql.Where("is_test=@0", false); + sql.Append("AND deleted=@0", false); sql.Append("AND delivered=@0", false); sql.Append("AND canceled=@0", false); sql.Append("AND send_on<=" + FrapidDbServer.GetDbTimestampFunction(database)); diff --git a/src/Libraries/Frapid.WebApi/DataAccess/FilterRepository.cs b/src/Libraries/Frapid.WebApi/DataAccess/FilterRepository.cs index 791f6341..da41c84f 100644 --- a/src/Libraries/Frapid.WebApi/DataAccess/FilterRepository.cs +++ b/src/Libraries/Frapid.WebApi/DataAccess/FilterRepository.cs @@ -56,7 +56,7 @@ public async Task> GetWhereAsync(long pageNumber, List item, object primaryKey int index = 0; - foreach (var prop in item.Where(x => !x.Key.Equals(this.IdentityColumn.ToPascalCase()))) + foreach (var prop in item.Where(x => !x.Key.Equals(this.IdentityColumn.Or(string.Empty).ToPascalCase()))) { if (index > 0) { diff --git a/src/Libraries/Frapid.WebApi/DataAccess/KanbanRepository.cs b/src/Libraries/Frapid.WebApi/DataAccess/KanbanRepository.cs index 1ec4ea7b..616d27ea 100644 --- a/src/Libraries/Frapid.WebApi/DataAccess/KanbanRepository.cs +++ b/src/Libraries/Frapid.WebApi/DataAccess/KanbanRepository.cs @@ -61,7 +61,7 @@ public async Task> GetAsync(long[] kanbanIds, object[] reso } - var sql = new Sql("SELECT * FROM config.kanban_details WHERE"); + var sql = new Sql("SELECT * FROM config.kanban_details WHERE deleted=@0 AND", false); sql.In("kanban_id IN(@0)", kanbanIds); sql.Append("AND"); sql.In("resource_id IN(@0)", resourceIds); diff --git a/src/Libraries/Frapid.i18n/Resources.cs b/src/Libraries/Frapid.i18n/Resources.cs index b6e84297..56b5bdd5 100644 --- a/src/Libraries/Frapid.i18n/Resources.cs +++ b/src/Libraries/Frapid.i18n/Resources.cs @@ -104,14 +104,14 @@ static Resources() public static string AppId => I18NResource.GetString(ResourceDirectory, "AppId"); /// - ///Hundredth Name + ///Url /// - public static string HundredthName => I18NResource.GetString(ResourceDirectory, "HundredthName"); + public static string Url => I18NResource.GetString(ResourceDirectory, "Url"); /// - ///Url + ///Hundredth Name /// - public static string Url => I18NResource.GetString(ResourceDirectory, "Url"); + public static string HundredthName => I18NResource.GetString(ResourceDirectory, "HundredthName"); /// ///Email @@ -134,14 +134,14 @@ static Resources() public static string ToRoleId => I18NResource.GetString(ResourceDirectory, "ToRoleId"); /// - ///Gender Code + ///Verification Status Id /// - public static string GenderCode => I18NResource.GetString(ResourceDirectory, "GenderCode"); + public static string VerificationStatusId => I18NResource.GetString(ResourceDirectory, "VerificationStatusId"); /// - ///Verification Status Id + ///Gender Code /// - public static string VerificationStatusId => I18NResource.GetString(ResourceDirectory, "VerificationStatusId"); + public static string GenderCode => I18NResource.GetString(ResourceDirectory, "GenderCode"); /// ///Country @@ -349,14 +349,14 @@ static Resources() public static string OfficeName => I18NResource.GetString(ResourceDirectory, "OfficeName"); /// - ///Currency Name + ///Country Code /// - public static string CurrencyName => I18NResource.GetString(ResourceDirectory, "CurrencyName"); + public static string CountryCode => I18NResource.GetString(ResourceDirectory, "CountryCode"); /// - ///Country Code + ///Currency Name /// - public static string CountryCode => I18NResource.GetString(ResourceDirectory, "CountryCode"); + public static string CurrencyName => I18NResource.GetString(ResourceDirectory, "CurrencyName"); /// ///Event Timestamp