This commit is contained in:
Andy Howard
2024-11-19 09:47:00 +00:00
parent c5ee285e27
commit 8b872cc8f3
214 changed files with 7924 additions and 5519 deletions
@@ -36,7 +36,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
ClearErrorState();
if (!SysId.IsValid(affiliateId)) return false;
SbmAffiliate.Params prmAffiliate = new SbmAffiliate.Params();
prmAffiliate.IncludedIds.Add(affiliateId);
prmAffiliate.IdsIncluded.Add(affiliateId);
prmAffiliate.StatusCat = SbmAffiliate.StatusCat.Any;
return GetAffiliateCount(prmAffiliate) == 1;
}
@@ -45,7 +45,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
ClearErrorState();
if (!SysId.IsValid(affiliateIdOwner)) return false;
SbmAffiliate.Params prmAffiliate = new SbmAffiliate.Params();
prmAffiliate.IncludedIds.Add(affiliateIdOwner);
prmAffiliate.IdsIncluded.Add(affiliateIdOwner);
prmAffiliate.StatusCat = SbmAffiliate.StatusCat.Any;
return GetAffiliateCount(prmAffiliate) == 1;
}
@@ -55,7 +55,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
if (!StringUtil.IsEmpty(organisationName) || !SysId.IsValid(affiliateIdExclude)) return false;
SbmAffiliate.Params prmAffiliate = new SbmAffiliate.Params();
prmAffiliate.Name = organisationName;
prmAffiliate.ExcludedIds.Add(affiliateIdExclude);
prmAffiliate.IdsExcluded.Add(affiliateIdExclude);
prmAffiliate.StatusCat = SbmAffiliate.StatusCat.Any;
return GetAffiliateCount(prmAffiliate) == 1;
}
@@ -66,7 +66,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
SbmAffiliate.Params prmAffiliate = new SbmAffiliate.Params();
prmAffiliate.Name = firstName;
prmAffiliate.Name = lastName;
prmAffiliate.ExcludedIds.Add(affiliateIdExclude);
prmAffiliate.IdsExcluded.Add(affiliateIdExclude);
prmAffiliate.StatusCat = SbmAffiliate.StatusCat.Any;
return GetAffiliateCount(prmAffiliate) == 1;
}
@@ -80,7 +80,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
ClearErrorState();
if (!SysId.IsValid(affiliateId)) return null;
SbmAffiliate.Params prmAffiliate = new SbmAffiliate.Params();
prmAffiliate.IncludedIds.Add(affiliateId);
prmAffiliate.IdsIncluded.Add(affiliateId);
prmAffiliate.StatusCat = SbmAffiliate.StatusCat.Any;
return GetAffiliate(prmAffiliate);
}
@@ -126,7 +126,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
ClearErrorState();
if (!SysId.IsValid(associationId)) return null;
SbmAffiliate.Params prmAffiliate = new SbmAffiliate.Params();
prmAffiliate.IncludedIds.Add(associationId);
prmAffiliate.IdsIncluded.Add(associationId);
prmAffiliate.StatusCat = SbmAffiliate.StatusCat.Any;
return GetAffiliate(prmAffiliate);
}
@@ -386,6 +386,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
DataValue value = new DataValue();
switch ((SbmAffiliate.Column)column.Id)
{
//-----------------------------------------------------------
// Affiliate type description.
case SbmAffiliate.Column.Type_Code:
case SbmAffiliate.Column.Type_Desc:
@@ -397,27 +398,25 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
}
break;
//-----------------------------------------------------------
// Address summary.
case SbmAffiliate.Column.Address_Summary:
{
List<String> addresses = new List<String>()
{
values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Line1).DataName).AsString(),
values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Line2).DataName).AsString(),
values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_City).DataName).AsString(),
values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Province).DataName).AsString(),
values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Postcode).DataName).AsString(),
values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Country).DataName).AsString(),
};
value = new DataValue(addresses.Concat(", ", null, null, true, true).Replace(" ,", ",").Trim(',').Trim());
String line1 = values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Line1).DataName).AsString();
String city = values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_City).DataName).AsString();
String province = values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Province).DataName).AsString();
String postcode = values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Postcode).DataName).AsString();
String country = values.GetValue(GetAffiliateColumnDfn(SbmAffiliate.Column.Address_Country).DataName).AsString();
value = new DataValue(SbmAddress.GetSummary(line1, city, province, postcode, country));
break;
}
//-----------------------------------------------------------
// Prospect Group.
case SbmAffiliate.Column.ProspectGroup:
break;
//-----------------------------------------------------------
// Notes.
case SbmAffiliate.Column.Notes:
value = new DataValue(SacsHierarchyItem.FormatForDisplay(values.GetValue(column.DataName).ToString(), 200));
@@ -436,7 +435,11 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
}
break;
//-----------------------------------------------------------
//-----------------------------------------------------------
default:
value = values.GetValue(column.DataName);
break;
}
return value;
}