Merge pull request #6282 from beganovich/v5-575

(v5) Make Invoice Ninja link clickable in footer
This commit is contained in:
Benjamin Beganović 2021-07-16 09:59:36 +02:00 committed by GitHub
commit 008c236a48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions

View File

@ -6,6 +6,7 @@
- Client portal: Remove "Approve" button from single quote page if quote is non-approvable - Client portal: Remove "Approve" button from single quote page if quote is non-approvable
- Client portal: Hide "Pay now" buttons if no gateways are configured - Client portal: Hide "Pay now" buttons if no gateways are configured
- Client portal: "Download" and "Open in new tab" buttons on documents show page - Client portal: "Download" and "Open in new tab" buttons on documents show page
- Client portal: Make "Invoice Ninja" link clickable in footer
## Fixed: ## Fixed:
- Client portal: Showing message instead of blank page when trying to download zero quotes - Client portal: Showing message instead of blank page when trying to download zero quotes

View File

@ -4280,6 +4280,7 @@ $LANG = array(
'you_might_be_interested_in_following' => 'You might be interested in following', 'you_might_be_interested_in_following' => 'You might be interested in following',
'quotes_with_status_sent_can_be_approved' => 'Only quotes with "Sent" status can be approved.', 'quotes_with_status_sent_can_be_approved' => 'Only quotes with "Sent" status can be approved.',
'no_quotes_available_for_download' => 'No quotes available for download.', 'no_quotes_available_for_download' => 'No quotes available for download.',
'copyright' => 'Copyright',
); );
return $LANG; return $LANG;

View File

@ -1,10 +1,17 @@
<footer class="bg-white px-4 py-5 shadow px-4 sm:px-6 md:px-8 flex justify-center border-t border-gray-200 justify-between items-center" x-data="{ privacy: false, tos: false }"> <footer class="bg-white px-4 py-5 shadow px-4 sm:px-6 md:px-8 flex justify-center border-t border-gray-200 justify-between items-center" x-data="{ privacy: false, tos: false }">
<section> <section>
<span class="text-xs md:text-sm text-gray-700">{{ ctrans('texts.footer_label', ['company' => auth('contact')->user() ? (auth('contact')->user()->user->account->isPaid() ? auth('contact')->user()->company->present()->name() : 'Invoice Ninja') : 'Invoice Ninja', 'year' => date('Y')]) }}</span> @if(auth('contact')->user() && auth('contact')->user()->user->account->isPaid())
<span class="text-xs md:text-sm text-gray-700">{{ ctrans('texts.footer_label', ['company' => auth('contact')->user()->company->present()->name(), 'year' => date('Y')]) }}</span>
@else
<span href="https://invoiceninja.com" target="_blank" class="text-xs md:text-sm text-gray-700">
{{ ctrans('texts.copyright') }} &copy; {{ date('Y') }}
<a class="text-primary hover:underline" href="https://invoiceninja.com" target="_blank">Invoice Ninja</a>.
</span>
@endif
<div class="flex items-center space-x-2"> <div class="flex items-center">
@if(strlen($client->getSetting('client_portal_privacy_policy')) > 1) @if(strlen($client->getSetting('client_portal_privacy_policy')) > 1)
<a x-on:click="privacy = true; tos = false" href="#" class="button-link text-sm primary-color flex items-center">{{ __('texts.privacy_policy')}}</a> <a x-on:click="privacy = true; tos = false" href="#" class="hover:underline text-sm primary-color flex items-center mr-2">{{ __('texts.privacy_policy')}}</a>
@endif @endif
@if(strlen($client->getSetting('client_portal_privacy_policy')) > 1 && strlen($client->getSetting('client_portal_terms')) > 1) @if(strlen($client->getSetting('client_portal_privacy_policy')) > 1 && strlen($client->getSetting('client_portal_terms')) > 1)
@ -14,7 +21,7 @@
@endif @endif
@if(strlen($client->getSetting('client_portal_terms')) > 1) @if(strlen($client->getSetting('client_portal_terms')) > 1)
<a x-on:click="privacy = false; tos = true" href="#" class="button-link text-sm primary-color flex items-center">{{ __('texts.terms')}}</a> <a x-on:click="privacy = false; tos = true" href="#" class="hover:underline text-sm primary-color flex items-center mr-2">{{ __('texts.terms')}}</a>
@endif @endif
</div> </div>
</section> </section>