Fix Ninja Namespace

Also includes other minor clean ups and L5 syntax changes

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
 {

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
 {

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
 {

app/Http/Controllers/AccountGatewayController.php

@@ -9,7 +9,7 @@
 |
 */
 
-use Ninja\Repositories\AccountRepository;
+use App\Ninja\Repositories\AccountRepository;
 
 class AccountGatewayController extends BaseController
 {

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);
 

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
 {

app/Http/Controllers/ClientController.php

@@ -1,6 +1,6 @@
 <?php
 
-use Ninja\Repositories\ClientRepository;
+use App\Ninja\Repositories\ClientRepository;
 
 class ClientController extends \BaseController
 {

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
 {

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;
 

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
 {

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);

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
 {

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
 {

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
 {

app/Http/Controllers/ReportController.php

@@ -3,7 +3,6 @@
 use Auth;
 use Input;
 
-
 class ReportController extends \BaseController
 {
     public function d3()

app/Http/Controllers/TimesheetController.php

@@ -1,7 +1,5 @@
 <?php namespace App\Http\Controllers;
 
-
-
 class TimesheetController extends \BaseController {
 
 	/**

app/Http/Controllers/TokenController.php

@@ -9,7 +9,7 @@
 |
 */
 
-use Ninja\Repositories\AccountRepository;
+use App\Ninja\Repositories\AccountRepository;
 
 class TokenController extends BaseController
 {

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
 {

app/Ninja/Mailers/ContactMailer.php

@@ -1,4 +1,4 @@
-<?php namespace Ninja\Mailers;
+<?php namespace App\Ninja\Mailers;
 
 use Invoice;
 use Payment;

app/Ninja/Mailers/Mailer.php

@@ -1,4 +1,4 @@
-<?php namespace Ninja\Mailers;
+<?php namespace App\Ninja\Mailers;
 
 use Mail;
 use Utils;

app/Ninja/Mailers/UserMailer.php

@@ -1,4 +1,4 @@
-<?php namespace Ninja\Mailers;
+<?php namespace App\Ninja\Mailers;
 
 use Invoice;
 use Payment;

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, []);

app/Ninja/Repositories/ClientRepository.php

@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use Client;
 use Contact;

app/Ninja/Repositories/CreditRepository.php

@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use Credit;
 use Client;

app/Ninja/Repositories/InvoiceRepository.php

@@ -1,4 +1,4 @@
-<?php namespace ninja\repositories;
+<?php namespace App\Ninja\Repositories;
 
 use Invoice;
 use InvoiceItem;

app/Ninja/Repositories/PaymentRepository.php

@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use Payment;
 use Credit;

app/Ninja/Repositories/TaxRateRepository.php

@@ -1,4 +1,4 @@
-<?php namespace Ninja\Repositories;
+<?php namespace App\Ninja\Repositories;
 
 use TaxRate;
 use Utils;