@nuxt-customer-portal/invoice-timesheets 0.4.9 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @nuxt-customer-portal/invoice-timesheets
 
+## 0.6.0
+
+### Minor Changes
+
+- cff4891: Add weekly, two-weekly, and monthly client review periods with provider-controlled combined requests, entry snapshots, withdrawal and correction history, supplementary requests, and English/Dutch notifications. Keep weekly internal approvals and historical reviews intact; interval changes start next month.
+
+  Require client approval before invoicing review-enabled client time from the persisted next-month rollout date. Run package migrations before deploying the new application code.
+
+### Patch Changes
+
+- Updated dependencies [cff4891]
+  - @nuxt-customer-portal/timesheets@0.6.0
+  - @nuxt-customer-portal/core@0.6.0
+  - @nuxt-customer-portal/invoices@0.6.0
+
+## 0.5.1
+
+### Patch Changes
+
+- Updated dependencies [1528005]
+  - @nuxt-customer-portal/timesheets@0.5.1
+  - @nuxt-customer-portal/core@0.5.1
+  - @nuxt-customer-portal/invoices@0.5.1
+
+## 0.5.0
+
+### Patch Changes
+
+- @nuxt-customer-portal/invoices@0.5.0
+- @nuxt-customer-portal/timesheets@0.5.0
+- @nuxt-customer-portal/core@0.5.0
+
 ## 0.4.9
 
 ### Patch Changes

package/app/plugins/invoice-timesheets-source.ts

