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

moved folders to common directory

Browse Source
This commit is contained in:
denisdulici
2018-06-10 02:48:51 +03:00
parent 7fa629e8b5
commit b1fd49c507
71 changed files with 719 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/companies/companies/create.blade.php → resources/views/common/companies/create.blade.php
View File

@@ -5,7 +5,7 @@
@section('content')
<!-- Default box -->
<div class="box box-success">
{!! Form::open(['url' => 'companies/companies', 'files' => true, 'role' => 'form']) !!}
{!! Form::open(['url' => 'common/companies', 'files' => true, 'role' => 'form']) !!}
<div class="box-body">
{{ Form::textGroup('company_name', trans('general.name'), 'id-card-o') }}
@@ -24,7 +24,7 @@
<!-- /.box-body -->
<div class="box-footer">
{{ Form::saveButtons('companies/companies') }}
{{ Form::saveButtons('common/companies') }}
</div>
<!-- /.box-footer -->

6
resources/views/companies/companies/edit.blade.php → resources/views/common/companies/edit.blade.php
View File

@@ -7,7 +7,7 @@
<div class="box box-success">
{!! Form::model($company, [
'method' => 'PATCH',
'url' => ['companies/companies', $company->id],
'url' => ['common/companies', $company->id],
'files' => true,
'role' => 'form'
]) !!}
@@ -29,9 +29,9 @@
</div>
<!-- /.box-body -->
@permission('update-companies-companies')
@permission('update-common-companies')
<div class="box-footer">
{{ Form::saveButtons('companies/companies') }}
{{ Form::saveButtons('common/companies') }}
</div>
<!-- /.box-footer -->
@endpermission

16
resources/views/companies/companies/index.blade.php → resources/views/common/companies/index.blade.php
View File

