diff --git a/resources/js/Components/Dashboard/ActivityGraphCard.vue b/resources/js/Components/Dashboard/ActivityGraphCard.vue index 6ad93472..30ac01fd 100644 --- a/resources/js/Components/Dashboard/ActivityGraphCard.vue +++ b/resources/js/Components/Dashboard/ActivityGraphCard.vue @@ -128,7 +128,8 @@ const option = computed(() => { if (dailyHoursTracked?.value) { return ( formatDate( - dailyHoursTracked?.value[dataIndex].date + dailyHoursTracked?.value[dataIndex].date, + organization?.value?.date_format ) + ': ' + formatHumanReadableDuration( diff --git a/resources/js/packages/api/src/index.ts b/resources/js/packages/api/src/index.ts index 0ef2de92..6898a5b7 100644 --- a/resources/js/packages/api/src/index.ts +++ b/resources/js/packages/api/src/index.ts @@ -178,6 +178,11 @@ export type DetailedInvoiceResponse = ZodiosResponseByAlias< 'getInvoice' >; +export type InvoiceIndexEntry = ZodiosResponseByAlias< + SolidTimeApi, + 'getInvoices' +>['data'][0]; + export type UpdateInvoiceSettings = ZodiosBodyByAlias< SolidTimeApi, 'updateInvoiceSettings' diff --git a/resources/js/packages/api/src/openapi.json.client.ts b/resources/js/packages/api/src/openapi.json.client.ts index ff5cd647..3e0d142d 100644 --- a/resources/js/packages/api/src/openapi.json.client.ts +++ b/resources/js/packages/api/src/openapi.json.client.ts @@ -164,8 +164,8 @@ const DetailedInvoiceResource = z paid_at: z.union([z.string(), z.null()]), due_at: z.string(), discount_type: z.string(), - discount_amount: z.string(), - tax_rate: z.string(), + discount_amount: z.number().int(), + tax_rate: z.number().int(), status: z.string(), currency: z.string(), date: z.string(), diff --git a/tsconfig.json b/tsconfig.json index f222afc7..ca98f8c8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,5 +18,8 @@ "resources/js/**/*.d.ts", "resources/js/**/*.vue", "resources/js/ziggy.d.ts", + "extensions/Invoicing/resources/js/**/*.ts", + "extensions/Invoicing/resources/js/**/*.d.ts", + "extensions/Invoicing/resources/js/**/*.vue", ] }