aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

POS: Updates from code review

Browse Source
This commit is contained in:
Dennis Reimann
2020-05-28 08:59:48 +02:00
parent e12aa9e657
commit 332a1da167
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BTCPayServer/Controllers/AppsPublicController.cs
View File

@@ -38,8 +38,8 @@ namespace BTCPayServer.Controllers
private readonly AppService _AppService; private readonly AppService _AppService;
private readonly BTCPayServerOptions _BtcPayServerOptions; private readonly BTCPayServerOptions _BtcPayServerOptions;
private readonly InvoiceController _InvoiceController; private readonly InvoiceController _InvoiceController;
private readonly UserManager<ApplicationUser> _UserManager; private readonly UserManager<ApplicationUser> _UserManager;
[HttpGet] [HttpGet]
[Route("/apps/{appId}/pos")] [Route("/apps/{appId}/pos")]
[XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)] [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
@@ -49,11 +49,11 @@ namespace BTCPayServer.Controllers
if (app == null) if (app == null)
return NotFound(); return NotFound();
var settings = app.GetSettings<PointOfSaleSettings>(); var settings = app.GetSettings<PointOfSaleSettings>();
PosViewType viewType = settings.DefaultView; PosViewType viewType = settings.EnableShoppingCart? PosViewType.Cart : settings.DefaultView;
return RedirectToAction(nameof(ViewPointOfSale), new { appId, viewType }); return RedirectToAction(nameof(ViewPointOfSale), new { appId, viewType });
} }
[HttpGet] [HttpGet]
[Route("/apps/{appId}/pos/{viewType}")] [Route("/apps/{appId}/pos/{viewType}")]
[XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)] [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
@@ -120,6 +120,7 @@ namespace BTCPayServer.Controllers
if (app == null) if (app == null)
return NotFound(); return NotFound();
var settings = app.GetSettings<PointOfSaleSettings>(); var settings = app.GetSettings<PointOfSaleSettings>();
settings.DefaultView = settings.EnableShoppingCart? PosViewType.Cart : settings.DefaultView;
if (string.IsNullOrEmpty(choiceKey) && !settings.ShowCustomAmount && settings.DefaultView != PosViewType.Cart) if (string.IsNullOrEmpty(choiceKey) && !settings.ShowCustomAmount && settings.DefaultView != PosViewType.Cart)
{ {
return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId, viewType = viewType }); return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId, viewType = viewType });
@@ -161,8 +162,8 @@ namespace BTCPayServer.Controllers
title = settings.Title; title = settings.Title;
//if cart IS enabled and we detect posdata that matches the cart system's, check inventory for the items //if cart IS enabled and we detect posdata that matches the cart system's, check inventory for the items
if (!string.IsNullOrEmpty(posData) && if (!string.IsNullOrEmpty(posData) &&
settings.DefaultView == PosViewType.Cart && settings.DefaultView == PosViewType.Cart &&
AppService.TryParsePosCartItems(posData, out var cartItems)) AppService.TryParsePosCartItems(posData, out var cartItems))
{ {