Allowing for POS to be displayed at website root (#853)

* Allowing for POS to be displayed at website root

* Switching to asp attributes for form post action

* Applying default formatting rules on HTML

BTCPayServer/Controllers/AppsPublicController.cs

@@ -91,6 +91,77 @@ namespace BTCPayServer.Controllers
             });
         }
 
+        [HttpPost]
+        [Route("/apps/{appId}/pos")]
+        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
+        [IgnoreAntiforgeryToken]
+        [EnableCors(CorsPolicies.All)]
+        public async Task<IActionResult> ViewPointOfSale(string appId,
+                                                        [ModelBinder(typeof(InvariantDecimalModelBinder))] decimal amount,
+                                                        string email,
+                                                        string orderId,
+                                                        string notificationUrl,
+                                                        string redirectUrl,
+                                                        string choiceKey,
+                                                        string posData = null, CancellationToken cancellationToken = default)
+        {
+            var app = await _AppService.GetApp(appId, AppType.PointOfSale);
+            if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
+            {
+                return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
+            }
+            if (app == null)
+                return NotFound();
+            var settings = app.GetSettings<PointOfSaleSettings>();
+            if (string.IsNullOrEmpty(choiceKey) && !settings.ShowCustomAmount && !settings.EnableShoppingCart)
+            {
+                return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
+            }
+            string title = null;
+            var price = 0.0m;
+            ViewPointOfSaleViewModel.Item choice = null;
+            if (!string.IsNullOrEmpty(choiceKey))
+            {
+                var choices = _AppService.Parse(settings.Template, settings.Currency);
+                choice = choices.FirstOrDefault(c => c.Id == choiceKey);
+                if (choice == null)
+                    return NotFound();
+                title = choice.Title;
+                price = choice.Price.Value;
+                if (amount > price)
+                    price = amount;
+            }
+            else
+            {
+                if (!settings.ShowCustomAmount && !settings.EnableShoppingCart)
+                    return NotFound();
+                price = amount;
+                title = settings.Title;
+            }
+            var store = await _AppService.GetStore(app);
+            store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
+            var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
+            {
+                ItemCode = choice?.Id,
+                ItemDesc = title,
+                Currency = settings.Currency,
+                Price = price,
+                BuyerEmail = email,
+                OrderId = orderId,
+                NotificationURL =
+                        string.IsNullOrEmpty(notificationUrl) ? settings.NotificationUrl : notificationUrl,
+                NotificationEmail = settings.NotificationEmail,
+                RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
+                FullNotifications = true,
+                ExtendedNotifications = true,
+                PosData = string.IsNullOrEmpty(posData) ? null : posData,
+                RedirectAutomatically = settings.RedirectAutomatically,
+            }, store, HttpContext.Request.GetAbsoluteRoot(),
+                new List<string>() { AppService.GetAppInternalTag(appId) },
+                cancellationToken);
+            return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
+        }
+
 
         [HttpGet]
         [Route("/apps/{appId}/crowdfund")]
@@ -215,77 +286,6 @@ namespace BTCPayServer.Controllers
 
         }
 
-        [HttpPost]
-        [Route("/apps/{appId}/pos")]
-        [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
-        [IgnoreAntiforgeryToken]
-        [EnableCors(CorsPolicies.All)]
-        public async Task<IActionResult> ViewPointOfSale(string appId,
-                                                        [ModelBinder(typeof(InvariantDecimalModelBinder))] decimal amount,
-                                                        string email,
-                                                        string orderId,
-                                                        string notificationUrl,
-                                                        string redirectUrl,
-                                                        string choiceKey,
-                                                        string posData = null, CancellationToken cancellationToken = default)
-        {
-            var app = await _AppService.GetApp(appId, AppType.PointOfSale);
-            if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
-            {
-                return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
-            }
-            if (app == null)
-                return NotFound();
-            var settings = app.GetSettings<PointOfSaleSettings>();
-            if (string.IsNullOrEmpty(choiceKey) && !settings.ShowCustomAmount && !settings.EnableShoppingCart)
-            {
-                return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
-            }
-            string title = null;
-            var price = 0.0m;
-            ViewPointOfSaleViewModel.Item choice = null;
-            if (!string.IsNullOrEmpty(choiceKey))
-            {
-                var choices = _AppService.Parse(settings.Template, settings.Currency);
-                choice = choices.FirstOrDefault(c => c.Id == choiceKey);
-                if (choice == null)
-                    return NotFound();
-                title = choice.Title;
-                price = choice.Price.Value;
-                if (amount > price)
-                    price = amount;
-            }
-            else
-            {
-                if (!settings.ShowCustomAmount && !settings.EnableShoppingCart)
-                    return NotFound();
-                price = amount;
-                title = settings.Title;
-            }
-            var store = await _AppService.GetStore(app);
-            store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
-            var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
-            {
-                ItemCode = choice?.Id,
-                ItemDesc = title,
-                Currency = settings.Currency,
-                Price = price,
-                BuyerEmail = email,
-                OrderId = orderId,
-                NotificationURL =
-                        string.IsNullOrEmpty(notificationUrl) ? settings.NotificationUrl : notificationUrl,
-                NotificationEmail = settings.NotificationEmail,
-                RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
-                FullNotifications = true,
-                ExtendedNotifications = true,
-                PosData = string.IsNullOrEmpty(posData) ? null : posData,
-                RedirectAutomatically = settings.RedirectAutomatically,
-            }, store, HttpContext.Request.GetAbsoluteRoot(),
-                new List<string>() { AppService.GetAppInternalTag(appId) },
-                cancellationToken);
-            return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
-        }
-
 
         private string GetUserId()
         {

BTCPayServer/Controllers/HomeController.cs

@@ -40,6 +40,20 @@ namespace BTCPayServer.Controllers
                     return res; // return 
                 }
             }
