Rename to AdminPanel and fix some display issues

adyen-examples · Nov 13, 2023 · 8b28de9 · 8b28de9
1 parent 288e021
commit 8b28de9
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 26 deletions.
diff --git a/in-person-payments-loyalty-example/Controllers/CashRegisterController.cs b/in-person-payments-loyalty-example/Controllers/CashRegisterController.cs
@@ -361,7 +361,7 @@ await _posCardAcquisitionAbortService.SendAbortRequestAfterSignUpAsync(
                                 serviceId: IdUtility.GetRandomAlphanumericId(10),
                                 poiId: _poiId,
                                 saleId: _saleId,
-                                textTitle: "Welcome back!",
+                                textTitle: "Hi again!",
                                 textDescription: "We've discounted your pizza!",
                                 cancellationToken: cancellationToken);
                         }
@@ -371,8 +371,8 @@ await _posCardAcquisitionAbortService.SendAbortRequestAfterSignUpAsync(
                                 serviceId: IdUtility.GetRandomAlphanumericId(10),
                                 poiId: _poiId,
                                 saleId: _saleId,
-                                textTitle: "Welcome back!",
-                                textDescription: $"You need {200 - existingCustomer.LoyaltyPoints} loyalty points to get your next discount!",
+                                textTitle: "Hi again!",
+                                textDescription: $"{200 - existingCustomer.LoyaltyPoints} points until next discount!",
                                 cancellationToken: cancellationToken);
                         }
                     }

diff --git a/in-person-payments-loyalty-example/Controllers/HomeController.cs b/in-person-payments-loyalty-example/Controllers/HomeController.cs
@@ -85,8 +85,8 @@ public IActionResult Error()
             return View();
         }
 
-        [Route("shoppers")]
-        public IActionResult Shoppers()
+        [Route("adminpanel")]
+        public IActionResult AdminPanel()
         {
             ViewBag.Shoppers = _shopperRepository.Shoppers.Select(kvp => kvp.Value).ToList();
             return View();

diff --git a/in-person-payments-loyalty-example/Controllers/WebhookController.cs b/in-person-payments-loyalty-example/Controllers/WebhookController.cs
@@ -1,8 +1,6 @@
 using Adyen.Model.Notification;
 using Adyen.Util;
-using adyen_dotnet_in_person_payments_loyalty_example.Models;
 using adyen_dotnet_in_person_payments_loyalty_example.Options;
-using adyen_dotnet_in_person_payments_loyalty_example.Repositories;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

diff --git a/in-person-payments-loyalty-example/Models/CardAcquisitionModel.cs b/in-person-payments-loyalty-example/Models/CardAcquisitionModel.cs
@@ -1,5 +1,12 @@
 namespace adyen_dotnet_in_person_payments_loyalty_example.Models
 {
+    public class CardAcquisitionModel
+    {
+        public AdditionalData AdditionalData { get; set; }
+        public string Message { get; set; }
+        public string Store { get; set; }
+    }
+
     /// <summary>
     /// See https://docs.adyen.com/point-of-sale/card-acquisition/identifiers/#example for a list of additionalData properties.
     /// </summary>
@@ -11,11 +18,4 @@ public class AdditionalData
         public string ShopperReference { get; set; }
         public bool GiftcardIndicator { get; set; }
     }
-
-    public class CardAcquisitionModel
-    {
-        public AdditionalData AdditionalData { get; set; }
-        public string Message { get; set; }
-        public string Store { get; set; }
-    }
 }
diff --git a/in-person-payments-loyalty-example/Models/Responses/ApiResponse.cs b/in-person-payments-loyalty-example/Models/Responses/ApiResponse.cs
@@ -2,7 +2,7 @@
 {
     public class ApiResponse
     {
-        public string Result { get; set; }
-        public string RefusalReason { get; set; }
+        public string Result { get; init; }
+        public string RefusalReason { get; init; }
     }
 }
diff --git a/...oyalty-example/Views/Home/Shoppers.cshtml → ...alty-example/Views/Home/AdminPanel.cshtml b/...oyalty-example/Views/Home/Shoppers.cshtml → ...alty-example/Views/Home/AdminPanel.cshtml
@@ -1,6 +1,6 @@
 @using adyen_dotnet_in_person_payments_loyalty_example.Models
 @{
-    ViewData["Title"] = "Your loyal shoppers";
+    ViewData["Title"] = "Admin Panel - Your loyal shoppers";
     List<ShopperModel> shoppers = ViewBag.Shoppers;
 }
 

