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

close #273 Fixed: Banking - Transfer and Transactions - Latest dates should be first then descend for consistency

Browse Source
This commit is contained in:
cuneytsenturk 2018-07-09 12:01:16 +03:00
parent bf30fad8af
commit eec7c0290b
6 changed files with 132 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,13 +37,13 @@ class Transactions extends Controller
$type = $request->get('type');
if ($type != 'income') {
$this->addTransactions(Payment::collect('paid_at'), trans_choice('general.expenses', 1));
$this->addTransactions(BillPayment::collect('paid_at'), trans_choice('general.expenses', 1), trans_choice('general.bills', 1));
$this->addTransactions(Payment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1));
$this->addTransactions(BillPayment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1), trans_choice('general.bills', 1));
}
if ($type != 'expense') {
$this->addTransactions(Revenue::collect('paid_at'), trans_choice('general.incomes', 1));
$this->addTransactions(InvoicePayment::collect('paid_at'), trans_choice('general.incomes', 1), trans_choice('general.invoices', 1));
$this->addTransactions(Revenue::collect(['paid_at'=> 'desc']), trans_choice('general.incomes', 1));
$this->addTransactions(InvoicePayment::collect(['paid_at'=> 'desc']), trans_choice('general.incomes', 1), trans_choice('general.invoices', 1));
}
$transactions = $this->getTransactions($request);

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

