From c2719dcbcadfe844dca74a98fbfb73c7d751c34a Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 18 Jan 2020 17:24:13 +0300
Subject: [PATCH] removed extra transfer check

---
 app/Http/Controllers/Purchases/Payments.php   |  4 +-
 app/Http/Controllers/Sales/Revenues.php       |  4 +-
 .../views/purchases/payments/index.blade.php  | 41 +++++++---------
 .../views/sales/revenues/index.blade.php      | 47 ++++++++-----------
 4 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php
index 06b6d0e76..15c1e7263 100644
--- a/app/Http/Controllers/Purchases/Payments.php
+++ b/app/Http/Controllers/Purchases/Payments.php
@@ -39,9 +39,7 @@ class Payments extends Controller
 
         $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
 
-        $transfer_cat_id = Category::transfer();
-
-        return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
+        return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
     }
 
     /**
diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php
index 4339f1b5e..1bd77e447 100644
--- a/app/Http/Controllers/Sales/Revenues.php
+++ b/app/Http/Controllers/Sales/Revenues.php
@@ -39,9 +39,7 @@ class Revenues extends Controller
 
         $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
 
-        $transfer_cat_id = Category::transfer();
-
-        return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
+        return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
     }
 
     /**
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index e63c10740..e9ae47432 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -47,7 +47,6 @@
 
                     <tbody>
                         @foreach($payments as $item)
-                            @php $is_transfer = ($item->category && ($item->category->id == $transfer_cat_id)); @endphp
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
                                 @if ($item->reconciled)
@@ -60,34 +59,26 @@
                                 <td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td>
                                 <td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td>
                                 <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">
-                                    @if (!$is_transfer)
-                                        <div class="dropdown">
-                                            <a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <i class="fa fa-ellipsis-h text-muted"></i>
-                                            </a>
-                                            <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
+                                    <div class="dropdown">
+                                        <a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="fa fa-ellipsis-h text-muted"></i>
+                                        </a>
+                                        <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
+                                            @if (!$item->reconciled)
+                                                <a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a>
+                                                <div class="dropdown-divider"></div>
+                                            @endif
+                                            @permission('create-purchases-payments')
+                                                <a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
+                                            @endpermission
+                                            @permission('delete-purchases-payments')
                                                 @if (!$item->reconciled)
-                                                    <a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a>
                                                     <div class="dropdown-divider"></div>
+                                                    {!! Form::deleteLink($item, 'purchases/payments') !!}
                                                 @endif
-                                                @permission('create-purchases-payments')
-                                                    <a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
-                                                @endpermission
-                                                @permission('delete-purchases-payments')
-                                                    @if (!$item->reconciled)
-                                                        <div class="dropdown-divider"></div>
-                                                        {!! Form::deleteLink($item, 'purchases/payments') !!}
-                                                    @endif
-                                                @endpermission
-                                            </div>
+                                            @endpermission
                                         </div>
-                                    @else
-                                        <div class="dropdown">
-                                            <button class="btn btn-white btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="tooltip" aria-haspopup="true" aria-expanded="false" title="This Transfer, If you want to action redirect">
-                                                <i class="fa fa-exchange-alt text-muted"></i>
-                                            </button>
-                                        </div>
-                                    @endif
+                                    </div>
                                 </td>
                             </tr>
                         @endforeach
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 674342bd2..99dd07eb5 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -47,7 +47,6 @@
 
                     <tbody>
                         @foreach($revenues as $item)
-                            @php $is_transfer = ($item->category && ($item->category->id == $transfer_cat_id)); @endphp
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
                                 @if ($item->reconciled)
@@ -60,35 +59,27 @@
                                 <td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td>
                                 <td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td>
                                 <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">
-                                    @if (!$is_transfer)
-                                        <div class="dropdown">
-                                            <a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <i class="fa fa-ellipsis-h text-muted"></i>
-                                            </a>
-                                            <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
-                                                @if (!$item->reconciled)
-                                                    <a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a>
-                                                    <div class="dropdown-divider"></div>
-                                                @endif
-                                                @permission('create-sales-revenues')
-                                                    <a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
-                                                @endpermission
+                                    <div class="dropdown">
+                                        <a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="fa fa-ellipsis-h text-muted"></i>
+                                        </a>
+                                        <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
+                                            @if (!$item->reconciled)
+                                                <a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a>
+                                                <div class="dropdown-divider"></div>
+                                            @endif
+                                            @permission('create-sales-revenues')
+                                                <a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
+                                            @endpermission
 
-                                                @permission('delete-sales-revenues')
-                                                    @if (!$item->reconciled)
-                                                        <div class="dropdown-divider"></div>
-                                                        {!! Form::deleteLink($item, 'sales/revenues') !!}
-                                                    @endif
-                                                @endpermission
-                                            </div>
+                                            @permission('delete-sales-revenues')
+                                                @if (!$item->reconciled)
+                                                    <div class="dropdown-divider"></div>
+                                                    {!! Form::deleteLink($item, 'sales/revenues') !!}
+                                                @endif
+                                            @endpermission
                                         </div>
-                                    @else
-                                        <div class="dropdown">
-                                            <button class="btn btn-secondary btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="tooltip" aria-haspopup="true" aria-expanded="false" title="This Transfer, If you want to action redirect">
-                                                <i class="fa fa-exchange-alt text-muted"></i>
-                                            </button>
-                                        </div>
-                                    @endif
+                                    </div>
                                 </td>
                             </tr>
                         @endforeach