From 6e75c240f85bf5d1d6ac55ea4b8209ed9a41c07b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 29 Dec 2016 22:40:24 +0200
Subject: [PATCH] Simplify new company process

---
 app/Ninja/Repositories/AccountRepository.php | 4 ----
 app/Ninja/Repositories/InvoiceRepository.php | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 740431432d74..66a230317377 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -594,9 +594,6 @@ class AccountRepository
 
         $record->save();
 
-        return $this->getUserAccounts($record);
-
-        /*
         $users = $this->getUserAccounts($record);
 
         // Pick the primary user
@@ -652,7 +649,6 @@ class AccountRepository
         }
 
         return $users;
-        */
     }
 
     public function unlinkAccount($account) {
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 59d2f0e1a4c0..1212b2c15206 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -390,7 +390,7 @@ class InvoiceRepository extends BaseRepository
 
         if (isset($data['terms']) && trim($data['terms'])) {
             $invoice->terms = trim($data['terms']);
-        } elseif ($isNew && ! $invoice->is_recurring && $$account->{"{$entityType}_terms"}) {
+        } elseif ($isNew && ! $invoice->is_recurring && $account->{"{$entityType}_terms"}) {
             $invoice->terms = $account->{"{$entityType}_terms"};
         } else {
             $invoice->terms = '';