@ -11,6 +11,7 @@ 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;
@ -26,7 +27,7 @@ class Transfers extends Controller
{
$request = request();
$items = Transfer::with(['payment', 'payment.account', 'revenue', 'revenue.account'])->collect('payment.paid_at');
$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)]), '');
@ -118,42 +119,59 @@ class Transfers extends Controller
$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();
$request['account_id'] = $request['from_account_id'];
$request['paid_at'] = $request['transferred_at'];
$request['currency_code'] = $payment_currency_code;
$request['currency_rate'] = $currencies[$payment_currency_code];
$request['vendor_id'] = '0';
$request['category_id'] = Category::transfer(); // Transfer Category ID
$request['attachment'] = '';
$payment_request = [
'company_id' => $request['company_id'],
'account_id' => $request['from_account_id'],
'paid_at' => $request['transferred_at'],
'amount' => $request['amount'],
'currency_code' => $payment_currency_code,
'currency_rate' => $currencies[$payment_currency_code],
'vendor_id' => 0,
'description' => $request['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'payment_method' => $request['payment_method'],
'reference' => $request['reference'],
];
$payment = Payment::create($request->all());
$payment = Payment::create($payment_request);
// Convert amount if not same currency
if ($payment_currency_code != $revenue_currency_code) {
$transfer = new Transfer();
$transfer_amount = new Transfer();
$transfer->default_currency_code = $payment_currency_code;
$transfer->amount = $request['amount'];
$transfer->currency_code = $revenue_currency_code;
$transfer->currency_rate = $currencies[$revenue_currency_code];
$transfer_amount->default_currency_code = $payment_currency_code;
$transfer_amount->amount = $request['amount'];
$transfer_amount->currency_code = $revenue_currency_code;
$transfer_amount->currency_rate = $currencies[$revenue_currency_code];
$amount = $transfer->getDynamicConvertedAmount();
$amount = $transfer_amount->getDynamicConvertedAmount();
} else {
$amount = $request['amount'];
}
$request['account_id'] = $request['to_account_id'];
$request['amount'] = $amount;
$request['currency_code'] = $revenue_currency_code;
$request['currency_rate'] = $currencies[$revenue_currency_code];
$request['customer_id'] = '0';
$revenue_request = [
'company_id' => $request['company_id'],
'account_id' => $request['to_account_id'],
'paid_at' => $request['transferred_at'],
'amount' => $amount,
'currency_code' => $revenue_currency_code,
'currency_rate' => $currencies[$revenue_currency_code],
'customer_id' => 0,
'description' => $request['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'payment_method' => $request['payment_method'],
'reference' => $request['reference'],
];
$revenue = Revenue::create($request->all());
$revenue = Revenue::create($revenue_request);
$request['payment_id'] = $payment->id;
$request['revenue_id'] = $revenue->id;
$transfer_request = [
'company_id' => $request['company_id'],
'payment_id' => $payment->id,
'revenue_id' => $revenue->id,
];
Transfer::create($request->all());
Transfer::create($transfer_request);
$message = trans('messages.success.added', ['type' => trans_choice('general.transfers', 1)]);
@ -176,11 +194,11 @@ class Transfers extends Controller
$transfer['from_account_id'] = $payment->account_id;
$transfer['to_account_id'] = $revenue->account_id;
$transfer['transferred_at'] = $revenue->deposited_at;
$transfer['description'] = $revenue->description;
$transfer['amount'] = $revenue->amount;
$transfer['payment_method'] = $revenue->payment_method;
$transfer['reference'] = $revenue->reference;
$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;
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
@ -207,42 +225,59 @@ class Transfers extends Controller
$payment = Payment::findOrFail($transfer->payment_id);
$revenue = Revenue::findOrFail($transfer->revenue_id);
$request['account_id'] = $request['from_account_id'];
$request['paid_at'] = $request['transferred_at'];
$request['currency_code'] = $payment_currency_code;
$request['currency_rate'] = $currencies[$payment_currency_code];
$request['vendor_id'] = '0';
$request['category_id'] = Category::transfer(); // Transfer Category ID
$request['attachment'] = '';
$payment_request = [
'company_id' => $request['company_id'],
'account_id' => $request['from_account_id'],
'paid_at' => $request['transferred_at'],
'amount' => $request['amount'],
'currency_code' => $payment_currency_code,
'currency_rate' => $currencies[$payment_currency_code],
'vendor_id' => 0,
'description' => $request['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'payment_method' => $request['payment_method'],
'reference' => $request['reference'],
];
$payment->update($request->all());
$payment->update($payment_request);
// Convert amount if not same currency
if ($payment_currency_code != $revenue_currency_code) {
$transfer = new Transfer();
$transfer_amount = new Transfer();
$transfer->default_currency_code = $payment_currency_code;
$transfer->amount = $request['amount'];
$transfer->currency_code = $revenue_currency_code;
$transfer->currency_rate = $currencies[$revenue_currency_code];
$transfer_amount->default_currency_code = $payment_currency_code;
$transfer_amount->amount = $request['amount'];
$transfer_amount->currency_code = $revenue_currency_code;
$transfer_amount->currency_rate = $currencies[$revenue_currency_code];
$amount = $transfer->getDynamicConvertedAmount();
$amount = $transfer_amount->getDynamicConvertedAmount();
} else {
$amount = $request['amount'];
}
$request['account_id'] = $request['to_account_id'];
$request['amount'] = $amount;
$request['currency_code'] = $revenue_currency_code;
$request['currency_rate'] = $currencies[$revenue_currency_code];
$request['customer_id'] = '0';
$revenue_request = [
'company_id' => $request['company_id'],
'account_id' => $request['to_account_id'],
'paid_at' => $request['transferred_at'],
'amount' => $amount,
'currency_code' => $revenue_currency_code,
'currency_rate' => $currencies[$revenue_currency_code],
'customer_id' => 0,
'description' => $request['description'],
'category_id' => Category::transfer(), // Transfer Category ID
'payment_method' => $request['payment_method'],
'reference' => $request['reference'],
];
$revenue->update($request->all());
$revenue->update($revenue_request);
$request['payment_id'] = $payment->id;
$request['revenue_id'] = $revenue->id;
$transfer_request = [
'company_id' => $request['company_id'],
'payment_id' => $payment->id,
'revenue_id' => $revenue->id,
];
$transfer->update($request->all());
$transfer->update($transfer_request);
$message = trans('messages.success.updated', ['type' => trans_choice('general.transfers', 1)]);
@ -263,9 +298,9 @@ class Transfers extends Controller
$payment = Payment::findOrFail($transfer->payment_id);
$revenue = Revenue::findOrFail($transfer->revenue_id);
$transfer->delete();
$payment->delete();
$revenue->delete();
$transfer->delete();
$message = trans('messages.success.deleted', ['type' => trans_choice('general.transfers', 1)]);

1
app/Http/Kernel.php
View File

@ -95,5 +95,6 @@ class Kernel extends HttpKernel
'invoice.dateformat' => \App\Http\Middleware\InvoiceDateFormat::class,
'payment.dateformat' => \App\Http\Middleware\PaymentDateFormat::class,
'revenue.dateformat' => \App\Http\Middleware\RevenueDateFormat::class,
'transfer.dateformat' => \App\Http\Middleware\TransferDateFormat::class,
];
}

36
app/Http/Middleware/TransferDateFormat.php Normal file
View File

@ -0,0 +1,36 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
use Illuminate\Support\Facades\Request;
class TransferDateFormat
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$company_id = session('company_id');
if (empty($company_id)) {
return $next($request);
}
$method = Request::method();
if (($method == 'POST') || ($method == 'PATCH')) {
$time = Date::now()->format('H:i:s');
$request['transferred_at'] = $request['transferred_at'] . ' ' . $time;
}
return $next($request);
}
}

2
resources/views/banking/transfers/edit.blade.php
View File

@ -18,7 +18,7 @@
{{ Form::textGroup('amount', trans('general.amount'), 'money') }}
{{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
{{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => 'yyyy-mm-dd']) }}
{{ Form::textareaGroup('description', trans('general.description')) }}

2
routes/web.php
View File

@ -103,7 +103,7 @@ Route::group(['middleware' => 'language'], function () {
Route::get('accounts/{account}/disable', 'Banking\Accounts@disable')->name('accounts.disable');
Route::resource('accounts', 'Banking\Accounts');
Route::resource('transactions', 'Banking\Transactions');
Route::resource('transfers', 'Banking\Transfers');
Route::resource('transfers', 'Banking\Transfers', ['middleware' => ['transfer.dateformat']]);
});
Route::group(['prefix' => 'reports'], function () {