Bug fixes

app/controllers/HomeController.php

@@ -21,12 +21,22 @@ class HomeController extends BaseController {
 
 	public function showAboutUs()
 	{
-		return View::make('public.about_us');
+		$data = [
+			'title' => 'About Us',
+			'description' => 'Invoice Ninja is an an open-source solution where you can create, customize, and generate invoices online for free using our templates!'
+		];
+
+		return View::make('public.about_us', $data);
 	}
 
 	public function showContactUs()
 	{
-		return View::make('public.contact_us');
+		$data = [
+			'title' => 'Contact Us',
+			'description' => 'Contact us today and try out our free or premium hassle-free plans. Start your online invoicing today with Invoice Ninja!'
+		];
+
+		return View::make('public.contact_us', $data);
 	}
 
 	public function showTerms()
@@ -46,7 +56,12 @@ class HomeController extends BaseController {
 
 	public function showPlans()
 	{
-		return View::make('public.plans');
+		$data = [
+			'title' => 'Professional Invoicing Software & Templates',
+			'description' => 'Invoice Ninja allows you to create and generate your own custom invoices. Choose from our professional invoice templates or customize your own with our pro plan.'
+		];
+
+		return View::make('public.plans', $data);
 	}
 
 
@@ -66,7 +81,8 @@ class HomeController extends BaseController {
 
 		$message = trans('texts.sent_message');
 		Session::flash('message', $message);
-		return Redirect::to('/contact');
+
+		return View::make('public.contact_us');
 	}
 
 	public function showComingSoon()

app/controllers/ProductController.php

@@ -26,7 +26,8 @@ class ProductController extends \BaseController {
             <li><a href="' . URL::to('products/'.$model->public_id) . '/archive">'.uctrans('texts.archive_product').'</a></li>
           </ul>
         </div>';
-      })         
+      })       
+      ->orderColumns(['cost', 'product_key', 'cost'])
       ->make();           
   }
 

app/filters.php