+            else if (_cachedServerSettings.RootAppType is Services.Apps.AppType.PointOfSale)
+            {
+                var serviceProvider = HttpContext.RequestServices;
+                var controller = (AppsPublicController)serviceProvider.GetService(typeof(AppsPublicController));
+                controller.Url = Url;
+                controller.ControllerContext = ControllerContext;
+                var res = await controller.ViewPointOfSale(_cachedServerSettings.RootAppId) as ViewResult;
+                if (res != null)
+                {
+                    res.ViewName = "/Views/AppsPublic/ViewPointOfSale.cshtml";
+                    return res; // return 
+                }
+
+            }
 
             return View("Home");
         }

BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml

@@ -12,7 +12,7 @@
 <html class="h-100">
 <head>
     <title>@Model.Title</title>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="apple-touch-icon" href="~/img/icons/icon-512x512.png">
@@ -20,12 +20,12 @@
 
     <link rel="manifest" href="~/manifest.json">
 
-    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet"/>
+    <link href="@this.Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
     @if (Model.CustomCSSLink != null)
     {
-        <link href="@Model.CustomCSSLink" rel="stylesheet"/>
+        <link href="@Model.CustomCSSLink" rel="stylesheet" />
     }
-    <link href="~/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
+    <link href="~/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
 
     @if (Model.EnableShoppingCart)
     {
@@ -33,7 +33,7 @@
         <script type="text/javascript">
             var srvModel = @Html.Raw(Json.Serialize(Model));
         </script>
-        <bundle name="wwwroot/bundles/cart-bundle.min.js"/>
+        <bundle name="wwwroot/bundles/cart-bundle.min.js" />
     }
     <style>
         .card-deck {
@@ -50,8 +50,8 @@
 </head>
 
 <body class="h-100">
-<script id="template-cart-item" type="text/template">
-<tr data-id="{id}">
+    <script id="template-cart-item" type="text/template">
+        <tr data-id="{id}">
             {image}
             <td class="align-middle pr-0 pl-2"><b>{title}</b></td>
             <td class="align-middle px-0" align="right">
@@ -62,22 +62,24 @@
                     <div class="input-group-prepend">
                         <a class="js-cart-item-minus btn btn-link px-2" href="#"><i class="fa fa-minus-circle fa-fw text-danger"></i></a>
                     </div>
-            <input class="js-cart-item-count form-control form-control-sm pull-left" type="text"name="count" placeholder="Qty" value="{count}" data-prev="{count}">
-            <div class="input-group-append"><a class="js-cart-item-plus btn btn-link px-2" href="#">
-                <i class="fa fa-plus-circle fa-fw text-success"></i></a>
+                    <input class="js-cart-item-count form-control form-control-sm pull-left" type="text" name="count" placeholder="Qty" value="{count}" data-prev="{count}">
+                    <div class="input-group-append">
+                        <a class="js-cart-item-plus btn btn-link px-2" href="#">
+                            <i class="fa fa-plus-circle fa-fw text-success"></i>
+                        </a>
                     </div>
                 </div>
             </td>
             <td class="align-middle" align="right">{price}</td>
-</tr>
-</script>
+        </tr>
+    </script>
 
-<script id="template-cart-item-image" type="text/template">
-<td class="align-middle pr-0" width="1%"><img src="{image}" width="50"></td>
-</script>
+    <script id="template-cart-item-image" type="text/template">
+        <td class="align-middle pr-0" width="1%"><img src="{image}" width="50"></td>
+    </script>
 
-<script id="template-cart-custom-amount" type="text/template">
-<tr>
+    <script id="template-cart-custom-amount" type="text/template">
+        <tr>
             <td colspan="5">
                 <div class="input-group">
                     <div class="input-group-prepend">
@@ -89,11 +91,11 @@
                     </div>
                 </div>
             </td>
-</tr>
-</script>
+        </tr>
+    </script>
 
-<script id="template-cart-extra" type="text/template">
-<tr>
+    <script id="template-cart-extra" type="text/template">
+        <tr>
             <td colspan="5" class="border-0 pb-0">
                 <div class="input-group">
                     <div class="input-group-prepend">
@@ -105,9 +107,9 @@
                     </div>
                 </div>
             </td>
-</tr>
-@if (Model.ShowDiscount)
-{
+        </tr>
+        @if (Model.ShowDiscount)
+        {
             <tr>
                 <td colspan="5" class="border-top-0">
                     <div class="input-group">
@@ -120,16 +122,16 @@
                         </div>
                     </div>
                 </td>
-</tr>
-}
-</script>
+            </tr>
+        }
+    </script>
 
-<script id="template-cart-tip" type="text/template">
-@if (Model.EnableTips)
-{
+    <script id="template-cart-tip" type="text/template">
+        @if (Model.EnableTips)
+        {
             <tr class="h5">
                 <td colspan="5" class="border-top-0 pt-4">@Model.CustomTipText</td>
-</tr>
+            </tr>
             <tr>
                 <td colspan="5" class="border-0">
                     <div class="input-group mb-2">
@@ -155,20 +157,20 @@
 
                     </div>
                 </td>
-</tr>}
-</script>
+            </tr>}
+    </script>
 
-<script id="template-cart-total" type="text/template">
-<tr class="h4 table-light">
+    <script id="template-cart-total" type="text/template">
+        <tr class="h4 table-light">
             <td colspan="1" class="pb-4">Total</td>
             <td colspan="4" align="right" class="pb-4">
                 <span class="js-cart-total">{total}</span>
             </td>
-</tr>
-</script>
+        </tr>
+    </script>
 
-@if (Model.EnableShoppingCart)
-{
+    @if (Model.EnableShoppingCart)
+    {
         <div id="cartModal" class="modal" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
@@ -220,7 +222,7 @@
                         </table>
                     </div>
                     <div class="modal-footer bg-light">
-                    <form method="post" asp-antiforgery="false" data-buy>
+                        <form method="post" asp-controller="AppsPublic" asp-action="ViewPointOfSale" asp-route-appId="@Model.AppId" asp-antiforgery="false" data-buy>
                             <input id="js-cart-amount" class="form-control" type="hidden" name="amount">
                             <input id="js-cart-posdata" class="form-control" type="hidden" name="posdata">
                             <button id="js-cart-pay" class="btn btn-primary btn-lg" type="submit">
@@ -325,9 +327,9 @@
                 </div>
             </nav>
         </div>
-}
-else
-{
+    }
+    else
+    {
         <div class="container d-flex h-100">
             <div class="justify-content-center align-self-center text-center mx-auto px-2 py-3 w-100" style="margin: auto;">
                 <h1 class="mb-4">@Model.Title</h1>
@@ -353,8 +355,8 @@ else
                             <div class="card-footer bg-transparent border-0">
                                 @if (item.Custom)
                                 {
-                                <form method="post" asp-antiforgery="false" data-buy>
-                                    <input type="hidden" name="choicekey" value="@item.Id"/>
+                                    <form method="post" asp-controller="AppsPublic" asp-action="ViewPointOfSale" asp-route-appId="@Model.AppId" asp-antiforgery="false" data-buy>
+                                        <input type="hidden" name="choicekey" value="@item.Id" />
                                         <div class="input-group">
                                             <div class="input-group-prepend">
                                                 <span class="input-group-text">@Model.CurrencySymbol</span>
@@ -369,9 +371,10 @@ else
                                 }
                                 else
                                 {
-                                <form method="post" asp-antiforgery="false">
+                                    <form method="post" asp-controller="AppsPublic" asp-action="ViewPointOfSale" asp-route-appId="@Model.AppId" asp-antiforgery="false">
                                         <button type="submit" name="choiceKey" class="js-add-cart btn btn-primary" value="@item.Id">
-                                        @String.Format(Model.ButtonText, @item.Price.Formatted)</button>
+                                            @String.Format(Model.ButtonText, @item.Price.Formatted)
+                                        </button>
                                     </form>
                                 }
                             </div>
@@ -386,7 +389,7 @@ else
 
                             </div>
                             <div class="card-footer bg-transparent border-0">
-                            <form method="post" asp-antiforgery="false" data-buy>
+                                <form method="post" asp-controller="AppsPublic" asp-action="ViewPointOfSale" asp-route-appId="@Model.AppId" asp-antiforgery="false" data-buy>
                                     <div class="input-group">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text">@Model.CurrencySymbol</span>
@@ -403,6 +406,6 @@ else
                 </div>
             </div>
         </div>
-}
+    }
 </body>
 </html>