From bf74ee7f83612bfb39dedab425606620a9d8f455 Mon Sep 17 00:00:00 2001
From: Kostas Dizas <254960+kostasdizas@users.noreply.github.com>
Date: Fri, 2 Nov 2018 13:58:43 +0000
Subject: [PATCH] Fixed bug in reconciliations that prevented it from working
 in linux and other OSes

Fixes #578
---
 app/Http/Controllers/Banking/Reconciliations.php         | 4 ++--
 resources/views/banking/reconciliations/create.blade.php | 2 +-
 resources/views/banking/reconciliations/edit.blade.php   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Banking/Reconciliations.php b/app/Http/Controllers/Banking/Reconciliations.php
index 035d97f07..2ea4a5262 100644
--- a/app/Http/Controllers/Banking/Reconciliations.php
+++ b/app/Http/Controllers/Banking/Reconciliations.php
@@ -218,7 +218,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 {
@@ -294,7 +294,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;
diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php
index a54b26c7b..3fa92d86b 100644
--- a/resources/views/banking/reconciliations/create.blade.php
+++ b/resources/views/banking/reconciliations/create.blade.php
@@ -62,7 +62,7 @@
                                     <td>{{ Date::parse($item->paid_at)->format($date_format) }}</td>
                                     <td>{{ $item->description }}</td>
                                     <td>@if (!empty($item->contact)) {{ $item->contact->name }} @else {{ trans('general.na') }}@endif</td>
-                                    @if ((basename($item->model) == 'Invoice') || (basename($item->model) == 'Revenue'))
+                                    @if (($item->model == 'App\Models\Income\Invoice') || ($item->model == 'App\Models\Income\Revenue'))
                                     <td class="text-right">@money($item->amount, $item->currency_code, true)</td>
                                     <td>&nbsp;</td>
                                     @else
diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php
index 73f9a7f43..c5934fb12 100644
--- a/resources/views/banking/reconciliations/edit.blade.php
+++ b/resources/views/banking/reconciliations/edit.blade.php
@@ -41,7 +41,7 @@
                             <td>{{ Date::parse($item->paid_at)->format($date_format) }}</td>
                             <td>{{ $item->description }}</td>
                             <td>@if (!empty($item->contact)) {{ $item->contact->name }} @else {{ trans('general.na') }}@endif</td>
-                            @if ((basename($item->model) == 'Invoice') || (basename($item->model) == 'Revenue'))
+                            @if (($item->model == 'App\Models\Income\Invoice') || ($item->model == 'App\Models\Income\Revenue'))
                                 <td class="text-right">@money($item->amount, $item->currency_code, true)</td>
                                 <td>&nbsp;</td>
                             @else