From 812b49cfcbb9043aeb027c3f565287fcabed3438 Mon Sep 17 00:00:00 2001 From: TekH Date: Fri, 27 Jun 2025 14:43:47 +0200 Subject: [PATCH] Merge master branch --- EnvelopeGenerator.Form/frmMain.vb | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index 02509f43..b3d086f6 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -597,7 +597,7 @@ Public Class frmMain Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try Dim oView As GridView = GridEnvelopes.FocusedView - Dim selReceiver As EnvelopeReceiver + Dim selReceiver As Receiver If oView.Name = ViewReceivers.Name Then selReceiver = oView.GetRow(oView.FocusedRowHandle) Else @@ -610,17 +610,17 @@ Public Class frmMain 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 + 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.Email) + Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.EmailAddress) MsgBox(oMsg, MsgBoxStyle.Information, Text) End If - End If - Next + End If + Next Catch ex As Exception Logger.Error(ex) Finally @@ -795,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.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() End If End If @@ -803,12 +803,6 @@ 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