@@ -2,9 +2,9 @@
@section('title', trans_choice('general.companies', 2))
@permission('create-companies-companies')
@permission('create-common-companies')
@section('new_button')
<span class="new-button"><a href="{{ url('companies/companies/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span class="new-button"><a href="{{ url('common/companies/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
@endsection
@endpermission
@@ -13,7 +13,7 @@
<div class="box box-success">
<div class="box-header with-border">
{!! Form::open(['url' => 'companies/companies', 'role' => 'form', 'method' => 'GET']) !!}
{!! Form::open(['url' => 'common/companies', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-left">
<span class="title-filter hidden-xs">{{ trans('general.search') }}:</span>
{!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
@@ -45,7 +45,7 @@
@foreach($companies as $item)
<tr>
<td class="hidden-xs">{{ $item->id }}</td>
<td><a href="{{ url('companies/companies/' . $item->id . '/edit') }}">{{ $item->company_name }}</a></td>
<td><a href="{{ url('common/companies/' . $item->id . '/edit') }}">{{ $item->company_name }}</a></td>
<td class="hidden-xs">{{ $item->domain }}</td>
<td class="hidden-xs">{{ $item->company_email }}</td>
<td class="hidden-xs">{{ Date::parse($item->created_at)->format($date_format) }}</td>
@@ -63,11 +63,11 @@
</button>
<ul class="dropdown-menu dropdown-menu-right">
@if ($item->enabled)
<li><a href="{{ url('companies/companies/' . $item->id . '/set') }}">{{ trans('general.switch') }}</a></li>
<li><a href="{{ url('common/companies/' . $item->id . '/set') }}">{{ trans('general.switch') }}</a></li>
@endif
<li><a href="{{ url('companies/companies/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
@permission('delete-companies-companies')
<li>{!! Form::deleteLink($item, 'companies/companies', '', 'company_name') !!}</li>
<li><a href="{{ url('common/companies/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
@permission('delete-common-companies')
<li>{!! Form::deleteLink($item, 'common/companies', '', 'company_name') !!}</li>
@endpermission
</ul>
</div>

6
resources/views/dashboard/dashboard/index.blade.php → resources/views/common/dashboard/index.blade.php
View File

@@ -267,7 +267,7 @@
var period = $('#period').val();
$.ajax({
url: '{{ url("dashboard/dashboard/cashflow") }}',
url: '{{ url("common/dashboard/cashflow") }}',
type: 'get',
dataType: 'html',
data: 'period=' + period + '&start=' + picker.startDate.format('YYYY-MM-DD') + '&end=' + picker.endDate.format('YYYY-MM-DD'),
@@ -283,7 +283,7 @@
$('#period').val('month');
$.ajax({
url: '{{ url("dashboard/dashboard/cashflow") }}',
url: '{{ url("common/dashboard/cashflow") }}',
type: 'get',
dataType: 'html',
data: 'period=month&start=' + picker.startDate.format('YYYY-MM-DD') + '&end=' + picker.endDate.format('YYYY-MM-DD'),
@@ -299,7 +299,7 @@
$('#period').val('quarter');
$.ajax({
url: '{{ url("dashboard/dashboard/cashflow") }}',
url: '{{ url("common/dashboard/cashflow") }}',
type: 'get',
dataType: 'html',
data: 'period=quarter&start=' + picker.startDate.format('YYYY-MM-DD') + '&end=' + picker.endDate.format('YYYY-MM-DD'),

4
resources/views/items/items/create.blade.php → resources/views/common/items/create.blade.php
View File

@@ -5,7 +5,7 @@
@section('content')
<!-- Default box -->
<div class="box box-success">
{!! Form::open(['url' => 'items/items', 'files' => true, 'role' => 'form']) !!}
{!! Form::open(['url' => 'common/items', 'files' => true, 'role' => 'form']) !!}
<div class="box-body">
{{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
@@ -41,7 +41,7 @@
<!-- /.box-body -->
<div class="box-footer">
{{ Form::saveButtons('items/items') }}
{{ Form::saveButtons('common/items') }}
</div>
<!-- /.box-footer -->

6
resources/views/items/items/edit.blade.php → resources/views/common/items/edit.blade.php
View File

@@ -8,7 +8,7 @@
{!! Form::model($item, [
'method' => 'PATCH',
'files' => true,
'url' => ['items/items', $item->id],
'url' => ['common/items', $item->id],
'role' => 'form'
]) !!}
@@ -35,9 +35,9 @@
</div>
<!-- /.box-body -->
@permission('update-items-items')
@permission('update-common-items')
<div class="box-footer">
{{ Form::saveButtons('items/items') }}
{{ Form::saveButtons('common/items') }}
</div>
<!-- /.box-footer -->
@endpermission

20
resources/views/items/items/index.blade.php → resources/views/common/items/index.blade.php
View File

@@ -2,10 +2,10 @@
@section('title', trans_choice('general.items', 2))
@permission('create-items-items')
@permission('create-common-items')
@section('new_button')
<span class="new-button"><a href="{{ url('items/items/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/items/items') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
<span class="new-button"><a href="{{ url('common/items/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ url('common/import/common/items') }}" class="btn btn-success btn-sm"><span class="fa fa-download"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endsection
@endpermission
@@ -13,7 +13,7 @@
<!-- Default box -->
<div class="box box-success">
<div class="box-header with-border">
{!! Form::open(['url' => 'items/items', 'role' => 'form', 'method' => 'GET']) !!}
{!! Form::open(['url' => 'common/items', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-left">
<span class="title-filter hidden-xs">{{ trans('general.search') }}:</span>
{!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
@@ -47,7 +47,7 @@
@foreach($items as $item)
<tr>
<td class="hidden-xs"><img src="{{ $item->picture ? Storage::url($item->picture->id) : asset('public/img/akaunting-logo-green.png') }}" class="img-thumbnail" width="50" alt="{{ $item->name }}"></td>
<td><a href="{{ url('items/items/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
<td><a href="{{ url('common/items/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
<td class="hidden-xs">{{ $item->category ? $item->category->name : trans('general.na') }}</td>
<td class="hidden-xs">{{ $item->quantity }}</td>
<td class="text-right amount-space">{{ money($item->sale_price, setting('general.default_currency'), true) }}</td>
@@ -65,14 +65,14 @@
<i class="fa fa-ellipsis-h"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li><a href="{{ url('items/items/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
<li><a href="{{ url('common/items/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
<li class="divider"></li>
@permission('create-items-items')
<li><a href="{{ url('items/items/' . $item->id . '/duplicate') }}">{{ trans('general.duplicate') }}</a></li>
@permission('create-common-items')
<li><a href="{{ url('common/items/' . $item->id . '/duplicate') }}">{{ trans('general.duplicate') }}</a></li>
<li class="divider"></li>
@endpermission
@permission('delete-items-items')
<li>{!! Form::deleteLink($item, 'items/items') !!}</li>
@permission('delete-common-items')
<li>{!! Form::deleteLink($item, 'common/items') !!}</li>
@endpermission
</ul>
</div>

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

@@ -220,7 +220,7 @@
placeholder : '{{ trans('general.form.no_file_selected') }}'
});
var autocomplete_path = "{{ url('items/items/autocomplete') }}";
var autocomplete_path = "{{ url('common/items/autocomplete') }}";
$(document).on('click', '.form-control.typeahead', function() {
input_id = $(this).attr('id').split('-');
@@ -336,7 +336,7 @@
function totalItem() {
$.ajax({
url: '{{ url("items/items/totalItem") }}',
url: '{{ url("common/items/totalItem") }}',
type: 'POST',
dataType: 'JSON',
data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'),

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

@@ -253,7 +253,7 @@
});
@endif
var autocomplete_path = "{{ url('items/items/autocomplete') }}";
var autocomplete_path = "{{ url('common/items/autocomplete') }}";
$(document).on('click', '.form-control.typeahead', function() {
input_id = $(this).attr('id').split('-');
@@ -369,7 +369,7 @@
function totalItem() {
$.ajax({
url: '{{ url("items/items/totalItem") }}',
url: '{{ url("common/items/totalItem") }}',
type: 'POST',
dataType: 'JSON',
data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'),

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

@@ -221,7 +221,7 @@
placeholder : '{{ trans('general.form.no_file_selected') }}'
});
var autocomplete_path = "{{ url('items/items/autocomplete') }}";
var autocomplete_path = "{{ url('common/items/autocomplete') }}";
$(document).on('click', '.form-control.typeahead', function() {
input_id = $(this).attr('id').split('-');
@@ -337,7 +337,7 @@
function totalItem() {
$.ajax({
url: '{{ url("items/items/totalItem") }}',
url: '{{ url("common/items/totalItem") }}',
type: 'POST',
dataType: 'JSON',
data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'),

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

@@ -252,7 +252,7 @@
});
@endif
var autocomplete_path = "{{ url('items/items/autocomplete') }}";
var autocomplete_path = "{{ url('common/items/autocomplete') }}";
$(document).on('click', '.form-control.typeahead', function() {
input_id = $(this).attr('id').split('-');
@@ -368,7 +368,7 @@
function totalItem() {
$.ajax({
url: '{{ url("items/items/totalItem") }}',
url: '{{ url("common/items/totalItem") }}',
type: 'POST',
dataType: 'JSON',
data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'),

2
resources/views/partials/admin/head.blade.php
View File

@@ -57,7 +57,7 @@
<script src="{{ asset('public/js/app.js?v=1.0') }}"></script>
<script type="text/javascript"><!--
var url_search = '{{ url("search/search/search") }}';
var url_search = '{{ url("common/search/search") }}';
//--></script>
@stack('js')

8
resources/views/partials/admin/menu.blade.php
View File

@@ -8,15 +8,15 @@
</div>
<div class="pull-left info">
<p>{{ str_limit(setting('general.company_name'), 22) }}</p>
@permission('read-companies-companies')
@permission('read-common-companies')
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="caret"></span> &nbsp;{{ trans('general.switch') }}</a>
<ul class="dropdown-menu">
@foreach($companies as $com)
<li><a href="{{ url('companies/companies/'. $com->id .'/set') }}">{{ str_limit($com->company_name, 18) }}</a></li>
<li><a href="{{ url('common/companies/'. $com->id .'/set') }}">{{ str_limit($com->company_name, 18) }}</a></li>
@endforeach
@permission('update-companies-companies')
@permission('update-common-companies')
<li role="separator" class="divider"></li>
<li><a href="{{ url('companies/companies') }}">{{ trans('companies.manage') }}</a></li>
<li><a href="{{ url('common/companies') }}">{{ trans('companies.manage') }}</a></li>
@endpermission
</ul>
@endpermission

2
resources/views/partials/customer/head.blade.php
View File

@@ -62,7 +62,7 @@
<script src="{{ asset('public/js/app.js?v=1.0') }}"></script>
<script type="text/javascript"><!--
var url_search = '{{ url("search/search/search") }}';
var url_search = '{{ url("common/search/search") }}';
//--></script>
@stack('js')

2
resources/views/partials/modules/head.blade.php
View File

@@ -58,7 +58,7 @@
<script src="{{ asset('public/js/app.js?v=1.0') }}"></script>
<script type="text/javascript"><!--
var url_search = '{{ url("search/search/search") }}';
var url_search = '{{ url("common/search/search") }}';
//--></script>
<script type="text/javascript">