Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 16:07:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6793 from beganovich/v5-722

Browse Source 
Show company logo on password reset pages
This commit is contained in:
David Bomba 2021-10-08 08:59:05 +11:00 committed by GitHub
commit 3fbfc7b4ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Auth/ContactResetPasswordController.php
View File

@ -67,9 +67,10 @@ class ContactResetPasswordController extends Controller
$account_id = $request->get('account_id'); $account_id = $request->get('account_id');
$account = Account::find($account_id); $account = Account::find($account_id);
$db = $account->companies->first()->db; $db = $account->companies->first()->db;
$company = $account->companies->first();
return $this->render('auth.passwords.reset')->with( return $this->render('auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email, 'account' => $account, 'db' => $db] ['token' => $token, 'email' => $request->email, 'account' => $account, 'db' => $db, 'company' => $company]
); );
} }

4
resources/views/portal/ninja2020/auth/passwords/request.blade.php
View File

@ -16,6 +16,10 @@
<div> <div>
<img src="{{ asset('images/invoiceninja-black-logo-2.png') }}" class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo"> <img src="{{ asset('images/invoiceninja-black-logo-2.png') }}" class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo">
</div> </div>
@elseif(isset($company) && !is_null($company))
<div>
<img src="{{ asset($company->present()->logo()) }}" class="h-14 mb-10" alt="{{ $company->present()->name() }} logo">
</div>
@endif @endif
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-center text-3xl">{{ ctrans('texts.password_recovery') }}</h1> <h1 class="text-center text-3xl">{{ ctrans('texts.password_recovery') }}</h1>

5
resources/views/portal/ninja2020/auth/passwords/reset.blade.php
View File

@ -13,11 +13,14 @@
<div class="{{ $account && !$account->isPaid() ? 'col-span-2' : 'col-span-3' }} h-screen flex"> <div class="{{ $account && !$account->isPaid() ? 'col-span-2' : 'col-span-3' }} h-screen flex">
<div class="m-auto w-1/2 md:w-1/3 lg:w-1/4"> <div class="m-auto w-1/2 md:w-1/3 lg:w-1/4">
@if($account && !$account->isPaid()) @if($account && !$account->isPaid())
<div> <div>
<img src="{{ asset('images/invoiceninja-black-logo-2.png') }}" class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo"> <img src="{{ asset('images/invoiceninja-black-logo-2.png') }}" class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo">
</div> </div>
@elseif(isset($company) && !is_null($company))
<div>
<img src="{{ asset($company->present()->logo()) }}" class="h-14 mb-10" alt="{{ $company->present()->name() }} logo">
</div>
@endif @endif
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-center text-3xl">{{ ctrans('texts.password_recovery') }}</h1> <h1 class="text-center text-3xl">{{ ctrans('texts.password_recovery') }}</h1>