relayhub
This commit is contained in:
@@ -83,6 +83,7 @@ Public Class cRelayHub
|
|||||||
|
|
||||||
Public Class cRelayHubAdditionalSettings
|
Public Class cRelayHubAdditionalSettings
|
||||||
Public Property combineOptions As List(Of String)
|
Public Property combineOptions As List(Of String)
|
||||||
|
Public Property combineItemsPriorityDocumentType As String
|
||||||
End Class
|
End Class
|
||||||
|
|
||||||
Public Class cRelayHubJobOrderRequest
|
Public Class cRelayHubJobOrderRequest
|
||||||
@@ -292,18 +293,29 @@ Public Class cRelayHub
|
|||||||
|
|
||||||
' AdditionalSettings -> combineOptions: nur erlaubte Keys, distinct, lower-case
|
' AdditionalSettings -> combineOptions: nur erlaubte Keys, distinct, lower-case
|
||||||
Dim allowed As New HashSet(Of String)(StringComparer.OrdinalIgnoreCase) From {
|
Dim allowed As New HashSet(Of String)(StringComparer.OrdinalIgnoreCase) From {
|
||||||
"description", "commodity_code", "country_of_origin", "unit_type"
|
"description", "commodity_code", "country_of_origin", "unit_type"
|
||||||
}
|
}
|
||||||
|
|
||||||
If req.additionalSettings IsNot Nothing AndAlso req.additionalSettings.combineOptions IsNot Nothing Then
|
If req.additionalSettings IsNot Nothing Then
|
||||||
Dim cleaned = req.additionalSettings.combineOptions.
|
|
||||||
Where(Function(o) Not String.IsNullOrWhiteSpace(o)).
|
If req.additionalSettings.combineOptions IsNot Nothing Then
|
||||||
Select(Function(o) o.Trim().ToLowerInvariant()).
|
Dim cleaned = req.additionalSettings.combineOptions.
|
||||||
Where(Function(o) allowed.Contains(o)).
|
Where(Function(o) Not String.IsNullOrWhiteSpace(o)).
|
||||||
Distinct().
|
Select(Function(o) o.Trim().ToLowerInvariant()).
|
||||||
ToList()
|
Where(Function(o) allowed.Contains(o)).
|
||||||
|
Distinct().
|
||||||
|
ToList()
|
||||||
|
|
||||||
|
req.additionalSettings.combineOptions = cleaned
|
||||||
|
End If
|
||||||
|
|
||||||
|
req.additionalSettings.combineItemsPriorityDocumentType =
|
||||||
|
If(req.additionalSettings.combineItemsPriorityDocumentType, "").Trim()
|
||||||
|
|
||||||
|
If req.additionalSettings.combineItemsPriorityDocumentType = "" Then
|
||||||
|
req.additionalSettings.combineItemsPriorityDocumentType = Nothing
|
||||||
|
End If
|
||||||
|
|
||||||
req.additionalSettings.combineOptions = cleaned
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Return req
|
Return req
|
||||||
|
|||||||
Reference in New Issue
Block a user