Merge pull request #174 from deanblackborough/v2.09.4

Missed two queries
costs-to-expect · Mar 25, 2020 · 00ca3e7 · 00ca3e7
2 parents 1e583dd + de368a6
commit 00ca3e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/app/Models/Item/AllocatedExpense.php b/app/Models/Item/AllocatedExpense.php
@@ -312,6 +312,7 @@ public function paginatedCollection(
 
             $category_join = true;
 
+            $select_fields[] = 'item_category.id AS item_category_id';
             $select_fields[] = 'category.id AS category_id';
             $select_fields[] = 'category.name AS category_name';
             $select_fields[] = 'category.description AS category_description';
@@ -330,6 +331,7 @@ public function paginatedCollection(
 
                 $subcategory_join = true;
 
+                $select_fields[] = 'item_sub_category.id AS item_subcategory_id';
                 $select_fields[] = 'sub_category.id AS subcategory_id';
                 $select_fields[] = 'sub_category.name AS subcategory_name';
                 $select_fields[] = 'sub_category.description AS subcategory_description';

diff --git a/app/Models/Item/SimpleExpense.php b/app/Models/Item/SimpleExpense.php
@@ -226,6 +226,7 @@ public function paginatedCollection(
 
             $category_join = true;
 
+            $select_fields[] = 'item_category.id AS item_category_id';
             $select_fields[] = 'category.id AS category_id';
             $select_fields[] = 'category.name AS category_name';
             $select_fields[] = 'category.description AS category_description';
@@ -244,6 +245,7 @@ public function paginatedCollection(
 
                 $subcategory_join = true;
 
+                $select_fields[] = 'item_sub_category.id AS item_subcategory_id';
                 $select_fields[] = 'sub_category.id AS subcategory_id';
                 $select_fields[] = 'sub_category.name AS subcategory_name';
                 $select_fields[] = 'sub_category.description AS subcategory_description';