Merge master branch
This commit is contained in:
@@ -594,31 +594,40 @@ Public Class frmMain
|
||||
End Sub
|
||||
|
||||
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick
|
||||
Dim oView As GridView = GridEnvelopes.FocusedView
|
||||
Dim selReceiver As Receiver
|
||||
If oView.Name = ViewReceivers.Name Then
|
||||
selReceiver = oView.GetRow(oView.FocusedRowHandle)
|
||||
Else
|
||||
MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
|
||||
End If
|
||||
If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then
|
||||
Exit Sub
|
||||
End If
|
||||
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
|
||||
Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
|
||||
Try
|
||||
Dim oView As GridView = GridEnvelopes.FocusedView
|
||||
Dim selReceiver As EnvelopeReceiver
|
||||
If oView.Name = ViewReceivers.Name Then
|
||||
selReceiver = oView.GetRow(oView.FocusedRowHandle)
|
||||
Else
|
||||
MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
|
||||
End If
|
||||
If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then
|
||||
Exit Sub
|
||||
End If
|
||||
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
|
||||
|
||||
Dim oController = New EnvelopeEditorController(State, oEnvelope)
|
||||
Dim Documents As New BindingList(Of EnvelopeDocument)
|
||||
Dim Receivers As New BindingList(Of Receiver)
|
||||
Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers)
|
||||
For Each oReceiver As Receiver In Receivers
|
||||
If oReceiver.EmailAddress = selReceiver.EmailAddress Then
|
||||
If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
|
||||
Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.EmailAddress)
|
||||
MsgBox(oMsg, MsgBoxStyle.Information, Text)
|
||||
Dim oController = New EnvelopeEditorController(State, oEnvelope)
|
||||
Dim Documents As New BindingList(Of EnvelopeDocument)
|
||||
Dim Receivers As New BindingList(Of EnvelopeReceiver)
|
||||
Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers)
|
||||
For Each oReceiver As EnvelopeReceiver In Receivers
|
||||
If oReceiver.Email = selReceiver.Email Then
|
||||
If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
|
||||
Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email)
|
||||
MsgBox(oMsg, MsgBoxStyle.Information, Text)
|
||||
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
Finally
|
||||
|
||||
|
||||
End Try
|
||||
SplashScreenManager.CloseOverlayForm(oHandle)
|
||||
|
||||
|
||||
End Sub
|
||||
@@ -786,7 +795,7 @@ Public Class frmMain
|
||||
If oDT.Rows.Count = 1 Then
|
||||
Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
|
||||
Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
|
||||
Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP, oTFA_REG_DL, DB_DD_ECM)
|
||||
Dim oForm As New frm2Factor_Properties(oReceiver.Email, oTOTP, oTFA_REG_DL, DB_DD_ECM)
|
||||
oForm.ShowDialog()
|
||||
End If
|
||||
End If
|
||||
@@ -794,6 +803,12 @@ Public Class frmMain
|
||||
Else
|
||||
MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
|
||||
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
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
|
||||
|
||||
Reference in New Issue
Block a user