Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

BrainTree - minor changes

DanielŻuławski21a4be77823f
diff --git a/src/Plugins/Payments.BrainTree/Views/Shared/Components/PaymentBrainTree/PaymentInfo_3DS.cshtml b/src/Plugins/Payments.BrainTree/Views/Shared/Components/PaymentBrainTree/PaymentInfo_3DS.cshtml
index c89853f27..e976f6ba0 100644
--- a/src/Plugins/Payments.BrainTree/Views/Shared/Components/PaymentBrainTree/PaymentInfo_3DS.cshtml
+++ b/src/Plugins/Payments.BrainTree/Views/Shared/Components/PaymentBrainTree/PaymentInfo_3DS.cshtml
@@ -108,20 +108,11 @@
components[name] = component;
}
}
- function addFrame(err, iframe) {
- bankFrame.appendChild(iframe);
- }
- function removeFrame() {
- var iframe = bankFrame.querySelector('iframe');
- iframe.parentNode.removeChild(iframe);
- }
function verifyCard(payload) {
components.threeDSecure.verifyCard({
bin: payload.details.bin,
amount: '@ViewBag.OrderTotal',
nonce: payload.nonce,
- addFrame: addFrame,
- removeFrame: removeFrame,
challengeRequested: true,
email: '@_workContext.CurrentCustomer.BillingAddress?.Email',
billingAddress: {
@@ -136,11 +127,15 @@
onLookupComplete: function (data, next) {
// use `data` here, then call `next()`
next();
+ setTimeout(function () {
+ vmorder.vPaymentInfo.resetLoadWaiting();
+ }, 1000);
}
}, function (err, payload) {
if (err) {
var currentErrorvalue = document.querySelector('#@Html.IdFor(model => model.Errors)').value;
document.querySelector('#@Html.IdFor(model => model.Errors)').value = currentErrorvalue + '|' + err.message;
+ vmorder.vPaymentInfo.resetLoadWaiting();
return;
}
// Add the nonce to the form and submit
@@ -153,15 +148,17 @@
});
}
- document.querySelector('input.payment-info-next-step-button').addEventListener('click', function (data) {
+ document.querySelector('input.payment-info-next-step-button').addEventListener('click', function (data) {
document.querySelector('#braintree-errors').innerHTML = '';
if (!submitForm) {
+ vmorder.Checkout.setLoadWaiting('payment-info');
if (!stepBack) {
components.hostedFields.tokenize(function (err, payload) {
if (err) {
var currentErrorvalue = document.querySelector('#@Html.IdFor(model => model.Errors)').value;
document.querySelector('#@Html.IdFor(model => model.Errors)').value = currentErrorvalue + '|' + err.message;
document.querySelector('#braintree-errors').innerHTML = err.message;
+ vmorder.vPaymentInfo.resetLoadWaiting();
return;
}
verifyCard(payload);
@@ -185,6 +182,7 @@
var currentErrorvalue = document.querySelector('#@Html.IdFor(model => model.Errors)').value;
document.querySelector('#@Html.IdFor(model => model.Errors)').value = currentErrorvalue + '|' + err.message;
document.querySelector('#braintree-errors').innerHTML = err.message;
+ vmorder.vPaymentInfo.resetLoadWaiting();
return;
}
verifyCard(payload);
diff --git a/src/Web/Grand.Web/Views/Checkout/_PaymentInfo.cshtml b/src/Web/Grand.Web/Views/Checkout/_PaymentInfo.cshtml
index a9ad71128..b85354c4e 100644
--- a/src/Web/Grand.Web/Views/Checkout/_PaymentInfo.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/_PaymentInfo.cshtml
@@ -1,7 +1,8 @@
<div v-if="vmorder.PaymentInfo" class="checkout-data">
<div class="col-12 px-0">
- <div v-if="vmorder.paymentBussy" style="height: 200px" class="d-flex justify-content-center align-items-center w-100">
- <b-spinner variant="info" label="Loading..."></b-spinner>
+ <div v-if="vmorder.paymentBussy" class="d-flex justify-content-center align-items-center" style="height: 150px;">
+ <div class="spinner-border text-info" role="status">
+ </div>
</div>
@await Component.InvokeAsync("Widget", new { widgetZone = "checkout_payment_info_top" })
<div class="section payment-info">