From 66adffe6d978db9ad476186e22a6cd920d037cfb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 9 Jun 2016 14:41:58 -0700
Subject: [PATCH 1/7] Moved include

---
 resources/views/hardware/edit.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 73cbcc4726..a23900e39a 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -15,7 +15,7 @@
   {{ trans('general.back') }}</a>
 @stop
 
-@include('partials/modals')
+
 
 {{-- Page content --}}
 
@@ -309,6 +309,7 @@
 
 
 @section('moar_scripts')
+    @include('partials/modals')
 <script>
 
     function fetchCustomFields() {

From f44d98924dbceef5dbe49ed61f1b80a8a923531b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 9 Jun 2016 14:42:13 -0700
Subject: [PATCH 2/7] Removed erroneous call to nonexistent model

---
 app/Http/Controllers/AssetsController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 236d28ebd6..2df8648371 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -10,7 +10,6 @@ use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
 use App\Models\AssetModel;
-use App\Models\AssetModels;
 use App\Models\Company;
 use App\Models\CustomField;
 use App\Models\Depreciation;

From ec4bc6c2af0e92b6b2cfa49d0d8c4713b8f381e8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 10 Jun 2016 03:40:49 -0700
Subject: [PATCH 3/7] Allow superadmins to print labels

---
 app/Http/Controllers/AssetsController.php   | 7 +------
 app/Http/Controllers/SettingsController.php | 1 +
 app/Models/Company.php                      | 3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 236d28ebd6..2929b4f5a5 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -696,9 +696,7 @@ class AssetsController extends Controller
             $asset = Asset::find($assetId);
             $size = Helper::barcodeDimensions($settings->barcode_type);
 
-            if (!Company::isCurrentUserHasAccess($asset)) {
-                return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
-            }
+
 
             if (isset($asset->id,$asset->asset_tag)) {
                 $barcode = new \Com\Tecnick\Barcode\Barcode();
@@ -725,9 +723,6 @@ class AssetsController extends Controller
         $settings = Setting::getSettings();
         $asset = Asset::find($assetId);
 
-        if (!Company::isCurrentUserHasAccess($asset)) {
-            return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
-        }
 
         if (isset($asset->id,$asset->asset_tag)) {
             $barcode = new \Com\Tecnick\Barcode\Barcode();
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 4b7642a88d..4627ccb303 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -338,6 +338,7 @@ class SettingsController extends Controller
 
         $setting->locale = e(Input::get('locale', 'en'));
         $setting->qr_code = e(Input::get('qr_code', '0'));
+        $setting->full_multiple_companies_support = e(Input::get('full_multiple_companies_support', '0'));
         $setting->alt_barcode = e(Input::get('alt_barcode'));
         $setting->alt_barcode_enabled = e(Input::get('alt_barcode_enabled', '0'));
         $setting->barcode_type = e(Input::get('barcode_type'));
diff --git a/app/Models/Company.php b/app/Models/Company.php
index ce4ef4bf45..5d563f0681 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -3,6 +3,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Watson\Validating\ValidatingTrait;
+use Auth;
 
 /**
  * Model for Companies.
@@ -108,7 +109,7 @@ final class Company extends Model
 
     public static function isCurrentUserAuthorized()
     {
-        return (!static::isFullMultipleCompanySupportEnabled() || Auth::user()->company_id == null);
+        return (!static::isFullMultipleCompanySupportEnabled() || (Auth::user()->company_id == null) || Auth::user()->isSuperUser());
     }
 
     public static function canManageUsersCompanies()

From a0901247a349b3bd895f15e2e0f06f927b7605b8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 10 Jun 2016 04:07:27 -0700
Subject: [PATCH 4/7] Let superadmins through companyable trait

---
 app/Http/Controllers/AssetsController.php | 3 ++-
 app/Models/Company.php                    | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 0425cb86f6..3e2f8a832f 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -255,8 +255,9 @@ class AssetsController extends Controller
     */
     public function getEdit($assetId = null)
     {
+        
         // Check if the asset exists
-        if (is_null($asset = Asset::find($assetId))) {
+        if (!$asset = Asset::find($assetId)) {
             // Redirect to the asset management page
             return redirect()->to('hardware')->with('error', trans('admin/hardware/message.does_not_exist'));
         } elseif (!Company::isCurrentUserHasAccess($asset)) {
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 5d563f0681..740008d3c1 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -102,14 +102,14 @@ final class Company extends Model
         } else {
             $current_user_company_id = Auth::user()->company_id;
             $companyable_company_id = $companyable->company_id;
-
-            return ($current_user_company_id == null || $current_user_company_id == $companyable_company_id);
+            return ($current_user_company_id == null || $current_user_company_id == $companyable_company_id || Auth::user()->isSuperUser());
         }
     }
 
     public static function isCurrentUserAuthorized()
     {
-        return (!static::isFullMultipleCompanySupportEnabled() || (Auth::user()->company_id == null) || Auth::user()->isSuperUser());
+
+        return ((!static::isFullMultipleCompanySupportEnabled()) || (Auth::user()->company_id == null) || (Auth::user()->isSuperUser()));
     }
 
     public static function canManageUsersCompanies()

From 7a9cfb1a8ff4fbd93693fbdd985f08dc644e9c58 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 10 Jun 2016 04:43:17 -0700
Subject: [PATCH 5/7] Fixed label weirdness when no serial

---
 resources/views/hardware/labels.blade.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index d810ae2887..ea27fe634e 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -93,7 +93,7 @@
 
 @foreach ($assets as $asset)
 	<?php $count++; ?>
-  <div class="label" {!!  ($count % $settings->labels_per_page == 0) ? 'style="margin-bottom: 0px;"' : '' !!}>
+  <div class="label"{!!  ($count % $settings->labels_per_page == 0) ? ' style="margin-bottom: 0px;"' : '' !!}>
 
       @if ($settings->qr_code=='1')
     <div class="qr_img">
@@ -102,23 +102,28 @@
       @endif
 
     <div class="qr_text">
+        <div class="pull-left">
         @if ($settings->qr_text!='')
             <strong>{{ $settings->qr_text }}</strong>
-        <br>
+            <br>
         @endif
+        </div>
+        <div class="pull-left">
         @if (($settings->labels_display_name=='1') && ($asset->name!=''))
             N: {{ $asset->name }}
-          <br>
         @endif
-
+        </div>
+        <div class="pull-left">
         @if (($settings->labels_display_tag=='1') && ($asset->asset_tag!=''))
             T: {{ $asset->asset_tag }}
-        <br>
         @endif
+        </div>
+        <div class="pull-left">
         @if (($settings->labels_display_serial=='1') && ($asset->serial!=''))
             S: {{ $asset->serial }}
-
         @endif
+         </div>
+
     </div>
 
     @if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!=''))

From 6fa4d1252d9aa54cef4b3c3721e988bf54ec1392 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 10 Jun 2016 05:00:49 -0700
Subject: [PATCH 6/7] Fixes purchase date if no purchase date given

---
 app/Console/Commands/ObjectImportCommand.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php
index 29583e8831..2ed05f7758 100644
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -113,7 +113,12 @@ class ObjectImportCommand extends Command {
 			$item_status_name = $this->array_smart_fetch($row, "status");
 
 			$item["item_name"] = $this->array_smart_fetch($row, "item name");
-			$item["purchase_date"] = date("Y-m-d 00:00:01", strtotime($this->array_smart_fetch($row, "purchase date")));
+			if ($this->array_smart_fetch($row, "purchase date")!='') {
+				$item["purchase_date"] = date("Y-m-d 00:00:01", strtotime($this->array_smart_fetch($row, "purchase date")));
+			} else {
+				$item["purchase_date"] = null;
+			}
+
 			$item["purchase_cost"] = $this->array_smart_fetch($row, "purchase cost");
 			$item["order_number"] = $this->array_smart_fetch($row, "order number");
 			$item["notes"] = $this->array_smart_fetch($row, "notes");

From 9e8b76d34895d3778bae76ce9d55c36b6340ed44 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 10 Jun 2016 05:16:27 -0700
Subject: [PATCH 7/7] Use updated $request->input methods for 5.2

---
 app/Http/Controllers/AssetsController.php | 68 +++++++++++------------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 3e2f8a832f..48d6191ce6 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -296,80 +296,78 @@ class AssetsController extends Controller
     * @since [v1.0]
     * @return Redirect
     */
-    public function postEdit($assetId = null)
+    public function postEdit(Request $request, $assetId = null)
     {
+        exit;
         // Check if the asset exists
-        if (is_null($asset = Asset::find($assetId))) {
+        if (!$asset = Asset::find($assetId)) {
             // Redirect to the asset management page with error
             return redirect()->to('hardware')->with('error', trans('admin/hardware/message.does_not_exist'));
         } elseif (!Company::isCurrentUserHasAccess($asset)) {
             return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
         }
 
-        if (e(Input::get('status_id')) == '') {
+        if ($request->has('status_id')) {
+            $asset->status_id = e($request->input('status_id'));
+        } else {
             $asset->status_id =  null;
-        } else {
-            $asset->status_id = e(Input::get('status_id'));
         }
 
-        if (e(Input::get('warranty_months')) == '') {
+        if ($request->has('warranty_months')) {
+            $asset->warranty_months = e($request->input('warranty_months'));
+        } else {
             $asset->warranty_months =  null;
-        } else {
-            $asset->warranty_months = e(Input::get('warranty_months'));
         }
 
-        if (e(Input::get('purchase_cost')) == '') {
+        if ($request->has('purchase_cost')) {
+            $asset->purchase_cost = e($request->input('purchase_cost'));
+        } else {
             $asset->purchase_cost =  null;
-        } else {
-            $asset->purchase_cost = e(Input::get('purchase_cost'));
         }
 
-        if (e(Input::get('purchase_date')) == '') {
+        if ($request->has('purchase_date')) {
+            $asset->purchase_date = e($request->input('purchase_date'));
+        } else {
             $asset->purchase_date =  null;
-        } else {
-            $asset->purchase_date        = e(Input::get('purchase_date'));
         }
 
-        if (e(Input::get('supplier_id')) == '') {
+        if ($request->has('supplier_id')) {
+            $asset->supplier_id = e($request->input('supplier_id'));
+        } else {
             $asset->supplier_id =  null;
-        } else {
-            $asset->supplier_id        = e(Input::get('supplier_id'));
         }
 
-        if (e(Input::get('requestable')) == '') {
-            $asset->requestable =  0;
+        if ($request->has('requestable')) {
+            $asset->requestable = e($request->input('requestable'));
         } else {
-            $asset->requestable        = e(Input::get('requestable'));
+            $asset->requestable =  null;
         }
 
-        if (e(Input::get('rtd_location_id')) == '') {
-            $asset->rtd_location_id = 0;
+        if ($request->has('rtd_location_id')) {
+            $asset->rtd_location_id = e($request->input('rtd_location_id'));
         } else {
-            $asset->rtd_location_id     = e(Input::get('rtd_location_id'));
+            $asset->requestable =  null;
         }
 
-        if (Input::has('image_delete')) {
+        if ($request->has('image_delete')) {
             unlink(public_path().'/uploads/assets/'.$asset->image);
             $asset->image = '';
         }
 
 
-
-        $checkModel = config('app.url').'/api/models/'.e(Input::get('model_id')).'/check';
-
         // Update the asset data
-        $asset->name         = e(Input::get('name'));
-        $asset->serial       = e(Input::get('serial'));
-        $asset->company_id   = Company::getIdForCurrentUser(e(Input::get('company_id')));
-        $asset->model_id     = e(Input::get('model_id'));
-        $asset->order_number = e(Input::get('order_number'));
-        $asset->asset_tag    = e(Input::get('asset_tag'));
-        $asset->notes        = e(Input::get('notes'));
+        $asset->name         = e($request->input('name'));
+        $asset->serial       = e($request->input('serial'));
+        $asset->company_id   = Company::getIdForCurrentUser(e($request->input('company_id')));
+        $asset->model_id     = e($request->input('model_id'));
+        $asset->order_number = e($request->input('order_number'));
+        $asset->asset_tag    = e($request->input('asset_tag'));
+        $asset->notes        = e($request->input('notes'));
         $asset->physical     = '1';
 
            // Update the image
           if (Input::has('image')) {
-            $image = Input::get('image');
+            $image = $request->input('image');
             $header = explode(';', $image, 2)[0];
             $extension = substr( $header, strpos($header, '/')+1);
             $image = substr( $image, strpos($image, ',')+1);