diff --git a/app/Http/Controllers/BottleController.php b/app/Http/Controllers/BottleController.php index a5133f58..e70c5c3e 100644 --- a/app/Http/Controllers/BottleController.php +++ b/app/Http/Controllers/BottleController.php @@ -36,10 +36,7 @@ public function show($id) Log::channel('bottle')->info('Bottles shown.', ['user' => Auth::user()]); // Get a single bottle - $bottle = Bottle::findOrFail($id); - - // Return the single bottle as a resource - return new BottleCollection($bottle); + return Bottle::findOrFail($id); } /** diff --git a/resources/assets/components/invDatatable.vue b/resources/assets/components/invDatatable.vue index abb175b6..9246c650 100644 --- a/resources/assets/components/invDatatable.vue +++ b/resources/assets/components/invDatatable.vue @@ -19,16 +19,9 @@ export default { dataClass: 'text-right' }, { - name: 'name', - sortField: 'name', - }, - { - title: 'Year', - name: 'release_date', - sortField: 'release_date', - titleClass: 'text-center', - dataClass: 'text-center', - callback: 'formatDate|YYYY' + name: 'offering_id', + title: 'Offering', + sortField: 'offering_id' }, { name: 'location_id', diff --git a/resources/assets/components/newInv.vue b/resources/assets/components/newInv.vue index 34de62cd..5853a979 100644 --- a/resources/assets/components/newInv.vue +++ b/resources/assets/components/newInv.vue @@ -1,6 +1,23 @@