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

import validation fixed create and edit action on invoice, bill, revenue, payment.

Browse Source 
refs #392
This commit is contained in:
cuneytsenturk 2018-06-25 17:53:43 +03:00
parent 409f83ae54
commit 55ac8447fc
16 changed files with 154 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Banking/Accounts.php
View File

@ -208,4 +208,18 @@ class Accounts extends Controller
return redirect('banking/accounts');
}
public function currency()
{
$account_id = request('account_id');
$account = Account::find($account_id);
// Get currency object
$currency = Currency::where('code', $account->currency_code)->first();
$account->currency_rate = $currency->rate;
return response()->json($account);
}
}

34
app/Http/Controllers/Expenses/Bills.php
View File

@ -117,25 +117,6 @@ class Bills extends Controller
*/
public function store(Request $request)
{
// Get vendor object
$vendor = Vendor::findOrFail($request['vendor_id']);
$request['vendor_name'] = $vendor->name;
$request['vendor_email'] = $vendor->email;
$request['vendor_tax_number'] = $vendor->tax_number;
$request['vendor_phone'] = $vendor->phone;
$request['vendor_address'] = $vendor->address;
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$request['bill_status_code'] = 'draft';
$request['amount'] = 0;
$bill = Bill::create($request->input());
// Upload attachment
@ -346,21 +327,6 @@ class Bills extends Controller
*/
public function update(Bill $bill, Request $request)
{
// Get vendor object
$vendor = Vendor::findOrFail($request['vendor_id']);
$request['vendor_name'] = $vendor->name;
$request['vendor_email'] = $vendor->email;
$request['vendor_tax_number'] = $vendor->tax_number;
$request['vendor_phone'] = $vendor->phone;
$request['vendor_address'] = $vendor->address;
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$taxes = [];
$tax_total = 0;
$sub_total = 0;

12
app/Http/Controllers/Expenses/Payments.php
View File

@ -82,12 +82,6 @@ class Payments extends Controller
*/
public function store(Request $request)
{
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$payment = Payment::create($request->input());
// Upload attachment
@ -179,12 +173,6 @@ class Payments extends Controller
*/
public function update(Payment $payment, Request $request)
{
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$payment->update($request->input());
// Upload attachment

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

@ -308,6 +308,11 @@ class Vendors extends Controller
$vendor = Vendor::find($vendor_id);
// Get currency object
$currency = Currency::where('code', $vendor->currency_code)->first();
$vendor->currency_rate = $currency->rate;
return response()->json($vendor);
}

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

@ -344,6 +344,11 @@ class Customers extends Controller
$customer = Customer::find($customer_id);
// Get currency object
$currency = Currency::where('code', $customer->currency_code)->first();
$customer->currency_rate = $currency->rate;
return response()->json($customer);
}

34
app/Http/Controllers/Incomes/Invoices.php
View File

@ -122,25 +122,6 @@ class Invoices extends Controller
*/
public function store(Request $request)
{
// Get customer object
$customer = Customer::findOrFail($request['customer_id']);
$request['customer_name'] = $customer->name;
$request['customer_email'] = $customer->email;
$request['customer_tax_number'] = $customer->tax_number;
$request['customer_phone'] = $customer->phone;
$request['customer_address'] = $customer->address;
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$request['invoice_status_code'] = 'draft';
$request['amount'] = 0;
$invoice = Invoice::create($request->input());
// Upload attachment
@ -367,21 +348,6 @@ class Invoices extends Controller
*/
public function update(Invoice $invoice, Request $request)
{
// Get customer object
$customer = Customer::findOrFail($request['customer_id']);
$request['customer_name'] = $customer->name;
$request['customer_email'] = $customer->email;
$request['customer_tax_number'] = $customer->tax_number;
$request['customer_phone'] = $customer->phone;
$request['customer_address'] = $customer->address;
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$taxes = [];
$tax_total = 0;
$sub_total = 0;

12
app/Http/Controllers/Incomes/Revenues.php
View File

@ -84,12 +84,6 @@ class Revenues extends Controller
*/
public function store(Request $request)
{
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$revenue = Revenue::create($request->input());
// Upload attachment
@ -181,12 +175,6 @@ class Revenues extends Controller
*/
public function update(Revenue $revenue, Request $request)
{
// Get currency
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$revenue->update($request->input());
// Upload attachment

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

@ -115,6 +115,15 @@
{{ Form::recurring('create') }}
{{ Form::fileGroup('attachment', trans('general.attachment'),[]) }}
{{ Form::hidden('vendor_name', '', ['id' => 'vendor_name']) }}
{{ Form::hidden('vendor_email', '', ['id' => 'vendor_email']) }}
{{ Form::hidden('vendor_tax_number', '', ['id' => 'vendor_tax_number']) }}
{{ Form::hidden('vendor_phone', '', ['id' => 'vendor_phone']) }}
{{ Form::hidden('vendor_address', '', ['id' => 'vendor_address']) }}
{{ Form::hidden('currency_rate', '', ['id' => 'currency_rate']) }}
{{ Form::hidden('bill_status_code', 'draft', ['id' => 'bill_status_code']) }}
{{ Form::hidden('amount', '0', ['id' => 'amount']) }}
</div>
<!-- /.box-body -->
@ -327,7 +336,14 @@
dataType: 'JSON',
data: 'vendor_id=' + $(this).val(),
success: function(data) {
$('#vendor_name').val(data.name);
$('#vendor_email').val(data.email);
$('#vendor_tax_number').val(data.tax_number);
$('#vendor_phone').val(data.phone);
$('#vendor_address').val(data.address);
$('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate);
// This event Select2 Stylesheet
$('#currency_code').trigger('change');
@ -452,6 +468,7 @@
$('#modal-create-vendor').modal('hide');
$("#vendor_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#vendor_id').trigger('change');
$("#vendor_id").select2('refresh');
},
error: function(error, textStatus, errorThrown) {

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

@ -121,6 +121,15 @@
{{ Form::recurring('edit', $bill) }}
{{ Form::fileGroup('attachment', trans('general.attachment'),[]) }}
{{ Form::hidden('vendor_name', null, ['id' => 'vendor_name']) }}
{{ Form::hidden('vendor_email', null, ['id' => 'vendor_email']) }}
{{ Form::hidden('vendor_tax_number', null, ['id' => 'vendor_tax_number']) }}
{{ Form::hidden('vendor_phone', null, ['id' => 'vendor_phone']) }}
{{ Form::hidden('vendor_address', null, ['id' => 'vendor_address']) }}
{{ Form::hidden('currency_rate', null, ['id' => 'currency_rate']) }}
{{ Form::hidden('bill_status_code', null, ['id' => 'bill_status_code']) }}
{{ Form::hidden('amount', null, ['id' => 'amount']) }}
</div>
<!-- /.box-body -->
@ -360,7 +369,14 @@
dataType: 'JSON',
data: 'vendor_id=' + $(this).val(),
success: function(data) {
$('#vendor_name').val(data.name);
$('#vendor_email').val(data.email);
$('#vendor_tax_number').val(data.tax_number);
$('#vendor_phone').val(data.phone);
$('#vendor_address').val(data.address);
$('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate);
// This event Select2 Stylesheet
$('#currency_code').trigger('change');

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

@ -20,6 +20,7 @@
<div class="input-group-append">
{!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', '', ['id' => 'currency_rate']) !!}
</div>
</div>
</div>
@ -84,6 +85,8 @@
@push('scripts')
<script type="text/javascript">
$(document).ready(function(){
$('#account_id').trigger('change');
//Date picker
$('#paid_at').datepicker({
format: 'yyyy-mm-dd',
@ -113,18 +116,20 @@
style : 'btn-default',
placeholder : '{{ trans('general.form.no_file_selected') }}'
});
});
$(document).on('change', '#account_id', function (e) {
$.ajax({
url: '{{ url("settings/currencies/currency") }}',
type: 'GET',
dataType: 'JSON',
data: 'account_id=' + $(this).val(),
success: function(data) {
$('#currency').val(data.currency_code);
$('#currency_code').val(data.currency_code);
}
});
$(document).on('change', '#account_id', function (e) {
$.ajax({
url: '{{ url("banking/accounts/currency") }}',
type: 'GET',
dataType: 'JSON',
data: 'account_id=' + $(this).val(),
success: function(data) {
$('#currency').val(data.currency_code);
$('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate);
}
});
});

27
resources/views/expenses/payments/edit.blade.php
View File

@ -37,6 +37,7 @@
<div class="input-group-append">
{!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}
</div>
</div>
</div>
@ -82,6 +83,8 @@
@push('scripts')
<script type="text/javascript">
$(document).ready(function(){
$('#account_id').trigger('change');
//Date picker
$('#paid_at').datepicker({
format: 'yyyy-mm-dd',
@ -136,18 +139,20 @@
confirmDelete("#attachment-{!! $payment->attachment->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $payment->attachment->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete') !!}");
});
@endif
});
$(document).on('change', '#account_id', function (e) {
$.ajax({
url: '{{ url("settings/currencies/currency") }}',
type: 'GET',
dataType: 'JSON',
data: 'account_id=' + $(this).val(),
success: function(data) {
$('#currency').val(data.currency_code);
$('#currency_code').val(data.currency_code);
}
});
$(document).on('change', '#account_id', function (e) {
$.ajax({
url: '{{ url("banking/accounts/currency") }}',
type: 'GET',
dataType: 'JSON',
data: 'account_id=' + $(this).val(),
success: function(data) {
$('#currency').val(data.currency_code);
$('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate);
}
});
});
</script>

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

@ -115,6 +115,15 @@
{{ Form::recurring('create') }}
{{ Form::fileGroup('attachment', trans('general.attachment')) }}
{{ Form::hidden('customer_name', '', ['id' => 'customer_name']) }}
{{ Form::hidden('customer_email', '', ['id' => 'customer_email']) }}
{{ Form::hidden('customer_tax_number', '', ['id' => 'customer_tax_number']) }}
{{ Form::hidden('customer_phone', '', ['id' => 'customer_phone']) }}
{{ Form::hidden('customer_address', '', ['id' => 'customer_address']) }}
{{ Form::hidden('currency_rate', '', ['id' => 'currency_rate']) }}
{{ Form::hidden('invoice_status_code', 'draft', ['id' => 'invoice_status_code']) }}
{{ Form::hidden('amount', '0', ['id' => 'amount']) }}
</div>
<!-- /.box-body -->
@ -328,7 +337,13 @@
dataType: 'JSON',
data: 'customer_id=' + $(this).val(),
success: function(data) {
$('#customer_name').val(data.name);
$('#customer_email').val(data.email);
$('#customer_tax_number').val(data.tax_number);
$('#customer_phone').val(data.phone);
$('#customer_address').val(data.address);
$('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate);
// This event Select2 Stylesheet
$('#currency_code').trigger('change');
@ -451,6 +466,8 @@
$('#modal-create-customer').modal('hide');
$("#customer_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
$('#customer_id').trigger('change');
$("#customer_id").select2('refresh');
},
error: function(error, textStatus, errorThrown) {

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

@ -120,6 +120,15 @@
{{ Form::recurring('edit', $invoice) }}
{{ Form::fileGroup('attachment', trans('general.attachment')) }}
{{ Form::hidden('customer_name', null, ['id' => 'customer_name']) }}
{{ Form::hidden('customer_email', null, ['id' => 'customer_email']) }}
{{ Form::hidden('customer_tax_number', null, ['id' => 'customer_tax_number']) }}
{{ Form::hidden('customer_phone', null, ['id' => 'customer_phone']) }}
{{ Form::hidden('customer_address', null, ['id' => 'customer_address']) }}
{{ Form::hidden('currency_rate', null, ['id' => 'currency_rate']) }}
{{ Form::hidden('invoice_status_code', null, ['id' => 'invoice_status_code']) }}
{{ Form::hidden('amount', null, ['id' => 'amount']) }}
</div>
<!-- /.box-body -->
@ -359,7 +368,13 @@
dataType: 'JSON',
data: 'customer_id=' + $(this).val(),
success: function(data) {
$('#customer_name').val(data.name);
$('#customer_email').val(data.email);
$('#customer_tax_number').val(data.tax_number);
$('#customer_phone').val(data.phone);
$('#customer_address').val(data.address);
$('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate);
// This event Select2 Stylesheet
$('#currency_code').trigger('change');

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

@ -20,6 +20,7 @@
<div class="input-group-append">
{!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', '', ['id' => 'currency_rate']) !!}
</div>
</div>
</div>
@ -84,6 +85,8 @@
@push('scripts')
<script type="text/javascript">
$(document).ready(function(){
$('#account_id').trigger('change');
//Date picker
$('#paid_at').datepicker({
format: 'yyyy-mm-dd',
@ -113,18 +116,20 @@
style : 'btn-default',
placeholder : '{{ trans('general.form.no_file_selected') }}'
});
});
$(document).on('change', '#account_id', function (e) {
$.ajax({
url: '{{ url("settings/currencies/currency") }}',
type: 'GET',
dataType: 'JSON',
data: 'account_id=' + $(this).val(),
success: function(data) {
$('#currency').val(data.currency_code);
$('#currency_code').val(data.currency_code);
}
});
$(document).on('change', '#account_id', function (e) {
$.ajax({
url: '{{ url("banking/accounts/currency") }}',
type: 'GET',
dataType: 'JSON',
data: 'account_id=' + $(this).val(),
success: function(data) {
$('#currency').val(data.currency_code);
$('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate);
}
});
});

27
resources/views/incomes/revenues/edit.blade.php
View File

@ -37,6 +37,7 @@
<div class="input-group-append">
{!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
{!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
{!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}
</div>
</div>
</div>
@ -82,6 +83,8 @@
@push('scripts')
<script type="text/javascript">
$(document).ready(function(){
$('#account_id').trigger('change');
//Date picker
$('#paid_at').datepicker({
format: 'yyyy-mm-dd',
@ -136,18 +139,20 @@
confirmDelete("#attachment-{!! $revenue->attachment->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $revenue->attachment->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete') !!}");
});
@endif
});
$(document).on('change', '#account_id', function (e) {
$.ajax({
url: '{{ url("settings/currencies/currency") }}',
type: 'GET',
dataType: 'JSON',
data: 'account_id=' + $(this).val(),
success: function(data) {
$('#currency').val(data.currency_code);
$('#currency_code').val(data.currency_code);
}
});
$(document).on('change', '#account_id', function (e) {
$.ajax({
url: '{{ url("banking/accounts/currency") }}',
type: 'GET',
dataType: 'JSON',
data: 'account_id=' + $(this).val(),
success: function(data) {
$('#currency').val(data.currency_code);
$('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate);
}
});
});
</script>

1
routes/web.php
View File

@ -98,6 +98,7 @@ Route::group(['middleware' => 'language'], function () {
});
Route::group(['prefix' => 'banking'], function () {
Route::get('accounts/currency', 'Banking\Accounts@currency')->name('accounts.currency');
Route::get('accounts/{account}/enable', 'Banking\Accounts@enable')->name('accounts.enable');
Route::get('accounts/{account}/disable', 'Banking\Accounts@disable')->name('accounts.disable');
Route::resource('accounts', 'Banking\Accounts');