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

Merge pull request #1134 from batuhawk/master

Browse Source 
Unnecessary control and responsive are fixed
This commit is contained in:
Batuhan Baş 2020-01-16 14:58:15 +03:00 committed by GitHub
commit 7d3c7619d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/views/install/Database.vue
View File

@ -114,7 +114,7 @@
}, },
next() { next() {
if (this.active++ > 2) this.active = 0; if (this.active++ > 2);
} }
} }
} }

2
resources/assets/js/views/install/Language.vue
View File

@ -73,7 +73,7 @@
}, },
next() { next() {
if (this.active++ > 2) this.active = 0; if (this.active++ > 2);
} }
} }
} }

2
resources/assets/js/views/install/Settings.vue
View File

@ -112,7 +112,7 @@
}, },
next() { next() {
if (this.active++ > 2) this.active = 0; if (this.active++ > 2);
} }
} }
} }

2
resources/assets/js/views/wizard/company.js vendored
View File

@ -40,7 +40,7 @@ const app = new Vue({
methods: { methods: {
next() { next() {
if (this.active++ > 3) this.active = 0; if (this.active++ > 3);
} }
} }
}); });

2
resources/assets/js/views/wizard/currencies.js vendored
View File

@ -108,7 +108,7 @@ const app = new Vue({
}, },
next() { next() {
if (this.active++ > 3) this.active = 0; if (this.active++ > 3);
} }
} }
}); });

2
resources/assets/js/views/wizard/finish.js vendored
View File

@ -37,7 +37,7 @@ const app = new Vue({
methods: { methods: {
next() { next() {
if (this.active++ > 3) this.active = 0; if (this.active++ > 3);
} }
} }
}); });

2
resources/assets/js/views/wizard/taxes.js vendored
View File

@ -80,7 +80,7 @@ const app = new Vue({
}, },
next() { next() {
if (this.active++ > 3) this.active = 0; if (this.active++ > 3);
} }
} }
}); });

38
resources/views/wizard/currencies/index.blade.php
View File

