From e9f3d622f567044ba99e19f32c3b37a749e03ae5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 07:19:52 -0700
Subject: [PATCH 01/10] Add company name to custom asset report

---
 app/Http/Controllers/ReportsController.php | 27 ++++++++++++----------
 resources/views/reports/custom.blade.php   |  7 ++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 3b9104afc..71248820e 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -381,24 +381,25 @@ class ReportsController extends Controller
     }
 
     /**
-    * Exports the custom report to CSV
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ReportsController::getCustomReport() method that generates form view
-    * @since [v1.0]
-    * @return \Illuminate\Http\Response
-    */
+     * Exports the custom report to CSV
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ReportsController::getCustomReport() method that generates form view
+     * @since [v1.0]
+     * @return \Illuminate\Http\Response
+     */
     public function postCustom()
     {
-        $assets = Asset::orderBy('created_at', 'DESC')->get();
+        $assets = Asset::orderBy('created_at', 'DESC')->with('company','assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->get();
         $customfields = CustomField::get();
 
         $rows   = [ ];
         $header = [ ];
 
-        if (e(Input::get('company_name')) == '1') {
+        if (e(Input::get('company')) == '1') {
             $header[] = 'Company Name';
         }
+
         if (e(Input::get('asset_name')) == '1') {
             $header[] = 'Asset Name';
         }
@@ -465,9 +466,10 @@ class ReportsController extends Controller
         foreach ($assets as $asset) {
             $row = [ ];
 
-            if (e(Input::get('company_name')) == '1') {
+            if (e(Input::get('company')) == '1') {
                 $row[] = is_null($asset->company) ? '' : e($asset->company->name);
             }
+
             if (e(Input::get('asset_name')) == '1') {
                 $row[] = '"' .e($asset->name) . '"';
             }
@@ -594,14 +596,15 @@ class ReportsController extends Controller
             $csv      = implode($rows, "\n");
             $response = Response::make($csv, 200);
             $response->header('Content-Type', 'text/csv');
-            $response->header('Content-disposition', 'attachment;filename=report.csv');
+            $response->header('Content-disposition', 'attachment;filename='.date('Y-m-d-His').'-custom-asset-report.csv');
 
             return $response;
         } else {
             return redirect()->to("reports/custom")
-                           ->with('error', trans('admin/reports/message.error'));
+                ->with('error', trans('admin/reports/message.error'));
         }
     }
+    
 
     /**
      * getImprovementsReport
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 6a5f48938..63b61fbbe 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -34,6 +34,13 @@
       <div class="box-body">
         <div class="col-md-3">
 
+          <div class="checkbox col-md-12">
+            <label>
+              {{ Form::checkbox('company', '1') }}
+              {{ trans('general.company') }}
+            </label>
+          </div>
+
         <div class="checkbox col-md-12">
         	<label>
         	{{ Form::checkbox('asset_tag', '1') }}

From 3061ce2983a57a648a490e71111061180d222c25 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 07:23:30 -0700
Subject: [PATCH 02/10] Missed delimiter for CSV

---
 app/Http/Controllers/ReportsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 71248820e..4b94ad93f 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -467,7 +467,7 @@ class ReportsController extends Controller
             $row = [ ];
 
             if (e(Input::get('company')) == '1') {
-                $row[] = is_null($asset->company) ? '' : e($asset->company->name);
+                $row[] = is_null($asset->company) ? '' : '"' e($asset->company->name).'"';
             }
 
             if (e(Input::get('asset_name')) == '1') {

From 61d07bdc7c7b92c3ee9d6a93609991ff022e7f5b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 07:24:26 -0700
Subject: [PATCH 03/10] Sigh.

---
 app/Http/Controllers/ReportsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 4b94ad93f..0703c14e7 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -467,7 +467,7 @@ class ReportsController extends Controller
             $row = [ ];
 
             if (e(Input::get('company')) == '1') {
-                $row[] = is_null($asset->company) ? '' : '"' e($asset->company->name).'"';
+                $row[] = is_null($asset->company) ? '' : '"'.e($asset->company->name).'"';
             }
 
             if (e(Input::get('asset_name')) == '1') {

From 2a8ab06ca3927c21cf04624c9e25461ccb523fb8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 07:25:28 -0700
Subject: [PATCH 04/10] Remove escaping for CSV to prevent weird encoding

---
 app/Http/Controllers/ReportsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 0703c14e7..10b8d4e62 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -467,7 +467,7 @@ class ReportsController extends Controller
             $row = [ ];
 
             if (e(Input::get('company')) == '1') {
-                $row[] = is_null($asset->company) ? '' : '"'.e($asset->company->name).'"';
+                $row[] = is_null($asset->company) ? '' : '"'.$asset->company->name.'"';
             }
 
             if (e(Input::get('asset_name')) == '1') {

From fa72e64b986be0438b3787cc1977f9ce2bc79fab Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 08:42:48 -0700
Subject: [PATCH 05/10] Add checkout date to asset report

---
 app/Http/Controllers/ReportsController.php | 4 ++++
 resources/views/reports/asset.blade.php    | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 10b8d4e62..b3bf6e18c 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -133,6 +133,7 @@ class ReportsController extends Controller
 
             Asset::with('assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle) {
             fputcsv($handle, [
+                trans('general.company'),
                 trans('admin/hardware/table.asset_tag'),
                 trans('admin/hardware/form.manufacturer'),
                 trans('admin/hardware/form.model'),
@@ -145,6 +146,7 @@ class ReportsController extends Controller
                 trans('admin/hardware/form.order'),
                 trans('admin/hardware/form.supplier'),
                 trans('admin/hardware/table.checkoutto'),
+                trans('admin/hardware/table.checkout_date'),
                 trans('admin/hardware/table.location'),
                 trans('general.notes'),
              ]);
@@ -152,6 +154,7 @@ class ReportsController extends Controller
             foreach ($assets as $asset) {
                 // Add a new row with data
                 fputcsv($handle, [
+                    ($asset->company) ? $asset->company->name : '',
                     $asset->asset_tag,
                     ($asset->model->manufacturer) ? $asset->model->manufacturer->name : '',
                     ($asset->model) ? $asset->model->name : '',
@@ -164,6 +167,7 @@ class ReportsController extends Controller
                     ($asset->order_number) ? e($asset->order_number) : '',
                     ($asset->supplier) ? e($asset->supplier->name) : '',
                     ($asset->assigneduser) ? e($asset->assigneduser->fullName()) : '',
+                    ($asset->last_checkout!='') ? e($asset->last_checkout) : '',
                     ($asset->assigneduser && $asset->assigneduser->userloc!='') ?
                     e($asset->assigneduser->userloc->name) : ( ($asset->defaultLoc!='') ? e($asset->defaultLoc->name) : ''),
                     ($asset->notes) ? e($asset->notes) : '',
diff --git a/resources/views/reports/asset.blade.php b/resources/views/reports/asset.blade.php
index 95fe31084..e1ab6bc83 100644
--- a/resources/views/reports/asset.blade.php
+++ b/resources/views/reports/asset.blade.php
@@ -47,6 +47,7 @@
             <th class="col-sm-1">{{ trans('admin/hardware/form.order') }}</th>
             <th class="col-sm-1">{{ trans('admin/hardware/form.supplier') }}</th>
             <th class="col-sm-1">{{ trans('admin/hardware/table.checkoutto') }}</th>
+            <th class="col-sm-1">{{ trans('admin/hardware/table.checkout_date') }}</th>
             <th class="col-sm-1">{{ trans('admin/hardware/table.location') }}</th>
         </tr>
     </thead>
@@ -98,6 +99,13 @@
 
             @endif
             </td>
+
+            <td>
+                @if (($asset->assigneduser) && ($asset->last_checkout!=''))
+                    {{ $asset->last_checkout }}
+                @endif
+            </td>
+
             <td>
             @if (($asset->assigneduser) && ($asset->assigneduser->userLoc))
               {{ $asset->assigneduser->userLoc->name }}

From ed22ec4b36b672e6da6e08ccc60bd8c6e49f0fa9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 08:42:55 -0700
Subject: [PATCH 06/10] Bumped hash

---
 config/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/version.php b/config/version.php
index 00794b518..e76f18d67 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v3.4.0',
-  'hash_version' => 'v3.4.0-9-g67315d8',
-);
+  'app_version' => 'v3.4',
+  'hash_version' => 'v3.4-14-g2a8ab06',
+);
\ No newline at end of file

From f1c458185dba1bed984a76f989add43d6129e6a1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 14:56:05 -0700
Subject: [PATCH 07/10] Client-side pagination on asset report for faster
 loading

---
 app/Helpers/Helper.php                     |  12 ++
 app/Http/Controllers/AssetsController.php  |   8 +-
 app/Http/Controllers/ReportsController.php |  18 +--
 resources/views/reports/asset.blade.php    | 150 ++++++++-------------
 4 files changed, 80 insertions(+), 108 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index d92a2c988..91d3c3c78 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -495,4 +495,16 @@ class Helper
 
     }
 
+
+    public static function stripTagsFromJSON(Array $array) {
+
+        foreach ($array as $key => $value) {
+            $clean_value = strip_tags($value);
+            $clean_array[$key] = $clean_value;
+        }
+        return $clean_array;
+
+    }
+
+
 }
diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index c40535aec..c89d9f3d1 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -1843,7 +1843,13 @@ class AssetsController extends Controller
                 }
 
             }
-            $rows[]=$row;
+
+            if (($request->has('report')) && ($request->get('report')=='true')) {
+                $rows[]= Helper::stripTagsFromJSON($row);
+            } else {
+                $rows[]= $row;
+            }
+
         }
 
         $data = array('total'=>$assetCount, 'rows'=>$rows);
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index b3bf6e18c..d75784a81 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -89,7 +89,7 @@ class ReportsController extends Controller
     }
 
     /**
-    * Display asset report.
+    * Display asset report view.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
@@ -98,23 +98,11 @@ class ReportsController extends Controller
     public function getAssetsReport()
     {
         $settings = \App\Models\Setting::first();
-        // Grab all the assets
-        $assets = Asset::with(
-            'model',
-            'assigneduser.userLoc',
-            'assetstatus',
-            'defaultLoc',
-            'assetlog',
-            'supplier',
-            'model.manufacturer',
-            'company'
-        )
-         ->orderBy('created_at', 'DESC')
-        ->get();
-
         return View::make('reports/asset', compact('assets'))->with('settings', $settings);
     }
 
+
+
     /**
     * Exports the assets to CSV
     *
diff --git a/resources/views/reports/asset.blade.php b/resources/views/reports/asset.blade.php
index e1ab6bc83..2d8a984f0 100644
--- a/resources/views/reports/asset.blade.php
+++ b/resources/views/reports/asset.blade.php
@@ -23,99 +23,55 @@
       <div class="table-responsive">
 
       <table
-      name="assetReport"
-      id="table"
-      class="table table-striped"
-      data-cookie="true"
-      data-click-to-select="true"
-      data-cookie-id-table="assetReportTable">
+                  name="assetsReport"
+                  {{-- data-row-style="rowStyle" --}}
+                  data-toolbar="#toolbar"
+                  class="table table-striped"
+                  id="table"
+                  data-url="{{route('api.hardware.list', array(''=>e(Input::get('status')),'order_number'=>e(Input::get('order_number')), 'status_id'=>e(Input::get('status_id')), 'report'=>'true'))}}"
+                  data-cookie="true"
+                  data-click-to-select="true"
+                  data-cookie-id-table="{{ e(Input::get('status')) }}assetTable-{{ config('version.hash_version') }}">
+              <thead>
+              <tr>
+                  @if (Input::get('status')!='Deleted')
+                      <th data-class="hidden-xs" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div></th>
+                  @endif
+                  <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
+                  <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
+                  <th data-sortable="true" data-field="name" data-visible="false">{{ trans('admin/hardware/form.name') }}</th>
+                  <th data-sortable="true" data-field="asset_tag">{{ trans('admin/hardware/table.asset_tag') }}</th>
+                  <th data-sortable="true" data-field="serial">{{ trans('admin/hardware/table.serial') }}</th>
+                  <th data-sortable="true" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
+                  <th data-sortable="true" data-field="model_number" data-visible="false">{{ trans('admin/models/table.modelnumber') }}</th>
+                  <th data-sortable="true" data-field="status_label">{{ trans('admin/hardware/table.status') }}</th>
+                  <th data-sortable="true" data-field="assigned_to">{{ trans('admin/hardware/form.checkedout_to') }}</th>
+                  <th data-sortable="true" data-field="location" data-searchable="true">{{ trans('admin/hardware/table.location') }}</th>
+                  <th data-sortable="true" data-field="category" data-searchable="true">{{ trans('general.category') }}</th>
+                  <th data-sortable="true" data-field="manufacturer" data-searchable="true" data-visible="false">{{ trans('general.manufacturer') }}</th>
+                  <th data-sortable="true" data-field="purchase_cost" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.cost') }}</th>
+                  <th data-sortable="true" data-field="purchase_date" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.date') }}</th>
+                  <th data-sortable="false" data-field="eol" data-searchable="true">{{ trans('general.eol') }}</th>
+                  <th data-sortable="true" data-searchable="true" data-field="notes">{{ trans('general.notes') }}</th>
+                  <th data-sortable="true" data-searchable="true"  data-field="order_number">{{ trans('admin/hardware/form.order') }}</th>
+                  <th data-sortable="true" data-searchable="true" data-field="last_checkout">{{ trans('admin/hardware/table.checkout_date') }}</th>
+                  <th data-sortable="true" data-field="expected_checkin" data-searchable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
+                  @foreach(\App\Models\CustomField::all() AS $field)
 
-        <thead>
-            <tr role="row">
-            <th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/table.asset_tag') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/form.manufacturer') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/form.model') }}</th>
-            <th class="col-sm-1">{{ trans('general.model_no') }}</th>
-            @if ($settings->display_asset_name)
-                <th class="col-sm-1">{{ trans('general.name') }}</th>
-            @endif
-            <th class="col-sm-1">{{ trans('admin/hardware/table.serial') }}</th>
-             <th class="col-sm-1">{{ trans('admin/hardware/table.status') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/table.purchase_date') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/table.purchase_cost') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/form.order') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/form.supplier') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/table.checkoutto') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/table.checkout_date') }}</th>
-            <th class="col-sm-1">{{ trans('admin/hardware/table.location') }}</th>
-        </tr>
-    </thead>
-    <tbody>
 
-        @foreach ($assets as $asset)
-        <tr>
-            <td>{{ is_null($asset->company) ? '' : $asset->company->name }}</td>
-            <td>{{ $asset->asset_tag }}</td>
-            <td>
-            @if ($asset->model->manufacturer)
-                {{ $asset->model->manufacturer->name }}
-            @endif
-            </td>
-            <td>{{ $asset->model->name }}</td>
-            <td>{{ $asset->model->modelno }}</td>
-            @if ($settings->display_asset_name)
-                <td>{{ $asset->name }}</td>
-            @endif
-            <td>{{ $asset->serial }}</td>
-            <td>
-                {{ ($asset->assigneduser) ? 'Deployed' : ((e($asset->assetstatus)) ? e($asset->assetstatus->name) : '')  }}
-            </td>
-            <td>{{ $asset->purchase_date }}</td>
-            <td class="align-right">{{ $settings->default_currency }}
-                {{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }}
-            </td>
-            <td>
-                @if ($asset->order_number)
-                    {{ $asset->order_number }}
-                @endif
-            </td>
-            <td>
-                @if ($asset->supplier_id)
-                    <a href="{{ route('view/supplier', $asset->supplier_id) }}">
-                    {{ $asset->supplier->name }}
-                    </a>
-                @endif
-            </td>
-            <td>
-             @if ($asset->assigneduser)
-            	 @if ($asset->assigneduser->deleted_at!='')
-            	 	<del>{{ $asset->assigneduser->fullName() }}</del>
-            	 @else
-            	 	<a href="{{ route('view/user', $asset->assigned_to) }}">
-					{{ $asset->assigneduser->fullName() }}
-					</a>
-            	 @endif
+                      <th data-sortable="{{ ($field->field_encrypted=='1' ? 'false' : 'true') }}" data-visible="false" data-field="{{$field->db_column_name()}}">
+                          @if ($field->field_encrypted=='1')
+                              <i class="fa fa-lock"></i>
+                          @endif
 
-            @endif
-            </td>
+                          {{$field->name}}
+                      </th>
 
-            <td>
-                @if (($asset->assigneduser) && ($asset->last_checkout!=''))
-                    {{ $asset->last_checkout }}
-                @endif
-            </td>
+                  @endforeach
+                  <th data-sortable="true" data-field="created_at" data-searchable="true" data-visible="false">{{ trans('general.created_at') }}</th>
 
-            <td>
-            @if (($asset->assigneduser) && ($asset->assigneduser->userLoc))
-              {{ $asset->assigneduser->userLoc->name }}
-            @elseif ($asset->defaultLoc)
-              {{ $asset->defaultLoc->name }}
-            @endif
-            </td>
-        </tr>
-        @endforeach
-    </tbody>
+              </tr>
+              </thead>
 </table>
 </div>
 </div>
@@ -130,6 +86,7 @@
 <script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
 <script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
 <script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
+
 <script type="text/javascript">
     $('#table').bootstrapTable({
         classes: 'table table-responsive table-no-bordered',
@@ -137,30 +94,39 @@
         iconsPrefix: 'fa',
         showRefresh: true,
         search: true,
-        pageSize: {{ $settings->per_page }},
+        pageSize: 100,
         pagination: true,
-        sidePagination: 'client',
+        sidePagination: 'server',
         sortable: true,
+        showMultiSort: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
         exportDataType: 'all',
-        exportTypes: ['csv', 'txt','json', 'xml'],
+        exportTypes: ['csv', 'excel', 'txt','json', 'xml'],
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",
         paginationPreText: "{{ trans('general.previous') }}",
         paginationNextText: "{{ trans('general.next') }}",
-        pageList: ['10','25','50','100','150','200'],
+        pageList: ['10','25','50','100','150','200','500','1000'],
+        exportOptions: {
+            fileName: 'assets-export-' + (new Date()).toISOString().slice(0,10),
+        },
         icons: {
             paginationSwitchDown: 'fa-caret-square-o-down',
             paginationSwitchUp: 'fa-caret-square-o-up',
+            sort: 'fa fa-sort-amount-desc',
+            plus: 'fa fa-plus',
+            minus: 'fa fa-minus',
             columns: 'fa-columns',
             refresh: 'fa-refresh'
         },
 
     });
+
 </script>
 @stop
 

From 67f199b09da963c5d9b5c83eeed81feb9582e4d9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 15:09:47 -0700
Subject: [PATCH 08/10] Added customfields to asset CSV export

---
 app/Http/Controllers/ReportsController.php | 92 ++++++++++++----------
 1 file changed, 51 insertions(+), 41 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index d75784a81..f39a8a66c 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -115,53 +115,63 @@ class ReportsController extends Controller
 
          \Debugbar::disable();
 
+        $customfields = CustomField::get();
+
         $response = new StreamedResponse(function(){
             // Open output stream
             $handle = fopen('php://output', 'w');
 
             Asset::with('assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle) {
-            fputcsv($handle, [
-                trans('general.company'),
-                trans('admin/hardware/table.asset_tag'),
-                trans('admin/hardware/form.manufacturer'),
-                trans('admin/hardware/form.model'),
-                trans('general.model_no'),
-                trans('general.name'),
-                trans('admin/hardware/table.serial'),
-                trans('general.status'),
-                trans('admin/hardware/table.purchase_date'),
-                trans('admin/hardware/table.purchase_cost'),
-                trans('admin/hardware/form.order'),
-                trans('admin/hardware/form.supplier'),
-                trans('admin/hardware/table.checkoutto'),
-                trans('admin/hardware/table.checkout_date'),
-                trans('admin/hardware/table.location'),
-                trans('general.notes'),
-             ]);
+                $headers=[
+                    trans('general.company'),
+                    trans('admin/hardware/table.asset_tag'),
+                    trans('admin/hardware/form.manufacturer'),
+                    trans('admin/hardware/form.model'),
+                    trans('general.model_no'),
+                    trans('general.name'),
+                    trans('admin/hardware/table.serial'),
+                    trans('general.status'),
+                    trans('admin/hardware/table.purchase_date'),
+                    trans('admin/hardware/table.purchase_cost'),
+                    trans('admin/hardware/form.order'),
+                    trans('admin/hardware/form.supplier'),
+                    trans('admin/hardware/table.checkoutto'),
+                    trans('admin/hardware/table.checkout_date'),
+                    trans('admin/hardware/table.location'),
+                    trans('general.notes'),
+                ];
+                foreach($customfields as $field) {
+                    $headers[]=$field->name;
+                }
+                fputcsv($handle, $headers);
 
-            foreach ($assets as $asset) {
-                // Add a new row with data
-                fputcsv($handle, [
-                    ($asset->company) ? $asset->company->name : '',
-                    $asset->asset_tag,
-                    ($asset->model->manufacturer) ? $asset->model->manufacturer->name : '',
-                    ($asset->model) ? $asset->model->name : '',
-                    ($asset->model->modelno) ? $asset->model->modelno : '',
-                    ($asset->name) ? $asset->name : '',
-                    ($asset->serial) ? $asset->serial : '',
-                    ($asset->assetstatus) ? e($asset->assetstatus->name) : '',
-                    ($asset->purchase_date) ? e($asset->purchase_date) : '',
-                    ($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '',
-                    ($asset->order_number) ? e($asset->order_number) : '',
-                    ($asset->supplier) ? e($asset->supplier->name) : '',
-                    ($asset->assigneduser) ? e($asset->assigneduser->fullName()) : '',
-                    ($asset->last_checkout!='') ? e($asset->last_checkout) : '',
-                    ($asset->assigneduser && $asset->assigneduser->userloc!='') ?
-                    e($asset->assigneduser->userloc->name) : ( ($asset->defaultLoc!='') ? e($asset->defaultLoc->name) : ''),
-                    ($asset->notes) ? e($asset->notes) : '',
-                ]);
-            }
-        });
+                foreach ($assets as $asset) {
+                    // Add a new row with data
+                    $values=[
+                        ($asset->company) ? $asset->company->name : '',
+                        $asset->asset_tag,
+                        ($asset->model->manufacturer) ? $asset->model->manufacturer->name : '',
+                        ($asset->model) ? $asset->model->name : '',
+                        ($asset->model->modelno) ? $asset->model->modelno : '',
+                        ($asset->name) ? $asset->name : '',
+                        ($asset->serial) ? $asset->serial : '',
+                        ($asset->assetstatus) ? e($asset->assetstatus->name) : '',
+                        ($asset->purchase_date) ? e($asset->purchase_date) : '',
+                        ($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '',
+                        ($asset->order_number) ? e($asset->order_number) : '',
+                        ($asset->supplier) ? e($asset->supplier->name) : '',
+                        ($asset->assigneduser) ? e($asset->assigneduser->fullName()) : '',
+                        ($asset->last_checkout!='') ? e($asset->last_checkout) : '',
+                        ($asset->assigneduser && $asset->assigneduser->userloc!='') ?
+                            e($asset->assigneduser->userloc->name) : ( ($asset->defaultLoc!='') ? e($asset->defaultLoc->name) : ''),
+                        ($asset->notes) ? e($asset->notes) : '',
+                    ];
+                    foreach($customfields as $field) {
+                        $values[]=$asset->{$field->db_column_name()};
+                    }
+                    fputcsv($handle, $values);
+                }
+            });
 
             // Close the output stream
             fclose($handle);

From ee2522571cffa62960e7252fd092c42c7e45f29c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 19:07:30 -0700
Subject: [PATCH 09/10] Fixes #2673

---
 app/Http/Controllers/AccessoriesController.php       |  4 ++--
 app/Http/Controllers/AssetMaintenancesController.php |  4 ++--
 app/Http/Controllers/AssetsController.php            |  6 +++---
 app/Http/Controllers/ComponentsController.php        |  4 ++--
 app/Http/Controllers/ConsumablesController.php       |  6 +++---
 app/Http/Controllers/LicensesController.php          | 11 +++--------
 6 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php
index 7f8c6debe..ea20762fc 100755
--- a/app/Http/Controllers/AccessoriesController.php
+++ b/app/Http/Controllers/AccessoriesController.php
@@ -92,7 +92,7 @@ class AccessoriesController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $accessory->purchase_cost       =  null;
         } else {
-            $accessory->purchase_cost       = e(Input::get('purchase_cost'));
+            $accessory->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')))p;
         }
 
         $accessory->qty                     = e(Input::get('qty'));
@@ -126,7 +126,7 @@ class AccessoriesController extends Controller
         }
 
         return View::make('accessories/edit', compact('accessory'))
-          ->with('category_list', Helper::categoryList('accessory'))
+          ->with('category_list', erper::categoryList('accessory'))
           ->with('company_list', Helper::companyList())
           ->with('location_list', Helper::locationsList())
           ->with('manufacturer_list', Helper::manufacturerList());
diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php
index b7bdb81bb..ea2a1bcce 100644
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -215,7 +215,7 @@ class AssetMaintenancesController extends Controller
         if (e(Input::get('cost')) == '') {
             $assetMaintenance->cost = '';
         } else {
-            $assetMaintenance->cost =  e(Input::get('cost'));
+            $assetMaintenance->cost =  Helper::ParseFloat(e(Input::get('cost')));
         }
 
         if (e(Input::get('notes')) == '') {
@@ -363,7 +363,7 @@ class AssetMaintenancesController extends Controller
         if (e(Input::get('cost')) == '') {
             $assetMaintenance->cost = '';
         } else {
-            $assetMaintenance->cost =  e(Input::get('cost'));
+            $assetMaintenance->cost =  Helper::ParseFloat(e(Input::get('cost')));
         }
 
         if (e(Input::get('notes')) == '') {
diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index c89d9f3d1..8e9c3ba26 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -178,7 +178,7 @@ class AssetsController extends Controller
         if (e(Input::get('purchase_cost')) == '') {
             $asset->purchase_cost =  null;
         } else {
-            $asset->purchase_cost = (e(Input::get('purchase_cost')));
+            $asset->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         if (e(Input::get('purchase_date')) == '') {
@@ -354,7 +354,7 @@ class AssetsController extends Controller
         }
 
         if ($request->has('purchase_cost')) {
-            $asset->purchase_cost = e(Helper::formatCurrencyOutput($request->input('purchase_cost')));
+            $asset->purchase_cost = Helper::ParseFloat(e($request->input('purchase_cost')));
         } else {
             $asset->purchase_cost =  null;
         }
@@ -1491,7 +1491,7 @@ class AssetsController extends Controller
                     }
 
                     if (Input::has('purchase_cost')) {
-                        $update_array['purchase_cost'] =  e(Input::get('purchase_cost'));
+                        $update_array['purchase_cost'] =  Helper::ParseFloat(e(Input::get('purchase_cost')));
                     }
 
                     if (Input::has('supplier_id')) {
diff --git a/app/Http/Controllers/ComponentsController.php b/app/Http/Controllers/ComponentsController.php
index 5debde18f..9de9b6733 100644
--- a/app/Http/Controllers/ComponentsController.php
+++ b/app/Http/Controllers/ComponentsController.php
@@ -99,7 +99,7 @@ class ComponentsController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $component->purchase_cost       =  null;
         } else {
-            $component->purchase_cost       = e(Input::get('purchase_cost'));
+            $component->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         $component->total_qty                    = e(Input::get('total_qty'));
@@ -183,7 +183,7 @@ class ComponentsController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $component->purchase_cost       =  null;
         } else {
-            $component->purchase_cost       = e(Input::get('purchase_cost'));
+            $component->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         $component->total_qty                    = e(Input::get('total_qty'));
diff --git a/app/Http/Controllers/ConsumablesController.php b/app/Http/Controllers/ConsumablesController.php
index 821c388fd..3743ff0bc 100644
--- a/app/Http/Controllers/ConsumablesController.php
+++ b/app/Http/Controllers/ConsumablesController.php
@@ -97,7 +97,7 @@ class ConsumablesController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $consumable->purchase_cost       =  null;
         } else {
-            $consumable->purchase_cost       = e(Input::get('purchase_cost'));
+            $consumable->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         $consumable->qty                    = e(Input::get('qty'));
@@ -182,10 +182,10 @@ class ConsumablesController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $consumable->purchase_cost       =  null;
         } else {
-            $consumable->purchase_cost       = e(Input::get('purchase_cost'));
+            $consumable->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
-        $consumable->qty                    = e(Input::get('qty'));
+        $consumable->qty                    = Helper::ParseFloat(e(Input::get('qty')));
 
         if ($consumable->save()) {
             return redirect()->to("admin/consumables")->with('success', trans('admin/consumables/message.update.success'));
diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php
index b92f7a3c4..ec2720df9 100755
--- a/app/Http/Controllers/LicensesController.php
+++ b/app/Http/Controllers/LicensesController.php
@@ -87,17 +87,13 @@ class LicensesController extends Controller
     public function postCreate()
     {
 
-
-        // get the POST data
-        $new = Input::all();
-
         // create a new model instance
         $license = new License();
 
         if (e(Input::get('purchase_cost')) == '') {
             $license->purchase_cost =  null;
         } else {
-            $license->purchase_cost = e(Input::get('purchase_cost'));
+            $license->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         if (e(Input::get('supplier_id')) == '') {
@@ -289,10 +285,9 @@ class LicensesController extends Controller
         }
 
         if (e(Input::get('purchase_cost')) == '') {
-              $license->purchase_cost =  null;
+            $license->purchase_cost =  null;
         } else {
-              $license->purchase_cost = e(Input::get('purchase_cost'));
-              //$license->purchase_cost = e(Input::get('purchase_cost'));
+            $license->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         if (e(Input::get('maintained')) == '') {

From b90c0de82264d958bcf1bad3e74bf57a51e617cd Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 27 Sep 2016 19:07:45 -0700
Subject: [PATCH 10/10] Fix companyable reult in maintenances

---
 app/Http/Controllers/AssetMaintenancesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php
index ea2a1bcce..aa40376c6 100644
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -141,7 +141,7 @@ class AssetMaintenancesController extends Controller
                 'completion_date'     => $maintenance->completion_date,
                 'user_id'       => ($maintenance->admin) ? (string)link_to('/admin/users/'.$maintenance->admin->id.'/view', $maintenance->admin->fullName()) : '',
                 'actions'       => $actions,
-                'companyName'   => ($maintenance->asset) ? $maintenance->asset->company->name : ''
+                'companyName'   => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
             );
         }