From 1af7cdb715776d6bfed05d37457f93876f0017f2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 3 Apr 2023 22:35:55 -0700
Subject: [PATCH] Wrapped the image delete into the existing image upload
 partial

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/edit.blade.php    | 21 +-------
 resources/views/categories/edit.blade.php     | 48 +++++--------------
 resources/views/companies/edit.blade.php      | 20 +-------
 resources/views/components/edit.blade.php     | 22 +--------
 resources/views/consumables/edit.blade.php    | 23 +--------
 resources/views/departments/edit.blade.php    | 22 +--------
 resources/views/hardware/edit.blade.php       | 22 ++-------
 resources/views/locations/edit.blade.php      | 21 +-------
 resources/views/manufacturers/edit.blade.php  | 14 +-----
 resources/views/models/edit.blade.php         | 21 +-------
 .../forms/edit/image-upload.blade.php         | 19 ++++++++
 resources/views/suppliers/edit.blade.php      | 21 +-------
 resources/views/users/edit.blade.php          | 24 ++--------
 13 files changed, 46 insertions(+), 252 deletions(-)

diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index 532336182b..b3ff55d419 100644
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -22,26 +22,7 @@
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
 @include ('partials.forms.edit.notes')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('accessories_upload_path')])
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url(app('accessories_upload_path').e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
 
 @stop
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 3d24650a73..491a40965d 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -39,20 +39,17 @@
 
 <!-- Use default checkbox -->
 <div class="form-group">
-    <div class="col-md-3">
-    </div>
-    <div class="col-md-9">
+    <div class="col-md-9 col-md-offset-3">
         @if ($snipeSettings->default_eula_text!='')
-            <label for="use_default_eula">
-            {{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['class'=>'minimal', 'aria-label'=>'use_default_eula']) }}
+            <label class="form-control">
+            {{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['aria-label'=>'use_default_eula']) }}
             {!! trans('admin/categories/general.use_default_eula') !!}
             </label>
         @else
-            <div class="icheckbox disabled">
-                <label for="use_default_eula">
-                {{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled minimal','disabled' => 'disabled', 'aria-label'=>'use_default_eula']) }}
+            <label class="form-control form-control--disabled">
+                {{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled','disabled' => 'disabled', 'aria-label'=>'use_default_eula']) }}
                 {!! trans('admin/categories/general.use_default_eula_disabled') !!}
-                </label>
+            </label>
             </div>
         @endif
     </div>
@@ -61,11 +58,9 @@
 
 <!-- Require Acceptance -->
 <div class="form-group">
-    <div class="col-md-3">
-    </div>
-    <div class="col-md-9">
-        <label for="require_acceptance">
-        {{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['class'=>'minimal', 'aria-label'=>'require_acceptance']) }}
+    <div class="col-md-9 col-md-offset-3">
+        <label class="form-control">
+        {{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['aria-label'=>'require_acceptance']) }}
         {{ trans('admin/categories/general.require_acceptance') }}
         </label>
     </div>
@@ -75,35 +70,16 @@
 <!-- Email on Checkin -->
 <div class="form-group">
     <div class="col-md-9 col-md-offset-3">
-        <label for="checkin_email">
-        {{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['class'=>'minimal','aria-label'=>'checkin_email']) }}
+        <label class="form-control">
+        {{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['aria-label'=>'checkin_email']) }}
         {{ trans('admin/categories/general.checkin_email') }}
         </label>
     </div>
 </div>
 
 
+@include ('partials.forms.edit.image-upload', ['image_path' => app('categories_upload_path')])
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url(app('companies_upload_path').e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
 
 @stop
 
diff --git a/resources/views/companies/edit.blade.php b/resources/views/companies/edit.blade.php
index 0023ce2891..6896cee972 100644
--- a/resources/views/companies/edit.blade.php
+++ b/resources/views/companies/edit.blade.php
@@ -9,24 +9,6 @@
 {{-- Page content --}}
 @section('inputFields')
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/companies/table.name')])
+@include ('partials.forms.edit.image-upload', ['image_path' => app('companies_upload_path')])
 
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url(app('companies_upload_path').e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
 @stop
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
index 6ab7ca40ac..1567ec5a80 100644
--- a/resources/views/components/edit.blade.php
+++ b/resources/views/components/edit.blade.php
@@ -20,28 +20,8 @@
 @include ('partials.forms.edit.order_number')
 @include ('partials.forms.edit.purchase_date')
 @include ('partials.forms.edit.purchase_cost')
-
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url(app('components_upload_path').e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
 @include ('partials.forms.edit.notes')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('components_upload_path')])
 
-@include ('partials.forms.edit.image-upload')
 
 @stop
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
index 83212bb148..6217aab3f1 100644
--- a/resources/views/consumables/edit.blade.php
+++ b/resources/views/consumables/edit.blade.php
@@ -21,27 +21,6 @@
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
 @include ('partials.forms.edit.notes')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('consumables_upload_path')])
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url(app('consumables_upload_path').e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-
-
-@include ('partials.forms.edit.image-upload')
 @stop
diff --git a/resources/views/departments/edit.blade.php b/resources/views/departments/edit.blade.php
index d345bcc97e..9e6fd40e80 100644
--- a/resources/views/departments/edit.blade.php
+++ b/resources/views/departments/edit.blade.php
@@ -16,33 +16,13 @@
         <input id="hidden_company_id" type="hidden" name="company_id" value="{{ Auth::user()->company_id }}">
     @endif
 
-
     <!-- Manager -->
     @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])
 
     <!-- Location -->
     @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