@ -8,9 +8,9 @@
<div class="card-body border-bottom-0"> <div class="card-body border-bottom-0">
<div class="row"> <div class="row">
<div class="col-12 text-right"> <div class="col-md-12 text-right">
<span> <span>
<button type="button" @click="onAddCurrency" class="btn btn-success btn-sm"> <button type="button" @click="onAddCurrency" class="btn btn-success header-button-top btn-sm">
<span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }} <span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}
</button> </button>
</span> </span>
@ -32,24 +32,24 @@
<table class="table table-flush table-hover" id='tbl-currencies'> <table class="table table-flush table-hover" id='tbl-currencies'>
<thead class="thead-light"> <thead class="thead-light">
<tr class="row table-head-line"> <tr class="row table-head-line">
<th class="col-xs-4 col-sm-3">@sortablelink('name', trans('general.name'))</th> <th class="col-xs-4 col-sm-4 col-md-3">@sortablelink('name', trans('general.name'))</th>
<th class="col-sm-3 hidden-sm">@sortablelink('code', trans('currencies.code'))</th> <th class="col-md-3 d-none d-md-block">@sortablelink('code', trans('currencies.code'))</th>
<th class="col-sm-2 hidden-sm">@sortablelink('rate', trans('currencies.rate'))</th> <th class="col-md-2 d-none d-md-block">@sortablelink('rate', trans('currencies.rate'))</th>
<th class="col-xs-4 col-sm-2">@sortablelink('enabled', trans('general.enabled'))</th> <th class="col-xs-4 col-sm-4 col-md-2 ">@sortablelink('enabled', trans('general.enabled'))</th>
<th class="col-xs-4 col-sm-2 text-center">{{ trans('general.actions') }}</th> <th class="col-xs-4 col-sm-4 col-md-2 text-center">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($currencies as $item) @foreach($currencies as $item)
<tr class="row align-items-center border-top-1" id="currency-{{ $item->id }}"> <tr class="row align-items-center border-top-1" id="currency-{{ $item->id }}">
<td class="col-xs-4 col-sm-3 currency-name"> <td class="col-xs-4 col-sm-4 col-md-3">
<a href="javascript:void(0);" class="text-success" @click="onEditCurrency('{{ $item->id }}')"> <a href="javascript:void(0);" class="text-success" @click="onEditCurrency('{{ $item->id }}')">
{{ $item->name }} {{ $item->name }}
</a> </a>
</td> </td>
<td class="col-sm-3 hidden-sm currency-code">{{ $item->code }}</td> <td class="col-md-3 d-none d-md-block">{{ $item->code }}</td>
<td class="col-sm-2 hidden-sm currency-rate">{{ $item->rate }}</td> <td class="col-md-2 d-none d-md-block">{{ $item->rate }}</td>
<td class="col-xs-4 col-sm-2 currency-status"> <td class="col-xs-4 col-sm-4 col-md-2">
@if (user()->can('update-settings-currencies')) @if (user()->can('update-settings-currencies'))
{{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
@else @else
@ -60,7 +60,7 @@
@endif @endif
@endif @endif
</td> </td>
<td class="col-xs-4 col-sm-2 text-center"> <td class="col-xs-4 col-sm-4 col-md-2 text-center">
<div class="dropdown"> <div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-h text-muted"></i> <i class="fa fa-ellipsis-h text-muted"></i>
@ -80,19 +80,19 @@
@endforeach @endforeach
<tr class="row align-items-center border-top-1" v-show="show"> <tr class="row align-items-center border-top-1" v-show="show">
<td class="col-xs-4 col-sm-3 currency-name"> <td class="col-xs-4 col-sm-4 col-md-3">
{{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }} {{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }}
</td> </td>
<td class="col-sm-3 hidden-sm currency-code"> <td class="col-md-3 d-none d-md-block">
{{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, null, ['required' => 'required', 'change' => 'onChangeCode'], '') }} {{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, null, ['required' => 'required', 'change' => 'onChangeCode'], '') }}
</td> </td>
<td class="col-sm-2 hidden-sm currency-rate"> <td class="col-md-2 d-none d-md-block">
{{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }} {{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }}
</td> </td>
<td class="col-xs-4 col-sm-2 currency-status"> <td class="col-xs-4 col-sm-4 col-md-2">
{{ Form::radioGroup('enabled', trans('general.enabled')) }} {{ Form::radioGroup('enabled', trans('general.enabled')) }}
</td> </td>
<td class="col-xs-4 col-sm-2 text-center"> <td class="col-xs-4 col-sm-4 col-md-2 text-center">
{!! Form::button( {!! Form::button(
'<span class="btn-inner--icon"><i class="fas fa-save"></i></span>', [ '<span class="btn-inner--icon"><i class="fas fa-save"></i></span>', [
':disabled' => 'form.loading', ':disabled' => 'form.loading',
@ -122,12 +122,12 @@
<div class="card-footer"> <div class="card-footer">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<a href="{{ url('wizard/companies') }}" class="btn btn-white header-button-top"> <a href="{{ url('wizard/companies') }}" class="btn btn-white header-button-top">
<span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }} <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
</a> </a>
</div> </div>
<div class="col-md-6 text-right"> <div class="col-sm-6 text-right">
<a href="{{ url('wizard/taxes') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next"> <a href="{{ url('wizard/taxes') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next">
<span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }} <span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }}
</a> </a>

4
resources/views/wizard/finish/index.blade.php
View File

@ -49,12 +49,12 @@
<div class="card-footer"> <div class="card-footer">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<a href="{{ url('wizard/taxes') }}" class="btn btn-white header-button-top"> <a href="{{ url('wizard/taxes') }}" class="btn btn-white header-button-top">
<span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }} <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
</a> </a>
</div> </div>
<div class="col-md-6 text-right"> <div class="col-sm-6 text-right">
<a href="{{ url('/') }}" class="btn btn-success header-button-top" @click="next"> <a href="{{ url('/') }}" class="btn btn-success header-button-top" @click="next">
<span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }} <span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}
</a> </a>

32
resources/views/wizard/taxes/index.blade.php
View File

