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

Merge pull request #585 from kostasdizas/issue578

Browse Source 
Fixed bug in reconciliations that prevented it from working in linux and other OSes
This commit is contained in:
Cüneyt Şentürk
2018-11-02 18:17:10 +03:00
committed by GitHub
parent 97f8c168a4 bf74ee7f83
commit 0083171a99
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,7 +217,7 @@ class Reconciliations extends Controller
$m::where('account_id', $account->id)->whereBetween('paid_at', [$started[0], $ended[0]])->each(function($item) use(&$transactions, $model) {
$item->model = $model;
if ((basename($model) == 'Invoice') || (basename($model) == 'Revenue')) {
if (($model == 'App\Models\Income\Invoice') || ($model == 'App\Models\Income\Revenue')) {
if ($item->invoice) {
$item->contact = $item->invoice->customer;
} else {
@ -293,7 +293,7 @@ class Reconciliations extends Controller
foreach ($transactions as $key => $value) {
$model = explode('_', $key);
if ((basename($model[1]) == 'Invoice') || (basename($model[1]) == 'Revenue')) {
if (($model[1] == 'App\Models\Income\Invoice') || ($model[1] == 'App\Models\Income\Revenue')) {
$income_total += $value;
} else {
$expense_total += $value;