diff --git a/SaBusMgrCoreWeb/Web/App/SbmSessionData_Web.cs b/SaBusMgrCoreWeb/Web/App/SbmSessionData_Web.cs index 5a337e8..b2056f9 100644 --- a/SaBusMgrCoreWeb/Web/App/SbmSessionData_Web.cs +++ b/SaBusMgrCoreWeb/Web/App/SbmSessionData_Web.cs @@ -33,6 +33,19 @@ namespace Sarand.BusinessMgr.Net.Core.Web.App } } + //------------------------------------------------------------------- + // Contacts. + public class ContactsData + { + public class FilterData + { + public uint PageNo { get; set; } = 1; + public ushort PageLength { get; set; } = 16; + } + public FilterData Filter { get; } = new FilterData(); + } + public ContactsData Contacts { get; } = new ContactsData(); + //------------------------------------------------------------------- } //======================================================================= diff --git a/SaBusMgrCoreWeb/Web/Controllers/SbmController_Base.cs b/SaBusMgrCoreWeb/Web/Controllers/SbmController_Base.cs index 7d4c87c..294c0f3 100644 --- a/SaBusMgrCoreWeb/Web/Controllers/SbmController_Base.cs +++ b/SaBusMgrCoreWeb/Web/Controllers/SbmController_Base.cs @@ -380,6 +380,8 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Controllers return Json(responseData); } + //------------------------------------------------------------------- + // Base Ajax Response Data. //------------------------------------------------------------------- public class AjaxResponse_Base { @@ -418,13 +420,30 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Controllers } } + //------------------------------------------------------------------- + // Ajax Response Data. //------------------------------------------------------------------- public class AjaxResponse_Data : AjaxResponse_Base { + //--------------------------------------------------------------- // Construction. protected AjaxResponse_Data(SbmModel_Base model) { } + + //--------------------------------------------------------------- + public class ItemData + { + public String Id { get; set; } + public String Notes { get; set; } + public String StatusCode { get; set; } + public String StatusDesc { get; set; } + public Boolean Awaiting { get { return StatusCode.EqualsCI(SacsSystem.GetStatusCode(SaStatus.Awaiting)); } } + public Boolean Active { get { return StatusCode.EqualsCI(SacsSystem.GetStatusCode(SaStatus.Active)); } } + public Boolean Deleted { get { return StatusCode.EqualsCI(SacsSystem.GetStatusCode(SaStatus.Deleted)); } } + } + + //--------------------------------------------------------------- // Form data. public class FormControlValue { @@ -477,6 +496,8 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Controllers } return false; } + + //--------------------------------------------------------------- // Notification - briefly displays after response received. public class NotificationData { @@ -490,6 +511,8 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Controllers Notification = new NotificationData() { Title = title, Message = message }; return this; } + + //--------------------------------------------------------------- // Paged data. public class PagingData { @@ -515,6 +538,8 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Controllers { Paging = new PagingData(model); } + + //--------------------------------------------------------------- } //------------------------------------------------------------------- diff --git a/SaBusMgrStandardBase/Base/App/SbmInternals.cs b/SaBusMgrStandardBase/Base/App/SbmInternals.cs index 3d3c28f..a183e89 100644 --- a/SaBusMgrStandardBase/Base/App/SbmInternals.cs +++ b/SaBusMgrStandardBase/Base/App/SbmInternals.cs @@ -111,8 +111,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App { if (!systemCodeCache.ContainsKey(systemCode)) systemCodeCache.Add(systemCode, SbmSystem.GetCodesOfType(UserContext, systemCode)); - return systemCodeCache.GetValueOrDefault(systemCode, new List()); + return new List(systemCodeCache.GetValueOrDefault(systemCode, new List())); } + public List AffiliateTypeCodes { get { return GetCodesOfType(Sbm.SystemCode.AffiliateType); } } //------------------------------------------------------------------- // Managers. diff --git a/SaBusMgrStandardBase/Base/App/SbmSecurityProfile.cs b/SaBusMgrStandardBase/Base/App/SbmSecurityProfile.cs index b8bad32..2d56087 100644 --- a/SaBusMgrStandardBase/Base/App/SbmSecurityProfile.cs +++ b/SaBusMgrStandardBase/Base/App/SbmSecurityProfile.cs @@ -1,4 +1,5 @@ -using Sarand.BusinessMgr.Net.Standard.Base.Bus; +using Newtonsoft.Json; +using Sarand.BusinessMgr.Net.Standard.Base.Bus; using Sarand.Net.Standard.Base.App; using Sarand.Net.Standard.Base.Bus; using Sarand.Net.Standard.Base.Core; @@ -35,6 +36,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App //------------------------------------------------------------------- // Properties. + [JsonIgnore] public SbmUserContext UserContext { get; } //------------------------------------------------------------------- diff --git a/SaBusMgrStandardBase/Base/App/SbmSessionContext.cs b/SaBusMgrStandardBase/Base/App/SbmSessionContext.cs index 7f1f5ed..07602ad 100644 --- a/SaBusMgrStandardBase/Base/App/SbmSessionContext.cs +++ b/SaBusMgrStandardBase/Base/App/SbmSessionContext.cs @@ -1,4 +1,5 @@ -using Sarand.Net.Standard.Base.App; +using Newtonsoft.Json; +using Sarand.Net.Standard.Base.App; namespace Sarand.BusinessMgr.Net.Standard.Base.App { @@ -7,6 +8,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App { //------------------------------------------------------------------- // Construction. + [JsonConstructor] protected SbmSessionContext(ushort index, Sbm.Application application) : base(index) { Index = index; diff --git a/SaBusMgrStandardBase/Base/Bus/SbmAffiliate.cs b/SaBusMgrStandardBase/Base/Bus/SbmAffiliate.cs index 32b5b50..f2def08 100644 --- a/SaBusMgrStandardBase/Base/Bus/SbmAffiliate.cs +++ b/SaBusMgrStandardBase/Base/Bus/SbmAffiliate.cs @@ -19,6 +19,8 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus Pos, Id, // Affiliate. + Type, + Type_Code, Type_Desc, Name, Abbrev, @@ -734,7 +736,11 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus // List parameters. public enum StatusCat { - Any, ActiveOnly, + Any, + CurrentOnly, + OnHoldOnly, + NotDeleted, + DeletedOnly, } /// /// Item list parameters. @@ -748,6 +754,8 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus public Sbm.AffiliateType AffiliateType { get; set; } = Sbm.AffiliateType.Any; public SysId AffiliateIdParent { get; set; } public SysId UserId { get; set; } + /// Generic search value - name, phone, website, address etc. + public String Search { get; set; } public String Name { get; set; } public String NamePartial { get; set; } public String PhonePartial { get; set; } diff --git a/SaBusMgrStandardBase/Base/Mgr/SbmAccountMgr_Affiliate.cs b/SaBusMgrStandardBase/Base/Mgr/SbmAccountMgr_Affiliate.cs index 15749b7..73f5ff7 100644 --- a/SaBusMgrStandardBase/Base/Mgr/SbmAccountMgr_Affiliate.cs +++ b/SaBusMgrStandardBase/Base/Mgr/SbmAccountMgr_Affiliate.cs @@ -378,10 +378,13 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr switch ((SbmAffiliate.Column)column.Id) { // Affiliate type description. + case SbmAffiliate.Column.Type_Code: case SbmAffiliate.Column.Type_Desc: { Sbm.AffiliateType affiliateType = (Sbm.AffiliateType)values.GetValue(column.DataName).AsLong(); - value = new DataValue(AffiliateTypes.GetDescForType(affiliateType, affiliateType.ToString())); + if (column.Id == (int)SbmAffiliate.Column.Type_Desc) + value = new DataValue(AffiliateTypes.GetDescForType(affiliateType, affiliateType.ToString())); + else value = new DataValue(AffiliateTypes.GetCodeForType(affiliateType, affiliateType.ToString())); } break; diff --git a/SaBusMgrStandardBase/Resource/Email/Shared/sbm-email-footer.html b/SaBusMgrStandardBase/Resource/Email/Shared/sbm-email-footer.html deleted file mode 100644 index 1c5016a..0000000 --- a/SaBusMgrStandardBase/Resource/Email/Shared/sbm-email-footer.html +++ /dev/null @@ -1,3 +0,0 @@ -
-
Email Footer
-
diff --git a/SaBusMgrStandardBase/Resource/Email/Security/sbm-email-request-password.html b/SaBusMgrStandardBase/Resources/Email/Security/sbm-email-request-password.html similarity index 92% rename from SaBusMgrStandardBase/Resource/Email/Security/sbm-email-request-password.html rename to SaBusMgrStandardBase/Resources/Email/Security/sbm-email-request-password.html index 3f1f8b3..c56a29d 100644 --- a/SaBusMgrStandardBase/Resource/Email/Security/sbm-email-request-password.html +++ b/SaBusMgrStandardBase/Resources/Email/Security/sbm-email-request-password.html @@ -16,6 +16,7 @@
Follow this link to set a new password against your account.
This link will expire in [#Link.ExpiresMinutes] minutes.
Thank you.
+
Sarand BusinessMgr team
[#Email.Footer] diff --git a/SaBusMgrStandardBase/Resources/Email/Shared/sbm-email-footer.html b/SaBusMgrStandardBase/Resources/Email/Shared/sbm-email-footer.html new file mode 100644 index 0000000..37d3726 --- /dev/null +++ b/SaBusMgrStandardBase/Resources/Email/Shared/sbm-email-footer.html @@ -0,0 +1,3 @@ +
+
+
diff --git a/SaBusMgrStandardBase/Resource/Email/Shared/sbm-email-header.html b/SaBusMgrStandardBase/Resources/Email/Shared/sbm-email-header.html similarity index 100% rename from SaBusMgrStandardBase/Resource/Email/Shared/sbm-email-header.html rename to SaBusMgrStandardBase/Resources/Email/Shared/sbm-email-header.html diff --git a/SaBusMgrStandardBase/Resource/Email/Style/sbm-email-main.css b/SaBusMgrStandardBase/Resources/Email/Style/sbm-email-main.css similarity index 88% rename from SaBusMgrStandardBase/Resource/Email/Style/sbm-email-main.css rename to SaBusMgrStandardBase/Resources/Email/Style/sbm-email-main.css index 0b5b642..53572ba 100644 --- a/SaBusMgrStandardBase/Resource/Email/Style/sbm-email-main.css +++ b/SaBusMgrStandardBase/Resources/Email/Style/sbm-email-main.css @@ -1,9 +1,14 @@ -body +html +{ + font-size:10px; +} + +body { margin: 0; padding: 0; font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 16px; + font-size: 1.6rem; line-height: 1.5; background-color: #fff; } @@ -32,6 +37,7 @@ td .sax-email-header .sax-content { + font-size:2.3rem; } .sax-email-body @@ -41,7 +47,7 @@ td .sax-email-panel-caption { margin: 12px 0; - font-size: 40px; + font-size: 3.2rem; font-weight: bold; color: #000; background-color: transparent; @@ -60,7 +66,7 @@ td td.sax-label { padding: 4px 12px; - font-size: 16px; + font-size: 1.6rem; text-align: right; color: #808080; white-space: nowrap; @@ -69,7 +75,7 @@ td.sax-label td.sax-value { padding-top: 4px; - font-size: 16px; + font-size: 1.6rem; } .sax-email-footer @@ -81,6 +87,7 @@ td.sax-value .sax-email-footer .sax-content { padding:12px 24px; + font-size:1.2rem; } .sax-email-footer .sax-content .sax-footer-lower diff --git a/SaBusMgrStandardBase/Resource/html/sbm-base.css b/SaBusMgrStandardBase/Resources/html/sbm-base.css similarity index 100% rename from SaBusMgrStandardBase/Resource/html/sbm-base.css rename to SaBusMgrStandardBase/Resources/html/sbm-base.css diff --git a/SaBusMgrStandardBase/Resource/html/sbm-base.js b/SaBusMgrStandardBase/Resources/html/sbm-base.js similarity index 100% rename from SaBusMgrStandardBase/Resource/html/sbm-base.js rename to SaBusMgrStandardBase/Resources/html/sbm-base.js diff --git a/SaBusMgrStandardBase/Resource/img/arrow-down-black-16.png b/SaBusMgrStandardBase/Resources/img/arrow-down-black-16.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/arrow-down-black-16.png rename to SaBusMgrStandardBase/Resources/img/arrow-down-black-16.png diff --git a/SaBusMgrStandardBase/Resource/img/arrow-down-black-24.png b/SaBusMgrStandardBase/Resources/img/arrow-down-black-24.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/arrow-down-black-24.png rename to SaBusMgrStandardBase/Resources/img/arrow-down-black-24.png diff --git a/SaBusMgrStandardBase/Resource/img/arrow-up-black-16.png b/SaBusMgrStandardBase/Resources/img/arrow-up-black-16.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/arrow-up-black-16.png rename to SaBusMgrStandardBase/Resources/img/arrow-up-black-16.png diff --git a/SaBusMgrStandardBase/Resource/img/arrow-up-black-24.png b/SaBusMgrStandardBase/Resources/img/arrow-up-black-24.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/arrow-up-black-24.png rename to SaBusMgrStandardBase/Resources/img/arrow-up-black-24.png diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-150.ico b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-150.ico similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-150.ico rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-150.ico diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-150.png b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-150.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-150.png rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-150.png diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-32.png b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-32.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-32.png rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-32.png diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-40.png b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-40.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-40.png rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-40.png diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-420.png b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-420.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-420.png rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-420.png diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-64-150.png b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-64-150.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-64-150.png rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-64-150.png diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-64.ico b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-64.ico similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-64.ico rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-64.ico diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-64.png b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-64.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-side-64.png rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-side-64.png diff --git a/SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-top-120.png b/SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-top-120.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/sapphire/sapphire01-top-120.png rename to SaBusMgrStandardBase/Resources/img/sapphire/sapphire01-top-120.png diff --git a/SaBusMgrStandardBase/Resource/img/star-amber-16.png b/SaBusMgrStandardBase/Resources/img/star-amber-16.png similarity index 100% rename from SaBusMgrStandardBase/Resource/img/star-amber-16.png rename to SaBusMgrStandardBase/Resources/img/star-amber-16.png diff --git a/SaBusMgrStandardBase/Resource/jquery/jquery-1.12.1.min.js b/SaBusMgrStandardBase/Resources/jquery/jquery-1.12.1.min.js similarity index 100% rename from SaBusMgrStandardBase/Resource/jquery/jquery-1.12.1.min.js rename to SaBusMgrStandardBase/Resources/jquery/jquery-1.12.1.min.js diff --git a/SaBusMgrStandardBase/Resource/jquery/jquery-ui-1.12.1.min.css b/SaBusMgrStandardBase/Resources/jquery/jquery-ui-1.12.1.min.css similarity index 100% rename from SaBusMgrStandardBase/Resource/jquery/jquery-ui-1.12.1.min.css rename to SaBusMgrStandardBase/Resources/jquery/jquery-ui-1.12.1.min.css diff --git a/SaBusMgrStandardBase/Resource/jquery/jquery-ui-1.12.1.min.js b/SaBusMgrStandardBase/Resources/jquery/jquery-ui-1.12.1.min.js similarity index 100% rename from SaBusMgrStandardBase/Resource/jquery/jquery-ui-1.12.1.min.js rename to SaBusMgrStandardBase/Resources/jquery/jquery-ui-1.12.1.min.js diff --git a/SaBusMgrStandardBase/SaBusMgrStandardBase.csproj b/SaBusMgrStandardBase/SaBusMgrStandardBase.csproj index c84fe10..5c28877 100644 --- a/SaBusMgrStandardBase/SaBusMgrStandardBase.csproj +++ b/SaBusMgrStandardBase/SaBusMgrStandardBase.csproj @@ -1,17 +1,21 @@ - - netstandard2.1 - Sarand.BusinessMgr.Net.Standard - + + netstandard2.1 + Sarand.BusinessMgr.Net.Standard + - - - + + + - - - - + + + + + + + + diff --git a/SaBusMgrStandardDbas/Dbas/Mgr/SbmAccountMgr_Dbas-Affiliate.cs b/SaBusMgrStandardDbas/Dbas/Mgr/SbmAccountMgr_Dbas-Affiliate.cs index e60bf58..e2f9e20 100644 --- a/SaBusMgrStandardDbas/Dbas/Mgr/SbmAccountMgr_Dbas-Affiliate.cs +++ b/SaBusMgrStandardDbas/Dbas/Mgr/SbmAccountMgr_Dbas-Affiliate.cs @@ -398,12 +398,18 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr columnDfn.ReadOnly = true; break; // Affiliate Properties. + case SbmAffiliate.Column.Type: + SetAffiliateColDfn(columnDfn, "Type", 60, SbmDbDfn.ColumnIdx.Affiliate_Type, ColumnAlignment.Center, DataValue.DataType.Long); + break; + case SbmAffiliate.Column.Type_Code: + SetAffiliateColDfn(columnDfn, "Type", 70, SbmDbDfn.ColumnIdx.Affiliate_Type, ColumnAlignment.Center); + break; case SbmAffiliate.Column.Type_Desc: - SetAffiliateColDfn(columnDfn, "Type", 70, SbmDbDfn.ColumnIdx.Affiliate_Type); + SetAffiliateColDfn(columnDfn, "Type", 80, SbmDbDfn.ColumnIdx.Affiliate_Type, ColumnAlignment.Center); break; case SbmAffiliate.Column.Name: SetAffiliateColDfn(columnDfn, "Name", 160, SbmDbDfn.ColumnIdx.Affiliate_Name); - break;/* + break; case SbmAffiliate.Column.Abbrev: SetAffiliateColDfn(columnDfn, "Abbrev", 90, SbmDbDfn.ColumnIdx.Affiliate_Abbrev); break; @@ -421,16 +427,16 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr break; case SbmAffiliate.Column.Salutation: SetAffiliateColDfn(columnDfn, "Salutation", 50, SbmDbDfn.ColumnIdx.Affiliate_Salutation); - break;*/ + break; case SbmAffiliate.Column.Nature: SetAffiliateColDfn(columnDfn, "Nature", 120, SbmDbDfn.ColumnIdx.Affiliate_Nature); - break;/* + break; case SbmAffiliate.Column.CompanyNo: SetAffiliateColDfn(columnDfn, "CompanyNo", 50, SbmDbDfn.ColumnIdx.Affiliate_CompanyNo); break; case SbmAffiliate.Column.VatReg: SetAffiliateColDfn(columnDfn, "VatReg", 80, SbmDbDfn.ColumnIdx.Affiliate_VatReg); - break;*/ + break; case SbmAffiliate.Column.Contact: SetAffiliateColDfn(columnDfn, "Contact", 120, SbmDbDfn.ColumnIdx.Affiliate_Contact); break; @@ -486,12 +492,14 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr case SbmAffiliate.Column.Address_Postcode: SetAffiliateColDfn(columnDfn, "Postcode", 65, SbmDbDfn.ColumnIdx.Address_Postcode, ColumnAlignment.Center, DataValue.DataType.String, aliasAffiliate_AddPrim, prefixAffiliate_AddPrim); break; + //----------------------------------------------------------------- // Derived columns. case SbmAffiliate.Column.GroupMembers: SetAffiliateColDfn(columnDfn, "Members", 90, SbmDbDfn.ColumnIdx.Unknown, ColumnAlignment.Right); columnDfn.DataName = colNameAffiliate_GroupMembers; break; + //----------------------------------------------------------------- // Common properties. case SbmAffiliate.Column.Notes: @@ -556,38 +564,60 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr filter.Add(colAffiliate_AffIdParent + "=" + SysId.ToString(prm.AffiliateIdParent)); //--------------------------------------------------------------- - // Name. + // Common columns. String colAffiliate_Name = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Name, aliasAffiliate); - if (!StringUtil.IsEmpty(prm.Name)) - filter.Add(colAffiliate_Name + "='" + DbQuery.FormatForCondition(prm.Name) + "'"); - // Partial Name with FirstName &LastName. String colAffiliate_FirstName = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_FirstName, aliasAffiliate); String colAffiliate_LastName = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_LastName, aliasAffiliate); + String colAffiliate_PhoneMain = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneMain, aliasAffiliate); + String colAffiliate_PhoneAlt = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneAlt, aliasAffiliate); + String colAffiliate_PhoneFax = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneFax); + String colAffiliate_PhoneMobile = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneMobile); + String colAffiliate_PhoneDirect = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneDirect); + String colAffiliate_Website = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Website, aliasAffiliate); + String colAffiliate_Email = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Email, aliasAffiliate); + String colAffiliate_Notes = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Notes, aliasAffiliate); + + //--------------------------------------------------------------- + // Generic search. + if (!StringUtil.IsEmpty(prm.Search)) + { + List searchFilter = new List(); + foreach (String rawSearchValue in prm.Search.Split(new char[] { ' ', ',', ';' })) + { + String searchValue = DbQuery.FormatForLike(StringUtil.TrimAll(rawSearchValue)); + if (StringUtil.IsEmpty(searchValue)) continue; + List searchValueFilter = new List(); + searchValueFilter.Add(colAffiliate_Name + " LIKE '%" + searchValue + "%'"); + searchValueFilter.Add(colAffiliate_FirstName + " LIKE '%" + searchValue + "%'"); + searchValueFilter.Add(colAffiliate_LastName + " LIKE '%" + searchValue + "%'"); + searchValueFilter.Add(colAffiliate_PhoneMain + " LIKE '%" + searchValue + "%'"); + searchValueFilter.Add(colAffiliate_PhoneAlt + " LIKE '%" + searchValue + "%'"); + searchValueFilter.Add(colAffiliate_Website + " LIKE '%" + searchValue + "%'"); + searchValueFilter.Add(colAffiliate_Email + " LIKE '%" + searchValue + "%'"); + searchValueFilter.Add(colAffiliate_Notes + " LIKE '%" + searchValue + "%'"); + searchFilter.Add(searchValueFilter.Concat(" OR ", "(", ")")); + } + filter.AddRange(searchFilter); + } + + //--------------------------------------------------------------- + // Name. + if (!StringUtil.IsEmpty(prm.Name)) + filter.Add(colAffiliate_Name + "='" + DbQuery.FormatForCondition(prm.Name) + "'"); + // Partial Name with FirstName & LastName. if (!StringUtil.IsEmpty(prm.NamePartial)) filter.Add(colAffiliate_Name + " LIKE '%" + DbQuery.FormatForLike(prm.NamePartial) + "%' OR " + colAffiliate_FirstName + " LIKE '%" + DbQuery.FormatForLike(prm.NamePartial) + "%' OR " + colAffiliate_LastName + " LIKE '%" + DbQuery.FormatForLike(prm.NamePartial) + "%'"); - //--------------------------------------------------------------- - // Partial Email. - String colAffiliate_Email = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Email, aliasAffiliate); + // Partial Email. if (!StringUtil.IsEmpty(prm.EmailPartial)) filter.Add(colAffiliate_Email + " LIKE '%" + DbQuery.FormatForLike(prm.EmailPartial) + "%'"); - // Partial Notes. - String colAffiliate_Notes = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Notes, aliasAffiliate); - if (!StringUtil.IsEmpty(prm.EmailPartial)) - filter.Add(colAffiliate_Notes + " LIKE '%" + DbQuery.FormatForLike(prm.NotesPartial) + "%'"); - //--------------------------------------------------------------- // Partial Phone - type of phone number held against addresses. if (!StringUtil.IsEmpty(prm.PhonePartial)) { // Search for matches in any of the phone numbers associated with the affiliate. String aliasAffAddPhone = "aAffAddPhone"; - String colAffiliate_PhoneMain = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneMain); - String colAffiliate_PhoneAlt = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneAlt); - String colAffiliate_PhoneFax = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneFax); - String colAffiliate_PhoneMobile = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneMobile); - String colAffiliate_PhoneDirect = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_PhoneDirect); String colAddress_Id = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Address_Id, aliasAffAddPhone); String colAddress_Owner = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Address_AffIdOwner, aliasAffAddPhone); String colAddress_Phone = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Address_Phone, aliasAffAddPhone); @@ -746,9 +776,21 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr } //--------------------------------------------------------------- + // Common properties. + + // Partial Notes. + if (!StringUtil.IsEmpty(prm.EmailPartial)) + filter.Add(colAffiliate_Notes + " LIKE '%" + DbQuery.FormatForLike(prm.NotesPartial) + "%'"); + // Status. - if (prm.StatusCat == SbmAffiliate.StatusCat.ActiveOnly) - filter.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Status, aliasAffiliate) + " = '" + StatusActive + "'"); + if (prm.StatusCat == SbmAffiliate.StatusCat.CurrentOnly) + filter.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Status, aliasAffiliate) + "='" + StatusCurrent + "'"); + else if (prm.StatusCat == SbmAffiliate.StatusCat.OnHoldOnly) + filter.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Status, aliasAffiliate) + "='" + SacsSystem.GetStatusCode(SaStatus.OnHold) + "'"); + else if (prm.StatusCat == SbmAffiliate.StatusCat.NotDeleted) + filter.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Status, aliasAffiliate) + "!='" + SacsSystem.GetStatusCode(SaStatus.Deleted) + "'"); + else if (prm.StatusCat == SbmAffiliate.StatusCat.DeletedOnly) + filter.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Status, aliasAffiliate) + "='" + SacsSystem.GetStatusCode(SaStatus.Deleted) + "'"); if (filter.Count < 1 && prm.IncludeDefaultFilter) filter.Add("1=1"); return filter; @@ -868,7 +910,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr // Affiliate Properties - add columns as defined in query list. if (columns.HasId((int)SbmAffiliate.Column.Id)) query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Id, aliasAffiliate)); - if (columns.HasId((int)SbmAffiliate.Column.Type_Desc)) + if (columns.HasId((int)SbmAffiliate.Column.Type) || columns.HasId((int)SbmAffiliate.Column.Type_Code) || columns.HasId((int)SbmAffiliate.Column.Type_Desc)) query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Type, aliasAffiliate)); if (columns.HasId((int)SbmAffiliate.Column.Name)) query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Name, aliasAffiliate)); diff --git a/SaBusinessMgrCoreWebPortal/Localisation/SbmPortalProperties.resx b/SaBusinessMgrCoreWebPortal/Localisation/SbmPortalProperties.resx index 694f73e..99031dd 100644 --- a/SaBusinessMgrCoreWebPortal/Localisation/SbmPortalProperties.resx +++ b/SaBusinessMgrCoreWebPortal/Localisation/SbmPortalProperties.resx @@ -117,6 +117,21 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Contact + + + Add Contact + + + Update Contact + + + Contacts + + + &copy; {0} + Alert @@ -126,12 +141,21 @@ Progress + + Any + + + Associations + Calendar Cancel + + Category + Change Password @@ -153,9 +177,15 @@ Contacts + + Create + Email + + First + Forgotten password? @@ -165,24 +195,48 @@ Remember Me + + Last + Name + + Next + No + + Notes + OK + + Page {0} of {1} + Password + + Previous + Reference + + Refresh + + + Search + Security + + Select + {0} selected @@ -195,6 +249,9 @@ Sign-out + + Type + Yes @@ -264,6 +321,9 @@ Value must not exceed {0} characters + + Change Password + Request Password diff --git a/SaBusinessMgrCoreWebPortal/Portal/Controllers/ContactController-Ajax.cs b/SaBusinessMgrCoreWebPortal/Portal/Controllers/ContactController-Ajax.cs new file mode 100644 index 0000000..4c6706d --- /dev/null +++ b/SaBusinessMgrCoreWebPortal/Portal/Controllers/ContactController-Ajax.cs @@ -0,0 +1,332 @@ +using Microsoft.AspNetCore.Mvc; +using Sarand.BusinessMgr.Net.Core.Web.App; +using Sarand.BusinessMgr.Net.Core.Web.Helpers; +using Sarand.BusinessMgr.Net.Core.Web.Portal.Models; +using Sarand.BusinessMgr.Net.Standard.Base.App; +using Sarand.BusinessMgr.Net.Standard.Base.Bus; +using Sarand.BusinessMgr.Net.Standard.Base.Consoles; +using Sarand.BusinessMgr.Net.Standard.Base.Helpers; +using Sarand.BusinessMgr.Net.Standard.Base.Mgr; +using Sarand.Net.Standard.Base.App; +using Sarand.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.Core; +using Sarand.Net.Standard.Base.Dbas; +using Sarand.Net.Standard.Base.Email; +using Sarand.Net.Standard.Base.Helpers; +using Sarand.Net.Standard.Base.Security; +using Sarand.Net.Standard.Base.Utils; +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Linq; +using System.Threading.Tasks; +using System.Web; + +namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers +{ + //======================================================================= + // Portal Contact Controller - Ajax actions. + //======================================================================= + partial class ContactController + { + //------------------------------------------------------------------- + // Affiliate data. + private class AffiliateData_List : AjaxResponse_Data.ItemData + { + public String DisplayName { get; set; } + public String TypeCode { get; set; } + public String TypeDesc { get; set; } + // Address. + public String AddressSummary { get; set; } + } + private class AffiliateData_Full : AffiliateData_List + { + // Affiliate properties. + public String PhoneMain { get; set; } = ""; + public String PhoneAlt { get; set; } = ""; + public String PhoneFax { get; set; } = ""; + public String Email { get; set; } = ""; + public String Website { get; set; } = ""; + // Ogranisation. + public SysId AffiliateIdParent { get; set; } = new SysId(); + public String Name { get; set; } = ""; + public String Abbr { get; set; } = ""; + public String Nature { get; set; } = ""; + public String Contact { get; set; } = ""; + public String CompanyNo { get; set; } = ""; + public String VatReg { get; set; } = ""; + public String PhoneDirect { get; set; } = ""; + // Individual. + public String Title { get; set; } = ""; + public String Initials { get; set; } = ""; + public String LastName { get; set; } = ""; + public String FirstName { get; set; } = ""; + public String Salutation { get; set; } = ""; + public String PhoneMobile { get; set; } = ""; + public byte BirthDay { get; set; } = 0; + public byte BirthMonth { get; set; } = 0; + public short BirthYear { get; set; } = 0; + public String MaritalStatus { get; set; } = ""; + public String Spouse { get; set; } = ""; + public String Children { get; set; } = ""; + public String Hometown { get; set; } = ""; + public SysId UserId { get; set; } = new SysId(); + } + private void PopulateAffiliateResponseData(SbmAffiliate affiliate, AffiliateData_List data) + { + data.Id = SysId.ToString(affiliate.Id); + data.DisplayName = affiliate.GetDisplayName(); + data.TypeCode = Internals.AffiliateTypeCodes.GetCodeForType(affiliate.AffiliateType); + data.TypeDesc = Internals.AffiliateTypeCodes.GetDescForType(affiliate.AffiliateType); + // Common properties. + data.Notes = affiliate.Notes; + data.StatusCode = affiliate.StatusCode; + data.StatusDesc = affiliate.StatusDesc; + } + private void PopulateAffiliateResponseData(SbmAffiliate affiliate, AffiliateData_Full data) + { + PopulateAffiliateResponseData(affiliate, data as AffiliateData_List); + // Affiliate properties. + data.PhoneMain = affiliate.PhoneMain; + data.PhoneAlt = affiliate.PhoneAlt; + data.PhoneFax = affiliate.PhoneFax; + data.Email = affiliate.Email; + data.Website = affiliate.Website; + // Ogranisation. + data.AffiliateIdParent = affiliate.AffiliateIdParent; + data.Name = affiliate.Name; + data.Abbr = affiliate.Abbr; + data.Nature = affiliate.Nature; + data.Contact = affiliate.Contact; + data.CompanyNo = affiliate.CompanyNo; + data.VatReg = affiliate.VatReg; + data.PhoneDirect = affiliate.PhoneDirect; + // Individual. + data.Title = affiliate.Title; + data.Initials = affiliate.Initials; + data.LastName = affiliate.LastName; + data.FirstName = affiliate.FirstName; + data.Salutation = affiliate.Salutation; + data.PhoneMobile = affiliate.PhoneMobile; + data.BirthDay = affiliate.BirthDay; + data.BirthMonth = affiliate.BirthMonth; + data.BirthYear = affiliate.BirthYear; + data.MaritalStatus = affiliate.MaritalStatus; + data.Spouse = affiliate.Spouse; + data.Children = affiliate.Children; + data.Hometown = affiliate.Hometown; + data.UserId = affiliate.UserId; + } + + //------------------------------------------------------------------- + // Contact list. + //------------------------------------------------------------------- + private class AjaxResponse_ContactList : AjaxResponse_Data + { + // Construction. + public AjaxResponse_ContactList(SbmModel_Portal model) : base(model) { } + // Affiliate list. + public List Affiliates { get; } = new List(); + // Reference data. + public List Statuses { get; } = new List(); + public String DefaultStatusCode { get; set; } + } + // Ajax request. + [HttpPost] + [Route("Contact/Ajax/List")] + [Route("Contact/Ajax/GetList")] + public IActionResult Ajax_ContactList(Model_Contact model) + { + String fn = GetType().Name + ".Ajax_ContactList"; + AjaxResponse_ContactList responseData = new AjaxResponse_ContactList(model); + String messageTitle = Localiser["contact.caption.contacts"]; + + // Validate session and referrer. + if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); + if (!ValidReferer) return Forbid(); + RefreshModel(model); + + // Reference data - statuses. + foreach (SaStatus status in SbmAffiliate.ValidStatuses.FindAll(item => item != SaStatus.Deleted)) + responseData.Statuses.Add(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)); + responseData.DefaultStatusCode = SacsSystem.GetStatusCode(SbmAffiliate.DefaultStatus); + + // Item filter. + SbmAffiliate.Params prmAffiliate = new SbmAffiliate.Params(); + prmAffiliate.Search = model.Filter.AffiliateSearch; + prmAffiliate.AffiliateType = model.GetFilterAffiliateType(); + prmAffiliate.StatusCat = SbmAffiliate.StatusCat.NotDeleted; + prmAffiliate.SortColumns.Add(AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Name)); + prmAffiliate.SortColumns.Add(AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.LastName)); + model.Paging.ItemTotal = (ulong)AccountMgr.GetAffiliateCount(prmAffiliate); + model.PopulatePagingTo(prmAffiliate.ResultsPaging); + + // Item columns. + ColumnDfn colId = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Id); + ColumnDfn colName = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Name); + ColumnDfn colAffiliateType = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Type); + ColumnDfn colPhoneMain = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.PhoneMain); + ColumnDfn colPhoneAlt = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.PhoneAlt); + ColumnDfn colNotes = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Notes); + ColumnDfn colStatus = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Status); + ColumnDfn colCreatedOn = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.CreateOn_Date); + ColumnDfn colUpdatedOn = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.UpdateOn_Date); + List columns = new List() + { + colId, + colName, + colAffiliateType, + colPhoneMain, + colPhoneAlt, + colNotes, colStatus, colCreatedOn, colUpdatedOn + }; + + // Query items. + using (DbResultSet resultSet = AccountMgr.ExecuteAffiliateQuery(columns, prmAffiliate)) + { + while (resultSet != null && resultSet.HasRows && resultSet.NextRecord()) + { + NamedValue.Map values = resultSet.GetRecordValues(); + Sbm.AffiliateType affiliateType = (Sbm.AffiliateType)values.GetLong(colAffiliateType.DataName); + AffiliateData_List affiliateData = new AffiliateData_List() + { + Id = values.GetString(colId.DataName), + DisplayName = values.GetString(colName.DataName), + TypeCode = Internals.AffiliateTypeCodes.GetCodeForType(affiliateType), + TypeDesc = Internals.AffiliateTypeCodes.GetDescForType(affiliateType), + Notes = values.GetString(colNotes.DataName), + StatusCode = values.GetString(colStatus.DataName), + StatusDesc = SacsSystem.GetStatusDescForCode(values.GetString(colStatus.DataName)) + }; + responseData.Affiliates.Add(affiliateData); + } + } + if (model.Paging.IsPaged) + model.Paging.ItemCount = (ushort)responseData.Affiliates.Count; + + // Complete response. + responseData.SetPaging(model); + responseData.Success = true; + return Json(responseData); + } + + //------------------------------------------------------------------- + // Get Affiliate ajax request. + //------------------------------------------------------------------- + private class AjaxResponse_Affiliate : AjaxResponse_Data + { + // Construction. + public AjaxResponse_Affiliate(SbmModel_Portal model) : base(model) { } + // Affiliate details. + public AffiliateData_Full affiliate { get; } = new AffiliateData_Full(); + } + //------------------------------------------------------------------- + [HttpPost] + [Route("Contact/Ajax/Item")] + [Route("Contact/Ajax/GetItem")] + public IActionResult Ajax_GetItem(Model_Contact model) + { + String fn = GetType().Name + ".Ajax_GetItem"; + String messageTitle = Localiser["affiliate.caption.affiliate"]; + AjaxResponse_Affiliate responseData = new AjaxResponse_Affiliate(model); + + // Validate session. + if (!ValidUserSession) + return GetAjaxResult_InvalidSession(responseData); + + // Identify item. + SysId affiliateId = model.AffiliateId.ToSysId(); + if (!SysId.IsValid(affiliateId)) + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.specified"])); + + // Retrieve item. + SbmAffiliate affiliate = AccountMgr.GetAffiliateById(affiliateId); + if (affiliate == null) + { + SaLogger.Warn(fn + " Failed to retrieve affiliate for Id: '" + model.AffiliateId + "'"); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"])); + } + + // Construct response. + PopulateAffiliateResponseData(affiliate, responseData.affiliate); + + // Complete response. + responseData.Success = true; + + return Json(responseData); + } + + //------------------------------------------------------------------- + // Store Affiliate ajax request. + //------------------------------------------------------------------- + [HttpPost] + [Route("Contact/Ajax/Store")] + [Route("Contact/Ajax/StoreItem")] + public IActionResult Ajax_StoreItem(Model_Contact model) + { + String fn = GetType().Name + ".Ajax_StoreItem"; + String messageTitle = Localiser["affiliate.caption.affiliate"]; + AjaxResponse_Affiliate responseData = new AjaxResponse_Affiliate(model); + + // Validate session. + if (!ValidUserSession) + return GetAjaxResult_InvalidSession(responseData); + + // Validate item properties. + model.ValidateAffiliateData(responseData); + if (responseData.HasControlErrors()) + return Json(responseData); + + // Retrieve existing item. + SysId affiliateId = model.AffiliateId.ToSysId(); + SbmAffiliate affiliate = AccountMgr.GetAffiliateById(affiliateId); + if (affiliate == null && SysId.IsValid(affiliateId)) + { + SaLogger.Warn(fn + " Failed to retrieve affiliate for Id: '" + model.AffiliateId + "'"); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"])); + } + + // Create new item if required. + if (affiliate == null) + affiliate = AccountMgr.CreateAffiliate(model.GetAffiliateType()); + + // Populate item properties. + if (model.AffiliateName != null) + affiliate.Name = model.AffiliateName; + // Common properties. + if (model.AffiliateNotes != null) + affiliate.Notes = model.AffiliateNotes; + if (model.AffiliateStatus != null) + affiliate.Status = model.GetAffiliateStatus(); + + // Store item. + if (!SysId.IsValid(affiliate.Id)) + { + if (!AccountMgr.InsertAffiliate(affiliate, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to insert affiliate: " + AccountMgr.ErrorStateMessage); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + AccountMgr.ErrorStateMessage)); + } + } + else + { + if (!AccountMgr.UpdateAffiliate(affiliate, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to update affiliate [Id:" + SysId.ToString(affiliate.Id) + "]: " + AccountMgr.ErrorStateMessage); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + AccountMgr.ErrorStateMessage)); + } + } + + // Construct response. + PopulateAffiliateResponseData(affiliate, responseData.affiliate); + + // Complete response. + responseData.Success = true; + + return Json(responseData); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaBusinessMgrCoreWebPortal/Portal/Controllers/ContactController.cs b/SaBusinessMgrCoreWebPortal/Portal/Controllers/ContactController.cs new file mode 100644 index 0000000..f0e42b0 --- /dev/null +++ b/SaBusinessMgrCoreWebPortal/Portal/Controllers/ContactController.cs @@ -0,0 +1,60 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using Sarand.BusinessMgr.Net.Core.Web.App; +using Sarand.BusinessMgr.Net.Core.Web.Helpers; +using Sarand.BusinessMgr.Net.Core.Web.Portal.Models; +using Sarand.BusinessMgr.Net.Standard.Base.App; +using Sarand.BusinessMgr.Net.Standard.Base.Bus; +using Sarand.BusinessMgr.Net.Standard.Base.Mgr; +using Sarand.Net.Standard.Base.App; +using Sarand.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.Security; +using Sarand.Net.Standard.Base.Utils; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Threading.Tasks; + +namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers +{ + //======================================================================= + public partial class ContactController : SbmController_Portal + { + //------------------------------------------------------------------- + // Data members. + + //------------------------------------------------------------------- + // Construction. + public ContactController(SbmLocaliser localiser, ILogger logger) : + base(localiser, logger) + { + } + + //------------------------------------------------------------------- + [HttpGet] + public IActionResult Index() + { + String fn = GetType().Name + ".Index"; + + if (!ValidUserSession) + return RedirectToAction("", ""); + + // Contact page. + Model_Contact model = new Model_Contact(Localiser); + model.Paging.PageNo = SessionData.Contacts.Filter.PageNo; + model.Paging.PageLength = SessionData.Contacts.Filter.PageLength; + return View(model); + } + + //------------------------------------------------------------------- + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] + public IActionResult Error() + { + return View(new ErrorViewModel(Localiser) { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaBusinessMgrCoreWebPortal/Portal/Controllers/HomeController.cs b/SaBusinessMgrCoreWebPortal/Portal/Controllers/HomeController.cs index 1c671eb..f68c4f4 100644 --- a/SaBusinessMgrCoreWebPortal/Portal/Controllers/HomeController.cs +++ b/SaBusinessMgrCoreWebPortal/Portal/Controllers/HomeController.cs @@ -41,62 +41,54 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers // NB Only allowed if there isn't a current user session. if (!ValidUserSession && AppConfig.Security.SignIn.KeepLoggedIn.Allowed) { + // Extract parameters and validate that they are populated. String encryptedParams = GetRequestCookie(CookieName_KeepLoggedIn); KeepLoggedInParams keepLoggedInParams = ExtractKeepLoggedInParams(encryptedParams); + String logPrefix = fn + " 'Keep Logged In' cookie found but "; String logSuffix = keepLoggedInParams.GetValidParams().Concat("", " ", "."); - - if (SysId.IsValid(keepLoggedInParams.SecurityItemId) && SysId.IsValid(keepLoggedInParams.AffiliateId)) + if (keepLoggedInParams.IsValid()) { // User may be defined on any one of the BusinessMgr databases - need to find out which. // Identify session contexts with a BusMgr database that hosts the specified email address. List sessionContextIdxs = SbmSessionContextHelper_Web.GetSessionContextIdxsForUsersBusMgrDatabase(keepLoggedInParams.EmailAddress); foreach (ushort sessionContextIdx in sessionContextIdxs) { + // Consoles and Managers must be associated with the specific context. SbmSessionContext sessionContext = SbmSessionContextHelper_Web.GetSessionContext(sessionContextIdx); SbmUserContext_Web userContext = new SbmUserContext_Web(sessionContext); - - using (SaSecurityConsole securityConsole = App.CreateSecurityConsole(userContext)) + using (SaSecurityConsole securityConsoleForUser = App.CreateSecurityConsole(userContext)) + using (SbmAccountMgr accountMgrForUser = App.System.CreateAccountMgr(userContext)) { - SaSecurityItem securityItemUser = securityConsole.GetUserByEmail(keepLoggedInParams.EmailAddress); - if (securityItemUser != null) + using (SaSecurityItem securityItemUser = securityConsoleForUser.GetUserByEmail(keepLoggedInParams.EmailAddress)) + using (SbmAffiliate affiliateUser = accountMgrForUser.GetAffiliateById(keepLoggedInParams.AffiliateId)) { - if (securityItemUser.Id.Equals(keepLoggedInParams.SecurityItemId)) + if (securityItemUser != null && affiliateUser != null) { - using (SbmAccountMgr accountMgr = App.System.CreateAccountMgr(userContext)) + if (securityItemUser.Id.Equals(keepLoggedInParams.SecurityItemId) && affiliateUser.UserId.Equals(securityItemUser.Id)) { - SbmAffiliate affiliateUser = accountMgr.GetAffiliateById(keepLoggedInParams.AffiliateId); - if (affiliateUser != null) + if (affiliateUser.IsStatusCurrent) { - if (affiliateUser.Id.Equals(keepLoggedInParams.AffiliateId)) + String errorMessage = ""; + if (SignUserIn(userContext, securityItemUser, affiliateUser, true, ref errorMessage)) { - if (affiliateUser.UserId.Equals(securityItemUser.Id)) - { - if (affiliateUser.IsStatusActive) - { - String errorMessage = ""; - if (SignUserIn(sessionContext, securityItemUser, affiliateUser, true, ref errorMessage)) - SaLogger.Info(fn + " Keep Logged In cookie found." + logSuffix); - else SaLogger.Warn(fn + " Keep Logged In cookie found but failed to sign user in: " + errorMessage + "." + logSuffix); - } - else SaLogger.Warn(fn + " Keep Logged In cookie found but Affiliate is not active." + logSuffix); - } - else SaLogger.Warn(fn + " Keep Logged In cookie found but Affiliate User Id does not match security item." + logSuffix); + SaLogger.Info(logPrefix + " 'Keep Logged In' cookie found." + logSuffix); + break; } - else SaLogger.Warn(fn + " Keep Logged In cookie found but Affiliate does nto match Id." + logSuffix); + else SaLogger.Warn(logPrefix + "failed to sign user in: " + errorMessage + "." + logSuffix); } - else SaLogger.Warn(fn + " Keep Logged In cookie found but Affiliate not found." + logSuffix); + else SaLogger.Warn(logPrefix + "Affiliate is not active." + logSuffix); } + else SaLogger.Warn(logPrefix + "Security Item and Affiliate are inconsistent. " + logSuffix); } - else SaLogger.Warn(fn + " Keep Logged In cookie found but Security Item does not match Id." + logSuffix); + else SaLogger.Warn(logPrefix + "Security Item or Affiliate not found. " + logSuffix); } - else SaLogger.Warn(fn + " Keep Logged In cookie found but Security Item not found by email." + logSuffix); } - if (ValidUserSession) break; } } - else SaLogger.Warn(fn + " Keep Logged In cookie found but Security Item or Affiliate Ids missing." + logSuffix); + else if (!StringUtil.IsEmpty(encryptedParams)) + SaLogger.Warn(fn + " Keep Logged In cookie found but with incomplete details." + logSuffix); } // Redirect to sign-in if not signed-in. diff --git a/SaBusinessMgrCoreWebPortal/Portal/Controllers/SbmController_Portal.cs b/SaBusinessMgrCoreWebPortal/Portal/Controllers/SbmController_Portal.cs index 0c002f6..8220b57 100644 --- a/SaBusinessMgrCoreWebPortal/Portal/Controllers/SbmController_Portal.cs +++ b/SaBusinessMgrCoreWebPortal/Portal/Controllers/SbmController_Portal.cs @@ -4,6 +4,7 @@ using Sarand.BusinessMgr.Net.Core.Web.Controllers; using Sarand.BusinessMgr.Net.Core.Web.Portal.App; using Sarand.BusinessMgr.Net.Standard.Base.App; using Sarand.BusinessMgr.Net.Standard.Base.Bus; +using Sarand.BusinessMgr.Net.Standard.Base.Mgr; using Sarand.Net.Standard.Base.App; using Sarand.Net.Standard.Base.Bus; using Sarand.Net.Standard.Base.Core; @@ -27,7 +28,7 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers //------------------------------------------------------------------- // Protected construction. - protected SbmController_Portal(SbmLocaliser localiser, Microsoft.Extensions.Logging.ILogger logger) : base(localiser) + protected SbmController_Portal(SbmLocaliser localiser, Microsoft.Extensions.Logging.ILogger logger) : base(localiser) { } @@ -50,42 +51,60 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers /// - Open user session - store details against Sesion Data. /// - Set 'Keep logged in' cookie if required. /// - protected bool SignUserIn(SbmSessionContext sessionContext, SaSecurityItem securityItemUser, SbmAffiliate affiliateUser, bool keepLoggedIn, ref String errorMessage) + protected bool SignUserIn(SbmUserContext userContext, SaSecurityItem securityItemUser, SbmAffiliate affiliateUser, bool keepLoggedIn, ref String errorMessage) { String fn = GetType().Name + ".SignUserIn"; - // Validate User Account, just in case - should have been done before arriving here! - if (affiliateUser == null) + // Validate Security Item and Affiliate, just in case - should have been done before arriving here! + if (securityItemUser == null) { - SaLogger.Error(fn + " Unable to sign account in - null user account."); - errorMessage = Localiser["security.msg.signin.failed"]; + SaLogger.Error(fn + " Unable to sign account in - null security item."); + errorMessage = Localiser["security.msg.signin.invalid"]; return false; } - if (!affiliateUser.IsStatusActive) + if (affiliateUser == null) { - SaLogger.Error(fn + " Unable to sign account in - user account is not active. Email: " + affiliateUser.Email); - errorMessage = Localiser["security.msg.signin.failed"]; + SaLogger.Error(fn + " Unable to sign account in - null affiliate."); + errorMessage = Localiser["security.msg.signin.invalid"]; + return false; + } + if (!affiliateUser.IsStatusCurrent) + { + SaLogger.Error(fn + " Unable to sign account in - affiliate is not active. Email: " + securityItemUser.EmailAddress); + errorMessage = Localiser["security.msg.signin.invalid"]; return false; } // 'Keep logged in' can be switched off by the application configuration. keepLoggedIn = App.AppConfig.Security.SignIn.KeepLoggedIn.Allowed && keepLoggedIn; - // Log user in. - affiliateUser.KeepLoggedIn_Portal = keepLoggedIn; - //affiliateUser.LastLoginAt = DateTime.Now; - //affiliateUser.InvalidLoginCount = 0; - //affiliateUser.LastInvalidLoginAt = DateTime.MinValue; - if (!AccountMgr.UpdateAffiliate(affiliateUser, DbUpdateInfo)) + using (SaSecurityConsole securityConsoleForUser = App.CreateSecurityConsole(userContext)) + using (SbmAccountMgr accountMgrForUser = App.System.CreateAccountMgr(userContext)) { - SaLogger.Warn(fn + " Failed to update account for " + affiliateUser.Email + ": " + AccountMgr.ErrorStateMessage); - errorMessage = Localiser["security.msg.signin.failed"]; - return false; + // Log user in. + securityItemUser.LastLogin = DateTime.Now; + securityItemUser.InvalidLoginCount = 0; + securityItemUser.LastInvalidLoginAt = DateTime.MinValue; + if (!securityConsoleForUser.UpdateSecurityItem(securityItemUser, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to update security item for " + securityItemUser.EmailAddress + ": " + securityConsoleForUser.ErrorStateMessage); + errorMessage = Localiser["security.msg.signin.invalid"]; + return false; + } + + // Update affiliate. + affiliateUser.KeepLoggedIn_Portal = keepLoggedIn; + if (!accountMgrForUser.UpdateAffiliate(affiliateUser, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to update affiliate for " + securityItemUser.EmailAddress + ": " + accountMgrForUser.ErrorStateMessage); + errorMessage = Localiser["security.msg.signin.invalid"]; + return false; + } + SaLogger.Info(fn + " User session opened for " + securityItemUser.EmailAddress, true); } - SaLogger.Info(fn + " User session opened for " + affiliateUser.Email, true); // Create session. - OpenUserSession(sessionContext, securityItemUser, affiliateUser); + OpenUserSession(userContext.SessionContext, securityItemUser, affiliateUser); // Send the 'Keep Logged In' cookie if requested. if (affiliateUser.KeepLoggedIn_Portal) @@ -116,7 +135,7 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers { // Validate user properties. if (!SysId.IsValid(affiliateUser.Id)) return false; - if (StringUtil.IsEmpty(affiliateUser.Email)) return false; + if (StringUtil.IsEmpty(securityItemUser.EmailAddress)) return false; // Close previous session. CloseUserSession(); @@ -186,10 +205,22 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers public List GetValidParams() { List values = new List(); + if (!StringUtil.IsEmpty(EmailAddress)) + values.Add("EmailAddress: " + EmailAddress); + if (SysId.IsValid(SecurityItemId)) + values.Add("SecurityItemId: " + SysId.ToString(SecurityItemId)); if (SysId.IsValid(AffiliateId)) values.Add("UserAccountId: " + SysId.ToString(AffiliateId)); return values; } + /// Verifiy that the email and account Ids are populated and the data hasn't expired. + public bool IsValid() + { + return + !StringUtil.IsEmpty(EmailAddress) && + SysId.IsValid(SecurityItemId) && + SysId.IsValid(AffiliateId); + } } public KeepLoggedInParams ExtractKeepLoggedInParams(String encryptedParams) { diff --git a/SaBusinessMgrCoreWebPortal/Portal/Controllers/SecurityController-Ajax.cs b/SaBusinessMgrCoreWebPortal/Portal/Controllers/SecurityController-Ajax.cs index fd0e046..ac863f4 100644 --- a/SaBusinessMgrCoreWebPortal/Portal/Controllers/SecurityController-Ajax.cs +++ b/SaBusinessMgrCoreWebPortal/Portal/Controllers/SecurityController-Ajax.cs @@ -25,7 +25,7 @@ using System.Web; namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers { //======================================================================= - // Online Security Controller - Ajax actions. + // Portal Security Controller - Ajax actions. //======================================================================= partial class SecurityController { @@ -72,7 +72,7 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers return Json(responseData); String errorMessage = ""; - if (!SignUserIn(sessionContext, securityItemUser, affiliateUser, model.KeepMeSignedIn, ref errorMessage)) + if (!SignUserIn(userContext, securityItemUser, affiliateUser, model.KeepMeSignedIn, ref errorMessage)) return Json(responseData.SetControlError(nameof(model.EmailAddress), errorMessage)); } } @@ -122,23 +122,25 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers { String fn = GetType().Name + ".GetSecurityItemForSignin"; SaSecurityItem securityItemUser = null; - using (SaSecurityConsole securityConsole = App.CreateSecurityConsole(userContext)) + using (SaSecurityConsole securityConsoleForUser = App.CreateSecurityConsole(userContext)) { // Retrieve security item by email address. - securityItemUser = securityConsole.GetUserByEmail(model.EmailAddress); - if (securityItemUser != null) + using (securityItemUser = securityConsoleForUser.GetUserByEmail(model.EmailAddress)) { - // Validate password. - if (!SbmPasswordHelper.VerifyHashedPassword(securityItemUser, model.Password) && !(DebugMode && model.EmailAddress.EqualsCI("ahoward@sarand.com"))) + if (securityItemUser != null) { - // Record invalid login attempt. - securityItemUser.InvalidLoginCount++; - securityItemUser.LastInvalidLoginAt = DateTime.Now; - if (!securityConsole.UpdateSecurityItem(securityItemUser, DbUpdateInfo)) - SaLogger.Warn(fn + " Failed to store invalid sign-in attempt against User: " + model.EmailAddress + ". " + AccountMgr.ErrorStateMessage, true); - SaLogger.Warn(fn + " Attempt to sign-in to User " + model.EmailAddress + " with invalid password. Attempt: " + securityItemUser.InvalidLoginCount, true); - responseData.SetControlError(nameof(model.EmailAddress), model.Localiser["security.msg.signin.invalid"]); - securityItemUser = null; + // Validate password. + if (!SbmPasswordHelper.VerifyHashedPassword(securityItemUser, model.Password) && !(DebugMode && model.EmailAddress.EqualsCI("ahoward@sarand.com"))) + { + // Record invalid login attempt. + securityItemUser.InvalidLoginCount++; + securityItemUser.LastInvalidLoginAt = DateTime.Now; + if (!securityConsoleForUser.UpdateSecurityItem(securityItemUser, DbUpdateInfo)) + SaLogger.Warn(fn + " Failed to store invalid sign-in attempt against User: " + model.EmailAddress + ". " + AccountMgr.ErrorStateMessage, true); + SaLogger.Warn(fn + " Attempt to sign-in to User " + model.EmailAddress + " with invalid password. Attempt: " + securityItemUser.InvalidLoginCount, true); + responseData.SetControlError(nameof(model.EmailAddress), model.Localiser["security.msg.signin.invalid"]); + securityItemUser = null; + } } } } @@ -150,18 +152,20 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers { String fn = GetType().Name + ".GetAffiliateForSignin"; SbmAffiliate affiliate = null; - using (SbmAccountMgr accountMgr = App.System.CreateAccountMgr(userContext)) + using (SbmAccountMgr accountMgrForUser = App.System.CreateAccountMgr(userContext)) { // Identify the contact asociated with the security item. SbmAffiliate.Params prmAffiliate = new SbmAffiliate.Params(); prmAffiliate.UserId = securityItemUser.Id; - prmAffiliate.StatusCat = SbmAffiliate.StatusCat.ActiveOnly; - affiliate = accountMgr.GetAffiliate(prmAffiliate); - if (affiliate != null) + prmAffiliate.StatusCat = SbmAffiliate.StatusCat.CurrentOnly; + using (affiliate = accountMgrForUser.GetAffiliate(prmAffiliate)) { + if (affiliate != null) + { + } + if (affiliate == null && !responseData.HasControlErrors()) + responseData.SetControlError(nameof(model.EmailAddress), model.Localiser["security.msg.signin.invalid"]); } - if (affiliate == null && !responseData.HasControlErrors()) - responseData.SetControlError(nameof(model.EmailAddress), model.Localiser["security.msg.signin.invalid"]); } return affiliate; } @@ -255,8 +259,12 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers String messageTitle = Localiser["security.caption.change.password"]; // Validate referrer. - if (!ValidReferer) - return Forbid(); + if (!ValidReferer) return Forbid(); + + // If user is logged in, session Consoles and Managers can be used. + // If 'Request Password' parameters are specified, Consoles and Managers must be associated with the specific database for the user. + SbmSessionContext sessionContextForUser = null; + SbmUserContext_Web userContextForUser = null; // If 'Request Password' encrypted params (from email link) are present, // Session is not required and password can be set directly against the user. @@ -267,68 +275,100 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers RequestPasswordParams requestPasswordParams = ExtractRequestPasswordLinkParams(model.rpe); if (requestPasswordParams.IsValid()) { - // Retrieve user details and validate email address. - securityItemUser = SecurityConsole.GetSecurityItemById(SaSecurity.ItemType.User, requestPasswordParams.SecurityItemId); - affiliateUser = AccountMgr.GetAffiliateById(requestPasswordParams.AffiliateId); - if (requestPasswordParams.IsValid(securityItemUser, affiliateUser)) + // User may be defined on any one of the BusinessMgr databases - need to find out which. + // Identify session contexts with a BusMgr database that hosts the specified email address. + List sessionContextIdxs = SbmSessionContextHelper_Web.GetSessionContextIdxsForUsersBusMgrDatabase(requestPasswordParams.EmailAddress); + foreach (ushort sessionContextIdx in sessionContextIdxs) { - validRequestPasswordParams = true; - validSessionRequired = false; - } - else - { - SaLogger.Warn(fn + " 'Request Password' parameters supplied but invalid. SecurityItemId: " + SysId.ToString(requestPasswordParams.SecurityItemId) + ". AffiliateId: " + SysId.ToString(requestPasswordParams.AffiliateId) + ". Email: " + requestPasswordParams.EmailAddress); - affiliateUser = null; + // Consoles and Managers must be associated with the specific context. + sessionContextForUser = SbmSessionContextHelper_Web.GetSessionContext(sessionContextIdx); + userContextForUser = new SbmUserContext_Web(sessionContextForUser); + using (SaSecurityConsole securityConsoleForUser = App.CreateSecurityConsole(userContextForUser)) + using (SbmAccountMgr accountMgrForUser = App.System.CreateAccountMgr(userContextForUser)) + { + // Retrieve user details and validate email address. + securityItemUser = securityConsoleForUser.GetSecurityItemById(SaSecurity.ItemType.User, requestPasswordParams.SecurityItemId); + affiliateUser = accountMgrForUser.GetAffiliateById(requestPasswordParams.AffiliateId); + if (requestPasswordParams.IsValid(securityItemUser, affiliateUser)) + { + validRequestPasswordParams = true; + validSessionRequired = false; + break; + } + else + { + SaLogger.Warn(fn + " 'Request Password' parameters supplied but invalid. Email: " + requestPasswordParams.EmailAddress + ". SecurityItemId: " + SysId.ToString(requestPasswordParams.SecurityItemId) + ". AffiliateId: " + SysId.ToString(requestPasswordParams.AffiliateId)); + if (securityItemUser != null) securityItemUser.Dispose(); securityItemUser = null; + if (affiliateUser != null) affiliateUser.Dispose(); affiliateUser = null; + sessionContextForUser = null; + userContextForUser = null; + } + } } } - // User must have a valid session. + // User must have a valid session if security item and affiliate not idenfied via the 'Request Password' paramaters. if (validSessionRequired && (securityItemUser == null || affiliateUser == null) && !ValidUserSession) return Json(responseData.SetSessionExpired(messageTitle, Localiser["security.msg.warn.sessionExpired"])); - // Retrieve user details if not previously populated. - if (securityItemUser == null && SessionData_Portal != null) - securityItemUser = SecurityConsole.GetSecurityItemById(SaSecurity.ItemType.User, SessionData_Portal.User.SecurityItemId); - if (securityItemUser == null) - return Json(responseData.SetControlError(nameof(model.Password), "System error - failed to retrieve security item details.")); - if (affiliateUser == null && SessionData_Portal != null) - affiliateUser = AccountMgr.GetAffiliateById(SessionData_Portal.User.AffiliateId); - if (affiliateUser == null) - return Json(responseData.SetControlError(nameof(model.Password), "System error - failed to retrieve affiliate details.")); - - // Validate password data. - model.ValidateChangePasswordData(securityItemUser, affiliateUser, responseData); - if (responseData.HasControlErrors()) - return Json(responseData); - - // Note old password. - String oldPasswordHashed = securityItemUser.PasswordHash; - - // Store password. - securityItemUser.PasswordHash = SbmPasswordHelper.GetPasswordHash(securityItemUser, model.Password); - securityItemUser.PasswordChangedAt = DateTime.Now; - // Remove new password from history if present. - for (int passwordHistoryIdx = 0; passwordHistoryIdx < securityItemUser.PasswordHistory.Count; passwordHistoryIdx++) + // User specific Consoles and Managers if User Context specified. + using (SaSecurityConsole securityConsoleForUser = userContextForUser != null ? App.CreateSecurityConsole(userContextForUser) : null) + using (SbmAccountMgr accountMgrForUser = userContextForUser != null ? App.System.CreateAccountMgr(userContextForUser) : null) { - // Compare history password to new value. - if (SbmPasswordHelper.VerifyHashedPassword(securityItemUser, model.Password, securityItemUser.PasswordHistory[passwordHistoryIdx])) + SaSecurityConsole securityConsole = (securityConsoleForUser ?? SecurityConsole); + SbmAccountMgr accountMgr = (accountMgrForUser ?? AccountMgr); + + // Retrieve user details if not previously populated. + if (securityItemUser == null && SessionData_Portal != null) + securityItemUser = (securityConsole.GetSecurityItemById(SaSecurity.ItemType.User, SessionData_Portal.User.SecurityItemId)); + if (securityItemUser == null) + return Json(responseData.SetControlError(nameof(model.Password), "System error - failed to retrieve security item details.")); + if (affiliateUser == null && SessionData_Portal != null) + affiliateUser = accountMgr.GetAffiliateById(SessionData_Portal.User.AffiliateId); + if (affiliateUser == null) + return Json(responseData.SetControlError(nameof(model.Password), "System error - failed to retrieve affiliate details.")); + + // Validate password data. + model.ValidateChangePasswordData(securityItemUser, affiliateUser, responseData); + if (responseData.HasControlErrors()) + return Json(responseData); + + // Note old password. + String oldPasswordHashed = securityItemUser.PasswordHash; + + // Store password. + securityItemUser.PasswordHash = SbmPasswordHelper.GetPasswordHash(securityItemUser, model.Password); + securityItemUser.PasswordChangedAt = DateTime.Now; + // Remove new password from history if present. + for (int passwordHistoryIdx = 0; passwordHistoryIdx < securityItemUser.PasswordHistory.Count; passwordHistoryIdx++) { - // New password found in history - remove it. - securityItemUser.PasswordHistory.RemoveAt(passwordHistoryIdx); - passwordHistoryIdx--; + // Compare history password to new value. + if (SbmPasswordHelper.VerifyHashedPassword(securityItemUser, model.Password, securityItemUser.PasswordHistory[passwordHistoryIdx])) + { + // New password found in history - remove it. + securityItemUser.PasswordHistory.RemoveAt(passwordHistoryIdx); + passwordHistoryIdx--; + } } + securityItemUser.PasswordHistory.Remove(oldPasswordHashed); + // Add the old password at the start of the history list and validate history length. + securityItemUser.PasswordHistory.Add(oldPasswordHashed); + while (securityItemUser.PasswordHistory.Count > 10) + securityItemUser.PasswordHistory.RemoveAt(securityItemUser.PasswordHistory.Count - 1); + if (!securityConsole.UpdateSecurityItem(securityItemUser, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to change password for " + securityItemUser.EmailAddress + ": " + securityConsole.ErrorStateMessage); + return Json(responseData.SetControlError(nameof(model.Password), Localiser["security.msg.change.password.failed"])); + } + SaLogger.Info(fn + " Password changed for " + securityItemUser.EmailAddress, true); } - securityItemUser.PasswordHistory.Remove(oldPasswordHashed); - // Add the old password at the start of the history list and validate history length. - securityItemUser.PasswordHistory.Add(oldPasswordHashed); - while (securityItemUser.PasswordHistory.Count > 10) - securityItemUser.PasswordHistory.RemoveAt(securityItemUser.PasswordHistory.Count - 1); - if (!SecurityConsole.UpdateSecurityItem(securityItemUser, DbUpdateInfo)) - { - SaLogger.Warn(fn + " Failed to change password for " + securityItemUser.EmailAddress + ": " + AccountMgr.ErrorStateMessage); - return Json(responseData.SetControlError(nameof(model.Password), Localiser["security.msg.change.password.failed"])); - } - SaLogger.Info(fn + " Password changed for " + securityItemUser.EmailAddress, true); + + // Cleanup. NB The Security Item and/or Affiliate aren't disposed when the method + // returns above but these objects shouldn't be carrying any disposable resources. + if (securityItemUser != null) securityItemUser.Dispose(); securityItemUser = null; + if (affiliateUser != null) affiliateUser.Dispose(); affiliateUser = null; + sessionContextForUser = null; + userContextForUser = null; // Construct response. responseData.Success = true; @@ -350,10 +390,10 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers } // Ajax request. [HttpPost] - [Route("Security/Ajax/RequestNewPassword")] - public ActionResult Ajax_RequestNewPassword(Model_Security model) + [Route("Security/Ajax/RequestPassword")] + public ActionResult Ajax_RequestPassword(Model_Security model) { - String fn = GetType().Name + ".Ajax_RequestNewPassword"; + String fn = GetType().Name + ".Ajax_RequestPassword"; AjaxResponse_RequestPassword responseData = new AjaxResponse_RequestPassword(model); String messageTitle = Localiser["security.caption.request.password"]; @@ -372,15 +412,15 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers SbmUserContext_Web userContext = new SbmUserContext_Web(sessionContext); // Get user security item and affiliate. - using (SaSecurityConsole securityConsole = App.CreateSecurityConsole(userContext)) + using (SaSecurityConsole securityConsoleForUser = App.CreateSecurityConsole(userContext)) { - using (SaSecurityItem securityItemUser = securityConsole.GetUserByEmail(model.EmailAddress)) + using (SaSecurityItem securityItemUser = securityConsoleForUser.GetUserByEmail(model.EmailAddress)) { if (securityItemUser != null) { - using (SbmAccountMgr accountMgr = App.System.CreateAccountMgr(userContext)) + using (SbmAccountMgr accountMgrForUser = App.System.CreateAccountMgr(userContext)) { - using (SbmAffiliate affiliateUser = accountMgr.GetAffiliateByUserId(securityItemUser.Id)) + using (SbmAffiliate affiliateUser = accountMgrForUser.GetAffiliateByUserId(securityItemUser.Id)) { if (affiliateUser != null) { @@ -431,9 +471,9 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers //------------------------------------------------------------------- // Password request link. private static String ParamName_RequestPasswordEncrypted { get; } = "rpe"; + private static String ParamName_EmailAddress { get; } = "ema"; private static String ParamName_SecurityItemId { get; } = "sei"; private static String ParamName_AffiliateId { get; } = "afi"; - private static String ParamName_EmailAddress { get; } = "ema"; private static String ParamName_ExpiresAt { get; } = "exp"; private static String ParamName_Token { get; } = "tok"; // NB IV value is generated from the key and fixed so that it doesn't change when the application restarts. @@ -444,9 +484,9 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers private String GenerateRequestPasswordLink(SysId securityItemId, SysId affiliateId, String emailAddress, String requestPasswordToken) { NameValueCollection parameters = new NameValueCollection(); + parameters.Add(ParamName_EmailAddress, emailAddress); parameters.Add(ParamName_SecurityItemId, SysId.ToString(securityItemId)); parameters.Add(ParamName_AffiliateId, SysId.ToString(affiliateId)); - parameters.Add(ParamName_EmailAddress, emailAddress); parameters.Add(ParamName_ExpiresAt, DateUtil.Format(DateTime.Now.AddMinutes(GetRequestPasswordEmailLinkExpiresMinutes()), DateUtil.Format_XmlDateTime)); parameters.Add(ParamName_Token, requestPasswordToken); String link = @@ -463,34 +503,34 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers } private class RequestPasswordParams { + public String EmailAddress { get; set; } public SysId SecurityItemId { get; set; } public SysId AffiliateId { get; set; } - public String EmailAddress { get; set; } public DateTime ExpiresAt { get; set; } public String Token { get; set; } /// Retrieve the list of valid parameters in printable format [Name: Value]. public List GetValidParams() { List values = new List(); + if (!StringUtil.IsEmpty(EmailAddress)) + values.Add("Email: " + EmailAddress); if (SysId.IsValid(SecurityItemId)) values.Add("SecurityItemId: " + SysId.ToString(SecurityItemId)); if (SysId.IsValid(AffiliateId)) values.Add("AffiliateId: " + SysId.ToString(AffiliateId)); - if (!StringUtil.IsEmpty(EmailAddress)) - values.Add("Email: " + EmailAddress); if (DateUtil.IsValid(ExpiresAt)) values.Add("Expires: " + DateUtil.FormatXmlDateTime(ExpiresAt)); if (!StringUtil.IsEmpty(Token)) values.Add("Token: " + Token); return values; } - /// Verifiy that the account Id and email are populated and the data hasn't expired. + /// Verifiy that the email and account Ids are populated and the data hasn't expired. public bool IsValid() { return + !StringUtil.IsEmpty(EmailAddress) && SysId.IsValid(SecurityItemId) && SysId.IsValid(AffiliateId) && - !StringUtil.IsEmpty(EmailAddress) && DateUtil.IsValid(ExpiresAt) && ExpiresAt >= DateTime.Now; } /// Verify that the data is valid and the account details match. @@ -498,10 +538,11 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers { return IsValid() && - affiliateUser != null && + securityItemUser.EmailAddress.EqualsCI(EmailAddress) && + securityItemUser != null && securityItemUser.Id.Equals(SecurityItemId) && - affiliateUser.Id.Equals(AffiliateId) && - securityItemUser.EmailAddress.EqualsCI(EmailAddress); + affiliateUser != null && + affiliateUser.Id.Equals(AffiliateId); } } private RequestPasswordParams ExtractRequestPasswordLinkParams(String encryptedParams) @@ -510,9 +551,9 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers if (!StringUtil.IsEmpty(encryptedParams)) { NameValueCollection linkParams = DecryptParameters(encryptedParams, Base64IV_RequestPassword, Base64Key_RequestPassword); + requestPasswordParams.EmailAddress = linkParams.Get(ParamName_EmailAddress); requestPasswordParams.SecurityItemId = new SysId(StringUtil.ToInt(linkParams.Get(ParamName_SecurityItemId))); requestPasswordParams.AffiliateId = new SysId(StringUtil.ToInt(linkParams.Get(ParamName_AffiliateId))); - requestPasswordParams.EmailAddress = linkParams.Get(ParamName_EmailAddress); requestPasswordParams.ExpiresAt = DateUtil.ParseXmlDateTime(linkParams.Get(ParamName_ExpiresAt)); requestPasswordParams.Token = linkParams.Get(ParamName_Token); } diff --git a/SaBusinessMgrCoreWebPortal/Portal/Controllers/SecurityController.cs b/SaBusinessMgrCoreWebPortal/Portal/Controllers/SecurityController.cs index 4c82373..2e3280b 100644 --- a/SaBusinessMgrCoreWebPortal/Portal/Controllers/SecurityController.cs +++ b/SaBusinessMgrCoreWebPortal/Portal/Controllers/SecurityController.cs @@ -2,8 +2,11 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Sarand.BusinessMgr.Net.Core.Web.App; +using Sarand.BusinessMgr.Net.Core.Web.Helpers; using Sarand.BusinessMgr.Net.Core.Web.Portal.Models; +using Sarand.BusinessMgr.Net.Standard.Base.App; using Sarand.BusinessMgr.Net.Standard.Base.Bus; +using Sarand.BusinessMgr.Net.Standard.Base.Mgr; using Sarand.Net.Standard.Base.App; using Sarand.Net.Standard.Base.Bus; using Sarand.Net.Standard.Base.Security; @@ -71,24 +74,43 @@ namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Controllers RequestPasswordParams requestPasswordParams = ExtractRequestPasswordLinkParams(encryptedParams); if (requestPasswordParams.IsValid()) { + String logPrefix = fn + " 'Request Password' parameters supplied but "; String logSuffix = requestPasswordParams.GetValidParams().Concat("", " ", "."); - using (SaSecurityItem securityItemUser = SecurityConsole.GetSecurityItemById(SaSecurity.ItemType.User, requestPasswordParams.SecurityItemId)) - using (SbmAffiliate userAccount = AccountMgr.GetAffiliateById(requestPasswordParams.AffiliateId)) + // User may be defined on any one of the BusinessMgr databases - need to find out which. + // Identify session contexts with a BusMgr database that hosts the specified email address. + List sessionContextIdxs = SbmSessionContextHelper_Web.GetSessionContextIdxsForUsersBusMgrDatabase(requestPasswordParams.EmailAddress); + foreach (ushort sessionContextIdx in sessionContextIdxs) { - if (securityItemUser != null && userAccount != null) + // Consoles and Managers must be associated with the specific context. + SbmSessionContext sessionContext = SbmSessionContextHelper_Web.GetSessionContext(sessionContextIdx); + SbmUserContext_Web userContext = new SbmUserContext_Web(sessionContext); + using (SaSecurityConsole securityConsoleForUser = App.CreateSecurityConsole(userContext)) + using (SbmAccountMgr accountMgrForUser = App.System.CreateAccountMgr(userContext)) { - if (userAccount.IsStatusActive) + using (SaSecurityItem securityItemUser = securityConsoleForUser.GetUserByEmail(requestPasswordParams.EmailAddress)) + using (SbmAffiliate affiliateUser = accountMgrForUser.GetAffiliateById(requestPasswordParams.AffiliateId)) { - if (requestPasswordParams.IsValid(securityItemUser, userAccount)) + if (securityItemUser != null && affiliateUser != null) { - model.rpe = encryptedParams; - validSessionRequired = false; + if (securityItemUser.Id.Equals(requestPasswordParams.SecurityItemId) && affiliateUser.UserId.Equals(securityItemUser.Id)) + { + if (affiliateUser.IsStatusCurrent) + { + if (requestPasswordParams.IsValid(securityItemUser, affiliateUser)) + { + model.rpe = encryptedParams; + validSessionRequired = false; + break; + } + else SaLogger.Warn(logPrefix + "Security Item and Affiliate are incompatible with parameters. " + logSuffix); + } + else SaLogger.Warn(logPrefix + "Affiliate is not active. " + logSuffix); + } + else SaLogger.Warn(logPrefix + "Security Item and Affiliate are inconsistent. " + logSuffix); } - else SaLogger.Warn(fn + " 'Request Password' parameters supplied but invalid. " + logSuffix); + else SaLogger.Warn(logPrefix + "Security Item or Affiliate not found. " + logSuffix); } - else SaLogger.Warn(fn + " 'Request Password' parameters supplied but account is not active. " + logSuffix); } - else SaLogger.Warn(fn + " 'Request Password' parameters supplied but security item or affiliate not found. " + logSuffix); } } } diff --git a/SaBusinessMgrCoreWebPortal/Portal/Models/Model_Contact.cs b/SaBusinessMgrCoreWebPortal/Portal/Models/Model_Contact.cs new file mode 100644 index 0000000..4bc1c8c --- /dev/null +++ b/SaBusinessMgrCoreWebPortal/Portal/Models/Model_Contact.cs @@ -0,0 +1,104 @@ +using Sarand.BusinessMgr.Net.Core.Web.App; +using Sarand.BusinessMgr.Net.Core.Web.Controllers; +using Sarand.BusinessMgr.Net.Standard.Base.App; +using Sarand.BusinessMgr.Net.Standard.Base.Bus; +using Sarand.BusinessMgr.Net.Standard.Base.Helpers; +using Sarand.Net.Standard.Base.App; +using Sarand.Net.Standard.Base.Core; +using Sarand.Net.Standard.Base.Helpers; +using Sarand.Net.Standard.Base.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Sarand.BusinessMgr.Net.Core.Web.Portal.Models +{ + //======================================================================= + public class Model_Contact : SbmModel_Portal + { + //------------------------------------------------------------------- + // Construction. + public Model_Contact(SbmLocaliser localiser) : + base(localiser) + { + AdditionalFiles_JS.Add("js/sbm-contact.js"); + } + + //------------------------------------------------------------------- + // Filter properties. + public class FilterData + { + public String AffiliateSearch { get; set; } + public String AffiliateType { get; set; } + } + public FilterData Filter { get; } = new FilterData(); + public Sbm.AffiliateType GetFilterAffiliateType() + { + return (Sbm.AffiliateType)Internals.AffiliateTypeCodes.GetTypeForCode(Filter.AffiliateType); + } + + //------------------------------------------------------------------- + // Affiliate properties. + public String AffiliateId { get; set; } + public String AffiliateType{ get; set; } + public Sbm.AffiliateType GetAffiliateType() + { + return (Sbm.AffiliateType)Internals.AffiliateTypeCodes.GetTypeForCode(AffiliateType); + } + public String AffiliateName { get; set; } + // Common properties. + public String AffiliateNotes { get; set; } + public String AffiliateStatus { get; set; } + public SaStatus GetAffiliateStatus() + { + return SacsSystem.GetStatusForCode(AffiliateStatus); + } + + //------------------------------------------------------------------- + // Validation. + //------------------------------------------------------------------- + // Affiliate validation. + public bool ValidateAffiliateData(SbmController_Base.AjaxResponse_Data responseData) + { + // Affiliate Type. + if (AffiliateType != null) + { + if (StringUtil.IsEmpty(AffiliateType)) + responseData.SetControlError(nameof(AffiliateType), Localiser["msg.validation.mandatory.value"]); + } + + // Affiliate Name. + if (AffiliateName != null) + { + responseData.SetControlValue(nameof(AffiliateName), AffiliateName); + if (StringUtil.IsEmpty(AffiliateName)) + responseData.SetControlError(nameof(AffiliateName), Localiser["msg.validation.mandatory.value"]); + if (StringUtil.GetLength(AffiliateName) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Affiliate_Name)) + responseData.SetControlError(nameof(AffiliateName), Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Affiliate_Name)]); + } + + // Affiliate Notes. + if (AffiliateNotes != null) + { + responseData.SetControlValue(nameof(AffiliateNotes), AffiliateNotes); + if (!StringUtil.IsEmpty(AffiliateNotes) && StringUtil.GetLength(AffiliateNotes) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Affiliate_Notes)) + responseData.SetControlError(nameof(AffiliateNotes), Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Affiliate_Notes)]); + } + + // Affiliate status. + if (AffiliateStatus != null) + { + if (StringUtil.IsEmpty(AffiliateStatus)) + responseData.SetControlError(nameof(AffiliateStatus), Localiser["msg.validation.mandatory.value"]); + else if (!SbmAffiliate.ValidStatuses.Contains(GetAffiliateStatus())) + responseData.SetControlError(nameof(AffiliateStatus), Localiser["msg.validation.invalid.value"]); + } + + return !responseData.HasControlErrors(); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaBusinessMgrCoreWebPortal/SaBusinessMgrCoreWebPortal.csproj b/SaBusinessMgrCoreWebPortal/SaBusinessMgrCoreWebPortal.csproj index 7295d67..6c1ec28 100644 --- a/SaBusinessMgrCoreWebPortal/SaBusinessMgrCoreWebPortal.csproj +++ b/SaBusinessMgrCoreWebPortal/SaBusinessMgrCoreWebPortal.csproj @@ -36,4 +36,10 @@ + + + + + + diff --git a/SaBusinessMgrCoreWebPortal/Views/Common/ResultsPaging.cshtml b/SaBusinessMgrCoreWebPortal/Views/Common/ResultsPaging.cshtml new file mode 100644 index 0000000..2914d83 --- /dev/null +++ b/SaBusinessMgrCoreWebPortal/Views/Common/ResultsPaging.cshtml @@ -0,0 +1,21 @@ +@model SbmModel_Portal +@inject SbmLocaliser Localiser + + + + +@* Results paging *@ + diff --git a/SaBusinessMgrCoreWebPortal/Views/Contact/Index.cshtml b/SaBusinessMgrCoreWebPortal/Views/Contact/Index.cshtml new file mode 100644 index 0000000..8f83627 --- /dev/null +++ b/SaBusinessMgrCoreWebPortal/Views/Contact/Index.cshtml @@ -0,0 +1,116 @@ +@model Model_Contact +@inject SbmLocaliser Localiser +@{ + /* Affiliates - Index */ + ViewData["Title"] = "Affiliates"; +} + +
+ + + +
+ +
+ +
+ + @* Filter Panel *@ + @using (@Html.BeginForm(FormMethod.Post, new { @id = "frmAffiliateFilter", @class = "sbm-form", @onSubmit = "return false;" })) + { +
+ @* Header - Page caption, paging controls, actions. *@ +
+
+
@Localiser["contact.caption.contacts"]
+
+
+ +
+
+
@(Localiser[
+
@(Localiser[
+
+
+
+
+
+ @* Affiliate filter - name etc. *@ +
+
@Localiser["label.search"]
+
+ @Html.TextBoxFor(model => model.Filter.AffiliateSearch, new { @id = "", @class = "FilterAffiliate", @maxlength = "32" }) +
+
+ @* Affiliate Category *@ +
+
@Localiser["label.category"]
+
+ @Html.DropDownListFor(model => model.Filter.AffiliateType, Model.GetAffiliateTypeCodesForSelect(), Localiser["label.any"], new { @id = "", @class = "FilterAffiliateType sbm-select" }) +
+
+
+
+ } + +
+ + @* Separate filter from results when alondside each other. *@ +
+ +
+ +
+ + @* Results Panel *@ +
+
+
+ + @* element templates *@ +
+ @* Affiliate item template *@ +
+
+
+ @* Affiliate caption *@ +
+
+
+ @* Burger menu *@ +
    +
  • + +
      @* Menu items will be inserted here. *@
    +
    • +
+
+
+
+
+
+
+
+
+
+
+
@Localiser["label.associations"]: 
+
+
+
+
+ @* Burger dropdown item template - ul is ignored *@ +
    +
  • XXX
    • +
+
+
+ +
+
+
+ + diff --git a/SaBusinessMgrCoreWebPortal/Views/Contact/Panel-AffiliateDialog.cshtml b/SaBusinessMgrCoreWebPortal/Views/Contact/Panel-AffiliateDialog.cshtml new file mode 100644 index 0000000..60bbd48 --- /dev/null +++ b/SaBusinessMgrCoreWebPortal/Views/Contact/Panel-AffiliateDialog.cshtml @@ -0,0 +1,56 @@ +@model Model_Contact +@inject SbmLocaliser Localiser +@{ + /* Affiliates - Affiliate dialog panel */ +} + + +@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmAffiliateId", @class = "sbm-form" })) +{ + @Html.HiddenFor(model => model.AffiliateId, new { @class = "AffiliateId" }) +} +
+ + @using (@Html.BeginForm(FormMethod.Post, new { @id = "frmAffiliate", @class = "sbm-form", @onSubmit = "return false;" })) + { + @Html.HiddenFor(model => model.AffiliateId, new { @id = "", @class = "AffiliateId" }) + + @* Affiliate Type *@ +
+
+ +
+
+ @Html.DropDownListFor(model => model.AffiliateType, Model.GetAffiliateTypeCodesForSelect(), Localiser["label.select"], new { @id = "cbAffiliateType", @class = "AffiliateType sbm-select" }) +
+
+
+ + @* Affiliate Organisation Name *@ +
+
+ +
+
+ @Html.TextBoxFor(model => model.AffiliateName, new { @id = "ifAffiliateName", @class = "AffiliateName sbm-input", @maxlength = @Model.GetControlMaxLength(SbmDbDfn.ColumnIdx.Affiliate_Name) }) +
+
+
+ + @* Affiliate Notes *@ +
+
+ +
+
+ @Html.TextAreaFor(model => model.AffiliateNotes, new { @id = "ifAffiliateNotes", @class = "AffiliateNotes sbm-textarea", @maxlength = @Model.GetControlMaxLength(SbmDbDfn.ColumnIdx.Affiliate_Notes) }) +
+
+
+ + } + +
diff --git a/SaBusinessMgrCoreWebPortal/Views/Shared/_Layout.cshtml b/SaBusinessMgrCoreWebPortal/Views/Shared/_Layout.cshtml index 0059dbb..e15b104 100644 --- a/SaBusinessMgrCoreWebPortal/Views/Shared/_Layout.cshtml +++ b/SaBusinessMgrCoreWebPortal/Views/Shared/_Layout.cshtml @@ -120,10 +120,10 @@ @Localiser["label.reference"]
-
@Localiser["label.contacts"]
+
@Localiser["label.contacts"]
-
@Localiser["label.commodities"]
+
@Localiser["label.commodities"]
  • diff --git a/SaBusinessMgrCoreWebPortal/appsettings.Development.json b/SaBusinessMgrCoreWebPortal/appsettings.Development.json index 58b13a3..771d378 100644 --- a/SaBusinessMgrCoreWebPortal/appsettings.Development.json +++ b/SaBusinessMgrCoreWebPortal/appsettings.Development.json @@ -16,7 +16,7 @@ "Send": { "Using": 2, "UserName": "businessmgr@sarand.com", - "Password": "sarand-busmgr-5apP1re" + "Password": "sarand-busmgr-5apPh1re" }, "Message": { "AddressFrom": "DoNotReply@SaBusinessMgr.com" diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-base.css b/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-base.css index b330981..b6cc104 100644 --- a/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-base.css +++ b/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-base.css @@ -1,5 +1,5 @@ /* - Base stylesheet. + BusMgr Portal - Base stylesheet. */ body @@ -19,10 +19,9 @@ div, button, input, select, textarea, table, tr, td font-size: 1rem; } -:focus, input:focus, textarea:focus, select:focus, button:focus +:focus, button:focus { outline: none; - border-color: inherit; box-shadow: 0 0 0 2px #80808040 inset; } @@ -122,10 +121,15 @@ input textarea { - overflow-y:scroll; resize: none; } +select +{ + margin: 0; + padding: 3px 2px 1px 2px; +} + .bold, b { font-weight: bold !important; @@ -389,7 +393,9 @@ td.action { -moz-box-shadow: 2px 2px 3px #ccc; -webkit-box-shadow: 2px 2px 3px #ccc; - box-shadow: 2px 2px 3px #ccc; + box-shadow: 2px 2px 3px #ccc; /* For IE 8 */ + -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=3,Direction=135,Color='#cccccc')"; /* For IE 5.5 - 7 */ + filter: progid:DXImageTransform.Microsoft.Shadow(Strength=3,Direction=135,Color='#cccccc'); } /* Bootstrap */ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-data.css b/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-data.css index 5258f3f..5dbecb7 100644 --- a/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-data.css +++ b/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-data.css @@ -1,5 +1,5 @@ /* - Data stylesheet. + BusMgr Portal - Data stylesheet. */ /* Filter panel */ @@ -8,10 +8,9 @@ { margin: 8px auto; background-color: #f8f8f8; - border: solid 2px var(--color-primary); + border: solid 1px #979797; border-radius: 6px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; + overflow: hidden; } @media (min-width: 576px) @@ -21,56 +20,60 @@ } } -.sbm-panel-filter > .sbm-header +.sbm-panel-filter .sbm-header { - padding: 2px 8px; + padding: 1px 8px 2px 8px; min-height: 24px; color: #f0f0f0; - background-color: var(--color-primary); - border-bottom: solid 1px var(--color-primary); + background-color: #979797; + border-bottom: solid 1px #979797; } -.sbm-panel-filter > .sbm-header .sbm-caption +.sbm-panel-filter .sbm-header .sbm-caption { margin-top: 4px; font-size: 1.2rem; font-weight: bold; } -.sbm-panel-filter > .sbm-header .sbm-action +.sbm-panel-filter .sbm-header .sbm-action { margin: 2px 0 0 8px; border-radius: 4px; } -.sbm-panel-filter > .sbm-header .sbm-action:hover +.sbm-panel-filter .sbm-header .sbm-action:hover { background-color: #b0b0b0; box-shadow: 0 0 4px 2px #80808080; } -.sbm-panel-filter > .sbm-content +.sbm-panel-filter .sbm-content { margin: 4px 8px; padding: 4px 8px; + background-color: #f8f8f8; } -.sbm-panel-filter > .sbm-content .sbm-control +.sbm-panel-filter .sbm-content .sbm-label { - margin-bottom: 4px; -} - -.sbm-panel-filter > .sbm-content .sbm-label -{ - padding: 2px 12px 2px 0; + padding-top: 2px; + padding-right: 12px; text-align: right; } -.sbm-panel-filter > .sbm-content .sbm-button +.sbm-panel-filter .sbm-content input[type="text"], +.sbm-panel-filter .sbm-content select +{ + min-width: 75%; + max-width: 90%; +} + +.sbm-panel-filter .sbm-content .sbm-button { min-width: auto; margin-left: 4px; - padding: 4px 6px 2px 6px; + padding: 4px 6px; } /* Paging */ @@ -88,8 +91,7 @@ .sbm-panel-filter .sbm-header .sbm-results-paging .sbm-action { margin: 2px 1px 0 1px; - background-color: #a0a0a0; - opacity: 0.8; + background-color: #b0b0b0; box-shadow: 0 0 0 1px #40404080 inset; } @@ -131,8 +133,7 @@ .sbm-panel-item { margin: 8px auto; - background-color: #f8f8f8; - border: solid 2px #979797; + border: solid 1px #979797; border-radius: 6px; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -161,7 +162,7 @@ .sbm-panel-item > .sbm-header .sbm-caption .sbm-action:hover { - color: var(--color-primary); + color: var(--color-light); } .sbm-panel-item > .sbm-header .sbm-actions .sbm-action @@ -177,7 +178,7 @@ .sbm-panel-item > .sbm-content { - margin: 6px 8px; + margin: 4px 8px; padding: 4px 4px; } @@ -186,46 +187,38 @@ font-size: 0.8rem; } -/* Profile Sports */ - -.sbm-panel-item.ProfileSport, -.sbm-panel-item.ProfileSport > .sbm-header +@media (min-width: 576px) { - border-color: var(--color-alt2); + .sbm-panel-filter + { + } } -/* Organisations */ +/* Item statuses */ -.sbm-panel-item.Organisation, -.sbm-panel-item.Organisation > .sbm-header +.sbm-status-awa { - border-color: var(--color-alt3); + color: darkorange; } -/* Articles */ - -.sbm-panel-item.Article, -.sbm-panel-item.Article > .sbm-header +.sbm-status-atv { - border-color: var(--color-article); + color: green; } -.sbm-panel-item.Article > .sbm-header +.sbm-status-ina { - background-color: var(--color-article-pale); + color: darkred; } -/* Opportunitys */ - -.sbm-panel-item.Opportunity, -.sbm-panel-item.Opportunity > .sbm-header +.sbm-status-hld { - border-color: var(--color-opportunity); + color: dodgerblue; } -.sbm-panel-item.Opportunity > .sbm-header +.sbm-status-del { - background-color: var(--color-opportunity-pale); + color: purple; } /* The End */ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-form.css b/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-form.css index 4e5a6b9..a6bae29 100644 --- a/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-form.css +++ b/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-form.css @@ -1,5 +1,5 @@ /* - Form stylesheet. + BusMgr Portal - Form stylesheet. */ /* Panels */ @@ -7,20 +7,20 @@ .sbm-panel-info, .sbm-panel-form { max-width: 720px; - margin: 16px auto; + margin: 24px auto; padding: 0; - background-color: #f8f8f8; - border: solid 2px #606060; + background-color: #fff; + border: solid 2px #979797; border-color: var(--color-primary); - border-radius: 6px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; overflow: hidden; } .sbm-panel-form.security { - max-width: 560px; + max-width: 520px; } @media (min-width: 576px) @@ -40,24 +40,14 @@ border-color: var(--color-primary); } -.sbm-panel-form > .sbm-header -{ - background-color: var(--color-primary); -} - .sbm-panel-info > .sbm-header .sbm-caption, .sbm-panel-form > .sbm-header .sbm-caption { - font-size: 1.25rem; + font-size: 1.5rem; font-weight: bold; color: var(--color-primary-dark); } -.sbm-panel-form > .sbm-header .sbm-caption -{ - color: #f0f0f0; -} - .sbm-panel-info > .sbm-header .sbm-action img:hover, .sbm-panel-form > .sbm-header .sbm-action img:hover { @@ -66,29 +56,18 @@ box-shadow: 2px 2px 4px 0 #80808080; } -.sbm-panel-info > .sbm-header .dropdown-menu, -.sbm-panel-form > .sbm-header .dropdown-menu -{ - padding: 4px 8px; -} - -.sbm-panel-info > .sbm-header ul.nav, -.sbm-panel-form > .sbm-header ul.nav -{ - margin: 0; -} - -.sbm-panel-info > .sbm-header .dropdown-menu .sbm-action, -.sbm-panel-form > .sbm-header .dropdown-menu .sbm-action -{ - font-size: .8rem; -} - .sbm-panel-info > .sbm-content, .sbm-panel-form > .sbm-content { + max-height: 400px; padding: 12px 12px; background-color: #f8f8f8; + overflow-y: auto; +} + +.sbm-panel-info > .sbm-content +{ + padding: 8px 12px; } .sbm-panel-section.sbm-edit .sbm-panel-info, @@ -128,20 +107,13 @@ { } -.sbm-form .sbm-form-control .sbm-caption, .sbm-form .sbm-form-control .sbm-label { - margin: 0 0 4px 0; + margin: 0 0 8px 0; font-size: 1rem; line-height: 1.25; } -.sbm-form .sbm-form-control .sbm-caption -{ - font-size: 1.1rem; - font-weight: bold; -} - .sbm-form .sbm-form-control .sbm-label-text { font-size: 1rem; @@ -158,19 +130,39 @@ .sbm-form .sbm-form-control { - margin: 0 0 12px 0; + margin: 0 0 16px 0; +} + +.sbm-form .sbm-form-control .sbm-label +{ + margin: 0 0 8px 0; + font-size: 1rem; + line-height: 1.25; +} + +.sbm-form .sbm-form-control .sbm-label-text +{ + font-size: 1rem; + line-height: 1.25; +} + +.sbm-form .sbm-form-control .sbm-note +{ + font-size: 0.9rem; + line-height: 1.2; } .sbm-form .sbm-input, .sbm-form .sbm-textarea, .sbm-form .sbm-select { - padding: 3px 8px 0 8px; + padding: 3px 8px 4px 8px; width: 100%; - min-height: 30px; font-size: 1rem; - line-height: 1.3; + line-height: 1.25; background-color: #fff; border: 1px solid #595959; - border-radius: 3px; + border-radius: 2px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; outline: none; } @@ -181,8 +173,8 @@ .sbm-form .sbm-textarea, .sbm-form .sbm-select[multiple="multiple"] { - border-top-right-radius: 0; - border-bottom-right-radius: 0; + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; overflow-y: scroll; } @@ -193,10 +185,8 @@ .sbm-form .sbm-form-control.sbm-error .sbm-input, .sbm-form .sbm-form-control.sbm-error .sbm-textarea, .sbm-form .sbm-form-control.sbm-error .sbm-select { - color: #606060; - color: var(--color-primary); - border-color: #606060; - border-color: var(--color-primary); + color: #DC143C; + border-color: #DC143C; } /* Control messages */ @@ -206,7 +196,7 @@ display: none; margin-top: 8px; padding-left: 24px; - font-size: 16px; + font-size: 1.00rem; background-position: left top; background-repeat: no-repeat; } @@ -226,16 +216,13 @@ { height: auto; width: auto; - min-width: 120px; - padding: 4px 8px; - font-size: 16px; - font-weight: bold; + min-width: 80px; + padding: 4px 2px; + font-size: 1rem; text-align: center; - color: #606060; - color: var(--color-primary); - background-color: #DFD2E1; - border: solid 1px #606060; - border-color: var(--color-primary); + color: #fff; + background-color: #d4af37; + border: 1px solid #d4af37; border-radius: 4px; } @@ -243,7 +230,6 @@ .sbm-form input[type="button"].sbm-button:hover, .sbm-form input[type="submit"].sbm-button:hover { - background-color: #EFE8F0; } /* Password strength */ @@ -254,7 +240,8 @@ height: 18px; margin: 6px 24px; border-color: #595959; - box-shadow: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; overflow: hidden; } diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-main.css b/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-main.css index cdcc17f..5a990ba 100644 --- a/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-main.css +++ b/SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-main.css @@ -1,35 +1,20 @@ /* - Main stylesheet. + BusMgr Portal - Main stylesheet. */ /* Global variables */ :root { - /* - #556B2F Dark Olive Green - Ref. https://www.crispedge.com/color/556B2F - Darker: #445525, #33401c. Lighter: #768858, #99a682, #a6c275, #b7ce90. - */ - --color-primary: #556B2F; - --color-primary-dark: #425324; - --color-primary-light: #a0ac8b; - --color-primary-pale: #eceee7; + /* Colour analysis: https://www.colorhexa.com/ */ + /* #4b0082 - Indigo. Ref. https://www.crispedge.com/color/4b0082 */ + --color-primary: #4b0082; + --color-light: #9b71b9; + --color-pale: #ebe2f1; /* Tetrad/Square colors */ - --color-alt1: #2f6b63; - --color-alt2: #452f6b; - --color-alt3: #6b2f37; - /* Activity colours */ - --color-article-dark: #7339ac; - --color-article: #9966CC; - --color-article-light: #b38cd9; - --color-article-pale: #decdee; - --color-opportunity-dark: #8f6b24; - --color-opportunity: #CC9933; - --color-opportunity-light: #dbb870; - --color-opportunity-pale: #f3e7d0; - /* Specific colours */ - --color-dialog: var(--color-alt3); + --color-alt1: #820a00; + --color-alt2: #378200; + --color-alt3: #007882; } /* Document */ @@ -49,13 +34,36 @@ html body { - font-family: Verdana, Helvetica, Arial, Lucida, sans-serif; - background-color: #e9edf6; + font-family: Arial, Verdana, Helvetica, Lucida, sans-serif; } body > .container { - padding: 0 1%; + padding: 0 0.5%; +} + +@media (min-width: 992px) +{ + .container + { + max-width: 1200px; + } +} + +@media (min-width: 768px) +{ + .container + { + max-width: 1200px; + } +} + +@media (min-width: 576px) +{ + .container + { + max-width: 1200px; + } } /* Sticky footer styles */ @@ -69,7 +77,7 @@ html body { /* Margin bottom by footer height */ - /*margin-bottom: 60px;*/ + margin-bottom: 60px; } .footer @@ -77,6 +85,7 @@ body position: absolute; bottom: 0; width: 100%; + padding: 0 2%; white-space: nowrap; /* Set the fixed height of the footer here */ height: 60px; @@ -113,11 +122,14 @@ button.accept-policy line-height: inherit; } -/* Information */ - -.sbm-para +/* Page caption */ +.sbm-page-caption { - margin: 8px 0; + margin: 0; + padding: 16px 24px; + font-size: 48px; + font-weight: bold; + color: #000; } /* Actions */ @@ -125,8 +137,7 @@ button.accept-policy a, a:hover { text-decoration: underline; - color: #606060; - color: var(--color-primary); + color: #d4af37; } a:focus @@ -135,11 +146,16 @@ a:focus outline-width: thin; } -.sbm-action +.sbm-action, .sbm-action-text { cursor: pointer; } +.sbm-action-text:hover +{ + text-decoration: underline; +} + .sbm-action-link { display: inline-block; @@ -169,11 +185,11 @@ a:focus padding: 12px 12px; min-width: 100px; color: #404040; - background-color: #b7ce90; + background-color: #e0e0e0; font-size: 16px; font-weight: bold; text-align: center; - border-radius: 12px; + border-radius: 20px; cursor: pointer; transition: all .5s ease-in-out; outline: none; @@ -185,12 +201,18 @@ a:focus .sbm-button-action:hover { - background-color: #a6c275; + background-color: #b0b0b0; +} + +.sbm-button-action:focus +{ + outline: none; + box-shadow: 0 0 4px 2px #808080; } .sbm-button-cta:hover { - background: #a6c275; + background: #808080 !important; } /* --- Notification --- */ @@ -254,7 +276,6 @@ a:focus } /* --- Modal Please wait --- */ - #sbm-please-wait { display: none; @@ -277,7 +298,6 @@ a:focus } /* Dialogs */ - .sbm-dialog { display: none; @@ -287,21 +307,25 @@ a:focus { position: fixed; padding: 0; - background-color: #e9edf6; +} + +.ui-dialog .ui-dialog-titlebar +{ + padding: 6px 12px; +} + +.ui-dialog .ui-dialog-content +{ + padding: 6px 12px; } .ui-dialog.ui-widget.ui-widget-content { border-width: 2px; - border-color: #606060; - border-color: var(--color-dialog); - -moz-box-shadow: 4px 4px 6px var(--color-dialog); - -webkit-box-shadow: 4px 4px 6px var(--color-dialog); -} - -.ui-dialog.ui-widget.sbm-dialog-border-thin.ui-widget-content -{ - border-width: 1px; + border-color: #d4af37; + -moz-box-shadow: 4px 4px 6px #ccc; + -webkit-box-shadow: 4px 4px 6px #ccc; + overflow: hidden; } .ui-dialog.ui-widget.ui-widget-content.ui-corner-all @@ -309,68 +333,41 @@ a:focus border-radius: 6px; } -.ui-dialog.ui-widget.sbm-dialog-rounding-none.ui-widget-content.ui-corner-all -{ - border-radius: 0; -} - .ui-dialog.ui-widget .ui-widget-header { font-size: 1.1rem; - color: #f0f0f0; - background-color: #606060; - border-color: var(--color-dialog); - background-color: #606060; - background-color: var(--color-dialog); + color: #fff; + background-color: #d4af37; + border-color: #d4af37; } -.ui-dialog.ui-widget .ui-widget-header.ui-corner-all +.ui-widget-content { - border-radius: 0; -} - -.ui-dialog.sbm-dialog-titlebar-hide .ui-dialog-titlebar -{ - display: none; -} - -.ui-dialog.dialog-no-close .ui-dialog-titlebar-close -{ - display: none; -} - -.ui-dialog.ui-widget .ui-dialog-content.ui-widget-content -{ - padding: 4px 8px 0 8px; - font-size: 1rem; + font-size: 16px; color: #000; } -.ui-dialog .ui-dialog-buttonpane.ui-widget-content +.ui-dialog .ui-dialog-titlebar.ui-corner-all { - margin-top: 0; - padding: 4px 16px 4px 16px; - background-color: transparent; - border-color: #606060; - border-color: var(--color-dialog); + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } -.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset +.ui-dialog.no-close .ui-dialog-titlebar-close { - float: none; - width: 100%; - text-align: right; + /*display: none;*/ +} + +.ui-dialog .ui-dialog-buttonpane +{ + border-color: #d4af37; } .ui-dialog .ui-dialog-buttonpane button { - min-width: 60px; - padding: 6px 16px 4px 16px; color: #fff; - background-color: #606060; - background-color: var(--color-dialog); - border-color: #606060; - border-color: var(--color-dialog); + background-color: #d4af37; + border-color: #d4af37; outline: none; } @@ -388,8 +385,7 @@ a:focus .ui-datepicker .ui-datepicker-header { background-color: #fff; - border: 1px solid #606060; - border-color: var(--color-dialog); + border: 1px solid #d4af37; } /* The End */ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept16.png new file mode 100644 index 0000000..102d03d Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept24.png new file mode 100644 index 0000000..fbaad5b Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept32.png new file mode 100644 index 0000000..0a2b4f3 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept48.png new file mode 100644 index 0000000..14c3684 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/accept48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add16.png new file mode 100644 index 0000000..9634014 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add24.png new file mode 100644 index 0000000..a0f296e Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add32.png new file mode 100644 index 0000000..30f5eac Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add48.png new file mode 100644 index 0000000..c8665e1 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/add48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block16.png new file mode 100644 index 0000000..20f0f2c Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block24.png new file mode 100644 index 0000000..a5bba5a Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block32.png new file mode 100644 index 0000000..4b0e9b2 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block48.png new file mode 100644 index 0000000..7a8d7a2 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/block48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar16.png new file mode 100644 index 0000000..7969075 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar24.png new file mode 100644 index 0000000..716683e Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar32.png new file mode 100644 index 0000000..ff7d299 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar48.png new file mode 100644 index 0000000..587871d Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/calendar48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy24.png new file mode 100644 index 0000000..493e0aa Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy24x.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy24x.png new file mode 100644 index 0000000..bfa977f Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy24x.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy32.png new file mode 100644 index 0000000..a1f0ca1 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy32x.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy32x.png new file mode 100644 index 0000000..1c3d7d4 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/copy32x.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete16.png new file mode 100644 index 0000000..97b7ca4 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete24.png new file mode 100644 index 0000000..fa5a135 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete32.png new file mode 100644 index 0000000..50b604f Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete48.png new file mode 100644 index 0000000..eac10b8 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/delete48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download16.png new file mode 100644 index 0000000..908aacf Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download24.png new file mode 100644 index 0000000..0c5d611 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download32.png new file mode 100644 index 0000000..204b899 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download48.png new file mode 100644 index 0000000..dc0d6ac Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/download48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/edit24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/edit24.png new file mode 100644 index 0000000..5716a04 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/edit24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/edit32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/edit32.png new file mode 100644 index 0000000..b94a212 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/edit32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite16.png new file mode 100644 index 0000000..171981a Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite24.png new file mode 100644 index 0000000..06696bd Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite32.png new file mode 100644 index 0000000..df43557 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite48.png new file mode 100644 index 0000000..4f97c3a Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/favorite48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first16.png new file mode 100644 index 0000000..9cdd676 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first24.png new file mode 100644 index 0000000..c104193 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first32.png new file mode 100644 index 0000000..593c33a Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/first32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info16.png new file mode 100644 index 0000000..200c448 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info24.png new file mode 100644 index 0000000..3b6e107 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info32.png new file mode 100644 index 0000000..3e841c9 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info48.png new file mode 100644 index 0000000..4518180 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/info48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last16.png new file mode 100644 index 0000000..8dbe5ae Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last24.png new file mode 100644 index 0000000..904ceb8 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last32.png new file mode 100644 index 0000000..026a96c Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/last32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock16.png new file mode 100644 index 0000000..2c03f7d Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock24.png new file mode 100644 index 0000000..89ebada Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock32.png new file mode 100644 index 0000000..6102d57 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock48.png new file mode 100644 index 0000000..7673ba5 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/lock48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail16.png new file mode 100644 index 0000000..d77a435 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail24.png new file mode 100644 index 0000000..7cda694 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail32.png new file mode 100644 index 0000000..a87a31d Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail48.png new file mode 100644 index 0000000..622e36e Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/mail48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next16.png new file mode 100644 index 0000000..a47d4d7 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next24.png new file mode 100644 index 0000000..90a7a49 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next32.png new file mode 100644 index 0000000..ae0fc1d Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/next32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/password24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/password24.png new file mode 100644 index 0000000..28426cf Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/password24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/password32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/password32.png new file mode 100644 index 0000000..c301dab Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/password32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev16.png new file mode 100644 index 0000000..4046b7c Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev24.png new file mode 100644 index 0000000..e9d20b8 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev32.png new file mode 100644 index 0000000..329210b Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/prev32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process16.png new file mode 100644 index 0000000..7062dea Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process24.png new file mode 100644 index 0000000..6c8f28d Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process32.png new file mode 100644 index 0000000..a03de55 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process48.png new file mode 100644 index 0000000..1d8e4f9 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/process48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh16.png new file mode 100644 index 0000000..3235f41 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh24.png new file mode 100644 index 0000000..b2adb77 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh32.png new file mode 100644 index 0000000..a3a11ac Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh48.png new file mode 100644 index 0000000..40f3ffc Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/refresh48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search16.png new file mode 100644 index 0000000..c78694e Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search24.png new file mode 100644 index 0000000..b4870f1 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search32.png new file mode 100644 index 0000000..6f39279 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search48.png new file mode 100644 index 0000000..83866ea Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/search48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock16.png new file mode 100644 index 0000000..6908232 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock24.png new file mode 100644 index 0000000..fae950d Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock32.png new file mode 100644 index 0000000..f3fda2c Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock48.png new file mode 100644 index 0000000..e253527 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/unlock48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload116.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload116.png new file mode 100644 index 0000000..1e97024 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload116.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload16.png new file mode 100644 index 0000000..69d69af Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload24.png new file mode 100644 index 0000000..6605301 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload32.png new file mode 100644 index 0000000..18c59e9 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload48.png new file mode 100644 index 0000000..e7943df Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/upload48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user16.png new file mode 100644 index 0000000..881f6ac Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user24.png new file mode 100644 index 0000000..2afac1e Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user32.png new file mode 100644 index 0000000..9c3ef13 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user48.png new file mode 100644 index 0000000..81999da Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/user48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users16.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users16.png new file mode 100644 index 0000000..b1eae4f Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users16.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users24.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users24.png new file mode 100644 index 0000000..2d0a943 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users24.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users32.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users32.png new file mode 100644 index 0000000..920e08d Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users32.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users48.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users48.png new file mode 100644 index 0000000..bb34f86 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/action/users48.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/animated/InProgress-01.gif b/SaBusinessMgrCoreWebPortal/wwwroot/img/animated/InProgress-01.gif new file mode 100644 index 0000000..162c88e Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/animated/InProgress-01.gif differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-18.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-18.png new file mode 100644 index 0000000..b74fd05 Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-18.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-36.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-36.png new file mode 100644 index 0000000..fe36b8f Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-36.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-54.png b/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-54.png new file mode 100644 index 0000000..2bb315f Binary files /dev/null and b/SaBusinessMgrCoreWebPortal/wwwroot/img/icon/error-54.png differ diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-contact.js b/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-contact.js new file mode 100644 index 0000000..f17e0f5 --- /dev/null +++ b/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-contact.js @@ -0,0 +1,182 @@ +/* + * Admin - Affiliate page scripts. + */ + +(function (win, doc, undef) +{ + "use strict"; + sbm.itemIdPrefix = 'Itm_'; + var $results; + + //-------------------------------------------------------------- + sbm.refreshResults = function (delay) + { + if (!sbm.awaitingRefreshResponse) + { + var $items = $('.sbm-panel-item-list', $results).fadeOut(200).empty(); + var $msgs = $('.sbm-panel-messages', $results).hide().empty().append($('
    ' + sbm.msg.dataQuerying + '
    ')).fadeIn(200); + } + sbm.ajax.refreshResults = sbm.ajax.refreshResults || { url: sbm.url.base + 'Contact/Ajax/List', formId: 'frmAffiliateFilter', callbackFn: sbm.doRefreshResults }; + sbm.doAjaxRequest(sbm.ajax.refreshResults, delay || 50); + sbm.awaitingRefreshResponse = true; + } + sbm.getItemTemplate = function () + { + return $('.sbm-panel-item-template .sbm-panel-item.Affiliate', $results); + } + sbm.getDropdownItemTemplate = function () + { + return $('.sbm-panel-item-template .sbm-dropdown-menu.Affiliate li.sbm-dropdown-item', $results); + } + sbm.doRefreshResults = function (response) + { + sbm.debug('doRefreshResults', response); + delete sbm.awaitingRefreshResponse; + sbm.refreshControlValues(response.controlValues); + var $msgs = $('.sbm-panel-messages', $results).hide().empty(); + var $items = $('.sbm-panel-item-list', $results).hide().empty(); + var $tmpl = sbm.getItemTemplate(); + sbm.refreshPaging(response, '#frmAffiliateFilter', sbm.refreshResults); + if (!response.success) return; + // Reference data - Statuses. + if (response.defaultStatusCode) sbm.data.defaultStatusCode = response.defaultStatusCode; + if (response.statuses) + sbm.populateSelectCodeDesc('#cbAffiliateStatus', response.statuses); + // Items. + var items = response.affiliates; + if (!items.length) + return $msgs.append($('
    ' + sbm.msg.dataNoneFound + '
    ')).fadeIn(500); + for (let itemIdx = 0; itemIdx < items.length; itemIdx++) + { + let item = items[itemIdx]; + let $item = $tmpl.clone(); + sbm.populateItem($item, item); + $items.append($item); + } + $items.fadeIn(50); + } + sbm.populateItem = function ($item, item) + { + if (!item) return; + $item.prop('id', sbm.itemIdPrefix + item.id); + $('.AffiliateName', $item).text(item.displayName); + $('.AffiliateType', $item).text(item.typeDesc); + $('.AffiliateAssociationCount', $item).on('click', function () { sbm.onClickAssociationCount(item.id); }).find('.AssociationCount').text(item.associationCount); + $('.StatusDesc', $item).text(item.statusDesc).addClass('sbm-status-' + item.statusCode.toLowerCase()); + $('.sbm-caption .sbm-action').toggleClass('sbm-action', !item.deleted); + if (!item.deleted) + { + let $mnu = $('ul.sbm-dropdown-menu', $item); + $mnu.append(sbm.getDropdownItemTemplate().clone().find('div.sbm-label').text(sbm.lbl.edit).end().on('click', function () { sbm.updateItem(item.id) })); + if (item.awaiting) + $mnu.append(sbm.getDropdownItemTemplate().clone().find('div.sbm-label').text(sbm.lbl.activate).end().on('click', function () { sbm.activateItem(item.id) })); + $('.sbm-header .sbm-action.sbm-item-update', $item).off('click').on('click', function () { sbm.updateItem(item.id) }); + $item.off('dblclick').on('dblclick', function () { sbm.updateItem(item.id) }); + } + $('.sbm-burger', $item).toggle(!!$('.sbm-burger .sbm-dropdown-menu .sbm-dropdown-item', $item).length); + $('.sbm-panel-messages', $results).hide().empty(); + return $item; + } + + //-------------------------------------------------------------- + sbm.createItem = function () + { + let $frm = sbm.$frm.affiliate; + $('.AffiliateId,input[type="text"],textarea,select', $frm).val(''); + $('.AffiliateStatus', $frm).val(sbm.data.defaultStatusCode); + sbm.clearControlErrors(); + sbm.$dlg.affiliate.dialog('option', 'title', sbm.dlg.title.createAffiliate); + sbm.openDialog(sbm.$dlg.affiliate, 600, 600); + } + sbm.doCreateItem = function () + { + sbm.storeItem(); + } + + //-------------------------------------------------------------- + sbm.updateItem = function (id) + { + $('.AffiliateId', sbm.$frm.affiliateId).val(id); + sbm.ajax.updateItem = sbm.ajax.updateItem || { url: sbm.url.base + 'Contact/Ajax/GetItem', formId: 'frmAffiliateId', callbackFn: sbm.onUpdateItem }; + sbm.doAjaxRequest(sbm.ajax.updateItem, 50); + } + sbm.onUpdateItem = function (response) + { + //sbm.debug('onUpdateItem', response); + let $frm = sbm.$frm.affiliate; + $('.AffiliateId,input[type="text"],textarea,select', $frm).val(''); + if (!response.success) return; + let item = response.affiliate; + $('.AffiliateId', $frm).val(item.id); + $('.AffiliateType', $frm).val(item.typeCode); + $('.AffiliateName', $frm).val(item.name); + $('.AffiliateNotes', $frm).val(item.notes); + $('.AffiliateStatus', $frm).val(item.statusCode); + sbm.clearControlErrors(); + sbm.$dlg.affiliate.dialog('option', 'title', sbm.dlg.title.updateAffiliate); + sbm.openDialog(sbm.$dlg.affiliate, 600, 600); + } + sbm.doUpdateItem = function () + { + sbm.storeItem(); + } + + //-------------------------------------------------------------- + sbm.storeItem = function () + { + sbm.ajax.storeItem = sbm.ajax.storeItem || { url: sbm.url.base + 'Contact/Ajax/StoreItem', formId: 'frmAffiliate', callbackFn: sbm.onStoreItem }; + sbm.doAjaxRequest(sbm.ajax.storeItem, 50); + } + sbm.onStoreItem = function (response) + { + //sbm.debug('onStoreItem', response); + sbm.refreshControlValues(response.controlValues); + if (!response.success) return; + sbm.$dlg.affiliate.dialog('close'); + + var item = response.affiliate; + var $item = $('#' + sbm.itemIdPrefix + item.id); + if (!$item.length) + { + $item = $('.sbm-panel-item-template .sbm-panel-item.Affiliate', $results).clone(); + $('.sbm-panel-item-list', $results).prepend($item).show(); + } + $item.replaceWith(sbm.populateItem(sbm.getItemTemplate(), item)); + } + + //-------------------------------------------------------------- + sbm.onClickAssociationCount = function (id) + { + if (!(id * 1)) return; + sbm.doPleaseWait(); + let $frm = $('#frmAffiliateId'); + $('.AffiliateId', $frm).val(id); + $frm.prop('action', sbm.url.base + 'Association').submit(); + } + + //-------------------------------------------------------------- + $(function () + { + $('.sbm-panel-filter .sbm-action.sbm-item-create').on('click', function () { sbm.createItem(); }); + $('.sbm-panel-filter .sbm-action.sbm-results-refresh').on('click', function () { sbm.refreshResults(); }); + $('.sbm-input, .sbm-textarea').on('input', function () { sbm.clearControlError(this); }); + $('.sbm-select').on('change', function () { sbm.clearControlError(this); }); + + sbm.$frm.filter = $('#frmAffiliateFilter'); + $('.FilterAffiliate', sbm.$frm.filter).on('input', function () { sbm.refreshResults(250); }); + $('.FilterAffiliateCategory,.FilterAffiliateStatusCategory', sbm.$frm.filter).on('change', function () { sbm.refreshResults(50); }); + sbm.$frm.affiliateId = $('#frmAffiliateId'); + sbm.$frm.affiliate = $('#frmAffiliate'); + $results = $('.sbm-panel-results'); + + var opt = sbm.dlgOpts(); + opt.buttons[sbm.dlg.btn.ok] = function () { sbm.doCreateItem(); }; + opt.buttons[sbm.dlg.btn.cancel] = function () { $(this).dialog('close'); }; + sbm.$dlg.affiliate = $('#dlgAffiliate').dialog(opt); + + setTimeout(sbm.refreshResults, 250); + }); + +}(window, window.document)); + +/* The End */ \ No newline at end of file diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-resultsPaging.js b/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-resultsPaging.js new file mode 100644 index 0000000..635181c --- /dev/null +++ b/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-resultsPaging.js @@ -0,0 +1,83 @@ +/* + * Admin - Results paging. + */ + +(function (win, doc, undef) +{ + "use strict"; + let rp = sbm.resultsPaging = sbm.resultsPaging || { fn: {}, msg: {}, contexts: [] }; + + //-------------------------------------------------------------- + rp.fn.refreshPaging = function (paging, contextSel, refreshFn) + { + let context = rp.fn.getContext(contextSel, refreshFn); + rp.fn.init(context); + context.paging = paging = paging || {}; + context.$rp.toggle(paging.paged); + context.$pageNo.val(paging.pageNo); + context.$pageLen.val(paging.pageLength); + $('.sbm-paging-info', context.$rp).text(sbm.resultsPaging.msg.pageInfo.format(paging.pageNo, paging.pageCount)); + //$('.sbm-paging-first,.sbm-paging-prev', context.$rp).toggle(paging.pageNo > 1); + //$('.sbm-paging-next,.sbm-paging-last', context.$rp).toggle(paging.pageNo < paging.pageCount); + } + + //-------------------------------------------------------------- + rp.fn.getContext = function (contextSel, refreshFn) + { + for (let idx = 0; idx < rp.contexts.length; idx++) + { + if (rp.contexts[idx].sel == contextSel) return rp.contexts[idx]; + } + //sbm.debug('getContext Creating new context for: ', contextSel); + let context = { sel: contextSel, refreshFn: refreshFn } + rp.contexts.push(context); + return context; + } + + //-------------------------------------------------------------- + rp.fn.firstPage = function (context) + { + let page = context.$pageNo.val() * 1; + if (page < 2) return; + context.$pageNo.val(1); + context.refreshFn(); + } + rp.fn.prevPage = function (context) + { + let page = context.$pageNo.val() * 1; + if (page < 2) return; + context.$pageNo.val(page - 1); + context.refreshFn(); + } + rp.fn.nextPage = function (context) + { + let page = context.$pageNo.val() * 1; + if (page > context.paging.pageCount - 1) return; + context.$pageNo.val(page + 1); + context.refreshFn(); + } + rp.fn.lastPage = function (context) + { + let page = context.$pageNo.val() * 1; + if (page > context.paging.pageCount - 1) return; + context.$pageNo.val(context.paging.pageCount); + context.refreshFn(); + } + + //-------------------------------------------------------------- + rp.fn.init = function (context) + { + if (context.$rp) return; + //sbm.debug('resultsPaging.init Initialising Paging.', context); + context.$rp = $('.sbm-results-paging', $(context.sel)); + context.$pageNo = $('.PagingPageNo', context.$rp); + context.$pageLen = $('.PagingPageLength', context.$rp); + $('.sbm-paging-first', context.$rp).off('click').on('click', function () { rp.fn.firstPage(context); }); + $('.sbm-paging-prev', context.$rp).off('click').on('click', function () { rp.fn.prevPage(context); }); + $('.sbm-paging-next', context.$rp).off('click').on('click', function () { rp.fn.nextPage(context); }); + $('.sbm-paging-last', context.$rp).off('click').on('click', function () { rp.fn.lastPage(context); }); + } + +}(window, window.document)); + +/* The End */ \ No newline at end of file diff --git a/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-security.js b/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-security.js index 10856d8..4b62f65 100644 --- a/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-security.js +++ b/SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-security.js @@ -52,7 +52,7 @@ sbm.doRequestPassword = function () { sbm.clearControlErrors(); - sbm.ajaxRequestPassword = sbm.ajaxRequestPassword || { url: sbm.url.base + 'Security/Ajax/RequestNewPassword', formId: 'frmRequestPassword', callbackFn: sbm.onRequestPassword }; + sbm.ajaxRequestPassword = sbm.ajaxRequestPassword || { url: sbm.url.base + 'Security/Ajax/RequestPassword', formId: 'frmRequestPassword', callbackFn: sbm.onRequestPassword }; sbm.doAjaxRequest(sbm.ajaxRequestPassword, 50); } sbm.onRequestPassword = function (response)