diff --git a/public/js/clients/payment_methods/authorize-ach.js b/public/js/clients/payment_methods/authorize-ach.js index 5c793190eac8..62373c94444f 100644 --- a/public/js/clients/payment_methods/authorize-ach.js +++ b/public/js/clients/payment_methods/authorize-ach.js @@ -1,2 +1,2 @@ /*! For license information please see authorize-ach.js.LICENSE.txt */ -!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=4)}({4:function(e,t,n){e.exports=n("UWWK")},UWWK:function(e,t){function n(e,t){for(var n=0;n svg").classList.add("hidden"),document.querySelector("#save-button > span").classList.remove("hidden"),t.errors.textContent="",t.errors.textContent=e,t.errors.hidden=!1})),r(this,"handleSuccess",(function(e){document.getElementById("gateway_response").value=JSON.stringify(e),document.getElementById("server_response").submit()})),r(this,"handleSubmit",(function(e){document.getElementById("save-button").disabled=!0,document.querySelector("#save-button > svg").classList.remove("hidden"),document.querySelector("#save-button > span").classList.add("hidden"),e.preventDefault(),t.errors.textContent="",t.errors.hidden=!0,t.stripe.createToken("bank_account",t.getFormData()).then((function(e){return e.hasOwnProperty("error")?t.handleError(e.error.message):t.handleSuccess(e)}))})),this.errors=document.getElementById("errors"),this.key=document.querySelector('meta[name="stripe-publishable-key"]').content}var t,o,u;return t=e,(o=[{key:"handle",value:function(){var e=this;document.getElementById("token-form").addEventListener("submit",(function(t){return e.handleSubmit(t)}))}}])&&n(t.prototype,o),u&&n(t,u),e}())).setupStripe().handle()}}); \ No newline at end of file diff --git a/public/js/clients/payment_methods/authorize-authorize-card.js b/public/js/clients/payment_methods/authorize-authorize-card.js index 0df669339ce0..ac2394a35b4b 100644 --- a/public/js/clients/payment_methods/authorize-authorize-card.js +++ b/public/js/clients/payment_methods/authorize-authorize-card.js @@ -1,2 +1,2 @@ /*! For license information please see authorize-authorize-card.js.LICENSE.txt */ -!function(e){var t={};function n(r){if(t[r])return t[r].exports;var a=t[r]={i:r,l:!1,exports:{}};return e[r].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var a in e)n.d(r,a,function(t){return e[t]}.bind(null,a));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=2)}({2:function(e,t,n){e.exports=n("6vDv")},"6vDv":function(e,t){function n(e,t){for(var n=0;n svg").classList.remove("hidden"),document.querySelector("#card_button > span").classList.add("hidden"),Accept.dispatchData(r,this.responseHandler),!1}},{key:"responseHandler",value:function(e){if("Error"===e.messages.resultCode){for(var t=0;t svg").classList.add("hidden"),document.querySelector("#card_button > span").classList.remove("hidden")}else"Ok"===e.messages.resultCode&&(document.getElementById("dataDescriptor").value=e.opaqueData.dataDescriptor,document.getElementById("dataValue").value=e.opaqueData.dataValue,document.getElementById("server_response").submit());return!1}},{key:"handle",value:function(){var e=this;return this.cardButton.addEventListener("click",(function(){e.cardButton.disabled=!e.cardButton.disabled,e.handleAuthorization()})),this}}])&&n(t.prototype,r),a&&n(t,a),e}())(document.querySelector('meta[name="authorize-public-key"]').content,document.querySelector('meta[name="authorize-login-id"]').content).handle()}}); \ No newline at end of file diff --git a/public/js/clients/payment_methods/authorize-stripe-card.js b/public/js/clients/payment_methods/authorize-stripe-card.js index ca93b02ec45f..d63edd7f58de 100644 --- a/public/js/clients/payment_methods/authorize-stripe-card.js +++ b/public/js/clients/payment_methods/authorize-stripe-card.js @@ -1,2 +1,2 @@ /*! For license information please see authorize-stripe-card.js.LICENSE.txt */ -!function(e){var t={};function n(r){if(t[r])return t[r].exports;var a=t[r]={i:r,l:!1,exports:{}};return e[r].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var a in e)n.d(r,a,function(t){return e[t]}.bind(null,a));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=1)}({1:function(e,t,n){e.exports=n("jzun")},jzun:function(e,t){function n(e,t){for(var n=0;n svg").classList.add("hidden"),document.querySelector("#pay-now-button > span").classList.remove("hidden"),r.stripe.createSource(e).then((function(e){if(e.hasOwnProperty("source"))return window.location=e.source.redirect.url;document.getElementById("pay-now-button").disabled=!1,document.querySelector("#pay-now-button > svg").classList.remove("hidden"),document.querySelector("#pay-now-button > span").classList.add("hidden"),this.errors.textContent="",this.errors.textContent=e.error.message,this.errors.hidden=!1}))}))})),this.key=t,this.errors=document.getElementById("errors")}(document.querySelector('meta[name="stripe-publishable-key"]').content).setupStripe().handle()}}); \ No newline at end of file diff --git a/public/js/clients/payments/authorize-credit-card-payment.js b/public/js/clients/payments/authorize-credit-card-payment.js index cbbe28154c20..50c4d7ad055f 100644 --- a/public/js/clients/payments/authorize-credit-card-payment.js +++ b/public/js/clients/payments/authorize-credit-card-payment.js @@ -1,2 +1,2 @@ /*! For license information please see authorize-credit-card-payment.js.LICENSE.txt */ -!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=3)}({3:function(e,t,n){e.exports=n("hK5p")},hK5p:function(e,t){function n(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return r(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return r(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var o=0,a=function(){};return{s:a,n:function(){return o>=e.length?{done:!0}:{done:!1,value:e[o++]}},e:function(e){throw e},f:a}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var u,i=!0,c=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return i=e.done,e},e:function(e){c=!0,u=e},f:function(){try{i||null==n.return||n.return()}finally{if(c)throw u}}}}function r(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n"+e.messages.message[0].code+": "+e.messages.message[0].text+"

"):"Ok"===e.messages.resultCode&&(document.getElementById("dataDescriptor").value=e.opaqueData.dataDescriptor,document.getElementById("dataValue").value=e.opaqueData.dataValue,document.getElementById("store_card").value=document.getElementById("store_card_checkbox").checked,document.getElementById("server_response").submit()),this.cardButton.disabled=!1,!1}}])&&o(t.prototype,r),u&&o(t,u),e}())(document.querySelector('meta[name="authorize-public-key"]').content,document.querySelector('meta[name="authorize-login-id"]').content).handle()}}); \ No newline at end of file +!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=3)}({3:function(e,t,n){e.exports=n("hK5p")},hK5p:function(e,t){function n(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return r(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return r(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var o=0,a=function(){};return{s:a,n:function(){return o>=e.length?{done:!0}:{done:!1,value:e[o++]}},e:function(e){throw e},f:a}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var u,c=!0,i=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return c=e.done,e},e:function(e){i=!0,u=e},f:function(){try{c||null==n.return||n.return()}finally{if(i)throw u}}}}function r(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n svg").classList.remove("hidden"),document.querySelector("#card_button > span").classList.add("hidden"),Accept.dispatchData(r,o.responseHandler),!1})),a(this,"handle",(function(){if(o.cardButton&&o.cardButton.addEventListener("click",(function(){o.cardButton.disabled=!0,o.handleAuthorization()})),o.payNowButton){var e,t=n(o.payNowButton);try{var r=function(){var t=e.value;t.addEventListener("click",(function(){t.disabled=!0,o.handlePayNowAction(t.dataset.id)}))};for(t.s();!(e=t.n()).done;)r()}catch(e){t.e(e)}finally{t.f()}}return o})),this.publicKey=t,this.loginId=r,this.cardHolderName=document.getElementById("cardholder_name"),this.cardButton=document.getElementById("card_button"),this.payNowButton=document.getElementsByClassName("pay_now_button")}var t,r,u;return t=e,(r=[{key:"handlePayNowAction",value:function(e){document.getElementById("token").value=e,document.getElementById("server_response").submit()}},{key:"responseHandler",value:function(e){return"Error"===e.messages.resultCode?($("#errors").show().html("

"+e.messages.message[0].code+": "+e.messages.message[0].text+"

"),document.getElementById("card_button").disabled=!1,document.querySelector("#card_button > svg").classList.add("hidden"),document.querySelector("#card_button > span").classList.remove("hidden")):"Ok"===e.messages.resultCode&&(document.getElementById("dataDescriptor").value=e.opaqueData.dataDescriptor,document.getElementById("dataValue").value=e.opaqueData.dataValue,document.getElementById("store_card").value=document.getElementById("store_card_checkbox").checked,document.getElementById("server_response").submit()),this.cardButton.disabled=!1,!1}}])&&o(t.prototype,r),u&&o(t,u),e}())(document.querySelector('meta[name="authorize-public-key"]').content,document.querySelector('meta[name="authorize-login-id"]').content).handle()}}); \ No newline at end of file diff --git a/public/js/clients/payments/process.js b/public/js/clients/payments/process.js index 42a8646e5005..e1688eeee212 100644 --- a/public/js/clients/payments/process.js +++ b/public/js/clients/payments/process.js @@ -1,2 +1,2 @@ /*! For license information please see process.js.LICENSE.txt */ -!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=12)}({12:function(e,t,n){e.exports=n("OXGg")},OXGg:function(e,t){function n(e,t){for(var n=0;n svg").classList.remove("hidden"),document.querySelector("#pay-now-button > span").classList.add("hidden"),r.stripe.createSource(e).then((function(e){if(e.hasOwnProperty("source"))return window.location=e.source.redirect.url;document.getElementById("pay-now-button").disabled=!1,document.querySelector("#pay-now-button > svg").classList.add("hidden"),document.querySelector("#pay-now-button > span").classList.remove("hidden"),this.errors.textContent="",this.errors.textContent=e.error.message,this.errors.hidden=!1,processingOverlay(!1),document.getElementById("pay-now").disabled=!1}))}))})),this.key=t,this.errors=document.getElementById("errors")}(document.querySelector('meta[name="stripe-publishable-key"]').content).setupStripe().handle()}}); \ No newline at end of file diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 35062ce14c05..ea01def4d2ef 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -3,15 +3,15 @@ "/css/app.css": "/css/app.css?id=52628d49061f3dbade45", "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=b0f29d5fdfa492962c22", "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=d7e708d66a9c769b4c6e", - "/js/clients/payment_methods/authorize-ach.js": "/js/clients/payment_methods/authorize-ach.js?id=260b1515722aadacba1b", - "/js/clients/payment_methods/authorize-authorize-card.js": "/js/clients/payment_methods/authorize-authorize-card.js?id=fda8f421f9e0e5b6a374", - "/js/clients/payment_methods/authorize-stripe-card.js": "/js/clients/payment_methods/authorize-stripe-card.js?id=2855350c0cf901f432f2", - "/js/clients/payments/alipay.js": "/js/clients/payments/alipay.js?id=766690d4207c0d8e75d1", - "/js/clients/payments/authorize-credit-card-payment.js": "/js/clients/payments/authorize-credit-card-payment.js?id=914bbac0c52e458a55ea", + "/js/clients/payment_methods/authorize-ach.js": "/js/clients/payment_methods/authorize-ach.js?id=c73d32c192c36fe44123", + "/js/clients/payment_methods/authorize-authorize-card.js": "/js/clients/payment_methods/authorize-authorize-card.js?id=044dc1eabd2ee074cb2b", + "/js/clients/payment_methods/authorize-stripe-card.js": "/js/clients/payment_methods/authorize-stripe-card.js?id=7f17c8e95d622ae12253", + "/js/clients/payments/alipay.js": "/js/clients/payments/alipay.js?id=6be66f65ec4537b3b05e", + "/js/clients/payments/authorize-credit-card-payment.js": "/js/clients/payments/authorize-credit-card-payment.js?id=c3dd83c587eafc0bdd33", "/js/clients/payments/card-js.min.js": "/js/clients/payments/card-js.min.js?id=7200ac43b87bddf1bedc", "/js/clients/payments/checkout.com.js": "/js/clients/payments/checkout.com.js?id=bee8407bd5dfae80dc6a", - "/js/clients/payments/process.js": "/js/clients/payments/process.js?id=8f0a87e44b6e6824c010", - "/js/clients/payments/sofort.js": "/js/clients/payments/sofort.js?id=ca99b358b094202d1e3a", + "/js/clients/payments/process.js": "/js/clients/payments/process.js?id=7e9acaeea54b0e291372", + "/js/clients/payments/sofort.js": "/js/clients/payments/sofort.js?id=946855f32f6f44ab25be", "/js/clients/quotes/action-selectors.js": "/js/clients/quotes/action-selectors.js?id=1702ddb9f59521c7758f", "/js/clients/quotes/approve.js": "/js/clients/quotes/approve.js?id=1c5d76fb5f98bd49f6c8", "/js/clients/shared/multiple-downloads.js": "/js/clients/shared/multiple-downloads.js?id=bf87649ca30c9a3fba59", diff --git a/resources/js/clients/payment_methods/authorize-ach.js b/resources/js/clients/payment_methods/authorize-ach.js index bf16f6b24624..911b2713cc2f 100644 --- a/resources/js/clients/payment_methods/authorize-ach.js +++ b/resources/js/clients/payment_methods/authorize-ach.js @@ -37,8 +37,9 @@ class AuthorizeACH { }; handleError = (message) => { - processingOverlay(false); document.getElementById('save-button').disabled = false; + document.querySelector('#save-button > svg').classList.add('hidden'); + document.querySelector('#save-button > span').classList.remove('hidden'); this.errors.textContent = ''; this.errors.textContent = message; @@ -54,10 +55,12 @@ class AuthorizeACH { }; handleSubmit = (e) => { - processingOverlay(true); document.getElementById('save-button').disabled = true; - + document.querySelector('#save-button > svg').classList.remove('hidden'); + document.querySelector('#save-button > span').classList.add('hidden'); + e.preventDefault(); + this.errors.textContent = ''; this.errors.hidden = true; diff --git a/resources/js/clients/payment_methods/authorize-authorize-card.js b/resources/js/clients/payment_methods/authorize-authorize-card.js index 9af8543c825d..c154372f5d1f 100644 --- a/resources/js/clients/payment_methods/authorize-authorize-card.js +++ b/resources/js/clients/payment_methods/authorize-authorize-card.js @@ -35,7 +35,9 @@ class AuthorizeAuthorizeCard { secureData.authData = authData; secureData.cardData = cardData; - processingOverlay(true); + document.getElementById('card_button').disabled = true; + document.querySelector('#card_button > svg').classList.remove('hidden'); + document.querySelector('#card_button > span').classList.add('hidden'); Accept.dispatchData(secureData, this.responseHandler); return false; @@ -43,8 +45,6 @@ class AuthorizeAuthorizeCard { } responseHandler(response) { - processingOverlay(false); - if (response.messages.resultCode === "Error") { var i = 0; while (i < response.messages.message.length) { @@ -53,7 +53,11 @@ class AuthorizeAuthorizeCard { response.messages.message[i].text ); i = i + 1; - } + } + + document.getElementById('card_button').disabled = false; + document.querySelector('#card_button > svg').classList.add('hidden'); + document.querySelector('#card_button > span').classList.remove('hidden'); } else if(response.messages.resultCode === "Ok"){ diff --git a/resources/js/clients/payment_methods/authorize-stripe-card.js b/resources/js/clients/payment_methods/authorize-stripe-card.js index 0acb344a0f02..c7b902f9438c 100644 --- a/resources/js/clients/payment_methods/authorize-stripe-card.js +++ b/resources/js/clients/payment_methods/authorize-stripe-card.js @@ -36,8 +36,9 @@ class AuthorizeStripeCard { } handleStripe(stripe, cardHolderName) { - processingOverlay(true); this.cardButton.disabled = true; + this.cardButton.querySelector('span').classList.add('hidden'); + this.cardButton.querySelector('svg').classList.remove('hidden'); stripe .handleCardSetup(this.clientSecret, this.cardElement, { @@ -55,8 +56,9 @@ class AuthorizeStripeCard { } handleFailure(result) { - processingOverlay(false); this.cardButton.disabled = false; + this.cardButton.querySelector('span').classList.remove('hidden'); + this.cardButton.querySelector('svg').classList.add('hidden'); let errors = document.getElementById('errors'); diff --git a/resources/js/clients/payments/alipay.js b/resources/js/clients/payments/alipay.js index e6b4c4ea1172..029db7af49ea 100644 --- a/resources/js/clients/payments/alipay.js +++ b/resources/js/clients/payments/alipay.js @@ -33,16 +33,19 @@ class ProcessAlipay { document.getElementById('pay-now').addEventListener('submit', (e) => { e.preventDefault(); - processingOverlay(true); - document.getElementById('pay-now').disabled = true; + + document.getElementById('pay-now-button').disabled = true; + document.querySelector('#pay-now-button > svg').classList.add('hidden'); + document.querySelector('#pay-now-button > span').classList.remove('hidden'); this.stripe.createSource(data).then(function(result) { if (result.hasOwnProperty('source')) { return (window.location = result.source.redirect.url); } - processingOverlay(false); - document.getElementById('pay-now').disabled = false; + document.getElementById('pay-now-button').disabled = false; + document.querySelector('#pay-now-button > svg').classList.remove('hidden'); + document.querySelector('#pay-now-button > span').classList.add('hidden'); this.errors.textContent = ''; this.errors.textContent = result.error.message; diff --git a/resources/js/clients/payments/authorize-credit-card-payment.js b/resources/js/clients/payments/authorize-credit-card-payment.js index 04dcda0468e0..49b2f6fadabb 100644 --- a/resources/js/clients/payments/authorize-credit-card-payment.js +++ b/resources/js/clients/payments/authorize-credit-card-payment.js @@ -39,7 +39,9 @@ class AuthorizeAuthorizeCard { // send the bankData object instead of the cardData object. // // secureData.bankData = bankData; - processingOverlay(true); + document.getElementById('card_button').disabled = true; + document.querySelector('#card_button > svg').classList.remove('hidden'); + document.querySelector('#card_button > span').classList.add('hidden'); Accept.dispatchData(secureData, this.responseHandler); @@ -55,14 +57,15 @@ class AuthorizeAuthorizeCard { } responseHandler(response) { - processingOverlay(false); - if (response.messages.resultCode === "Error") { var i = 0; var $errors = $('#errors'); // get the reference of the div $errors.show().html("

" + response.messages.message[i].code + ": " + response.messages.message[i].text + "

"); - + + document.getElementById('card_button').disabled = false; + document.querySelector('#card_button > svg').classList.add('hidden'); + document.querySelector('#card_button > span').classList.remove('hidden'); } else if(response.messages.resultCode === "Ok"){ diff --git a/resources/js/clients/payments/process.js b/resources/js/clients/payments/process.js index 2f00c94d285d..4772de550bff 100644 --- a/resources/js/clients/payments/process.js +++ b/resources/js/clients/payments/process.js @@ -39,7 +39,8 @@ class ProcessStripePayment { this.payNowButton = payNowButton; this.payNowButton.disabled = true; - processingOverlay(true); + this.payNowButton.querySelector('svg').classList.remove('hidden'); + this.payNowButton.querySelector('span').classList.add('hidden'); this.stripe .handleCardPayment(payNowButton.dataset.secret, { @@ -57,11 +58,14 @@ class ProcessStripePayment { completePaymentWithoutToken() { let payNowButton = document.getElementById('pay-now'); this.payNowButton = payNowButton; + + this.payNowButton.disabled = true; + + this.payNowButton.querySelector('svg').classList.remove('hidden'); + this.payNowButton.querySelector('span').classList.add('hidden'); let cardHolderName = document.getElementById('cardholder-name'); - processingOverlay(true); - this.stripe .handleCardPayment(payNowButton.dataset.secret, this.cardElement, { payment_method_data: { @@ -82,8 +86,6 @@ class ProcessStripePayment { } handleSuccess(result) { - processingOverlay(false); - document.querySelector( 'input[name="gateway_response"]' ).value = JSON.stringify(result.paymentIntent); @@ -107,8 +109,9 @@ class ProcessStripePayment { errors.textContent = message; errors.hidden = false; - processingOverlay(false); this.payNowButton.disabled = false; + this.payNowButton.querySelector('svg').classList.add('hidden'); + this.payNowButton.querySelector('span').classList.remove('hidden'); } handle() { diff --git a/resources/js/clients/payments/sofort.js b/resources/js/clients/payments/sofort.js index e5d44f3b0ae7..5e241ab26414 100644 --- a/resources/js/clients/payments/sofort.js +++ b/resources/js/clients/payments/sofort.js @@ -36,14 +36,20 @@ class ProcessSOFORT { document.getElementById('pay-now').addEventListener('submit', (e) => { e.preventDefault(); - processingOverlay(true); - document.getElementById('pay-now').disabled = true; + + document.getElementById('pay-now-button').disabled = true; + document.querySelector('#pay-now-button > svg').classList.remove('hidden'); + document.querySelector('#pay-now-button > span').classList.add('hidden'); this.stripe.createSource(data).then(function(result) { if (result.hasOwnProperty('source')) { return (window.location = result.source.redirect.url); } + document.getElementById('pay-now-button').disabled = false; + document.querySelector('#pay-now-button > svg').classList.add('hidden'); + document.querySelector('#pay-now-button > span').classList.remove('hidden'); + this.errors.textContent = ''; this.errors.textContent = result.error.message; this.errors.hidden = false; diff --git a/resources/views/portal/ninja2020/gateways/authorize/add_credit_card.blade.php b/resources/views/portal/ninja2020/gateways/authorize/add_credit_card.blade.php index 1249b394c48e..62203c115193 100644 --- a/resources/views/portal/ninja2020/gateways/authorize/add_credit_card.blade.php +++ b/resources/views/portal/ninja2020/gateways/authorize/add_credit_card.blade.php @@ -59,8 +59,13 @@
- - +
diff --git a/resources/views/portal/ninja2020/gateways/authorize/credit_card_payment.blade.php b/resources/views/portal/ninja2020/gateways/authorize/credit_card_payment.blade.php index 661bba3e330e..1dbfcf010178 100644 --- a/resources/views/portal/ninja2020/gateways/authorize/credit_card_payment.blade.php +++ b/resources/views/portal/ninja2020/gateways/authorize/credit_card_payment.blade.php @@ -87,7 +87,13 @@
- +
@else @@ -134,19 +140,6 @@ - - - - - - - - - - - - - @endsection @push('footer') @@ -158,5 +151,4 @@ @endif - @endpush \ No newline at end of file diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php index 30a859e0b43e..b824954f6c82 100644 --- a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php +++ b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php @@ -105,7 +105,11 @@
diff --git a/resources/views/portal/ninja2020/gateways/stripe/add_credit_card.blade.php b/resources/views/portal/ninja2020/gateways/stripe/add_credit_card.blade.php index 587ea00a4414..e99e1158eac2 100644 --- a/resources/views/portal/ninja2020/gateways/stripe/add_credit_card.blade.php +++ b/resources/views/portal/ninja2020/gateways/stripe/add_credit_card.blade.php @@ -76,7 +76,11 @@ id="card-button" data-secret="{{ $intent->client_secret }}" class="button button-primary"> - {{ ctrans('texts.save') }} + + {{ __('texts.save') }} diff --git a/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php index fa4a81fae099..33b1bcf6b841 100644 --- a/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php +++ b/resources/views/portal/ninja2020/gateways/stripe/alipay/pay.blade.php @@ -40,8 +40,12 @@
-
diff --git a/resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php b/resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php index e2b40fe4f885..dcce02532b66 100644 --- a/resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php +++ b/resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php @@ -69,11 +69,11 @@ data-token="{{ $token->token }}" id="pay-now-with-token" class="button button-primary inline-flex items-center"> - - {{ ctrans('texts.pay_now') }} + + {{ __('texts.save') }} @else @@ -131,7 +131,11 @@ id="pay-now" data-secret="{{ $intent->client_secret }}" class="button button-primary"> - {{ ctrans('texts.pay_now') }} + + {{ __('texts.save') }} @endif diff --git a/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php index 0bb9511f53b0..d06441e05c60 100644 --- a/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php +++ b/resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php @@ -39,9 +39,13 @@ {{ App\Utils\Number::formatMoney($amount, $client) }} -
+