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

Bill, Revenue, Bill, Payment create page add new category button

Browse Source
This commit is contained in:
cuneytsenturk 2018-04-24 17:26:05 +03:00
parent 04cf93e98e
commit bfc4a70ec9
6 changed files with 396 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Settings/Categories.php
View File

@ -171,4 +171,11 @@ class Categories extends Controller
return redirect('settings/categories');
}
public function category(Request $request)
{
$category = Category::create($request->all());
return response()->json($category);
}
}

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

@ -98,7 +98,17 @@
</div>
</div>
{{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }}
<div class="form-group col-md-6 required {{ $errors->has('category_id') ? 'has-error' : ''}}">
{!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-folder-open-o"></i></div>
{!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!}
<div class="input-group-btn">
<button type="button" onclick="createCategory();" class="btn btn-default btn-icon"><i class="fa fa-plus"></i></button>
</div>
</div>
{!! $errors->first('category_id', '<p class="help-block">:message</p>') !!}
</div>
{{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }}
@ -118,11 +128,13 @@
<script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/datepicker/bootstrap-datepicker.js') }}"></script>
<script src="{{ asset('public/js/bootstrap-fancyfile.js') }}"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-3-typeahead/4.0.1/bootstrap3-typeahead.min.js"></script>
<script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.js') }}"></script>
@endpush
@push('css')
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/datepicker/datepicker3.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/bootstrap-fancyfile.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.css') }}">
@endpush
@push('scripts')
@ -401,5 +413,89 @@
}
});
});
function createCategory() {
$('#modal-create-category').remove();
modal = '<div class="modal fade" id="modal-create-category" style="display: none;">';
modal += ' <div class="modal-dialog modal-lg">';
modal += ' <div class="modal-content">';
modal += ' <div class="modal-header">';
modal += ' <h4 class="modal-title">{{ trans('general.title.new', ['type' => trans_choice('general.categories', 1)]) }}</h4>';
modal += ' </div>';
modal += ' <div class="modal-body">';
modal += ' {!! Form::open(['id' => 'form-create-category', 'role' => 'form']) !!}';
modal += ' <div class="row">';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="name" class="control-label">{{ trans('general.name') }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-id-card-o"></i></div>';
modal += ' <input class="form-control" placeholder="{{ trans('general.name') }}" required="required" name="name" type="text" id="name">';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="color" class="control-label">{{ trans('general.color') }}</label>';
modal += ' <div id="category-color-picker" class="input-group colorpicker-component">';
modal += ' <div class="input-group-addon"><i></i></div>';
modal += ' <input class="form-control" value="#00a65a" placeholder="{{ trans('general.color') }}" required="required" name="color" type="text" id="color">';
modal += ' </div>';
modal += ' </div>';
modal += ' {!! Form::hidden('type', 'expense', []) !!}';
modal += ' {!! Form::hidden('enabled', '1', []) !!}';
modal += ' </div>';
modal += ' {!! Form::close() !!}';
modal += ' </div>';
modal += ' <div class="modal-footer">';
modal += ' <div class="pull-left">';
modal += ' {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-category', 'class' => 'btn btn-success']) !!}';
modal += ' <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>';
modal += ' </div>';
modal += ' </div>';
modal += ' </div>';
modal += ' </div>';
modal += '</div>';
$('body').append(modal);
$('#category-color-picker').colorpicker();
$('#modal-create-category').modal('show');
}
$(document).on('click', '#button-create-category', function (e) {
$('#modal-create-category .modal-header').before('<span id="span-loading" style="position: absolute; height: 100%; width: 100%; z-index: 99; background: #6da252; opacity: 0.4;"><i class="fa fa-spinner fa-spin" style="font-size: 10em !important;margin-left: 35%;margin-top: 8%;"></i></span>');
$.ajax({
url: '{{ url("settings/categories/category") }}',
type: 'POST',
dataType: 'JSON',
data: $("#form-create-category").serialize(),
beforeSend: function () {
$(".form-group").removeClass("has-error");
$(".help-block").remove();
},
success: function(data) {
$('#span-loading').remove();
$('#modal-create-category').modal('hide');
$("#category_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$("#category_id").select2('refresh');
},
error: function(error, textStatus, errorThrown) {
$('#span-loading').remove();
if (error.responseJSON.name) {
$("input[name='name']").parent().parent().addClass('has-error');
$("input[name='name']").parent().after('<p class="help-block">' + error.responseJSON.name + '</p>');
}
if (error.responseJSON.color) {
$("input[name='color']").parent().parent().addClass('has-error');
$("input[name='color']").parent().after('<p class="help-block">' + error.responseJSON.color + '</p>');
}
}
});
});
</script>
@endpush

98
resources/views/expenses/payments/create.blade.php
View File

@ -26,7 +26,17 @@
{{ Form::textareaGroup('description', trans('general.description')) }}
{{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }}
<div class="form-group col-md-6 required {{ $errors->has('category_id') ? 'has-error' : ''}}">
{!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-folder-open-o"></i></div>
{!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!}
<div class="input-group-btn">
<button type="button" onclick="createCategory();" class="btn btn-default btn-icon"><i class="fa fa-plus"></i></button>
</div>
</div>
{!! $errors->first('category_id', '<p class="help-block">:message</p>') !!}
</div>
<div class="form-group col-md-6">
{!! Form::label('vendor_id', trans_choice('general.vendors', 1), ['class' => 'control-label']) !!}
@ -59,11 +69,13 @@
@push('js')
<script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/datepicker/bootstrap-datepicker.js') }}"></script>
<script src="{{ asset('public/js/bootstrap-fancyfile.js') }}"></script>
<script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.js') }}"></script>
@endpush
@push('css')
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/datepicker/datepicker3.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/bootstrap-fancyfile.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.css') }}">
@endpush
@push('scripts')
@ -223,5 +235,89 @@
}
});
});
function createCategory() {
$('#modal-create-category').remove();
modal = '<div class="modal fade" id="modal-create-category" style="display: none;">';
modal += ' <div class="modal-dialog modal-lg">';
modal += ' <div class="modal-content">';
modal += ' <div class="modal-header">';
modal += ' <h4 class="modal-title">{{ trans('general.title.new', ['type' => trans_choice('general.categories', 1)]) }}</h4>';
modal += ' </div>';
modal += ' <div class="modal-body">';
modal += ' {!! Form::open(['id' => 'form-create-category', 'role' => 'form']) !!}';
modal += ' <div class="row">';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="name" class="control-label">{{ trans('general.name') }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-id-card-o"></i></div>';
modal += ' <input class="form-control" placeholder="{{ trans('general.name') }}" required="required" name="name" type="text" id="name">';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="color" class="control-label">{{ trans('general.color') }}</label>';
modal += ' <div id="category-color-picker" class="input-group colorpicker-component">';
modal += ' <div class="input-group-addon"><i></i></div>';
modal += ' <input class="form-control" value="#00a65a" placeholder="{{ trans('general.color') }}" required="required" name="color" type="text" id="color">';
modal += ' </div>';
modal += ' </div>';
modal += ' {!! Form::hidden('type', 'expense', []) !!}';
modal += ' {!! Form::hidden('enabled', '1', []) !!}';
modal += ' </div>';
modal += ' {!! Form::close() !!}';
modal += ' </div>';
modal += ' <div class="modal-footer">';
modal += ' <div class="pull-left">';
modal += ' {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-category', 'class' => 'btn btn-success']) !!}';
modal += ' <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>';
modal += ' </div>';
modal += ' </div>';
modal += ' </div>';
modal += ' </div>';
modal += '</div>';
$('body').append(modal);
$('#category-color-picker').colorpicker();
$('#modal-create-category').modal('show');
}
$(document).on('click', '#button-create-category', function (e) {
$('#modal-create-category .modal-header').before('<span id="span-loading" style="position: absolute; height: 100%; width: 100%; z-index: 99; background: #6da252; opacity: 0.4;"><i class="fa fa-spinner fa-spin" style="font-size: 10em !important;margin-left: 35%;margin-top: 8%;"></i></span>');
$.ajax({
url: '{{ url("settings/categories/category") }}',
type: 'POST',
dataType: 'JSON',
data: $("#form-create-category").serialize(),
beforeSend: function () {
$(".form-group").removeClass("has-error");
$(".help-block").remove();
},
success: function(data) {
$('#span-loading').remove();
$('#modal-create-category').modal('hide');
$("#category_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$("#category_id").select2('refresh');
},
error: function(error, textStatus, errorThrown) {
$('#span-loading').remove();
if (error.responseJSON.name) {
$("input[name='name']").parent().parent().addClass('has-error');
$("input[name='name']").parent().after('<p class="help-block">' + error.responseJSON.name + '</p>');
}
if (error.responseJSON.color) {
$("input[name='color']").parent().parent().addClass('has-error');
$("input[name='color']").parent().after('<p class="help-block">' + error.responseJSON.color + '</p>');
}
}
});
});
</script>
@endpush

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

@ -98,7 +98,17 @@
</div>
</div>
{{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }}
<div class="form-group col-md-6 required {{ $errors->has('category_id') ? 'has-error' : ''}}">
{!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-folder-open-o"></i></div>
{!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!}
<div class="input-group-btn">
<button type="button" onclick="createCategory();" class="btn btn-default btn-icon"><i class="fa fa-plus"></i></button>
</div>
</div>
{!! $errors->first('category_id', '<p class="help-block">:message</p>') !!}
</div>
{{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }}
@ -119,11 +129,13 @@
<script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/datepicker/bootstrap-datepicker.js') }}"></script>
<script src="{{ asset('public/js/bootstrap-fancyfile.js') }}"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-3-typeahead/4.0.1/bootstrap3-typeahead.min.js"></script>
<script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.js') }}"></script>
@endpush
@push('css')
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/datepicker/datepicker3.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/bootstrap-fancyfile.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.css') }}">
@endpush
@push('scripts')
@ -400,5 +412,89 @@
}
});
});
function createCategory() {
$('#modal-create-category').remove();
modal = '<div class="modal fade" id="modal-create-category" style="display: none;">';
modal += ' <div class="modal-dialog modal-lg">';
modal += ' <div class="modal-content">';
modal += ' <div class="modal-header">';
modal += ' <h4 class="modal-title">{{ trans('general.title.new', ['type' => trans_choice('general.categories', 1)]) }}</h4>';
modal += ' </div>';
modal += ' <div class="modal-body">';
modal += ' {!! Form::open(['id' => 'form-create-category', 'role' => 'form']) !!}';
modal += ' <div class="row">';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="name" class="control-label">{{ trans('general.name') }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-id-card-o"></i></div>';
modal += ' <input class="form-control" placeholder="{{ trans('general.name') }}" required="required" name="name" type="text" id="name">';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="color" class="control-label">{{ trans('general.color') }}</label>';
modal += ' <div id="category-color-picker" class="input-group colorpicker-component">';
modal += ' <div class="input-group-addon"><i></i></div>';
modal += ' <input class="form-control" value="#00a65a" placeholder="{{ trans('general.color') }}" required="required" name="color" type="text" id="color">';
modal += ' </div>';
modal += ' </div>';
modal += ' {!! Form::hidden('type', 'income', []) !!}';
modal += ' {!! Form::hidden('enabled', '1', []) !!}';
modal += ' </div>';
modal += ' {!! Form::close() !!}';
modal += ' </div>';
modal += ' <div class="modal-footer">';
modal += ' <div class="pull-left">';
modal += ' {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-category', 'class' => 'btn btn-success']) !!}';
modal += ' <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>';
modal += ' </div>';
modal += ' </div>';
modal += ' </div>';
modal += ' </div>';
modal += '</div>';
$('body').append(modal);
$('#category-color-picker').colorpicker();
$('#modal-create-category').modal('show');
}
$(document).on('click', '#button-create-category', function (e) {
$('#modal-create-category .modal-header').before('<span id="span-loading" style="position: absolute; height: 100%; width: 100%; z-index: 99; background: #6da252; opacity: 0.4;"><i class="fa fa-spinner fa-spin" style="font-size: 10em !important;margin-left: 35%;margin-top: 8%;"></i></span>');
$.ajax({
url: '{{ url("settings/categories/category") }}',
type: 'POST',
dataType: 'JSON',
data: $("#form-create-category").serialize(),
beforeSend: function () {
$(".form-group").removeClass("has-error");
$(".help-block").remove();
},
success: function(data) {
$('#span-loading').remove();
$('#modal-create-category').modal('hide');
$("#category_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$("#category_id").select2('refresh');
},
error: function(error, textStatus, errorThrown) {
$('#span-loading').remove();
if (error.responseJSON.name) {
$("input[name='name']").parent().parent().addClass('has-error');
$("input[name='name']").parent().after('<p class="help-block">' + error.responseJSON.name + '</p>');
}
if (error.responseJSON.color) {
$("input[name='color']").parent().parent().addClass('has-error');
$("input[name='color']").parent().after('<p class="help-block">' + error.responseJSON.color + '</p>');
}
}
});
});
</script>
@endpush

98
resources/views/incomes/revenues/create.blade.php
View File

@ -26,7 +26,17 @@
{{ Form::textareaGroup('description', trans('general.description')) }}
{{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }}
<div class="form-group col-md-6 required {{ $errors->has('category_id') ? 'has-error' : ''}}">
{!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-folder-open-o"></i></div>
{!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!}
<div class="input-group-btn">
<button type="button" onclick="createCategory();" class="btn btn-default btn-icon"><i class="fa fa-plus"></i></button>
</div>
</div>
{!! $errors->first('category_id', '<p class="help-block">:message</p>') !!}
</div>
<div class="form-group col-md-6">
{!! Form::label('customer_id', trans_choice('general.customers', 1), ['class' => 'control-label']) !!}
@ -59,11 +69,13 @@
@push('js')
<script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/datepicker/bootstrap-datepicker.js') }}"></script>
<script src="{{ asset('public/js/bootstrap-fancyfile.js') }}"></script>
<script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.js') }}"></script>
@endpush
@push('css')
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/datepicker/datepicker3.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/bootstrap-fancyfile.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.css') }}">
@endpush
@push('scripts')
@ -223,5 +235,89 @@
}
});
});
function createCategory() {
$('#modal-create-category').remove();
modal = '<div class="modal fade" id="modal-create-category" style="display: none;">';
modal += ' <div class="modal-dialog modal-lg">';
modal += ' <div class="modal-content">';
modal += ' <div class="modal-header">';
modal += ' <h4 class="modal-title">{{ trans('general.title.new', ['type' => trans_choice('general.categories', 1)]) }}</h4>';
modal += ' </div>';
modal += ' <div class="modal-body">';
modal += ' {!! Form::open(['id' => 'form-create-category', 'role' => 'form']) !!}';
modal += ' <div class="row">';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="name" class="control-label">{{ trans('general.name') }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-id-card-o"></i></div>';
modal += ' <input class="form-control" placeholder="{{ trans('general.name') }}" required="required" name="name" type="text" id="name">';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="color" class="control-label">{{ trans('general.color') }}</label>';
modal += ' <div id="category-color-picker" class="input-group colorpicker-component">';
modal += ' <div class="input-group-addon"><i></i></div>';
modal += ' <input class="form-control" value="#00a65a" placeholder="{{ trans('general.color') }}" required="required" name="color" type="text" id="color">';
modal += ' </div>';
modal += ' </div>';
modal += ' {!! Form::hidden('type', 'income', []) !!}';
modal += ' {!! Form::hidden('enabled', '1', []) !!}';
modal += ' </div>';
modal += ' {!! Form::close() !!}';
modal += ' </div>';
modal += ' <div class="modal-footer">';
modal += ' <div class="pull-left">';
modal += ' {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-category', 'class' => 'btn btn-success']) !!}';
modal += ' <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>';
modal += ' </div>';
modal += ' </div>';
modal += ' </div>';
modal += ' </div>';
modal += '</div>';
$('body').append(modal);
$('#category-color-picker').colorpicker();
$('#modal-create-category').modal('show');
}
$(document).on('click', '#button-create-category', function (e) {
$('#modal-create-category .modal-header').before('<span id="span-loading" style="position: absolute; height: 100%; width: 100%; z-index: 99; background: #6da252; opacity: 0.4;"><i class="fa fa-spinner fa-spin" style="font-size: 10em !important;margin-left: 35%;margin-top: 8%;"></i></span>');
$.ajax({
url: '{{ url("settings/categories/category") }}',
type: 'POST',
dataType: 'JSON',
data: $("#form-create-category").serialize(),
beforeSend: function () {
$(".form-group").removeClass("has-error");
$(".help-block").remove();
},
success: function(data) {
$('#span-loading').remove();
$('#modal-create-category').modal('hide');
$("#category_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$("#category_id").select2('refresh');
},
error: function(error, textStatus, errorThrown) {
$('#span-loading').remove();
if (error.responseJSON.name) {
$("input[name='name']").parent().parent().addClass('has-error');
$("input[name='name']").parent().after('<p class="help-block">' + error.responseJSON.name + '</p>');
}
if (error.responseJSON.color) {
$("input[name='color']").parent().parent().addClass('has-error');
$("input[name='color']").parent().after('<p class="help-block">' + error.responseJSON.color + '</p>');
}
}
});
});
</script>
@endpush

1
routes/web.php
View File

@ -101,6 +101,7 @@ Route::group(['middleware' => 'language'], function () {
});
Route::group(['prefix' => 'settings'], function () {
Route::post('categories/category', 'Settings\Categories@category');
Route::resource('categories', 'Settings\Categories');
Route::get('currencies/currency', 'Settings\Currencies@currency');
Route::get('currencies/config', 'Settings\Currencies@config');