This commit is contained in:
@@ -322,29 +322,29 @@ MULTIPLE discount / markup ITEMS
|
||||
//PARTS
|
||||
if (proposedObj.ContractPartOverrideItems.Count > 0)
|
||||
{
|
||||
List<string> allTags = new List<string>();
|
||||
//List<string> allTags = new List<string>();
|
||||
|
||||
for (int i = 0; i < proposedObj.ContractPartOverrideItems.Count; i++)
|
||||
{
|
||||
var item = proposedObj.ContractPartOverrideItems[i];
|
||||
if (item.Tags.Count < 1)
|
||||
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractPartOverrideItems[{i}].Tags");
|
||||
else
|
||||
{
|
||||
//add to list, check for dupes
|
||||
foreach (string s in item.Tags)
|
||||
{
|
||||
if (allTags.Contains(s))
|
||||
{
|
||||
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractPartOverrideItems[{i}].Tags");
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
allTags.Add(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// //add to list, check for dupes
|
||||
// foreach (string s in item.Tags)
|
||||
// {
|
||||
// if (allTags.Contains(s))
|
||||
// {
|
||||
// AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractPartOverrideItems[{i}].Tags");
|
||||
// break;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// allTags.Add(s);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
if (item.OverridePct == 0)
|
||||
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractPartOverrideItems[{i}].OverridePct");
|
||||
|
||||
@@ -353,29 +353,33 @@ MULTIPLE discount / markup ITEMS
|
||||
//SERVICE RATES
|
||||
if (proposedObj.ContractServiceRateOverrideItems.Count > 0)
|
||||
{
|
||||
List<string> allTags = new List<string>();
|
||||
// List<string> allTags = new List<string>();
|
||||
//check for overlapping dupes
|
||||
//[NO DON"T CHECK FOR DUPES, OR AT LEAST NOT LIKE THIS, REMOVING FOR NOW]
|
||||
//Not sure what the dupe intent was but it should be entirely duped, not just one tag in common as with this
|
||||
|
||||
//Check for missing tags
|
||||
for (int i = 0; i < proposedObj.ContractServiceRateOverrideItems.Count; i++)
|
||||
{
|
||||
var item = proposedObj.ContractServiceRateOverrideItems[i];
|
||||
if (item.Tags.Count < 1)
|
||||
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractServiceRateOverrideItems[{i}].Tags");
|
||||
else
|
||||
{
|
||||
//add to list, check for dupes
|
||||
foreach (string s in item.Tags)
|
||||
{
|
||||
if (allTags.Contains(s))
|
||||
{
|
||||
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractServiceRateOverrideItems[{i}].Tags");
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
allTags.Add(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// //add to list, check for dupes
|
||||
// foreach (string s in item.Tags)
|
||||
// {
|
||||
// if (allTags.Contains(s))
|
||||
// {
|
||||
// AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractServiceRateOverrideItems[{i}].Tags");
|
||||
// break;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// allTags.Add(s);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
if (item.OverridePct == 0)
|
||||
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractServiceRateOverrideItems[{i}].OverridePct");
|
||||
|
||||
@@ -385,29 +389,27 @@ MULTIPLE discount / markup ITEMS
|
||||
//TRAVEL RATES
|
||||
if (proposedObj.ContractTravelRateOverrideItems.Count > 0)
|
||||
{
|
||||
List<string> allTags = new List<string>();
|
||||
//check for overlapping dupes
|
||||
for (int i = 0; i < proposedObj.ContractTravelRateOverrideItems.Count; i++)
|
||||
for (int i = 0; i < proposedObj.ContractTravelRateOverrideItems.Count; i++)
|
||||
{
|
||||
var item = proposedObj.ContractTravelRateOverrideItems[i];
|
||||
if (item.Tags.Count < 1)
|
||||
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractTravelRateOverrideItems[{i}].Tags");
|
||||
else
|
||||
{
|
||||
//add to list, check for dupes
|
||||
foreach (string s in item.Tags)
|
||||
{
|
||||
if (allTags.Contains(s))
|
||||
{
|
||||
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractTravelRateOverrideItems[{i}].Tags");
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
allTags.Add(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// //add to list, check for dupes
|
||||
// foreach (string s in item.Tags)
|
||||
// {
|
||||
// if (allTags.Contains(s))
|
||||
// {
|
||||
// AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractTravelRateOverrideItems[{i}].Tags");
|
||||
// break;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// allTags.Add(s);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
if (item.OverridePct == 0)
|
||||
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractTravelRateOverrideItems[{i}].OverridePct");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user