From 280c03dcad1561e58bbaabf596acc9e6acad776d Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 20 May 2024 10:25:59 -0700
Subject: [PATCH] remove license checkout changes

---
 .../Licenses/LicenseCheckoutController.php    |   2 -
 resources/views/licenses/checkout.blade.php   | 175 +++++++++---------
 2 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index a9030d63d..7b3ad7e5c 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Licenses;
 
 use App\Events\CheckoutableCheckedOut;
-use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\LicenseCheckoutRequest;
 use App\Models\Accessory;
@@ -12,7 +11,6 @@ use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
 
 class LicenseCheckoutController extends Controller
 {
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index 3bf635073..e85c67742 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -2,8 +2,8 @@
 
 {{-- Page title --}}
 @section('title')
-    {{ trans('admin/licenses/general.checkout') }}
-    @parent
+     {{ trans('admin/licenses/general.checkout') }}
+@parent
 @stop
 
 @section('header_right')
@@ -13,104 +13,105 @@
 
 {{-- Page content --}}
 @section('content')
-    <div class="row">
+<div class="row">
         <!-- left column -->
-        <div class="col-md-7">
-            <form class="form-horizontal" method="post" action="" autocomplete="off">
-                {{csrf_field()}}
+    <div class="col-md-7">
+        <form class="form-horizontal" method="post" action="" autocomplete="off">
+            {{csrf_field()}}
 
-                <div class="box box-default">
-                    <div class="box-header with-border">
-                        <h2 class="box-title"> {{ $license->name }}
-                            ({{ trans('admin/licenses/message.seats_available', ['seat_count' => $license->availCount()->count()]) }}
-                            )</h2>
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h2 class="box-title"> {{ $license->name }} ({{ trans('admin/licenses/message.seats_available', ['seat_count' => $license->availCount()->count()]) }})</h2>
+                </div>
+                <div class="box-body">
+
+
+                    <!-- Asset name -->
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">{{ trans('admin/hardware/form.name') }}</label>
+                        <div class="col-md-9">
+                            <p class="form-control-static">{{ $license->name }}</p>
+                        </div>
                     </div>
-                    <div class="box-body">
-
-
-                        <!-- Asset name -->
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">{{ trans('admin/hardware/form.name') }}</label>
-                            <div class="col-md-9">
-                                <p class="form-control-static">{{ $license->name }}</p>
-                            </div>
-                        </div>
-                        <!-- Category -->
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
-                            <div class="col-md-9">
-                                <p class="form-control-static">{{ $license->category->name }}</p>
-                            </div>
-                        </div>
-
-                        <!-- Serial -->
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
-                            <div class="col-md-9">
-                                <p class="form-control-static" style="word-wrap: break-word;">
-                                    @can('viewKeys', $license)
-                                        {{ $license->serial }}
-                                    @else
-                                        ------------
-                                    @endcan
-                                </p>
-                            </div>
-                        </div>
-
-                        @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'false'])
-
-                        @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_to', 'required'=>'true'])
-
-                        @include ('partials.forms.edit.asset-select', ['translated_name' => trans('admin/licenses/form.asset'), 'fieldname' => 'asset_id', 'style' => 'display:none;'])
-
-
-                        <!-- Note -->
-                        <div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
-                            <label for="note"
-                                   class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
-                            <div class="col-md-8">
-                                <textarea class="col-md-6 form-control" id="notes" name="notes"
-                                          style="width: 100%">{{ old('note') }}</textarea>
-                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                            </div>
+                    <!-- Category -->
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
+                        <div class="col-md-9">
+                            <p class="form-control-static">{{ $license->category->name }}</p>
                         </div>
                     </div>
 
+                    <!-- Serial -->
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
+                        <div class="col-md-9">
+                            <p class="form-control-static" style="word-wrap: break-word;">
+                                @can('viewKeys', $license)
+                                    {{ $license->serial }}
+                                @else
+                                    ------------
+                                @endcan
+                            </p>
+                        </div>
+                    </div>
 
-                    @if ($license->requireAcceptance() || $license->getEula() || ($snipeSettings->webhook_endpoint!=''))
-                        <div class="form-group notification-callout">
-                            <div class="col-md-8 col-md-offset-3">
-                                <div class="callout callout-info">
+                    @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'false'])
 
-                                    @if ($license->requireAcceptance())
-                                        <i class="far fa-envelope"></i>
-                                        {{ trans('admin/categories/general.required_acceptance') }}
-                                        <br>
-                                    @endif
+                    @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_to', 'required'=>'true'])
 
-                                    @if ($license->getEula())
-                                        <i class="far fa-envelope"></i>
-                                        {{ trans('admin/categories/general.required_eula') }}
-                                        <br>
-                                    @endif
+                    @include ('partials.forms.edit.asset-select', ['translated_name' => trans('admin/licenses/form.asset'), 'fieldname' => 'asset_id', 'style' => 'display:none;'])
 
-                                    @if (($license->category) && ($license->category->checkin_email))
-                                        <i class="far fa-envelope"></i>
-                                        {{ trans('admin/categories/general.checkin_email_notification') }}
-                                        <br>
-                                    @endif
 
-                                    @if ($snipeSettings->webhook_endpoint!='')
-                                        <i class="fab fa-slack"></i>
-                                        {{ trans('general.webhook_msg_note') }}
-                                    @endif
-                                </div>
+                    <!-- Note -->
+                    <div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
+                        <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
+                        <div class="col-md-8">
+                            <textarea class="col-md-6 form-control" id="notes" name="notes" style="width: 100%">{{ old('note') }}</textarea>
+                            {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                        </div>
+                    </div>
+                </div>
+
+
+                @if ($license->requireAcceptance() || $license->getEula() || ($snipeSettings->webhook_endpoint!=''))
+                    <div class="form-group notification-callout">
+                        <div class="col-md-8 col-md-offset-3">
+                            <div class="callout callout-info">
+
+                                @if ($license->requireAcceptance())
+                                    <i class="far fa-envelope"></i>
+                                    {{ trans('admin/categories/general.required_acceptance') }}
+                                    <br>
+                                @endif
+
+                                @if ($license->getEula())
+                                    <i class="far fa-envelope"></i>
+                                    {{ trans('admin/categories/general.required_eula') }}
+                                    <br>
+                                @endif
+
+                                @if (($license->category) && ($license->category->checkin_email))
+                                    <i class="far fa-envelope"></i>
+                                    {{ trans('admin/categories/general.checkin_email_notification') }}
+                                    <br>
+                                @endif
+
+                                @if ($snipeSettings->webhook_endpoint!='')
+                                    <i class="fab fa-slack"></i>
+                                    {{ trans('general.webhook_msg_note') }}
+                                @endif
                             </div>
                         </div>
+                    </div>
                 @endif
-                @include ('partials.forms.redirect_submit_options', ['translated_name' => trans('admin/licenses/form.asset'), 'table_name' => $table_name, 'type' => $license->name])
-            </form>
-        </div> <!-- /.col-md-7-->
-    </div>
+
+                <div class="box-footer">
+                    <a class="btn btn-link" href="{{ route('licenses.index') }}">{{ trans('button.cancel') }}</a>
+                    <button type="submit" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button>
+                </div>
+            </div> <!-- /.box-->
+        </form>
+    </div> <!-- /.col-md-7-->
+</div>
 
 @stop