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

v2 first commit

Browse Source
This commit is contained in:
denisdulici
2019-11-16 10:21:14 +03:00
parent 5b23e9c2c4
commit 6d50fa8442
3075 changed files with 3451681 additions and 65594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,14 +2,16 @@
namespace App\Http\Controllers\Banking;
use App\Http\Controllers\Controller;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Banking\Account as Request;
use App\Jobs\Banking\CreateAccount;
use App\Jobs\Banking\DeleteAccount;
use App\Jobs\Banking\UpdateAccount;
use App\Models\Banking\Account;
use App\Models\Setting\Currency;
class Accounts extends Controller
{
/**
* Display a listing of the resource.
*
@ -29,7 +31,7 @@ class Accounts extends Controller
*/
public function show()
{
return redirect('banking/accounts');
return redirect()->route('accounts.index');
}
/**
@ -41,7 +43,7 @@ class Accounts extends Controller
{
$currencies = Currency::enabled()->pluck('name', 'code');
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
$currency = Currency::where('code', '=', setting('default.currency'))->first();
return view('banking.accounts.create', compact('currencies', 'currency'));
}
@ -55,19 +57,23 @@ class Accounts extends Controller
*/
public function store(Request $request)
{
$account = Account::create($request->all());
$response = $this->ajaxDispatch(new CreateAccount($request));
// Set default account
if ($request['default_account']) {
setting()->set('general.default_account', $account->id);
setting()->save();
if ($response['success']) {
$response['redirect'] = route('accounts.index');
$message = trans('messages.success.added', ['type' => trans_choice('general.accounts', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('accounts.create');
$message = $response['message'];
flash($message)->error();
}
$message = trans('messages.success.added', ['type' => trans_choice('general.accounts', 1)]);
flash($message)->success();
return redirect('banking/accounts');
return response()->json($response);
}
/**
@ -81,7 +87,7 @@ class Accounts extends Controller
{
$currencies = Currency::enabled()->pluck('name', 'code');
$account->default_account = ($account->id == setting('general.default_account')) ? 1 : 0;
$account->default_account = ($account->id == setting('default.account')) ? 1 : 0;
$currency = Currency::where('code', '=', $account->currency_code)->first();
@ -91,131 +97,92 @@ class Accounts extends Controller
/**
* Update the specified resource in storage.
*
* @param Account $account
* @param Request $request
* @param Account $account
* @param Request $request
*
* @return Response
*/
public function update(Account $account, Request $request)
{
// Check if we can disable or change the code
if (!$request['enabled'] || ($account->currency_code != $request['currency_code'])) {
$relationships = $this->countRelationships($account, [
'invoice_payments' => 'invoices',
'revenues' => 'revenues',
'bill_payments' => 'bills',
'payments' => 'payments',
]);
$response = $this->ajaxDispatch(new UpdateAccount($account, $request));
if (!$request['enabled'] && $account->id == setting('general.default_account')) {
$relationships[] = strtolower(trans_choice('general.companies', 1));
}
}
if ($response['success']) {
$response['redirect'] = route('accounts.index');
if (empty($relationships)) {
$account->update($request->all());
// Set default account
if ($request['default_account']) {
setting()->set('general.default_account', $account->id);
setting()->save();
}
$message = trans('messages.success.updated', ['type' => trans_choice('general.accounts', 1)]);
$message = trans('messages.success.updated', ['type' => $account->name]);
flash($message)->success();
return redirect('banking/accounts');
} else {
$message = trans('messages.warning.disable_code', ['name' => $account->name, 'text' => implode(', ', $relationships)]);
$response['redirect'] = route('accounts.edit', $account->id);
flash($message)->warning();
$message = $response['message'];
return redirect('banking/accounts/' . $account->id . '/edit');
flash($message)->error();
}
return response()->json($response);
}
/**
* Enable the specified resource.
*
* @param Account $account
* @param Account $account
*
* @return Response
*/
public function enable(Account $account)
{
$account->enabled = 1;
$account->save();
$response = $this->ajaxDispatch(new UpdateAccount($account, request()->merge(['enabled' => 1])));
$message = trans('messages.success.enabled', ['type' => trans_choice('general.accounts', 1)]);
if ($response['success']) {
$response['message'] = trans('messages.success.enabled', ['type' => $account->name]);
}
flash($message)->success();
return redirect()->route('accounts.index');
return response()->json($response);
}
/**
* Disable the specified resource.
*
* @param Account $account
* @param Account $account
*
* @return Response
*/
public function disable(Account $account)
{
if ($account->id == setting('general.default_account')) {
$relationships[] = strtolower(trans_choice('general.companies', 1));
$response = $this->ajaxDispatch(new UpdateAccount($account, request()->merge(['enabled' => 0])));
if ($response['success']) {
$response['message'] = trans('messages.success.disabled', ['type' => $account->name]);
}
if (empty($relationships)) {
$account->enabled = 0;
$account->save();
$message = trans('messages.success.disabled', ['type' => trans_choice('general.accounts', 1)]);
flash($message)->success();
} else {
$message = trans('messages.warning.disabled', ['name' => $account->name, 'text' => implode(', ', $relationships)]);
flash($message)->warning();
}
return redirect()->route('accounts.index');
return response()->json($response);
}
/**
* Remove the specified resource from storage.
*
* @param Account $account
* @param Account $account
*
* @return Response
*/
public function destroy(Account $account)
{
$relationships = $this->countRelationships($account, [
'bill_payments' => 'bills',
'payments' => 'payments',
'invoice_payments' => 'invoices',
'revenues' => 'revenues',
]);
$response = $this->ajaxDispatch(new DeleteAccount($account));
if ($account->id == setting('general.default_account')) {
$relationships[] = strtolower(trans_choice('general.companies', 1));
}
$response['redirect'] = route('accounts.index');
if (empty($relationships)) {
$account->delete();
$message = trans('messages.success.deleted', ['type' => trans_choice('general.accounts', 1)]);
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => $account->name]);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $account->name, 'text' => implode(', ', $relationships)]);
$message = $response['message'];
flash($message)->warning();
flash($message)->error();
}
return redirect('banking/accounts');
return response()->json($response);
}
public function currency()
@ -232,7 +199,7 @@ class Accounts extends Controller
return response()->json([]);
}
$currency_code = setting('general.default_currency');
$currency_code = setting('default.currency');
if (isset($account->currency_code)) {
$currencies = Currency::enabled()->pluck('name', 'code')->toArray();

165
app/Http/Controllers/Banking/Reconciliations.php
View File

@ -2,13 +2,15 @@
namespace App\Http\Controllers\Banking;
use App\Http\Controllers\Controller;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Banking\Reconciliation as Request;
use App\Http\Requests\Banking\ReconciliationCalculate as CalculateRequest;
use App\Jobs\Banking\CreateReconciliation;
use App\Jobs\Banking\DeleteReconciliation;
use App\Jobs\Banking\UpdateReconciliation;
use App\Models\Banking\Account;
use App\Models\Banking\Reconciliation;
use App\Models\Setting\Currency;
use Date;
use App\Models\Banking\Transaction;
class Reconciliations extends Controller
{
@ -45,7 +47,7 @@ class Reconciliations extends Controller
{
$accounts = Account::enabled()->pluck('name', 'id');
$account_id = request('account_id', setting('general.default_account'));
$account_id = request('account_id', setting('default.account'));
$started_at = request('started_at', '0000-00-00');
$ended_at = request('ended_at', '0000-00-00');
@ -55,7 +57,7 @@ class Reconciliations extends Controller
$transactions = $this->getTransactions($account, $started_at, $ended_at);
$opening_balance = $this->getOpeningBalance($account, $started_at, $ended_at);
$opening_balance = $this->getOpeningBalance($account, $started_at);
return view('banking.reconciliations.create', compact('accounts', 'account', 'currency', 'opening_balance', 'transactions'));
}
@ -69,34 +71,23 @@ class Reconciliations extends Controller
*/
public function store(Request $request)
{
$reconcile = $request->get('reconcile');
$transactions = $request->get('transactions');
$response = $this->ajaxDispatch(new CreateReconciliation($request));
Reconciliation::create([
'company_id' => session('company_id'),
'account_id' => $request->get('account_id'),
'started_at' => $request->get('started_at'),
'ended_at' => $request->get('ended_at'),
'closing_balance' => $request->get('closing_balance'),
'reconciled' => $reconcile ? 1 : 0,
]);
if ($response['success']) {
$response['redirect'] = route('reconciliations.index');
if ($transactions) {
foreach ($transactions as $key => $value) {
$t = explode('_', $key);
$m = '\\' . $t['1'];
$message = trans('messages.success.added', ['type' => trans_choice('general.reconciliations', 1)]);
$transaction = $m::find($t[0]);
$transaction->reconciled = 1;
$transaction->save();
}
flash($message)->success();
} else {
$response['redirect'] = route('reconciliations.create');
$message = $response['message'];
flash($message)->error();
}
$message = trans('messages.success.added', ['type' => trans_choice('general.reconciliations', 1)]);
flash($message)->success();
return redirect()->route('reconciliations.index');
return response()->json($response);
}
/**
@ -122,119 +113,73 @@ class Reconciliations extends Controller
/**
* Update the specified resource in storage.
*
* @param Reconciliation $reconciliation
* @param Request $request
* @param Reconciliation $reconciliation
* @param Request $request
*
* @return Response
*/
public function update(Reconciliation $reconciliation, Request $request)
{
$reconcile = $request->get('reconcile');
$transactions = $request->get('transactions');
$response = $this->ajaxDispatch(new UpdateReconciliation($reconciliation, $request));
$reconciliation->reconciled = $reconcile ? 1 : 0;
$reconciliation->save();
if ($response['success']) {
$response['redirect'] = route('reconciliations.index');
if ($transactions) {
foreach ($transactions as $key => $value) {
$t = explode('_', $key);
$m = '\\' . $t['1'];
$message = trans('messages.success.updated', ['type' => trans_choice('general.reconciliations', 1)]);
$transaction = $m::find($t[0]);
$transaction->reconciled = 1;
$transaction->save();
}
flash($message)->success();
} else {
$response['redirect'] = route('reconciliations.edit', $reconciliation->id);
$message = $response['message'];
flash($message)->error();
}
$message = trans('messages.success.updated', ['type' => trans_choice('general.reconciliations', 1)]);
flash($message)->success();
return redirect()->route('reconciliations.index');
return response()->json($response);
}
/**
* Remove the specified resource from storage.
*
* @param Reconciliation $reconciliation
* @param Reconciliation $reconciliation
*
* @return Response
*/
public function destroy(Reconciliation $reconciliation)
{
$reconciliation->delete();
$response = $this->ajaxDispatch(new DeleteReconciliation($reconciliation));
$models = [
'App\Models\Expense\Payment',
'App\Models\Expense\BillPayment',
'App\Models\Income\Revenue',
'App\Models\Income\InvoicePayment',
];
$response['redirect'] = route('reconciliations.index');
foreach ($models as $model) {
$m = '\\' . $model;
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => trans_choice('general.reconciliations', 1)]);
$m::where('account_id', $reconciliation->account_id)
->reconciled()
->whereBetween('paid_at', [$reconciliation->started_at, $reconciliation->ended_at])->each(function ($item) {
$item->reconciled = 0;
$item->save();
});
flash($message)->success();
} else {
$message = $response['message'];
flash($message)->error();
}
$message = trans('messages.success.deleted', ['type' => trans_choice('general.reconciliations', 1)]);
flash($message)->success();
return redirect()->route('reconciliations.index');
return response()->json($response);
}
/**
* Add transactions array.
*
* @param $account_id
* @param $account
* @param $started_at
* @param $ended_at
*
* @return array
* @return mixed
*/
protected function getTransactions($account, $started_at, $ended_at)
{
$started = explode(' ', $started_at);
$ended = explode(' ', $ended_at);
$models = [
'App\Models\Expense\Payment',
'App\Models\Expense\BillPayment',
'App\Models\Income\Revenue',
'App\Models\Income\InvoicePayment',
];
$transactions = [];
foreach ($models as $model) {
$m = '\\' . $model;
$m::where('account_id', $account->id)->whereBetween('paid_at', [$started[0], $ended[0]])->each(function($item) use(&$transactions, $model) {
$item->model = $model;
if (($model == 'App\Models\Income\InvoicePayment') || ($model == 'App\Models\Income\Revenue')) {
if ($item->invoice) {
$item->contact = $item->invoice->customer;
} else {
$item->contact = $item->customer;
}
} else {
if ($item->bill) {
$item->contact = $item->bill->vendor;
} else {
$item->contact = $item->vendor;
}
}
$transactions[] = $item;
});
}
$transactions = Transaction::where('account_id', $account->id)->whereBetween('paid_at', [$started[0], $ended[0]])->get();
return collect($transactions)->sortByDesc('paid_at');
}
@ -252,24 +197,12 @@ class Reconciliations extends Controller
// Opening Balance
$total = $account->opening_balance;
// Sum invoices
$invoice_payments = $account->invoice_payments()->whereDate('paid_at', '<', $started_at)->get();
foreach ($invoice_payments as $item) {
$total += $item->amount;
}
// Sum revenues
$revenues = $account->revenues()->whereDate('paid_at', '<', $started_at)->get();
foreach ($revenues as $item) {
$total += $item->amount;
}
// Subtract bills
$bill_payments = $account->bill_payments()->whereDate('paid_at', '<', $started_at)->get();
foreach ($bill_payments as $item) {
$total -= $item->amount;
}
// Subtract payments
$payments = $account->payments()->whereDate('paid_at', '<', $started_at)->get();
foreach ($payments as $item) {
@ -292,9 +225,9 @@ class Reconciliations extends Controller
$opening_balance = $request['opening_balance'];
foreach ($transactions as $key => $value) {
$model = explode('_', $key);
$k = explode('_', $key);
if (($model[1] == 'App\Models\Income\InvoicePayment') || ($model[1] == 'App\Models\Income\Revenue')) {
if ($k[1] == 'income') {
$income_total += $value;
} else {
$expense_total += $value;

110
app/Http/Controllers/Banking/Transactions.php
View File

@ -2,20 +2,17 @@
namespace App\Http\Controllers\Banking;
use App\Http\Controllers\Controller;
use App\Abstracts\Http\Controller;
use App\Exports\Banking\Transactions as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Banking\Transactions as Import;
use App\Jobs\Banking\DeleteTransaction;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Expense\BillPayment;
use App\Models\Expense\Payment;
use App\Models\Income\InvoicePayment;
use App\Models\Income\Revenue;
use App\Models\Setting\Category;
class Transactions extends Controller
{
public $transactions = [];
/**
* Display a listing of the resource.
*
@ -23,79 +20,70 @@ class Transactions extends Controller
*/
public function index()
{
$request = request();
$accounts = collect(Account::enabled()->pluck('name', 'id'));
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$types = collect(['expense' => 'Expense', 'income' => 'Income'])
->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), '');
$type = $request->get('type');
$request_type = !request()->has('type') ? ['income', 'expense'] : request('type');
$categories = Category::enabled()->type($request_type)->orderBy('name')->pluck('name', 'id');
$type_cats = empty($type) ? ['income', 'expense'] : $type;
$categories = collect(Category::enabled()->type($type_cats)->pluck('name', 'id'));
if ($type != 'income') {
$this->addTransactions(Payment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1));
$this->addTransactions(BillPayment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1));
}
if ($type != 'expense') {
$this->addTransactions(Revenue::collect(['paid_at'=> 'desc']), trans_choice('general.incomes', 1));
$this->addTransactions(InvoicePayment::collect(['paid_at'=> 'desc']), trans_choice('general.incomes', 1));
}
$transactions = $this->getTransactions($request);
$transactions = Transaction::with(['account', 'category', 'contact'])->collect(['paid_at'=> 'desc']);
return view('banking.transactions.index', compact('transactions', 'accounts', 'types', 'categories'));
}
/**
* Add items to transactions array.
* Import the specified resource.
*
* @param $items
* @param $type
* @param ImportRequest $request
*
* @return Response
*/
protected function addTransactions($items, $type)
public function import(ImportRequest $request)
{
foreach ($items as $item) {
if (!empty($item->category)) {
$category_name = ($item->category) ? $item->category->name : trans('general.na');
} else {
if ($type == trans_choice('general.incomes', 1)) {
$category_name = ($item->invoice->category) ? $item->invoice->category->name : trans('general.na');
} else {
$category_name = ($item->bill->category) ? $item->bill->category->name : trans('general.na');
}
}
\Excel::import(new Import(), $request->file('import'));
$this->transactions[] = (object) [
'paid_at' => $item->paid_at,
'account_name' => $item->account->name,
'type' => $type,
'description' => $item->description,
'amount' => $item->amount,
'currency_code' => $item->currency_code,
'category_name' => $category_name,
];
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.transactions', 2)]);
flash($message)->success();
return redirect()->route('transactions.index');
}
protected function getTransactions($request)
/**
* Remove the specified resource from storage.
*
* @param Transaction $transaction
*
* @return Response
*/
public function destroy(Transaction $transaction)
{
// Sort items
if (isset($request['sort'])) {
if ($request['order'] == 'asc') {
$f = 'sortBy';
} else {
$f = 'sortByDesc';
}
$response = $this->ajaxDispatch(new DeleteTransaction($transaction));
$transactions = collect($this->transactions)->$f($request['sort']);
$response['redirect'] = url()->previous();
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => trans_choice('general.transactions', 1)]);
flash($message)->success();
} else {
$transactions = collect($this->transactions)->sortByDesc('paid_at');
$message = $response['message'];
flash($message)->error();
}
return $transactions;
return response()->json($response);
}
/**
* Export the specified resource.
*
* @return Response
*/
public function export()
{
return \Excel::download(new Export(), trans_choice('general.transactions', 2) . '.xlsx');
}
}

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

@ -2,22 +2,19 @@
namespace App\Http\Controllers\Banking;
use App\Http\Controllers\Controller;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Banking\Transfer as Request;
use App\Jobs\Banking\CreateTransfer;
use App\Jobs\Banking\UpdateTransfer;
use App\Jobs\Banking\DeleteTransfer;
use App\Models\Banking\Account;
use App\Models\Banking\Transfer;
use App\Models\Expense\Payment;
use App\Models\Income\Revenue;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use Date;
use App\Utilities\Modules;
use Date;
class Transfers extends Controller
{
/**
* Display a listing of the resource.
*
@ -25,45 +22,43 @@ class Transfers extends Controller
*/
public function index()
{
$request = request();
$data = [];
$items = Transfer::with(['payment', 'payment.account', 'revenue', 'revenue.account'])->collect(['payment.paid_at' => 'desc']);
$accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
$transfers = array();
$items = Transfer::with([
'expense_transaction', 'expense_transaction.account', 'income_transaction', 'income_transaction.account'
])->collect(['expense_transaction.paid_at' => 'desc']);
foreach ($items as $item) {
$revenue = $item->revenue;
$payment = $item->payment;
$income_transaction = $item->income_transaction;
$expense_transaction = $item->expense_transaction;
$name = trans('transfers.messages.delete', [
'from' => $payment->account->name,
'to' => $revenue->account->name,
'amount' => money($payment->amount, $payment->currency_code, true)
'from' => $expense_transaction->account->name,
'to' => $income_transaction->account->name,
'amount' => money($expense_transaction->amount, $expense_transaction->currency_code, true)
]);
$transfers[] = (object)[
$data[] = (object) [
'id' => $item->id,
'name' => $name,
'from_account' => $payment->account->name,
'to_account' => $revenue->account->name,
'amount' => $payment->amount,
'currency_code' => $payment->currency_code,
'paid_at' => $payment->paid_at,
'from_account' => $expense_transaction->account->name,
'to_account' => $income_transaction->account->name,
'amount' => $expense_transaction->amount,
'currency_code' => $expense_transaction->currency_code,
'paid_at' => $expense_transaction->paid_at,
];
}
$special_key = array(
'payment.name' => 'from_account',
'revenue.name' => 'to_account',
'expense_transaction.name' => 'from_account',
'income_transaction.name' => 'to_account',
);
$request = request();
if (isset($request['sort']) && array_key_exists($request['sort'], $special_key)) {
$sort_order = array();
foreach ($transfers as $key => $value) {
foreach ($data as $key => $value) {
$sort = $request['sort'];
if (array_key_exists($request['sort'], $special_key)) {
@ -75,10 +70,15 @@ class Transfers extends Controller
$sort_type = (isset($request['order']) && $request['order'] == 'asc') ? SORT_ASC : SORT_DESC;
array_multisort($sort_order, $sort_type, $transfers);
array_multisort($sort_order, $sort_type, $data);
}
return view('banking.transfers.index', compact('transfers', 'items', 'accounts'));
$transfers = $this->paginate($data);
$accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
return view('banking.transfers.index', compact('transfers', 'accounts'));
}
/**
@ -88,7 +88,7 @@ class Transfers extends Controller
*/
public function show()
{
return redirect('banking/transfers');
return redirect()->route('transfers.index');
}
/**
@ -102,7 +102,7 @@ class Transfers extends Controller
$payment_methods = Modules::getPaymentMethods();
$currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first();
$currency = Currency::where('code', setting('default.currency'))->first();
return view('banking.transfers.create', compact('accounts', 'payment_methods', 'currency'));
}
@ -116,113 +116,49 @@ class Transfers extends Controller
*/
public function store(Request $request)
{
$currencies = Currency::enabled()->pluck('rate', 'code')->toArray();
$response = $this->ajaxDispatch(new CreateTransfer($request));
$payment_currency_code = Account::where('id', $request['from_account_id'])->pluck('currency_code')->first();
$revenue_currency_code = Account::where('id', $request['to_account_id'])->pluck('currency_code')->first();
if ($response['success']) {
$response['redirect'] = route('transfers.index');
$payment_request = [
'company_id' => $request['company_id'],
'account_id' => $request['from_account_id'],
'paid_at' => $request['transferred_at'],
'currency_code' => $payment_currency_code,
'currency_rate' => $currencies[$payment_currency_code],
'amount' => $request['amount'],
'vendor_id' => 0,
'description' => $request['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'payment_method' => $request['payment_method'],
'reference' => $request['reference'],
];
$message = trans('messages.success.added', ['type' => trans_choice('general.transfers', 1)]);
$payment = Payment::create($payment_request);
// Convert amount if not same currency
if ($payment_currency_code != $revenue_currency_code) {
$default_currency = setting('general.default_currency', 'USD');
$default_amount = $request['amount'];
if ($default_currency != $payment_currency_code) {
$default_amount_model = new Transfer();
$default_amount_model->default_currency_code = $default_currency;
$default_amount_model->amount = $request['amount'];
$default_amount_model->currency_code = $payment_currency_code;
$default_amount_model->currency_rate = $currencies[$payment_currency_code];
$default_amount = $default_amount_model->getDivideConvertedAmount();
}
$transfer_amount = new Transfer();
$transfer_amount->default_currency_code = $payment_currency_code;
$transfer_amount->amount = $default_amount;
$transfer_amount->currency_code = $revenue_currency_code;
$transfer_amount->currency_rate = $currencies[$revenue_currency_code];
$amount = $transfer_amount->getDynamicConvertedAmount();
flash($message)->success();
} else {
$amount = $request['amount'];
$response['redirect'] = route('transfers.create');
$message = $response['message'];
flash($message)->error();
}
$revenue_request = [
'company_id' => $request['company_id'],
'account_id' => $request['to_account_id'],
'paid_at' => $request['transferred_at'],
'currency_code' => $revenue_currency_code,
'currency_rate' => $currencies[$revenue_currency_code],
'amount' => $amount,
'customer_id' => 0,
'description' => $request['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'payment_method' => $request['payment_method'],
'reference' => $request['reference'],
];
$revenue = Revenue::create($revenue_request);
$transfer_request = [
'company_id' => $request['company_id'],
'payment_id' => $payment->id,
'revenue_id' => $revenue->id,
];
Transfer::create($transfer_request);
$message = trans('messages.success.added', ['type' => trans_choice('general.transfers', 1)]);
flash($message)->success();
return redirect('banking/transfers');
return response()->json($response);
}
/**
* Show the form for editing the specified resource.
*
* @param Request $request
* @param Transfer $transfer
*
* @return Response
*/
public function edit(Transfer $transfer)
{
$payment = Payment::findOrFail($transfer->payment_id);
$revenue = Revenue::findOrFail($transfer->revenue_id);
$transfer['from_account_id'] = $transfer->expense_transaction->account_id;
$transfer['to_account_id'] = $transfer->income_transaction->account_id;
$transfer['transferred_at'] = Date::parse($transfer->expense_transaction->paid_at)->format('Y-m-d');
$transfer['description'] = $transfer->expense_transaction->description;
$transfer['amount'] = $transfer->expense_transaction->amount;
$transfer['payment_method'] = $transfer->expense_transaction->payment_method;
$transfer['reference'] = $transfer->expense_transaction->reference;
$transfer['from_account_id'] = $payment->account_id;
$transfer['to_account_id'] = $revenue->account_id;
$transfer['transferred_at'] = Date::parse($payment->paid_at)->format('Y-m-d');
$transfer['description'] = $payment->description;
$transfer['amount'] = $payment->amount;
$transfer['payment_method'] = $payment->payment_method;
$transfer['reference'] = $payment->reference;
$account = Account::find($payment->account_id);
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
$currency = Currency::where('code', '=', $account->currency_code)->first();
$account = $transfer->expense_transaction->account;
$currency = Currency::where('code', $account->currency_code)->first();
return view('banking.transfers.edit', compact('transfer', 'accounts', 'payment_methods', 'currency'));
}
@ -230,117 +166,55 @@ class Transfers extends Controller
/**
* Update the specified resource in storage.
*
* @param Transfer $transfer
* @param $id
* @param Request $request
*
* @return Response
*/
public function update(Transfer $transfer, Request $request)
{
$currencies = Currency::enabled()->pluck('rate', 'code')->toArray();
$response = $this->ajaxDispatch(new UpdateTransfer($transfer, $request));
$payment_currency_code = Account::where('id', $request['from_account_id'])->pluck('currency_code')->first();
$revenue_currency_code = Account::where('id', $request['to_account_id'])->pluck('currency_code')->first();
if ($response['success']) {
$response['redirect'] = route('transfers.index');
$payment = Payment::findOrFail($transfer->payment_id);
$revenue = Revenue::findOrFail($transfer->revenue_id);
$message = trans('messages.success.updated', ['type' => trans_choice('general.transfers', 1)]);
$payment_request = [
'company_id' => $request['company_id'],
'account_id' => $request['from_account_id'],
'paid_at' => $request['transferred_at'],
'currency_code' => $payment_currency_code,
'currency_rate' => $currencies[$payment_currency_code],
'amount' => $request['amount'],
'vendor_id' => 0,
'description' => $request['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'payment_method' => $request['payment_method'],
'reference' => $request['reference'],
];
$payment->update($payment_request);
// Convert amount if not same currency
if ($payment_currency_code != $revenue_currency_code) {
$default_currency = setting('general.default_currency', 'USD');
$default_amount = $request['amount'];
if ($default_currency != $payment_currency_code) {
$default_amount_model = new Transfer();
$default_amount_model->default_currency_code = $default_currency;
$default_amount_model->amount = $request['amount'];
$default_amount_model->currency_code = $payment_currency_code;
$default_amount_model->currency_rate = $currencies[$payment_currency_code];
$default_amount = $default_amount_model->getDivideConvertedAmount();
}
$transfer_amount = new Transfer();
$transfer_amount->default_currency_code = $payment_currency_code;
$transfer_amount->amount = $default_amount;
$transfer_amount->currency_code = $revenue_currency_code;
$transfer_amount->currency_rate = $currencies[$revenue_currency_code];
$amount = $transfer_amount->getDynamicConvertedAmount();
flash($message)->success();
} else {
$amount = $request['amount'];
$response['redirect'] = route('transfers.edit', $transfer->id);
$message = $response['message'];
flash($message)->error();
}
$revenue_request = [
'company_id' => $request['company_id'],
'account_id' => $request['to_account_id'],
'paid_at' => $request['transferred_at'],
'currency_code' => $revenue_currency_code,
'currency_rate' => $currencies[$revenue_currency_code],
'amount' => $amount,
'customer_id' => 0,
'description' => $request['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'payment_method' => $request['payment_method'],
'reference' => $request['reference'],
];
$revenue->update($revenue_request);
$transfer_request = [
'company_id' => $request['company_id'],
'payment_id' => $payment->id,
'revenue_id' => $revenue->id,
];
$transfer->update($transfer_request);
$message = trans('messages.success.updated', ['type' => trans_choice('general.transfers', 1)]);
flash($message)->success();
return redirect('banking/transfers');
return response()->json($response);
}
/**
* Remove the specified resource from storage.
*
* @param Transfer $transfer
* @param $id
*
* @return Response
*/
public function destroy(Transfer $transfer)
{
$payment = Payment::findOrFail($transfer->payment_id);
$revenue = Revenue::findOrFail($transfer->revenue_id);
$response = $this->ajaxDispatch(new DeleteTransfer($transfer));
$payment->delete();
$revenue->delete();
$transfer->delete();
$response['redirect'] = route('transfers.index');
$message = trans('messages.success.deleted', ['type' => trans_choice('general.transfers', 1)]);
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => trans_choice('general.transfers', 1)]);
flash($message)->success();
flash($message)->success();
} else {
$message = $response['message'];
return redirect('banking/transfers');
flash($message)->error();
}
return response()->json($response);
}
}