Removed code related to "related transactions".

app/Http/Controllers/RelatedController.php

@@ -1,164 +0,0 @@
-<?php namespace FireflyIII\Http\Controllers;
-
-use Auth;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionGroup;
-use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use Illuminate\Support\Collection;
-use Input;
-use Redirect;
-use Response;
-use URL;
-
-/**
- * Class RelatedController
- *
- * @package FireflyIII\Http\Controllers
- */
-class RelatedController extends Controller
-{
-
-    /**
-     *
-     * @param TransactionJournal $journal
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function alreadyRelated(TransactionJournal $journal)
-    {
-        $ids = [];
-        /** @var TransactionGroup $group */
-        foreach ($journal->transactiongroups()->get() as $group) {
-            /** @var TransactionJournal $loopJournal */
-            foreach ($group->transactionjournals()->get() as $loopJournal) {
-                if ($loopJournal->id != $journal->id) {
-                    $ids[] = $loopJournal->id;
-                }
-            }
-        }
-        $unique   = array_unique($ids);
-        $journals = new Collection;
-        if (count($unique) > 0) {
-            $journals = Auth::user()->transactionjournals()->whereIn('id', $unique)->get();
-        }
-        $parent = $journal;
-
-        return view('related.alreadyRelated', compact('parent', 'journals'));
-    }
-
-    /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
-     *
-     * @param TransactionJournal $parentJournal
-     * @param TransactionJournal $childJournal
-     *
-     * @return \Illuminate\Http\JsonResponse
-     * @throws Exception
-     */
-    public function getRemoveRelation(TransactionJournal $parentJournal, TransactionJournal $childJournal)
-    {
-        $groups = $parentJournal->transactiongroups()->get();
-        /** @var TransactionGroup $group */
-        foreach ($groups as $group) {
-            foreach ($group->transactionjournals()->get() as $loopJournal) {
-                if ($loopJournal->id == $childJournal->id) {
-                    // remove from group:
-                    $group->transactionjournals()->detach($childJournal);
-                }
-            }
-            if ($group->transactionjournals()->count() == 1) {
-                $group->delete();
-            }
-        }
-
-        return Redirect::to(URL::previous());
-    }
-
-    /**
-     * @param TransactionJournal $parentJournal
-     * @param TransactionJournal $childJournal
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function relate(TransactionJournal $parentJournal, TransactionJournal $childJournal)
-    {
-        $group           = new TransactionGroup;
-        $group->relation = 'balance';
-        $group->user_id  = Auth::user()->id;
-        $group->save();
-        $group->transactionjournals()->save($parentJournal);
-        $group->transactionjournals()->save($childJournal);
-
-        return Response::json(true);
-
-    }
-
-    /**
-     * @param TransactionJournal $journal
-     *
-     * @return \Illuminate\View\View
-     */
-    public function related(TransactionJournal $journal)
-    {
-        $groups  = $journal->transactiongroups()->get();
-        $members = new Collection;
-        /** @var TransactionGroup $group */
-        foreach ($groups as $group) {
-            /** @var TransactionJournal $loopJournal */
-            foreach ($group->transactionjournals()->get() as $loopJournal) {
-                if ($loopJournal->id != $journal->id) {
-                    $members->push($loopJournal);
-                }
-            }
-        }
-
-        return view('related.relate', compact('journal', 'members'));
-    }
-
-    /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
-     *
-     * @param TransactionJournal $parentJournal
-     * @param TransactionJournal $childJournal
-     *
-     * @return \Illuminate\Http\JsonResponse
-     * @throws Exception
-     */
-    public function removeRelation(TransactionJournal $parentJournal, TransactionJournal $childJournal)
-    {
-        $groups = $parentJournal->transactiongroups()->get();
-        /** @var TransactionGroup $group */
-        foreach ($groups as $group) {
-            foreach ($group->transactionjournals()->get() as $loopJournal) {
-                if ($loopJournal->id == $childJournal->id) {
-                    // remove from group:
-                    $group->transactionjournals()->detach($childJournal);
-                }
-            }
-            if ($group->transactionjournals()->count() == 1) {
-                $group->delete();
-            }
-        }
-
-        return Response::json(true);
-    }
-
-    /**
-     * @param TransactionJournal $journal
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function search(TransactionJournal $journal, JournalRepositoryInterface $repository)
-    {
-
-        $search = e(trim(Input::get('searchValue')));
-        $parent = $journal;
-
-        $journals = $repository->searchRelated($search, $journal);
-
-        return view('related.searchResult', compact('journals', 'search', 'parent'));
-
-    }
-
-}

app/Http/routes.php

@@ -30,18 +30,6 @@ Route::bind(
     }
 );
 
-Route::bind(
-    'tjSecond', function ($value, $route) {
-    if (Auth::check()) {
-        $object = TransactionJournal::where('id', $value)->where('user_id', Auth::user()->id)->first();
-        if ($object) {
-            return $object;
-        }
-    }
-    throw new NotFoundHttpException;
-}
-);
-
 Route::bind(
     'tj', function ($value, $route) {
     if (Auth::check()) {
@@ -328,16 +316,6 @@ Route::group(
     Route::post('/profile/delete-account', ['uses' => 'ProfileController@postDeleteAccount', 'as' => 'delete-account-post']);
     Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'change-password-post']);
 
-    /**
-     * Related transactions controller
-     */
-    Route::get('/related/alreadyRelated/{tj}', ['uses' => 'RelatedController@alreadyRelated', 'as' => 'related.alreadyRelated']);
-    Route::post('/related/relate/{tj}/{tjSecond}', ['uses' => 'RelatedController@relate', 'as' => 'related.relate']);
-    Route::post('/related/removeRelation/{tj}/{tjSecond}', ['uses' => 'RelatedController@removeRelation', 'as' => 'related.removeRelation']);
-    Route::get('/related/remove/{tj}/{tjSecond}', ['uses' => 'RelatedController@getRemoveRelation', 'as' => 'related.getRemoveRelation']);
-    Route::get('/related/related/{tj}', ['uses' => 'RelatedController@related', 'as' => 'related.related']);
-    Route::post('/related/search/{tj}', ['uses' => 'RelatedController@search', 'as' => 'related.search']);
-
     /**
      * Reminder Controller
      */

