Working on advanced settings

2025-07-09 03:14:30 -04:00 · 2014-05-08 22:19:33 +03:00 · 2014-05-08 22:19:33 +03:00 · 6bdc9e9eb9
commit 6bdc9e9eb9
parent 7b86aea0a7
14 changed files with 263 additions and 248 deletions
--- a/README.md
+++ b/README.md
@ -4,11 +4,9 @@
 ### [https://www.invoiceninja.com](https://www.invoiceninja.com)
 ### Introduction

-Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies. 
+Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. [This guide](http://hillelcoren.com/invoice-ninja/self-hosting/) is the simplest way to setup the site. The high level instructions for setting up the site using Git are below but there's also a more detailed [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). 

-[This guide](http://hillelcoren.com/invoice-ninja/self-hosting/) is the simplest way to setup the site. The high level instructions for setting up the site using Git are below but there's also a more detailed [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). 
-
-For updates follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
+To connect follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).

 If you'd like to translate the site please use [caouecs/Laravel4-long](https://github.com/caouecs/Laravel4-lang) for the starter files.

--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@ -78,7 +78,7 @@ class AccountController extends \BaseController {
 		return Response::json($data);
 	}

-	public function showSection($section = ACCOUNT_DETAILS)  
+	public function showSection($section = ACCOUNT_DETAILS, $subSection = false)  
 	{
 		if ($section == ACCOUNT_DETAILS)
 		{			
@ -187,7 +187,7 @@ class AccountController extends \BaseController {
 				'account' => Auth::user()->account
 			];

-			return View::make('accounts.advanced_settings', $data);	
+			return View::make("accounts.{$subSection}", $data);	
 		}
 		else if ($section == ACCOUNT_PRODUCTS)
 		{
@ -227,7 +227,14 @@ class AccountController extends \BaseController {
 		}		
 		else if ($section == ACCOUNT_ADVANCED_SETTINGS)
 		{
-			return AccountController::saveAdvancedSettings();
+			if ($subSection == ACCOUNT_CUSTOM_FIELDS) 
+			{
+				return AccountController::saveCustomFields();
+			} 
+			else if ($subSection == ACCOUNT_INVOICE_DESIGN)
+			{
+				return AccountController::saveInvoiceDesign();
+			}
 		}
 		else if ($section == ACCOUNT_PRODUCTS)
 		{
@ -247,23 +254,37 @@ class AccountController extends \BaseController {
 		return Redirect::to('company/products');		
 	}

-	private function saveAdvancedSettings()
+	private function saveCustomFields()
+	{
+		if (!Auth::user()->account->isPro())
 		{
 			$account = Auth::user()->account;
-
 			$account->custom_label1 = Input::get('custom_label1');
 			$account->custom_value1 = Input::get('custom_value1');
 			$account->custom_label2 = Input::get('custom_label2');
 			$account->custom_value2 = Input::get('custom_value2');
 			$account->custom_client_label1 = Input::get('custom_client_label1');
 			$account->custom_client_label2 = Input::get('custom_client_label2');		
-
-		$account->primary_color = Input::get('primary_color');// ? Input::get('primary_color') : null;
-		$account->secondary_color = Input::get('secondary_color');// ? Input::get('secondary_color') : null;
-
 			$account->save();

 			Session::flash('message', trans('texts.updated_settings'));
+		}
+
+		return Redirect::to('company/advanced_settings');		
+	}
+
+	private function saveInvoiceDesign()
+	{
+		if (!Auth::user()->account->isPro())
+		{
+			$account = Auth::user()->account;
+			$account->primary_color = Input::get('primary_color');// ? Input::get('primary_color') : null;
+			$account->secondary_color = Input::get('secondary_color');// ? Input::get('secondary_color') : null;
+			$account->save();
+
+			Session::flash('message', trans('texts.updated_settings'));
+		}
+		
 		return Redirect::to('company/advanced_settings');		
 	}

--- a/app/controllers/ReportController.php
+++ b/app/controllers/ReportController.php
@ -24,7 +24,10 @@ class ReportController extends \BaseController {
 		$datasets = [];
 		$labels = [];
 		$maxTotals = 0;
+		$width = 10;
 		
+		if (Auth::user()->account->isPro())
+		{
 			foreach ([ENTITY_INVOICE, ENTITY_PAYMENT, ENTITY_CREDIT] as $entityType)
 			{
 				$records = DB::table($entityType.'s')
@ -71,6 +74,7 @@ class ReportController extends \BaseController {

 			$width = (ceil( $maxTotals / 100 ) * 100) / 10;  
 			$width = max($width, 10);
+		}

 		$dateTypes = [
 			'DAYOFYEAR' => 'Daily',
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@ -348,5 +348,7 @@ return array(
  'specify_colors' => 'Specify colors',
  'specify_colors_label' => 'Select the colors used in the invoice',

+  'chart_builder' => 'Chart Builder',

 );
+
--- a/app/routes.php
+++ b/app/routes.php
@ -74,9 +74,12 @@ Route::group(array('before' => 'auth'), function()
  Route::post('company/products/{product_id?}', 'AccountController@saveProduct');
  */

+  Route::get('company/advanced_settings/chart_builder', 'ReportController@report');
+  Route::post('company/advanced_settings/chart_builder', 'ReportController@report');
+
 	Route::get('account/getSearchData', array('as' => 'getSearchData', 'uses' => 'AccountController@getSearchData'));
-  Route::get('company/{section?}', 'AccountController@showSection');	
-	Route::post('company/{section?}', 'AccountController@doSection');
+  Route::get('company/{section?}/{sub_section?}', 'AccountController@showSection');	
+	Route::post('company/{section?}/{sub_section?}', 'AccountController@doSection');
 	Route::post('user/setTheme', 'UserController@setTheme');
  Route::post('remove_logo', 'AccountController@removeLogo');
  Route::post('account/go_pro', 'AccountController@enableProPlan');
@ -105,9 +108,6 @@ Route::group(array('before' => 'auth'), function()
 	Route::get('credits/create/{client_id?}/{invoice_id?}', 'CreditController@create');
 	Route::get('api/credits/{client_id?}', array('as'=>'api.credits', 'uses'=>'CreditController@getDatatable'));	
 	Route::post('credits/bulk', 'CreditController@bulk');	
-	
-	Route::get('reports', 'ReportController@report');
-	Route::post('reports', 'ReportController@report');
 });


@ -137,8 +137,12 @@ define('ACCOUNT_IMPORT_EXPORT', 'import_export');
 define('ACCOUNT_PAYMENTS', 'payments');
 define('ACCOUNT_MAP', 'import_map');
 define('ACCOUNT_EXPORT', 'export');
-define('ACCOUNT_ADVANCED_SETTINGS', 'advanced_settings');
 define('ACCOUNT_PRODUCTS', 'products');
+define('ACCOUNT_ADVANCED_SETTINGS', 'advanced_settings');
+define('ACCOUNT_CUSTOM_FIELDS', 'custom_fields');
+define('ACCOUNT_INVOICE_DESIGN', 'invoice_design');
+define('ACCOUNT_CHART_BUILDER', 'chart_builder');
+

 define('DEFAULT_INVOICE_NUMBER', '0001');
 define('RECENTLY_VIEWED_LIMIT', 8);
@ -225,7 +229,7 @@ HTML::macro('menu_link', function($type) {
  $types = $type.'s';
  $Type = ucfirst($type);
  $Types = ucfirst($types);
-  $class = ( Request::is($types) || Request::is('*'.$type.'*')) ? ' active' : '';
+  $class = ( Request::is($types) || Request::is('*'.$type.'*')) && !Request::is('*advanced_settings*') ? ' active' : '';

  return '<li class="dropdown '.$class.'">
           <a href="'.URL::to($types).'" class="dropdown-toggle">'.trans("texts.$types").'</a>
--- a/app/views/accounts/advanced_settings.blade.php
+++ b/app/views/accounts/advanced_settings.blade.php
@ -2,16 +2,7 @@

@section('content')	
 	@parent
-
-	@if (!Auth::user()->account->isPro())
-  <div class="container">
-    <div class="row">
-			<div style="font-size:larger;" class="col-md-8 col-md-offset-2">{{ trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}</div>
-			&nbsp;<p/>&nbsp;
-		</div>		
-	</div>
-	@endif
-
+	@include('accounts.nav_advanced')

 	{{ Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') }}
 	{{ Former::populate($account) }}
@ -27,10 +18,6 @@
 	{{ Former::text('custom_client_label1')->label(trans('texts.field_label')) }}
 	{{ Former::text('custom_client_label2')->label(trans('texts.field_label')) }}

-	{{ Former::legend('invoice_design') }}
-	{{ Former::text('primary_color') }}
-	{{ Former::text('secondary_color') }}
-
 	@if (Auth::user()->isPro())
 	{{ Former::actions( Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk') ) }}
 	@else
@ -43,20 +30,4 @@

 	{{ Former::close() }}

-	<script>
-	    $(function() {   
-	    	var options = {
-	    		preferredFormat: "hex",
-	    		disabled: {{ Auth::user()->isPro() ? 'false' : 'true' }},
-	    		showInitial: false,
-	    		showInput: true,
-	    		allowEmpty: true,
-	    		clickoutFiresChange: true,
-	    	};
-	    	$('#primary_color').spectrum(options);
-	    	$('#secondary_color').spectrum(options);
-	    });
-	</script>	
-
-
@stop
--- a/app/views/accounts/invoice_design.blade.php
+++ b/app/views/accounts/invoice_design.blade.php
@ -0,0 +1,42 @@
+@extends('accounts.nav')
+
+@section('content')	
+	@parent
+	@include('accounts.nav_advanced')
+
+	{{ Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') }}
+	{{ Former::populate($account) }}
+
+	{{ Former::legend('invoice_design') }}
+	{{ Former::text('primary_color') }}
+	{{ Former::text('secondary_color') }}
+
+	@if (Auth::user()->isPro())
+	{{ Former::actions( Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk') ) }}
+	@else
+	<script>
+	    $(function() {   
+	    	$('form.warn-on-exit input').prop('disabled', true);
+	    });
+	</script>	
+	@endif
+
+	{{ Former::close() }}
+
+	<script>
+	    $(function() {   
+	    	var options = {
+	    		preferredFormat: "hex",
+	    		disabled: {{ Auth::user()->isPro() ? 'false' : 'true' }},
+	    		showInitial: false,
+	    		showInput: true,
+	    		allowEmpty: true,
+	    		clickoutFiresChange: true,
+	    	};
+	    	$('#primary_color').spectrum(options);
+	    	$('#secondary_color').spectrum(options);
+	    });
+	</script>	
+
+
+@stop
--- a/app/views/accounts/nav.blade.php
+++ b/app/views/accounts/nav.blade.php
@ -8,8 +8,9 @@
    {{ HTML::nav_link('company/products', 'product_library') }}
  	{{ HTML::nav_link('company/notifications', 'notifications') }}
    {{ HTML::nav_link('company/import_export', 'import_export', 'company/import_map') }}
-  	{{ HTML::nav_link('company/advanced_settings', 'advanced_settings') }}
+  	{{ HTML::nav_link('company/advanced_settings/custom_fields', 'advanced_settings', '*/advanced_settings/*') }}
 	</ul>
-	<p>&nbsp;</p>
+
+	<br/>

@stop
--- a/app/views/accounts/nav_advanced.blade.php
+++ b/app/views/accounts/nav_advanced.blade.php
@ -0,0 +1,17 @@
+<ul class="nav nav-tabs nav nav-justified">
+  {{ HTML::nav_link('company/advanced_settings/custom_fields', 'custom_fields') }}
+  {{ HTML::nav_link('company/advanced_settings/invoice_design', 'invoice_design') }}
+  {{ HTML::nav_link('company/advanced_settings/chart_builder', 'chart_builder') }}
+</ul>
+<p>&nbsp;</p>
+
+@if (!Auth::user()->account->isPro())
+<div class="container">
+  <div class="row">
+    <div style="font-size:larger;" class="col-md-8 col-md-offset-2">{{ trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}</div>
+    &nbsp;<p/>&nbsp;
+  </div>    
+</div>
+@endif
+
+<br/>
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@ -113,7 +113,6 @@
        {{ HTML::menu_link('invoice') }}
        {{ HTML::menu_link('payment') }}
        {{ HTML::menu_link('credit') }}
-        {{-- HTML::nav_link('reports', 'Reports') --}}
      </ul>

      <div class="navbar-form navbar-right">
@ -152,7 +151,7 @@
            <li>{{ link_to('company/products', uctrans('texts.product_library')) }}</li>
            <li>{{ link_to('company/notifications', uctrans('texts.notifications')) }}</li>
            <li>{{ link_to('company/import_export', uctrans('texts.import_export')) }}</li>
-            <li><a href="{{ url('company/advanced_settings') }}">{{ uctrans('texts.advanced_settings') . Utils::getProLabel(ACCOUNT_ADVANCED_SETTINGS) }}</a></li>
+            <li><a href="{{ url('company/advanced_settings/custom_fields') }}">{{ uctrans('texts.advanced_settings') . Utils::getProLabel(ACCOUNT_ADVANCED_SETTINGS) }}</a></li>

            <li class="divider"></li>
            <li>{{ link_to('#', trans('texts.logout'), array('onclick'=>'logout()')) }}</li>
@ -376,60 +375,8 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
                </div>
             </div>
            </div>              
-            <div class="container">
-                <div class="row">
-                  <div class="plans-table col-md-9">
-                    <div class="col-md-4 desc hide-mobile">
-                      <div class="cell"></div>
-                      <div class="cell">Number of clients per account</div>
-                      <div class="cell">Unlimited client invoices</div>
-                      <div class="cell">Add your company logo</div>
-                      <div class="cell">Live .PDF invoice creation </div>
-                      <div class="cell">4 beatiful invoice templates</div>
-                      <div class="cell">Accept credit card payments</div>
-                      <div class="cell">Custom invoice fields</div>
-                      <div class="cell">Priority email support</div>
-                      <div class="cell">Custom invoice colors</div>
-                      <div class="cell">Remove "Created by Invoice Ninja"</div>
-                      <div class="cell">Pricing</div>
-
-
-                    </div>
-                    <div class="free col-md-4">
-                      <div class="cell">Free</div>
-                      <div class="cell"><div class="hide-desktop">Number of clients per account</div><span>500</span></div>
-                      <div class="cell"><div class="hide-desktop">Unlimited client invoices</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Add your company logo</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">4 beatiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Custom invoice fields</div><span class="glyphicon glyphicon-remove"></div>
-                      <div class="cell"><div class="hide-desktop">Priority email support</div><span class="glyphicon glyphicon-remove"></div>
-                      <div class="cell"><div class="hide-desktop">Custom invoice colors</div><span class="glyphicon glyphicon-remove"></div>
-                      <div class="cell"><div class="hide-desktop">Remove "Created by Invoice Ninja"</div><span class="glyphicon glyphicon-remove"></div>
-                      <div class="cell price"><div class="hide-desktop">Pricing</div><p>Free<span> /Always!</span></p></div>
-                    </div>
-                    <div class="pro col-md-4">
-
-                      <div class="cell">Pro Plan<span class="glyphicon glyphicon-star"></div>
-                      <div class="cell"><div class="hide-desktop">Number of clients per account</div><span style="color: #2299c0; font-size: 16px;">5,000</span></div>
-                      <div class="cell"><div class="hide-desktop">Unlimited client invoices</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Add your company logo</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">4 beatiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Custom invoice fields</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Priority email support</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Custom invoice colors</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell"><div class="hide-desktop">Remove "Created by Invoice Ninja"</div><span class="glyphicon glyphicon-ok"></div>
-                      <div class="cell price"><div class="hide-desktop">Pricing</div><p>$50<span> /Year</span></p></div>
-                    </a>
-                  </div>
-                </div>
-              </div>
-            </section>
-

+            @include('plans')
            &nbsp;
      </div>

@ -577,6 +524,10 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
    }
  }

+  function showSignUp() {
+    $('#signUpModal').modal('show');    
+  }
+
  @if (Auth::check() && !Auth::user()->isPro())
  function showProPlan() {
    $('#proPlanModal').modal('show');       
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@ -449,10 +449,6 @@

 	<script type="text/javascript">
 	
-	function showSignUp() {
-		$('#signUpModal').modal('show');		
-	}
-
 	function showLearnMore() {
 		$('#recurringModal').modal('show');			
 	}
--- a/app/views/plans.blade.php
+++ b/app/views/plans.blade.php
@ -0,0 +1,54 @@
+<div class="container">
+  <div class="row">
+    <div class="plans-table col-md-9">
+      <div class="col-md-4 desc hide-mobile">
+        <div class="cell"></div>
+        <div class="cell">Number of clients per account</div>
+        <div class="cell">Unlimited client invoices</div>
+        <div class="cell">Add your company logo</div>
+        <div class="cell">Live .PDF invoice creation </div>
+        <div class="cell">4 beatiful invoice templates</div>
+        <div class="cell">Accept credit card payments</div>
+        <div class="cell">Custom invoice fields and colors</div>
+        <div class="cell">Basic chart builder</div>
+        <div class="cell">Priority email support</div>
+        <div class="cell">Remove "Created by Invoice Ninja"</div>
+        <div class="cell">Latest and greatest features</div>
+        <div class="cell">Pricing</div>
+
+      </div>
+      <div class="free col-md-4">
+        <div class="cell">Free</div>
+        <div class="cell"><div class="hide-desktop">Number of clients per account</div><span>500</span></div>
+        <div class="cell"><div class="hide-desktop">Unlimited client invoices</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Add your company logo</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">4 beatiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Custom fields and invoice colors</div><span class="glyphicon glyphicon-remove"></div>
+        <div class="cell"><div class="hide-desktop">Basic chart builder</div><span class="glyphicon glyphicon-remove"></div>
+        <div class="cell"><div class="hide-desktop">Priority email support</div><span class="glyphicon glyphicon-remove"></div>
+        <div class="cell"><div class="hide-desktop">Remove "Created by Invoice Ninja"</div><span class="glyphicon glyphicon-remove"></div>
+        <div class="cell"><div class="hide-desktop">Latest and greatest features</div><span class="glyphicon glyphicon-remove"></div>
+        <div class="cell price"><div class="hide-desktop">Pricing</div><p>Free<span> /Always!</span></p></div>
+      </div>
+      <div class="pro col-md-4">
+
+        <div class="cell">Pro Plan<span class="glyphicon glyphicon-star"></div>
+        <div class="cell"><div class="hide-desktop">Number of clients per account</div><span style="color: #2299c0; font-size: 16px;">5,000</span></div>
+        <div class="cell"><div class="hide-desktop">Unlimited client invoices</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Add your company logo</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">4 beatiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Custom invoice fields and colors</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Basic chart builder</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Priority email support</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Remove "Created by Invoice Ninja"</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell"><div class="hide-desktop">Latest and greatest features</div><span class="glyphicon glyphicon-ok"></div>
+        <div class="cell price"><div class="hide-desktop">Pricing</div><p>$50<span> /Year</span></p></div>
+        <!-- <div class="cell"><a href="#"><div class="cta"><h2 onclick="return getStarted()">GO PRO <span>+</span></h2></div>    </a>-->
+      </div>
+    </div>
+  </div>
+</div>
--- a/app/views/public/plans.blade.php
+++ b/app/views/public/plans.blade.php
@ -22,65 +22,9 @@
        </div>
      </div>
    </div>
- <div class="container">
-      <div class="row">
-        <div class="plans-table col-md-9">
-        <div class="col-md-4 desc hide-mobile">
-            <div class="cell"></div>
-            <div class="cell">Number of clients per account</div>
-            <div class="cell">Unlimited client invoices</div>
-            <div class="cell">Add your company logo</div>
-            <div class="cell">Live .PDF invoice creation </div>
-            <div class="cell">4 beatiful invoice templates</div>
-            <div class="cell">Accept credit card payments</div>
-            <div class="cell">Custom invoice fields</div>
-            <div class="cell">Priority email support</div>
-            <div class="cell">Custom invoice colors</div>
-            <div class="cell">Remove "Created by Invoice Ninja"</div>
-                        <div class="cell">Pricing</div>

+    @include('plans')

-            </div>
-        <div class="free col-md-4">
-            <div class="cell">Free</div>
-            <div class="cell"><div class="hide-desktop">Number of clients per account</div><span>500</span></div>
-            <div class="cell"><div class="hide-desktop">Unlimited client invoices</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Add your company logo</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">4 beatiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Custom invoice fields</div><span class="glyphicon glyphicon-remove"></div>
-            <div class="cell"><div class="hide-desktop">Priority email support</div><span class="glyphicon glyphicon-remove"></div>
-            <div class="cell"><div class="hide-desktop">Custom invoice colors</div><span class="glyphicon glyphicon-remove"></div>
-            <div class="cell"><div class="hide-desktop">Remove "Created by Invoice Ninja"</div><span class="glyphicon glyphicon-remove"></div>
-            <div class="cell price"><div class="hide-desktop">Pricing</div><p>Free<span> /Always!</span></p></div>
-            </div>
-        <div class="pro col-md-4">
-            
-            <div class="cell">Pro Plan<span class="glyphicon glyphicon-star"></div>
-            <div class="cell"><div class="hide-desktop">Number of clients per account</div><span style="color: #2299c0; font-size: 16px;">5,000</span></div>
-            <div class="cell"><div class="hide-desktop">Unlimited client invoices</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Add your company logo</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">4 beatiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Custom invoice fields</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Priority email support</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Custom invoice colors</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell"><div class="hide-desktop">Remove "Created by Invoice Ninja"</div><span class="glyphicon glyphicon-ok"></div>
-            <div class="cell price"><div class="hide-desktop">Pricing</div><p>$50<span> /Year</span></p></div>
-          <!--
-            <div class="cell">
-            <a href="#">
-        <div class="cta">
-          <h2 onclick="return getStarted()">GO PRO <span>+</span></h2>
-        </div>
-        -->
-      </a>
-            </div>
-          </div>
-     </div>
-                      </div>
  </div>
 </section>

--- a/app/views/reports/report_builder.blade.php
+++ b/app/views/reports/report_builder.blade.php
@ -1,4 +1,4 @@
-@extends('header')
+@extends('accounts.nav')

@section('head')
 	@parent
@ -7,20 +7,30 @@
@stop

@section('content')
-	
-	<p>&nbsp;</p>
+	@parent
+	@include('accounts.nav_advanced')

 	<div class="row">
 		<div class="col-lg-4">

-			{{ Former::open() }}
+			{{ Former::open()->addClass('warn-on-exit') }}
 			{{ Former::populateField('start_date', $startDate) }}
 			{{ Former::populateField('end_date', $endDate) }}
 			{{ Former::select('chart_type')->options($chartTypes, $chartType) }}
 			{{ Former::select('group_by')->options($dateTypes, $groupBy) }}
 			{{ Former::text('start_date') }}
 			{{ Former::text('end_date') }}
+
+			@if (Auth::user()->isPro())
 				{{ Former::actions( Button::primary_submit('Generate') ) }}
+			@else
+			<script>
+			    $(function() {   
+			    	$('form.warn-on-exit').find('input, select').prop('disabled', true);
+			    });
+			</script>	
+			@endif
+			
 			{{ Former::close() }}

 			<p>&nbsp;</p>
@ -39,7 +49,7 @@

 		</div>
 		<div class="col-lg-8">
-			<canvas id="monthly-reports" width="850" height="400"></canvas>
+			<canvas id="monthly-reports" width="772" height="400"></canvas>
 		</div>

 	</div>