From f0cb63fd48c1c44da85e60f673cf3b2c18f65082 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 18 Feb 2017 09:32:10 +0100
Subject: [PATCH] Some small optimisations.

---
 app/Http/Controllers/HelpController.php      | 8 ++++----
 database/seeds/AccountTypeSeeder.php         | 3 +--
 database/seeds/TransactionCurrencySeeder.php | 2 --
 database/seeds/TransactionTypeSeeder.php     | 3 ---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php
index 24d2d75254..82846210cf 100644
--- a/app/Http/Controllers/HelpController.php
+++ b/app/Http/Controllers/HelpController.php
@@ -58,7 +58,8 @@ class HelpController extends Controller
             return Response::json($content);
         }
 
-        $content = $help->getFromGithub($language, $route);
+        $content         = $help->getFromGithub($language, $route);
+        $notYourLanguage = '<p><em>' . strval(trans('firefly.help_may_not_be_your_language')) . '</em></p>';
 
         // get backup language content (try English):
         if (strlen($content) === 0) {
@@ -68,12 +69,11 @@ class HelpController extends Controller
                 $content = $help->getFromCache($route, $language);
             }
             if (!$help->inCache($route, $language)) {
-                $content = $help->getFromGithub($language, $route);
-                $content = '<p><em>' . strval(trans('firefly.help_may_not_be_your_language')) . '</em></p>' . $content;
+                $content = trim($notYourLanguage . $help->getFromGithub($language, $route));
             }
         }
 
-        if (strlen($content) === 0) {
+        if ($content === $notYourLanguage) {
             $content = '<p>' . strval(trans('firefly.route_has_no_help')) . '</p>';
         }
 
diff --git a/database/seeds/AccountTypeSeeder.php b/database/seeds/AccountTypeSeeder.php
index 64422f3a5d..8f8690f33a 100644
--- a/database/seeds/AccountTypeSeeder.php
+++ b/database/seeds/AccountTypeSeeder.php
@@ -21,8 +21,6 @@ class AccountTypeSeeder extends Seeder
 {
     public function run()
     {
-        DB::table('account_types')->delete();
-
         AccountType::create(['type' => 'Default account']);
         AccountType::create(['type' => 'Cash account']);
         AccountType::create(['type' => 'Asset account']);
@@ -31,6 +29,7 @@ class AccountTypeSeeder extends Seeder
         AccountType::create(['type' => 'Initial balance account']);
         AccountType::create(['type' => 'Beneficiary account']);
         AccountType::create(['type' => 'Import account']);
+        AccountType::create(['type' => 'Loan']);
     }
 
 
diff --git a/database/seeds/TransactionCurrencySeeder.php b/database/seeds/TransactionCurrencySeeder.php
index f1204569a3..5d8fe07845 100644
--- a/database/seeds/TransactionCurrencySeeder.php
+++ b/database/seeds/TransactionCurrencySeeder.php
@@ -21,8 +21,6 @@ class TransactionCurrencySeeder extends Seeder
 {
     public function run()
     {
-        DB::table('transaction_currencies')->delete();
-
         TransactionCurrency::create(['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€', 'decimal_places' => 2]);
         TransactionCurrency::create(['code' => 'USD', 'name' => 'US Dollar', 'symbol' => '$', 'decimal_places' => 2]);
         TransactionCurrency::create(['code' => 'HUF', 'name' => 'Hungarian forint', 'symbol' => 'Ft', 'decimal_places' => 2]);
diff --git a/database/seeds/TransactionTypeSeeder.php b/database/seeds/TransactionTypeSeeder.php
index 690d333aba..06ff214776 100644
--- a/database/seeds/TransactionTypeSeeder.php
+++ b/database/seeds/TransactionTypeSeeder.php
@@ -21,9 +21,6 @@ class TransactionTypeSeeder extends Seeder
 {
     public function run()
     {
-
-        DB::table('transaction_types')->delete();
-
         TransactionType::create(['type' => TransactionType::WITHDRAWAL]);
         TransactionType::create(['type' => TransactionType::DEPOSIT]);
         TransactionType::create(['type' => TransactionType::TRANSFER]);