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

Errors not working in PointOfSale (#1141)

Browse Source
This commit is contained in:
nicolas.dorier
2019-11-14 20:55:18 +09:00
parent 6900964c03
commit bcb85e2084
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
BTCPayServer/Controllers/AppsPublicController.cs
View File

@@ -165,26 +165,39 @@ namespace BTCPayServer.Controllers
} }
} }
var store = await _AppService.GetStore(app); var store = await _AppService.GetStore(app);
var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest() try
{ {
ItemCode = choice?.Id, var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
ItemDesc = title, {
Currency = settings.Currency, ItemCode = choice?.Id,
Price = price, ItemDesc = title,
BuyerEmail = email, Currency = settings.Currency,
OrderId = orderId, Price = price,
NotificationURL = BuyerEmail = email,
string.IsNullOrEmpty(notificationUrl) ? settings.NotificationUrl : notificationUrl, OrderId = orderId,
NotificationEmail = settings.NotificationEmail, NotificationURL =
RedirectURL = redirectUrl ?? Request.GetDisplayUrl(), string.IsNullOrEmpty(notificationUrl) ? settings.NotificationUrl : notificationUrl,
FullNotifications = true, NotificationEmail = settings.NotificationEmail,
ExtendedNotifications = true, RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
PosData = string.IsNullOrEmpty(posData) ? null : posData, FullNotifications = true,
RedirectAutomatically = settings.RedirectAutomatically, ExtendedNotifications = true,
}, store, HttpContext.Request.GetAbsoluteRoot(), PosData = string.IsNullOrEmpty(posData) ? null : posData,
new List<string>() { AppService.GetAppInternalTag(appId) }, RedirectAutomatically = settings.RedirectAutomatically,
cancellationToken); }, store, HttpContext.Request.GetAbsoluteRoot(),
return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id }); new List<string>() { AppService.GetAppInternalTag(appId) },
cancellationToken);
return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
}
catch (BitpayHttpException e)
{
TempData.SetStatusMessageModel(new StatusMessageModel()
{
Html = e.Message.Replace("\n", "<br />", StringComparison.OrdinalIgnoreCase),
Severity = StatusMessageModel.StatusSeverity.Error,
AllowDismiss = true
});
return RedirectToAction(nameof(ViewPointOfSale), new { appId = appId });
}
} }
[HttpGet] [HttpGet]

4
BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
View File

@@ -185,6 +185,10 @@
</td> </td>
</tr> </tr>
</script> </script>
@if (this.TempData.HasStatusMessage())
{
<partial name="_StatusMessage" />
}
@if (Model.EnableShoppingCart) @if (Model.EnableShoppingCart)
{ {