Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 04:07:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for show/hide invitation key

Browse Source
This commit is contained in:
David Bomba 2022-02-16 10:47:54 +11:00
parent 1efe0fb992
commit 682ba68120
7 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientPortal/CreditController.php
View File

@ -34,7 +34,7 @@ class CreditController extends Controller
$data = [ $data = [
'credit' => $credit, 'credit' => $credit,
'key' => $invitation->key 'key' => $invitation ? $invitation->key : false
]; ];
if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) { if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) {

4
app/Http/Controllers/ClientPortal/InvoiceController.php
View File

@ -61,7 +61,7 @@ class InvoiceController extends Controller
$invoice->service()->removeUnpaidGatewayFees()->save(); $invoice->service()->removeUnpaidGatewayFees()->save();
$invitation = $invoice->invitations()->where('client_contact_id', auth()->user()->id)->first(); $invitation = $invoice->invitations()->where('client_contact_id', auth()->guard('contact')->user()->id)->first();
if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) { if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) {
@ -74,7 +74,7 @@ class InvoiceController extends Controller
$data = [ $data = [
'invoice' => $invoice, 'invoice' => $invoice,
'key' => $invitation->key 'key' => $invitation ? $invitation->key : false
]; ];
if ($request->query('mode') === 'fullscreen') { if ($request->query('mode') === 'fullscreen') {

2
app/Http/Controllers/ClientPortal/QuoteController.php
View File

@ -63,7 +63,7 @@ class QuoteController extends Controller
$data = [ $data = [
'quote' => $quote, 'quote' => $quote,
'key' => $invitation->key, 'key' => $invitation ? $invitation->key : false,
]; ];
if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) { if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) {

4
resources/views/portal/ninja2020/credits/show.blade.php
View File

@ -17,12 +17,14 @@
{{ ctrans('texts.entity_number_placeholder', ['entity' => ctrans('texts.credit'), 'entity_number' => $credit->number]) }} {{ ctrans('texts.entity_number_placeholder', ['entity' => ctrans('texts.credit'), 'entity_number' => $credit->number]) }}
</h3> </h3>
<div class="btn" data-clipboard-text="{{url("client/credit/{$key}")}}" aria-label="Copied!"> @if($key)
<div class="btn hidden md:block" data-clipboard-text="{{url("client/credit/{$key}")}}" aria-label="Copied!">
<div class="flex text-sm leading-6 font-medium text-gray-500"> <div class="flex text-sm leading-6 font-medium text-gray-500">
<p class="mr-2">{{url("client/credit/{$key}")}}</p> <p class="mr-2">{{url("client/credit/{$key}")}}</p>
<p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p> <p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p>
</div> </div>
</div> </div>
@endif
</div> </div>
</div> </div>

9
resources/views/portal/ninja2020/invoices/show.blade.php
View File

@ -40,12 +40,15 @@
- {{ ctrans('texts.unpaid') }} - {{ ctrans('texts.unpaid') }}
</h3> </h3>
<div class="btn" data-clipboard-text="{{url("client/invoice/{$key}")}}" aria-label="Copied!"> @if($key)
<div class="btn hidden md:block" data-clipboard-text="{{url("client/invoice/{$key}")}}" aria-label="Copied!">
<div class="flex text-sm leading-6 font-medium text-gray-500"> <div class="flex text-sm leading-6 font-medium text-gray-500">
<p class="mr-2">{{url("client/invoice/{$key}")}}</p> <p class="mr-2">{{url("client/invoice/{$key}")}}</p>
<p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p> <p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p>
</div> </div>
</div> </div>
@endif
</div> </div>
<div class="mt-5 sm:mt-0 sm:ml-6 flex justify-end"> <div class="mt-5 sm:mt-0 sm:ml-6 flex justify-end">
@ -74,12 +77,14 @@
- {{ \App\Models\Invoice::stringStatus($invoice->status_id) }} - {{ \App\Models\Invoice::stringStatus($invoice->status_id) }}
</h3> </h3>
<div class="btn" data-clipboard-text="{{url("client/invoice/{$key}")}}" aria-label="Copied!"> @if($key)
<div class="btn hidden md:block" data-clipboard-text="{{url("client/invoice/{$key}")}}" aria-label="Copied!">
<div class="flex text-sm leading-6 font-medium text-gray-500"> <div class="flex text-sm leading-6 font-medium text-gray-500">
<p class="pr-10">{{url("client/invoice/{$key}")}}</p> <p class="pr-10">{{url("client/invoice/{$key}")}}</p>
<p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p> <p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p>
</div> </div>
</div> </div>
@endif
</div> </div>
</div> </div>
</div> </div>

2
resources/views/portal/ninja2020/quotes/includes/actions.blade.php
View File

@ -15,7 +15,7 @@
{{ ctrans('texts.approve') }} {{ ctrans('texts.approve') }}
</h3> </h3>
<div class="btn" data-clipboard-text="{{url("client/quote/{$key}")}}" aria-label="Copied!"> <div class="btn hidden md:block" data-clipboard-text="{{url("client/quote/{$key}")}}" aria-label="Copied!">
<div class="flex text-sm leading-6 font-medium text-gray-500"> <div class="flex text-sm leading-6 font-medium text-gray-500">
<p class="mr-2">{{url("client/quote/{$key}")}}</p> <p class="mr-2">{{url("client/quote/{$key}")}}</p>
<p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p> <p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p>

13
resources/views/portal/ninja2020/quotes/show.blade.php
View File

@ -35,12 +35,15 @@
{{ ctrans('texts.approved') }} {{ ctrans('texts.approved') }}
</h3> </h3>
<div class="btn" data-clipboard-text="{{url("client/quote/{$key}")}}" aria-label="Copied!"> @if($key)
<div class="btn hidden md:block" data-clipboard-text="{{url("client/quote/{$key}")}}" aria-label="Copied!">
<div class="flex text-sm leading-6 font-medium text-gray-500"> <div class="flex text-sm leading-6 font-medium text-gray-500">
<p class="mr-2">{{url("client/quote/{$key}")}}</p> <p class="mr-2">{{url("client/quote/{$key}")}}</p>
<p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p> <p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p>
</div> </div>
</div> </div>
@endif
</div> </div>
</div> </div>
</div> </div>
@ -56,12 +59,14 @@
{{ ctrans('texts.approved') }} {{ ctrans('texts.approved') }}
</h3> </h3>
<div class="btn" data-clipboard-text="{{url("client/quote/{$key}")}}" aria-label="Copied!"> @if($key)
<div class="btn hidden md:block" data-clipboard-text="{{url("client/quote/{$key}")}}" aria-label="Copied!">
<div class="flex text-sm leading-6 font-medium text-gray-500"> <div class="flex text-sm leading-6 font-medium text-gray-500">
<p class="mr-2">{{url("client/quote/{$key}")}}</p> <p class="mr-2">{{url("client/quote/{$key}")}}</p>
<p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p> <p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p>
</div> </div>
</div> </div>
@endif
</div> </div>
</div> </div>
</div> </div>
@ -76,12 +81,14 @@
{{ ctrans('texts.expired') }} {{ ctrans('texts.expired') }}
</h3> </h3>
<div class="btn" data-clipboard-text="{{url("client/quote/{$key}")}}" aria-label="Copied!"> @if($key)
<div class="btn hidden md:block" data-clipboard-text="{{url("client/quote/{$key}")}}" aria-label="Copied!">
<div class="flex text-sm leading-6 font-medium text-gray-500"> <div class="flex text-sm leading-6 font-medium text-gray-500">
<p class="mr-2">{{url("client/quote/{$key}")}}</p> <p class="mr-2">{{url("client/quote/{$key}")}}</p>
<p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p> <p><img class="h-5 w-5" src="{{ asset('assets/clippy.svg') }}" alt="Copy to clipboard"></p>
</div> </div>
</div> </div>
@endif
</div> </div>
</div> </div>
</div> </div>