From eeff305b029c089dcf85b05b9ad686e3fa6897f1 Mon Sep 17 00:00:00 2001
From: Karol <kpawelski@users.noreply.github.com>
Date: Fri, 16 Sep 2016 04:59:01 +0200
Subject: [PATCH 1/4] Update dashboard.blade.php (#2593)

---
 resources/views/dashboard.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index a2edef1c58..5c7377fbc9 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -25,7 +25,7 @@
             <i class="fa fa-barcode"></i>
           </div>
             @can('assets.view')
-                <a href="{{ route('hardware') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="{{ route('hardware') }}" class="small-box-footer">{{ trans('general.more_info') }} <i class="fa fa-arrow-circle-right"></i></a>
              @endcan
         </div>
       </div><!-- ./col -->
@@ -41,7 +41,7 @@
             <i class="fa fa-floppy-o"></i>
           </div>
             @can('licenses.view')
-                <a href="{{ route('licenses') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="{{ route('licenses') }}" class="small-box-footer">{{ trans('general.more_info') }} <i class="fa fa-arrow-circle-right"></i></a>
             @endcan
         </div>
       </div><!-- ./col -->
@@ -57,7 +57,7 @@
             <i class="fa fa-keyboard-o"></i>
           </div>
             @can('accessories.view')
-                <a href="{{ route('accessories') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="{{ route('accessories') }}" class="small-box-footer">{{ trans('general.more_info') }} <i class="fa fa-arrow-circle-right"></i></a>
             @endcan
         </div>
       </div><!-- ./col -->
@@ -73,7 +73,7 @@
             <i class="fa fa-tint"></i>
           </div>
             @can('consumables.view')
-                <a href="{{ route('consumables') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="{{ route('consumables') }}" class="small-box-footer">{{ trans('general.more_info') }} <i class="fa fa-arrow-circle-right"></i></a>
             @endcan
         </div>
       </div><!-- ./col -->

From 04898c49b245f9db4417cee414c23073e5b2e395 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 15 Sep 2016 20:03:47 -0700
Subject: [PATCH 2/4] Fixed wrong translation from PR

---
 resources/views/dashboard.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 5c7377fbc9..2bdb96232e 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -25,7 +25,7 @@
             <i class="fa fa-barcode"></i>
           </div>
             @can('assets.view')
-                <a href="{{ route('hardware') }}" class="small-box-footer">{{ trans('general.more_info') }} <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="{{ route('hardware') }}" class="small-box-footer">{{ trans('general.moreinfo') }} <i class="fa fa-arrow-circle-right"></i></a>
              @endcan
         </div>
       </div><!-- ./col -->
@@ -41,7 +41,7 @@
             <i class="fa fa-floppy-o"></i>
           </div>
             @can('licenses.view')
-                <a href="{{ route('licenses') }}" class="small-box-footer">{{ trans('general.more_info') }} <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="{{ route('licenses') }}" class="small-box-footer">{{ trans('general.moreinfo') }} <i class="fa fa-arrow-circle-right"></i></a>
             @endcan
         </div>
       </div><!-- ./col -->
@@ -57,7 +57,7 @@
             <i class="fa fa-keyboard-o"></i>
           </div>
             @can('accessories.view')
-                <a href="{{ route('accessories') }}" class="small-box-footer">{{ trans('general.more_info') }} <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="{{ route('accessories') }}" class="small-box-footer">{{ trans('general.moreinfo') }} <i class="fa fa-arrow-circle-right"></i></a>
             @endcan
         </div>
       </div><!-- ./col -->
@@ -73,7 +73,7 @@
             <i class="fa fa-tint"></i>
           </div>
             @can('consumables.view')
-                <a href="{{ route('consumables') }}" class="small-box-footer">{{ trans('general.more_info') }} <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="{{ route('consumables') }}" class="small-box-footer">{{ trans('general.moreinfo') }} <i class="fa fa-arrow-circle-right"></i></a>
             @endcan
         </div>
       </div><!-- ./col -->

From d3d36315d3c436f64c5cf0f6ca54033c295abaca Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 20 Sep 2016 00:49:08 -0700
Subject: [PATCH 3/4] Hotfixes adding company name to custom report

---
 app/Http/Controllers/ReportsController.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 327c02413f..3b9104afcc 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -396,6 +396,9 @@ class ReportsController extends Controller
         $rows   = [ ];
         $header = [ ];
 
+        if (e(Input::get('company_name')) == '1') {
+            $header[] = 'Company Name';
+        }
         if (e(Input::get('asset_name')) == '1') {
             $header[] = 'Asset Name';
         }
@@ -461,6 +464,10 @@ class ReportsController extends Controller
 
         foreach ($assets as $asset) {
             $row = [ ];
+
+            if (e(Input::get('company_name')) == '1') {
+                $row[] = is_null($asset->company) ? '' : e($asset->company->name);
+            }
             if (e(Input::get('asset_name')) == '1') {
                 $row[] = '"' .e($asset->name) . '"';
             }

From 3208522dd147bb31240dba0769dce82a22a8c007 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 23 Sep 2016 14:10:08 -0700
Subject: [PATCH 4/4] Fixes #2672 - model_no field updated to be string

---
 ...2_fix_modelno_in_consumables_to_string.php | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 database/migrations/2016_09_23_140722_fix_modelno_in_consumables_to_string.php

diff --git a/database/migrations/2016_09_23_140722_fix_modelno_in_consumables_to_string.php b/database/migrations/2016_09_23_140722_fix_modelno_in_consumables_to_string.php
new file mode 100644
index 0000000000..a76ea18189
--- /dev/null
+++ b/database/migrations/2016_09_23_140722_fix_modelno_in_consumables_to_string.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixModelnoInConsumablesToString extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('consumables', function ($table) {
+            $table->string('model_no')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('consumables', function ($table) {
+            $table->integer('model_no')->nullable()->default(null)->change();
+        });
+    }
+}