From 6ae6a29117a25f9d4e0ed4204645244fa407896c Mon Sep 17 00:00:00 2001
From: Jeramy Simpson <jeramy@mywork.com.au>
Date: Tue, 24 Mar 2015 18:21:12 +1000
Subject: [PATCH] Fix Ninja Namespace Also includes other minor clean ups and
 L5 syntax changes

---
 .../Commands/SendRecurringInvoices.php        |  2 +-
 app/Handlers/InvoiceEventHandler.php          |  4 +-
 app/Http/Controllers/AccountController.php    |  6 +--
 .../Controllers/AccountGatewayController.php  |  2 +-
 app/Http/Controllers/AppController.php        | 45 +++++++++++--------
 app/Http/Controllers/ClientApiController.php  |  2 +-
 app/Http/Controllers/ClientController.php     |  2 +-
 app/Http/Controllers/CreditController.php     |  2 +-
 app/Http/Controllers/HomeController.php       |  2 +-
 app/Http/Controllers/InvoiceApiController.php |  4 +-
 app/Http/Controllers/InvoiceController.php    | 15 +++----
 app/Http/Controllers/PaymentApiController.php |  2 +-
 app/Http/Controllers/QuoteApiController.php   |  2 +-
 app/Http/Controllers/QuoteController.php      |  8 ++--
 app/Http/Controllers/ReportController.php     |  1 -
 app/Http/Controllers/TimesheetController.php  |  2 -
 app/Http/Controllers/TokenController.php      |  2 +-
 app/Http/Controllers/UserController.php       |  6 +--
 app/Ninja/Mailers/ContactMailer.php           |  2 +-
 app/Ninja/Mailers/Mailer.php                  |  2 +-
 app/Ninja/Mailers/UserMailer.php              |  2 +-
 app/Ninja/Repositories/AccountRepository.php  |  4 +-
 app/Ninja/Repositories/ClientRepository.php   |  2 +-
 app/Ninja/Repositories/CreditRepository.php   |  2 +-
 app/Ninja/Repositories/InvoiceRepository.php  |  2 +-
 app/Ninja/Repositories/PaymentRepository.php  |  2 +-
 app/Ninja/Repositories/TaxRateRepository.php  |  2 +-
 27 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/app/Console/Commands/SendRecurringInvoices.php b/app/Console/Commands/SendRecurringInvoices.php
