Skip to content

Commit eb7298c

Browse files
author
Carlos Cañizares Estévez
committed
Add Checkout view, My Orders view and Order Detail View, and Mvc flow for this Views...
1 parent 65e633e commit eb7298c

44 files changed

Lines changed: 450 additions & 1259 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/Web/WebMVC/Controllers/AccountController.cs

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,15 @@ public class AccountController : Controller
1919
{
2020
private readonly UserManager<ApplicationUser> _userManager;
2121
private readonly SignInManager<ApplicationUser> _signInManager;
22-
private readonly IEmailSender _emailSender;
23-
private readonly ISmsSender _smsSender;
2422
private readonly ILogger _logger;
2523

2624
public AccountController(
2725
UserManager<ApplicationUser> userManager,
2826
SignInManager<ApplicationUser> signInManager,
29-
IEmailSender emailSender,
30-
ISmsSender smsSender,
3127
ILoggerFactory loggerFactory)
3228
{
3329
_userManager = userManager;
3430
_signInManager = signInManager;
35-
_emailSender = emailSender;
36-
_smsSender = smsSender;
3731
_logger = loggerFactory.CreateLogger<AccountController>();
3832
}
3933

@@ -368,44 +362,6 @@ public async Task<ActionResult> SendCode(string returnUrl = null, bool rememberM
368362
return View(new SendCodeViewModel { Providers = factorOptions, ReturnUrl = returnUrl, RememberMe = rememberMe });
369363
}
370364

371-
//
372-
// POST: /Account/SendCode
373-
[HttpPost]
374-
[AllowAnonymous]
375-
[ValidateAntiForgeryToken]
376-
public async Task<IActionResult> SendCode(SendCodeViewModel model)
377-
{
378-
if (!ModelState.IsValid)
379-
{
380-
return View();
381-
}
382-
383-
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
384-
if (user == null)
385-
{
386-
return View("Error");
387-
}
388-
389-
// Generate the token and send it
390-
var code = await _userManager.GenerateTwoFactorTokenAsync(user, model.SelectedProvider);
391-
if (string.IsNullOrWhiteSpace(code))
392-
{
393-
return View("Error");
394-
}
395-
396-
var message = "Your security code is: " + code;
397-
if (model.SelectedProvider == "Email")
398-
{
399-
await _emailSender.SendEmailAsync(await _userManager.GetEmailAsync(user), "Security Code", message);
400-
}
401-
else if (model.SelectedProvider == "Phone")
402-
{
403-
await _smsSender.SendSmsAsync(await _userManager.GetPhoneNumberAsync(user), message);
404-
}
405-
406-
return RedirectToAction(nameof(VerifyCode), new { Provider = model.SelectedProvider, ReturnUrl = model.ReturnUrl, RememberMe = model.RememberMe });
407-
}
408-
409365
//
410366
// GET: /Account/VerifyCode
411367
[HttpGet]

src/Web/WebMVC/Controllers/CartController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public async Task<IActionResult> Index(Dictionary<string, int> quantities, strin
3838
{
3939
var user = await _userManager.GetUserAsync(HttpContext.User);
4040
var basket = _basketSvc.SetQuantities(user, quantities);
41+
var vm = _basketSvc.UpdateBasket(basket);
4142

4243
if (action == "[ Checkout ]")
4344
{
4445
var order = _basketSvc.MapBasketToOrder(basket);
4546
return RedirectToAction("Create", "Order");
4647
}
47-
48-
var vm = _basketSvc.UpdateBasket(basket);
48+
4949
return View(vm);
5050
}
5151

@@ -62,7 +62,7 @@ public async Task<IActionResult> AddToCart(string productId)
6262
UnitPrice = productDetails.Price,
6363
ProductId = productId
6464
};
65-
_basketSvc.AddToCart(user, product);
65+
_basketSvc.AddItemToBasket(user, product);
6666
return RedirectToAction("Index", "Catalog");
6767
}
6868
}

0 commit comments

Comments
 (0)