Draw attention to error messages, add AJAX timeout handling
This commit is contained in:
parent
0545140672
commit
2c1406b916
@ -213,7 +213,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
<div id="addresserror"></div>
|
<div id="addresserror" class="box"></div>
|
||||||
<br />
|
<br />
|
||||||
<div>
|
<div>
|
||||||
By continuing, you acknowledge that you aren't sending anything except paper documents.
|
By continuing, you acknowledge that you aren't sending anything except paper documents.
|
||||||
@ -242,7 +242,7 @@
|
|||||||
<div id="card-element" style="width: 500px; max-width: 100%; background-color: white; padding: 1em; border-radius: 4px;"></div>
|
<div id="card-element" style="width: 500px; max-width: 100%; background-color: white; padding: 1em; border-radius: 4px;"></div>
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
<div id="paymenterror"></div>
|
<div id="paymenterror" class="box"></div>
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
<ul class="actions">
|
<ul class="actions">
|
||||||
|
|||||||
@ -3793,4 +3793,31 @@ body.is-preload #banner:after {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.box:empty {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box:not(.box:empty) {
|
||||||
|
animation: flashbox 300ms;
|
||||||
|
animation-timing-function: linear;
|
||||||
|
animation-iteration-count: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wrapper.style1 .box {
|
||||||
|
border-color: white;
|
||||||
|
border-width: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes flashbox {
|
||||||
|
0% {
|
||||||
|
background-color: rgba(255, 255, 255, 0);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
background-color: rgba(255, 255, 255, 0.5);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
background-color: rgba(255, 255, 255, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*# sourceMappingURL=main.css.map */
|
/*# sourceMappingURL=main.css.map */
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -11,9 +11,11 @@ function getRateAndValidateAddress() {
|
|||||||
$("#getRateAndValidateAddressButton").html('<i class="far fa-spinner fa-spin"></i> Working...</a>');
|
$("#getRateAndValidateAddressButton").html('<i class="far fa-spinner fa-spin"></i> Working...</a>');
|
||||||
disableGetRateButton = true;
|
disableGetRateButton = true;
|
||||||
$("#addresserror").text("");
|
$("#addresserror").text("");
|
||||||
$.post("makeshipment.php",
|
$.ajax({
|
||||||
$("#addressform").serialize(),
|
type: "POST",
|
||||||
function (resp) {
|
url: "makeshipment.php",
|
||||||
|
data: $("#addressform").serialize(),
|
||||||
|
success: function (resp) {
|
||||||
if (resp.status == "OK") {
|
if (resp.status == "OK") {
|
||||||
$("input[name=to_name]").val(resp.address.name);
|
$("input[name=to_name]").val(resp.address.name);
|
||||||
$("input[name=to_company]").val(resp.address.company);
|
$("input[name=to_company]").val(resp.address.company);
|
||||||
@ -78,8 +80,14 @@ function getRateAndValidateAddress() {
|
|||||||
$("#getRateAndValidateAddressButton").html('<i class="far fa-chevron-right"></i> Next</a>');
|
$("#getRateAndValidateAddressButton").html('<i class="far fa-chevron-right"></i> Next</a>');
|
||||||
disableGetRateButton = false;
|
disableGetRateButton = false;
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
);
|
dataType: "json",
|
||||||
|
timeout: 1000 * 10
|
||||||
|
}).fail(function () {
|
||||||
|
$("#addresserror").text("There was a network glitch or your request took too long. Please try again.");
|
||||||
|
$("#getRateAndValidateAddressButton").html('<i class="far fa-chevron-right"></i> Next</a>');
|
||||||
|
disableGetRateButton = false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function submitPayment() {
|
function submitPayment() {
|
||||||
@ -97,15 +105,19 @@ function submitPayment() {
|
|||||||
$("#paymenterror").text(result.error.message);
|
$("#paymenterror").text(result.error.message);
|
||||||
$("#submitPaymentButton").html('<i class="far fa-chevron-right"></i> Purchase</a>');
|
$("#submitPaymentButton").html('<i class="far fa-chevron-right"></i> Purchase</a>');
|
||||||
} else {
|
} else {
|
||||||
$.post("payshipment.php",
|
$.ajax({
|
||||||
{
|
type: "POST",
|
||||||
|
url: "payshipment.php",
|
||||||
|
data: {
|
||||||
"shipmentid": shipmentid,
|
"shipmentid": shipmentid,
|
||||||
"rateid": rateid,
|
"rateid": rateid,
|
||||||
"stripeid": result.paymentMethod.id,
|
"stripeid": result.paymentMethod.id,
|
||||||
"price": price,
|
"price": price,
|
||||||
"label_only": document.getElementById('label_only').checked ? "1" : ""
|
"label_only": document.getElementById('label_only').checked ? "1" : ""
|
||||||
},
|
},
|
||||||
function (resp) {
|
dataType: "json",
|
||||||
|
timeout: 1000 * 30,
|
||||||
|
success: function (resp) {
|
||||||
if (resp.status == "OK") {
|
if (resp.status == "OK") {
|
||||||
// load PDF to print
|
// load PDF to print
|
||||||
$("#pdfframe").attr("src", resp.pdf + "#toolbar=0&navpanes=0&pagemode=none");
|
$("#pdfframe").attr("src", resp.pdf + "#toolbar=0&navpanes=0&pagemode=none");
|
||||||
@ -136,7 +148,11 @@ function submitPayment() {
|
|||||||
disablePayButton = false;
|
disablePayButton = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
}).fail(function () {
|
||||||
|
$("#paymenterror").html("There was a network glitch or your request took too long to process. It's possible your payment went through; check with your card provider or <a href='https://postalportal.net/#contact' target='_BLANK'>click here to contact us</a>.");
|
||||||
|
$("#submitPaymentButton").html('<i class="far fa-chevron-right"></i> Purchase</a>');
|
||||||
|
disablePayButton = false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -82,3 +82,30 @@ xxsmall: ( null, 360px )
|
|||||||
@import 'layout/banner';
|
@import 'layout/banner';
|
||||||
@import 'layout/main';
|
@import 'layout/main';
|
||||||
@import 'layout/footer';
|
@import 'layout/footer';
|
||||||
|
|
||||||
|
.box:empty {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box:not(.box:empty) {
|
||||||
|
animation: flashbox 300ms;
|
||||||
|
animation-timing-function: linear;
|
||||||
|
animation-iteration-count: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wrapper.style1 .box {
|
||||||
|
border-color: white;
|
||||||
|
border-width: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes flashbox {
|
||||||
|
0% {
|
||||||
|
background-color: rgba(255,255,255,0);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
background-color: rgba(255,255,255,0.5);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
background-color: rgba(255,255,255,0);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user