added deleted CartRule

Author: thiennn

src/Modules/SimplCommerce.Module.Inventory/wwwroot/admin/warehouse/warehouse-form.html

@@ -1,4 +1,4 @@
-<div class="panel panel-default well">
+<div class="panel panel-default">
     <div class="panel-heading">
         <h2 ng-if="!vm.isEditMode">{{::vm.translate.get('Create Warehouse')}}</h2>
         <h2 ng-if="vm.isEditMode">{{::vm.translate.get('Edit Warehouse')}}</h2>

src/Modules/SimplCommerce.Module.Pricing/Controllers/CartRuleApiController.cs

@@ -1,11 +1,12 @@
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using SimplCommerce.Infrastructure.Data;
 using SimplCommerce.Infrastructure.Web.SmartTable;
 using SimplCommerce.Module.Pricing.Models;
 using SimplCommerce.Module.Pricing.ViewModels;
-using Microsoft.EntityFrameworkCore;
 
 namespace SimplCommerce.Module.Pricing.Controllers
 {
@@ -41,12 +42,12 @@ public IActionResult List([FromBody] SmartTableParam param)
         }
 
         [HttpGet("{id}")]
-        public IActionResult Get(long id)
+        public async Task<IActionResult> Get(long id)
         {
-            var catrtRule = _cartRuleRepository.Query()
+            var catrtRule = await _cartRuleRepository.Query()
                 .Include(x => x.Coupons)
                 .Include(x => x.Products).ThenInclude(p => p.Product)
-                .FirstOrDefault(x => x.Id == id);
+                .FirstOrDefaultAsync(x => x.Id == id);
             var model = new CartRuleForm
             {
                 Id = catrtRule.Id,
@@ -78,7 +79,7 @@ public IActionResult Get(long id)
         }
 
         [HttpPost]
-        public IActionResult Post([FromBody] CartRuleForm model)
+        public async Task<IActionResult> Post([FromBody] CartRuleForm model)
         {
             if (ModelState.IsValid)
             {
@@ -120,22 +121,22 @@ public IActionResult Post([FromBody] CartRuleForm model)
                 }
 
                 _cartRuleRepository.Add(cartRule);
-                _cartRuleRepository.SaveChanges();
+                await _cartRuleRepository.SaveChangesAsync();
 
-                return Ok();
+                return CreatedAtAction(nameof(Get), new { id = cartRule.Id }, null);
             }
-            return new BadRequestObjectResult(ModelState);
+            return BadRequest(ModelState);
         }
 
         [HttpPut("{id}")]
-        public IActionResult Put(long id, [FromBody] CartRuleForm model)
+        public async Task<IActionResult> Put(long id, [FromBody] CartRuleForm model)
         {
             if (ModelState.IsValid)
             {
-                var cartRule = _cartRuleRepository.Query()
+                var cartRule = await _cartRuleRepository.Query()
                     .Include(x => x.Coupons)
                     .Include(x => x.Products)
-                    .FirstOrDefault(x => x.Id == id);
+                    .FirstOrDefaultAsync(x => x.Id == id);
                 if(cartRule == null)
                 {
                     return NotFound();
@@ -195,11 +196,32 @@ public IActionResult Put(long id, [FromBody] CartRuleForm model)
                     cartRule.Products.Remove(item);
                 }
 
-                _cartRuleRepository.SaveChanges();
+                await _cartRuleRepository.SaveChangesAsync();
+                return Accepted();
+            }
+            return BadRequest(ModelState);
+        }
+
+        [HttpDelete("{id}")]
+        public async Task<IActionResult> Delete(long id)
+        {
+            var cartRule = await _cartRuleRepository.Query().FirstOrDefaultAsync(x => x.Id == id);
+            if (cartRule == null)
+            {
+                return NotFound();
+            }
 
-                return Ok();
+            try
+            {
+                _cartRuleRepository.Remove(cartRule);
+                await _cartRuleRepository.SaveChangesAsync();
             }
-            return new BadRequestObjectResult(ModelState);
+            catch (DbUpdateException)
+            {
+                return BadRequest(new { Error = $"The cart rule {cartRule.Name} can't not be deleted because it has been used" });
+            }
+
+            return NoContent();
         }
     }
 }

src/Modules/SimplCommerce.Module.Pricing/Data/PricingCustomModelBuilder.cs

@@ -8,24 +8,29 @@ public class PricingCustomModelBuilder : ICustomModelBuilder
     {
         public void Build(ModelBuilder modelBuilder)
         {
+            modelBuilder.Entity<Coupon>(b =>
+            {
+                b.HasOne(cc => cc.CartRule).WithMany(c => c.Coupons).HasForeignKey(x => x.CartRuleId).OnDelete(DeleteBehavior.Cascade);
+            });
+
             modelBuilder.Entity<CartRuleCategory>(b =>
             {
                 b.HasKey(cc => new { cc.CartRuleId, cc.CategoryId });
-                b.HasOne(cc => cc.CartRule).WithMany(c => c.Categories).HasForeignKey(x => x.CartRuleId);
+                b.HasOne(cc => cc.CartRule).WithMany(c => c.Categories).HasForeignKey(x => x.CartRuleId).OnDelete(DeleteBehavior.Cascade);
                 b.HasOne(cc => cc.Category).WithMany().HasForeignKey(x => x.CategoryId);
             });
 
             modelBuilder.Entity<CartRuleProduct>(b =>
             {
                 b.HasKey(cp => new { cp.CartRuleId, cp.ProductId });
-                b.HasOne(cp => cp.CartRule).WithMany(p => p.Products).HasForeignKey(x => x.CartRuleId);
+                b.HasOne(cp => cp.CartRule).WithMany(p => p.Products).HasForeignKey(x => x.CartRuleId).OnDelete(DeleteBehavior.Cascade);
                 b.HasOne(cp => cp.Product).WithMany().HasForeignKey(x => x.ProductId);
             });
 
             modelBuilder.Entity<CartRuleCustomerGroup>(b =>
             {
                 b.HasKey(cc => new { cc.CartRuleId, cc.CustomerGroupId });
-                b.HasOne(cc => cc.CartRule).WithMany(c => c.CustomerGroups).HasForeignKey(x => x.CartRuleId);
+                b.HasOne(cc => cc.CartRule).WithMany(c => c.CustomerGroups).HasForeignKey(x => x.CartRuleId).OnDelete(DeleteBehavior.Cascade);
                 b.HasOne(cc => cc.CustomerGroup).WithMany().HasForeignKey(x => x.CustomerGroupId);
             });