Merge pull request #180 from xdorro/v2

V2.0.4
anhnmt · Aug 28, 2021 · 0ddc4b6 · 0ddc4b6
2 parents 3e333ef + ffc1945
commit 0ddc4b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/Backend/Areas/Admin/Controllers/ChequesController.cs b/Backend/Areas/Admin/Controllers/ChequesController.cs
@@ -641,7 +641,7 @@ private List<Notifications> CreateNotification(Cheques cheque, string message)
                     Content = message,
                     Status = (int) NotificationStatus.Unread,
                     PkType = (int) NotificationType.Cheque,
-                    PkId = cheque.ChequeBookId,
+                    PkId = cheque.ChequeId,
                 }
             };
 

diff --git a/Backend/Controllers/ChequesController.cs b/Backend/Controllers/ChequesController.cs
@@ -54,15 +54,13 @@ public ActionResult Detail(int id)
             var account = accounts.Get(user.AccountId);
             var cheque = cheques.Get(id);
 
-            if (chequebooks.CheckDuplicate(x => x.ChequeBookId == cheque.ChequeBookId && x.AccountId == account.AccountId))
-            {
-                var chequeDetail = new ChequesViewModel(cheque);
-                return View(chequeDetail);
-            }
-            else
-            {
+            if (!chequebooks.CheckDuplicate(x =>
+                x.ChequeBookId == cheque.ChequeBookId && x.AccountId == account.AccountId))
                 return RedirectToAction("NotFound", "Error");
-            }
+
+            var chequeDetail = new ChequesViewModel(cheque);
+            return View(chequeDetail);
+
         }
 
         public ActionResult GetData(int chequeBookId)
@@ -450,7 +448,7 @@ private List<Notifications> CreateNotification(Cheques cheque, string message)
                     Content = message,
                     Status = (int) NotificationStatus.Unread,
                     PkType = (int) NotificationType.Cheque,
-                    PkId = cheque.ChequeBookId,
+                    PkId = cheque.ChequeId,
                 }
             };
 

diff --git a/Backend/Hubs/ChatHub.cs b/Backend/Hubs/ChatHub.cs
@@ -173,7 +173,7 @@ public string ReadNotification(int notificationId)
                             return "/Transactions/TransactionsDetails/" + notification.PkId;
 
                         case (int) NotificationType.Cheque:
-                            return "/Cheques/?ChequeBookId=" + notification.PkId;
+                            return "/Cheques/Detail/" + notification.PkId;
                     }
                 }
                 catch (Exception ex)