@@ -107,7 +107,9 @@ Route::filter('csrf', function()
 	$token = Request::ajax() ? Request::header('X-CSRF-Token') : Input::get('_token');
 	
    	if (Session::token() != $token) 
-   	{
+   	{      
+      Session::flash('warning', trans('texts.session_expired'));   
+
    		return Redirect::to('/');
 			//throw new Illuminate\Session\TokenMismatchException;
    	}

app/lang/de/texts.php

@@ -380,4 +380,6 @@ return array(
   'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.',
   'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.',  
 
+  'session_expired' => 'Your session has expired.',
+  
 );

app/lang/en/texts.php

@@ -395,7 +395,7 @@ return array(
   'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.',
   'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.',  
   
-
+  'session_expired' => 'Your session has expired.',
 
 
 );

app/lang/es/texts.php

@@ -377,5 +377,7 @@ return array(
   'notification_quote_viewed_subject' => 'Quote :invoice was viewed by :client',
   'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.',
   'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.',  
-  
+
+  'session_expired' => 'Your session has expired.',
+    
 );

app/lang/fr/texts.php

@@ -379,5 +379,7 @@ return array(
   'notification_quote_viewed_subject' => 'Quote :invoice was viewed by :client',
   'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.',
   'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.',  
-  
+
+  'session_expired' => 'Your session has expired.',
+    
 );

app/lang/it/texts.php

@@ -380,4 +380,6 @@ return array(
   'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.',
   'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.',  
 
+  'session_expired' => 'Your session has expired.',
+  
 );

app/lang/nl/texts.php

@@ -380,5 +380,6 @@ return array(
   'notification_quote_viewed_subject' => 'Quote :invoice was viewed by :client',
   'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.',
   'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.',  
-  
+
+  'session_expired' => 'Your session has expired.',  
 );

app/lang/pt_BR/texts.php

@@ -369,5 +369,6 @@ return array(
   'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.',
   'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.',  
 
+  'session_expired' => 'Your session has expired.',
   
 );

app/ninja/repositories/InvoiceRepository.php

@@ -17,6 +17,7 @@ class InvoiceRepository
   					->join('contacts', 'contacts.client_id', '=', 'clients.id')
             ->where('invoices.account_id', '=', $accountId)
             ->where('clients.deleted_at', '=', null)
+            ->where('contacts.deleted_at', '=', null)
     				->where('invoices.is_recurring', '=', false)    			
     				->where('contacts.is_primary', '=', true)	
   					->select('clients.public_id as client_public_id', 'invoice_number', 'clients.name as client_name', 'invoices.public_id', 'amount', 'invoices.balance', 'invoice_date', 'due_date', 'invoice_statuses.name as invoice_status_name', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'quote_id', 'quote_invoice_id');

app/routes.php

@@ -28,7 +28,7 @@ Route::get('/about', 'HomeController@showAboutUs');
 Route::get('/terms', 'HomeController@showTerms');
 Route::get('/contact', 'HomeController@showContactUs');
 Route::get('/plans', 'HomeController@showPlans');
-Route::post('/contact', 'HomeController@doContactUs');
+Route::post('/contact_submit', 'HomeController@doContactUs');
 Route::get('/faq', 'HomeController@showFaq');
 Route::get('/features', 'HomeController@showFeatures');
 Route::get('/secure_payment', 'HomeController@showSecurePayment');

app/start/global.php

@@ -58,9 +58,9 @@ $monolog->pushHandler(new Monolog\Handler\SyslogHandler('intranet', 'user', Logg
 
 App::error(function(Exception $exception, $code)
 {
-	//Log::error($exception);
-
 	Utils::logError($exception . ' ' . $code);
+
+  return Response::view('error', ['error' => "A {$code} error occurred."], $code);
 });
 
 /*

app/views/error.blade.php

@@ -1,7 +1,20 @@
-@extends('header')
+@extends('public.header')
 
 @section('content')
 
-	{{ $error }}
+<p>&nbsp;<p>
+<p>&nbsp;<p>
+
+<div class="well">
+  <div class="container" style="min-height:400px">
+	<h3>{{ $error }}</h3>
+  Looks like something went wrong.<br/>
+  If you'd like help please email us at contact@invoiceninja.com.
+</div>
+</div>
+
+<p>&nbsp;<p>
+<p>&nbsp;<p>
+
 
 @stop

app/views/master.blade.php

@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Invoice Ninja {{ isset($title) ? $title : ' - Free and Open-Source Online Invoicing' }}</title>    
-    
+    <title>Invoice Ninja | {{ isset($title) ? $title : ' Free Online Invoice Templates & Generator' }}</title>    
+    <meta name="description" content="{{ isset($description) ? $description : 'Create and generate custom invoices online for free using Invoice Ninja. Use our templates or customize your own today.' }}"></meta>
+
     <!-- Source: https://github.com/hillelcoren/invoice-ninja -->
     <!-- Version: {{ NINJA_VERSION }} -->
 

app/views/public/contact_us.blade.php

@@ -64,23 +64,13 @@ var contactForm = {
 <section class="about contact">
   <div class="container">
     <div id="contact_form" class="row">
-
-
-      @if (Session::has('message'))
-      <div class="alert alert-info">{{ Session::get('message') }}</div>
-      @endif
-
-      @if (Session::has('error'))
-      <div class="alert alert-danger">{{ Session::get('error') }}</div>
-      @endif
-
       
       <div class="row">              
         <div class="col-md-7">
           <h2>Questions, special requests, or just want to say hi?</h2>
           <p>Fill in the form below and we'll get back to you as soon as possible. Hope to hear from you!</p>
           
-          {{ Form::open(['url' => 'contact', 'class' => 'feedbackForm']) }}
+          {{ Form::open(['url' => 'contact_submit', 'class' => 'feedbackForm']) }}
           <div class="form-group">
             <input type="text" class="form-control" id="name" name="name" placeholder="Name">
             <span class="help-block" style="display: none;">Please enter your name.</span>