Merge remote-tracking branch 'origin/develop'

Author: snipe

.travis.yml

@@ -18,6 +18,7 @@ before_script:
   - cp app/config/production/database.example.php app/config/database.php
   - cp app/config/production/mail.example.php app/config/mail.php
   - php composer.phar self-update
+  - php composer.phar validate
   - php composer.phar install --prefer-source --no-interaction --dev
   - php artisan key:generate
   - php artisan migrate:install
@@ -31,4 +32,5 @@ script: phpunit
 
 # configure notifications (email, IRC, campfire etc)
 notifications:
-  slack: snipe:F6LWbfP6vhr3aRBoeARFG6Ti
+  slack:
+    secure: vv9we1RxB9RsrMbomSdq6D7vz/okobw87pEkgIZjB+hj1QpQ2by90gsPsOa+NgsJEFaEP7e4KlT6SH8kK+zhbmuKaUd3d1//XdcancE22LZXi6tkiB5yuR/Jhhb1LLDqyGJTB4D92hMnnCPiUjpxNA3r437ttNeYRdYIEEP3drA=

CONTRIBUTING.md

@@ -1,5 +1,25 @@
 # Contribution Guidelines
 
-Please submit all issues and pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the develop branch!
+Please submit all issues and pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the `develop` branch!
 
-As you're working on bug-fixes or features, please break them out into their own feature branches and open the pull request against your feature branch. It makes it much easier to decipher down the road, as you open multiple pull requests over time.
+**As you're working on bug-fixes or features, please break them out into their own feature branches and open the pull request against your feature branch**. It makes it _much_ easier to decipher down the road, as you open multiple pull requests over time, and makes it much easier for me to approve pull requests quickly.
+
+If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.
+
+-----
+
+## Translations!
+
+If you're not great at PHP and you still want to help, consider contributing some translation files (assuming, of course, that you are fluent in another language.)
+
+To do so:
+
+* fork the develop branch
+* create a new branch on your new fork (something like `translations/french`)
+* copy the `en` directory and name it according to the [two-letter ISO 639-1 code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
+* translate the strings
+* submit a pull request!
+
+**If you've translated Snipe IT into another language already for your own usage, please consider contributing those translation files back to the project so that everyone can benefit.**
+
+Thanks!

app/controllers/admin/LicensesController.php

@@ -79,16 +79,22 @@ public function postCreate()
 			$license->seats 			= e(Input::get('seats'));
 			$license->purchase_date 	= e(Input::get('purchase_date'));
 			$license->purchase_cost 	= e(Input::get('purchase_cost'));
+			$license->depreciate 		= e(Input::get('depreciate'));
 			$license->user_id 			= Sentry::getId();
 
-			if ($license->purchase_date == "0000-00-00") {
+			if (($license->purchase_date == "") || ($license->purchase_date == "0000-00-00")) {
 				$license->purchase_date = NULL;
 			}
 
-			if ($license->purchase_cost == "0.00") {
+			if (($license->purchase_cost == "") || ($license->purchase_cost == "0.00")) {
 				$license->purchase_cost = NULL;
 			}
 
+			if ($license->depreciate == "") {
+				$license->depreciate = 0;
+			}
+
+
 			// Was the license created?
 			if($license->save())
 			{
@@ -98,6 +104,8 @@ public function postCreate()
 					$license_seat = new LicenseSeat();
 					$license_seat->license_id 		= $insertedId;
 					$license_seat->user_id 			= Sentry::getId();
+					$license_seat->assigned_to 		= 0;
+					$license_seat->notes 			= NULL;
 					$license_seat->save();
 				}
 

app/controllers/admin/UsersController.php

@@ -267,6 +267,7 @@ public function postEdit($id = null)
 		// Create a new validator instance from our validation rules
 		$validator = Validator::make(Input::all(), $this->validationRules);
 
+
 		// If validation fails, we'll exit the operation now.
 		if ($validator->fails())
 		{
@@ -287,6 +288,14 @@ public function postEdit($id = null)
 			$user->location_id = Input::get('location_id');
 			$user->manager_id = Input::get('manager_id');
 
+			if ($user->manager_id == "") {
+				$user->manager_id = NULL;
+			}
+
+			if ($user->location_id == "") {
+					$user->location_id = NULL;
+			}
+
 
 			// Do we want to update the user password?
 			if ($password)

app/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php

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

app/database/migrations/2014_05_27_231658_alter_default_values_licenses.php

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

app/lang/en/admin/categories/general.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+	'about_asset_categories' 			=> 'About Asset Categories',
+	'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you. ',
+	'asset_categories' 					=> 'Asset Categories',
+	'category_name'  					=> 'Category Name',
+	'create'  							=> 'Create Category',
+	'update'  							=> 'Update Category',
+
+);

app/lang/en/admin/categories/message.php

@@ -16,6 +16,7 @@
 	),
 
 	'delete' => array(
+		'confirm'   => 'Are you sure you wish to delete this category?',
 		'error'   => 'There was an issue deleting the category. Please try again.',
 		'success' => 'The category was deleted successfully.'
 	)

app/lang/en/admin/categories/table.php

@@ -3,7 +3,7 @@
 return array(
 
 	'id'      => 'ID',
-	'title'      => 'Asset Category Name',
 	'parent'   => 'Parent',
+	'title'      => 'Asset Category Name',
 
 );

app/lang/en/admin/depreciations/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return array(
+	'about_asset_depreciations'  			=> 'About Asset Depreciations',
+	'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+	'asset_depreciations'  					=> 'Asset Depreciations',
+	'create_depreciation'  					=> 'Create Depreciation',
+	'depreciation_name'  					=> 'Depreciation Name',
+	'number_of_months'  					=> 'Number of Months',
+	'update_depreciation'  					=> 'Update Depreciation',
+
+);