Skip to content

A free open source IT asset/license management system

Use new livewire component

snipe6beb46f86cf3
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index caf7320db2..2a71213cdd 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -13,11 +13,12 @@
{{-- Page content --}}
@section('content')
-<x-container class="col-md-9">
+<x-container columns="2">
+ <x-page-column class="col-md-7">
- <x-form route="{{ url()->current() }}" id="checkout_form">
+ <x-form route="{{ url()->current() }}" id="checkout_form">
- <x-box header="{{ $accessory->name }}">
+ <x-box header="{{ $accessory->name }}">
@if ($accessory->name)
<x-form.static :label="trans('admin/accessories/general.accessory_name')">{{ $accessory->name }}</x-form.static>
@@ -101,9 +102,13 @@
/>
</x-slot:customfooter>
- </x-box>
+ </x-box>
- </x-form>
+ </x-form>
+
+ </x-page-column>
+
+ <livewire:checkout-target-panel type="accessories" />
</x-container>
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index 8eaf3f2d00..a6453fa30d 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -9,11 +9,12 @@
{{-- Page content --}}
@section('content')
-<x-container class="col-md-9">
+<x-container columns="2">
+ <x-page-column class="col-md-7">
- <x-form route="{{ url()->current() }}" id="checkout_form">
+ <x-form route="{{ url()->current() }}" id="checkout_form">
- <x-box header="{{ $consumable->name }}">
+ <x-box header="{{ $consumable->name }}">
@if ($consumable->name)
<x-form.static :label="trans('admin/consumables/general.consumable_name')">{{ $consumable->name }}</x-form.static>
@@ -98,9 +99,13 @@
/>
</x-slot:customfooter>
- </x-box>
+ </x-box>
- </x-form>
+ </x-form>
+
+ </x-page-column>
+
+ <livewire:checkout-target-panel type="consumables" />
</x-container>
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index 6bb599b12f..d1c1761332 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -157,29 +157,13 @@
</form>
</div> <!--/.col-md-7-->
- <!-- right column -->
- <div class="col-md-5" id="current_assets_box" style="display:none;">
- <div class="box box-primary">
- <div class="box-header with-border">
- <h2 class="box-title">{{ trans('admin/users/general.current_assets') }}</h2>
- </div>
- <div class="box-body">
- <div id="current_assets_content">
- </div>
- </div>
- </div>
- </div>
+ <livewire:checkout-target-panel type="assets" />
</div>
@stop
@section('moar_scripts')
-@include('partials/assets-assigned')
<script nonce="{{ csrf_token() }}">
$(function () {
- //if there's already a user selected, make sure their checked-out assets show up
- // (if there isn't one, it won't do anything)
- $('#assigned_user').change();
-
// Add the disabled attribute to empty inputs on submit to handle the case where someone does not pick a status ID
// and the form is submitted with an empty status ID which will fail validation via the form request
$("form").submit(function() {
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 1a774eb202..a8ec0ef147 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -252,23 +252,11 @@
</div>
</div> <!--/.col-md-7-->
- <!-- right column -->
- <div class="col-md-5" id="current_assets_box" style="display:none;">
- <div class="box box-primary">
- <div class="box-header with-border">
- <h2 class="box-title">{{ trans('admin/users/general.current_assets') }}</h2>
- </div>
- <div class="box-body">
- <div id="current_assets_content">
- </div>
- </div>
- </div>
- </div>
+ <livewire:checkout-target-panel type="assets" />
</div>
@stop
@section('moar_scripts')
- @include('partials/assets-assigned')
<script nonce="{{ csrf_token() }}">
// Per-user localStorage preference for the requestable default on
diff --git a/resources/views/kits/checkout.blade.php b/resources/views/kits/checkout.blade.php
index c3555a09c6..baf34cc1be 100644
--- a/resources/views/kits/checkout.blade.php
+++ b/resources/views/kits/checkout.blade.php
@@ -74,26 +74,10 @@
</form>
</div> <!--/.col-md-7-->
- <!-- right column -->
- <div class="col-md-5" id="current_assets_box" style="display:none;">
- <div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('admin/users/general.current_assets') }}</h3>
- </div>
- <div class="box-body">
- <div id="current_assets_content">
- </div>
- </div>
- </div>
- </div>
+ <livewire:checkout-target-panel type="assets" />
</div>
@stop
-@section('moar_scripts')
-@include('partials/assets-assigned')
-
-@stop
-
@section('notifications')
@parent
<!-- included content -->
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index 37aead0abb..f04fbe5ec0 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -145,21 +145,6 @@
</div> <!-- /.box-->
</form>
</div> <!-- /.col-md-7-->
- <!-- right column -->
- <div class="col-md-5" id="current_license_box" style="display:none;">
- <div class="box box-primary">
- <div class="box-header with-border">
- <h2 class="box-title">{{ trans('admin/users/general.current_items', ['item' => trans('general.licenses')]) }}</h2>
- </div>
- <div class="box-body">
- <div id="current_license_content">
- </div>
- </div>
- </div>
- </div>
+ <livewire:checkout-target-panel type="licenses" />
</div>
-@stop
-
-@section('moar_scripts')
- @include('partials.licenses-assigned')
-@endsection
\ No newline at end of file
+@stop
\ No newline at end of file