Add Cart model to the TokensController

This change includes the Cart model in the TokensController and the TokenViewModel. Consequently, it modifies the Index.cshtml, adding conditionality to the 'Checkout with token' link based on cart content. Unused code in CheckOutController.cs has also been cleaned up.
SwedbankPay · Feb 9, 2024 · aaabe5a · aaabe5a
1 parent ec2eea6
commit aaabe5a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/src/Samples/Sample.AspNetCore/Controllers/CheckOutController.cs b/src/Samples/Sample.AspNetCore/Controllers/CheckOutController.cs
@@ -129,11 +129,6 @@ public async Task<IPaymentOrderResponse> CreatePaymentOrder(bool generatePayment
         return await CreatePaymentOrder(generatePaymentToken, generateRecurrenceToken, generateUnscheduledToken, null, null);
     }
 
-    // public async Task<IPaymentOrderResponse> CreatePaymentOrder(bool generatePaymentToken, bool generateRecurrenceToken, bool generateUnscheduledToken, string paymentToken)
-    // {
-    //     return await CreatePaymentOrder(generatePaymentToken, generateRecurrenceToken, generateUnscheduledToken, null, paymentToken);
-    // }
-
     public async Task<IPaymentOrderResponse> CreatePaymentOrder(bool generatePaymentToken, bool generateRecurrenceToken, bool generateUnscheduledToken,
         Uri paymentUrl, string paymentToken)
     {
@@ -231,7 +226,6 @@ public async Task<IPaymentOrderResponse> CreatePaymentOrder(bool generatePayment
 
             if (!string.IsNullOrWhiteSpace(paymentToken))
             {
-                // paymentOrderRequest.Payer.PayerReference = null;
                 paymentOrderRequest.GeneratePaymentToken = false;
                 paymentOrderRequest.PaymentToken ??= paymentToken;
 

diff --git a/src/Samples/Sample.AspNetCore/Controllers/TokensController.cs b/src/Samples/Sample.AspNetCore/Controllers/TokensController.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
+using Sample.AspNetCore.Models;
 using Sample.AspNetCore.Models.ViewModels;
 
 using SwedbankPay.Sdk;
@@ -17,12 +18,15 @@ public class TokensController : Controller
 {
     private readonly ISwedbankPayClient _swedbankPayClient;
     private readonly ILogger<TokensController> _logger;
+    private readonly Cart _cart;
 
     public TokensController(ISwedbankPayClient swedbankPayClient,
-        ILogger<TokensController> logger)
+        ILogger<TokensController> logger,
+        Cart cart)
     {
         _swedbankPayClient = swedbankPayClient;
         _logger = logger;
+        _cart = cart;
     }
 
 
@@ -107,6 +111,7 @@ private async Task<TokenViewModel> GetViewModel()
             viewModel.PayerReference = tokenResponse?.PayerReference;
             viewModel.Tokens = tokenResponse?.Tokens;
             viewModel.OperationList = tokenResponse?.Operations;
+            viewModel.Cart = _cart;
         }
         catch (Exception)
         {

diff --git a/src/Samples/Sample.AspNetCore/Models/ViewModels/TokenViewModel.cs b/src/Samples/Sample.AspNetCore/Models/ViewModels/TokenViewModel.cs
@@ -8,8 +8,9 @@ public class TokenViewModel
 {
     public string Id { get;set; }
     public string PayerReference { get;set; }
-
+
+    public Cart Cart { get; set; }
     public IUserTokenOperations OperationList { get; set; }
-
     public List<IUserToken> Tokens { get; set; }
+
 }
diff --git a/src/Samples/Sample.AspNetCore/Views/Tokens/Index.cshtml b/src/Samples/Sample.AspNetCore/Views/Tokens/Index.cshtml
@@ -1,5 +1,4 @@
 @model Sample.AspNetCore.Models.ViewModels.TokenViewModel
-
 @{
     ViewData["Title"] = "Tokens";
     Layout = "~/Views/Shared/_Layout.cshtml";
@@ -68,14 +67,18 @@
                                asp-route-tokenId=@token.Token>
                                 Delete Token
                             </a>
-
-                            <a class="btn btn-primary"
-                               data-automation="button-checkout-with-token"
-                               asp-route-paymentToken="@token.Token"
-                               asp-action="LoadPaymentMenu"
-                               asp-controller="CheckOut">
-                                Checkout with token
-                            </a>
+
+                            @if (Model.Cart.CartLines.Any())
+                            {
+                                <a class="btn btn-primary"
+                                   data-automation="button-checkout-with-token"
+                                   asp-route-paymentToken="@token.Token"
+                                   asp-action="LoadPaymentMenu"
+                                   asp-controller="CheckOut">
+                                    Checkout with token
+                                </a>
+                            }
+
                         </td>
                     </tr>
                 }