+    @include ('partials.forms.edit.image-upload', ['image_path' => app('departments_upload_path')])
 
-    <!-- Image -->
-    @if (($item->image) && ($item->image!=''))
-        <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-            <div class="col-md-9 col-md-offset-3">
-                <label for="image_delete">
-                    {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
-                    {{ trans('general.image_delete') }}
-                    {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-                </label>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-9 col-md-offset-3">
-                <img src="{{ Storage::disk('public')->url(app('departments_upload_path').e($item->image)) }}" class="img-responsive">
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </div>
-        </div>
-    @endif
-
-    @include ('partials.forms.edit.image-upload')
 
 @stop
 
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 58fdb85eaa..6ca6dc647e 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -67,26 +67,10 @@
     @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id'])
     @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')])
 
-    <!-- Image -->
-    @if (($item->image) && ($item->image!=''))
-        <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-            <div class="col-md-9 col-md-offset-3">
-                <label for="image_delete" class="form-control">
-                    {{ Form::checkbox('image_delete', '1', old('image_delete'), ['aria-label'=>'image_delete']) }}
-                    {{ trans('general.image_delete') }}
-                    {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-                </label>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-9 col-md-offset-3">
-                <img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($item->image)) }}" class="img-responsive">
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </div>
-        </div>
-    @endif
 
-    @include ('partials.forms.edit.image-upload')
+
+    @include ('partials.forms.edit.image-upload', ['image_path' => app('assets_upload_path')])
+
 
     <div id='custom_fields_content'>
         <!-- Custom Fields -->
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php
index 10d0f59bb0..d147cbc138 100755
--- a/resources/views/locations/edit.blade.php
+++ b/resources/views/locations/edit.blade.php
@@ -43,25 +43,6 @@
     </div>
 @endif
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url(app('locations_upload_path').e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('locations_upload_path')])
 @stop
 
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index 23b06209ab..fbbb812ba6 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -50,20 +50,8 @@
         </div>
     </div>
 
-<!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-            <img src="{{ Storage::disk('public')->url(app('manufacturers_upload_path').e($item->image)) }}"  class="img-responsive" />
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
+@include ('partials.forms.edit.image-upload', ['image_path' => app('manufacturers_upload_path')])
 
 
-    @include ('partials.forms.edit.image-upload')
-
 
 @stop
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index f8280b86df..edcced17c4 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -38,26 +38,7 @@
 
 @include ('partials.forms.edit.notes')
 @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')])
+@include ('partials.forms.edit.image-upload', ['image_path' => app('models_upload_path')])
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label for="image_delete" class="form-control">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
 
 @stop
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 8e69477cc1..fde6af69ee 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -1,3 +1,22 @@
+<!-- Image -->
+@if (($item->image) && ($item->image!=''))
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
+            <label class="form-control">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url($image_path.e($item->image)) }}" class="img-responsive">
+            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+        </div>
+    </div>
+@endif
+
 <div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'image')) ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="{{ (isset($fieldname) ? $fieldname : 'image') }}">{{ trans('general.image_upload') }}</label>
     <div class="col-md-9">
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 1f8e51c0e6..aed15fedb1 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -42,25 +42,6 @@
 </div>
 
 @include ('partials.forms.edit.notes')
+@include ('partials.forms.edit.image-upload', ['image_path' => app('suppliers_upload_path')])
 
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url(app('suppliers_upload_path').e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
-@endif
-
-@include ('partials.forms.edit.image-upload')
 @stop
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 8a410ecfd4..f36b4a8ebd 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -277,27 +277,9 @@
                           </div>
                       </div> <!--/form-group-->
                   @endif
+                  
+                  @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar', 'image_path' => app('users_upload_path')])
 
-                  <!-- Image -->
-                  @if (($user->avatar) && ($user->avatar!=''))
-                      <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-                          <div class="col-md-9 col-md-offset-3">
-                              <label for="image_delete form-control">
-                                  {{ Form::checkbox('image_delete', '1', old('image_delete'), ['aria-label'=>'image_delete']) }}
-                                  {{ trans('general.image_delete') }}
-                                  {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-                              </label>
-                          </div>
-                      </div>
-                      <div class="form-group">
-                          <div class="col-md-9 col-md-offset-3">
-                              <img src="{{ Storage::disk('public')->url(app('users_upload_path').$user->avatar) }}" class="img-responsive">
-                              {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-                          </div>
-                      </div>
-                  @endif
-
-                  @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar'])
 
                   <!-- begin optional disclosure arrow stuff -->
                   <div class="form-group">
@@ -663,7 +645,7 @@ $(document).ready(function() {
     $('tr.header-row input:radio').change(function() {
         value = $(this).attr('value');
         area = $(this).data('checker-group');
-        $('.radiochecker-'+area+'[value='+value+']').iCheck('check');
+        $('.radiochecker-'+area+'[value='+value+']').prop('checked', true);
     });
 
     $('.header-name').click(function() {