Merge fecee69de6 into 64f49afce1

app/Http/Controllers/Api/AssetsController.php

@@ -556,7 +556,12 @@ class AssetsController extends Controller
             'assets.assigned_to',
             'assets.assigned_type',
             'assets.status_id',
-        ])->with('model', 'assetstatus', 'assignedTo')->NotArchived();
+        ])->with('model', 'assetstatus', 'assignedTo')
+            ->NotArchived();
+
+        if ((Setting::getSettings()->full_multiple_companies_support=='1') &&  ($request->filled('companyId'))) {
+            $assets->where('assets.company_id', $request->input('companyId'));
+        }
 
         if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
             $assets = $assets->RTD();
@@ -566,7 +571,6 @@ class AssetsController extends Controller
             $assets = $assets->AssignedSearch($request->input('search'));
         }
 
-
         $assets = $assets->paginate(50);
 
         // Loop through and set some custom properties for the transformer to use.

app/Http/Controllers/Api/ConsumablesController.php

@@ -40,7 +40,7 @@ class ConsumablesController extends Controller
         }
 
         if ($request->filled('company_id')) {
-            $consumables->where('company_id', '=', $request->input('company_id'));
+            $consumables->where('consumables.company_id', '=', $request->input('company_id'));
         }
 
         if ($request->filled('category_id')) {

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=65d7af7b9fa7fd0e05737526a0d1d282",
+    "/js/build/app.js": "/js/build/app.js?id=e03cda01c82f4c5a18a0ce4ccd7ee4d5",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=06c13e817cc022028b3f4a33c0ca303a",
     "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=79aa889a1a6691013be6c342ca7391cd",
     "/css/build/overrides.css": "/css/build/overrides.css?id=6528155ed5ed8fddf4047de7f0d0298d",
@@ -111,5 +111,5 @@
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=ceded08e0cc745a83c13647035b03406",
     "/js/build/vendor.js": "/js/build/vendor.js?id=89dffa552c6e3abe3a2aac6c9c7b466b",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=61285c8ac5ea7b46002ea8c451c94e60",
-    "/js/dist/all.js": "/js/dist/all.js?id=21e041dec60e0785db6d64961b13a9b0"
+    "/js/dist/all.js": "/js/dist/all.js?id=27ea1d91dc20808bc6e09e8c739c4e00"
 }

resources/assets/js/snipeit.js

@@ -198,6 +198,7 @@ $(function () {
                         search: params.term,
                         page: params.page || 1,
                         assetStatusType: link.data("asset-status-type"),
+                        companyId: link.data("company-id"),
                     };
                     return data;
                 },

resources/views/accessories/checkout.blade.php

@@ -39,7 +39,18 @@
           </div>
           @endif
 
-          @if ($accessory->category)
+         @if ($accessory->company)
+             <!-- accessory name -->
+             <div class="form-group">
+                 <label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
+                 <div class="col-md-6">
+                     <p class="form-control-static">{{ $accessory->company->name }}</p>
+                 </div>
+             </div>
+         @endif
+
+
+         @if ($accessory->category)
           <!-- accessory name -->
           <div class="form-group">
             <label class="col-sm-3 control-label">{{ trans('admin/accessories/general.accessory_category') }}</label>
@@ -71,7 +82,9 @@
              @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
              @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_user'])
              <!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
-             @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;'])
+
+             @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'assigned_asset', 'company_id' => $accessory->company_id, 'unselect' => 'true', 'style' => 'display:none;'])
+
              @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;'])
 
 

resources/views/components/checkout.blade.php

@@ -26,14 +26,14 @@
 
         <div class="box-body">
           <!-- Asset -->
-            @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'asset_id'])
+            @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'asset_id', 'company_id' => $component->company_id])
 
             <div class="form-group {{ $errors->has('assigned_qty') ? ' has-error' : '' }}">
               <label for="assigned_qty" class="col-md-3 control-label">
                 {{ trans('general.qty') }}
               </label>
               <div class="col-md-2 col-sm-5 col-xs-5">
-                <input class="form-control required col-md-12" type="text" name="assigned_qty" id="assigned_qty" value="{{ old('assigned_qty') ?? 1 }}" maxlength="999999" />
+                <input class="form-control required col-md-12" type="text" name="assigned_qty" id="assigned_qty" value="{{ old('assigned_qty') ?? 1 }}" maxlength="99999" />
               </div>
               @if ($errors->first('assigned_qty'))
                 <div class="col-md-9 col-md-offset-3">

resources/views/partials/forms/edit/asset-select.blade.php

@@ -3,7 +3,18 @@
      class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
     <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="col-md-7">
-        <select class="js-data-ajax select2" data-endpoint="hardware" data-placeholder="{{ trans('general.select_asset') }}" aria-label="{{ $fieldname }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}>
+        <select class="js-data-ajax select2"
+                data-endpoint="hardware"
+                data-placeholder="{{ trans('general.select_asset') }}"
+                aria-label="{{ $fieldname }}"
+                name="{{ $fieldname }}"
+                style="width: 100%"
+                id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"
+                {{ (isset($multiple)) ? ' multiple' : '' }}
+                {!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}
+                {!! (!empty($company_id)) ? ' data-company-id="' .$company_id.'"'  : '' !!}
+                {{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}
+        >
 
             @if ((!isset($unselect)) && ($asset_id = old($fieldname, (isset($asset) ? $asset->id  : (isset($item) ? $item->{$fieldname} : '')))))
                 <option value="{{ $asset_id }}" selected="selected" role="option" aria-selected="true"  role="option">