Compare commits
2 Commits
8766b9e386
...
9b70ca8ce6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b70ca8ce6 | ||
|
|
66c1fb3698 |
@@ -135,19 +135,13 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
var resourceManager = My.Resources.Model.ResourceManager;
|
|
||||||
var statusName = ((Constants.EnvelopeStatus)Status).ToString();
|
var statusName = ((Constants.EnvelopeStatus)Status).ToString();
|
||||||
|
var rescourceManager = My.Resources.Model.ResourceManager;
|
||||||
|
|
||||||
if (this.IsReadAndSign())
|
if (this.IsReadAndSign() && rescourceManager.GetString(statusName + "4RaC") is string translationRaC)
|
||||||
{
|
return translationRaC;
|
||||||
var statusNameRaC = statusName + "4RaC";
|
|
||||||
var translationRaC = resourceManager.GetString(statusNameRaC);
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(translationRaC))
|
return rescourceManager.GetString(statusName);
|
||||||
return translationRaC;
|
|
||||||
}
|
|
||||||
|
|
||||||
return resourceManager.GetString(statusName);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ Public Class EnvelopeEditorController
|
|||||||
Public Function ValidateEnvelopeForSending(pErrors As List(Of String)) As List(Of String)
|
Public Function ValidateEnvelopeForSending(pErrors As List(Of String)) As List(Of String)
|
||||||
Dim oEnvelopeErrors = pErrors
|
Dim oEnvelopeErrors = pErrors
|
||||||
|
|
||||||
If Envelope.EnvelopeTypeId <> ContractType.ReadAndSign Then
|
If Envelope.EnvelopeTypeId <> 2 Then
|
||||||
|
|
||||||
If ElementModel.ElementsExist(Envelope.Id) = False Then
|
If ElementModel.ElementsExist(Envelope.Id) = False Then
|
||||||
oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements)
|
oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements)
|
||||||
|
|||||||
Reference in New Issue
Block a user