shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #47

Browse Source
This commit is contained in:
denisdulici
2017-10-31 22:41:06 +03:00
parent 0c1e026bb5
commit 6d246f03e4
12 changed files with 74 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/expenses/bills/bill.blade.php
View File

@ -7,9 +7,9 @@
<div class="row invoice-header">
<div class="col-xs-7">
@if (setting('general.invoice_logo'))
<img src="{{ asset(setting('general.invoice_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
@else
<img src="{{ asset(setting('general.company_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
@endif
</div>
<div class="col-xs-5 invoice-company">

4
resources/views/expenses/bills/show.blade.php
View File

@ -10,9 +10,9 @@
<div class="row invoice-header">
<div class="col-xs-7">
@if (setting('general.invoice_logo'))
<img src="{{ asset(setting('general.invoice_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
@else
<img src="{{ asset(setting('general.company_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
@endif
</div>
<div class="col-xs-5 invoice-company">

4
resources/views/incomes/invoices/create.blade.php
View File

@ -16,9 +16,9 @@
{{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '']) }}
{{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file-text-o') }}
{{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file-text-o', ['required' => 'required'], $number) }}
{{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart',[]) }}
{{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart', []) }}
<div class="form-group col-md-12">
{!! Form::label('items', 'Items', ['class' => 'control-label']) !!}

4
resources/views/incomes/invoices/invoice.blade.php
View File

@ -7,9 +7,9 @@
<div class="row invoice-header">
<div class="col-xs-7">
@if (setting('general.invoice_logo'))
<img src="{{ asset(setting('general.invoice_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
@else
<img src="{{ asset(setting('general.company_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
@endif
</div>
<div class="col-xs-5 invoice-company">

4
resources/views/incomes/invoices/show.blade.php
View File

@ -10,9 +10,9 @@
<div class="row invoice-header">
<div class="col-xs-7">
@if (setting('general.invoice_logo'))
<img src="{{ asset(setting('general.invoice_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
@else
<img src="{{ asset(setting('general.company_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
@endif
</div>
<div class="col-xs-5 invoice-company">

6
resources/views/settings/settings/edit.blade.php
View File

@ -50,11 +50,11 @@
</div>
<div class="tab-pane tab-margin" id="invoice">
{{ Form::textGroup('invoice_prefix', trans('settings.invoice.prefix'), 'font', []) }}
{{ Form::textGroup('invoice_number_prefix', trans('settings.invoice.prefix'), 'font', []) }}
{{ Form::textGroup('invoice_digit', trans('settings.invoice.digit'), 'text-width', []) }}
{{ Form::textGroup('invoice_number_digit', trans('settings.invoice.digit'), 'text-width', []) }}
{{ Form::textGroup('invoice_start', trans('settings.invoice.start'), 'chevron-right', []) }}
{{ Form::textGroup('invoice_number_next', trans('settings.invoice.next'), 'chevron-right', []) }}
{{ Form::fileGroup('invoice_logo', trans('settings.invoice.logo')) }}
</div>