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

Create customer from invoice and vendor from bill

Browse Source
This commit is contained in:
Cüneyt Şentürk 2017-11-30 02:07:00 +03:00
parent 966deefc29
commit 93402e0fd9
7 changed files with 256 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Expenses/Vendors.php
View File

@ -140,4 +140,11 @@ class Vendors extends Controller
return response()->json($vendor);
}
public function vendor(Request $request)
{
$vendor = Vendor::create($request->all());
return response()->json($vendor);
}
}

7
app/Http/Controllers/Incomes/Customers.php
View File

@ -187,4 +187,11 @@ class Customers extends Controller
return response()->json($customer);
}
public function customer(Request $request)
{
$customer = Customer::create($request->all());
return response()->json($customer);
}
}

2
resources/lang/en-GB/bills.php
View File

@ -27,6 +27,8 @@ return [
'download_pdf' => 'Download PDF',
'send_mail' => 'Send Email',
'create_vendor' => 'Vendor Create',
'status' => [
'draft' => 'Draft',
'received' => 'Received',

2
resources/lang/en-GB/invoices.php
View File

@ -27,6 +27,8 @@ return [
'download_pdf' => 'Download PDF',
'send_mail' => 'Send Email',
'create_customer' => 'Customer Create',
'status' => [
'draft' => 'Draft',
'sent' => 'Sent',

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

@ -8,7 +8,17 @@
{!! Form::open(['url' => 'expenses/bills', 'files' => true, 'role' => 'form']) !!}
<div class="box-body">
{{ Form::selectGroup('vendor_id', trans_choice('general.vendors', 1), 'user', $vendors) }}
<div class="form-group col-md-6 required {{ $errors->has('vendor_id') ? 'has-error' : ''}}">
{!! Form::label('vendor_id', trans_choice('general.vendors', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-user"></i></div>
{!! Form::select('vendor_id', $vendors, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.vendors', 1)])])) !!}
<span class="input-group-btn">
<button type="button" onclick="createVendor();" class="btn btn-success">{{ trans('bills.create_vendor') }}</button>
</span>
</div>
{!! $errors->first('vendor_id', '<p class="help-block">:message</p>') !!}
</div>
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }}
@ -260,5 +270,112 @@
}
});
}
function createVendor() {
$('#modal-create-vendor').remove();
modal = '<div class="modal fade" id="modal-create-vendor" 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.vendors', 1)]) }}</h4>';
modal += ' </div>';
modal += ' <div class="modal-body">';
modal += ' {!! Form::open(['id' => 'form-create-vendor', '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="email" class="control-label">{{ trans('general.email') }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-envelope"></i></div>';
modal += ' <input class="form-control" placeholder="{{ trans('general.email') }}" required="required" name="email" type="text" id="email">';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-6">';
modal += ' <label for="tax_number" class="control-label">{{ trans('general.tax_number') }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-percent"></i></div>';
modal += ' <input class="form-control" placeholder="{{ trans('general.tax_number') }}" name="tax_number" type="text" id="tax_number">';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="email" class="control-label">{{ trans_choice('general.currencies', 1) }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-exchange"></i></div>';
modal += ' <select class="form-control" required="required" id="currency_code" name="currency_code">';
modal += ' <option value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}</option>';
@foreach($currencies as $currency_code => $currency_name)
modal += ' <option value="{{ $currency_code }}" {{ (setting('general.default_currency') == $currency_code) ? 'selected' : '' }}>{{ $currency_name }}</option>';
@endforeach
modal += ' </select>';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-12">';
modal += ' <label for="address" class="control-label">{{ trans('general.address') }}</label>';
modal += ' <textarea class="form-control" placeholder="{{ trans('general.address') }}" rows="3" name="address" cols="50" id="address"></textarea>';
modal += ' </div>';
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-vendor', '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);
$("#modal-create-vendor #currency_code").select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}"
});
$('#modal-create-vendor').modal('show');
}
$(document).on('click', '#button-create-vendor', function (e) {
$.ajax({
url: '{{ url("expenses/vendors/vendor") }}',
type: 'POST',
dataType: 'JSON',
data: $("#form-create-vendor").serialize(),
beforeSend: function () {
$(".form-group").removeClass("has-error");
$(".help-block").remove();
},
success: function(data) {
$('#modal-create-vendor').modal('hide');
$("#vendor_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$("#vendor_id").select2('refresh');
},
error: function(error, textStatus, errorThrown) {
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.email) {
$("input[name='email']").parent().parent().addClass('has-error');
$("input[name='email']").parent().after('<p class="help-block">' + error.responseJSON.email + '</p>');
}
if (error.responseJSON.currency_code) {
$("select[name='currency_code']").parent().parent().addClass('has-error');
$("select[name='currency_code']").parent().after('<p class="help-block">' + error.responseJSON.currency_code + '</p>');
}
}
});
});
</script>
@endpush

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

