diff --git a/.gitignore b/.gitignore index 505a9f8f9b3b..955906ddce9d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /public/logo /public/build /public/packages +/public/vendor /bootstrap/compiled.php /bootstrap/environment.php /vendor diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 00f57f65a819..1e6b4237db06 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -35,7 +35,7 @@ class AccountController extends \BaseController { if ($user && $user->registered) { - exit; + return Redirect::to('/'); } } @@ -49,7 +49,7 @@ class AccountController extends \BaseController { Auth::login($user, true); Event::fire('user.login'); - + return Redirect::to('invoices/create'); } diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php index 9ae6ec456582..c446835840e4 100755 --- a/app/controllers/HomeController.php +++ b/app/controllers/HomeController.php @@ -74,6 +74,18 @@ class HomeController extends BaseController { return View::make('coming_soon'); } + public function invoiceNow() + { + if (Auth::check()) + { + return Redirect::to('invoices/create'); + } + else + { + return View::make('public.header', ['invoiceNow' => true]); + } + } + public function logError() { return Utils::logError(Input::get('error'), 'JavaScript'); diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index 6c70eba77bac..578e5d0403bf 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -94,7 +94,7 @@ class InvoiceController extends \BaseController { return $table->addColumn('start_date', function($model) { return Utils::fromSqlDate($model->start_date); }) ->addColumn('end_date', function($model) { return Utils::fromSqlDate($model->end_date); }) - ->addColumn('total', function($model) { return Utils::formatMoney($model->amount, $model->currency_id); }) + ->addColumn('amount', function($model) { return Utils::formatMoney($model->amount, $model->currency_id); }) ->addColumn('dropdown', function($model) { return '