Small payment request fixes (#5926)

* Do not crash payment request page on 0 amount * set email from form to payment request
btcpayserver · Apr 12, 2024 · 8819372 · 8819372
1 parent b9cea96
commit 8819372
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/BTCPayServer/Controllers/UIPaymentRequestController.cs b/BTCPayServer/Controllers/UIPaymentRequestController.cs
@@ -277,6 +277,10 @@ public async Task<IActionResult> ViewPaymentRequestForm(string payReqId, FormVie
                 if (FormDataService.Validate(form, ModelState))
                 {
                     prBlob.FormResponse = FormDataService.GetValues(form);
+                    if(string.IsNullOrEmpty(prBlob.Email) && form.GetFieldByFullName("buyerEmail") is { } emailField)
+                    {
+                        prBlob.Email = emailField.Value;
+                    }
                     result.SetBlob(prBlob);
                     await _PaymentRequestRepository.CreateOrUpdatePaymentRequest(result);
                     return RedirectToAction("PayPaymentRequest", new { payReqId });

diff --git a/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml
@@ -118,7 +118,10 @@
                     </p>
                     <dl class="mt-n1 mb-4" v-if="srvModel.amountCollected > 0 && srvModel.amountDue > 0">
                         <div class="progress bg-light d-flex mb-3 d-print-none" style="height:5px">
-                            <div class="progress-bar bg-primary" role="progressbar" style="width:@(Model.AmountCollected/Model.Amount*100)%" v-bind:style="{ width: (srvModel.amountCollected/srvModel.amount*100) + '%' }"></div>
+                            @{
+                                var prcnt = Model.Amount == 0? 100:  Model.AmountCollected / Model.Amount * 100;
+                            }
+                            <div class="progress-bar bg-primary" role="progressbar" style="width:@prcnt%" v-bind:style="{ width: (srvModel.amountCollected/srvModel.amount*100) + '%' }"></div>
                         </div>
                         <div class="d-flex flex-wrap gap-3 align-items-center justify-content-between">
                             <div class="d-flex d-print-inline-block flex-column gap-1">