diff --git a/resources/assets/js/helpers/utilities.js b/resources/assets/js/helpers/utilities.js index be9afd51..9bbae1d9 100644 --- a/resources/assets/js/helpers/utilities.js +++ b/resources/assets/js/helpers/utilities.js @@ -128,6 +128,14 @@ export default { }, checkValidUrl(url) { + if ( + url.includes('http://localhost') || + url.includes('http://127.0.0.1') || + url.includes('https://localhost') || + url.includes('https://127.0.0.1') + ) { + return true + } let pattern = new RegExp( '^(https?:\\/\\/)?' + // protocol '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name diff --git a/resources/views/emails/send/estimate.blade.php b/resources/views/emails/send/estimate.blade.php index 685b5d6f..6306bd0e 100644 --- a/resources/views/emails/send/estimate.blade.php +++ b/resources/views/emails/send/estimate.blade.php @@ -16,7 +16,7 @@ {{-- Subcopy --}} @slot('subcopy') @component('mail::subcopy') - You have received a new estimate from {{$data['company']['name']}} + You have received a new estimate from {{$data['company']['name']}} @component('mail::button', ['url' => url('/customer/estimates/pdf/'.$data['estimate']['unique_hash'])]) View Estimate @endcomponent diff --git a/resources/views/emails/send/invoice.blade.php b/resources/views/emails/send/invoice.blade.php index e57c885f..8488e7f6 100644 --- a/resources/views/emails/send/invoice.blade.php +++ b/resources/views/emails/send/invoice.blade.php @@ -16,7 +16,7 @@ {{-- Subcopy --}} @slot('subcopy') @component('mail::subcopy') - You have received a new invoice from {{$data['company']['name']}} + You have received a new invoice from {{$data['company']['name']}} @component('mail::button', ['url' => url('/customer/invoices/pdf/'.$data['invoice']['unique_hash'])]) View Invoice @endcomponent diff --git a/resources/views/emails/send/payment.blade.php b/resources/views/emails/send/payment.blade.php index e3384325..487e9e9b 100644 --- a/resources/views/emails/send/payment.blade.php +++ b/resources/views/emails/send/payment.blade.php @@ -16,7 +16,7 @@ {{-- Subcopy --}} @slot('subcopy') @component('mail::subcopy') - You have received a new payment from {{$data['company']['name']}} + You have received a new payment from {{$data['company']['name']}} @component('mail::button', ['url' => url('/payments/pdf/'.$data['payment']['unique_hash'])]) View Payment @endcomponent diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css index 94aa08dd..dd8c752e 100644 --- a/resources/views/vendor/mail/html/themes/default.css +++ b/resources/views/vendor/mail/html/themes/default.css @@ -158,8 +158,6 @@ img { } .subcopy p { - display: flex; - justify-content: center; text-align: center; font-size: 20px; }