@ -8,7 +8,17 @@
{!! Form::open(['url' => 'incomes/invoices', 'files' => true, 'role' => 'form']) !!}
<div class="box-body">
{{ Form::selectGroup('customer_id', trans_choice('general.customers', 1), 'user', $customers) }}
<div class="form-group col-md-6 required {{ $errors->has('customer_id') ? 'has-error' : ''}}">
{!! Form::label('customer_id', trans_choice('general.customers', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-user"></i></div>
{!! Form::select('customer_id', $customers, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.customers', 1)])])) !!}
<span class="input-group-btn">
<button type="button" onclick="createCustomer();" class="btn btn-success">{{ trans('invoices.create_customer') }}</button>
</span>
</div>
{!! $errors->first('customer_id', '<p class="help-block">:message</p>') !!}
</div>
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }}
@ -261,5 +271,112 @@
}
});
}
function createCustomer() {
$('#modal-create-customer').remove();
modal = '<div class="modal fade" id="modal-create-customer" 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.customers', 1)]) }}</h4>';
modal += ' </div>';
modal += ' <div class="modal-body">';
modal += ' {!! Form::open(['id' => 'form-create-customer', '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="email" class="control-label">{{ trans('general.email') }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-envelope"></i></div>';
modal += ' <input class="form-control" placeholder="{{ trans('general.email') }}" required="required" name="email" type="text" id="email">';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-6">';
modal += ' <label for="tax_number" class="control-label">{{ trans('general.tax_number') }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-percent"></i></div>';
modal += ' <input class="form-control" placeholder="{{ trans('general.tax_number') }}" name="tax_number" type="text" id="tax_number">';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-6 required">';
modal += ' <label for="email" class="control-label">{{ trans_choice('general.currencies', 1) }}</label>';
modal += ' <div class="input-group">';
modal += ' <div class="input-group-addon"><i class="fa fa-exchange"></i></div>';
modal += ' <select class="form-control" required="required" id="currency_code" name="currency_code">';
modal += ' <option value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}</option>';
@foreach($currencies as $currency_code => $currency_name)
modal += ' <option value="{{ $currency_code }}" {{ (setting('general.default_currency') == $currency_code) ? 'selected' : '' }}>{{ $currency_name }}</option>';
@endforeach
modal += ' </select>';
modal += ' </div>';
modal += ' </div>';
modal += ' <div class="form-group col-md-12">';
modal += ' <label for="address" class="control-label">{{ trans('general.address') }}</label>';
modal += ' <textarea class="form-control" placeholder="{{ trans('general.address') }}" rows="3" name="address" cols="50" id="address"></textarea>';
modal += ' </div>';
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-customer', '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);
$("#modal-create-customer #currency_code").select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}"
});
$('#modal-create-customer').modal('show');
}
$(document).on('click', '#button-create-customer', function (e) {
$.ajax({
url: '{{ url("incomes/customers/customer") }}',
type: 'POST',
dataType: 'JSON',
data: $("#form-create-customer").serialize(),
beforeSend: function () {
$(".form-group").removeClass("has-error");
$(".help-block").remove();
},
success: function(data) {
$('#modal-create-customer').modal('hide');
$("#customer_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$("#customer_id").select2('refresh');
},
error: function(error, textStatus, errorThrown) {
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.email) {
$("input[name='email']").parent().parent().addClass('has-error');
$("input[name='email']").parent().after('<p class="help-block">' + error.responseJSON.email + '</p>');
}
if (error.responseJSON.currency_code) {
$("select[name='currency_code']").parent().parent().addClass('has-error');
$("select[name='currency_code']").parent().after('<p class="help-block">' + error.responseJSON.currency_code + '</p>');
}
}
});
});
</script>
@endpush

2
routes/web.php
View File

@ -58,6 +58,7 @@ Route::group(['middleware' => 'language'], function () {
Route::resource('revenues', 'Incomes\Revenues');
Route::get('customers/currency', 'Incomes\Customers@currency');
Route::get('customers/{customer}/duplicate', 'Incomes\Customers@duplicate');
Route::post('customers/customer', 'Incomes\Customers@customer');
Route::resource('customers', 'Incomes\Customers');
});
@ -73,6 +74,7 @@ Route::group(['middleware' => 'language'], function () {
Route::resource('payments', 'Expenses\Payments');
Route::get('vendors/currency', 'Expenses\Vendors@currency');
Route::get('vendors/{vendor}/duplicate', 'Expenses\Vendors@duplicate');
Route::post('vendors/vendor', 'Expenses\Vendors@vendor');
Route::resource('vendors', 'Expenses\Vendors');
});