bug fixes

app/controllers/ClientController.php

@@ -47,7 +47,7 @@ class ClientController extends \BaseController {
     	    ->addColumn('checkbox', function($model) { return '<input type="checkbox" name="ids[]" value="' . $model->public_id . '">'; })
     	    ->addColumn('name', function($model) { return link_to('clients/' . $model->public_id, $model->name); })
     	    ->addColumn('first_name', function($model) { return $model->first_name . ' ' . $model->last_name; })
-    	    ->addColumn('created_at', function($model) { return Utils::timestampToDateString($model->created_at); })
+    	    ->addColumn('created_at', function($model) { return Utils::timestampToDateString(strtotime($model->created_at)); })
     	    ->addColumn('email', function($model) { return $model->email ? HTML::mailto($model->email, $model->email) : ''; })
     	    ->addColumn('work_phone', function($model) { return Utils::formatPhoneNumber($model->work_phone); })    	   
     	    ->addColumn('last_login', function($model) { return Utils::timestampToDateString($model->last_login); })

app/database/migrations/2013_11_05_180133_confide_setup_users_table.php

@@ -194,7 +194,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->text('notes');
             $t->decimal('balance', 10, 2);
             $t->decimal('paid_to_date', 10, 2);
-            $t->timestamp('last_login');
+            $t->timestamp('last_login')->nullable();
             $t->string('website');
             $t->unsignedInteger('client_industry_id')->nullable();
             $t->unsignedInteger('client_size_id')->nullable();

app/libraries/utils.php

@@ -72,6 +72,9 @@ class Utils
 
 	public static function timestampToString($timestamp, $timezone = false, $format)
 	{
+		if (!$timestamp) {
+			return '';
+		}		
 		$date = Carbon::createFromTimeStamp($timestamp);
 		if ($timezone) {
 			$date->tz = $timezone;	

app/routes.php

@@ -15,9 +15,11 @@
 //dd(Client::getPrivateId(1));
 //dd(new DateTime());
 //Event::fire('user.signup');
+//dd(App::environment());
 
-include(app_path().'/libraries/utils.php');  // TODO_FIX
+
-include(app_path().'/handlers/UserEventHandler.php');  // TODO_FIX
+include_once(app_path().'/libraries/utils.php');  // TODO_FIX
+include_once(app_path().'/handlers/UserEventHandler.php');  // TODO_FIX
 
 Route::get('/send_emails', function() {
 	Artisan::call('ninja:send-invoices');	

app/views/header.blade.php

@@ -39,10 +39,12 @@
 	}
 	@endif
 
+	/*
 	body > div.container {
 		min-height: 600px;		
 	}
-
+	*/
+	
 	label.checkbox,
 	label.control-label {
 		font-weight: normal !important;
@@ -230,7 +232,33 @@
 	<p/>
 	<div>		
 		<a href="{{ URL::to('/') }}" style="font-size:30px;color:black">Invoice Ninja</a>
-		<div style="float:right">
+	
+	</div>
+
+	<p style="clear: both"/>
+	<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+
+	  <div class="navbar-header">
+	    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+	      <span class="sr-only">Toggle navigation</span>
+	      <span class="icon-bar"></span>
+	      <span class="icon-bar"></span>
+	      <span class="icon-bar"></span>
+	    </button>
+	    {{ link_to('/', 'Invoice Ninja', array('class'=>'navbar-brand')) }}
+	  </div>
+
+	  <div class="collapse navbar-collapse" id="navbar-collapse-1">
+	    <ul class="nav navbar-nav" style="font-weight: bold">
+	    	{{-- HTML::nav_link('home', 'Home') --}}
+	    	{{ HTML::menu_link('client') }}
+	    	{{ HTML::menu_link('invoice') }}
+	    	{{ HTML::menu_link('payment') }}
+	    	{{ HTML::menu_link('credit') }}
+	    	{{ HTML::nav_link('reports', 'Reports') }}
+	    </ul>
+
+		<div class="navbar-form navbar-right">
 			@if (Auth::check() && Auth::user()->registered)
 			{{ Auth::user()->email }} &nbsp;
 			@else			
@@ -250,31 +278,8 @@
 			    <li>{{ link_to('#', 'Logout', array('onclick'=>'logout()')) }}</li>
 			  </ul>
 			</div>			
-		</div>		
+		</div>	
-	</div>
 
-	<p style="clear: both"/>
-	<nav class="navbar navbar-default" role="navigation">
-
-	  <div class="navbar-header">
-	    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
-	      <span class="sr-only">Toggle navigation</span>
-	      <span class="icon-bar"></span>
-	      <span class="icon-bar"></span>
-	      <span class="icon-bar"></span>
-	    </button>
-	    <!-- <a class="navbar-brand" href="#">Invoice Ninja</a> -->
-	  </div>
-
-	  <div class="collapse navbar-collapse" id="navbar-collapse-1">
-	    <ul class="nav navbar-nav" style="font-weight: bold">
-	    	{{-- HTML::nav_link('home', 'Home') --}}
-	    	{{ HTML::menu_link('client') }}
-	    	{{ HTML::menu_link('invoice') }}
-	    	{{ HTML::menu_link('payment') }}
-	    	{{ HTML::menu_link('credit') }}
-	    	{{ HTML::nav_link('reports', 'Reports') }}
-	    </ul>
 		<ul class="nav navbar-nav navbar-right">	      
 	      <li class="dropdown">
 	        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Recently Viewed <b class="caret"></b></a>
@@ -294,6 +299,9 @@
 	      </div>
 	    </form>
 	    </ul>	    
+
+
+
 	  </div><!-- /.navbar-collapse -->
 	</nav>
 	

app/views/invoices/edit.blade.php

@@ -17,7 +17,7 @@
 	)); }}
     
     <div class="row" style="min-height:195px" onkeypress="formEnterClick(event)">
-    	<div class="col-md-7" id="col_1">
+    	<div class="col-md-5" id="col_1">
 			{{ Former::select('client')->addOption('', '')->fromQuery($clients, 'name', 'public_id')->data_bind("dropdown: client")
 					->addGroupClass('client_select closer-row') }}
 
@@ -37,23 +37,12 @@
 					</div>				
 				</div>
 			</div>
-			{{ Former::text('discount')->data_bind("value: discount, valueUpdate: 'afterkeydown'") }}
 			{{ Former::textarea('terms')->data_bind("value: wrapped_terms, valueUpdate: 'afterkeydown'") }}			
 			
 		</div>
 		<div class="col-md-4" id="col_2">
-			<div data-bind="visible: invoice_status_id() < CONSTS.INVOICE_STATUS_SENT">
-				{{ Former::checkbox('recurring')->text('Enable | <a href="#">Learn more</a>')->data_bind("checked: is_recurring")
-					->inlineHelp($invoice && $invoice->last_sent_date ? 'Last invoice sent ' . Utils::timestampToDateString($invoice->last_sent_date) : '') }}
-			</div>
-			@if ($invoice && $invoice->recurring_invoice_id)
-				<div style="padding-top: 6px">
-					Created by a {{ link_to('/invoices/'.$invoice->recurring_invoice_id, 'recurring invoice') }}
-				</div>
-			@endif
 			<div data-bind="visible: !is_recurring()">
 				{{ Former::text('invoice_number')->label('Invoice #')->data_bind("value: invoice_number, valueUpdate: 'afterkeydown'") }}
-				{{ Former::text('po_number')->label('PO number')->data_bind("value: po_number, valueUpdate: 'afterkeydown'") }}
 				{{ Former::text('invoice_date')->data_bind("value: invoice_date, valueUpdate: 'afterkeydown'") }}
 				{{ Former::text('due_date')->data_bind("value: due_date, valueUpdate: 'afterkeydown'") }}
 							
@@ -64,8 +53,22 @@
 				{{ Former::text('start_date')->data_bind("value: start_date, valueUpdate: 'afterkeydown'") }}
 				{{ Former::text('end_date')->data_bind("value: end_date, valueUpdate: 'afterkeydown'") }}
 			</div>
+			<div data-bind="visible: invoice_status_id() < CONSTS.INVOICE_STATUS_SENT">
+				{{ Former::checkbox('recurring')->text('Enable | <a href="#">Learn more</a>')->data_bind("checked: is_recurring")
+					->inlineHelp($invoice && $invoice->last_sent_date ? 'Last invoice sent ' . Utils::timestampToDateString($invoice->last_sent_date) : '') }}
+			</div>
+			@if ($invoice && $invoice->recurring_invoice_id)
+				<div style="padding-top: 6px">
+					Created by a {{ link_to('/invoices/'.$invoice->recurring_invoice_id, 'recurring invoice') }}
+				</div>
+			@endif
 			
 		</div>
+
+		<div class="col-md-3" id="col_2">
+			{{ Former::text('po_number')->label('PO&nbsp;number')->data_bind("value: po_number, valueUpdate: 'afterkeydown'") }}				
+			{{ Former::text('discount')->data_bind("value: discount, valueUpdate: 'afterkeydown'") }}			
+		</div>
 	</div>
 
 	<p>&nbsp;</p>

app/views/splash.blade.php

@@ -9,7 +9,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="#">Invoice Ninja</a>
+          <!-- <a class="navbar-brand" href="#">Invoice Ninja</a> -->
         </div>
         <div class="navbar-collapse collapse">
           {{ Form::open(array('url' => 'login', 'class' => 'navbar-form navbar-right')) }}

bootstrap/start.php

@@ -28,7 +28,7 @@ $app->redirectIfTrailingSlash();
 
 $env = $app->detectEnvironment(array(
 
-	'development' => array('precise64'),
+	'development' => array('precise64', 'ubuntu-server-12042-x64-vbox4210'),
 	'staging' => array('host107.hostmonster.com')
 ));