diff --git a/in-person-payments-loyalty-example/Views/Home/Index.cshtml b/in-person-payments-loyalty-example/Views/Home/Index.cshtml
@@ -1,10 +1,9 @@
 @{
-    ViewData["Title"] = "Adyen In-person Payment Demo";
+    ViewData["Title"] = "Adyen In-person Payment Loyalty Demo";
 }
 <div class="container">
   <main role="main" class="pb-3">
-
-    <div class="main-container" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
+    <div class="main-container">
       <div class="info">
         <h1>
           Adyen In-person Payments — Loyalty Demo
@@ -26,7 +25,7 @@
 
         <p>
           To learn more about card acquisitions loyalty, check out our <a href="https://docs.adyen.com/point-of-sale/loyalty/#synchronous-flow">documentation</a>. <br/>
-          <i>Note:</i> The asynchronous flow is similar and can be found <a href="https://docs.adyen.com/point-of-sale/loyalty/#asynchronous-flow">here</a>. In this flow, you can't apply discounts or other loyalty benefits on the spot before the payment.
+          <i>Note:</i> The asynchronous flow is similar and can be found <a href="https://docs.adyen.com/point-of-sale/loyalty/#asynchronous-flow">here</a>.
         </p>
 
         <ul class="integration-list">

diff --git a/in-person-payments-loyalty-example/Views/Home/Result.cshtml b/in-person-payments-loyalty-example/Views/Home/Result.cshtml
@@ -14,13 +14,17 @@
         {
           <img src="~/images/thank-you.svg" class="status-image" alt="" />
         }
-        <p class="status-message">@ViewBag.Msg</p>
         @if (ViewBag.Status == "failure")
         {
+          <p class="status-message">@ViewBag.Msg</p>
           <p class="status-message-generic">
             Learn how to resolve Terminal API errors and handle declined payments in <a href="https://docs.adyen.com/point-of-sale/error-scenarios/">our documentation.</a>
           </p>
         }
+        else
+        {
+          <p class="status-message-generic">@ViewBag.Msg</p>
+        }
         <a class="button" href="/" to="#/">Return</a>
       </div>
     </div>

diff --git a/in-person-payments-loyalty-example/Views/Home/TransactionStatus.cshtml b/in-person-payments-loyalty-example/Views/Home/TransactionStatus.cshtml
@@ -8,7 +8,6 @@
 
 <div class="container">
     <main role="main" class="pb-3">
-
         <div class="status-container">
             <div class="status">
                 <h2>Transaction Status</h2>
@@ -38,7 +37,7 @@
                         @errorMessage
                     </p>
                 }
-                <a class="button" href="/shoppers" to="#/">Return</a>
+                <a class="button" href="/AdminPanel" to="#/">Return</a>
             </div>
         </div>
     </main>

diff --git a/in-person-payments-loyalty-example/Views/Shared/_Layout.cshtml b/in-person-payments-loyalty-example/Views/Shared/_Layout.cshtml
@@ -23,7 +23,7 @@
       <!-- start Navigation Menu -->
       <nav class="navMenu">
           <a asp-area="" asp-controller="Home" asp-action="Index">Home</a>
-          <a asp-area="" asp-controller="Home" asp-action="Shoppers">Admin Panel</a>
+          <a asp-area="" asp-controller="Home" asp-action="AdminPanel">Admin Panel</a>
       </nav>
       <!-- end Navigation Menu -->
     </header>

diff --git a/in-person-payments-loyalty-example/wwwroot/css/site.css b/in-person-payments-loyalty-example/wwwroot/css/site.css
@@ -723,6 +723,10 @@ a:hover {
   border: 2px solid #00bf53;
 }
 
+li {
+  padding: 8px;
+}
+
 /* Transaction Status button end */
 
 .highlight {

diff --git a/in-person-payments-loyalty-example/wwwroot/js/cashregister-bindings.js b/in-person-payments-loyalty-example/wwwroot/js/cashregister-bindings.js
@@ -130,7 +130,7 @@ function bindButtons() {
             {
                 // Hides loading animation component and allow user to select tables again
                 hideLoadingComponent();
-                window.location.href = "/cashregister";
+                window.location.href = "/cash-register";
             }
             else
             {