Merge remote-tracking branch 'origin/develop'

Author: snipe

app/controllers/admin/LicensesController.php

@@ -188,8 +188,20 @@ public function postEdit($licenseId = null)
 			$license->license_name 		= e(Input::get('license_name'));
 			$license->notes 			= e(Input::get('notes'));
 			$license->order_number 		= e(Input::get('order_number'));
-			$license->purchase_date 	= e(Input::get('purchase_date'));
-			$license->purchase_cost 	= e(Input::get('purchase_cost'));
+
+			// Update the asset data
+			if ( e(Input::get('purchase_date')) == '') {
+					$license->purchase_date =  NULL;
+			} else {
+					$license->purchase_date = e(Input::get('purchase_date'));
+			}
+
+			if ( e(Input::get('purchase_cost')) == '') {
+					$license->purchase_cost =  NULL;
+			} else {
+					$license->purchase_cost = e(Input::get('purchase_cost'));
+			}
+
 
 			//Are we changing the total number of seats?
 			if( $license->seats != e(Input::get('seats')))
@@ -205,12 +217,13 @@ public function postEdit($licenseId = null)
 						return is_null($seat->user);
 					});
 
+
 					//If the remaining collection is as large or larger than the number of seats we want to delete
 					if($seats->count() >= abs($difference))
 					{
 						for ($i=1; $i <= abs($difference); $i++) {
 							//Delete the appropriate number of seats
-							$seats->first()->delete();
+							$seats->pop()->delete();
 						}
 
 						//Log the deletion of seats to the log
@@ -219,7 +232,9 @@ public function postEdit($licenseId = null)
 						$logaction->asset_type = 'software';
 						$logaction->user_id = Sentry::getUser()->id;
 						$logaction->note = abs($difference)." seats";
+						$logaction->checkedout_to =  NULL;
 						$log = $logaction->logaction('delete seats');
+
 					} else {
 						// Redirect to the license edit page
 						return Redirect::to("admin/licenses/$licenseId/edit")->with('error', Lang::get('admin/licenses/message.assoc_users'));
@@ -364,21 +379,34 @@ public function postCheckout($seatId)
 
 
 		// Update the asset data
-		$licenseseat->assigned_to            		= e(Input::get('assigned_to'));
-
+		if ( e(Input::get('assigned_to')) == '') {
+				$licenseseat->assigned_to =  NULL;
+		} else {
+				$licenseseat->assigned_to = e(Input::get('assigned_to'));
+		}
 
 		// Was the asset updated?
 		if($licenseseat->save())
 		{
+
 			$logaction = new Actionlog();
 			$logaction->asset_id = $licenseseat->license_id;
-			$logaction->checkedout_to = $licenseseat->assigned_to;
 			$logaction->location_id = $assigned_to->location_id;
 			$logaction->asset_type = 'software';
 			$logaction->user_id = Sentry::getUser()->id;
 			$logaction->note = e(Input::get('note'));
+
+
+			// Update the asset data
+			if ( e(Input::get('assigned_to')) == '') {
+					$logaction->checkedout_to = NULL;
+			} else {
+					$logaction->checkedout_to = e(Input::get('assigned_to'));
+			}
+
 			$log = $logaction->logaction('checkout');
 
+
 			// Redirect to the new asset page
 			return Redirect::to("admin/licenses")->with('success', Lang::get('admin/licenses/message.checkout.success'));
 		}

app/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MakeAssetLogCheckedoutToNullable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::statement('ALTER TABLE asset_logs MODIFY column checkedout_to int(11) NULL');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}
+
+
+
+

app/database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MakeAssetLogPurchasedateToNullable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::statement('ALTER TABLE licenses MODIFY column purchase_date date NULL');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}