app/Repositories/Journal/JournalRepository.php

@@ -142,58 +142,6 @@ class JournalRepository implements JournalRepositoryInterface
         }
     }
 
-    /**
-     * @param string             $query
-     * @param TransactionJournal $journal
-     *
-     * @return Collection
-     */
-    public function searchRelated($query, TransactionJournal $journal)
-    {
-        $start = clone $journal->date;
-        $end   = clone $journal->date;
-        $start->startOfMonth();
-        $end->endOfMonth();
-
-        // get already related transactions:
-        $exclude = [$journal->id];
-        foreach ($journal->transactiongroups()->get() as $group) {
-            foreach ($group->transactionjournals()->get() as $current) {
-                $exclude[] = $current->id;
-            }
-        }
-        $exclude = array_unique($exclude);
-
-        /** @var Collection $collection */
-        $collection = Auth::user()->transactionjournals()
-                          ->withRelevantData()
-                          ->before($end)->after($start)->where('encrypted', 0)
-                          ->whereNotIn('id', $exclude)
-                          ->where('description', 'LIKE', '%' . $query . '%')
-                          ->get();
-
-        // manually search encrypted entries:
-        /** @var Collection $encryptedCollection */
-        $encryptedCollection = Auth::user()->transactionjournals()
-                                   ->withRelevantData()
-                                   ->before($end)->after($start)
-                                   ->where('encrypted', 1)
-                                   ->whereNotIn('id', $exclude)
-                                   ->get();
-        $encrypted           = $encryptedCollection->filter(
-            function (TransactionJournal $journal) use ($query) {
-                $strPos = strpos(strtolower($journal->description), strtolower($query));
-                if ($strPos !== false) {
-                    return $journal;
-                }
-
-                return null;
-            }
-        );
-
-        return $collection->merge($encrypted);
-    }
-
     /**
      * @param array $data
      *

app/Repositories/Journal/JournalRepositoryInterface.php

@@ -55,15 +55,6 @@ interface JournalRepositoryInterface
      */
     public function getJournalsOfType(TransactionType $dbType);
 
