From 1527679f4b9eb596ad4034ee0971be2314f603c9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 11 Jul 2024 17:26:43 +0100
Subject: [PATCH] Handle deletions on the observer

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Observers/ConsumableObserver.php          |  8 ++++++--
 .../views/consumables/checkout.blade.php      | 19 +++++++++++++++++++
 resources/views/consumables/view.blade.php    |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/Observers/ConsumableObserver.php b/app/Observers/ConsumableObserver.php
index 1bd6e7cde8..377995ebb9 100644
--- a/app/Observers/ConsumableObserver.php
+++ b/app/Observers/ConsumableObserver.php
@@ -70,15 +70,19 @@ class ConsumableObserver
     {
 
         $consumable->users()->detach();
+        $uploads = $consumable->uploads;
 
-        foreach ($consumable->uploads() as $file) {
+        foreach ($uploads as $file) {
             try {
-                Storage::disk('public')->delete('consumables/'.$file);
+                Storage::delete('private_uploads/consumables/'.$file->filename);
+                $file->delete();
             } catch (\Exception $e) {
                 Log::info($e);
             }
         }
 
+
+
         try {
             Storage::disk('public')->delete('consumables/'.$consumable->image);
         } catch (\Exception $e) {
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index bde94bc6f4..29b68b6ce7 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -37,6 +37,25 @@
           </div>
           @endif
 
+          <!-- total -->
+          <div class="form-group">
+              <label class="col-sm-3 control-label">{{  trans('admin/components/general.total') }}</label>
+              <div class="col-md-6">
+                  <p class="form-control-static">{{ $consumable->qty }}</p>
+              </div>
+          </div>
+
+          <!-- remaining -->
+          <div class="form-group">
+              <label class="col-sm-3 control-label">{{  trans('admin/components/general.remaining') }}</label>
+              <div class="col-md-6">
+                  <p class="form-control-static">{{ $consumable->numRemaining() }}</p>
+              </div>
+          </div>
+
+
+
+
           <!-- User -->
             @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to', 'required'=> 'true'])
 
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index e6b8137238..5a25659fbe 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -351,7 +351,7 @@
           @can('delete', $consumable)
             <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
               @if ($consumable->deleted_at=='')
-                <button class="btn btn-sm btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $consumable->id]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }}
+                <button class="btn btn-sm btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $consumable->name]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }}
                 </button>
                 <span class="sr-only">{{ trans('general.delete') }}</span>
               @endif