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

refs #451 Add format files;

Browse Source 
Banking => Account,
Banking => Transfer,
Common => Items,
Expense => Payment,
Income => Revenue
This commit is contained in:
cuneytsenturk
2018-08-13 21:14:58 +03:00
parent 784d2fd6b1
commit e9d6cecf14
21 changed files with 1099 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,8 +40,10 @@ class Accounts extends Controller
public function create()
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('banking.accounts.create', compact('currencies'));
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
return view('banking.accounts.create', compact('currencies', 'currency'));
}
/**
@ -80,8 +82,10 @@ class Accounts extends Controller
$currencies = Currency::enabled()->pluck('name', 'code');
$account->default_account = ($account->id == setting('general.default_account')) ?: 1;
return view('banking.accounts.edit', compact('account', 'currencies'));
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
return view('banking.accounts.edit', compact('account', 'currencies', 'currency'));
}
/**
@ -239,6 +243,12 @@ class Accounts extends Controller
$account->currency_code = $currency_code;
$account->currency_rate = $currency->rate;
$account->thousands_separator = $currency->thousands_separator;
$account->decimal_mark = $currency->decimal_mark;
$account->precision = (int) $currency->precision;
$account->symbol_first = $currency->symbol_first;
$account->symbol = $currency->symbol;
return response()->json($account);
}
}

8
app/Http/Controllers/Banking/Transfers.php
View File

@ -102,7 +102,9 @@ class Transfers extends Controller
$payment_methods = Modules::getPaymentMethods();
return view('banking.transfers.create', compact('accounts', 'payment_methods'));
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
return view('banking.transfers.create', compact('accounts', 'payment_methods', 'currency'));
}
/**
@ -219,7 +221,9 @@ class Transfers extends Controller
$payment_methods = Modules::getPaymentMethods();
return view('banking.transfers.edit', compact('transfer', 'accounts', 'payment_methods'));
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
return view('banking.transfers.edit', compact('transfer', 'accounts', 'payment_methods', 'currency'));
}
/**

14
app/Http/Controllers/Common/Items.php
View File

@ -52,7 +52,9 @@ class Items extends Controller
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
return view('common.items.create', compact('categories', 'taxes'));
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
return view('common.items.create', compact('categories', 'taxes', 'currency'));
}
/**
@ -131,7 +133,9 @@ class Items extends Controller
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
return view('common.items.edit', compact('item', 'categories', 'taxes'));
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
return view('common.items.edit', compact('item', 'categories', 'taxes', 'currency'));
}
/**
@ -234,8 +238,8 @@ class Items extends Controller
*/
public function export()
{
\Excel::create('items', function ($excel) {
$excel->sheet('items', function ($sheet) {
\Excel::create('items', function($excel) {
$excel->sheet('items', function($sheet) {
$sheet->fromModel(Item::filter(request()->input())->get()->makeHidden([
'id', 'company_id', 'item_id', 'created_at', 'updated_at', 'deleted_at'
]));
@ -315,7 +319,7 @@ class Items extends Controller
if ($input_items) {
foreach ($input_items as $key => $item) {
$price = money($item['price'], $currency_code)->getAmount();
$price = (double) $item['price'];
$quantity = (double) $item['quantity'];
$item_tax_total= 0;

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

@ -64,13 +64,15 @@ class Payments extends Controller
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$currency = Currency::where('code', '=', $account_currency_code)->first();
$vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
return view('expenses.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods'));
return view('expenses.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
}
/**
@ -154,13 +156,15 @@ class Payments extends Controller
$account_currency_code = Account::where('id', $payment->account_id)->pluck('currency_code')->first();
$currency = Currency::where('code', '=', $account_currency_code)->first();
$vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods'));
return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
}
/**

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

@ -66,13 +66,15 @@ class Revenues extends Controller
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$currency = Currency::where('code', '=', $account_currency_code)->first();
$customers = Customer::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
return view('incomes.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods'));
return view('incomes.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
}
/**
@ -156,13 +158,15 @@ class Revenues extends Controller
$account_currency_code = Account::where('id', $revenue->account_id)->pluck('currency_code')->first();
$currency = Currency::where('code', '=', $account_currency_code)->first();
$customers = Customer::enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
return view('incomes.revenues.edit', compact('revenue', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods'));
return view('incomes.revenues.edit', compact('revenue', 'accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
}
/**

10
app/Http/Controllers/Settings/Currencies.php
View File

@ -288,13 +288,9 @@ class Currencies extends Controller
$code = request('code');
if ($code) {
$currency = config('money.' . $code);
$currency['symbol_first'] = $currency['symbol_first'] ? 1 : 0;
// Get currency object
$currency = Currency::where('code', $code)->first();
$json = (object) $currency;
}
return response()->json($json);
return response()->json($currency);
}
}