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 @@ @endif + +
{{ $consumable->qty }}
+{{ $consumable->numRemaining() }}
+