TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into refactor-new-issues

Browse Source
This commit is contained in:
Mohit Panjwani
2020-05-30 21:36:49 +05:30
parent bd9beaa343 ca90ff2767
commit 09bbf98e61
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/assets/js/helpers/utilities.js
View File

@ -128,6 +128,14 @@ export default {
}, },
checkValidUrl(url) { 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( let pattern = new RegExp(
'^(https?:\\/\\/)?' + // protocol '^(https?:\\/\\/)?' + // protocol
'((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name

2
resources/views/emails/send/estimate.blade.php
View File

@ -16,7 +16,7 @@
{{-- Subcopy --}} {{-- Subcopy --}}
@slot('subcopy') @slot('subcopy')
@component('mail::subcopy') @component('mail::subcopy')
You have received a new estimate from <span class="company-name">{{$data['company']['name']}}</span> You have received a new estimate from <b>{{$data['company']['name']}}</b>
@component('mail::button', ['url' => url('/customer/estimates/pdf/'.$data['estimate']['unique_hash'])]) @component('mail::button', ['url' => url('/customer/estimates/pdf/'.$data['estimate']['unique_hash'])])
View Estimate View Estimate
@endcomponent @endcomponent

2
resources/views/emails/send/invoice.blade.php
View File

@ -16,7 +16,7 @@
{{-- Subcopy --}} {{-- Subcopy --}}
@slot('subcopy') @slot('subcopy')
@component('mail::subcopy') @component('mail::subcopy')
You have received a new invoice from <span class="company-name">{{$data['company']['name']}}</span> You have received a new invoice from <b>{{$data['company']['name']}}</b>
@component('mail::button', ['url' => url('/customer/invoices/pdf/'.$data['invoice']['unique_hash'])]) @component('mail::button', ['url' => url('/customer/invoices/pdf/'.$data['invoice']['unique_hash'])])
View Invoice View Invoice
@endcomponent @endcomponent

2
resources/views/emails/send/payment.blade.php
View File

@ -16,7 +16,7 @@
{{-- Subcopy --}} {{-- Subcopy --}}
@slot('subcopy') @slot('subcopy')
@component('mail::subcopy') @component('mail::subcopy')
You have received a new payment from <span class="company-name">{{$data['company']['name']}}</span> You have received a new payment from <b>{{$data['company']['name']}}</b>
@component('mail::button', ['url' => url('/payments/pdf/'.$data['payment']['unique_hash'])]) @component('mail::button', ['url' => url('/payments/pdf/'.$data['payment']['unique_hash'])])
View Payment View Payment
@endcomponent @endcomponent

2
resources/views/vendor/mail/html/themes/default.css vendored
View File

@ -158,8 +158,6 @@ img {
} }
.subcopy p { .subcopy p {
display: flex;
justify-content: center;
text-align: center; text-align: center;
font-size: 20px; font-size: 20px;
} }