Merge master branch
This commit is contained in:
parent
f039437f4c
commit
812b49cfcb
@ -597,7 +597,7 @@ Public Class frmMain
|
|||||||
Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
|
Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
|
||||||
Try
|
Try
|
||||||
Dim oView As GridView = GridEnvelopes.FocusedView
|
Dim oView As GridView = GridEnvelopes.FocusedView
|
||||||
Dim selReceiver As EnvelopeReceiver
|
Dim selReceiver As Receiver
|
||||||
If oView.Name = ViewReceivers.Name Then
|
If oView.Name = ViewReceivers.Name Then
|
||||||
selReceiver = oView.GetRow(oView.FocusedRowHandle)
|
selReceiver = oView.GetRow(oView.FocusedRowHandle)
|
||||||
Else
|
Else
|
||||||
@ -610,17 +610,17 @@ Public Class frmMain
|
|||||||
|
|
||||||
Dim oController = New EnvelopeEditorController(State, oEnvelope)
|
Dim oController = New EnvelopeEditorController(State, oEnvelope)
|
||||||
Dim Documents As New BindingList(Of EnvelopeDocument)
|
Dim Documents As New BindingList(Of EnvelopeDocument)
|
||||||
Dim Receivers As New BindingList(Of EnvelopeReceiver)
|
Dim Receivers As New BindingList(Of Receiver)
|
||||||
Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers)
|
Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers)
|
||||||
For Each oReceiver As EnvelopeReceiver In Receivers
|
For Each oReceiver As Receiver In Receivers
|
||||||
If oReceiver.Email = selReceiver.Email Then
|
If oReceiver.EmailAddress = selReceiver.EmailAddress Then
|
||||||
If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
|
If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
|
||||||
Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email)
|
Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.EmailAddress)
|
||||||
MsgBox(oMsg, MsgBoxStyle.Information, Text)
|
MsgBox(oMsg, MsgBoxStyle.Information, Text)
|
||||||
|
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
Next
|
Next
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Logger.Error(ex)
|
Logger.Error(ex)
|
||||||
Finally
|
Finally
|
||||||
@ -795,7 +795,7 @@ Public Class frmMain
|
|||||||
If oDT.Rows.Count = 1 Then
|
If oDT.Rows.Count = 1 Then
|
||||||
Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
|
Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
|
||||||
Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
|
Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
|
||||||
Dim oForm As New frm2Factor_Properties(oReceiver.Email, oTOTP, oTFA_REG_DL, DB_DD_ECM)
|
Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP, oTFA_REG_DL, DB_DD_ECM)
|
||||||
oForm.ShowDialog()
|
oForm.ShowDialog()
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
@ -803,12 +803,6 @@ Public Class frmMain
|
|||||||
Else
|
Else
|
||||||
MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
|
MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
|
||||||
End If
|
End If
|
||||||
End If
|
|
||||||
End If
|
|
||||||
|
|
||||||
Else
|
|
||||||
MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
|
|
||||||
End If
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
|
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user