Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes

Fixes #8462 - move accessory notes into pivot table
2020-10-23 14:19:51 -07:00
parent b9a9949570 88f03e6b55
commit 2aa8e1e76b
7 changed files with 102 additions and 5 deletions
@@ -75,7 +75,8 @@ class AccessoryCheckoutController extends Controller
            'accessory_id' => $accessory->id,
            'created_at' => Carbon::now(),
            'user_id' => Auth::id(),
-            'assigned_to' => $request->get('assigned_to')
+            'assigned_to' => $request->get('assigned_to'),
+            'note' => $request->input('note')
        ]);

        DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
@@ -154,7 +154,6 @@ class AccessoriesController extends Controller
        $offset = request('offset', 0);
        $limit = request('limit', 50);

-        $accessory->lastCheckoutArray = $accessory->lastCheckout->toArray();
        $accessory_users = $accessory->users;
        $total = $accessory_users->count();