Merge pull request #164 from xdorro/minh

Update Currency
anhnmt · Aug 27, 2021 · 532271b · 532271b
2 parents 95ff24e + 04aeb73
commit 532271b
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 12 deletions.
diff --git a/Backend/Areas/Admin/Controllers/CurrenciesController.cs b/Backend/Areas/Admin/Controllers/CurrenciesController.cs
@@ -155,18 +155,52 @@ public ActionResult PutData(Currencies c)
         // GET: Admin/Currencies/Delete/5
         public ActionResult Delete(int id)
         {
-            if (currencies.Delete(id))
+            try
+            {
+                var currency = currencies.Get(id);
+                if (currency == null)
+                {
+                    return Json(new
+                    {
+                        statusCode = 400,
+                        data = "This currency does not exist",
+                        message = "Error"
+                    }, JsonRequestBehavior.AllowGet);
+                }
+
+                if (currency.BankAccounts.Count > 0)
+                {
+                    return Json(new
+                    {
+                        statusCode = 400,
+                        data = "This currency have bank account link to it, cannot delete!",
+                        message = "Error"
+                    }, JsonRequestBehavior.AllowGet);
+                }
+
+                if (currencies.Delete(currency))
+                {
+                    return Json(new
+                    {
+                        statusCode = 200,
+                        message = "Success"
+                    }, JsonRequestBehavior.AllowGet);
+                }
+            }
+            catch (System.Exception)
             {
                 return Json(new
                 {
-                    statusCode = 200,
-                    message = "Success"
+                    statusCode = 400,
+                    data = "Something error happen",
+                    message = "Error"
                 }, JsonRequestBehavior.AllowGet);
             }
 
             return Json(new
             {
                 statusCode = 400,
+                data = "Something error happen",
                 message = "Error"
             }, JsonRequestBehavior.AllowGet);
         }

diff --git a/Backend/Areas/Admin/Views/Currencies/Index.cshtml b/Backend/Areas/Admin/Views/Currencies/Index.cshtml
@@ -117,9 +117,10 @@
                         if (res.statusCode === 200) {
                             $("#modifyModal").modal("hide");
                             $('#datatables').DataTable().ajax.reload();
-                            toastr.success('Created Successfully');
+                            notifySuccess('Success', 'Created Successfully');
                         } else {
                             validator.showErrors(res.data);
+                            notifyError('Error', 'Created Fail');
                         }
                     }
 
@@ -134,9 +135,10 @@
                         if (res.statusCode === 200) {
                             $("#modifyModal").modal("hide");
                             $('#datatables').DataTable().ajax.reload();
-                            toastr.success('Updated Successfully');
+                            notifySuccess('Success', 'Updated Successfully');
                         } else {
                             validator.showErrors(res.data);
+                            notifyError('Error', 'Updated Fail');
                         }
                     }
                 })
@@ -156,9 +158,14 @@
                 $.ajax({
                     type: "GET",
                     url: `/Admin/Currencies/Delete/${id}`,
-                    success: function () {
-                        $('#datatables').DataTable().ajax.reload();
-                        toastr.success('Deleted Successfully');
+                    success: function (res) {
+                        if (res.statusCode == 200) {
+                            $('#datatables').DataTable().ajax.reload();
+                            notifySuccess('Success', 'Deleted Successfully');
+                        } else {
+                            notifyError('Error', res.data);
+                        }
+                        
                     }
                 })
             }

diff --git a/Backend/Web.config b/Backend/Web.config
@@ -63,8 +63,8 @@
 		</assemblyBinding>
 	</runtime>
 	<connectionStrings>
-		<add name="DBConnectionString" connectionString="server=.;database=OnlineBanking;uid=sa;pwd=123456aA@;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" />
-		<!-- <add name="DBConnectionString" connectionString="server=14.231.185.26;database=OnlineBanking;uid=sa;pwd=123456aA@;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" /> -->
+		<!--<add name="DBConnectionString" connectionString="server=.;database=OnlineBanking;uid=sa;pwd=123456aA@;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" />-->
+		 <add name="DBConnectionString" connectionString="server=14.231.185.26;database=OnlineBanking;uid=sa;pwd=123456aA@;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" /> 
 	</connectionStrings>
 	<entityFramework>
 		<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />

diff --git a/OnlineBanking.DAL/DataMapping/Currencies.cs b/OnlineBanking.DAL/DataMapping/Currencies.cs
@@ -12,6 +12,6 @@ public class Currencies
 
         [Required(AllowEmptyStrings = false)] public string Name { get; set; }
         public int Status { get; set; }
-        public ICollection<BankAccounts> BankAccounts { get; set; }
+        public virtual ICollection<BankAccounts> BankAccounts { get; set; }
     }
 }
diff --git a/OnlineBanking.DAL/ViewModel/ProfileViewModel.cs b/OnlineBanking.DAL/ViewModel/ProfileViewModel.cs
@@ -14,7 +14,7 @@ public class ProfileViewModel
         [Required] [MinLength(10)] public string Phone { get; set; }
         [Required] public string Birthday { get; set; }
         [Required] public string Address { get; set; }
-        [Required] [MinLength(10)] public string NumberId { get; set; }
+        [Required] [MinLength(9)] public string NumberId { get; set; }
         public string StatusName { get; set; } // active, delete, lock
         public string RoleName { get; set; } // Quyền
     }