From 9aab36c2dc81231d434973bf891a2568af7483f0 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Wed, 6 Dec 2017 13:42:30 +0300
Subject: [PATCH] optimization

---
 app/Http/Controllers/Settings/Currencies.php | 27 +++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Settings/Currencies.php b/app/Http/Controllers/Settings/Currencies.php
index ef110aed2..bce09e152 100644
--- a/app/Http/Controllers/Settings/Currencies.php
+++ b/app/Http/Controllers/Settings/Currencies.php
@@ -19,7 +19,7 @@ class Currencies extends Controller
     {
         $currencies = Currency::collect();
 
-        return view('settings.currencies.index', compact('currencies', 'codes', 'rates'));
+        return view('settings.currencies.index', compact('currencies'));
     }
 
     /**
@@ -116,20 +116,23 @@ class Currencies extends Controller
      */
     public function update(Currency $currency, Request $request)
     {
-        $relationships = $this->countRelationships($currency, [
-            'accounts' => 'accounts',
-            'customers' => 'customers',
-            'invoices' => 'invoices',
-            'revenues' => 'revenues',
-            'bills' => 'bills',
-            'payments' => 'payments',
-        ]);
+        // Check if we can disable it
+        if (!$request['enabled']) {
+            $relationships = $this->countRelationships($currency, [
+                'accounts' => 'accounts',
+                'customers' => 'customers',
+                'invoices' => 'invoices',
+                'revenues' => 'revenues',
+                'bills' => 'bills',
+                'payments' => 'payments',
+            ]);
 
-        if ($currency->code == setting('general.default_currency')) {
-            $relationships[] = strtolower(trans_choice('general.companies', 1));
+            if ($currency->code == setting('general.default_currency')) {
+                $relationships[] = strtolower(trans_choice('general.companies', 1));
+            }
         }
 
-        if (empty($relationships) || $request['enabled']) {
+        if (empty($relationships)) {
             // Force the rate to be 1 for default currency
             if ($request['default_currency']) {
                 $request['rate'] = '1';