@ -8,9 +8,9 @@
<div class="card-body border-bottom-0"> <div class="card-body border-bottom-0">
<div class="row"> <div class="row">
<div class="col-12 text-right"> <div class="col-md-12 text-right">
<span> <span>
<button type="button" @click="onAddTax" class="btn btn-success btn-sm"> <button type="button" @click="onAddTax" class="btn btn-success header-button-top btn-sm">
<span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }} <span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}
</button> </button>
</span> </span>
@ -32,22 +32,22 @@
<table class="table table-flush table-hover" id='tbl-taxes'> <table class="table table-flush table-hover" id='tbl-taxes'>
<thead class="thead-light"> <thead class="thead-light">
<tr class="row table-head-line"> <tr class="row table-head-line">
<th class="col-xs-4 col-sm-3">@sortablelink('name', trans('general.name'))</th> <th class="col-xs-4 col-sm-4 col-md-3">@sortablelink('name', trans('general.name'))</th>
<th class="col-sm-3 hidden-sm">@sortablelink('rate', trans('taxes.rate_percent'))</th> <th class="col-md-3 d-none d-md-block">@sortablelink('rate', trans('taxes.rate_percent'))</th>
<th class="col-xs-4 col-sm-3">@sortablelink('enabled', trans('general.enabled'))</th> <th class="col-xs-4 col-sm-4 col-md-3">@sortablelink('enabled', trans('general.enabled'))</th>
<th class="col-xs-4 col-sm-3 text-center">{{ trans('general.actions') }}</th> <th class="col-xs-4 col-sm-4 col-md-3 text-center">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($taxes as $item) @foreach($taxes as $item)
<tr class="row align-items-center border-top-1" id="tax-{{ $item->id }}"> <tr class="row align-items-center border-top-1" id="tax-{{ $item->id }}">
<td class="col-xs-4 col-sm-3 tax-name"> <td class="col-xs-4 col-sm-4 col-md-3 tax-name">
<a href="javascript:void(0);" class="text-success" @click="onEditTax('{{ $item->id }}')"> <a href="javascript:void(0);" class="text-success" @click="onEditTax('{{ $item->id }}')">
{{ $item->name }} {{ $item->name }}
</a> </a>
</td> </td>
<td class="col-sm-3 hidden-sm">{{ $item->rate }}</td> <td class="col-md-3 d-none d-md-block">{{ $item->rate }}</td>
<td class="col-xs-4 col-sm-3"> <td class="col-xs-4 col-sm-4 col-md-3">
@if (user()->can('update-settings-taxes')) @if (user()->can('update-settings-taxes'))
{{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
@else @else
@ -58,7 +58,7 @@
@endif @endif
@endif @endif
</td> </td>
<td class="col-xs-4 col-sm-3 text-center"> <td class="col-xs-4 col-sm-4 col-md-3 text-center">
<div class="dropdown"> <div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-h text-muted"></i> <i class="fa fa-ellipsis-h text-muted"></i>
@ -78,16 +78,16 @@
@endforeach @endforeach
<tr class="row align-items-center border-top-1" v-show="show"> <tr class="row align-items-center border-top-1" v-show="show">
<td class="col-xs-4 col-sm-3 tax-name"> <td class="col-xs-4 col-sm-4 col-md-3">
{{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }} {{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }}
</td> </td>
<td class="col-sm-3 hidden-sm tax-rate"> <td class="col-md-3 d-none d-md-block">
{{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }} {{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }}
</td> </td>
<td class="col-xs-4 col-sm-3 tax-status"> <td class="col-xs-4 col-sm-4 col-md-3">
{{ Form::radioGroup('enabled', trans('general.enabled')) }} {{ Form::radioGroup('enabled', trans('general.enabled')) }}
</td> </td>
<td class="col-xs-4 col-sm-3 text-center"> <td class="col-xs-4 col-sm-4 col-md-3 text-center">
{!! Form::button( {!! Form::button(
'<span class="btn-inner--icon"><i class="fas fa-save"></i></span>', [ '<span class="btn-inner--icon"><i class="fas fa-save"></i></span>', [
':disabled' => 'form.loading', ':disabled' => 'form.loading',
@ -105,12 +105,12 @@
<div class="card-footer"> <div class="card-footer">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<a href="{{ url('wizard/currencies') }}" class="btn btn-white header-button-top"> <a href="{{ url('wizard/currencies') }}" class="btn btn-white header-button-top">
<span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }} <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
</a> </a>
</div> </div>
<div class="col-md-6 text-right"> <div class="col-sm-6 text-right">
<a href="{{ url('wizard/finish') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next"> <a href="{{ url('wizard/finish') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next">
<span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }} <span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }}
</a> </a>