Setup improvements:

- Disable Test PDF button while network request loading
- Return correct public/test.pdf file path

app/Http/Controllers/SetupController.php

@@ -229,7 +229,7 @@ class SetupController extends Controller
 
             Storage::put('public/test.pdf', $pdf);
 
-            return response(['url' => asset('storage/test.pdf')], 200);
+            return response(['url' => asset('test.pdf')], 200);
         } catch (Exception $e) {
             info($e->getMessage());
 

public/js/clients/payments/stripe-sofort.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-sofort.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=6)}({6:function(e,t,n){e.exports=n("RFiP")},RFiP:function(e,t){function n(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),n(this,"setupStripe",(function(){return r.stripe=Stripe(r.key),r})),n(this,"handle",(function(){var e={type:"sofort",amount:document.querySelector('meta[name="amount"]').content,currency:"eur",redirect:{return_url:document.querySelector('meta[name="return-url"]').content},sofort:{country:document.querySelector('meta[name="country"').content}};document.getElementById("pay-now").addEventListener("click",(function(t){document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > 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").disabled=!1,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden"),this.errors.textContent="",this.errors.textContent=e.error.message,this.errors.hidden=!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()}});
+!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=6)}({6:function(e,t,n){e.exports=n("RFiP")},RFiP:function(e,t){function n(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),n(this,"setupStripe",(function(){return r.stripe=Stripe(r.key),r})),n(this,"handle",(function(){var e={type:"sofort",amount:document.querySelector('meta[name="amount"]').content,currency:"eur",redirect:{return_url:document.querySelector('meta[name="return-url"]').content},sofort:{country:document.querySelector('meta[name="country"]').content}};document.getElementById("pay-now").addEventListener("click",(function(t){document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > 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").disabled=!1,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden"),this.errors.textContent="",this.errors.textContent=e.error.message,this.errors.hidden=!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()}});

public/mix-manifest.json

@@ -10,11 +10,11 @@
     "/js/clients/payments/stripe-ach.js": "/js/clients/payments/stripe-ach.js?id=c4012ad90f17d60432ad",
     "/js/clients/payments/stripe-alipay.js": "/js/clients/payments/stripe-alipay.js?id=6dbe9316b98deea55421",
     "/js/clients/payments/stripe-credit-card.js": "/js/clients/payments/stripe-credit-card.js?id=f4659d26a26d2f408397",
-    "/js/clients/payments/stripe-sofort.js": "/js/clients/payments/stripe-sofort.js?id=bb7c55ca3da2d29e55d2",
+    "/js/clients/payments/stripe-sofort.js": "/js/clients/payments/stripe-sofort.js?id=9b9fd56d655ad238f149",
     "/js/clients/quotes/action-selectors.js": "/js/clients/quotes/action-selectors.js?id=1b8f9325aa6e8595e7fa",
     "/js/clients/quotes/approve.js": "/js/clients/quotes/approve.js?id=85bcae0a646882e56b12",
     "/js/clients/shared/multiple-downloads.js": "/js/clients/shared/multiple-downloads.js?id=5c35d28cf0a3286e7c45",
     "/js/clients/shared/pdf.js": "/js/clients/shared/pdf.js?id=fa54bb4229aba6b0817c",
-    "/js/setup/setup.js": "/js/setup/setup.js?id=b264d828086fdf87b710",
+    "/js/setup/setup.js": "/js/setup/setup.js?id=29e88ab480038cba57df",
     "/css/card-js.min.css": "/css/card-js.min.css?id=62afeb675235451543ad"
 }

resources/js/setup/setup.js

@@ -25,13 +25,18 @@ class Setup {
     handleDatabaseCheck() {
         let data = {
             db_host: document.querySelector('input[name="db_host"]').value,
-            db_database: document.querySelector('input[name="db_database"]').value,
-            db_username: document.querySelector('input[name="db_username"]').value,
-            db_password: document.querySelector('input[name="db_password"]').value,
+            db_database: document.querySelector('input[name="db_database"]')
+                .value,
+            db_username: document.querySelector('input[name="db_username"]')
+                .value,
+            db_password: document.querySelector('input[name="db_password"]')
+                .value,
         };
 
         Axios.post('/setup/check_db', data)
-            .then((response) => this.handleSuccess(this.checkDbAlert, 'mail-wrapper'))
+            .then((response) =>
+                this.handleSuccess(this.checkDbAlert, 'mail-wrapper')
+            )
             .catch((e) =>
                 this.handleFailure(this.checkDbAlert, e.response.data.message)
             );
@@ -39,7 +44,8 @@ class Setup {
 
     handleSmtpCheck() {
         let data = {
-            mail_driver: document.querySelector('select[name="mail_driver"]').value,
+            mail_driver: document.querySelector('select[name="mail_driver"]')
+                .value,
             mail_name: document.querySelector('input[name="mail_name"]').value,
             mail_address: document.querySelector('input[name="mail_address"]')
                 .value,
@@ -59,7 +65,7 @@ class Setup {
             this.handleSuccess(this.checkSmtpAlert, 'account-wrapper');
             this.handleSuccess(this.checkSmtpAlert, 'submit-wrapper');
 
-            return this.checkSmtpButton.disabled = false;
+            return (this.checkSmtpButton.disabled = false);
         }
 
         Axios.post('/setup/check_mail', data)
@@ -74,13 +80,18 @@ class Setup {
     }
 
     handleTestPdfCheck() {
+        this.checkPdfButton.disabled = true;
+
         Axios.post('/setup/check_pdf', {})
             .then((response) => {
                 try {
                     let win = window.open(response.data.url, '_blank');
                     win.focus();
 
-                    return this.handleSuccess(this.checkPdfAlert, 'database-wrapper');
+                    return this.handleSuccess(
+                        this.checkPdfAlert,
+                        'database-wrapper'
+                    );
                 } catch (error) {
                     this.handleSuccess(this.checkPdfAlert, 'database-wrapper');
                     this.checkPdfAlert.textContent = `Success! You can preview test PDF here: ${response.data.url}`;
@@ -89,7 +100,8 @@ class Setup {
             .catch((error) => {
                 console.log(error);
                 this.handleFailure(this.checkPdfAlert);
-            });
+            })
+            .finally(() => (this.checkPdfButton.disabled = false));
     }
 
     handleSuccess(element, nextStep = null) {
@@ -99,7 +111,9 @@ class Setup {
 
         if (nextStep) {
             document.getElementById(nextStep).classList.remove('hidden');
-            document.getElementById(nextStep).scrollIntoView({behavior: 'smooth', block: 'center'});
+            document
+                .getElementById(nextStep)
+                .scrollIntoView({ behavior: 'smooth', block: 'center' });
         }
     }