Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev
# Conflicts: # app/Http/Controllers/Common/Items.php # resources/views/modules/item/documentation.blade.php # resources/views/modules/item/show.blade.php # resources/views/partials/admin/header.blade.php # resources/views/purchases/bills/show.blade.php # resources/views/purchases/vendors/show.blade.php # resources/views/sales/customers/show.blade.php # resources/views/sales/invoices/show.blade.php # resources/views/wizard/companies/edit.blade.php # resources/views/wizard/currencies/index.blade.php # resources/views/wizard/finish/index.blade.php # resources/views/wizard/taxes/index.blade.php
This commit is contained in:
@ -50,13 +50,13 @@
|
||||
<div class="card-footer">
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<a href="{{ url('wizard/taxes') }}" class="btn btn-icon btn-white header-button-top">
|
||||
<span class="btn-inner--text">{{ trans('modules.back') }}</span>
|
||||
<a href="{{ route('wizard.taxes.index') }}" class="btn btn-icon btn-white header-button-top">
|
||||
<span class="btn-inner--text">{{ trans('pagination.previous') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-6 text-right">
|
||||
<a href="{{ url('/') }}" id="wizard-skip" class="btn btn-icon btn-success header-button-top">
|
||||
<a href="{{ route('dashboard') }}" id="wizard-skip" class="btn btn-icon btn-success header-button-top">
|
||||
<span class="btn-inner--text">{{ trans('general.go_to_dashboard') }}</span>
|
||||
</a>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user