@@ -1,9 +1,12 @@
+import type { InvoiceSourceEntryDto } from '@nuxt-customer-portal/invoices/shared/types/invoice'
+
 export default defineNuxtPlugin(() => {
   useInvoiceSources().register({
     id: 'timesheets',
     labelKey: 'features.invoices.admin.approvedTime',
     descriptionKey: 'features.invoices.admin.approvedTimeDescription',
-    load: (query) => $fetch('/api/invoice-timesheets/sources', { query }),
+    load: (query) =>
+      $fetch<{ enabled: boolean; entries: InvoiceSourceEntryDto[] }>('/api/invoice-timesheets/sources', { query }),
     create: (input) => $fetch<{ id: string }>('/api/invoice-timesheets/invoices', { method: 'POST', body: input })
   })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt-customer-portal/invoice-timesheets",
-  "version": "0.4.9",
+  "version": "0.6.0",
   "license": "MIT",
   "homepage": "https://nuxt-customer-portal.com",
   "repository": {
@@ -36,9 +36,9 @@
     "nanoid": "^5.1.6",
     "pg": "^8.22.0",
     "zod": "^4.4.3",
-    "@nuxt-customer-portal/core": "^0.4.9",
-    "@nuxt-customer-portal/timesheets": "^0.4.9",
-    "@nuxt-customer-portal/invoices": "^0.4.9"
+    "@nuxt-customer-portal/core": "^0.6.0",
+    "@nuxt-customer-portal/invoices": "^0.6.0",
+    "@nuxt-customer-portal/timesheets": "^0.6.0"
   },
   "peerDependencies": {
     "nuxt": "^4.5.1",

package/portal.manifest.mjs

@@ -1,6 +1,6 @@
 export default {
   id: 'invoice-timesheets',
-  version: '0.4.9',
+  version: '0.6.0',
   source: '@nuxt-customer-portal/invoice-timesheets',
   dependsOn: ['core', 'invoices', 'timesheets'],
   schema: './server/db/schema/invoice-timesheets.ts',

package/server/utils/invoice-timesheets.ts

@@ -1,3 +1,4 @@
+import { reviewCutover } from '@nuxt-customer-portal/timesheets/server/utils/client-review-requests'
 import { and, eq, inArray, sql } from 'drizzle-orm'
 import { nanoid } from 'nanoid'
 import { db } from '@nuxt-customer-portal/core/server/portal'
@@ -13,6 +14,14 @@ import {
 } from '@nuxt-customer-portal/timesheets/server/utils/timesheet-repository'
 import { invoiceTimeEntry } from '@nuxt-customer-portal/invoice-timesheets/server/db/schema/invoice-timesheets'
 
+const clientPeriodApproved = sql`(
+  ${timeEntry.entryDate} < (select starts_on from timesheets.client_review_rollout)
+  or not exists (select 1 from timesheets.workspace_client wc where wc.workspace_organization_id = ${timeEntry.organizationId} and wc.client_organization_id = ${timeEntry.clientOrganizationId} and wc.access_mode = 'REVIEW')
+  or exists (select 1 from timesheets.client_review_request_entry re
+    join timesheets.client_review_request r on r.id = re.request_id
+    where re.entry_id = ${timeEntry.id} and r.status = 'APPROVED')
+)`
+
 export const listTimesheetInvoiceSources = async (organizationId: string, from?: string, to?: string) => {
   try {
     await requireTimesheetWorkspace(organizationId)
@@ -33,7 +42,7 @@ export const listTimesheetInvoiceSources = async (organizationId: string, from?:
         projectId: timeEntry.projectId
       })
       .from(timeEntry)
-      .where(and(eq(timeEntry.organizationId, organizationId), inArray(timeEntry.id, ids))),
+      .where(and(eq(timeEntry.organizationId, organizationId), inArray(timeEntry.id, ids), clientPeriodApproved)),
     db
       .select({ timeEntryId: invoiceTimeEntry.timeEntryId })
       .from(invoiceTimeEntry)
@@ -50,6 +59,7 @@ export const listTimesheetInvoiceSources = async (organizationId: string, from?:
   ])
   const context = new Map(contexts.map((item) => [item.entryId, item]))
   const used = new Set(linked.map((item) => item.timeEntryId))
+  const cutover = await reviewCutover()
   const disputes = new Set(disputed.map((item) => `${item.submissionId}:${item.clientOrganizationId}`))
   return {
     enabled: true,
@@ -58,7 +68,7 @@ export const listTimesheetInvoiceSources = async (organizationId: string, from?:
       return !item ||
         item.clientOrganizationId === organizationId ||
         used.has(row.entryId) ||
-        disputes.has(`${item.submissionId}:${item.clientOrganizationId}`)
+        (row.date < cutover && disputes.has(`${item.submissionId}:${item.clientOrganizationId}`))
         ? []
         : [
             {
@@ -109,6 +119,9 @@ export const createInvoiceFromTimesheets = async (
     throw createError({ statusCode: 400, message: 'Internal time entries cannot be invoiced' })
   }
   return db.transaction(async (tx) => {
+    await tx.execute(
+      sql`select pg_advisory_xact_lock(hashtext(${'client-review:' + organizationId + ':' + input.clientOrganizationId}))`
+    )
     const sourceIds = input.lines.flatMap((line) => line.timeEntryIds)
     if (new Set(sourceIds).size !== sourceIds.length) {
       throw createError({ statusCode: 400, message: 'A time entry can only occur once on an invoice' })
@@ -125,7 +138,8 @@ export const createInvoiceFromTimesheets = async (
           and(
             eq(timeEntry.organizationId, organizationId),
             eq(timeEntry.clientOrganizationId, input.clientOrganizationId),
-            inArray(timeEntry.id, sourceIds)
+            inArray(timeEntry.id, sourceIds),
+            clientPeriodApproved
           )
         ),
       tx
@@ -147,6 +161,7 @@ export const createInvoiceFromTimesheets = async (
           )
         )
     ])
+    const cutover = await reviewCutover(tx)
     const disputedSubmissions = new Set(disputed.map((item) => item.submissionId))
     if (
       entries.length !== sourceIds.length ||
@@ -154,7 +169,7 @@ export const createInvoiceFromTimesheets = async (
       entries.some(
         (row) =>
           row.status !== 'APPROVED' ||
-          disputedSubmissions.has(row.entry.submissionId) ||
+          (row.entry.entryDate < cutover && disputedSubmissions.has(row.entry.submissionId)) ||
           !row.entry.billableSnapshot ||
           row.entry.currencySnapshot !== input.currency
       )