Merge branch 'develop'

# Conflicts: # config/version.php
Bumped hash
2018-01-20 07:47:54 -08:00 · 2018-01-20 07:47:07 -08:00 · 2018-01-20 07:42:48 -08:00 · 2018-01-20 04:56:36 -08:00 · 2018-01-20 04:53:04 -08:00 · 2018-01-20 04:49:40 -08:00
388 changed files with 8067 additions and 20309 deletions
@@ -838,6 +838,24 @@
      "contributions": [
        "doc"
      ]
+    },
+    {
+      "login": "vcordes79",
+      "name": "vcordes79",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/10672546?v=4",
+      "profile": "https://github.com/vcordes79",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fordster78",
+      "name": "fordster78",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/27958330?v=4",
+      "profile": "https://github.com/fordster78",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
@@ -29,7 +29,7 @@
 - If a stacktrace is provided in the error, include that too.
 - Any errors that appear in your browser's error console.
 - Confirm whether the error is reproducible on the demo: https://snipeitapp.com/demo.
- Include any additional information you can find in `app/storage/logs` and your webserver's logs.
+- Include any additional information you can find in `storage/logs` and your webserver's logs.
 - Include what you've done so far in the installation, and if you got any error messages along the way.
 - Indicate whether or not you've manually edited any data directly in the database

@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - ready for dev
+  - bounty
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions!
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&amp;title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]() [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead) [![Zenhub](https://img.shields.io/badge/Shipping_faster_with-ZenHub-5e60ba.svg)](https://zenhub.io) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-90-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-92-orange.svg?style=flat-square)](#contributors)


 ## Snipe-IT - Open Source Asset Management System
@@ -68,7 +68,8 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars2.githubusercontent.com/u/857740?v=3" width="110px;"/><br /><sub>Gil Rutkowski</sub>](http://FlashingCursor.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=flashingcursor "Code") | [<img src="https://avatars3.githubusercontent.com/u/129360?v=3" width="110px;"/><br /><sub>Desmond Morris</sub>](http://www.desmondmorris.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=desmondmorris "Code") | [<img src="https://avatars2.githubusercontent.com/u/52936?v=3" width="110px;"/><br /><sub>Nick Peelman</sub>](http://peelman.us)<br />[💻](https://github.com/snipe/snipe-it/commits?author=peelman "Code") | [<img src="https://avatars0.githubusercontent.com/u/53161?v=3" width="110px;"/><br /><sub>Abraham Vegh</sub>](https://abrahamvegh.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=abrahamvegh "Code") | [<img src="https://avatars0.githubusercontent.com/u/2818680?v=3" width="110px;"/><br /><sub>Mohamed Rashid</sub>](https://github.com/rashivkp)<br />[📖](https://github.com/snipe/snipe-it/commits?author=rashivkp "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/1509456?v=3" width="110px;"/><br /><sub>Kasey</sub>](http://hinchk.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=HinchK "Code") | [<img src="https://avatars2.githubusercontent.com/u/10522541?v=3" width="110px;"/><br /><sub>Brett</sub>](https://github.com/BrettFagerlund)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=BrettFagerlund "Tests") |
 | [<img src="https://avatars2.githubusercontent.com/u/16108587?v=3" width="110px;"/><br /><sub>Jason Spriggs</sub>](http://jasonspriggs.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jasonspriggs "Code") | [<img src="https://avatars2.githubusercontent.com/u/1134568?v=3" width="110px;"/><br /><sub>Nate Felton</sub>](http://n8felton.wordpress.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=n8felton "Code") | [<img src="https://avatars2.githubusercontent.com/u/14036694?v=3" width="110px;"/><br /><sub>Manasses Ferreira</sub>](http://homepages.dcc.ufmg.br/~manassesferreira)<br />[💻](https://github.com/snipe/snipe-it/commits?author=manassesferreira "Code") | [<img src="https://avatars0.githubusercontent.com/u/15913949?v=3" width="110px;"/><br /><sub>Steve</sub>](https://github.com/steveelwood)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=steveelwood "Tests") | [<img src="https://avatars1.githubusercontent.com/u/3361683?v=3" width="110px;"/><br /><sub>matc</sub>](http://twitter.com/matc)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=matc "Tests") | [<img src="https://avatars3.githubusercontent.com/u/7405702?v=3" width="110px;"/><br /><sub>Cole R. Davis</sub>](http://www.davisracingteam.com)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD "Tests") | [<img src="https://avatars2.githubusercontent.com/u/10167681?v=3" width="110px;"/><br /><sub>gibsonjoshua55</sub>](https://github.com/gibsonjoshua55)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55 "Code") |
 | [<img src="https://avatars2.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://github.com/zwerch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [<img src="https://avatars0.githubusercontent.com/u/6961695?v=4" width="110px;"/><br /><sub>Iman</sub>](https://github.com/imanghafoori1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [<img src="https://avatars1.githubusercontent.com/u/6551003?v=4" width="110px;"/><br /><sub>Richard Hofman</sub>](https://github.com/richardhofman6)<br />[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [<img src="https://avatars0.githubusercontent.com/u/3697569?v=4" width="110px;"/><br /><sub>gizzmojr</sub>](https://github.com/gizzmojr)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | [<img src="https://avatars3.githubusercontent.com/u/404729?v=4" width="110px;"/><br /><sub>Jenny Li</sub>](https://github.com/imjennyli)<br />[📖](https://github.com/snipe/snipe-it/commits?author=imjennyli "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/869227?v=4" width="110px;"/><br /><sub>Geoff Young</sub>](https://github.com/GeoffYoung)<br />[💻](https://github.com/snipe/snipe-it/commits?author=GeoffYoung "Code") | [<img src="https://avatars3.githubusercontent.com/u/1068477?v=4" width="110px;"/><br /><sub>Elliot Blackburn</sub>](http://www.elliotblackburn.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=BlueHatbRit "Documentation") |
-| [<img src="https://avatars1.githubusercontent.com/u/6357451?v=4" width="110px;"/><br /><sub>Tõnis Ormisson</sub>](http://andmemasin.eu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TonisOrmisson "Code") | [<img src="https://avatars0.githubusercontent.com/u/449411?v=4" width="110px;"/><br /><sub>Nicolai Essig</sub>](http://www.nicolai-essig.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thakilla "Code") | [<img src="https://avatars1.githubusercontent.com/u/14809698?v=4" width="110px;"/><br /><sub>Danielle</sub>](https://github.com/techincolor)<br />[📖](https://github.com/snipe/snipe-it/commits?author=techincolor "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/18545156?v=4" width="110px;"/><br /><sub>Lawrence</sub>](https://github.com/TheVakman)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=TheVakman "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3ATheVakman "Bug reports") | [<img src="https://avatars1.githubusercontent.com/u/22473767?v=4" width="110px;"/><br /><sub>uknzaeinozpas</sub>](https://github.com/uknzaeinozpas)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Tests") [💻](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Code") | [<img src="https://avatars3.githubusercontent.com/u/422752?v=4" width="110px;"/><br /><sub>Ryan</sub>](https://github.com/Gelob)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Gelob "Documentation") |
+| [<img src="https://avatars1.githubusercontent.com/u/6357451?v=4" width="110px;"/><br /><sub>Tõnis Ormisson</sub>](http://andmemasin.eu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TonisOrmisson "Code") | [<img src="https://avatars0.githubusercontent.com/u/449411?v=4" width="110px;"/><br /><sub>Nicolai Essig</sub>](http://www.nicolai-essig.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thakilla "Code") | [<img src="https://avatars1.githubusercontent.com/u/14809698?v=4" width="110px;"/><br /><sub>Danielle</sub>](https://github.com/techincolor)<br />[📖](https://github.com/snipe/snipe-it/commits?author=techincolor "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/18545156?v=4" width="110px;"/><br /><sub>Lawrence</sub>](https://github.com/TheVakman)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=TheVakman "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3ATheVakman "Bug reports") | [<img src="https://avatars1.githubusercontent.com/u/22473767?v=4" width="110px;"/><br /><sub>uknzaeinozpas</sub>](https://github.com/uknzaeinozpas)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Tests") [💻](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Code") | [<img src="https://avatars3.githubusercontent.com/u/422752?v=4" width="110px;"/><br /><sub>Ryan</sub>](https://github.com/Gelob)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Gelob "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/10672546?v=4" width="110px;"/><br /><sub>vcordes79</sub>](https://github.com/vcordes79)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vcordes79 "Code") |
+| [<img src="https://avatars3.githubusercontent.com/u/27958330?v=4" width="110px;"/><br /><sub>fordster78</sub>](https://github.com/fordster78)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fordster78 "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -460,19 +460,19 @@ class Helper
     */
    public static function checkLowInventory()
    {
-        $consumables = Consumable::with('users')->whereNotNull('min_amt')->get();
-        $accessories = Accessory::with('users')->whereNotNull('min_amt')->get();
-        $components = Component::with('assets')->whereNotNull('min_amt')->get();
+        $consumables = Consumable::withCount('consumableAssignments')->whereNotNull('min_amt')->get();
+        $accessories = Accessory::withCount('users')->whereNotNull('min_amt')->get();
+        $components = Component::withCount('assets')->whereNotNull('min_amt')->get();

        $avail_consumables = 0;
        $items_array = array();
        $all_count = 0;

        foreach ($consumables as $consumable) {
-            $avail = $consumable->numRemaining();
+            $avail = $consumable->qty - $consumable->consumable_assignment_count;  //$consumable->numRemaining();
            if ($avail < ($consumable->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
                if ($consumable->qty > 0) {
-                    $percent = number_format((($consumable->numRemaining() / $consumable->qty) * 100), 0);
+                    $percent = number_format((($avail / $consumable->qty) * 100), 0);
                } else {
                    $percent = 100;
                }
@@ -481,7 +481,7 @@ class Helper
                $items_array[$all_count]['name'] = $consumable->name;
                $items_array[$all_count]['type'] = 'consumables';
                $items_array[$all_count]['percent'] = $percent;
-                $items_array[$all_count]['remaining']=$consumable->numRemaining();
+                $items_array[$all_count]['remaining'] = $avail;
                $items_array[$all_count]['min_amt']=$consumable->min_amt;
                $all_count++;
            }
@@ -490,11 +490,11 @@ class Helper
        }

        foreach ($accessories as $accessory) {
-            $avail = $accessory->numRemaining();
+            $avail = $accessory->qty - $accessory->users_count;
            if ($avail < ($accessory->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {

                if ($accessory->qty > 0) {
-                    $percent = number_format((($accessory->numRemaining() / $accessory->qty) * 100), 0);
+                    $percent = number_format((($avail / $accessory->qty) * 100), 0);
                } else {
                    $percent = 100;
                }
@@ -503,7 +503,7 @@ class Helper
                $items_array[$all_count]['name'] = $accessory->name;
                $items_array[$all_count]['type'] = 'accessories';
                $items_array[$all_count]['percent'] = $percent;
-                $items_array[$all_count]['remaining']=$accessory->numRemaining();
+                $items_array[$all_count]['remaining'] = $avail;
                $items_array[$all_count]['min_amt']=$accessory->min_amt;
                $all_count++;
            }
@@ -511,10 +511,10 @@ class Helper
        }

        foreach ($components as $component) {
-            $avail = $component->numRemaining();
+            $avail = $component->qty - $component->assets_count;
            if ($avail < ($component->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
                if ($component->qty > 0) {
-                    $percent = number_format((($component->numRemaining() / $component->qty) * 100), 0);
+                    $percent = number_format((($avail / $component->qty) * 100), 0);
                } else {
                    $percent = 100;
                }
@@ -523,7 +523,7 @@ class Helper
                $items_array[$all_count]['name'] = $component->name;
                $items_array[$all_count]['type'] = 'components';
                $items_array[$all_count]['percent'] = $percent;
-                $items_array[$all_count]['remaining']=$component->numRemaining();
+                $items_array[$all_count]['remaining'] = $avail;
                $items_array[$all_count]['min_amt']=$component->min_amt;
                $all_count++;
            }
@@ -30,20 +30,21 @@ class AssetModelsController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', AssetModel::class);
-        $allowed_columns = ['id','image','name','model_number','eol','notes','created_at','manufacturer'];
+        $allowed_columns = ['id','image','name','model_number','eol','notes','created_at','manufacturer','assets_count'];

        $assetmodels = AssetModel::select(['models.id','models.image','models.name','model_number','eol','models.notes','models.created_at','category_id','manufacturer_id','depreciation_id','fieldset_id', 'models.deleted_at'])
            ->with('category','depreciation', 'manufacturer','fieldset')
            ->withCount('assets');

-        if ($request->has('search')) {
-            $assetmodels->TextSearch($request->input('search'));
-        }
+

        if ($request->has('status')) {
            $assetmodels->onlyTrashed();
        }

+        if ($request->has('search')) {
+            $assetmodels->TextSearch($request->input('search'));
+        }

        $offset = $request->input('offset', 0);
        $limit = $request->input('limit', 50);
@@ -60,6 +61,7 @@ class AssetModelsController extends Controller
        }


+
        $total = $assetmodels->count();
        $assetmodels = $assetmodels->skip($offset)->take($limit)->get();
        return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total);
@@ -200,7 +202,7 @@ class AssetModelsController extends Controller
        $assetmodels = $assetmodels->OrderCategory('ASC')->OrderManufacturer('ASC')->orderby('models.name', 'asc')->orderby('models.model_number', 'asc')->paginate(50);

        foreach ($assetmodels as $assetmodel) {
-            $assetmodel->use_text = (($assetmodel->category) ? e($assetmodel->category->name) : '').': '.(($assetmodel->manufacturer) ? e($assetmodel->manufacturer->name) : '').' '.$assetmodel->present()->modelName;
+            $assetmodel->use_text = (($assetmodel->category) ? e($assetmodel->category->name) : '').': '.$assetmodel->present()->modelName;
            $assetmodel->use_image = ($assetmodel->image) ? url('/').'/uploads/models/'.$assetmodel->image : null;
        }

@@ -54,7 +54,9 @@ class AssetsController extends Controller
     */
    public function index(Request $request)
    {
+
        $this->authorize('index', Asset::class);
+        $settings = Setting::getSettings();

        $allowed_columns = [
            'id',
@@ -78,30 +80,28 @@ class AssetsController extends Controller
        ];

        $filter = array();
+
        if ($request->has('filter')) {
            $filter = json_decode($request->input('filter'));
        }

-
        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
        foreach ($all_custom_fields as $field) {
            $allowed_columns[]=$field->db_column_name();
        }

-        $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets")->with(
-            'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
+        $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets")
+            ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
            'model.category', 'model.manufacturer', 'model.fieldset','supplier');


-        if (count($filter) > 0) {
-            $assets->ByFilter($filter);
-        } elseif ($request->has('search')) {
-            $assets->TextSearch($request->input('search'));
-        }



-        // These are used by the API to query against specific ID numbers
+
+        // These are used by the API to query against specific ID numbers.
+        // They are also used by the individual searches on detail pages like
+        // locations, etc.
        if ($request->has('status_id')) {
            $assets->where('assets.status_id', '=', $request->input('status_id'));
        }
@@ -116,12 +116,18 @@ class AssetsController extends Controller

        if ($request->has('location_id')) {
            $assets->where('assets.location_id', '=', $request->input('location_id'));
+           // dd($assets->toSql());
        }

        if ($request->has('supplier_id')) {
            $assets->where('assets.supplier_id', '=', $request->input('supplier_id'));
        }

+        if (($request->has('assigned_to')) && ($request->has('assigned_type'))) {
+            $assets->where('assets.assigned_to', '=', $request->input('assigned_to'))
+                    ->where('assets.assigned_type', '=', $request->input('assigned_type'));
+        }
+
        if ($request->has('company_id')) {
            $assets->where('assets.company_id', '=', $request->input('company_id'));
        }
@@ -140,7 +146,6 @@ class AssetsController extends Controller
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

-
        // This is used by the sidenav, mostly

        // We switched from using query scopes here because of a Laravel bug
@@ -193,11 +198,21 @@ class AssetsController extends Controller
                $assets->where('assets.assigned_to', '>', '0');
                break;
            default:
-                // terrible workaround for complex-query Laravel bug in fulltext
-                $assets->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.archived', '=', 0);
-                });
+
+                if ($settings->show_archived_in_list!='1') {
+                    // terrible workaround for complex-query Laravel bug in fulltext
+                    $assets->join('status_labels AS status_alias',function ($join) {
+                        $join->on('status_alias.id', "=", "assets.status_id")
+                            ->where('status_alias.archived', '=', 0);
+                    });
+                }
+
+        }
+
+        if (count($filter) > 0) {
+            $assets->ByFilter($filter);
+        } elseif ($request->has('search')) {
+            $assets->TextSearch($request->input('search'));
        }


@@ -243,7 +258,8 @@ class AssetsController extends Controller
                $assets->orderBy($column_sort, $order);
                break;
        }
-        
+
+
        $total = $assets->count();
        $assets = $assets->skip($offset)->take($limit)->get();
        return (new AssetsTransformer)->transformAssets($assets, $total);
@@ -344,7 +360,7 @@ class AssetsController extends Controller
        $asset->model_id                = $request->get('model_id');
        $asset->order_number            = $request->get('order_number');
        $asset->notes                   = $request->get('notes');
-        $asset->asset_tag               = $request->get('asset_tag');
+        $asset->asset_tag               = $request->get('asset_tag', Asset::autoincrement_asset());
        $asset->user_id                 = Auth::id();
        $asset->archived                = '0';
        $asset->physical                = '1';
@@ -436,26 +452,24 @@ class AssetsController extends Controller
            ($request->has('company_id')) ?
                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';

-            if ($request->has('model_id')) {
-                if (($model = AssetModel::find($request->get('model_id'))) && (isset($model->fieldset))) {
-                    foreach ($model->fieldset->fields as $field) {
-                        if ($request->has($field->convertUnicodeDbSlug())) {
-                            $asset->{$field->convertUnicodeDbSlug()} = e($request->input($field->convertUnicodeDbSlug()));
-                        }
+
+            // Update custom fields
+            if (($model = AssetModel::find($asset->model_id)) && (isset($model->fieldset))) {
+                foreach ($model->fieldset->fields as $field) {
+                    if ($request->has($field->convertUnicodeDbSlug())) {
+                        $asset->{$field->convertUnicodeDbSlug()} = e($request->input($field->convertUnicodeDbSlug()));
                    }
                }
            }

+
            if ($asset->save()) {

-                if ($request->get('assigned_user')) {
-                    $target = User::find(request('assigned_user'));
-                    $location = $target->location_id;
-                } elseif ($request->get('assigned_asset')) {
-                    $target = Asset::find(request('assigned_asset'));
-                    $location = $target->location_id;
-                } elseif ($request->get('assigned_location')) {
-                    $target = Location::find(request('assigned_location'));
+                if (($request->has('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
+                        $location = $target->location_id;
+                } elseif (($request->has('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
+                            $location = $target->location_id;
+                } elseif (($request->has('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
                    $location = $target->id;
                }

@@ -35,10 +35,7 @@ class CompaniesController extends Controller
            'components_count',
        ];

-        $companies = Company::withCount('assets','licenses','accessories','consumables','components','users')
-            ->withCount('users')->withCount('assets')
-            ->withCount('licenses')->withCount('accessories')
-            ->withCount('consumables')->withCount('components');
+        $companies = Company::withCount('assets','licenses','accessories','consumables','components','users');

        if ($request->has('search')) {
            $companies->TextSearch($request->input('search'));
@@ -31,6 +31,10 @@ class ComponentsController extends Controller
            $components = $components->TextSearch($request->input('search'));
        }

+        if ($request->has('company_id')) {
+            $components->where('company_id','=',$request->input('company_id'));
+        }
+
        $offset = request('offset', 0);
        $limit = request('limit', 50);

@@ -2,11 +2,14 @@

 namespace App\Http\Controllers\Api;

+use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\CustomFieldsTransformer;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Http\Request;
+use Validator;
+use Illuminate\Validation\Rule;

 class CustomFieldsController extends Controller
 {
@@ -27,6 +30,81 @@ class CustomFieldsController extends Controller
        $total = count($fields);
        return (new CustomFieldsTransformer)->transformCustomFields($fields, $total);
    }
+
+    /**
+    * Shows the given field
+    * @author [V. Cordes] [<volker@fdatek.de>]
+    * @param int $id
+    * @since [v4.1.10]
+    * @return View
+    */
+    public function show($id)
+    {
+      $this->authorize('show', CustomField::class);
+        if ($field = CustomField::find($id)) {
+            return (new CustomFieldsTransformer)->transformCustomField($field);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/custom_fields/message.field.invalid')), 200);
+    }
+
+     /**
+     * Update the specified field
+     *
+     * @author [V. Cordes] [<volker@fdatek.de>]
+     * @since [v4.1.10]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('edit', CustomField::class);
+        $field = CustomField::findOrFail($id);
+        $data = $request->all();
+
+        $validator = Validator::make($data, $field->validationRules());
+        if ($validator->fails()) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()));
+        }
+
+        $field->fill($data);
+
+        if ($field->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $field, trans('admin/custom_fields/message.field.update.success')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $field->getErrors()));
+    }
+
+
+    /**
+     * Store a newly created field.
+     *
+     * @author [V. Cordes] [<volker@fdatek.de>]
+     * @since [v4.1.10]
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->authorize('create', CustomField::class);
+        $field = new CustomField;
+
+        $data = $request->all();
+        $validator = Validator::make($data, $field->validationRules());
+        if ($validator->fails()) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()));
+        }
+        $field->fill($data);
+
+        if ($field->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $field, trans('admin/custom_fields/message.field.create.success')));
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $field->getErrors()));
+
+    }
+
    public function postReorder(Request $request, $id)
    {
        $fieldset = CustomFieldset::find($id);
@@ -62,7 +140,7 @@ class CustomFieldsController extends Controller
        if ($field->fieldset->count() >0) {
            return response()->json(Helper::formatStandardApiResponse('error', null, 'Field is in use.'));
        }
-        
+
        $field->delete();
        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/custom_fields/message.field.delete.success')));

@@ -5,7 +5,9 @@ namespace App\Http\Controllers\Api;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\LicensesTransformer;
+use App\Http\Transformers\LicenseSeatsTransformer;
 use App\Models\License;
+use App\Models\LicenseSeat;
 use App\Models\Company;

 class LicensesController extends Controller
@@ -23,9 +25,6 @@ class LicensesController extends Controller
        $this->authorize('view', License::class);
        $licenses = Company::scopeCompanyables(License::with('company', 'manufacturer', 'freeSeats', 'supplier')->withCount('freeSeats'));

-        if ($request->has('search')) {
-            $licenses = $licenses->TextSearch($request->input('search'));
-        }

        if ($request->has('company_id')) {
            $licenses->where('company_id','=',$request->input('company_id'));
@@ -71,6 +70,12 @@ class LicensesController extends Controller
            $licenses->where('supplier_id','=',$request->input('supplier_id'));
        }

+
+        if ($request->has('search')) {
+            $licenses = $licenses->TextSearch($request->input('search'));
+        }
+
+
        $offset = request('offset', 0);
        $limit = request('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -92,7 +97,8 @@ class LicensesController extends Controller
                $licenses = $licenses->orderBy($sort, $order);
                break;
        }
-        
+
+

        $total = $licenses->count();

@@ -162,4 +168,38 @@ class LicensesController extends Controller
    {
        //
    }
+
+    /**
+     * Get license seat listing
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $licenseId
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function seats(Request $request, $licenseId)
+    {
+
+        if ($license = License::find($licenseId)) {
+
+            $seats = LicenseSeat::where('license_id', $licenseId)->with('license', 'user', 'asset');
+
+            $offset = request('offset', 0);
+            $limit = request('limit', 50);
+            $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+
+            $total = $seats->count();
+            $seats = $seats->skip($offset)->take($limit)->get();
+
+            if ($seats) {
+                return (new LicenseSeatsTransformer)->transformLicenseSeats($seats, $total);
+            }
+
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.does_not_exist')), 200);
+
+    }
+
+
 }
@@ -22,7 +22,7 @@ class ManufacturersController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', Manufacturer::class);
-        $allowed_columns = ['id','name','url','support_url','support_email','support_phone','created_at','updated_at','image'];
+        $allowed_columns = ['id','name','url','support_url','support_email','support_phone','created_at','updated_at','image', 'assets_count', 'consumables_count', 'components_count', 'licenses_count'];

        $manufacturers = Manufacturer::select(
            array('id','name','url','support_url','support_email','support_phone','created_at','updated_at','image')
@@ -58,11 +58,6 @@ class UsersController extends Controller
        $users = Company::scopeCompanyables($users);


-        if ($request->has('search')) {
-            $users = $users->TextSearch($request->input('search'));
-        }
-
-
        if (($request->has('deleted')) && ($request->input('deleted')=='true')) {
            $users = $users->GetDeleted();
        }
@@ -83,6 +78,10 @@ class UsersController extends Controller
            $users = $users->where('users.department_id','=',$request->input('department_id'));
        }

+        if ($request->has('search')) {
+            $users = $users->TextSearch($request->input('search'));
+        }
+
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $offset = request('offset', 0);
        $limit = request('limit',  20);
@@ -111,6 +110,8 @@ class UsersController extends Controller
                $users = $users->orderBy($sort, $order);
                break;
        }
+
+
        $total = $users->count();
        $users = $users->skip($offset)->take($limit)->get();
        return (new UsersTransformer)->transformUsers($users, $total);
@@ -131,6 +132,7 @@ class UsersController extends Controller
        $users = User::select(
            [
                'users.id',
+                'users.username',
                'users.employee_num',
                'users.first_name',
                'users.last_name',
@@ -159,8 +161,12 @@ class UsersController extends Controller
            }
            $name_str .= e($user->first_name);

+            if ($user->username!='') {
+                $name_str .= ' ('.e($user->username).')';
+            }
+
            if ($user->employee_num!='') {
-                $name_str .= ' (#'.e($user->employee_num).')';
+                $name_str .= ' - #'.e($user->employee_num);
            }

            $user->use_text = $name_str;
@@ -40,6 +40,7 @@ class AssetModelsController extends Controller
    */
    public function index()
    {
+        $this->authorize('index', AssetModel::class);
        return view('models/index');
    }

@@ -52,6 +53,7 @@ class AssetModelsController extends Controller
    */
    public function create()
    {
+        $this->authorize('create', AssetModel::class);
        $category_type = 'asset';
        return view('models/edit')->with('category_type',$category_type)
        ->with('depreciation_list', Helper::depreciationList())
@@ -69,6 +71,7 @@ class AssetModelsController extends Controller
    public function store(ImageUploadRequest $request)
    {

+        $this->authorize('create', AssetModel::class);
        // Create a new asset model
        $model = new AssetModel;

@@ -124,7 +127,8 @@ class AssetModelsController extends Controller
     */
    public function apiStore(Request $request)
    {
-      //COPYPASTA!!!! FIXME
+        //COPYPASTA!!!! FIXME
+        $this->authorize('create', AssetModel::class);
        $model = new AssetModel;

        $settings=Input::all();
@@ -162,6 +166,7 @@ class AssetModelsController extends Controller
    */
    public function edit($modelId = null)
    {
+        $this->authorize('edit', AssetModel::class);
        if ($item = AssetModel::find($modelId)) {
            $category_type = 'asset';
            $view = View::make('models/edit', compact('item','category_type'));
@@ -185,6 +190,7 @@ class AssetModelsController extends Controller
    */
    public function update(ImageUploadRequest $request, $modelId = null)
    {
+        $this->authorize('edit', AssetModel::class);
        // Check if the model exists
        if (is_null($model = AssetModel::find($modelId))) {
            // Redirect to the models management page
@@ -255,6 +261,7 @@ class AssetModelsController extends Controller
    */
    public function destroy($modelId)
    {
+        $this->authorize('delete', AssetModel::class);
        // Check if the model exists
        if (is_null($model = AssetModel::find($modelId))) {
            return redirect()->route('models.index')->with('error', trans('admin/models/message.not_found'));
@@ -291,7 +298,7 @@ class AssetModelsController extends Controller
    */
    public function getRestore($modelId = null)
    {
-
+        $this->authorize('create', AssetModel::class);
        // Get user information
        $model = AssetModel::withTrashed()->find($modelId);

@@ -322,6 +329,7 @@ class AssetModelsController extends Controller
    */
    public function show($modelId = null)
    {
+        $this->authorize('view', AssetModel::class);
        $model = AssetModel::withTrashed()->find($modelId);

        if (isset($model->id)) {
@@ -1198,9 +1198,14 @@ class AssetsController extends Controller
        $user = User::find(e(Input::get('assigned_to')));
        $admin = Auth::user();

+        if (!$user) {
+            return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.user_does_not_exist'));
+        }
+
        if (!is_array(Input::get('selected_assets'))) {
            return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
        }
+
        $asset_ids = array_filter(Input::get('selected_assets'));

        if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) {
@@ -1215,6 +1220,7 @@ class AssetsController extends Controller
            $expected_checkin = '';
        }

+
        $errors = [];
        DB::transaction(function () use ($user, $admin, $checkout_at, $expected_checkin, $errors, $asset_ids) {
          
@@ -1223,6 +1229,14 @@ class AssetsController extends Controller
                $this->authorize('checkout', $asset);
                $error = $asset->checkOut($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null);

+                if ($user->location_id!='') {
+                    $asset->location_id = $user->location_id;
+                    $asset->unsetEventDispatcher();
+                    $asset->save();
+
+                }
+
+
                if ($error) {
                    array_merge_recursive($errors, $asset->getErrors()->toArray());
                }
@@ -12,4 +12,12 @@ class RegisterController extends Controller
    {
        $this->middleware('guest');
    }
+
+    public function showRegistrationForm() {
+        abort(404,'Page not found');
+    }
+    
+    public function register() {
+        abort(404,'Page not found');
+    }
 }
@@ -40,6 +40,7 @@ class CategoriesController extends Controller
    public function index()
    {
        // Show the page
+        $this->authorize('view', Category::class);
        return view('categories/index');
    }

@@ -55,6 +56,7 @@ class CategoriesController extends Controller
    public function create()
    {
        // Show the page
+        $this->authorize('create', Category::class);
         $category_types= Helper::categoryTypeList();
        return view('categories/edit')->with('item', new Category)
            ->with('category_types', $category_types);
@@ -71,6 +73,7 @@ class CategoriesController extends Controller
     */
    public function store(ImageUploadRequest $request)
    {
+        $this->authorize('create', Category::class);
        $category = new Category();
        $category->name                 = $request->input('name');
        $category->category_type        = $request->input('category_type');
@@ -110,6 +113,7 @@ class CategoriesController extends Controller
     */
    public function edit($categoryId = null)
    {
+        $this->authorize('edit', Category::class);
        if (is_null($item = Category::find($categoryId))) {
            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
        }
@@ -132,7 +136,7 @@ class CategoriesController extends Controller
     */
    public function update(ImageUploadRequest $request, $categoryId = null)
    {
-        // Check if the blog post exists
+        $this->authorize('edit', Category::class);
        if (is_null($category = Category::find($categoryId))) {
            // Redirect to the categories management page
            return redirect()->to('admin/categories')->with('error', trans('admin/categories/message.does_not_exist'));
@@ -198,6 +202,7 @@ class CategoriesController extends Controller
     */
    public function destroy($categoryId)
    {
+        $this->authorize('delete', Category::class);
        // Check if the category exists
        if (is_null($category = Category::find($categoryId))) {
            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
@@ -231,6 +236,7 @@ class CategoriesController extends Controller
     */
    public function show($id)
    {
+        $this->authorize('view', Category::class);
        if ($category = Category::find($id)) {

            if ($category->category_type=='asset') {
@@ -335,7 +335,7 @@ class ComponentsController extends Controller
                return redirect()->route('components.index')->with('error',
                    trans('admin/components/message.not_found'));
            }
-            $this->authorize('checkin', $component_assets);
+            $this->authorize('checkin', $component);
            return view('components/checkin', compact('component_assets','component','asset'));
        }

@@ -40,6 +40,7 @@ class LocationsController extends Controller
    public function index()
    {
        // Grab all the locations
+        $this->authorize('view', Location::class);
        $locations = Location::orderBy('created_at', 'DESC')->with('parent', 'assets', 'assignedassets')->get();

        // Show the page
@@ -57,6 +58,7 @@ class LocationsController extends Controller
     */
    public function create()
    {
+        $this->authorize('create', Location::class);
        $locations = Location::orderBy('name', 'ASC')->get();

        $location_options_array = Location::getLocationHierarchy($locations);
@@ -80,6 +82,7 @@ class LocationsController extends Controller
     */
    public function store(ImageUploadRequest $request)
    {
+        $this->authorize('create', Location::class);
        $location = new Location();
        $location->name             = $request->input('name');
        $location->parent_id        = $request->input('parent_id', null);
@@ -122,6 +125,7 @@ class LocationsController extends Controller
    */
    public function apiStore(Request $request)
    {
+        $this->authorize('create', Location::class);
        $new['currency']=Setting::first()->default_currency;

        // create a new location instance
@@ -158,6 +162,7 @@ class LocationsController extends Controller
     */
    public function edit($locationId = null)
    {
+        $this->authorize('edit', Location::class);
        // Check if the location exists
        if (is_null($item = Location::find($locationId))) {
            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
@@ -186,6 +191,7 @@ class LocationsController extends Controller
     */
    public function update(ImageUploadRequest $request, $locationId = null)
    {
+        $this->authorize('edit', Location::class);
        // Check if the location exists
        if (is_null($location = Location::find($locationId))) {
            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
@@ -252,6 +258,7 @@ class LocationsController extends Controller
     */
    public function destroy($locationId)
    {
+        $this->authorize('delete', Location::class);
        if (is_null($location = Location::find($locationId))) {
            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.not_found'));
        }
@@ -29,4 +29,13 @@ class ModalController extends Controller
    function user() {
        return view('modals.user');
    }
+
+    function category() {
+        return view('modals.category');
+    }
+
+    function manufacturer() {
+        return view('modals.manufacturer');
+    }
+
 }
@@ -67,7 +67,7 @@ class SettingsController extends Controller

        $start_settings['url_config'] = url('/');
        $start_settings['real_url'] = $pageURL;
-        
+
        // Curl the .env file to make sure it's not accessible via a browser
        $ch = curl_init($protocol . $host.'/.env');
        curl_setopt($ch, CURLOPT_HEADER, true);    // we want headers
@@ -150,28 +150,31 @@ class SettingsController extends Controller


        $user = new User;
-        $user->first_name  = $data['first_name']= e(Input::get('first_name'));
-        $user->last_name = e(Input::get('last_name'));
-        $user->email = $data['email'] = e(Input::get('email'));
+        $user->first_name  = $data['first_name']= $request->input('first_name');
+        $user->last_name = $request->input('last_name');
+        $user->email = $data['email'] = $request->input('email');
        $user->activated = 1;
        $permissions = array('superuser' => 1);
        $user->permissions = json_encode($permissions);
-        $user->username = $data['username'] = e(Input::get('username'));
-        $user->password = bcrypt(Input::get('password'));
-        $data['password'] =  Input::get('password');
+        $user->username = $data['username'] = $request->input('username');
+        $user->password = bcrypt($request->input('password'));
+        $data['password'] =  $request->input('password');

        $settings = new Setting;
-        $settings->site_name = e(Input::get('site_name'));
-        $settings->alert_email = e(Input::get('email'));
+        $settings->full_multiple_companies_support = $request->input('full_multiple_companies_support', 0);
+        $settings->site_name = $request->input('site_name');
+        $settings->alert_email = $request->input('email');
        $settings->alerts_enabled = 1;
        $settings->pwd_secure_min = 10;
        $settings->brand = 1;
-        $settings->locale = 'en';
-        $settings->default_currency = 'USD';
+        $settings->locale = $request->input('locale', 'en');
+        $settings->default_currency = $request->input('default_currency', "USD");
        $settings->user_id = 1;
-        $settings->email_domain = e(Input::get('email_domain'));
-        $settings->email_format = e(Input::get('email_format'));
+        $settings->email_domain = $request->input('email_domain');
+        $settings->email_format = $request->input('email_format');
        $settings->next_auto_tag_base = 1;
+        $settings->auto_increment_assets = $request->input('auto_increment_assets', 0);
+        $settings->auto_increment_prefix = $request->input('auto_increment_prefix');


        if ((!$user->isValid()) || (!$settings->isValid())) {
@@ -313,6 +316,8 @@ class SettingsController extends Controller

        $setting->full_multiple_companies_support = $request->input('full_multiple_companies_support', '0');
        $setting->load_remote = $request->input('load_remote', '0');
+        $setting->show_archived_in_list = $request->input('show_archived_in_list', '0');
+        $setting->dashboard_message = $request->input('dashboard_message');
        $setting->email_domain = $request->input('email_domain');
        $setting->email_format = $request->input('email_format');
        $setting->username_format = $request->input('username_format');
@@ -32,12 +32,13 @@ class StatuslabelsController extends Controller

    public function index()
    {
+        $this->authorize('view', Statuslabel::class);
        return view('statuslabels.index', compact('statuslabels'));
    }

    public function show($id)
    {
-
+        $this->authorize('view', Statuslabel::class);
        if ($statuslabel = Statuslabel::find($id)) {
            return view('statuslabels.view')->with('statuslabel', $statuslabel);
        }
@@ -55,6 +56,7 @@ class StatuslabelsController extends Controller
    public function create()
    {
        // Show the page
+        $this->authorize('create', Statuslabel::class);
        $item = new Statuslabel;
        $use_statuslabel_type = $item->getStatuslabelType();
        $statuslabel_types = Helper::statusTypeList();
@@ -72,6 +74,7 @@ class StatuslabelsController extends Controller
    public function store(Request $request)
    {

+        $this->authorize('create', Statuslabel::class);
        // create a new model instance
        $statusLabel = new Statuslabel();

@@ -106,6 +109,7 @@ class StatuslabelsController extends Controller
     */
    public function apiStore(Request $request)
    {
+        $this->authorize('create', Statuslabel::class);
        $statuslabel = new Statuslabel();
        if (!$request->has('statuslabel_types')) {
            return JsonResponse::create(["error" => trans('validation.statuslabel_type')], 500);
@@ -137,6 +141,7 @@ class StatuslabelsController extends Controller
     */
    public function edit($statuslabelId = null)
    {
+        $this->authorize('update', Statuslabel::class);
        // Check if the Statuslabel exists
        if (is_null($item = Statuslabel::find($statuslabelId))) {
            // Redirect to the blogs management page
@@ -159,6 +164,7 @@ class StatuslabelsController extends Controller
     */
    public function update(Request $request, $statuslabelId = null)
    {
+        $this->authorize('update', Statuslabel::class);
        // Check if the Statuslabel exists
        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
            // Redirect to the blogs management page
@@ -197,6 +203,7 @@ class StatuslabelsController extends Controller
     */
    public function destroy($statuslabelId)
    {
+        $this->authorize('delete', Statuslabel::class);
        // Check if the Statuslabel exists
        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.not_found'));
@@ -33,6 +33,7 @@ class SuppliersController extends Controller
    public function index()
    {
        // Grab all the suppliers
+        $this->authorize('view', Supplier::class);
        $suppliers = Supplier::orderBy('created_at', 'DESC')->get();

        // Show the page
@@ -47,6 +48,7 @@ class SuppliersController extends Controller
     */
    public function create()
    {
+        $this->authorize('create', Supplier::class);
        return view('suppliers/edit')->with('item', new Supplier);
    }

@@ -59,6 +61,7 @@ class SuppliersController extends Controller
     */
    public function store(ImageUploadRequest $request)
    {
+        $this->authorize('create', Supplier::class);
        // Create a new supplier
        $supplier = new Supplier;
        // Save the location data
@@ -100,6 +103,7 @@ class SuppliersController extends Controller
     */
    public function apiStore(Request $request)
    {
+        $this->authorize('create', Supplier::class);
        $supplier = new Supplier;
        $supplier->name =  $request->input('name');
        $supplier->user_id              = Auth::id();
@@ -118,6 +122,7 @@ class SuppliersController extends Controller
     */
    public function edit($supplierId = null)
    {
+        $this->authorize('edit', Supplier::class);
        // Check if the supplier exists
        if (is_null($item = Supplier::find($supplierId))) {
            // Redirect to the supplier  page
@@ -137,6 +142,7 @@ class SuppliersController extends Controller
     */
    public function update($supplierId = null, ImageUploadRequest $request)
    {
+        $this->authorize('edit', Supplier::class);
        // Check if the supplier exists
        if (is_null($supplier = Supplier::find($supplierId))) {
            // Redirect to the supplier  page
@@ -207,6 +213,7 @@ class SuppliersController extends Controller
     */
    public function destroy($supplierId)
    {
+        $this->authorize('delete', Supplier::class);
        if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances','assets','licenses')->find($supplierId))) {
            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
        }
@@ -431,7 +431,7 @@ class UsersController extends Controller
    public function postBulkEdit(Request $request)
    {
        $this->authorize('update', User::class);
-        if ((!Input::has('ids')) || (count(Input::has('ids')) == 0)) {
+        if ((!Input::has('ids')) || (count(Input::input('ids')) == 0)) {
            return redirect()->back()->with('error', 'No users selected');
        } else {

@@ -480,6 +480,11 @@ class UsersController extends Controller
            if ($request->has('company_id')) {
                $update_array['company_id'] = $request->input('company_id');
            }
+            if ($request->has('locale')) {
+                $update_array['locale'] = $request->input('locale');
+            }
+
+

            if ($request->has('manager_id')) {

@@ -36,13 +36,16 @@ class AssetRequest extends Request
            'checkin_date'    => 'date',
            'supplier_id'     => 'integer|nullable',
            'status'          => 'integer|nullable',
-            'asset_tag'       => 'required',
            'purchase_cost'   => 'numeric|nullable',
            "assigned_user"   => 'sometimes:required_without_all:assigned_asset,assigned_location',
            "assigned_asset"   => 'sometimes:required_without_all:assigned_user,assigned_location',
            "assigned_location"   => 'sometimes:required_without_all:assigned_user,assigned_asset',
        ];

+        $settings = \App\Models\Setting::getSettings();
+
+        $rules['asset_tag'] = ($settings->auto_increment_assets == '1') ? 'max:255' : 'required';
+
        $model = AssetModel::find($this->request->get('model_id'));

        if (($model) && ($model->fieldset)) {
@@ -26,7 +26,7 @@ class ItemImportRequest extends FormRequest
    public function rules()
    {
        return [
-            //
+            'import-type' => 'required',
        ];
    }

@@ -34,7 +34,8 @@ class AssetsTransformer
            'eol' => ($asset->purchase_date!='') ? Helper::getFormattedDateObject($asset->present()->eol_date(), 'date') : null ,
            'status_label' => ($asset->assetstatus) ? [
                'id' => (int) $asset->assetstatus->id,
-                'name'=> e($asset->present()->statusText),
+                'name'=> e($asset->assetstatus->name),
+                'status_type'=> e($asset->assetstatus->getStatuslabelType()),
                'status_meta' =>  e($asset->present()->statusMeta),
            ] : null,
            'category' => ($asset->model->category) ? [
@@ -38,7 +38,7 @@ class CompaniesTransformer

            $permissions_array['available_actions'] = [
                'update' => Gate::allows('update', Company::class) ? true : false,
-                'delete' => (Gate::allows('delete', Category::class) && ($company->assets_count == 0) && ($company->accessories_count == 0) && ($company->consumables_count == 0) && ($company->components_count == 0) && ($company->users_count == 0)) ? true : false,
+                'delete' => (Gate::allows('delete', Company::class) && ($company->assets_count == 0) && ($company->accessories_count == 0) && ($company->consumables_count == 0) && ($company->components_count == 0) && ($company->users_count == 0)) ? true : false,
            ];

            $array += $permissions_array;
@@ -22,6 +22,7 @@ class CustomFieldsTransformer
    {

        $array = [
+            'id' => $field->id,
            'name' => e($field->name),
            'db_column_name' => e($field->db_column_name()),
            'format'   =>  e($field->format),
@@ -0,0 +1,62 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\LicenseSeat;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+
+class LicenseSeatsTransformer
+{
+
+    public function transformLicenseSeats (Collection $seats, $total)
+    {
+        $array = array();
+        $seat_count = 0;
+        foreach ($seats as $seat) {
+            $seat_count++;
+            $array[] = self::transformLicenseSeat($seat, $seat_count);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformLicenseSeat (LicenseSeat $seat, $seat_count)
+    {
+        $array = [
+            'id' => (int) $seat->id,
+            'license_id' => (int) $seat->license->id,
+            'name' => 'Seat '.$seat_count,
+            'assigned_user' => ($seat->user) ? [
+                'id' => (int) $seat->user->id,
+                'name'=> e($seat->user->present()->fullName)
+            ] : null,
+            'assigned_asset' => ($seat->asset) ? [
+                'id' => (int) $seat->asset->id,
+                'name'=> e($seat->asset->present()->fullName)
+            ] : null,
+            'location' => ($seat->location()) ? [
+                'id' => (int) $seat->location()->id,
+                'name'=> e($seat->location()->name)
+            ] : null,
+            'reassignable' => (bool) $seat->license->reassignable,
+            'user_can_checkout' => (($seat->assigned_to=='') && ($seat->asset_id=='')) ? true : false,
+        ];
+
+        $permissions_array['available_actions'] = [
+            'checkout' => Gate::allows('checkout', License::class) ? true : false,
+            'checkin' => Gate::allows('checkin', License::class) ? true : false,
+            'clone' => Gate::allows('create', License::class) ? true : false,
+            'update' => Gate::allows('update', License::class) ? true : false,
+            'delete' => Gate::allows('delete', License::class) ? true : false,
+        ];
+
+        $array += $permissions_array;
+
+        return $array;
+    }
+
+
+
+
+
+}
@@ -57,7 +57,7 @@ class LocationsTransformer

            $permissions_array['available_actions'] = [
                'update' => Gate::allows('update', Location::class) ? true : false,
-                'delete' => (Gate::allows('delete', Department::class) && ($location->assigned_assets_count==0) && ($location->assets_count==0) && ($location->users_count==0) && ($location->deleted_at=='')) ? true : false,
+                'delete' => (Gate::allows('delete', Location::class) && ($location->assigned_assets_count==0) && ($location->assets_count==0) && ($location->users_count==0) && ($location->deleted_at=='')) ? true : false,
            ];

            $array += $permissions_array;
@@ -25,8 +25,8 @@ class UsersTransformer
                'id' => (int) $user->id,
                'avatar' => e($user->present()->gravatar),
                'name' => e($user->first_name).' '.($user->last_name),
-                'firstname' => e($user->first_name),
-                'lastname' => e($user->last_name),
+                'first_name' => e($user->first_name),
+                'last_name' => e($user->last_name),
                'username' => e($user->username),
                'employee_num' => e($user->employee_num),
                'manager' => ($user->manager) ? [
@@ -41,6 +41,7 @@ class AccessoryImporter extends ItemImporter
        $this->log("No Matching Accessory, Creating a new one");
        $accessory = new Accessory();
        $accessory->fill($this->sanitizeItemForStoring($accessory));
+        $accessory->unsetEventDispatcher();
        if ($accessory->save()) {
            $accessory->logCreate('Imported using CSV Importer');
            $this->log('Accessory ' . $this->item["name"] . ' was created');
@@ -79,28 +79,42 @@ class AssetImporter extends ItemImporter
        }

        $this->item['asset_tag'] = $asset_tag;
+
+        // We need to save the user if it exists so that we can checkout to user later.
+        // Sanitizing the item will remove it.
+        if(array_key_exists('user', $this->item)) {
+            $user = $this->item['user'];
+        }
        $item = $this->sanitizeItemForStoring($asset, $editingAsset);
-        // By default we're set this to location_id in the item.
+        // The location id fetched by the csv reader is actually the rtd_location_id.
+        // This will also set location_id, but then that will be overridden by the
+        // checkout method if necessary below.
        if (isset($this->item["location_id"])) {
            $item['rtd_location_id'] = $this->item['location_id'];
-            unset($item['location_id']);
        }

+
        if ($editingAsset) {
            $asset->update($item);
        } else {
            $asset->fill($item);
        }
-        // If we're updating, we don't want to overwrite old fields.

+        // If we're updating, we don't want to overwrite old fields.
        if (array_key_exists('custom_fields', $this->item)) {
            foreach ($this->item['custom_fields'] as $custom_field => $val) {
                $asset->{$custom_field} = $val;
            }
        }
+        $asset->unsetEventDispatcher();
        if ($asset->save()) {
            $asset->logCreate('Imported using csv importer');
            $this->log('Asset ' . $this->item["name"] . ' with serial number ' . $this->item['serial'] . ' was created');
+
+            // If we have a user to checkout to, lets do so.
+            if(isset($user)) {
+                $asset->fresh()->checkOut($user);
+            }
            return;
        }
        $this->logError($asset, 'Asset "' . $this->item['name'].'"');
@@ -27,27 +27,26 @@ class ComponentImporter extends ItemImporter
    public function createComponentIfNotExists()
    {
        $component = null;
-        $editingComponent = false;
        $this->log("Creating Component");
-        $component = Component::where('name', $this->item['name']);
+        $component = Component::where('name', $this->item['name'])
+                        ->where('serial', $this->item['serial'])
+                        ->first();

        if ($component) {
-            $editingComponent = true;
-            $this->log('A matching Component ' . $this->item["name"] . ' already exists.  ');
+            $this->log('A matching Component ' . $this->item["name"] . ' with serial ' .$this->item['serial'].' already exists.  ');
            if (!$this->updating) {
                $this->log("Skipping Component");
                return;
            }
            $this->log("Updating Component");
-            $component = $this->components[$componentId];
-            $component->update($this->sanitizeItemFor($component));
+            $component->update($this->sanitizeItemForUpdating($component));
            $component->save();
            return;
        }
        $this->log("No matching component, creating one");
        $component = new Component;
-        $component->fill($$this->sanitizeItemForStoring($component));
-
+        $component->fill($this->sanitizeItemForStoring($component));
+        $component->unsetEventDispatcher();
        if ($component->save()) {
            $component->logCreate('Imported using CSV Importer');
            $this->log("Component " . $this->item["name"] . ' was created');
@@ -41,6 +41,7 @@ class ConsumableImporter extends ItemImporter
        $consumable = new Consumable();
        $consumable->fill($this->sanitizeItemForStoring($consumable));

+        $consumable->unsetEventDispatcher();
        if ($consumable->save()) {
            $consumable->logCreate('Imported using CSV Importer');
            $this->log("Consumable " . $this->item["name"] . ' was created');
@@ -239,12 +239,15 @@ abstract class Importer
        // A number was given instead of a name
        if (is_numeric($user_name)) {
            $this->log('User '.$user_name.' is not a name - assume this user already exists');
-            $user_username = '';
-            // No name was given
+            $user = User::find($user_name);
+            if($user) {
+                return $user;
+            }
+            $this->log('User with id'.$user_name.' does not exist.  Continuing through our processes');
        } elseif (empty($user_name)) {
-
            $this->log('No user data provided - skipping user creation, just adding asset');
            //$user_username = '';
+            return false;
        } else {
            $user_email_array = User::generateFormattedNameFromFullName(Setting::getSettings()->email_format, $user_name);
            $first_name = $user_email_array['first_name'];
@@ -67,10 +67,7 @@ class ItemImporter extends Importer
        // NO need to call this method if we're running the user import.
        // TODO: Merge these methods.
        if(get_class($this) !== UserImporter::class) {
-            if ($this->item["user"] = $this->createOrFetchUser($row)) {
-                $this->item['assigned_to'] = $this->item['user']->id;
-                $this->item['assigned_type'] = User::class;
-            }
+            $this->item["user"] = $this->createOrFetchUser($row);
        }
    }

@@ -63,6 +63,8 @@ class LicenseImporter extends ItemImporter
        } else {
            $license->fill($this->sanitizeItemForStoring($license));
        }
+
+        $license->unsetEventDispatcher();
        if ($license->save()) {
            $license->logCreate('Imported using csv importer');
            $this->log('License ' . $this->item["name"] . ' with serial number ' . $this->item['serial'] . ' was created');
@@ -33,7 +33,7 @@ class UserImporter extends ItemImporter
        $this->item['username'] = $this->findCsvMatch($row, 'username');
        $this->item['first_name'] = $this->findCsvMatch($row, 'first_name');
        $this->item['last_name'] = $this->findCsvMatch($row, 'last_name');
-        $this->item['email'] = $this->findCsvMatch($row, 'user_email');
+        $this->item['email'] = $this->findCsvMatch($row, 'email');
        $this->item['phone'] = $this->findCsvMatch($row, 'phone_number');
        $this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle');
        $this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num');
@@ -181,8 +181,7 @@ class Accessory extends SnipeModel
                    })->orWhere('accessories.name', 'LIKE', '%'.$search.'%')
                            ->orWhere('accessories.model_number', 'LIKE', '%'.$search.'%')
                            ->orWhere('accessories.order_number', 'LIKE', '%'.$search.'%')
-                            ->orWhere('accessories.purchase_cost', 'LIKE', '%'.$search.'%')
-                            ->orWhere('accessories.purchase_date', 'LIKE', '%'.$search.'%');
+                            ->orWhere('accessories.purchase_cost', '=', $search);
            }
        });
    }
@@ -12,6 +12,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Log;
 use Watson\Validating\ValidatingTrait;
 use Illuminate\Notifications\Notifiable;
+use DB;

 /**
 * Model for Assets.
@@ -173,6 +174,10 @@ class Asset extends Depreciable

        if ($location != null) {
            $this->location_id = $location;
+        } else {
+            if($target->location) {
+                $this->location_id = $target->location->id;
+            }
        }

        if ($this->requireAcceptance()) {
@@ -814,7 +819,7 @@ class Asset extends Depreciable
                 })->orWhere(function ($query) use ($search) {
                         $query->where('assets_users.first_name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_users.last_name', 'LIKE', '%'.$search.'%')
-                         ->orWhereRaw('CONCAT(assets_users.first_name," ",assets_users.last_name) LIKE ?', ["%$search%", "%$search%"])
+                         ->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$search%", "%$search%"])
                         ->orWhere('assets_users.username', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_locations.name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assigned_assets.name', 'LIKE', '%'.$search.'%');
@@ -822,7 +827,6 @@ class Asset extends Depreciable
                    ->orWhere('assets.asset_tag', 'LIKE', '%'.$search.'%')
                    ->orWhere('assets.serial', 'LIKE', '%'.$search.'%')
                    ->orWhere('assets.order_number', 'LIKE', '%'.$search.'%')
-                    ->orWhere('assets.purchase_date', 'LIKE', '%'.$search.'%')
                    ->orWhere('assets.purchase_cost', 'LIKE', '%'.$search.'%')
                    ->orWhere('assets.notes', 'LIKE', '%'.$search.'%');
            }
@@ -873,7 +877,7 @@ class Asset extends Depreciable
                })->orWhere(function ($query) use ($search) {
                    $query->where('assets_users.first_name', 'LIKE', '%'.$search.'%')
                        ->orWhere('assets_users.last_name', 'LIKE', '%'.$search.'%')
-                        ->orWhereRaw('CONCAT(assets_users.first_name," ",assets_users.last_name) LIKE ?', ["%$search%", "%$search%"])
+                        ->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$search%", "%$search%"])
                        ->orWhere('assets_users.username', 'LIKE', '%'.$search.'%')
                        ->orWhere('assets_locations.name', 'LIKE', '%'.$search.'%')
                        ->orWhere('assigned_assets.name', 'LIKE', '%'.$search.'%');
@@ -166,31 +166,31 @@ final class Company extends SnipeModel

    public function users()
    {
-        return $this->hasMany(User::class, 'users.company_id');
+        return $this->hasMany(User::class, 'company_id');
    }

    public function assets()
    {
-        return $this->hasMany(Asset::class, 'assets.company_id');
+        return $this->hasMany(Asset::class, 'company_id');
    }

    public function licenses()
    {
-        return $this->hasMany(License::class, 'licenses.company_id');
+        return $this->hasMany(License::class, 'company_id');
    }
    public function accessories()
    {
-        return $this->hasMany(Accessory::class, 'accessories.company_id');
+        return $this->hasMany(Accessory::class, 'company_id');
    }

    public function consumables()
    {
-        return $this->hasMany(Consumable::class, 'consumables.company_id');
+        return $this->hasMany(Consumable::class, 'company_id');
    }

    public function components()
    {
-        return $this->hasMany(Component::class, 'components.company_id');
+        return $this->hasMany(Component::class, 'company_id');
    }

    /**
@@ -55,6 +55,7 @@ class Component extends SnipeModel
        'purchase_date',
        'min_amt',
        'qty',
+        'serial'
    ];

    public function location()
@@ -143,8 +144,7 @@ class Component extends SnipeModel
                    })->orWhere('components.name', 'LIKE', '%'.$search.'%')
                            ->orWhere('components.order_number', 'LIKE', '%'.$search.'%')
                            ->orWhere('components.serial', 'LIKE', '%'.$search.'%')
-                            ->orWhere('components.purchase_cost', 'LIKE', '%'.$search.'%')
-                            ->orWhere('components.purchase_date', 'LIKE', '%'.$search.'%');
+                            ->orWhere('components.purchase_cost', 'LIKE', '%'.$search.'%');
            }
        });
    }
@@ -186,8 +186,7 @@ class Consumable extends SnipeModel
                        });
                    })->orWhere('consumables.name', 'LIKE', '%'.$search.'%')
                            ->orWhere('consumables.order_number', 'LIKE', '%'.$search.'%')
-                            ->orWhere('consumables.purchase_cost', 'LIKE', '%'.$search.'%')
-                            ->orWhere('consumables.purchase_date', 'LIKE', '%'.$search.'%');
+                            ->orWhere('consumables.purchase_cost', 'LIKE', '%'.$search.'%');
            }
        });
    }
@@ -8,6 +8,7 @@ use App\Http\Traits\UniqueUndeletedTrait;
 use ForceUTF8\Encoding;
 use EasySlugger\Utf8Slugger;
 use Patchwork\Utf8;
+use Illuminate\Validation\Rule;

 class CustomField extends Model
 {
@@ -29,8 +30,18 @@ class CustomField extends Model
        "BOOLEAN" => "boolean",
    ];

-    public $rules = [
-        "name" => "required|unique:custom_fields"
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name',
+        'element',
+        'format',
+        'field_values',
+        'field_encrypted',
+        'help_text'
    ];

    // This is confusing, since it's actually the custom fields table that
@@ -160,7 +171,7 @@ class CustomField extends Model
    public function getFormatAttribute($value)
    {
        foreach (self::$PredefinedFormats as $name => $pattern) {
-            if ($pattern === $value) {
+            if ($pattern === $value || $name === $value) {
                return $name;
            }
        }
@@ -248,4 +259,26 @@ class CustomField extends Model

        return substr($long_slug, 0, 50) . '_' . $id;
    }
+
+    /**
+    * Get validation rules for custom fields to use with Validator
+    * @author [V. Cordes] [<volker@fdatek.de>]
+    * @param int $id
+    * @since [v4.1.10]
+    * @return Array
+    */
+    public function validationRules()
+    {
+        return [
+            "name" => "required|unique:custom_fields",
+            "element" => [
+                "required",
+                Rule::in(['text', 'listbox'])
+            ],
+            'format' => [
+                Rule::in(array_merge(array_keys(CustomField::$PredefinedFormats), CustomField::$PredefinedFormats))
+            ],
+            'field_encrypted' => "nullable|boolean"
+        ];
+    }
 }
@@ -34,4 +34,17 @@ class LicenseSeat extends Model implements ICompanyableChild
    {
        return $this->belongsTo('\App\Models\Asset', 'asset_id')->withTrashed();
    }
+
+    public function location()
+    {
+        if (($this->user) && ($this->user->location)) {
+            return $this->user->location;
+
+        } elseif (($this->asset) && ($this->asset->location)) {
+            return $this->asset->location;
+        }
+
+        return false;
+
+    }
 }
@@ -182,7 +182,7 @@ trait Loggable
        $log->location_id = null;
        $log->note = $note;
        $log->user_id = $user_id;
-        $log->logaction('created');
+        $log->logaction('create');
        $log->save();
        return $log;
    }
@@ -36,7 +36,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
        'jobtitle',
        'location_id',
        'password',
-        'phone_number',
+        'phone',
        'username',
        'first_name',
        'address',
@@ -44,6 +44,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
        'state',
        'country',
        'zip',
+        'activated',
    ];

    protected $casts = [
@@ -42,13 +42,7 @@ class AssetObserver
            $logAction->log_meta = json_encode($changed);
            $logAction->logaction('update');

-        } else {
-
-            \Log::debug('Something else happened');
-            \Log::debug($asset->getOriginal()['assigned_to'].' == '.$asset->getAttributes()['assigned_to']);
-            \Log::debug($asset->getOriginal()['next_audit_date'].' == '.$asset->getAttributes()['next_audit_date']);
-            \Log::debug($asset->getOriginal()['last_checkout'].' == '.$asset->getAttributes()['last_checkout']);
-        }
+        } 

    }

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Policies;
+
+use App\Policies\SnipePermissionsPolicy;
+
+class CompanyPolicy extends SnipePermissionsPolicy
+{
+    protected function columnName()
+    {
+        return 'companies';
+    }
+}
@@ -58,7 +58,7 @@ class ActionlogPresenter extends Presenter


    public function actionType() {
-        return strtolower(trans('general.'.str_replace(' ', '_', $this->action_type)));
+        return mb_strtolower(trans('general.'.str_replace(' ', '_', $this->action_type)));
    }


@@ -47,7 +47,7 @@ class AssetModelPresenter extends Presenter
    {
        $name = '';
        if ($this->model->manufacturer) {
-            $name .= $this->model->manufacturer->name;
+            $name .= $this->model->manufacturer->name.' ';
        }
        $name .= $this->name;

@@ -417,6 +417,47 @@ class AssetPresenter extends Presenter
        return $this->model->assetstatus->name;
    }

+    /**
+     * @return string
+     * This handles the status label "meta" status of "deployed" if
+     * it's assigned. Results look like:
+     *
+     * (if assigned and the status label is "Ready to Deploy"):
+     * (Deployed)
+     *
+     * (f assigned and status label is not "Ready to Deploy":)
+     * Deployed (Another Status Label)
+     *
+     * (if not deployed:)
+     * Another Status Label
+     */
+    public function fullStatusText() {
+        // Make sure the status is valid
+        if ($this->assetstatus) {
+
+            // If the status is assigned to someone or something...
+            if ($this->model->assigned) {
+
+                // If it's assigned and not set to the default "ready to deploy" status
+                if ($this->assetstatus->name != trans('general.ready_to_deploy')) {
+                    return trans('general.deployed'). ' (' . $this->model->assetstatus->name.')';
+                }
+
+                // If it's assigned to the default "ready to deploy" status, just
+                // say it's deployed - otherwise it's confusing to have a status that is
+                // both "ready to deploy" and deployed at the same time.
+                return trans('general.deployed');
+            }
+
+            // Return just the status name
+            return $this->model->assetstatus->name;
+        }
+
+        // This status doesn't seem valid - either data has been manually edited or
+        // the status label was deleted.
+        return 'Invalid status';
+    }
+
    /**
     * Date the warantee expires.
     * @return false|string
@@ -69,7 +69,8 @@ class ManufacturerPresenter extends Presenter
                "sortable" => true,
                "switchable" => true,
                "title" => trans('admin/manufacturers/table.support_phone'),
-                "visible" => true
+                "visible" => true,
+                "formatter" => "phoneFormatter"
            ],

            [
@@ -85,7 +86,7 @@ class ManufacturerPresenter extends Presenter
            [
                "field" => "assets_count",
                "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                "switchable" => true,
                "title" => ' <span class="hidden-md hidden-lg">Assets</span>'
                    .'<span class="hidden-xs"><i class="fa fa-barcode fa-lg"></i></span>',
@@ -94,7 +95,7 @@ class ManufacturerPresenter extends Presenter
            [
                "field" => "licenses_count",
                "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                "switchable" => true,
                "title" => ' <span class="hidden-md hidden-lg">Licenses</span>'
                    .'<span class="hidden-xs"><i class="fa fa-floppy-o fa-lg"></i></span>',
@@ -103,7 +104,7 @@ class ManufacturerPresenter extends Presenter
            [
                "field" => "consumables_count",
                "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                "switchable" => true,
                "title" => ' <span class="hidden-md hidden-lg">Consumables</span>'
                    .'<span class="hidden-xs"><i class="fa fa-tint fa-lg"></i></span>',
@@ -112,7 +113,7 @@ class ManufacturerPresenter extends Presenter
            [
                "field" => "accessories_count",
                "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                "switchable" => true,
                "title" => ' <span class="hidden-md hidden-lg">Accessories</span>'
                    .'<span class="hidden-xs"><i class="fa fa-keyboard-o fa-lg"></i></span>',
@@ -85,6 +85,7 @@ class UserPresenter extends Presenter
                "switchable" => true,
                "title" => trans('admin/users/table.phone'),
                "visible" => true,
+                "formatter"    => "phoneFormatter",
            ],
            [
                "field" => "address",
@@ -15,6 +15,7 @@ use App\Models\Location;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
 use App\Models\Manufacturer;
+use App\Models\Company;
 use App\Models\User;
 use App\Policies\AccessoryPolicy;
 use App\Policies\AssetModelPolicy;
@@ -30,6 +31,7 @@ use App\Policies\StatuslabelPolicy;
 use App\Policies\SupplierPolicy;
 use App\Policies\UserPolicy;
 use App\Policies\ManufacturerPolicy;
+use App\Policies\CompanyPolicy;
 use Carbon\Carbon;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Gate;
@@ -59,6 +61,7 @@ class AuthServiceProvider extends ServiceProvider
        Supplier::class => SupplierPolicy::class,
        User::class => UserPolicy::class,
        Manufacturer::class => ManufacturerPolicy::class,
+        Company::class => CompanyPolicy::class,
    ];

    /**
@@ -132,6 +135,7 @@ class AuthServiceProvider extends ServiceProvider
                || $user->can('view', \App\Models\Location::class)
                || $user->can('view', \App\Models\Company::class)
                || $user->can('view', \App\Models\Manufacturer::class)
+                || $user->can('view', \App\Models\Company::class)
                || $user->can('view', \App\Models\Depreciation::class);
        });
    }
@@ -521,6 +521,33 @@ return array(
        ),
    ),

+    'Companies' => array(
+        array(
+            'permission' => 'companies.view',
+            'label'      => 'View ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'companies.create',
+            'label'      => 'Create ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'companies.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'companies.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
+            'display'    => true,
+        ),
+    ),
+



@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.1.8',
-  'full_app_version' => 'v4.1.8-pre - build 3106-geb827cd',
-  'build_version' => '3106',
+  'app_version' => 'v4.1.10',
+  'full_app_version' => 'v4.1.10 - build 3249-g8d3a214',
+  'build_version' => '3249',
  'prerelease_version' => '',
-  'hash_version' => 'geb827cd',
-  'full_hash' => 'v4.1.7-69-geb827cd',
+  'hash_version' => 'g8d3a214',
+  'full_hash' => 'v4.1.10-119-g8d3a214',
  'branch' => 'master',
 );
@@ -52,10 +52,12 @@ class FixUtf8CustomFieldColumnNames extends Migration
        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
        $platform->registerDoctrineTypeMapping('enum', 'string');

-        Schema::table('custom_fields', function ($table) {
-            $table->string('db_column')->nullable();
-            $table->text('help_text')->nullable();
-        });
+        if (!Schema::hasColumn('custom_fields', 'db_column')) {
+            Schema::table('custom_fields', function ($table) {
+                $table->string('db_column')->nullable();
+                $table->text('help_text')->nullable();
+            });
+        }

        foreach(CustomField::all() as $field) {

@@ -3,8 +3,7 @@
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
-use App\Models\Actionlog;
-use App\Models\Asset;
+

 class NormalizeAssetLastAuditDate extends Migration
 {
@@ -16,23 +15,14 @@ class NormalizeAssetLastAuditDate extends Migration
    public function up()
    {

-        Schema::table('assets', function (Blueprint $table) {
-            $table->datetime('last_audit_date')->after('assigned_type')->nullable()->default(null);
-        });
-
-        // Grab the latest info from the Actionlog table where the action is 'audit'
-        $audits = Actionlog::selectRaw('MAX(created_at) AS created_at, item_id')->where('action_type', 'audit')->where('item_type', Asset::class)->groupBy('item_id')->orderBy('created_at', 'desc')->get();
-
-        if ($audits) {
-            foreach ($audits as $audit) {
-                $assets = Asset::where('id', $audit->item_id)->first();
-                $assets->last_audit_date = $audit->created_at;
-                $assets->unsetEventDispatcher();
-                $assets->save();
-            }
+        if (!Schema::hasColumn('assets', 'last_audit_date')) {
+            Schema::table('assets', function (Blueprint $table) {
+                $table->datetime('last_audit_date')->after('assigned_type')->nullable()->default(null);
+            });
        }


+
    }

    /**
@@ -42,8 +32,10 @@ class NormalizeAssetLastAuditDate extends Migration
     */
    public function down()
    {
-        Schema::table('assets', function (Blueprint $table) {
-            $table->dropColumn('last_audit_date');
-        });
+        if (Schema::hasColumn('assets', 'last_audit_date')) {
+            Schema::table('assets', function (Blueprint $table) {
+                $table->dropColumn('last_audit_date');
+            });
+        }
    }
 }
@@ -0,0 +1,52 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use App\Models\Actionlog;
+use App\Models\Asset;
+
+class ReNormalizeLastAudit extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+
+        if (Schema::hasColumn('assets', 'last_audit_date')) {
+
+            // Grab the latest info from the Actionlog table where the action is 'audit'
+            $audits = Actionlog::selectRaw('MAX(created_at) AS created_at, item_id')
+                ->where('action_type', 'audit')
+                ->where('item_type', Asset::class)
+                ->groupBy('item_id')
+                ->orderBy('created_at', 'desc')
+                ->get();
+
+            if ($audits) {
+                foreach ($audits as $audit) {
+                    $asset = Asset::where('id', $audit->item_id)->withTrashed()->first();
+                    if ($asset) {
+                        $asset->last_audit_date = $audit->created_at;
+                        $asset->unsetEventDispatcher();
+                        $asset->save();
+                    }
+
+                }
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddArchivedInListSetting extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('show_archived_in_list')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('show_archived_in_list');
+        });
+    }
+}
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDashboardMessageToSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->text('dashboard_message')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->text('dashboard_message');
+        });
+    }
+}
@@ -44,6 +44,7 @@ class AssetSeeder extends Seeder
              unlink($del_file); // delete file
      }

+      DB::table('checkout_requests')->truncate();

  }
 }
@@ -14,9 +14,10 @@
    "babel-preset-latest": "^6.24.1",
    "cross-env": "^5.0.5",
    "jquery": "^3.1.1",
-    "laravel-mix": "1.4.3",
+    "laravel-mix": "1.7",
    "lodash": "^4.17.4",
    "vue": "2.4.4",
+    "vue-loader": "^13.6.1",
    "vue-template-compiler": "2.4.4"
  },
  "dependencies": {
@@ -1,7 +1,2 @@
 /*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
-var saveAs=saveAs||"undefined"!==typeof navigator&&navigator.msSaveOrOpenBlob&&navigator.msSaveOrOpenBlob.bind(navigator)||function(a){"use strict";if("undefined"===typeof navigator||!/MSIE [1-9]\./.test(navigator.userAgent)){var k=a.document,n=k.createElementNS("http://www.w3.org/1999/xhtml","a"),w="download"in n,x=function(c){var e=k.createEvent("MouseEvents");e.initMouseEvent("click",!0,!1,a,0,0,0,0,0,!1,!1,!1,!1,0,null);c.dispatchEvent(e)},q=a.webkitRequestFileSystem,u=a.requestFileSystem||q||a.mozRequestFileSystem,
-y=function(c){(a.setImmediate||a.setTimeout)(function(){throw c;},0)},r=0,s=function(c){var e=function(){"string"===typeof c?(a.URL||a.webkitURL||a).revokeObjectURL(c):c.remove()};a.chrome?e():setTimeout(e,500)},t=function(c,a,d){a=[].concat(a);for(var b=a.length;b--;){var l=c["on"+a[b]];if("function"===typeof l)try{l.call(c,d||c)}catch(f){y(f)}}},m=function(c,e){var d=this,b=c.type,l=!1,f,p,k=function(){t(d,["writestart","progress","write","writeend"])},g=function(){if(l||!f)f=(a.URL||a.webkitURL||
-a).createObjectURL(c);p?p.location.href=f:void 0==a.open(f,"_blank")&&"undefined"!==typeof safari&&(a.location.href=f);d.readyState=d.DONE;k();s(f)},h=function(a){return function(){if(d.readyState!==d.DONE)return a.apply(this,arguments)}},m={create:!0,exclusive:!1},v;d.readyState=d.INIT;e||(e="download");if(w)f=(a.URL||a.webkitURL||a).createObjectURL(c),n.href=f,n.download=e,x(n),d.readyState=d.DONE,k(),s(f);else{a.chrome&&b&&"application/octet-stream"!==b&&(v=c.slice||c.webkitSlice,c=v.call(c,0,
-c.size,"application/octet-stream"),l=!0);q&&"download"!==e&&(e+=".download");if("application/octet-stream"===b||q)p=a;u?(r+=c.size,u(a.TEMPORARY,r,h(function(a){a.root.getDirectory("saved",m,h(function(a){var b=function(){a.getFile(e,m,h(function(a){a.createWriter(h(function(b){b.onwriteend=function(b){p.location.href=a.toURL();d.readyState=d.DONE;t(d,"writeend",b);s(a)};b.onerror=function(){var a=b.error;a.code!==a.ABORT_ERR&&g()};["writestart","progress","write","abort"].forEach(function(a){b["on"+
-a]=d["on"+a]});b.write(c);d.abort=function(){b.abort();d.readyState=d.DONE};d.readyState=d.WRITING}),g)}),g)};a.getFile(e,{create:!1},h(function(a){a.remove();b()}),h(function(a){a.code===a.NOT_FOUND_ERR?b():g()}))}),g)}),g)):g()}},b=m.prototype;b.abort=function(){this.readyState=this.DONE;t(this,"abort")};b.readyState=b.INIT=0;b.WRITING=1;b.DONE=2;b.error=b.onwritestart=b.onprogress=b.onwrite=b.onabort=b.onerror=b.onwriteend=null;return function(a,b){return new m(a,b)}}}("undefined"!==typeof self&&
-self||"undefined"!==typeof window&&window||this.content);"undefined"!==typeof module&&null!==module?module.exports=saveAs:"undefined"!==typeof define&&null!==define&&null!=define.amd&&define([],function(){return saveAs});
+var saveAs=saveAs||function(e){"use strict";if(typeof e==="undefined"||typeof navigator!=="undefined"&&/MSIE [1-9]\./.test(navigator.userAgent)){return}var t=e.document,n=function(){return e.URL||e.webkitURL||e},r=t.createElementNS("http://www.w3.org/1999/xhtml","a"),o="download"in r,a=function(e){var t=new MouseEvent("click");e.dispatchEvent(t)},i=/constructor/i.test(e.HTMLElement)||e.safari,f=/CriOS\/[\d]+/.test(navigator.userAgent),u=function(t){(e.setImmediate||e.setTimeout)(function(){throw t},0)},s="application/octet-stream",d=1e3*40,c=function(e){var t=function(){if(typeof e==="string"){n().revokeObjectURL(e)}else{e.remove()}};setTimeout(t,d)},l=function(e,t,n){t=[].concat(t);var r=t.length;while(r--){var o=e["on"+t[r]];if(typeof o==="function"){try{o.call(e,n||e)}catch(a){u(a)}}}},p=function(e){if(/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(e.type)){return new Blob([String.fromCharCode(65279),e],{type:e.type})}return e},v=function(t,u,d){if(!d){t=p(t)}var v=this,w=t.type,m=w===s,y,h=function(){l(v,"writestart progress write writeend".split(" "))},S=function(){if((f||m&&i)&&e.FileReader){var r=new FileReader;r.onloadend=function(){var t=f?r.result:r.result.replace(/^data:[^;]*;/,"data:attachment/file;");var n=e.open(t,"_blank");if(!n)e.location.href=t;t=undefined;v.readyState=v.DONE;h()};r.readAsDataURL(t);v.readyState=v.INIT;return}if(!y){y=n().createObjectURL(t)}if(m){e.location.href=y}else{var o=e.open(y,"_blank");if(!o){e.location.href=y}}v.readyState=v.DONE;h();c(y)};v.readyState=v.INIT;if(o){y=n().createObjectURL(t);setTimeout(function(){r.href=y;r.download=u;a(r);h();c(y);v.readyState=v.DONE});return}S()},w=v.prototype,m=function(e,t,n){return new v(e,t||e.name||"download",n)};if(typeof navigator!=="undefined"&&navigator.msSaveOrOpenBlob){return function(e,t,n){t=t||e.name||"download";if(!n){e=p(e)}return navigator.msSaveOrOpenBlob(e,t)}}w.abort=function(){};w.readyState=w.INIT=0;w.WRITING=1;w.DONE=2;w.error=w.onwritestart=w.onprogress=w.onwrite=w.onabort=w.onerror=w.onwriteend=null;return m}(typeof self!=="undefined"&&self||typeof window!=="undefined"&&window||this.content);if(typeof module!=="undefined"&&module.exports){module.exports.saveAs=saveAs}else if(typeof define!=="undefined"&&define!==null&&define.amd!==null){define("FileSaver.js",function(){return saveAs})}
@@ -1,7 +1,7 @@
 /**
 * @author: Dennis Hernández
 * @webSite: http://djhvscf.github.io/Blog
- * @version: v1.2.0
+ * @version: v1.2.2
 *
 * @update zhixin wen <wenzhixin2010@gmail.com>
 */
@@ -64,11 +64,27 @@
        }

        cookieName = that.options.cookieIdTable + '.' + cookieName;
-        if (!cookieName || /^(?:expires|max\-age|path|domain|secure)$/i.test(cookieName)) {
-            return false;
+
+        switch(that.options.cookieStorage) {
+            case 'cookieStorage':
+                document.cookie = [
+                    cookieName, '=', cookieValue,
+                    '; expires=' + that.options.cookieExpire,
+                    that.options.cookiePath ? '; path=' + that.options.cookiePath : '',
+                    that.options.cookieDomain ? '; domain=' + that.options.cookieDomain : '',
+                    that.options.cookieSecure ? '; secure' : ''
+                ].join('');
+                break;
+            case 'localStorage':
+                localStorage.setItem(cookieName, cookieValue);
+                break;
+            case 'sessionStorage':
+                sessionStorage.setItem(cookieName, cookieValue);
+                break;
+            default:
+                return false;
        }

-        document.cookie = encodeURIComponent(cookieName) + '=' + encodeURIComponent(cookieValue) + calculateExpiration(that.options.cookieExpire) + (that.options.cookieDomain ? '; domain=' + that.options.cookieDomain : '') + (that.options.cookiePath ? '; path=' + that.options.cookiePath : '') + (that.cookieSecure ? '; secure' : '');
        return true;
    };

@@ -83,28 +99,44 @@

        cookieName = tableName + '.' + cookieName;

-        return decodeURIComponent(document.cookie.replace(new RegExp('(?:(?:^|.*;)\\s*' + encodeURIComponent(cookieName).replace(/[\-\.\+\*]/g, '\\$&') + '\\s*\\=\\s*([^;]*).*$)|^.*$'), '$1')) || null;
-    };
-
-    var hasCookie = function (cookieName) {
-        if (!cookieName) {
-            return false;
+        switch(that.options.cookieStorage) {
+            case 'cookieStorage':
+                return decodeURIComponent(document.cookie.replace(new RegExp('(?:(?:^|.*;)\\s*' + encodeURIComponent(cookieName).replace(/[\-\.\+\*]/g, '\\$&') + '\\s*\\=\\s*([^;]*).*$)|^.*$'), '$1')) || null;
+            case 'localStorage':
+                return localStorage.getItem(cookieName);
+            case 'sessionStorage':
+                return sessionStorage.getItem(cookieName);
+            default:
+                return null;
        }
-        return (new RegExp('(?:^|;\\s*)' + encodeURIComponent(cookieName).replace(/[\-\.\+\*]/g, '\\$&') + '\\s*\\=')).test(document.cookie);
    };

-    var deleteCookie = function (tableName, cookieName, sPath, sDomain) {
+    var deleteCookie = function (that, tableName, cookieName) {
        cookieName = tableName + '.' + cookieName;
-        if (!hasCookie(cookieName)) {
-            return false;
+
+        switch(that.options.cookieStorage) {
+            case 'cookieStorage':
+                document.cookie = [
+                    encodeURIComponent(cookieName), '=',
+                    '; expires=Thu, 01 Jan 1970 00:00:00 GMT',
+                    that.options.cookiePath ? '; path=' + that.options.cookiePath : '',
+                    that.options.cookieDomain ? '; domain=' + that.options.cookieDomain : '',
+                ].join('');
+                break;
+            case 'localStorage':
+                localStorage.removeItem(cookieName);
+                break;
+            case 'sessionStorage':
+                sessionStorage.removeItem(cookieName);
+                break;
+
        }
-        document.cookie = encodeURIComponent(cookieName) + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT' + (sDomain ? '; domain=' + sDomain : '') + (sPath ? '; path=' + sPath : '');
        return true;
    };

    var calculateExpiration = function(cookieExpire) {
        var time = cookieExpire.replace(/[0-9]*/, ''); //s,mi,h,d,m,y
-        cookieExpire = cookieExpire.replace(/[A-Za-z]/, ''); //number
+        cookieExpire = cookieExpire.replace(/[A-Za-z]{1,2}}/, ''); //number

        switch (time.toLowerCase()) {
            case 's':
@@ -123,7 +155,7 @@
                cookieExpire = cookieExpire * 30 * 24 * 60 * 60;
                break;
            case 'y':
-                cookieExpire = cookieExpire * 365 * 30 * 24 * 60 * 60;
+                cookieExpire = cookieExpire * 365 * 24 * 60 * 60;
                break;
            default:
                cookieExpire = undefined;
@@ -133,6 +165,38 @@
        return cookieExpire === undefined ? '' : '; max-age=' + cookieExpire;
    };

+    var initCookieFilters = function (bootstrapTable) {
+        setTimeout(function () {
+            var parsedCookieFilters = JSON.parse(getCookie(bootstrapTable, bootstrapTable.options.cookieIdTable, cookieIds.filterControl));
+
+            if (!bootstrapTable.options.filterControlValuesLoaded && parsedCookieFilters) {
+                bootstrapTable.options.filterControlValuesLoaded = true;
+
+                var cachedFilters = {},
+                    header = getCurrentHeader(bootstrapTable),
+                    searchControls = getCurrentSearchControls(bootstrapTable),
+
+                    applyCookieFilters = function (element, filteredCookies) {
+                        $(filteredCookies).each(function (i, cookie) {
+                            $(element).val(cookie.text);
+                            cachedFilters[cookie.field] = cookie.text;
+                        });
+                    };
+
+                header.find(searchControls).each(function () {
+                    var field = $(this).closest('[data-field]').data('field'),
+                        filteredCookies = $.grep(parsedCookieFilters, function (cookie) {
+                            return cookie.field === field;
+                        });
+
+                    applyCookieFilters(this, filteredCookies);
+                });
+
+                bootstrapTable.initColumnSearch(cachedFilters);
+            }
+        }, 250);
+    };
+
    $.extend($.fn.bootstrapTable.defaults, {
        cookie: false,
        cookieExpire: '2h',
@@ -140,17 +204,30 @@
        cookieDomain: null,
        cookieSecure: null,
        cookieIdTable: '',
-        cookiesEnabled: ['bs.table.sortOrder', 'bs.table.sortName', 'bs.table.pageNumber', 'bs.table.pageList', 'bs.table.columns', 'bs.table.searchText', 'bs.table.filterControl'],
+        cookiesEnabled: [
+            'bs.table.sortOrder', 'bs.table.sortName',
+            'bs.table.pageNumber', 'bs.table.pageList',
+            'bs.table.columns', 'bs.table.searchText',
+            'bs.table.filterControl'
+        ],
+        cookieStorage: 'cookieStorage', //localStorage, sessionStorage
        //internal variable
        filterControls: [],
        filterControlValuesLoaded: false
    });

+    $.fn.bootstrapTable.methods.push('getCookies');
    $.fn.bootstrapTable.methods.push('deleteCookie');

+    $.extend($.fn.bootstrapTable.utils, {
+        setCookie: setCookie,
+        getCookie: getCookie
+    });
+
    var BootstrapTable = $.fn.bootstrapTable.Constructor,
        _init = BootstrapTable.prototype.init,
        _initTable = BootstrapTable.prototype.initTable,
+        _initServer = BootstrapTable.prototype.initServer,
        _onSort = BootstrapTable.prototype.onSort,
        _onPageNumber = BootstrapTable.prototype.onPageNumber,
        _onPageListChange = BootstrapTable.prototype.onPageListChange,
@@ -167,9 +244,10 @@
        this.options.filterControls = [];
        this.options.filterControlValuesLoaded = false;

-
        this.options.cookiesEnabled = typeof this.options.cookiesEnabled === 'string' ?
-            this.options.cookiesEnabled.replace('[', '').replace(']', '').replace(/ /g, '').toLowerCase().split(',') : this.options.cookiesEnabled;
+            this.options.cookiesEnabled.replace('[', '').replace(']', '')
+                .replace(/ /g, '').toLowerCase().split(',') :
+            this.options.cookiesEnabled;

        if (this.options.filterControl) {
            var that = this;
@@ -191,36 +269,46 @@
                }

                setCookie(that, cookieIds.filterControl, JSON.stringify(that.options.filterControls));
-            }).on('post-body.bs.table', function () {
-                setTimeout(function () {
-                    if (!that.options.filterControlValuesLoaded) {
-                        that.options.filterControlValuesLoaded = true;
-                        var filterControl = JSON.parse(getCookie(that, that.options.cookieIdTable, cookieIds.filterControl));
-                        if (filterControl) {
-                            var field = null,
-                                result = [],
-                                header = getCurrentHeader(that),
-                                searchControls = getCurrentSearchControls(that);
-
-                            header.find(searchControls).each(function (index, ele) {
-                                field = $(this).parent().parent().parent().data('field');
-                                result = $.grep(filterControl, function (valueObj) {
-                                    return valueObj.field === field;
-                                });
-
-                                if (result.length > 0) {
-                                    $(this).val(result[0].text);
-                                    that.onColumnSearch({currentTarget: $(this)});
-                                }
-                            });
-                        }
-                    }
-                }, 250);
-            });
+            }).on('post-body.bs.table', initCookieFilters(that));
        }
        _init.apply(this, Array.prototype.slice.apply(arguments));
    };

+    BootstrapTable.prototype.initServer = function () {
+        var bootstrapTable = this,
+            selectsWithoutDefaults = [],
+
+            columnHasSelectControl = function (column) {
+                return column.filterControl && column.filterControl === 'select';
+            },
+
+            columnHasDefaultSelectValues = function (column) {
+                return column.filterData && column.filterData !== 'column';
+            },
+
+            cookiesPresent = function() {
+                var cookie = JSON.parse(getCookie(bootstrapTable, bootstrapTable.options.cookieIdTable, cookieIds.filterControl));
+                return bootstrapTable.options.cookie && cookie;
+            };
+
+        selectsWithoutDefaults = $.grep(bootstrapTable.columns, function(column) {
+            return columnHasSelectControl(column) && !columnHasDefaultSelectValues(column);
+        });
+
+        // reset variable to original initServer function, so that future calls to initServer
+        // use the original function from this point on.
+        BootstrapTable.prototype.initServer = _initServer;
+
+        // early return if we don't need to populate any select values with cookie values
+        if (this.options.filterControl && cookiesPresent() && selectsWithoutDefaults.length === 0) {
+            return;
+        }
+
+        // call BootstrapTable.prototype.initServer
+        _initServer.apply(this, Array.prototype.slice.apply(arguments));
+    };
+
+
    BootstrapTable.prototype.initTable = function () {
        _initTable.apply(this, Array.prototype.slice.apply(arguments));
        this.initCookie();
@@ -233,7 +321,6 @@

        if ((this.options.cookieIdTable === '') || (this.options.cookieExpire === '') || (!cookieEnabled())) {
            throw new Error("Configuration error. Please review the cookieIdTable, cookieExpire properties, if those properties are ok, then this browser does not support the cookies");
-            return;
        }

        var sortOrderCookie = getCookie(this, this.options.cookieIdTable, cookieIds.sortOrder),
@@ -310,15 +397,31 @@

        setCookie(this, cookieIds.columns, JSON.stringify(visibleColumns));
    };
-    
+
    BootstrapTable.prototype.selectPage = function (page) {
        _selectPage.apply(this, Array.prototype.slice.apply(arguments));
        setCookie(this, cookieIds.pageNumber, page);
    };

    BootstrapTable.prototype.onSearch = function () {
-        _onSearch.apply(this, Array.prototype.slice.apply(arguments));
-        setCookie(this, cookieIds.searchText, this.searchText);
+        var target = Array.prototype.slice.apply(arguments);
+        _onSearch.apply(this, target);
+
+        if ($(target[0].currentTarget).parent().hasClass('search')) {
+            setCookie(this, cookieIds.searchText, this.searchText);
+        }
+    };
+
+    BootstrapTable.prototype.getCookies = function () {
+        var bootstrapTable = this;
+        var cookies = {};
+        $.each(cookieIds, function(key, value) {
+            cookies[key] = getCookie(bootstrapTable, bootstrapTable.options.cookieIdTable, value);
+            if (key === 'columns') {
+                cookies[key] = JSON.parse(cookies[key]);
+            }
+        });
+        return cookies;
    };

    BootstrapTable.prototype.deleteCookie = function (cookieName) {
@@ -326,6 +429,6 @@
            return;
        }

-        deleteCookie(this.options.cookieIdTable, cookieIds[cookieName], this.options.cookiePath, this.options.cookieDomain);
+        deleteCookie(this, this.options.cookieIdTable, cookieIds[cookieName]);
    };
 })(jQuery);
@@ -0,0 +1,77 @@
+/*
+ tableExport.jquery.plugin
+
+ Version 1.9.8
+
+ Copyright (c) 2015-2017 hhurz, https://github.com/hhurz
+
+ Original Work Copyright (c) 2014 Giri Raj
+
+ Licensed under the MIT License
+*/
+var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(c,f,u){c instanceof String&&(c=String(c));for(var C=c.length,D=0;D<C;D++){var O=c[D];if(f.call(u,O,D,c))return{i:D,v:O}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(c,f,u){c!=Array.prototype&&c!=Object.prototype&&(c[f]=u.value)};
+$jscomp.getGlobal=function(c){return"undefined"!=typeof window&&window===c?c:"undefined"!=typeof global&&null!=global?global:c};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(c,f,u,C){if(f){u=$jscomp.global;c=c.split(".");for(C=0;C<c.length-1;C++){var D=c[C];D in u||(u[D]={});u=u[D]}c=c[c.length-1];C=u[c];f=f(C);f!=C&&null!=f&&$jscomp.defineProperty(u,c,{configurable:!0,writable:!0,value:f})}};
+$jscomp.polyfill("Array.prototype.find",function(c){return c?c:function(c,u){return $jscomp.findInternal(this,c,u).v}},"es6","es3");
+(function(c){c.fn.extend({tableExport:function(f){function u(b){var e=[];C(b,"tbody").each(function(){e.push.apply(e,D(c(this),a.tbodySelector))});a.tfootSelector.length&&C(b,"tfoot").each(function(){e.push.apply(e,D(c(this),a.tfootSelector))});return e}function C(b,e){var a=b.parents("table").length;return b.find(e).filter(function(){return c(this).closest("table").parents("table").length===a})}function D(b,e){return b.find(e).filter(function(){return 0===c(this).find("table").length&&1===c(this).parents("table").length})}
+        function O(b){var e=[];c(b).find("thead").first().find("th").each(function(b,a){void 0!==c(a).attr("data-field")?e[b]=c(a).attr("data-field"):e[b]=b.toString()});return e}function P(b){var e="undefined"!==typeof b[0].cellIndex,a="undefined"!==typeof b[0].rowIndex,r=e||a?ya(b):b.is(":visible"),g=b.data("tableexport-display");e&&"none"!=g&&"always"!=g&&(b=c(b[0].parentNode),a="undefined"!==typeof b[0].rowIndex,g=b.data("tableexport-display"));a&&"none"!=g&&"always"!=g&&(g=b.closest("table").data("tableexport-display"));
+            return"none"!==g&&(1==r||"always"==g)}function ya(b){var e=[];R&&(e=K.filter(function(){var e=!1;this.nodeType==b[0].nodeType&&("undefined"!==typeof this.rowIndex&&this.rowIndex==b[0].rowIndex?e=!0:"undefined"!==typeof this.cellIndex&&this.cellIndex==b[0].cellIndex&&"undefined"!==typeof this.parentNode.rowIndex&&"undefined"!==typeof b[0].parentNode.rowIndex&&this.parentNode.rowIndex==b[0].parentNode.rowIndex&&(e=!0));return e}));return 0==R||0==e.length}function za(b,e,k){var r=!1;P(b)?0<a.ignoreColumn.length&&
+            (-1!=c.inArray(k,a.ignoreColumn)||-1!=c.inArray(k-e,a.ignoreColumn)||Q.length>k&&"undefined"!=typeof Q[k]&&-1!=c.inArray(Q[k],a.ignoreColumn))&&(r=!0):r=!0;return r}function B(b,e,k,r,g){if("function"===typeof g){var h=!1;"function"===typeof a.onIgnoreRow&&(h=a.onIgnoreRow(c(b),k));if(!1===h&&-1==c.inArray(k,a.ignoreRow)&&-1==c.inArray(k-r,a.ignoreRow)&&P(c(b))){var x=c(b).find(e),q=0;x.each(function(b){var e=c(this),a,h=parseInt(this.getAttribute("colspan")),r=parseInt(this.getAttribute("rowspan"));
+            G.forEach(function(b){if(k>=b.s.r&&k<=b.e.r&&q>=b.s.c&&q<=b.e.c)for(a=0;a<=b.e.c-b.s.c;++a)g(null,k,q++)});if(!1===za(e,x.length,b)){if(r||h)h=h||1,G.push({s:{r:k,c:q},e:{r:k+(r||1)-1,c:q+h-1}});g(this,k,q++)}if(h)for(a=0;a<h-1;++a)g(null,k,q++)});G.forEach(function(b){if(k>=b.s.r&&k<=b.e.r&&q>=b.s.c&&q<=b.e.c)for(Y=0;Y<=b.e.c-b.s.c;++Y)g(null,k,q++)})}}}function la(b,e){!0===a.consoleLog&&console.log(b.output());if("string"===a.outputMode)return b.output();if("base64"===a.outputMode)return L(b.output());
+            if("window"===a.outputMode)window.URL=window.URL||window.webkitURL,window.open(window.URL.createObjectURL(b.output("blob")));else try{var k=b.output("blob");saveAs(k,a.fileName+".pdf")}catch(r){H(a.fileName+".pdf","data:application/pdf"+(e?"":";base64")+",",e?b.output("blob"):b.output())}}function ma(b,e,a){var k=0;"undefined"!==typeof a&&(k=a.colspan);if(0<=k){for(var g=b.width,c=b.textPos.x,x=e.table.columns.indexOf(e.column),q=1;q<k;q++)g+=e.table.columns[x+q].width;1<k&&("right"===b.styles.halign?
+            c=b.textPos.x+g-b.width:"center"===b.styles.halign&&(c=b.textPos.x+(g-b.width)/2));b.width=g;b.textPos.x=c;"undefined"!==typeof a&&1<a.rowspan&&(b.height*=a.rowspan);if("middle"===b.styles.valign||"bottom"===b.styles.valign)a=("string"===typeof b.text?b.text.split(/\r\n|\r|\n/g):b.text).length||1,2<a&&(b.textPos.y-=(2-1.15)/2*e.row.styles.fontSize*(a-2)/3);return!0}return!1}function na(b,a,k){"undefined"!=typeof k.images&&a.each(function(){var a=c(this).children();if(c(this).is("img")){var e=oa(this.src);
+            k.images[e]={url:this.src,src:this.src}}"undefined"!=typeof a&&0<a.length&&na(b,a,k)})}function Aa(b,a){function e(b){if(b.url){var e=new Image;g=++h;e.crossOrigin="Anonymous";e.onerror=e.onload=function(){if(e.complete&&(0===e.src.indexOf("data:image/")&&(e.width=b.width||e.width||0,e.height=b.height||e.height||0),e.width+e.height)){var k=document.createElement("canvas"),c=k.getContext("2d");k.width=e.width;k.height=e.height;c.drawImage(e,0,0);b.src=k.toDataURL("image/jpeg")}--h||a(g)};e.src=b.url}}
+            var c,g=0,h=0;if("undefined"!=typeof b.images)for(c in b.images)b.images.hasOwnProperty(c)&&e(b.images[c]);(b=h)||(a(g),b=void 0);return b}function pa(b,e,k){e.each(function(){var e=c(this).children(),g=0;if(c(this).is("div")){var h=Z(M(this,"background-color"),[255,255,255]),x=Z(M(this,"border-top-color"),[0,0,0]),q=aa(this,"border-top-width",a.jspdf.unit),d=this.getBoundingClientRect(),f=this.offsetLeft*k.dw;g=this.offsetTop*k.dh;var l=d.width*k.dw;d=d.height*k.dh;k.doc.setDrawColor.apply(void 0,
+            x);k.doc.setFillColor.apply(void 0,h);k.doc.setLineWidth(q);k.doc.rect(b.x+f,b.y+g,l,d,q?"FD":"F")}else if(c(this).is("img")&&"undefined"!=typeof k.images&&(h=oa(this.src),h=k.images[h],"undefined"!=typeof h)){x=b.width/b.height;q=this.width/this.height;f=b.width;l=b.height;d=19.049976/25.4;q<=x?(l=Math.min(b.height,this.height),f=this.width*l/this.height):q>x&&(f=Math.min(b.width,this.width),l=this.height*f/this.width);f*=d;l*=d;l<b.height&&(g=(b.height-l)/2);try{k.doc.addImage(h.src,b.textPos.x,
+            b.y+g,f,l)}catch(Ea){}b.textPos.x+=f}"undefined"!=typeof e&&0<e.length&&pa(b,e,k)})}function qa(b,e,a){if("function"===typeof a.onAutotableText)a.onAutotableText(a.doc,b,e);else{var k=b.textPos.x,g=b.textPos.y,h={halign:b.styles.halign,valign:b.styles.valign};if(e.length){for(e=e[0];e.previousSibling;)e=e.previousSibling;for(var x=!1,q=!1;e;){var d=e.innerText||e.textContent||"";d=(d.length&&" "==d[0]?" ":"")+c.trim(d)+(1<d.length&&" "==d[d.length-1]?" ":"");c(e).is("br")&&(k=b.textPos.x,g+=a.doc.internal.getFontSize());
+            c(e).is("b")?x=!0:c(e).is("i")&&(q=!0);(x||q)&&a.doc.setFontType(x&&q?"bolditalic":x?"bold":"italic");var f=a.doc.getStringUnitWidth(d)*a.doc.internal.getFontSize();if(f){if("linebreak"===b.styles.overflow&&k>b.textPos.x&&k+f>b.textPos.x+b.width){if(0<=".,!%*;:=-".indexOf(d.charAt(0))){var l=d.charAt(0);f=a.doc.getStringUnitWidth(l)*a.doc.internal.getFontSize();k+f<=b.textPos.x+b.width&&(a.doc.autoTableText(l,k,g,h),d=d.substring(1,d.length));f=a.doc.getStringUnitWidth(d)*a.doc.internal.getFontSize()}k=
+                b.textPos.x;g+=a.doc.internal.getFontSize()}for(;d.length&&k+f>b.textPos.x+b.width;)d=d.substring(0,d.length-1),f=a.doc.getStringUnitWidth(d)*a.doc.internal.getFontSize();a.doc.autoTableText(d,k,g,h);k+=f}if(x||q)c(e).is("b")?x=!1:c(e).is("i")&&(q=!1),a.doc.setFontType(x||q?x?"bold":"italic":"normal");e=e.nextSibling}b.textPos.x=k;b.textPos.y=g}else a.doc.autoTableText(b.text,b.textPos.x,b.textPos.y,h)}}function ba(b,a,c){return b.replace(new RegExp(a.replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),
+            "g"),c)}function ea(b){b=ba(b||"0",a.numbers.html.thousandsSeparator,"");b=ba(b,a.numbers.html.decimalMark,".");return"number"===typeof b||!1!==jQuery.isNumeric(b)?b:!1}function Ba(b){-1<b.indexOf("%")?(b=ea(b.replace(/%/g,"")),!1!==b&&(b/=100)):b=!1;return b}function z(b,e,k){var r="";if(null!==b){var g=c(b);if(g[0].hasAttribute("data-tableexport-value"))var h=(h=g.data("tableexport-value"))?h+"":"";else if(h=g.html(),"function"===typeof a.onCellHtmlData)h=a.onCellHtmlData(g,e,k,h);else if(""!=h){var d=
+            c.parseHTML(h),f=0,l=0;h="";c.each(d,function(){if(c(this).is("input"))h+=g.find("input").eq(f++).val();else if(c(this).is("select"))h+=g.find("select option:selected").eq(l++).text();else if("undefined"===typeof c(this).html())h+=c(this).text();else if(void 0===jQuery().bootstrapTable||!0!==c(this).hasClass("filterControl")&&0===c(b).parents(".detail-view").length)h+=c(this).html()})}if(!0===a.htmlContent)r=c.trim(h);else if(h&&""!=h)if(""!=c(b).data("tableexport-cellformat")){var n=h.replace(/\n/g,
+            "\u2028").replace(/<br\s*[\/]?>/gi,"\u2060"),m=c("<div/>").html(n).contents();d=!1;n="";c.each(m.text().split("\u2028"),function(b,a){0<b&&(n+=" ");n+=c.trim(a)});c.each(n.split("\u2060"),function(b,a){0<b&&(r+="\n");r+=c.trim(a).replace(/\u00AD/g,"")});if("json"==a.type||"excel"===a.type&&"xmlss"===a.excelFileFormat||!1===a.numbers.output)d=ea(r),!1!==d&&(r=Number(d));else if(a.numbers.html.decimalMark!=a.numbers.output.decimalMark||a.numbers.html.thousandsSeparator!=a.numbers.output.thousandsSeparator)if(d=
+                ea(r),!1!==d){m=(""+d.substr(0>d?1:0)).split(".");1==m.length&&(m[1]="");var p=3<m[0].length?m[0].length%3:0;r=(0>d?"-":"")+(a.numbers.output.thousandsSeparator?(p?m[0].substr(0,p)+a.numbers.output.thousandsSeparator:"")+m[0].substr(p).replace(/(\d{3})(?=\d)/g,"$1"+a.numbers.output.thousandsSeparator):m[0])+(m[1].length?a.numbers.output.decimalMark+m[1]:"")}}else r=h;!0===a.escape&&(r=escape(r));"function"===typeof a.onCellData&&(r=a.onCellData(g,e,k,r))}return r}function Ca(b,a,c){return a+"-"+c.toLowerCase()}
+        function Z(b,a){(b=/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/.exec(b))&&(a=[parseInt(b[1]),parseInt(b[2]),parseInt(b[3])]);return a}function ra(b){var a=M(b,"text-align"),k=M(b,"font-weight"),r=M(b,"font-style"),g="";"start"==a&&(a="rtl"==M(b,"direction")?"right":"left");700<=k&&(g="bold");"italic"==r&&(g+=r);""===g&&(g="normal");a={style:{align:a,bcolor:Z(M(b,"background-color"),[255,255,255]),color:Z(M(b,"color"),[0,0,0]),fstyle:g},colspan:parseInt(c(b).attr("colspan"))||0,rowspan:parseInt(c(b).attr("rowspan"))||
+            0};null!==b&&(b=b.getBoundingClientRect(),a.rect={width:b.width,height:b.height});return a}function M(b,a){try{return window.getComputedStyle?(a=a.replace(/([a-z])([A-Z])/,Ca),window.getComputedStyle(b,null).getPropertyValue(a)):b.currentStyle?b.currentStyle[a]:b.style[a]}catch(k){}return""}function aa(b,a,c){a=M(b,a).match(/\d+/);if(null!==a){a=a[0];b=b.parentElement;var e=document.createElement("div");e.style.overflow="hidden";e.style.visibility="hidden";b.appendChild(e);e.style.width=100+c;c=100/
+            e.offsetWidth;b.removeChild(e);return a*c}return 0}function fa(){if(!(this instanceof fa))return new fa;this.SheetNames=[];this.Sheets={}}function sa(b){for(var a=new ArrayBuffer(b.length),c=new Uint8Array(a),d=0;d!=b.length;++d)c[d]=b.charCodeAt(d)&255;return a}function Da(b){for(var a={},c={s:{c:1E7,r:1E7},e:{c:0,r:0}},d=0;d!=b.length;++d)for(var g=0;g!=b[d].length;++g){c.s.r>d&&(c.s.r=d);c.s.c>g&&(c.s.c=g);c.e.r<d&&(c.e.r=d);c.e.c<g&&(c.e.c=g);var h={v:b[d][g]};if(null!==h.v){var f=XLSX.utils.encode_cell({c:g,
+            r:d});if("number"===typeof h.v)h.t="n";else if("boolean"===typeof h.v)h.t="b";else if(h.v instanceof Date){h.t="n";h.z=XLSX.SSF._table[14];var q=h;var l=(Date.parse(h.v)-new Date(Date.UTC(1899,11,30)))/864E5;q.v=l}else h.t="s";a[f]=h}}1E7>c.s.c&&(a["!ref"]=XLSX.utils.encode_range(c));return a}function oa(b){var a=0,c;if(0===b.length)return a;var d=0;for(c=b.length;d<c;d++){var g=b.charCodeAt(d);a=(a<<5)-a+g;a|=0}return a}function H(b,a,c){var e=window.navigator.userAgent;if(!1!==b&&window.navigator.msSaveOrOpenBlob)window.navigator.msSaveOrOpenBlob(new Blob([c]),
+            b);else if(!1!==b&&(0<e.indexOf("MSIE ")||e.match(/Trident.*rv\:11\./))){if(a=document.createElement("iframe"))document.body.appendChild(a),a.setAttribute("style","display:none"),a.contentDocument.open("txt/html","replace"),a.contentDocument.write(c),a.contentDocument.close(),a.focus(),a.contentDocument.execCommand("SaveAs",!0,b),document.body.removeChild(a)}else{var g=document.createElement("a");if(g){var h=null;g.style.display="none";!1!==b?g.download=b:g.target="_blank";"object"==typeof c?(window.URL=
+            window.URL||window.webkitURL,h=window.URL.createObjectURL(c),g.href=h):0<=a.toLowerCase().indexOf("base64,")?g.href=a+L(c):g.href=a+encodeURIComponent(c);document.body.appendChild(g);if(document.createEvent)null===ca&&(ca=document.createEvent("MouseEvents")),ca.initEvent("click",!0,!1),g.dispatchEvent(ca);else if(document.createEventObject)g.fireEvent("onclick");else if("function"==typeof g.onclick)g.onclick();setTimeout(function(){h&&window.URL.revokeObjectURL(h);document.body.removeChild(g)},100)}}}
+        function L(a){var b,c="",d=0;if("string"===typeof a){a=a.replace(/\x0d\x0a/g,"\n");var g="";for(b=0;b<a.length;b++){var h=a.charCodeAt(b);128>h?g+=String.fromCharCode(h):(127<h&&2048>h?g+=String.fromCharCode(h>>6|192):(g+=String.fromCharCode(h>>12|224),g+=String.fromCharCode(h>>6&63|128)),g+=String.fromCharCode(h&63|128))}a=g}for(;d<a.length;){var f=a.charCodeAt(d++);g=a.charCodeAt(d++);b=a.charCodeAt(d++);h=f>>2;f=(f&3)<<4|g>>4;var q=(g&15)<<2|b>>6;var l=b&63;isNaN(g)?q=l=64:isNaN(b)&&(l=64);c=c+
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(h)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(f)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(q)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(l)}return c}var a={consoleLog:!1,csvEnclosure:'"',csvSeparator:",",csvUseBOM:!0,displayTableName:!1,escape:!1,excelFileFormat:"xlshtml",excelRTL:!1,excelstyles:[],exportHiddenCells:!1,fileName:"tableExport",
+                htmlContent:!1,ignoreColumn:[],ignoreRow:[],jsonScope:"all",jspdf:{orientation:"p",unit:"pt",format:"a4",margins:{left:20,right:10,top:10,bottom:10},onDocCreated:null,autotable:{styles:{cellPadding:2,rowHeight:12,fontSize:8,fillColor:255,textColor:50,fontStyle:"normal",overflow:"ellipsize",halign:"left",valign:"middle"},headerStyles:{fillColor:[52,73,94],textColor:255,fontStyle:"bold",halign:"center"},alternateRowStyles:{fillColor:245},tableExport:{doc:null,onAfterAutotable:null,onBeforeAutotable:null,
+                            onAutotableText:null,onTable:null,outputImages:!0}}},numbers:{html:{decimalMark:".",thousandsSeparator:","},output:{decimalMark:".",thousandsSeparator:","}},onCellData:null,onCellHtmlData:null,onIgnoreRow:null,onMsoNumberFormat:null,outputMode:"file",pdfmake:{enabled:!1,docDefinition:{pageOrientation:"portrait",defaultStyle:{font:"Roboto"}},fonts:{}},tbodySelector:"tr",tfootSelector:"tr",theadSelector:"tr",tableName:"Table",type:"csv",worksheetName:""},v=this,ca=null,p=[],t=[],l=0,m="",Q=[],G=[],
+            K=[],R=!1;c.extend(!0,a,f);Q=O(v);if("csv"==a.type||"tsv"==a.type||"txt"==a.type){var I="",U=0;G=[];l=0;var ha=function(b,e,k){b.each(function(){m="";B(this,e,l,k+b.length,function(b,c,e){var g=m,h="";if(null!==b)if(b=z(b,c,e),c=null===b||""===b?"":b.toString(),"tsv"==a.type)b instanceof Date&&b.toLocaleString(),h=ba(c,"\t"," ");else if(b instanceof Date)h=a.csvEnclosure+b.toLocaleString()+a.csvEnclosure;else if(h=ba(c,a.csvEnclosure,a.csvEnclosure+a.csvEnclosure),0<=h.indexOf(a.csvSeparator)||/[\r\n ]/g.test(h))h=
+            a.csvEnclosure+h+a.csvEnclosure;m=g+(h+("tsv"==a.type?"\t":a.csvSeparator))});m=c.trim(m).substring(0,m.length-1);0<m.length&&(0<I.length&&(I+="\n"),I+=m);l++});return b.length};U+=ha(c(v).find("thead").first().find(a.theadSelector),"th,td",U);C(c(v),"tbody").each(function(){U+=ha(D(c(this),a.tbodySelector),"td,th",U)});a.tfootSelector.length&&ha(c(v).find("tfoot").first().find(a.tfootSelector),"td,th",U);I+="\n";!0===a.consoleLog&&console.log(I);if("string"===a.outputMode)return I;if("base64"===
+            a.outputMode)return L(I);if("window"===a.outputMode){H(!1,"data:text/"+("csv"==a.type?"csv":"plain")+";charset=utf-8,",I);return}try{var A=new Blob([I],{type:"text/"+("csv"==a.type?"csv":"plain")+";charset=utf-8"});saveAs(A,a.fileName+"."+a.type,"csv"!=a.type||!1===a.csvUseBOM)}catch(b){H(a.fileName+"."+a.type,"data:text/"+("csv"==a.type?"csv":"plain")+";charset=utf-8,"+("csv"==a.type&&a.csvUseBOM?"\ufeff":""),I)}}else if("sql"==a.type){l=0;G=[];var w="INSERT INTO `"+a.tableName+"` (";p=c(v).find("thead").first().find(a.theadSelector);
+            p.each(function(){B(this,"th,td",l,p.length,function(a,c,k){w+="'"+z(a,c,k)+"',"});l++;w=c.trim(w);w=c.trim(w).substring(0,w.length-1)});w+=") VALUES ";t=u(c(v));c(t).each(function(){m="";B(this,"td,th",l,p.length+t.length,function(a,c,k){m+="'"+z(a,c,k)+"',"});3<m.length&&(w+="("+m,w=c.trim(w).substring(0,w.length-1),w+="),");l++});w=c.trim(w).substring(0,w.length-1);w+=";";!0===a.consoleLog&&console.log(w);if("string"===a.outputMode)return w;if("base64"===a.outputMode)return L(w);try{A=new Blob([w],
+                {type:"text/plain;charset=utf-8"}),saveAs(A,a.fileName+".sql")}catch(b){H(a.fileName+".sql","data:application/sql;charset=utf-8,",w)}}else if("json"==a.type){var S=[];G=[];p=c(v).find("thead").first().find(a.theadSelector);p.each(function(){var a=[];B(this,"th,td",l,p.length,function(b,c,d){a.push(z(b,c,d))});S.push(a)});var ia=[];t=u(c(v));c(t).each(function(){var a={},e=0;B(this,"td,th",l,p.length+t.length,function(b,c,g){S.length?a[S[S.length-1][e]]=z(b,c,g):a[e]=z(b,c,g);e++});!1===c.isEmptyObject(a)&&
+        ia.push(a);l++});f="";f="head"==a.jsonScope?JSON.stringify(S):"data"==a.jsonScope?JSON.stringify(ia):JSON.stringify({header:S,data:ia});!0===a.consoleLog&&console.log(f);if("string"===a.outputMode)return f;if("base64"===a.outputMode)return L(f);try{A=new Blob([f],{type:"application/json;charset=utf-8"}),saveAs(A,a.fileName+".json")}catch(b){H(a.fileName+".json","data:application/json;charset=utf-8;base64,",f)}}else if("xml"===a.type){l=0;G=[];var J='<?xml version="1.0" encoding="utf-8"?>';J+="<tabledata><fields>";
+            p=c(v).find("thead").first().find(a.theadSelector);p.each(function(){B(this,"th,td",l,p.length,function(a,c,d){J+="<field>"+z(a,c,d)+"</field>"});l++});J+="</fields><data>";var ta=1;t=u(c(v));c(t).each(function(){var a=1;m="";B(this,"td,th",l,p.length+t.length,function(b,c,d){m+="<column-"+a+">"+z(b,c,d)+"</column-"+a+">";a++});0<m.length&&"<column-1></column-1>"!=m&&(J+='<row id="'+ta+'">'+m+"</row>",ta++);l++});J+="</data></tabledata>";!0===a.consoleLog&&console.log(J);if("string"===a.outputMode)return J;
+            if("base64"===a.outputMode)return L(J);try{A=new Blob([J],{type:"application/xml;charset=utf-8"}),saveAs(A,a.fileName+".xml")}catch(b){H(a.fileName+".xml","data:application/xml;charset=utf-8;base64,",J)}}else if("excel"===a.type&&"xmlss"===a.excelFileFormat){var ja=[],F=[];c(v).filter(function(){return P(c(this))}).each(function(){function b(a,b,e){var g=[];c(a).each(function(){var b=0,h=0;m="";B(this,"td,th",l,e+a.length,function(a,e,d){if(null!==a){var k="";e=z(a,e,d);d="String";if(!1!==jQuery.isNumeric(e))d=
+            "Number";else{var f=Ba(e);!1!==f&&(e=f,d="Number",k+=' ss:StyleID="pct1"')}"Number"!==d&&(e=e.replace(/\n/g,"<br>"));f=parseInt(a.getAttribute("colspan"));a=parseInt(a.getAttribute("rowspan"));g.forEach(function(a){if(l>=a.s.r&&l<=a.e.r&&h>=a.s.c&&h<=a.e.c)for(var c=0;c<=a.e.c-a.s.c;++c)h++,b++});if(a||f)a=a||1,f=f||1,g.push({s:{r:l,c:h},e:{r:l+a-1,c:h+f-1}});1<f&&(k+=' ss:MergeAcross="'+(f-1)+'"',h+=f-1);1<a&&(k+=' ss:MergeDown="'+(a-1)+'" ss:StyleID="rsp1"');0<b&&(k+=' ss:Index="'+(h+1)+'"',b=0);
+            m+="<Cell"+k+'><Data ss:Type="'+d+'">'+c("<div />").text(e).html()+"</Data></Cell>\r";h++}});0<m.length&&(E+='<Row ss:AutoFitHeight="0">\r'+m+"</Row>\r");l++});return a.length}var e=c(this),d="";"string"===typeof a.worksheetName&&a.worksheetName.length?d=a.worksheetName+" "+(F.length+1):"undefined"!==typeof a.worksheetName[F.length]&&(d=a.worksheetName[F.length]);d.length||(d=e.find("caption").text()||"");d.length||(d="Table "+(F.length+1));d=d.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31).trim();
+            F.push(c("<div />").text(d).html());!1===a.exportHiddenCells&&(K=e.find("tr, th, td").filter(":hidden"),R=0<K.length);l=0;Q=O(this);E="<Table>\r";d=0;d+=b(e.find("thead").first().find(a.theadSelector),"th,td",d);b(u(e),"td,th",d);E+="</Table>\r";ja.push(E);!0===a.consoleLog&&console.log(E)});f={};for(var y={},n,N,T=0,Y=F.length;T<Y;T++)n=F[T],N=f[n],N=f[n]=null==N?1:N+1,2==N&&(F[y[n]]=F[y[n]].substring(0,29)+"-1"),1<f[n]?F[T]=F[T].substring(0,29)+"-"+f[n]:y[n]=T;f='<?xml version="1.0" encoding="UTF-8"?>\r<?mso-application progid="Excel.Sheet"?>\r<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:o="urn:schemas-microsoft-com:office:office"\r xmlns:x="urn:schemas-microsoft-com:office:excel"\r xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:html="http://www.w3.org/TR/REC-html40">\r<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">\r  <Created>'+
+            (new Date).toISOString()+'</Created>\r</DocumentProperties>\r<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">\r  <AllowPNG/>\r</OfficeDocumentSettings>\r<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">\r  <WindowHeight>9000</WindowHeight>\r  <WindowWidth>13860</WindowWidth>\r  <WindowTopX>0</WindowTopX>\r  <WindowTopY>0</WindowTopY>\r  <ProtectStructure>False</ProtectStructure>\r  <ProtectWindows>False</ProtectWindows>\r</ExcelWorkbook>\r<Styles>\r  <Style ss:ID="Default" ss:Name="Normal">\r    <Alignment ss:Vertical="Bottom"/>\r    <Borders/>\r    <Font/>\r    <Interior/>\r    <NumberFormat/>\r    <Protection/>\r  </Style>\r  <Style ss:ID="rsp1">\r    <Alignment ss:Vertical="Center"/>\r  </Style>\r  <Style ss:ID="pct1">\r    <NumberFormat ss:Format="Percent"/>\r  </Style>\r</Styles>\r';
+            for(y=0;y<ja.length;y++)f+='<Worksheet ss:Name="'+F[y]+'" ss:RightToLeft="'+(a.excelRTL?"1":"0")+'">\r'+ja[y],f=a.excelRTL?f+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">\r<DisplayRightToLeft/>\r</WorksheetOptions>\r':f+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"/>\r',f+="</Worksheet>\r";f+="</Workbook>\r";!0===a.consoleLog&&console.log(f);if("string"===a.outputMode)return f;if("base64"===a.outputMode)return L(f);try{A=new Blob([f],{type:"application/xml;charset=utf-8"}),
+                saveAs(A,a.fileName+".xml")}catch(b){H(a.fileName+".xml","data:application/xml;charset=utf-8;base64,",f)}}else if("excel"==a.type||"xls"==a.type||"word"==a.type||"doc"==a.type){f="excel"==a.type||"xls"==a.type?"excel":"word";y="excel"==f?"xls":"doc";n='xmlns:x="urn:schemas-microsoft-com:office:'+f+'"';var E="",V="";c(v).filter(function(){return P(c(this))}).each(function(){var b=c(this);""===V&&(V=a.worksheetName||b.find("caption").text()||"Table",V=V.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31).trim());
+            !1===a.exportHiddenCells&&(K=b.find("tr, th, td").filter(":hidden"),R=0<K.length);l=0;G=[];Q=O(this);E+="<table><thead>";p=b.find("thead").first().find(a.theadSelector);p.each(function(){m="";B(this,"th,td",l,p.length,function(b,d,f){if(null!==b){var e="";m+="<th";for(var h in a.excelstyles)if(a.excelstyles.hasOwnProperty(h)){var k=c(b).css(a.excelstyles[h]);""!==k&&"0px none rgb(0, 0, 0)"!=k&&"rgba(0, 0, 0, 0)"!=k&&(e+=""===e?'style="':";",e+=a.excelstyles[h]+":"+k)}""!==e&&(m+=" "+e+'"');c(b).is("[colspan]")&&
+            (m+=' colspan="'+c(b).attr("colspan")+'"');c(b).is("[rowspan]")&&(m+=' rowspan="'+c(b).attr("rowspan")+'"');m+=">"+z(b,d,f)+"</th>"}});0<m.length&&(E+="<tr>"+m+"</tr>");l++});E+="</thead><tbody>";t=u(b);c(t).each(function(){var b=c(this);m="";B(this,"td,th",l,p.length+t.length,function(e,d,g){if(null!==e){var h=z(e,d,g),k="",f=c(e).data("tableexport-msonumberformat");"undefined"==typeof f&&"function"===typeof a.onMsoNumberFormat&&(f=a.onMsoNumberFormat(e,d,g));"undefined"!=typeof f&&""!==f&&(k="style=\"mso-number-format:'"+
+                f+"'");for(var l in a.excelstyles)a.excelstyles.hasOwnProperty(l)&&(f=c(e).css(a.excelstyles[l]),""===f&&(f=b.css(a.excelstyles[l])),""!==f&&"0px none rgb(0, 0, 0)"!=f&&"rgba(0, 0, 0, 0)"!=f&&(k+=""===k?'style="':";",k+=a.excelstyles[l]+":"+f));m+="<td";""!==k&&(m+=" "+k+'"');c(e).is("[colspan]")&&(m+=' colspan="'+c(e).attr("colspan")+'"');c(e).is("[rowspan]")&&(m+=' rowspan="'+c(e).attr("rowspan")+'"');"string"===typeof h&&""!=h&&(h=h.replace(/\n/g,"<br>"));m+=">"+h+"</td>"}});0<m.length&&(E+="<tr>"+
+                m+"</tr>");l++});a.displayTableName&&(E+="<tr><td></td></tr><tr><td></td></tr><tr><td>"+z(c("<p>"+a.tableName+"</p>"))+"</td></tr>");E+="</tbody></table>";!0===a.consoleLog&&console.log(E)});n='<html xmlns:o="urn:schemas-microsoft-com:office:office" '+n+' xmlns="http://www.w3.org/TR/REC-html40">'+('<meta http-equiv="content-type" content="application/vnd.ms-'+f+'; charset=UTF-8">')+"<head>";"excel"===f&&(n+="\x3c!--[if gte mso 9]>",n+="<xml>",n+="<x:ExcelWorkbook>",n+="<x:ExcelWorksheets>",n+="<x:ExcelWorksheet>",
+            n+="<x:Name>",n+=V,n+="</x:Name>",n+="<x:WorksheetOptions>",n+="<x:DisplayGridlines/>",a.excelRTL&&(n+="<x:DisplayRightToLeft/>"),n+="</x:WorksheetOptions>",n+="</x:ExcelWorksheet>",n+="</x:ExcelWorksheets>",n+="</x:ExcelWorkbook>",n+="</xml>",n+="<![endif]--\x3e");n+="<style>br {mso-data-placement:same-cell;}</style>";n+="</head>";n+="<body>";n+=E;n+="</body>";n+="</html>";!0===a.consoleLog&&console.log(n);if("string"===a.outputMode)return n;if("base64"===a.outputMode)return L(n);try{A=new Blob([n],
+            {type:"application/vnd.ms-"+a.type}),saveAs(A,a.fileName+"."+y)}catch(b){H(a.fileName+"."+y,"data:application/vnd.ms-"+f+";base64,",n)}}else if("xlsx"==a.type){var ua=[],ka=[];l=0;t=c(v).find("thead").first().find(a.theadSelector);t.push.apply(t,u(c(v)));c(t).each(function(){var b=[];B(this,"th,td",l,t.length,function(c,d,f){if("undefined"!==typeof c&&null!==c){f=z(c,d,f);d=parseInt(c.getAttribute("colspan"));c=parseInt(c.getAttribute("rowspan"));ka.forEach(function(a){if(l>=a.s.r&&l<=a.e.r&&b.length>=
+            a.s.c&&b.length<=a.e.c)for(var c=0;c<=a.e.c-a.s.c;++c)b.push(null)});if(c||d)d=d||1,ka.push({s:{r:l,c:b.length},e:{r:l+(c||1)-1,c:b.length+d-1}});"function"!==typeof a.onCellData&&""!==f&&f==+f&&(f=+f);b.push(""!==f?f:null);if(d)for(c=0;c<d-1;++c)b.push(null)}});ua.push(b);l++});f=new fa;y=Da(ua);y["!merges"]=ka;f.SheetNames.push(a.worksheetName);f.Sheets[a.worksheetName]=y;f=XLSX.write(f,{bookType:a.type,bookSST:!1,type:"binary"});try{A=new Blob([sa(f)],{type:"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"}),
+            saveAs(A,a.fileName+"."+a.type)}catch(b){H(a.fileName+"."+a.type,"data:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8,",sa(f))}}else if("png"==a.type)html2canvas(c(v)[0]).then(function(b){b=b.toDataURL();for(var c=atob(b.substring(22)),d=new ArrayBuffer(c.length),f=new Uint8Array(d),g=0;g<c.length;g++)f[g]=c.charCodeAt(g);!0===a.consoleLog&&console.log(c);if("string"===a.outputMode)return c;if("base64"===a.outputMode)return L(b);if("window"===a.outputMode)window.open(b);
+        else try{A=new Blob([d],{type:"image/png"}),saveAs(A,a.fileName+".png")}catch(h){H(a.fileName+".png","data:image/png,",A)}});else if("pdf"==a.type)if(!0===a.pdfmake.enabled){f=[];var va=[];l=0;G=[];y=function(a,d,f){var b=0;c(a).each(function(){var a=[];B(this,d,l,f,function(b,c,d){if("undefined"!==typeof b&&null!==b){var e=parseInt(b.getAttribute("colspan")),g=parseInt(b.getAttribute("rowspan"));b=z(b,c,d)||" ";1<e||1<g?a.push({colSpan:e||1,rowSpan:g||1,text:b}):a.push(b)}else a.push(" ")});a.length&&
+        va.push(a);b<a.length&&(b=a.length);l++});return b};p=c(this).find("thead").first().find(a.theadSelector);n=y(p,"th,td",p.length);for(N=f.length;N<n;N++)f.push("*");t=u(c(this));y(t,"th,td",p.length+t.length);f={content:[{table:{headerRows:p.length,widths:f,body:va}}]};c.extend(!0,f,a.pdfmake.docDefinition);pdfMake.fonts={Roboto:{normal:"Roboto-Regular.ttf",bold:"Roboto-Medium.ttf",italics:"Roboto-Italic.ttf",bolditalics:"Roboto-MediumItalic.ttf"}};c.extend(!0,pdfMake.fonts,a.pdfmake.fonts);pdfMake.createPdf(f).getBuffer(function(b){try{var c=
+            new Blob([b],{type:"application/pdf"});saveAs(c,a.fileName+".pdf")}catch(k){H(a.fileName+".pdf","data:application/pdf;base64,",b)}})}else if(!1===a.jspdf.autotable){f={dim:{w:aa(c(v).first().get(0),"width","mm"),h:aa(c(v).first().get(0),"height","mm")},pagesplit:!1};var wa=new jsPDF(a.jspdf.orientation,a.jspdf.unit,a.jspdf.format);wa.addHTML(c(v).first(),a.jspdf.margins.left,a.jspdf.margins.top,f,function(){la(wa,!1)})}else{var d=a.jspdf.autotable.tableExport;if("string"===typeof a.jspdf.format&&
+            "bestfit"===a.jspdf.format.toLowerCase()){var W={a0:[2383.94,3370.39],a1:[1683.78,2383.94],a2:[1190.55,1683.78],a3:[841.89,1190.55],a4:[595.28,841.89]},da="",X="",xa=0;c(v).each(function(){if(P(c(this))){var a=aa(c(this).get(0),"width","pt");if(a>xa){a>W.a0[0]&&(da="a0",X="l");for(var d in W)W.hasOwnProperty(d)&&W[d][1]>a&&(da=d,X="l",W[d][0]>a&&(X="p"));xa=a}}});a.jspdf.format=""===da?"a4":da;a.jspdf.orientation=""===X?"w":X}if(null==d.doc&&(d.doc=new jsPDF(a.jspdf.orientation,a.jspdf.unit,a.jspdf.format),
+            "function"===typeof a.jspdf.onDocCreated))a.jspdf.onDocCreated(d.doc);!0===d.outputImages&&(d.images={});"undefined"!=typeof d.images&&(c(v).filter(function(){return P(c(this))}).each(function(){var b=0;G=[];!1===a.exportHiddenCells&&(K=c(this).find("tr, th, td").filter(":hidden"),R=0<K.length);p=c(this).find("thead").find(a.theadSelector);t=u(c(this));c(t).each(function(){B(this,"td,th",p.length+b,p.length+t.length,function(a){if("undefined"!==typeof a&&null!==a){var b=c(a).children();"undefined"!=
+        typeof b&&0<b.length&&na(a,b,d)}});b++})}),p=[],t=[]);Aa(d,function(){c(v).filter(function(){return P(c(this))}).each(function(){var b;l=0;G=[];!1===a.exportHiddenCells&&(K=c(this).find("tr, th, td").filter(":hidden"),R=0<K.length);Q=O(this);d.columns=[];d.rows=[];d.rowoptions={};if("function"===typeof d.onTable&&!1===d.onTable(c(this),a))return!0;a.jspdf.autotable.tableExport=null;var e=c.extend(!0,{},a.jspdf.autotable);a.jspdf.autotable.tableExport=d;e.margin={};c.extend(!0,e.margin,a.jspdf.margins);
+            e.tableExport=d;"function"!==typeof e.beforePageContent&&(e.beforePageContent=function(a){1==a.pageCount&&a.table.rows.concat(a.table.headerRow).forEach(function(b){0<b.height&&(b.height+=(2-1.15)/2*b.styles.fontSize,a.table.height+=(2-1.15)/2*b.styles.fontSize)})});"function"!==typeof e.createdHeaderCell&&(e.createdHeaderCell=function(a,b){a.styles=c.extend({},b.row.styles);if("undefined"!=typeof d.columns[b.column.dataKey]){var g=d.columns[b.column.dataKey];if("undefined"!=typeof g.rect){a.contentWidth=
+                g.rect.width;if("undefined"==typeof d.heightRatio||0===d.heightRatio){var f=b.row.raw[b.column.dataKey].rowspan?b.row.raw[b.column.dataKey].rect.height/b.row.raw[b.column.dataKey].rowspan:b.row.raw[b.column.dataKey].rect.height;d.heightRatio=a.styles.rowHeight/f}f=b.row.raw[b.column.dataKey].rect.height*d.heightRatio;f>a.styles.rowHeight&&(a.styles.rowHeight=f)}"undefined"!=typeof g.style&&!0!==g.style.hidden&&(a.styles.halign=g.style.align,"inherit"===e.styles.fillColor&&(a.styles.fillColor=g.style.bcolor),
+            "inherit"===e.styles.textColor&&(a.styles.textColor=g.style.color),"inherit"===e.styles.fontStyle&&(a.styles.fontStyle=g.style.fstyle))}});"function"!==typeof e.createdCell&&(e.createdCell=function(a,b){b=d.rowoptions[b.row.index+":"+b.column.dataKey];"undefined"!=typeof b&&"undefined"!=typeof b.style&&!0!==b.style.hidden&&(a.styles.halign=b.style.align,"inherit"===e.styles.fillColor&&(a.styles.fillColor=b.style.bcolor),"inherit"===e.styles.textColor&&(a.styles.textColor=b.style.color),"inherit"===
+            e.styles.fontStyle&&(a.styles.fontStyle=b.style.fstyle))});"function"!==typeof e.drawHeaderCell&&(e.drawHeaderCell=function(a,b){var c=d.columns[b.column.dataKey];return(!0!==c.style.hasOwnProperty("hidden")||!0!==c.style.hidden)&&0<=c.rowIndex?ma(a,b,c):!1});"function"!==typeof e.drawCell&&(e.drawCell=function(a,b){var c=d.rowoptions[b.row.index+":"+b.column.dataKey];if(ma(a,b,c))if(d.doc.rect(a.x,a.y,a.width,a.height,a.styles.fillStyle),"undefined"!=typeof c&&"undefined"!=typeof c.kids&&0<c.kids.length){b=
+                a.height/c.rect.height;if(b>d.dh||"undefined"==typeof d.dh)d.dh=b;d.dw=a.width/c.rect.width;b=a.textPos.y;pa(a,c.kids,d);a.textPos.y=b;qa(a,c.kids,d)}else qa(a,{},d);return!1});d.headerrows=[];p=c(this).find("thead").find(a.theadSelector);p.each(function(){b=0;d.headerrows[l]=[];B(this,"th,td",l,p.length,function(a,c,e){var f=ra(a);f.title=z(a,c,e);f.key=b++;f.rowIndex=l;d.headerrows[l].push(f)});l++});if(0<l)for(var f=l-1;0<=f;)c.each(d.headerrows[f],function(){var a=this;0<f&&null===this.rect&&
+            (a=d.headerrows[f-1][this.key]);null!==a&&0<=a.rowIndex&&(!0!==a.style.hasOwnProperty("hidden")||!0!==a.style.hidden)&&d.columns.push(a)}),f=0<d.columns.length?-1:f-1;var m=0;t=[];t=u(c(this));c(t).each(function(){var a=[];b=0;B(this,"td,th",l,p.length+t.length,function(e,f,g){if("undefined"===typeof d.columns[b]){var h={title:"",key:b,style:{hidden:!0}};d.columns.push(h)}"undefined"!==typeof e&&null!==e?(h=ra(e),h.kids=c(e).children()):(h=c.extend(!0,{},d.rowoptions[m+":"+(b-1)]),h.colspan=-1);d.rowoptions[m+
+            ":"+b++]=h;a.push(z(e,f,g))});a.length&&(d.rows.push(a),m++);l++});if("function"===typeof d.onBeforeAutotable)d.onBeforeAutotable(c(this),d.columns,d.rows,e);d.doc.autoTable(d.columns,d.rows,e);if("function"===typeof d.onAfterAutotable)d.onAfterAutotable(c(this),e);a.jspdf.autotable.startY=d.doc.autoTableEndPosY()+e.margin.top});la(d.doc,"undefined"!=typeof d.images&&!1===jQuery.isEmptyObject(d.images));"undefined"!=typeof d.headerrows&&(d.headerrows.length=0);"undefined"!=typeof d.columns&&(d.columns.length=
+            0);"undefined"!=typeof d.rows&&(d.rows.length=0);delete d.doc;d.doc=null})}return this}})})(jQuery);
@@ -108,7 +108,7 @@
    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);

    var BootstrapTable = $.fn.bootstrapTable.Constructor,
-        _initToolbar = BootstrapTable.prototype.initToolbar,        
+        _initToolbar = BootstrapTable.prototype.initToolbar,
        _load = BootstrapTable.prototype.load,
        _initSearch = BootstrapTable.prototype.initSearch;

@@ -131,7 +131,7 @@
            html = [];

        html.push(sprintf('<div class="columns columns-%s btn-group pull-%s" role="group">', this.options.buttonsAlign, this.options.buttonsAlign));
-        html.push(sprintf('<button class="btn btn-default%s' + '" type="button" name="advancedSearch" title="%s">', that.options.iconSize === undefined ? '' : ' btn-' + that.options.iconSize, that.options.formatAdvancedSearch()));
+        html.push(sprintf('<button class="btn btn-default%s' + '" type="button" name="advancedSearch" aria-label="advanced search" title="%s">', that.options.iconSize === undefined ? '' : ' btn-' + that.options.iconSize, that.options.formatAdvancedSearch()));
        html.push(sprintf('<i class="%s %s"></i>', that.options.iconsPrefix, that.options.icons.advancedSearchIcon))
        html.push('</button></div>');

@@ -139,8 +139,8 @@

        that.$toolbar.find('button[name="advancedSearch"]')
            .off('click').on('click', function() {
-                showAvdSearch(that.columns, that.options.formatAdvancedSearch(), that.options.formatAdvancedCloseButton(), that);
-            });
+            showAvdSearch(that.columns, that.options.formatAdvancedSearch(), that.options.formatAdvancedCloseButton(), that);
+        });
    };

    BootstrapTable.prototype.load = function(data) {
@@ -181,8 +181,8 @@
                    [value, item, i], value);

                if (!($.inArray(key, that.header.fields) !== -1 &&
-                    (typeof value === 'string' || typeof value === 'number') &&
-                    (value + '').toLowerCase().indexOf(fval) !== -1)) {
+                        (typeof value === 'string' || typeof value === 'number') &&
+                        (value + '').toLowerCase().indexOf(fval) !== -1)) {
                    return false;
                }
            }
@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.9.1 - 2015-10-25
+* bootstrap-table - v1.11.1 - 2017-02-22
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2015 zhixin wen
+* Copyright (c) 2017 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";var b=!1,c=a.fn.bootstrapTable.utils.sprintf,d=function(b,d,f,g){if(a("#avdSearchModal_"+g.options.idTable).hasClass("modal"))a("#avdSearchModal_"+g.options.idTable).modal();else{var h=c('<div id="avdSearchModal%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">',"_"+g.options.idTable);h+='<div class="modal-dialog modal-xs">',h+=' <div class="modal-content">',h+='  <div class="modal-header">',h+='   <button type="button" class="close" data-dismiss="modal" aria-hidden="true" >&times;</button>',h+=c('   <h4 class="modal-title">%s</h4>',d),h+="  </div>",h+='  <div class="modal-body modal-body-custom">',h+=c('   <div class="container-fluid" id="avdSearchModalContent%s" style="padding-right: 0px;padding-left: 0px;" >',"_"+g.options.idTable),h+="   </div>",h+="  </div>",h+="  </div>",h+=" </div>",h+="</div>",a("body").append(a(h));var i=e(b,f,g),j=0;a("#avdSearchModalContent_"+g.options.idTable).append(i.join("")),a("#"+g.options.idForm).off("keyup blur","input").on("keyup blur","input",function(a){clearTimeout(j),j=setTimeout(function(){g.onColumnAdvancedSearch(a)},g.options.searchTimeOut)}),a("#btnCloseAvd_"+g.options.idTable).click(function(){a("#avdSearchModal_"+g.options.idTable).modal("hide")}),a("#avdSearchModal_"+g.options.idTable).modal()}},e=function(a,b,d){var e=[];e.push(c('<form class="form-horizontal" id="%s" action="%s" >',d.options.idForm,d.options.actionForm));for(var f in a){var g=a[f];!g.checkbox&&g.visible&&g.searchable&&(e.push('<div class="form-group">'),e.push(c('<label class="col-sm-4 control-label">%s</label>',g.title)),e.push('<div class="col-sm-6">'),e.push(c('<input type="text" class="form-control input-md" name="%s" placeholder="%s" id="%s">',g.field,g.title,g.field)),e.push("</div>"),e.push("</div>"))}return e.push('<div class="form-group">'),e.push('<div class="col-sm-offset-9 col-sm-3">'),e.push(c('<button type="button" id="btnCloseAvd%s" class="btn btn-default" >%s</button>',"_"+d.options.idTable,b)),e.push("</div>"),e.push("</div>"),e.push("</form>"),e};a.extend(a.fn.bootstrapTable.defaults,{advancedSearch:!1,idForm:"advancedSearch",actionForm:"",idTable:void 0,onColumnAdvancedSearch:function(){return!1}}),a.extend(a.fn.bootstrapTable.defaults.icons,{advancedSearchIcon:"glyphicon-chevron-down"}),a.extend(a.fn.bootstrapTable.Constructor.EVENTS,{"column-advanced-search.bs.table":"onColumnAdvancedSearch"}),a.extend(a.fn.bootstrapTable.locales,{formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}}),a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales);var f=a.fn.bootstrapTable.Constructor,g=f.prototype.initToolbar,h=f.prototype.load,i=f.prototype.initSearch;f.prototype.initToolbar=function(){if(g.apply(this,Array.prototype.slice.apply(arguments)),this.options.search&&this.options.advancedSearch&&this.options.idTable){var a=this,b=[];b.push(c('<div class="columns columns-%s btn-group pull-%s" role="group">',this.options.buttonsAlign,this.options.buttonsAlign)),b.push(c('<button class="btn btn-default%s" type="button" name="advancedSearch" title="%s">',void 0===a.options.iconSize?"":" btn-"+a.options.iconSize,a.options.formatAdvancedSearch())),b.push(c('<i class="%s %s"></i>',a.options.iconsPrefix,a.options.icons.advancedSearchIcon)),b.push("</button></div>"),a.$toolbar.prepend(b.join("")),a.$toolbar.find('button[name="advancedSearch"]').off("click").on("click",function(){d(a.columns,a.options.formatAdvancedSearch(),a.options.formatAdvancedCloseButton(),a)})}},f.prototype.load=function(){if(h.apply(this,Array.prototype.slice.apply(arguments)),this.options.advancedSearch&&"undefined"!=typeof this.options.idTable&&!b){var c=parseInt(a(".bootstrap-table").height());c+=10,a("#"+this.options.idTable).bootstrapTable("resetView",{height:c}),b=!0}},f.prototype.initSearch=function(){if(i.apply(this,Array.prototype.slice.apply(arguments)),this.options.advancedSearch){var b=this,c=a.isEmptyObject(this.filterColumnsPartial)?null:this.filterColumnsPartial;this.data=c?a.grep(this.data,function(d,e){for(var f in c){var g=c[f].toLowerCase(),h=d[f];if(h=a.fn.bootstrapTable.utils.calculateObjectValue(b.header,b.header.formatters[a.inArray(f,b.header.fields)],[h,d,e],h),-1===a.inArray(f,b.header.fields)||"string"!=typeof h&&"number"!=typeof h||-1===(h+"").toLowerCase().indexOf(g))return!1}return!0}):this.data}},f.prototype.onColumnAdvancedSearch=function(b){var c=a.trim(a(b.currentTarget).val()),d=a(b.currentTarget)[0].id;a.isEmptyObject(this.filterColumnsPartial)&&(this.filterColumnsPartial={}),c?this.filterColumnsPartial[d]=c:delete this.filterColumnsPartial[d],this.options.pageNumber=1,this.onSearch(b),this.updatePagination(),this.trigger("column-advanced-search",d,c)}}(jQuery);
+!function(a){"use strict";var b=!1,c=a.fn.bootstrapTable.utils.sprintf,d=function(b,d,f,g){if(a("#avdSearchModal_"+g.options.idTable).hasClass("modal"))a("#avdSearchModal_"+g.options.idTable).modal();else{var h=c('<div id="avdSearchModal%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">',"_"+g.options.idTable);h+='<div class="modal-dialog modal-xs">',h+=' <div class="modal-content">',h+='  <div class="modal-header">',h+='   <button type="button" class="close" data-dismiss="modal" aria-hidden="true" >&times;</button>',h+=c('   <h4 class="modal-title">%s</h4>',d),h+="  </div>",h+='  <div class="modal-body modal-body-custom">',h+=c('   <div class="container-fluid" id="avdSearchModalContent%s" style="padding-right: 0px;padding-left: 0px;" >',"_"+g.options.idTable),h+="   </div>",h+="  </div>",h+="  </div>",h+=" </div>",h+="</div>",a("body").append(a(h));var i=e(b,f,g),j=0;a("#avdSearchModalContent_"+g.options.idTable).append(i.join("")),a("#"+g.options.idForm).off("keyup blur","input").on("keyup blur","input",function(a){clearTimeout(j),j=setTimeout(function(){g.onColumnAdvancedSearch(a)},g.options.searchTimeOut)}),a("#btnCloseAvd_"+g.options.idTable).click(function(){a("#avdSearchModal_"+g.options.idTable).modal("hide")}),a("#avdSearchModal_"+g.options.idTable).modal()}},e=function(a,b,d){var e=[];e.push(c('<form class="form-horizontal" id="%s" action="%s" >',d.options.idForm,d.options.actionForm));for(var f in a){var g=a[f];!g.checkbox&&g.visible&&g.searchable&&(e.push('<div class="form-group">'),e.push(c('<label class="col-sm-4 control-label">%s</label>',g.title)),e.push('<div class="col-sm-6">'),e.push(c('<input type="text" class="form-control input-md" name="%s" placeholder="%s" id="%s">',g.field,g.title,g.field)),e.push("</div>"),e.push("</div>"))}return e.push('<div class="form-group">'),e.push('<div class="col-sm-offset-9 col-sm-3">'),e.push(c('<button type="button" id="btnCloseAvd%s" class="btn btn-default" >%s</button>',"_"+d.options.idTable,b)),e.push("</div>"),e.push("</div>"),e.push("</form>"),e};a.extend(a.fn.bootstrapTable.defaults,{advancedSearch:!1,idForm:"advancedSearch",actionForm:"",idTable:void 0,onColumnAdvancedSearch:function(){return!1}}),a.extend(a.fn.bootstrapTable.defaults.icons,{advancedSearchIcon:"glyphicon-chevron-down"}),a.extend(a.fn.bootstrapTable.Constructor.EVENTS,{"column-advanced-search.bs.table":"onColumnAdvancedSearch"}),a.extend(a.fn.bootstrapTable.locales,{formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}}),a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales);var f=a.fn.bootstrapTable.Constructor,g=f.prototype.initToolbar,h=f.prototype.load,i=f.prototype.initSearch;f.prototype.initToolbar=function(){if(g.apply(this,Array.prototype.slice.apply(arguments)),this.options.search&&this.options.advancedSearch&&this.options.idTable){var a=this,b=[];b.push(c('<div class="columns columns-%s btn-group pull-%s" role="group">',this.options.buttonsAlign,this.options.buttonsAlign)),b.push(c('<button class="btn btn-default%s" type="button" name="advancedSearch" aria-label="advanced search" title="%s">',void 0===a.options.iconSize?"":" btn-"+a.options.iconSize,a.options.formatAdvancedSearch())),b.push(c('<i class="%s %s"></i>',a.options.iconsPrefix,a.options.icons.advancedSearchIcon)),b.push("</button></div>"),a.$toolbar.prepend(b.join("")),a.$toolbar.find('button[name="advancedSearch"]').off("click").on("click",function(){d(a.columns,a.options.formatAdvancedSearch(),a.options.formatAdvancedCloseButton(),a)})}},f.prototype.load=function(){if(h.apply(this,Array.prototype.slice.apply(arguments)),this.options.advancedSearch&&"undefined"!=typeof this.options.idTable&&!b){var c=parseInt(a(".bootstrap-table").height());c+=10,a("#"+this.options.idTable).bootstrapTable("resetView",{height:c}),b=!0}},f.prototype.initSearch=function(){if(i.apply(this,Array.prototype.slice.apply(arguments)),this.options.advancedSearch){var b=this,c=a.isEmptyObject(this.filterColumnsPartial)?null:this.filterColumnsPartial;this.data=c?a.grep(this.data,function(d,e){for(var f in c){var g=c[f].toLowerCase(),h=d[f];if(h=a.fn.bootstrapTable.utils.calculateObjectValue(b.header,b.header.formatters[a.inArray(f,b.header.fields)],[h,d,e],h),-1===a.inArray(f,b.header.fields)||"string"!=typeof h&&"number"!=typeof h||-1===(h+"").toLowerCase().indexOf(g))return!1}return!0}):this.data}},f.prototype.onColumnAdvancedSearch=function(b){var c=a.trim(a(b.currentTarget).val()),d=a(b.currentTarget)[0].id;a.isEmptyObject(this.filterColumnsPartial)&&(this.filterColumnsPartial={}),c?this.filterColumnsPartial[d]=c:delete this.filterColumnsPartial[d],this.options.pageNumber=1,this.onSearch(b),this.updatePagination(),this.trigger("column-advanced-search",d,c)}}(jQuery);
@@ -1,14 +1,14 @@
 {
-    "/js/build/vue.js": "/js/build/vue.js?id=e6804371942215bd1d7d",
+    "/js/build/vue.js": "/js/build/vue.js?id=25049a0c0eb736e1c883",
    "/css/AdminLTE.css": "/css/AdminLTE.css?id=b8be19a285eaf44eec37",
    "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
    "/css/overrides.css": "/css/overrides.css?id=1bdafb06a8609780f546",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=3b3d417664a61dcce3e9",
+    "/js/build/vue.js.map": "/js/build/vue.js.map?id=6b79d08f1decca72957c",
    "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6",
    "/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
    "/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
    "/css/dist/all.css": "/css/dist/all.css?id=3a8aa974e7b09b52b18c",
-    "/js/dist/all.js": "/js/dist/all.js?id=88f08e0103b14f7949b3",
+    "/js/dist/all.js": "/js/dist/all.js?id=722d1692756a30dc1ece",
    "/css/build/all.css": "/css/build/all.css?id=3a8aa974e7b09b52b18c",
-    "/js/build/all.js": "/js/build/all.js?id=88f08e0103b14f7949b3"
+    "/js/build/all.js": "/js/build/all.js?id=722d1692756a30dc1ece"
 }
@@ -13,7 +13,7 @@ tr {
                    <label for="import-type">Import Type:</label>
                </div>
                <div class="col-md-4 col-xs-12">
-                    <select2 :options="options.importTypes" v-model="options.importType">
+                    <select2 :options="options.importTypes" v-model="options.importType" required>
                        <option disabled value="0"></option>
                    </select2>
                </div>
@@ -60,7 +60,14 @@ tr {
        <td>
            <button type="button" class="btn btn-sm btn-default" @click="processDetail = false">Cancel</button>
            <button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
-            <div class="alert alert-success col-md-5 col-md-offset-1" style="text-align:left" v-if="statusText">{{ this.statusText }}</div>
+            <div 
+                class="alert col-md-5 col-md-offset-1"
+                :class="alertClass"
+                style="text-align:left"
+                v-if="statusText"
+            >
+                {{ this.statusText }}
+            </div>
        </td>
    </tr>
 </template>
@@ -73,6 +80,7 @@ tr {
                activeFile: this.file,
                processDetail: false,
                statusText: null,
+                statusType: null,
                options: {
                    importType: this.file.import_type,
                    update: false,
@@ -151,10 +159,33 @@ tr {
                        return this.columnOptions.general.concat(this.columnOptions.users);
                }
                return this.columnOptions.general;
+            },
+            alertClass() {
+                if(this.statusType=='success') {
+                    return 'alert-success';
+                }
+                if(this.statusType=='error') {
+                    return 'alert-danger';
+                }
+                return 'alert-info';
+            },
+        },
+        watch: {
+            columns() {
+                console.log("CHANGED");
+                this.populateSelect2ActiveItems();
            }
        },
        methods: {
            postSave() {
+                console.log('saving');
+                console.log(this.options.importType);
+                if(!this.options.importType) {
+                    this.statusType='error';
+                    this.statusText= "An import type is required... ";
+                    return;
+                }
+                this.statusType='pending';
                this.statusText = "Processing...";
                this.$http.post(route('api.imports.importFile', this.file.id), {
                    'import-update': this.options.update,
@@ -162,12 +193,14 @@ tr {
                    'column-mappings': this.columnMappings
                }).then( ({body}) => {
                    // Success
+                    this.statusType="success";
                    this.statusText = "Success... Redirecting.";
                    window.location.href = body.messages.redirect_url;
                }, ({body}) => {
                    // Failure
                    if(body.status == 'import-errors') {
                        window.eventHub.$emit('importErrors', body.messages);
+                        this.statusType='error';
                        this.statusText = "Error";
                    } else {
                        this.$emit('alert', {
@@ -188,7 +221,9 @@ tr {
                    // Then, for any values that have a likely match, we make that active.
                    for(var j=0; j < this.columns.length; j++) {
                        let column = this.columns[j];
-                        let index = this.file.header_row.indexOf(column.text)
+                        let lower = this.file.header_row.map((value) => value.toLowerCase());
+                        console.dir(lower);
+                        let index = lower.indexOf(column.text.toLowerCase())
                        if(index != -1) {
                            this.$set(this.columnMappings, this.file.header_row[index], column.id)
                        }
@@ -11,15 +11,17 @@

 Create a Button looking like this:

- <a href='{{ route('modal.user') }}' data-toggle="modal"  data-target="#createModal" data-dependency="user" data-select='assigned_to' class="btn btn-sm btn-default">New</a>
+ <a href='{{ route('modal.user') }}' data-toggle="modal"  data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-default">New</a>

 If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href'

 data-toggle="modal" - required for Bootstrap Modals
 data-target="#createModal" - fixed ID for the modal, do not change
- data-dependency="user" - which Snipe-IT model you're going to be creating.
 data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library!
 class="btn btn-sm btn-default" - makes it look button-ey, feel free to change :)
+ 
+ If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href
+ 
 */

 $(function () {
@@ -44,40 +46,22 @@


  $('#createModal').on('click','#modal-save', function () {
-    var data = {};
-    //console.warn("We are about to SAVE!!! for model: "+model+" and select ID: "+select);
-    $('.modal-body input:visible').each(function (index, elem) {
-        var bits = elem.id.split("-");
-        if (bits[0] === "modal") {
-            data[bits[1]] = $(elem).val();
-        }
-    });
-    //this can probably get replaced with a normal 'serialize' instead
-    $('.modal-body select:visible').each(function (index, elem) {
-        var bits = elem.id.split("-");
-        data[bits[1]] = $(elem).val();
-    });
-
-    data._token = Laravel.csrfToken;
-
    $.ajax({
        type: 'POST',
-        url: baseUrl+ "/api/v1/" + model + "s",
+        url: $('.modal-body form').attr('action'),
        headers: {
            "X-Requested-With": 'XMLHttpRequest',
            "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
        },

-        data: data,
+        data: $('.modal-body form').serialize(),
        success: function (result) {
-            console.dir(result);

            if(result.status == "error") {
                var error_message="";
                for(var field in result.messages) {
                    error_message += "<li>Problem(s) with field <i><strong>" + field + "</strong></i>: " + result.messages[field];
-                    console.dir(result.messages);
-                    console.log('error_messages are: ' + error_message);
+
                }
                $('#modal_error_msg').html(error_message).show();
                return false;
@@ -95,14 +79,11 @@
            // clicked 'add' on to add a new 'thing'
            // this code adds the newly created object to that select
            var selector = document.getElementById(select);
-            console.warn("The selector we should've selecte dis: "+select);
-            console.dir(selector);
+
            if(!selector) {
                return false;
            }

-            console.warn("onChange Selector Thing should've activated? Here's the selector");
-            console.dir(selector);
            selector.options[selector.length] = new Option(name, id);
            selector.selectedIndex = selector.length - 1;
            $(selector).trigger("change");
@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Voer enige aangepaste CSS-oortredings in wat u graag wil gebruik. Moenie die &lt;style&gt;&lt;/style&gt;-etikette insluit nie.',
    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Verstek Geld',
 	'default_eula_text'			=> 'Standaard EULA',
-  'default_language'					=> 'Verstek taal',
+  'default_language'			=> 'Verstek taal',
 	'default_eula_help_text'	=> 'U kan ook aangepaste EULA\'s aan spesifieke batekategorieë assosieer.',
    'display_asset_name'        => 'Wys bate naam',
    'display_checkout_date'     => 'Vertoon Checkout Date',
@@ -91,6 +93,9 @@ return array(
    'qr_text'                   => 'QR Kode Teks',
    'setting'                   => 'omgewing',
    'settings'                  => 'instellings',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
    'site_name'                 => 'Site Naam',
    'slack_botname'             => 'Slack Botname',
    'slack_channel'             => 'Slack Channel',
@@ -85,6 +85,7 @@
    'file_name'				=> 'lêer',
    'file_uploads'			=> 'Lêeroplaaie',
    'generate'				=> 'genereer',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
    'groups'				=> 'groepe',
    'gravatar_email'        => 'Gravatar e-pos adres',
    'history'  			    => 'Geskiedenis',
@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'أدخل أي تخصيصات CSS ترغب في استخدامها. لا تقم باضافة &lt;style&gt;&lt;/style&gt;.',
    'custom_forgot_pass_url'	=> 'رابط مخصص لاعادة تعيين كلمة المرور',
    'custom_forgot_pass_url_help'	=> 'يحل هذا محل الرابط الخاص باعادة تعيين كلمة المرور على شاشة تسجيل الدخول، وهو مفيد لتوجيه الأشخاص إلى وظيفة إعادة تعيين كلمة مرور من خلال LDAP الداخلي أو المستضاف. وهذا سوف يعطل وظيفة إعادة تعيين كلمة مرور المحلية.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'العملة الافتراضية',
 	'default_eula_text'			=> 'اتفاقية ترخيص المستخدم النهائي الافتراضية',
-  'default_language'					=> 'اللغة الافتراضية',
+  'default_language'			=> 'اللغة الافتراضية',
 	'default_eula_help_text'	=> 'يمكنك أيضا ربط (اتفاقية ترخيص المستخدم) لاصناف محددة من الاصول.',
    'display_asset_name'        => 'عرض اسم مادة العرض',
    'display_checkout_date'     => 'عرض تاريخ الخروج',
@@ -91,6 +93,9 @@ return array(
    'qr_text'                   => 'نص رمز الاستجابة السريعة',
    'setting'                   => 'ضبط',
    'settings'                  => 'إعدادات',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
    'site_name'                 => 'اسم الموقع',
    'slack_botname'             => 'سلاك بوتنام',
    'slack_channel'             => 'قناة سلاك',
@@ -85,6 +85,7 @@
    'file_name'				=> 'ملف',
    'file_uploads'			=> 'تحميلات الملفات',
    'generate'				=> 'توفير',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
    'groups'				=> 'المجموعات',
    'gravatar_email'        => 'البريد الإلكتروني لخدمة Gravatar',
    'history'  			    => 'الأرشيف',
@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Включете вашите CSS правила тук. Не използвайте &lt;style&gt;&lt;/style&gt; тагове.',
    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Валута по подразбиране',
 	'default_eula_text'			=> 'EULA по подразбиране',
-  'default_language'					=> 'Език по подразбиране',
+  'default_language'			=> 'Език по подразбиране',
 	'default_eula_help_text'	=> 'Можете да асоциирате специфична EULA към всяка избрана категория.',
    'display_asset_name'        => 'Визуализиране на актив',
    'display_checkout_date'     => 'Визуализиране на дата на изписване',
@@ -91,6 +93,9 @@ return array(
    'qr_text'                   => 'Съдържание на QR код',
    'setting'                   => 'Настройка',
    'settings'                  => 'Настройки',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
    'site_name'                 => 'Име на системата',
    'slack_botname'             => 'Име на Slack bot',
    'slack_channel'             => 'Slack канал',
@@ -85,6 +85,7 @@
    'file_name'				=> 'Файл',
    'file_uploads'			=> 'Качени файлове',
    'generate'				=> 'Генериране',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
    'groups'				=> 'Групи',
    'gravatar_email'        => 'Gravatar email адрес',
    'history'  			    => 'История',
@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Zadejte libovolné vlastní CSS, které chcete použít. Nezahrnujte &lt;style&gt;&lt;/style&gt; tagy.',
    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Výchozí měna',
 	'default_eula_text'			=> 'Výchozí EULA',
-  'default_language'					=> 'Výchozí jazyk',
+  'default_language'			=> 'Výchozí jazyk',
 	'default_eula_help_text'	=> 'Můžete také spojit vlastní EULA se specifickými kategoriemi majetku.',
    'display_asset_name'        => 'Zobrazit název majetku',
    'display_checkout_date'     => 'Zobrazit den převzetí',
@@ -91,6 +93,9 @@ return array(
    'qr_text'                   => 'Text QR kódu',
    'setting'                   => 'Nastavení',
    'settings'                  => 'Nastavení',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
    'site_name'                 => 'Název stránky',
    'slack_botname'             => 'Slack Botname',
    'slack_channel'             => 'Slack kanál',
@@ -85,6 +85,7 @@
    'file_name'				=> 'Soubor',
    'file_uploads'			=> 'Nahrání souboru',
    'generate'				=> 'Vytvořit',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
    'groups'				=> 'Skupiny',
    'gravatar_email'        => 'Emailová adresa Gravatar',
    'history'  			    => 'Historie',
@@ -25,9 +25,11 @@ return array(
 	'custom_css_help'			=> 'Indtast eventuelle brugerdefinerede CSS overskridelser, du gerne vil bruge. Indsæt ikke de &lt;style&gt;&lt;/style&gt; tags.',
    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Standardvaluta',
 	'default_eula_text'			=> 'Standard EULA',
-  'default_language'					=> 'Standard sprog',
+  'default_language'			=> 'Standard sprog',
 	'default_eula_help_text'	=> 'Du kan også knytte brugerdefinerede EULA til specifikke aktivkategorier.',
    'display_asset_name'        => 'Vis aktivnavn',
    'display_checkout_date'     => 'Vis checkout dato',
@@ -91,6 +93,9 @@ return array(
    'qr_text'                   => 'QR Kode Tekst',
    'setting'                   => 'Indstilling',
    'settings'                  => 'Indstillinger',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
    'site_name'                 => 'Side navn',
    'slack_botname'             => 'Slack Botname',
    'slack_channel'             => 'Slack Channel',
@@ -85,6 +85,7 @@
    'file_name'				=> 'Fil',
    'file_uploads'			=> 'Filoverførsel',
    'generate'				=> 'Skab',
+     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
    'groups'				=> 'Grupper',
    'gravatar_email'        => 'Gravatar email addresse',
    'history'  			    => 'Historik',
@@ -10,7 +10,7 @@ return array(
    'create'  							=> 'Zubehör anlegen',
    'edit'  							=> 'Zubehör bearbeiten',
    'eula_text'							=> 'Kategorie EULA',
-    'eula_text_help'					=> 'Dieses Feld erlaubt Ihnen, die EULA an Ihren Bedürfnisse je nach Asset-Typ anzupassen. Wenn Sie nur eine EULA für alle Assets haben, aktivieren Sie die Checkbox unterhalb, um die Standard EULA zu verwenden.',
+    'eula_text_help'					=> 'Dieses Feld erlaubt Ihnen, die EULA je nach Asset-Typ an Ihre Bedürfnisse anzupassen. Wenn Sie nur eine EULA für alle Assets haben, aktivieren Sie die Checkbox unterhalb, um die Standard-EULA zu verwenden.',
    'require_acceptance'				=> 'Benutzer müssen die Annahme von Assets in dieser Kategorie bestätigen.',
    'no_default_eula'					=> 'Keine Standard-EULA gefunden. Bitte fügen Sie eine EULA in den Einstellungen hinzu.',
    'total'  							=> 'Gesamt',
@@ -22,14 +22,14 @@ return array(
    ),

     'checkout' => array(
-        'error'   		=> 'Zubehör konnte nicht ausgebucht werden, bitte versuchen Sie es erneut',
-        'success' 		=> 'Zubehör erfolgreich ausgebucht.',
+        'error'   		=> 'Zubehör konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut',
+        'success' 		=> 'Zubehör erfolgreich herausgegeben.',
        'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.'
    ),

    'checkin' => array(
-        'error'   		=> 'Das Zubehör wurde nicht erfolgreich eingebucht, bitte versuchen Sie es erneut',
-        'success' 		=> 'Zubehör erfolgreich eingebucht.',
+        'error'   		=> 'Das Zubehör wurde nicht erfolgreich zurückgenommen. Bitte versuchen Sie es erneut',
+        'success' 		=> 'Zubehör erfolgreich zurückgenommen.',
        'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.'
    )

@@ -5,7 +5,7 @@ return array(
    'about_categories'  				=> 'Kategorien helfen Ihnen beim Organisieren von Assets. Beispielkategorien sind &quot;PCs&quot;, &quot;Laptops&quot;, &quot;Mobiltelefone&quot;, &quot;Tablets&quot; usw., jedoch können Sie Kategorien nutzen, wie Sie es für sinnvoll erachten.',
    'asset_categories' 					=> 'Asset-Kategorien',
    'category_name'  					=> 'Kategoriename',
-    'checkin_email'                     => 'Dem Nutzer beim Einbuchen eine Mail zusenden.',
+    'checkin_email'                     => 'Dem Nutzer beim Zurücknehmen eine Mail zusenden.',
    'clone'                             => 'Kategorie duplizieren',
    'create'  							=> 'Kategorie erstellen',
    'edit'                              => 'Kategorie bearbeiten',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	a3240da707	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-20 07:47:54 -08:00
snipe	a28fee1ff4	Bumped hash	2018-01-20 07:47:07 -08:00
snipe	57e5af2f69	Removed console logging from JS	2018-01-20 07:42:48 -08:00
snipe	8d3a214475	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-20 04:56:36 -08:00
snipe	58eedce6fe	Updated language files	2018-01-20 04:53:04 -08:00
snipe	f91704a372	Added Ukrianian to language dropdown	2018-01-20 04:49:40 -08:00
snipe	f53c68e040	Bumped hash	2018-01-20 04:40:26 -08:00
snipe	99e55f84f0	Fixed misc UI permissions elements	2018-01-20 04:39:31 -08:00
snipe	798ea75f3d	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-20 04:00:26 -08:00
snipe	913e6a5709	Bumped hash	2018-01-20 03:59:42 -08:00
snipe	34f6d5ab45	Fixed #4671 - corrected component checkin gate	2018-01-20 03:58:59 -08:00
snipe	86c0194e9a	Fixed #4628 and #4590 - Illegal mix of collations for operation error when searching on some languages	2018-01-20 03:08:27 -08:00
Brady Wetherington	dfb2b9b569	Major overhaul for modals, and a fix for #4820 (#4866 ) Changes how the various modals work, and allows for specifying category_type when inline-creating categories.	2018-01-20 00:42:29 -08:00
snipe	7fae380ab6	Fixed #4300 - Fix for illegal character type in action log	2018-01-20 00:27:45 -08:00
snipe	4ca8272efc	Merge branch 'develop'	2018-01-20 00:21:03 -08:00
snipe	5d4bbc393e	Fixed #4837 - link phone numbers	2018-01-20 00:20:45 -08:00
snipe	984275ff05	Merge branch 'develop'	2018-01-19 23:47:54 -08:00
snipe	e6f70f2ab7	Fixed #4821 - add username to user selection dropdown	2018-01-19 23:47:37 -08:00
snipe	f7de252f67	Wrong branch. :(	2018-01-19 23:46:42 -08:00
snipe	532b299c40	Fixed #4821 - add username to user selection dropdown	2018-01-19 23:46:12 -08:00
snipe	5dcc63dc74	Merge branch 'develop'	2018-01-19 20:49:20 -08:00
snipe	6eb8acf319	Swich to panel box for dashboard message	2018-01-19 20:49:02 -08:00
snipe	862251ab36	Change label to stale	2018-01-19 20:45:25 -08:00
snipe	95a9742571	Fixed #4768 - adds dashboard message option to settings	2018-01-19 20:43:55 -08:00
snipe	81d0921782	Merge branch 'develop'	2018-01-19 19:18:43 -08:00
snipe	0fa556da1d	Exempt ready for dev and bounty tags from stale collection	2018-01-19 19:16:35 -08:00
snipe	05bc238c9a	Merge branch 'develop'	2018-01-19 18:17:38 -08:00
snipe	782813ab49	Check for valid category before checking acceptance	2018-01-19 18:17:23 -08:00
snipe	cbca126d9d	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-19 17:53:15 -08:00
snipe	a9ffe8d210	Bumped hash	2018-01-19 17:52:40 -08:00
snipe	c242abb42e	Added Company policy to fix company deletion issue	2018-01-19 17:51:28 -08:00
snipe	2c722ffc4f	Fixed issue template with correct path to storage logs	2018-01-19 16:31:01 -08:00
snipe	484c47cef8	Added stale.yml to auto-close stale issues	2018-01-19 16:23:28 -08:00
snipe	f38dc37152	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-17 19:31:09 -08:00
snipe	6133f09056	Bumped hash	2018-01-17 19:30:31 -08:00
snipe	2a959edeba	Added - Setting to allow archived assets in List All	2018-01-17 19:18:48 -08:00
snipe	8995d689b8	Fixed #4817 - [BREAKING API CHANGE] - changed user API response from firstname, lastname to first_name, last_name	2018-01-17 13:25:11 -08:00
snipe	f08bec6c78	Merge branch 'develop'	2018-01-17 13:12:58 -08:00
snipe	d920d91786	Fixed #4593 - do not require model_id to update asset custom fields via API	2018-01-17 13:12:32 -08:00
snipe	e35b3745eb	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-17 12:41:51 -08:00
snipe	e8252d9468	Bumped hash	2018-01-17 12:41:11 -08:00
snipe	8fff6a1a06	Update asset location based on user checkout in bulk checkout	2018-01-17 12:39:49 -08:00
snipe	0eff821928	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-17 12:12:33 -08:00
snipe	9e605e0f79	Bumped hash	2018-01-17 12:11:39 -08:00
snipe	8fb991110e	Fixed #4652 - asset not correctly checking out to user on creation	2018-01-17 12:10:28 -08:00
snipe	b383ebee48	Add @fordster78 as a contributor	2018-01-17 10:59:00 -08:00
fordster78	138313dcb9	Setup changes (#4813 ) * Add Asset Tag settings to Setup * Add Locale Settings to Setup * Add multiple company support to setup * Changed the locale label name from 'site_name' to locale Added default value for language to 'en' and multiple companies support to 0 (false) Switched out the old Input facade to the preferred $request->input method for the setup page.	2018-01-17 10:58:03 -08:00
snipe	f254958db9	Check if db_column foield already exists	2018-01-17 06:48:14 -08:00
snipe	09eff88679	Merge branch 'develop'	2018-01-17 06:28:11 -08:00
snipe	24b356dba4	Fixed typos in default blade that cause components to not show up for non-superadmins	2018-01-17 06:27:23 -08:00
snipe	91bca5fcba	Fixed #4844 - use input value for ids in user bulk edit	2018-01-17 06:15:52 -08:00
vcordes79	96a469db36	allow changing user activated field via api (#4843 )	2018-01-17 05:38:10 -08:00
snipe	9ab05e7037	Add @vcordes79 as a contributor	2018-01-17 05:36:15 -08:00
vcordes79	52a99faf68	fix phone number update in api (#4842 )	2018-01-17 05:33:55 -08:00
vcordes79	94cf1f8741	Fixes #4829 - add fields api (#4840 ) * add fields api * change route names	2018-01-17 05:31:57 -08:00
snipe	e2a8f9b790	Merge branch 'develop'	2018-01-17 03:27:03 -08:00
snipe	409f5cc4fd	Added - display asset model category on hardware view page	2018-01-16 16:26:24 -08:00
snipe	3b5e4c44eb	Fixed depreciation report not showing assigned to	2018-01-16 07:46:34 -08:00
snipe	69a7ea63e2	Pass nopages to dashboard stuff	2018-01-16 07:37:20 -08:00
snipe	aac379daeb	If nopages is passed, hide page numbers This seems weird since we’re checking for a negative, but there are only a few spots where we wouldn’t want page numbers, namely the dashboard sruff	2018-01-16 07:37:06 -08:00
snipe	1d3472b5c4	Truncate the checkout_requests field on seed	2018-01-16 07:36:14 -08:00
snipe	66a590b774	Account for user’s that have been deleted in the requested list	2018-01-16 07:36:03 -08:00
snipe	dc4472e9e9	Misc export table fixes	2018-01-15 21:03:46 -08:00
snipe	6bfd428c2e	Use real status label names, even if deployed	2018-01-15 21:03:26 -08:00
snipe	f4623bd277	Add user group membership to user view page	2018-01-15 20:31:10 -08:00
snipe	1f04d7aafd	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-11 15:27:17 -08:00
snipe	78efeec368	Bumped hash	2018-01-11 15:24:37 -08:00
snipe	5b15a2fc0a	Merge branch 'develop'	2018-01-11 15:23:27 -08:00
snipe	68f1fa0340	Added - ability to sort by asset count in models	2018-01-11 15:21:51 -08:00
snipe	9293f17707	Moved search scope lower to fix weird (possible Laravel) bug w/prepared statements	2018-01-11 15:17:34 -08:00
snipe	a4b32e2328	Improved - use presenters on model detail	2018-01-11 15:17:10 -08:00
snipe	d109ca30e2	Improved - allow searching on most detail views with additional tables	2018-01-11 15:16:53 -08:00
snipe	3b4a651dd9	Allow counts in mfg sorting	2018-01-11 15:16:23 -08:00
snipe	a4ac53e2e9	Improved - Using presenters for column headers in location detail	2018-01-11 15:16:09 -08:00
snipe	cf1b5a7685	Added- sort by count in manufacturer listing	2018-01-11 15:13:32 -08:00
snipe	0789eb8b07	Improved - using presenters for column headers in manufacturer detail	2018-01-11 15:12:48 -08:00
snipe	7f674fdd35	Require implicit search	2018-01-11 13:18:06 -08:00
snipe	500aa37e3c	Fixed switchable attributes on table headers	2018-01-11 13:17:55 -08:00
snipe	efe668d26d	Merge branch 'develop' # Conflicts: # config/version.php	2018-01-10 22:59:02 -08:00
snipe	90db97b980	Merge branch 'features/fixes_4792_ajax_tables_on_license_view' into develop	2018-01-10 22:57:44 -08:00
snipe	bc3d27fac6	Bumped hash	2018-01-10 22:57:22 -08:00
snipe	55b9f1207d	Updated bootstrap tables	2018-01-10 22:53:54 -08:00
snipe	2bbb6001a8	Added location to seats transformer	2018-01-10 20:36:27 -08:00
snipe	af7b7664c5	Added license seat location method	2018-01-10 20:34:44 -08:00
snipe	c31362655c	Refactored BS tables include for clearer separation of simple v not simple	2018-01-10 20:34:36 -08:00
snipe	c6a956382f	Fixed #4784 - cookie not always being set correctly for ajax tables	2018-01-10 20:04:41 -08:00
snipe	bab0bda174	Added custom formatter for license seats (WIP)	2018-01-10 18:58:55 -08:00
snipe	bb52a8417c	Switch view code to AJAX table	2018-01-10 18:58:41 -08:00
snipe	e3d7be23cb	Added new seats controller method	2018-01-10 18:47:57 -08:00
snipe	3d5545494e	Added new seats transformer	2018-01-10 18:47:40 -08:00
snipe	7f1a535b30	Added new seats API route	2018-01-10 18:47:27 -08:00
snipe	254234b0dc	Fixed #4787 - don’t try to display category if it is invalid This shouldn’t be needed, but in case data got weird (manual editing, etc)	2018-01-10 06:33:59 -08:00
snipe	3566f37981	Merge branch 'develop'	2018-01-10 06:25:06 -08:00
snipe	e6259eb6e1	Fixed #4774 - show assets assigned to assets in asset view Todo: Fix text search on the asset to asset tab. It’s currently broken so I’ve disabled it.	2018-01-10 05:44:11 -08:00
snipe	eeb3d1eb42	Use language strings for tab text	2018-01-10 05:42:34 -08:00
snipe	79295f6434	Use dataTableLayout for table	2018-01-10 05:33:45 -08:00
snipe	285e4e2e52	Allow bulk language update in user edit	2018-01-10 05:33:26 -08:00
snipe	5587b64d64	Fixed #4770 - broken licenses, etc on company view, added users and components	2018-01-10 03:52:21 -08:00
snipe	f0f2a5aa67	Workaround for #4784 - make changes tab always visible Not sure why the cookie isn’t cookie-ing	2018-01-10 01:56:24 -08:00
Brady Wetherington	061317866b	Changes to Models in the asset-edit screen maintain chosen values (#4781 ) Fixed for #2195	2018-01-09 23:45:20 -08:00
snipe	65ffc01583	Merge branch 'develop'	2018-01-09 20:19:50 -08:00
snipe	f5f7a63a23	Production assets	2018-01-09 20:19:04 -08:00
snipe	b6a7fd1cec	Run production assets - because modern web development. Sigh.	2018-01-09 20:18:49 -08:00
snipe	6245f92e16	Merge branch 'develop'	2018-01-09 20:12:44 -08:00
snipe	0abab2107c	Fixed #4779 - show selected filename on filepicker	2018-01-09 20:12:07 -08:00
snipe	afc7116260	Fixed #4778 - added notes to asset model view	2018-01-09 20:00:06 -08:00
Geoff Young	0b3d2b46e0	Add attributes to delete asset file button (#4336 ) This adds attributes to the delete file buttons on the View Asset page. The attributes will fill the confirmation modal that prompts users before deleting. They also activate a tooltip on the button.	2018-01-03 17:25:50 -08:00
Brandon Daniel Bailey	f786e07179	Allow auto increment through the API (#4690 ) * Allow auto incrementing asset_id from the API when the setting is enabled * Cleaned up the if else statement * Added prefix to the orWhereRaw which causes a database error if the configuration uses a prefix * Auto incrementing through the API	2018-01-03 17:24:32 -08:00
Daniel Meltzer	b2469bb34f	Fix double create log on import. (#4706 ) * Fix double create log on import. * Fix code error causing component importer to implode. * More component importer oldities	2018-01-03 17:22:02 -08:00
Brandon Daniel Bailey	b721bfcc84	Added prefix to the orWhereRaw which causes a database error if the configuration uses a prefix (#4703 )	2017-12-28 20:09:36 -08:00
Daniel Meltzer	f16ce09a7a	Importer again (#4702 ) * If a user id is provided in the name column of an import, we should assume that it is a user id and check out to it. * Fix build of vue files. The location is public/js/build, not public/build * Ensure a status type is set before allowing submission of an import. Also expand the status text label to change color based on success/failure. Fixes #4658 * Use right key to lookup emails when importing users. Fixes 4619. * Import serial for components, and make unique matches based on the serial as well as the name. Fixes #4569 * Set the location_id when importing an item properly. This moves as well to using the Asset::checkout() method, which should consolidate the logic into a useful spot. Fixes #4563 (I think) * Production assets. * Case insensitive field map guessing and repopulate when changingin import type.	2017-12-28 20:08:45 -08:00
snipe	bbe9df306b	Merge branch 'develop'	2017-12-26 17:33:06 -08:00
snipe	1bd7392531	Account for audits on deleted assets	2017-12-26 17:32:45 -08:00
snipe	2002dfca17	Merge branch 'develop'	2017-12-26 17:13:49 -08:00
snipe	38c2ecbd0c	Fixed migration use	2017-12-26 17:13:26 -08:00
snipe	ce97faa8d4	Merge branch 'develop'	2017-12-26 17:11:40 -08:00
snipe	31ca4bff8c	Break audit date denorm migrations into two separate migrations	2017-12-26 17:11:08 -08:00
snipe	6f9033b2fd	Merge branch 'develop'	2017-12-26 16:49:42 -08:00
snipe	8864f81402	Fixed manufacturer error on printable user page Manufacturer is not required for accessories, so need to account for that	2017-12-26 16:49:01 -08:00
snipe	71ba1af647	Fixed button class on asset view	2017-12-26 16:48:28 -08:00
snipe	b894a4c19a	Merge branch 'develop'	2017-12-20 12:36:45 -08:00
snipe	c3a44f25fd	Fixed #4663 - duplicate manufacturer name in selectlist	2017-12-20 12:32:55 -08:00
snipe	1f36e7997f	Bumped version	2017-12-20 03:31:43 -08:00
snipe	33b5c26da5	Bumped hashcount	2017-12-19 22:16:31 -08:00
snipe	e5a7e6619f	Merge branch 'develop'	2017-12-19 22:15:51 -08:00
snipe	d2e2c1c05f	Stub and 404 registration routes	2017-12-19 22:14:51 -08:00
snipe	557b8b0ded	Merge branch 'develop'	2017-12-19 20:57:46 -08:00
snipe	37d4cf3afb	Fixed #4647 - requestable model button not clickable	2017-12-19 20:48:26 -08:00
snipe	b716db225f	Added “new” buttons for manufacturer and category in asset model creation	2017-12-19 20:30:46 -08:00
snipe	fbe093705d	Fixed #4640 - add username to user detail	2017-12-19 13:42:34 -08:00
snipe	db278e9109	Merge branch 'develop'	2017-12-19 00:48:44 -08:00
snipe	88798435f6	Fixed inefficient query for inventory alerts	2017-12-19 00:32:39 -08:00
snipe	6220f0d8a5	Merge branch 'develop' # Conflicts: # config/version.php	2017-12-15 18:57:21 -08:00
snipe	30716b349b	Bumped dev hash	2017-12-15 18:55:56 -08:00
snipe	7a8c8233a2	Fixes #4639	2017-12-15 18:54:38 -08:00