mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
fix for presenting company logo in portal
This commit is contained in:
David Bomba
parent
b2b464fb9e
commit
249c0e8b2b
@ -88,9 +88,11 @@ class InvoiceItemSum
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Don't round the cost x qty - will allow us to use higher precision costs */
|
||||||
private function sumLineItem()
|
private function sumLineItem()
|
||||||
{ //todo need to support quantities less than the precision amount
|
{ //todo need to support quantities less than the precision amount
|
||||||
$this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision));
|
// $this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision));
|
||||||
|
$this->setLineTotal($this->item->cost * $this->item->quantity);
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
@ -112,8 +114,8 @@ class InvoiceItemSum
|
|||||||
{
|
{
|
||||||
$item_tax = 0;
|
$item_tax = 0;
|
||||||
|
|
||||||
// info(print_r($this->item,1));
|
// nlog(print_r($this->item,1));
|
||||||
// info(print_r($this->invoice,1));
|
// nlog(print_r($this->invoice,1));
|
||||||
|
|
||||||
$amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / 100));
|
$amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / 100));
|
||||||
$item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount);
|
$item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount);
|
||||||
|
|||||||
@ -36,7 +36,7 @@ class CompanyPresenter extends EntityPresenter
|
|||||||
$settings = $this->entity->settings;
|
$settings = $this->entity->settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (strlen($settings->company_logo) > 0) ? url($settings->company_logo) : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
|
return (strlen($settings->company_logo) > 0) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function address($settings = null)
|
public function address($settings = null)
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
@component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel])
|
@component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel])
|
||||||
|
|
||||||
@slot('header')
|
@slot('header')
|
||||||
@component('email.components.header', ['p' => $body, 'logo' => $settings->company_logo ?: 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
|
@component('email.components.header', ['p' => $body, 'logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
|
||||||
|
|
||||||
@if(isset($title))
|
@if(isset($title))
|
||||||
{{$title}}
|
{{$title}}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
|
@component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
|
||||||
|
|
||||||
@slot('header')
|
@slot('header')
|
||||||
@component('email.components.header', ['p' => $body, 'logo' => $settings->company_logo ?: 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
|
@component('email.components.header', ['p' => $body, (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
|
||||||
|
|
||||||
@if(isset($title))
|
@if(isset($title))
|
||||||
{{$title}}
|
{{$title}}
|
||||||
|
|||||||
@ -1,137 +0,0 @@
|
|||||||
<body class="app header-fixed sidebar-fixed aside-menu-fixed sidebar-lg-show">
|
|
||||||
<header class="app-header navbar">
|
|
||||||
<button class="navbar-toggler sidebar-toggler d-lg-none mr-auto" type="button" data-toggle="sidebar-show">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<a class="navbar-brand" href="https://invoiceninja.com">
|
|
||||||
<img class="navbar-brand-full" src="/images/logo.png" width="50" height="50" alt="Invoice Ninja Logo">
|
|
||||||
<img class="navbar-brand-minimized" src="/images/logo.png" width="30" height="30" alt="Invoice Ninja Logo">
|
|
||||||
</a>
|
|
||||||
<button class="sidebar-minimizer brand-minimizer" type="button">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<ul class="nav navbar-nav ml-auto">
|
|
||||||
<li class="nav-item dropdown d-md-down-none" style="padding-left:20px; padding-right: 20px;">
|
|
||||||
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
|
|
||||||
<i class="icon-list"></i>
|
|
||||||
<span class="badge badge-pill badge-warning">15</span>
|
|
||||||
</a>
|
|
||||||
<div class="dropdown-menu dropdown-menu-right dropdown-menu-lg">
|
|
||||||
<div class="dropdown-header text-center">
|
|
||||||
<strong>You have 5 pending tasks</strong>
|
|
||||||
</div>
|
|
||||||
<a class="dropdown-item" href="#">
|
|
||||||
<div class="small mb-1">Mr Miyagi todos
|
|
||||||
<span class="float-right">
|
|
||||||
<strong>0%</strong>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<span class="progress progress-xs">
|
|
||||||
<div class="progress-bar bg-info" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
<a class="dropdown-item" href="#">
|
|
||||||
<div class="small mb-1">First, wash all car.
|
|
||||||
<span class="float-right">
|
|
||||||
<strong>25%</strong>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<span class="progress progress-xs">
|
|
||||||
<div class="progress-bar bg-danger" role="progressbar" style="width: 25%" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100"></div>
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
<a class="dropdown-item" href="#">
|
|
||||||
<div class="small mb-1">Then wax. Wax on...
|
|
||||||
<span class="float-right">
|
|
||||||
<strong>50%</strong>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<span class="progress progress-xs">
|
|
||||||
<div class="progress-bar bg-warning" role="progressbar" style="width: 50%" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
<a class="dropdown-item" href="#">
|
|
||||||
<div class="small mb-1">No questions!
|
|
||||||
<span class="float-right">
|
|
||||||
<strong>75%</strong>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<span class="progress progress-xs">
|
|
||||||
<div class="progress-bar bg-info" role="progressbar" style="width: 75%" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100"></div>
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
<a class="dropdown-item" href="#">
|
|
||||||
<div class="small mb-1">Wax on... wax off. Wax on... wax off.
|
|
||||||
<span class="float-right">
|
|
||||||
<strong>100%</strong>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<span class="progress progress-xs">
|
|
||||||
<div class="progress-bar bg-success" role="progressbar" style="width: 100%" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
<a class="dropdown-item text-center" href="#">
|
|
||||||
<strong>View all tasks</strong>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item dropdown d-md-down-none" style="padding-left:20px; padding-right: 20px;">
|
|
||||||
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
|
|
||||||
<i class="fa fa-building" aria-hidden="true"></i> {{ $current_company->present()->name() }}
|
|
||||||
</a>
|
|
||||||
<div class="dropdown-menu dropdown-menu-right dropdown-menu-lg">
|
|
||||||
<div class="dropdown-header text-center">
|
|
||||||
<strong>trans('texts.manage_companies')</strong>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@foreach($companies as $company) <!-- List all remaining companies here-->
|
|
||||||
<a class="dropdown-item" href="#">
|
|
||||||
<div class="small mb-1">{{ $company->present()->name }}
|
|
||||||
<span class="float-right">
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<span class="progress progress-xs">
|
|
||||||
<div class="progress-bar bg-info" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
@endforeach
|
|
||||||
|
|
||||||
<div class="dropdown-divider"></div>
|
|
||||||
|
|
||||||
<!-- Add Company-->
|
|
||||||
@if(count($companies) < 5)
|
|
||||||
<a class="dropdown-item" href="{{ route('user.logout') }}">
|
|
||||||
<i class="fa fa-plus"></i> trans('texts.add_company')</a>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item dropdown">
|
|
||||||
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
|
|
||||||
<img class="img-avatar" src="/images/logo.png" alt=""> {{ auth()->user()->present()->name }}
|
|
||||||
</a>
|
|
||||||
<div class="dropdown-menu dropdown-menu-right">
|
|
||||||
<div class="dropdown-header text-center">
|
|
||||||
<strong>Settings</strong>
|
|
||||||
</div>
|
|
||||||
<a class="dropdown-item" href="#">
|
|
||||||
<i class="fa fa-user"></i> Profile</a>
|
|
||||||
<a class="dropdown-item" href="{{ route('user.settings') }}">
|
|
||||||
<i class="fa fa-wrench"></i> trans('texts.settings')</a>
|
|
||||||
|
|
||||||
<div class="dropdown-divider"></div>
|
|
||||||
<a class="dropdown-item" href="{{ route('user.logout') }}">
|
|
||||||
<i class="fa fa-lock"></i> Logout</a>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<button class="navbar-toggler aside-menu-toggler d-md-down-none" type="button" data-toggle="aside-menu-lg-show">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<button class="navbar-toggler aside-menu-toggler d-lg-none" type="button" data-toggle="aside-menu-show">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
</header>
|
|
||||||
<div class="app-body">
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
<div class="flex flex-col w-64">
|
<div class="flex flex-col w-64">
|
||||||
<div class="flex items-center h-16 flex-shrink-0 px-4 bg-primary-darken justify-center">
|
<div class="flex items-center h-16 flex-shrink-0 px-4 bg-primary-darken justify-center">
|
||||||
<a href="{{ route('client.dashboard') }}">
|
<a href="{{ route('client.dashboard') }}">
|
||||||
<img class="h-8 w-auto" src="{!! $settings->company_logo ?: asset('images/invoiceninja-white-logo.png') !!}" alt="{{ config('app.name') }}" />
|
<img class="h-8 w-auto" src="{!! url('') . $settings->company_logo ?: asset('images/invoiceninja-white-logo.png') !!}" alt="{{ config('app.name') }}" />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="h-0 flex-1 flex flex-col overflow-y-auto">
|
<div class="h-0 flex-1 flex flex-col overflow-y-auto">
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-shrink-0 flex items-center px-4">
|
<div class="flex-shrink-0 flex items-center px-4">
|
||||||
<img class="h-6 w-auto" src="{!! $settings->company_logo ?: asset('images/invoiceninja-white-logo.png') !!}" alt="{{ config('app.name') }}" />
|
<img class="h-6 w-auto" src="{!! url($settings->company_logo) ?: asset('images/invoiceninja-white-logo.png') !!}" alt="{{ config('app.name') }}" />
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-5 flex-1 h-0 overflow-y-auto">
|
<div class="mt-5 flex-1 h-0 overflow-y-auto">
|
||||||
<nav class="flex-1 py-4 bg-primary">
|
<nav class="flex-1 py-4 bg-primary">
|
||||||
|
|||||||
@ -1,68 +0,0 @@
|
|||||||
<div class="sidebar">
|
|
||||||
<nav class="sidebar-nav">
|
|
||||||
<ul class="nav">
|
|
||||||
|
|
||||||
<li class="nav-item ">
|
|
||||||
<a class="nav-link" href="{{ route('dashboard.index') }}">
|
|
||||||
<i class="nav-icon icon-speedometer"></i> @lang('texts.dashboard')
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="/clients">
|
|
||||||
<i class="nav-icon icon-user"></i> @lang('texts.clients')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="{{ route('invoices.index') }}">
|
|
||||||
<i class="nav-icon icon-notebook"></i> @lang('texts.invoices')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-wallet"></i> @lang('texts.payments')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-docs"></i> @lang('texts.recurring')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-badge"></i> @lang('texts.credits')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-vector"></i> @lang('texts.quotes')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-wrench"></i> @lang('texts.projects')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-grid"></i> @lang('texts.tasks')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-envelope-open"></i> @lang('texts.expenses')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-bell"></i> @lang('texts.vendors')</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link" href="typography.html">
|
|
||||||
<i class="nav-icon icon-printer"></i> @lang('texts.reports')</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
<button class="sidebar-minimizer brand-minimizer" type="button"></button>
|
|
||||||
</div>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user