Merge branch 'refs/heads/develop'

Author: snipe

app/database/seeds/LicenseSeatsSeeder.php

@@ -18,34 +18,38 @@ public function run()
 			'created_at' 		=> $date->modify('-10 day'),
 			'updated_at' 		=> $date->modify('-3 day'),
 			'deleted_at'  		=> NULL,
-			'notes' 			=>'',
+			'notes' 			=> '',
+			'user_id' 			=> '1',
 		);
 
 		$license_seats[] = array(
 			'license_id'      	=> '1',
-			'assigned_to'      	=> NULL,
+			'assigned_to'      	=> '0',
 			'created_at' 		=> $date->modify('-10 day'),
 			'updated_at' 		=> $date->modify('-3 day'),
 			'deleted_at' 		=> NULL,
-			'notes' 			=>'',
+			'notes' 			=> '',
+			'user_id' 			=> '1',
 		);
 
 		$license_seats[] = array(
 			'license_id'      	=> '1',
-			'assigned_to'      	=> NULL,
+			'assigned_to'      	=> '0',
 			'created_at' 		=> $date->modify('-10 day'),
 			'updated_at' 		=> $date->modify('-3 day'),
 			'deleted_at' 		=> NULL,
-			'notes' 			=>'',
+			'notes' 			=> '',
+			'user_id' 			=> '1',
 		);
 
 		$license_seats[] = array(
 			'license_id'      	=> '1',
-			'assigned_to'      	=> NULL,
+			'assigned_to'      	=> '0',
 			'created_at' 		=> $date->modify('-10 day'),
 			'updated_at' 		=> $date->modify('-3 day'),
 			'deleted_at' 		=> NULL,
-			'notes' 			=>'',
+			'notes' 			=> '',
+			'user_id' 			=> '1',
 		);
 
 		$license_seats[] = array(
@@ -54,7 +58,8 @@ public function run()
 			'created_at' 		=> $date->modify('-10 day'),
 			'updated_at' 		=> $date->modify('-3 day'),
 			'deleted_at' 		=> NULL,
-			'notes' 			=>'',
+			'notes' 			=> '',
+			'user_id' 			=> '1',
 		);
 
 		$license_seats[] = array(
@@ -63,17 +68,19 @@ public function run()
 			'created_at' 		=> $date->modify('-10 day'),
 			'updated_at' 		=> $date->modify('-3 day'),
 			'deleted_at' 		=> NULL,
-			'notes' 			=>'',
+			'notes' 			=> '',
+			'user_id' 			=> '1',
 		);
 
 		// Pending (status_id is null, assigned_to = 0)
 		$license_seats[] = array(
 			'license_id'      	=> '2',
-			'assigned_to'      	=> NULL,
+			'assigned_to'      	=> '0',
 			'created_at' 		=> $date->modify('-10 day'),
 			'updated_at' 		=> $date->modify('-3 day'),
 			'deleted_at' 		=> NULL,
-			'notes' 			=>'',
+			'notes' 			=> '',
+			'user_id' 			=> '1',
 
 		);
 

app/database/seeds/LicensesSeeder.php

@@ -24,8 +24,8 @@ public function run()
 			'license_name'		=> '',
 			'license_email'		=> '',
 			'notes' 			=> '',
-			'user_id'			=>1,
-			'depreciation_id'	=>2,
+			'user_id'			=> 1,
+			'depreciation_id'	=> 2,
 			'deleted_at' 		=> NULL,
 			'depreciate' 		=> '0',
 		);
@@ -43,8 +43,8 @@ public function run()
 			'license_name'		=> 'Alison Gianotto',
 			'license_email'		=> '[email protected]',
 			'notes' 			=> '',
-			'user_id'			=>1,
-			'depreciation_id'	=>2,
+			'user_id'			=> 1,
+			'depreciation_id'	=> 2,
 			'deleted_at' 		=> NULL,
 			'depreciate' 		=> '0',
 		);