index 31f6f5be8c86..ece16d94baa5 100644
--- a/app/Console/Commands/SendRecurringInvoices.php
+++ b/app/Console/Commands/SendRecurringInvoices.php
@@ -3,7 +3,7 @@
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use Ninja\Mailers\ContactMailer as Mailer;
+use App\Ninja\Mailers\ContactMailer as Mailer;
 
 class SendRecurringInvoices extends Command
 {
diff --git a/app/Handlers/InvoiceEventHandler.php b/app/Handlers/InvoiceEventHandler.php
index 0296e7818518..924a9590ee36 100644
--- a/app/Handlers/InvoiceEventHandler.php
+++ b/app/Handlers/InvoiceEventHandler.php
@@ -1,7 +1,7 @@
 <?php namespace App\Handlers;
 
-use Ninja\Mailers\UserMailer;
-use Ninja\Mailers\ContactMailer;
+use App\Ninja\Mailers\UserMailer;
+use App\Ninja\Mailers\ContactMailer;
 
 class InvoiceEventHandler
 {
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index a79410e600e0..8c53a16b231b 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -1,8 +1,8 @@
 <?php namespace App\Http\Controllers;
 
-use Ninja\Repositories\AccountRepository;
-use Ninja\Mailers\UserMailer;
-use Ninja\Mailers\ContactMailer;
+use App\Ninja\Repositories\AccountRepository;
+use App\Ninja\Mailers\UserMailer;
+use App\Ninja\Mailers\ContactMailer;
 
 class AccountController extends \BaseController
 {
diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index eb18642c1959..92069f55c928 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -9,7 +9,7 @@
 |
 */
 
-use Ninja\Repositories\AccountRepository;
+use App\Ninja\Repositories\AccountRepository;
 
 class AccountGatewayController extends BaseController
 {
diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index b22be9510fc7..11fabece50a2 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -8,8 +8,8 @@ use Exception;
 use Input;
 use Utils;
 use View;
-use Ninja\Mailers\Mailer;
-use Ninja\Repositories\AccountRepository;
+use App\Ninja\Mailers\Mailer;
+use App\Ninja\Repositories\AccountRepository;
 use Redirect;
 
 class AppController extends BaseController
@@ -36,21 +36,22 @@ class AppController extends BaseController
 
     public function doSetup()
     {
-        if (Utils::isNinja() || Utils::isDatabaseSetup()) {
-            return Redirect::to('/');
-        }
+        // if (Utils::isNinja() || Utils::isDatabaseSetup()) {
+        //     return Redirect::to('/');
+        // }
 
         $valid = false;
         $test = Input::get('test');
 
         $app = Input::get('app');
         $app['key'] = str_random(RANDOM_KEY_LENGTH);
-        $app['debug'] = false;
+        $app['debug'] = 'false';
 
         $database = Input::get('database');
-        $dbType = $database['default'];
-        $database['connections'] = [$dbType => $database['type']];
-        unset($database['type']);
+        $dbType = $database['driver'];
+        
+        $test_database = $database;
+        $test_database['connections'] = [$dbType => $test_database];        
 
         $mail = Input::get('mail');
         $email = $mail['username'];
@@ -60,7 +61,7 @@ class AppController extends BaseController
             return self::testMail($mail);
         }
 
-        $valid = self::testDatabase($database);
+        $valid = self::testDatabase($test_database);
 
         if ($test == 'db') {
             return $valid === true ? 'Success' : $valid;
@@ -68,17 +69,17 @@ class AppController extends BaseController
             return Redirect::to('/setup')->withInput();
         }
 
-        $content = "<?php return 'production';";
+        /*$content = "<?php return 'production';";
         $fp = fopen(base_path()."/bootstrap/environment.php", 'w');
         fwrite($fp, $content);
-        fclose($fp);
+        fclose($fp);*/
 
         /*$configDir = base_path().'/config/production';
         if (!file_exists($configDir)) {
             mkdir($configDir);
         }*/
 
-        // TODO: Please test this!!!!!!!!!!!
+        // TODO: GET THIS WORKING PROPERLY!!!!
         
         // == ENV Settings (Production) == //
 
@@ -90,9 +91,14 @@ class AppController extends BaseController
 
             // Write a nice Comment to lay out each config area
             $env_config .= "# " . $key . " Settings \n";
-            
+
+
             // For Each config varible : Write to env
             foreach ($config as $name => $value) {
+                if(is_array($value)){
+                    continue; // BREAKS ON THE MAIL ARRAY
+                    dd($value);
+                }
                 $env_config .= strtoupper($name) . '=' . $value . "\n";
             }
         }
@@ -103,9 +109,9 @@ class AppController extends BaseController
         }
         
         // Write Config Settings
-        $fp = fopen(base_path()."/.env", 'w');
-        fwrite($fp, $env_config);
-        fclose($fp);
+        // $fp = fopen(base_path()."/.env", 'w');
+        // fwrite($fp, $env_config);
+        // fclose($fp);
 
         // == END ENV Settings == //
 
@@ -137,7 +143,7 @@ class AppController extends BaseController
         $user->password = trim(Input::get('password'));
         $user->password_confirmation = trim(Input::get('password'));
         $user->registered = true;
-        $user->amend();
+        $user->save();
 
         //Auth::login($user, true);
         $this->accountRepo->registerUser($user);
@@ -147,7 +153,8 @@ class AppController extends BaseController
 
     private function testDatabase($database)
     {
-        $dbType = $database['default'];
+        // dd($database);
+        $dbType = $database['driver'];
 
         Config::set('database.default', $dbType);
 
diff --git a/app/Http/Controllers/ClientApiController.php b/app/Http/Controllers/ClientApiController.php
index cff44c4222ad..8bbc976987d0 100644
--- a/app/Http/Controllers/ClientApiController.php
+++ b/app/Http/Controllers/ClientApiController.php
@@ -1,6 +1,6 @@
 <?php namespace App\Http\Controllers;
 
-use Ninja\Repositories\ClientRepository;
+use App\Ninja\Repositories\ClientRepository;
 
 class ClientApiController extends Controller
 {
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 1d6f5c6fac38..fdbd3b475c63 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -1,6 +1,6 @@
 <?php
 
-use Ninja\Repositories\ClientRepository;
+use App\Ninja\Repositories\ClientRepository;
 
 class ClientController extends \BaseController
 {
diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index c5d179c9d7f6..efa83c7ca442 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -1,6 +1,6 @@
 <?php namespace App\Http\Controllers;
 
-use Ninja\Repositories\CreditRepository;
+use App\Ninja\Repositories\CreditRepository;
 
 class CreditController extends \BaseController
 {
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 983bd88897de..25fb49884d12 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,7 +1,7 @@
 <?php namespace App\Http\Controllers;
 
 use App\Libraries\Utils;
-use Ninja\Mailers\Mailer;
+use App\Ninja\Mailers\Mailer;
 use Redirect;
 use App\Models\Account;
 
diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index 4036a8e9822a..83555042a196 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -1,8 +1,8 @@
 <?php namespace App\Http\Controllers;
 
 use Utils;
-use Ninja\Repositories\InvoiceRepository;
-use Ninja\Mailers\ContactMailer as Mailer;
+use App\Ninja\Repositories\InvoiceRepository;
+use App\Ninja\Mailers\ContactMailer as Mailer;
 
 class InvoiceApiController extends Controller
 {
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index c41450229bc3..3492083317b8 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -1,12 +1,11 @@
 <?php namespace App\Http\Controllers;
 
+use App\Ninja\Mailers\ContactMailer as Mailer;
+use App\Ninja\Repositories\InvoiceRepository;
+use App\Ninja\Repositories\ClientRepository;
+use App\Ninja\Repositories\TaxRateRepository;
 
-use Ninja\Mailers\ContactMailer as Mailer;
-use Ninja\Repositories\InvoiceRepository;
-use Ninja\Repositories\ClientRepository;
-use Ninja\Repositories\TaxRateRepository;
-
-class InvoiceController extends \BaseController
+class InvoiceController extends BaseController
 {
     protected $mailer;
     protected $invoiceRepo;
@@ -398,9 +397,9 @@ class InvoiceController extends \BaseController
                 Utils::trackViewed($client->getDisplayName(), ENTITY_CLIENT, $url);
             }
 
-            if (!empty(Input::get('pdfupload')) && strpos(Input::get('pdfupload'), 'data:application/pdf;base64,') === 0) {
+            /*if (!empty(Input::get('pdfupload')) && strpos(Input::get('pdfupload'), 'data:application/pdf;base64,') === 0) {
                 $this->storePDF(Input::get('pdfupload'), $input->invoice->public_id);
-            }
+            }*/
 
             if ($action == 'clone') {
                 return $this->cloneInvoice($publicId);
diff --git a/app/Http/Controllers/PaymentApiController.php b/app/Http/Controllers/PaymentApiController.php
index ef85ee862549..daaaebd56d0f 100644
--- a/app/Http/Controllers/PaymentApiController.php
+++ b/app/Http/Controllers/PaymentApiController.php
@@ -1,7 +1,7 @@
 <?php namespace App\Http\Controllers;
 
 use Utils;
-use Ninja\Repositories\PaymentRepository;
+use App\Ninja\Repositories\PaymentRepository;
 
 class PaymentApiController extends Controller
 {
diff --git a/app/Http/Controllers/QuoteApiController.php b/app/Http/Controllers/QuoteApiController.php
index 675932bb0d3e..cebc63d55090 100644
--- a/app/Http/Controllers/QuoteApiController.php
+++ b/app/Http/Controllers/QuoteApiController.php
@@ -1,7 +1,7 @@
 <?php namespace App\Http\Controllers;
 
 use Utils;
-use Ninja\Repositories\InvoiceRepository;
+use App\Ninja\Repositories\InvoiceRepository;
 
 class QuoteApiController extends Controller
 {
diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index 6b3563a472e2..65d06c366367 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -1,10 +1,10 @@
 <?php namespace App\Http\Controllers;
 
 use Utils;
-use Ninja\Mailers\ContactMailer as Mailer;
-use Ninja\Repositories\InvoiceRepository;
-use Ninja\Repositories\ClientRepository;
-use Ninja\Repositories\TaxRateRepository;
+use App\Ninja\Mailers\ContactMailer as Mailer;
+use App\Ninja\Repositories\InvoiceRepository;
+use App\Ninja\Repositories\ClientRepository;
+use App\Ninja\Repositories\TaxRateRepository;
 
 class QuoteController extends \BaseController
 {
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 0395296ac4a4..4352920d04fd 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -3,7 +3,6 @@
 use Auth;
 use Input;
 
-
 class ReportController extends \BaseController
 {
     public function d3()
diff --git a/app/Http/Controllers/TimesheetController.php b/app/Http/Controllers/TimesheetController.php
index e046b7347c43..cab40b564a00 100644
--- a/app/Http/Controllers/TimesheetController.php
+++ b/app/Http/Controllers/TimesheetController.php
@@ -1,7 +1,5 @@
 <?php namespace App\Http\Controllers;
 
-
-
 class TimesheetController extends \BaseController {
 
 	/**
diff --git a/app/Http/Controllers/TokenController.php b/app/Http/Controllers/TokenController.php
index 8364de25d9e6..d6a488e3a4b1 100644
--- a/app/Http/Controllers/TokenController.php
+++ b/app/Http/Controllers/TokenController.php
@@ -9,7 +9,7 @@
 |
 */
 
-use Ninja\Repositories\AccountRepository;
+use App\Ninja\Repositories\AccountRepository;
 
 class TokenController extends BaseController
 {
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 88b768c06b83..c5ee506193e5 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -9,9 +9,9 @@ use Redirect;
 
 use App\Http\Requests;
 use App\Http\Controllers\Controller;
-use Ninja\Repositories\AccountRepository;
-use Ninja\Mailers\ContactMailer;
-use Ninja\Mailers\UserMailer;
+use App\Ninja\Repositories\AccountRepository;
+use App\Ninja\Mailers\ContactMailer;
+use App\Ninja\Mailers\UserMailer;
 
 class UserController extends BaseController
 {
diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index 2983c089cc8a..3bab6deae90e 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -1,4 +1,4 @@
-<?php namespace Ninja\Mailers;
+<?php namespace App\Ninja\Mailers;
 
 use Invoice;
 use Payment;
diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php
index da5bd5e3676b..73cdddbe6fed 100644
--- a/app/Ninja/Mailers/Mailer.php
+++ b/app/Ninja/Mailers/Mailer.php
@@ -1,4 +1,4 @@
-<?php namespace Ninja\Mailers;
+<?php namespace App\Ninja\Mailers;
 
 use Mail;
 use Utils;
diff --git a/app/Ninja/Mailers/UserMailer.php b/app/Ninja/Mailers/UserMailer.php
index c3106d3e5a54..4bf1d2b51b23 100644
--- a/app/Ninja/Mailers/UserMailer.php
+++ b/app/Ninja/Mailers/UserMailer.php
@@ -1,4 +1,4 @@
-<?php namespace Ninja\Mailers;
+<?php namespace App\Ninja\Mailers;
 
 use Invoice;
 use Payment;
diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 15c0a99bfa31..452ca0ac05e1 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use AccountGateway;
 use Auth;
@@ -34,9 +34,11 @@ class AccountRepository
 
         $random = str_random(RANDOM_KEY_LENGTH);
 
+        // I don't like how this is done with regards to init setup. I think it needs a refresh.
         $user = new User();
         $user->password = $random;
         $user->password_confirmation = $random;
+        $user->email = 'test@test.com';
         $user->username = $random;
         $user->confirmed = !Utils::isNinja();
         $account->users()->save($user, []);
diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php
index 05cc8a839708..7c6280313e8e 100644
--- a/app/Ninja/Repositories/ClientRepository.php
+++ b/app/Ninja/Repositories/ClientRepository.php
@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use Client;
 use Contact;
diff --git a/app/Ninja/Repositories/CreditRepository.php b/app/Ninja/Repositories/CreditRepository.php
index 29e283284d64..56f502e42070 100644
--- a/app/Ninja/Repositories/CreditRepository.php
+++ b/app/Ninja/Repositories/CreditRepository.php
@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use Credit;
 use Client;
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 83efff8bcd8a..30ada577af82 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -1,4 +1,4 @@
-<?php namespace ninja\repositories;
+<?php namespace App\Ninja\Repositories;
 
 use Invoice;
 use InvoiceItem;
diff --git a/app/Ninja/Repositories/PaymentRepository.php b/app/Ninja/Repositories/PaymentRepository.php
index a712b0c3330e..cb180b827042 100644
--- a/app/Ninja/Repositories/PaymentRepository.php
+++ b/app/Ninja/Repositories/PaymentRepository.php
@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use Payment;
 use Credit;
diff --git a/app/Ninja/Repositories/TaxRateRepository.php b/app/Ninja/Repositories/TaxRateRepository.php
index ad61df2917aa..bde29e225821 100644
--- a/app/Ninja/Repositories/TaxRateRepository.php
+++ b/app/Ninja/Repositories/TaxRateRepository.php
@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use TaxRate;
 use Utils;