-    /**
-     * @param string             $query
-     * @param TransactionJournal $journal
-     *
-     * @return Collection
-     */
-    public function searchRelated($query, TransactionJournal $journal);
-
-
     /**
      * @param $type
      *

public/js/related-manager.js

@@ -1,112 +0,0 @@
-$(document).ready(function () {
-    $('.relateTransaction').click(relateTransactionDialog);
-    //$('.unrelate-checkbox').click(unrelateTransaction);
-
-});
-
-function unrelateTransaction(e) {
-    var target = $(e.target);
-    var id = target.data('id');
-    var parent = target.data('parent');
-
-    if(typeof id == "undefined" && typeof parent == "undefined") {
-        target = target.parent();
-        id = target.data('id');
-        parent = target.data('parent');
-    }
-    console.log('unlink ' + id + ' from ' + parent);
-
-    $.post('related/removeRelation/' + id + '/' + parent, {_token: token}).success(function (data) {
-        target.parent().parent().remove();
-    }).fail(function () {
-        alert('Could not!');
-    });
-
-
-    return false;
-
-
-    //$.post('related/removeRelation/' + id + '/' + relatedTo, {_token: token}).success(function (data) {
-    //    target.parent().parent().remove();
-    //}).fail(function () {
-    //    alert('Could not!');
-    //});
-
-}
-
-function relateTransactionDialog(e) {
-    var target = $(e.target);
-    var ID = target.data('id');
-
-
-    $('#relationModal').empty().load('related/related/' + ID, function () {
-
-        $('#relationModal').modal('show');
-        getAlreadyRelatedTransactions(e, ID);
-        $('#searchRelated').submit(function (e) {
-            searchRelatedTransactions(e, ID);
-
-            return false;
-        });
-    });
-
-
-    return false;
-}
-
-
-function searchRelatedTransactions(e, ID) {
-    var searchValue = $('#relatedSearchValue').val();
-    if (searchValue != '') {
-        $.post('related/search/' + ID, {searchValue: searchValue, _token: token}).success(function (data) {
-            // post the results to some div.
-            $('#relatedSearchResultsTitle').show();
-            $('#relatedSearchResults').empty().html(data);
-            // remove any clicks.
-            $('.relate').unbind('click').on('click', doRelateNewTransaction);
-
-        }).fail(function () {
-            alert('Could not search. Sorry.');
-        });
-    }
-
-    return false;
-}
-
-function doRelateNewTransaction(e) {
-    // remove the row from the table:
-    var target = $(e.target);
-    var id = target.data('id');
-    var parent = target.data('parent');
-
-    if (typeof id == "undefined" && typeof parent == "undefined") {
-        target = target.parent();
-        console.log(target);
-        id = target.data('id');
-        parent = target.data('parent');
-    }
-
-    console.log('Relate ' + id + ' to ' + parent);
-    $.post('related/relate/' + parent + '/' + id, {_token: token}).success(function (data) {
-        // success! remove entry:
-        target.parent().parent().remove();
-        // get related stuff (again).
-        getAlreadyRelatedTransactions(null, parent);
-    }).fail(function () {
-        // could not relate.
-        alert('Could not relate this transaction to the intended target.');
-    });
-    return false;
-}
-
-function getAlreadyRelatedTransactions(e, ID) {
-    //#alreadyRelated
-    $.get('related/alreadyRelated/' + ID).success(function (data) {
-        $('#alreadyRelated').empty().html(data);
-        // some event triggers.
-        $('.unrelate').unbind('click').on('click', unrelateTransaction);
-
-    }).fail(function () {
-        alert('Cannot get related stuff.');
-    });
-}

resources/views/related/alreadyRelated.blade.php

@@ -1,63 +0,0 @@
-@if($journals->count() > 0)
-<table class="table table-bordered table-striped table-condensed">
-    @foreach($journals as $journal)
-        <tr>
-            <td>
-                <a title="Unlink" data-id="{{$journal->id}}" data-parent="{{$parent->id}}" class="btn unrelate btn-xs btn-default" href="#"><i class="fa fa-fw fa-expand"></i></a></td>
-            <td>
-                @if($journal->transactiontype->type == 'Withdrawal')
-                    <i class="fa fa-long-arrow-left fa-fw" title="Withdrawal"></i>
-                @endif
-                @if($journal->transactiontype->type == 'Deposit')
-                    <i class="fa fa-long-arrow-right fa-fw" title="Deposit"></i>
-                @endif
-                @if($journal->transactiontype->type == 'Transfer')
-                    <i class="fa fa-fw fa-exchange" title="Transfer"></i>
-                @endif
-            </td>
-            <td>{{$journal->date->format('jS M Y')}}</td>
-            <td>
-                <a title="{{$journal->date->format('jS M Y')}}" href="{{route('transactions.show',$journal->id)}}">{{{$journal->description}}}</a>
-            </td>
-            <td>
-                @if($journal->transactiontype->type == 'Withdrawal')
-                    <span class="text-danger">{{Amount::formatTransaction($journal->transactions[0],false)}}</span>
-                @endif
-                @if($journal->transactiontype->type == 'Deposit')
-                    <span class="text-success">{{Amount::formatTransaction($journal->transactions[1],false)}}</span>
-                @endif
-                @if($journal->transactiontype->type == 'Transfer')
-                    <span class="text-info">{{Amount::formatTransaction($journal->transactions[1],false)}}</span>
-                @endif
-            </td>
-
-        </tr>
-{{--
-
-
-
-
-
-            <span class="pull-right small">
-@if(isset($account))
-                    @foreach($journal->transactions as $index => $t)
-                        @if($t->account_id == $account->id)
-                            {!! Amount::formatTransaction($t) !!}
-                        @endif
-                    @endforeach
-                @else
-                    @foreach($journal->transactions as $index => $t)
-                        @if($index == 0)
-                            {!! Amount::formatTransaction($t) !!}
-                        @endif
-                    @endforeach
-                @endif
-</span>
-
-        </a>
-        --}}
-    @endforeach
-</table>
-@else
-    <p><em>No related transactions</em></p>
-@endif

resources/views/related/relate.blade.php

@@ -1,29 +0,0 @@
-<div class="modal-dialog modal-lg">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-            <h4 class="modal-title">Relate "{{{$journal->description}}}" to other transactions</h4>
-        </div>
-        <div class="modal-body">
-            <p>
-                Use this form to relate this transaction to other transactions. An often used relation is any unexpected expenses and the balancing transfer
-                from a savings account.
-            </p>
-            <form class="form-inline" role="form" id="searchRelated">
-                <div class="form-group">
-                    <input type="text" style="width:400px;" class="form-control" name="related" id="relatedSearchValue" placeholder="Search for related transactions">
-                </div>
-              <button type="submit" class="btn btn-default">Search</button>
-            </form>
-            <h5 id="relatedSearchResultsTitle" style="display:none;">Search results</h5>
-            <div id="relatedSearchResults">
-            </div>
-            <h5>(Already) related transactions</h5>
-            <div id="alreadyRelated">
-            </div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-    </div>
-</div>

resources/views/related/searchResult.blade.php

@@ -1,39 +0,0 @@
-<!-- search for: {{$search}} with {{$journals->count()}} results -->
-@if($journals->count() > 0)
-<table class="table table-bordered table-striped table-condensed">
-    @foreach($journals as $journal)
-        <tr>
-            <td><a title="Link" data-id="{{$journal->id}}" data-parent="{{$parent->id}}" class="btn relate btn-xs btn-default" href="#"><i class="fa fa-fw fa-expand"></i></a></td>
-            <td>
-                @if($journal->transactiontype->type == 'Withdrawal')
-                    <i class="fa fa-long-arrow-left fa-fw" title="Withdrawal"></i>
-                @endif
-                @if($journal->transactiontype->type == 'Deposit')
-                    <i class="fa fa-long-arrow-right fa-fw" title="Deposit"></i>
-                @endif
-                @if($journal->transactiontype->type == 'Transfer')
-                    <i class="fa fa-fw fa-exchange" title="Transfer"></i>
-                @endif
-            </td>
-            <td>{{$journal->date->format('jS M Y')}}</td>
-            <td>
-                <a title="{{$journal->date->format('jS M Y')}}" href="{{route('transactions.show',$journal->id)}}">{{{$journal->description}}}</a>
-            </td>
-            <td>
-                @if($journal->transactiontype->type == 'Withdrawal')
-                    <span class="text-danger">{{Amount::formatTransaction($journal->transactions[0],false)}}</span>
-                @endif
-                @if($journal->transactiontype->type == 'Deposit')
-                    <span class="text-success">{{Amount::formatTransaction($journal->transactions[1],false)}}</span>
-                @endif
-                @if($journal->transactiontype->type == 'Transfer')
-                    <span class="text-info">{{Amount::formatTransaction($journal->transactions[1],false)}}</span>
-                @endif
-            </td>
-
-        </tr>
-    @endforeach
-</table>
-@else
-    <p><em>No results</em></p>
-@endif

resources/views/transactions/show.blade.php

@@ -130,5 +130,4 @@
 @stop
 @section('scripts')
 <script type="text/javascript" src="js/transactions.js"></script>
-<script type="text/javascript" src="js/related-manager.js"></script>
 @stop