Fixed #9148 Checking Out Consumables doesn't decrease starting quantity

app/Http/Controllers/Api/ConsumablesController.php

@@ -278,6 +278,8 @@ public function checkout(Request $request, $id)
                 'note' => $request->input('note'),
             ]);
 
+            $consumable->newQuery()->where(['id' => $consumable->id])->update(['qty' => $consumable->qty - 1]);
+
             // Log checkout event
             $logaction = $consumable->logCheckout(e($request->input('note')), $user);
             $data['log_id'] = $logaction->id;

app/Http/Controllers/Consumables/ConsumableCheckoutController.php

@@ -69,6 +69,8 @@ public function store(Request $request, $consumableId)
             'note' => $request->input('note'),
         ]);
 
+        $consumable->newQuery()->where(['id' => $consumable->id])->update(['qty' => $consumable->qty - 1]);
+
         event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note')));
 
         // Redirect to the new consumable page

app/Models/Consumable.php

@@ -317,11 +317,9 @@ public function numCheckedOut()
      */
     public function numRemaining()
     {
-        $checkedout = $this->users->count();
         $total = $this->qty;
-        $remaining = $total - $checkedout;
 
-        return $remaining;
+        return $total;
     }
 
     /**

app/Presenters/ConsumablePresenter.php

@@ -69,13 +69,7 @@ public static function dataTableLayout()
                 'sortable' => false,
                 'title' => trans('admin/components/general.total'),
                 'visible' => true,
-            ], [
-                'field' => 'remaining',
-                'searchable' => false,
-                'sortable' => false,
-                'title' => trans('admin/components/general.remaining'),
-                'visible' => true,
-            ], [
+            ],  [
                 'field' => 'min_amt',
                 'searchable' => false,
                 'sortable' => false,

database/migrations/2023_02_09_015832_adjust_consumables_quantities.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\Consumable;
+
+class AdjustConsumablesQuantities extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $consumables_checkedout = DB::table('consumables_users')->select('consumable_id', DB::raw('count(*) as total_checkedout'))->groupBy('consumable_id')->get();
+
+        foreach ($consumables_checkedout as $consumable){
+            $consumable_qty = Consumable::select('qty')->where(['id' => $consumable->consumable_id])->value('qty');
+            $total = (int) $consumable_qty - (int) $consumable->total_checkedout;
+
+            // Control that the $total is never negative 
+            if ($total < 0){
+                $total = 0;
+            }
+
+            Consumable::where('id', $consumable->consumable_id)->update(['qty' => $total]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}