Updated

Author: StanBarrows

.github/workflows/npm-publish-api.yml

@@ -212,6 +212,7 @@ private function getTimeEntriesQuery(Organization $organization, TimeEntryIndexR
         $filter->addTaskIdsFilter($request->input('task_ids'));
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));
+        $filter->addInvoicedFilter($request->input('invoiced'));
 
         return $filter->get();
     }

.github/workflows/npm-publish-ui.yml

@@ -119,6 +119,11 @@ public function rules(): array
                 'string',
                 'in:true,false',
             ],
+            // Filter by invoiced status (invoiced_at not null vs null)
+            'invoiced' => [
+                'string',
+                'in:true,false',
+            ],
             // Limit the number of returned time entries (default: 150)
             'limit' => [
                 'integer',

app/Http/Controllers/Api/V1/TimeEntryController.php

@@ -122,6 +122,11 @@ public function rules(): array
                 'string',
                 'in:true,false',
             ],
+            // Filter by invoiced status (invoiced_at not null vs null)
+            'invoiced' => [
+                'string',
+                'in:true,false',
+            ],
             // Limit the number of returned time entries (default: 150)
             'limit' => [
                 'integer',

app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php

@@ -141,6 +141,36 @@ public function addBillable(?bool $billable): self
         return $this;
     }
 
+    public function addInvoicedFilter(?string $invoiced): self
+    {
+        if ($invoiced === null) {
+            return $this;
+        }
+        if ($invoiced === 'true') {
+            $this->addInvoiced(true);
+        } elseif ($invoiced === 'false') {
+            $this->addInvoiced(false);
+        } else {
+            Log::warning('Invalid invoiced filter value', ['value' => $invoiced]);
+        }
+
+        return $this;
+    }
+
+    public function addInvoiced(?bool $invoiced): self
+    {
+        if ($invoiced === null) {
+            return $this;
+        }
+        if ($invoiced) {
+            $this->builder->whereNotNull('invoiced_at');
+        } else {
+            $this->builder->whereNull('invoiced_at');
+        }
+
+        return $this;
+    }
+
     /**
      * @param  array<string>|null  $clientIds
      */

app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php

@@ -13,6 +13,11 @@
         "format:check": "prettier --check './**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,vue}'"
     },
     "devDependencies": {
+        "eslint": "^9.19.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-vue": "^9.30.0",
+        "globals": "^15.12.0",
+        "typescript-eslint": "^8.18.2",
         "@eslint/eslintrc": "^3.2.0",
         "@eslint/js": "^9.19.0",
         "@inertiajs/vue3": "^1.0.0",
@@ -30,6 +35,7 @@
         "openapi-zod-client": "^1.16.2",
         "postcss": "^8.4.47",
         "postcss-nesting": "^12.1.5",
+        "prettier": "^3.3.3",
         "tailwindcss": "^3.4.13",
         "typescript": "^5.7.3",
         "vite": "^6.0.11",

app/Service/TimeEntryFilter.php

@@ -13,6 +13,7 @@ import {
     ChevronRightIcon,
     ChevronDoubleRightIcon,
     ClockIcon,
+    DocumentTextIcon,
 } from '@heroicons/vue/20/solid';
 import DateRangePicker from '@/packages/ui/src/Input/DateRangePicker.vue';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
@@ -84,6 +85,7 @@ const selectedMembers = ref<string[]>([]);
 const selectedTasks = ref<string[]>([]);
 const selectedClients = ref<string[]>([]);
 const billable = ref<'true' | 'false' | null>(null);
+const invoiced = ref<'true' | 'false' | null>(null);
 const roundingEnabled = ref<boolean>(false);
 const roundingType = ref<TimeEntryRoundingType>('nearest');
 const roundingMinutes = ref<number>(15);
@@ -114,6 +116,7 @@ function getFilterAttributes() {
         client_ids: selectedClients.value.length > 0 ? selectedClients.value : undefined,
         tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined,
         billable: billable.value !== null ? billable.value : undefined,
+        invoiced: invoiced.value !== null ? invoiced.value : undefined,
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
         rounding_minutes: roundingEnabled.value ? roundingMinutes.value : undefined,
     };
@@ -344,6 +347,32 @@ async function downloadExport(format: ExportFormat) {
                                 :icon="BillableIcon"></ReportingFilterBadge>
                         </template>
                     </SelectDropdown>
+                    <SelectDropdown
+                        v-model="invoiced"
+                        :get-key-from-item="(item) => item.value"
+                        :get-name-for-item="(item) => item.label"
+                        :items="[
+                            {
+                                label: 'Both',
+                                value: null,
+                            },
+                            {
+                                label: 'Invoiced',
+                                value: 'true',
+                            },
+                            {
+                                label: 'Not invoiced',
+                                value: 'false',
+                            },
+                        ]"
+                        @changed="updateFilteredTimeEntries">
+                        <template #trigger>
+                            <ReportingFilterBadge
+                                :active="invoiced !== null"
+                                :title="invoiced === 'false' ? 'Not invoiced' : 'Invoiced'"
+                                :icon="DocumentTextIcon"></ReportingFilterBadge>
+                        </template>
+                    </SelectDropdown>
                     <ReportingRoundingControls
                         v-model:enabled="roundingEnabled"
                         v-model:type="roundingType"

package.json

@@ -32,8 +32,7 @@ const iconSizeClasses = computed(() => {
     <component
         :is="IconComponent"
         :class="[iconColorClasses, iconSizeClasses]"
-        :title="invoiced ? 'Invoiced' : 'Not invoiced'"
-    />
+        :title="invoiced ? 'Invoiced' : 'Not invoiced'" />
 </template>
 
 <style scoped></style>

resources/js/Pages/ReportingDetailed.vue

@@ -123,7 +123,7 @@ async function deleteEntry() {
             await props.deleteTimeEntry(editableTimeEntry.value.id);
             // Success - close modal and let the store handle success message
             show.value = false;
-        } catch (error) {
+        } catch {
             // Error is already handled by handleApiRequestNotifications
             // Don't close the modal on error
         } finally {