diff --git a/EnotaryoPH/EnotaryoPH.Web/Pages/BaseTakeSelfiePageModel.cs b/EnotaryoPH/EnotaryoPH.Web/Pages/BaseTakeSelfiePageModel.cs index 970ad59..0151b25 100644 --- a/EnotaryoPH/EnotaryoPH.Web/Pages/BaseTakeSelfiePageModel.cs +++ b/EnotaryoPH/EnotaryoPH.Web/Pages/BaseTakeSelfiePageModel.cs @@ -34,11 +34,13 @@ namespace EnotaryoPH.Web.Pages var isMatchSuccess = faceMatches.Any(); if (isMatchSuccess) { - var signatory = _notaryoDBContext.TransactionSignatories.FirstOrDefault(x => x.UserID == CurrentUser.UserID); + var signatory = _notaryoDBContext.TransactionSignatories.Include(ts => ts.Transaction).FirstOrDefault(x => x.UserID == CurrentUser.UserID); if (signatory != null) { signatory.Status = nameof(SignatoryStatus.FaceMatch); _notaryoDBContext.Update(signatory); + _transactionEntity = signatory.Transaction; + Transaction_UID = _transactionEntity.Transaction_UID.Value; } else if (!CurrentUser.Role.IsInList(nameof(UserType.Principal), nameof(UserType.SuperUser), nameof(UserType.Administrator))) { diff --git a/EnotaryoPH/EnotaryoPH.Web/Pages/Participant/Registration/Index.cshtml.cs b/EnotaryoPH/EnotaryoPH.Web/Pages/Participant/Registration/Index.cshtml.cs index d3d1596..535eb91 100644 --- a/EnotaryoPH/EnotaryoPH.Web/Pages/Participant/Registration/Index.cshtml.cs +++ b/EnotaryoPH/EnotaryoPH.Web/Pages/Participant/Registration/Index.cshtml.cs @@ -71,8 +71,9 @@ namespace EnotaryoPH.Web.Pages.Participant.Registration } var signatory = _notaryoDBContext.TransactionSignatories - .FirstOrDefault(e => e.TransactionSignatory_UID == TransactionSignatory_UID && e.Status == nameof(SignatoryStatus.New)); - if (signatory == null) + .Include(t => t.Transaction) + .FirstOrDefault(e => e.TransactionSignatory_UID == TransactionSignatory_UID); + if (signatory == null || !signatory.Status.IsInList(SignatoryStatus.New, SignatoryStatus.EmailSent)) { return BadRequest(); }