feat: ensure invoice PDF attached to email contains the latest user-entered data (#129)

YanaYestr · web-flow · commit 975679a31606 · 2025-12-09T20:43:49.000+01:00
diff --git a/apps/gauzy/src/app/pages/invoices/invoice-add/by-role/invoice-add-by-role.component.ts b/apps/gauzy/src/app/pages/invoices/invoice-add/by-role/invoice-add-by-role.component.ts
@@ -22,7 +22,8 @@ import {
 	IReportDayGroupByEmployee,
 	IGetEmployeeHourlyRateInput,
 	IEmployeeHourlyRate,
-	IReportDayGroupByProject
+	IReportDayGroupByProject,
+	IInvoiceItem
 } from '@gauzy/contracts';
 import { filter, tap } from 'rxjs/operators';
 import { compareDate, distinctUntilChange, extractNumber, isEmpty, isNotEmpty } from '@gauzy/ui-core/common';
@@ -687,7 +688,24 @@ export class InvoiceAddByRoleComponent extends PaginationFilterBaseComponent imp
 			return;
 		}
 
-		const { invoiceNumber, invoiceDate, dueDate } = this.form.value;
+		if (!this.organization) {
+			return;
+		}
+		const { id: organizationId } = this.organization;
+		const { tenantId } = this.store.user;
+		const {
+			invoiceNumber,
+			invoiceDate,
+			dueDate,
+			discountValue,
+			discountType,
+			tax,
+			tax2,
+			taxType,
+			tax2Type,
+			notes,
+			tags
+		} = this.form.value;
 
 		if (!invoiceDate || !dueDate || compareDate(invoiceDate, dueDate)) {
 			this.toastrService.danger(
@@ -709,18 +727,88 @@ export class InvoiceAddByRoleComponent extends PaginationFilterBaseComponent imp
 			return;
 		}
 
-		const invoice = await this.createInvoiceEstimate(InvoiceStatusTypesEnum.SENT);
-		const invoiceItems = await this.createInvoiceEstimateItems();
+		const invoice: IInvoice = {
+			invoiceNumber,
+			invoiceDate: moment(invoiceDate).startOf('day').toDate(),
+			dueDate: moment(dueDate).endOf('day').toDate(),
+			currency: this.currency,
+			discountValue,
+			discountType,
+			tax,
+			tax2,
+			taxType,
+			tax2Type,
+			terms: notes,
+			paid: false,
+			totalValue: +this.total.toFixed(2),
+			fromUserId: this.selectedEmployee?.id,
+			fromUser: this.selectedEmployee,
+			fromOrganization: this.organization,
+			organizationId,
+			tenantId,
+			invoiceType: this.selectedInvoiceType,
+			tags,
+			isEstimate: this.isEstimate,
+			status: InvoiceStatusTypesEnum.SENT,
+			sentTo: this.organizationId,
+			isArchived: false
+		};
 
-		await firstValueFrom(
-			this.dialogService.open(InvoiceEmailMutationComponent, {
-				context: {
-					invoice: invoice,
-					invoiceItems: invoiceItems,
-					isEstimate: this.isEstimate
-				}
-			}).onClose
-		);
+		const invoiceItems: IInvoiceItem[] = [];
+
+		for (const invoiceItem of tableSources) {
+			const id = invoiceItem.selectedItem ? invoiceItem.selectedItem.id : null;
+			const itemToAdd = {
+				description: invoiceItem.description,
+				currency: invoiceItem.currency,
+				price: Number(invoiceItem.price),
+				quantity: Number(invoiceItem.quantity),
+				totalValue: Number(invoiceItem.totalValue),
+				invoiceId: invoiceNumber,
+				applyTax: invoiceItem.applyTax,
+				applyDiscount: invoiceItem.applyDiscount,
+				organizationId,
+				tenantId
+			};
+
+			switch (this.selectedInvoiceType) {
+				case InvoiceTypeEnum.BY_EMPLOYEE_HOURS:
+					itemToAdd['employeeId'] = this.selectedEmployee?.employee?.id;
+					break;
+				case InvoiceTypeEnum.BY_PROJECT_HOURS:
+					itemToAdd['projectId'] = id;
+					itemToAdd['project'] = {
+						id: invoiceItem.selectedItem?.id,
+						name: invoiceItem.selectedItem?.name
+					};
+					break;
+				case InvoiceTypeEnum.BY_TASK_HOURS:
+					itemToAdd['taskId'] = id;
+					break;
+				case InvoiceTypeEnum.BY_PRODUCTS:
+					itemToAdd['productId'] = id;
+					break;
+				case InvoiceTypeEnum.BY_EXPENSES:
+					itemToAdd['expenseId'] = id;
+					break;
+				default:
+					break;
+			}
+			invoiceItems.push(itemToAdd);
+		}
+
+		invoice.invoiceItems = invoiceItems;
+		const dialogRef = this.dialogService.open(InvoiceEmailMutationComponent, {
+			context: {
+				invoice,
+				invoiceItems,
+				isEstimate: this.isEstimate
+			}
+		});
+
+		const result = await firstValueFrom(dialogRef.onClose);
+
+		if (result !== 'ok') return;
 
 		if (this.isEstimate) {
 			this.toastrService.success(
diff --git a/apps/gauzy/src/app/pages/invoices/invoice-edit/by-role/invoice-edit-by-role.component.ts b/apps/gauzy/src/app/pages/invoices/invoice-edit/by-role/invoice-edit-by-role.component.ts
@@ -638,7 +638,7 @@ export class InvoiceEditByRoleComponent extends PaginationFilterBaseComponent im
 				id: invoiceData.id,
 				invoiceNumber: invoiceData.invoiceNumber,
 				invoiceDate: invoiceData.invoiceDate,
-				currency: invoiceData.currency,
+				currency: this.invoice?.currency,
 				dueDate: invoiceData.dueDate,
 				discountValue: invoiceData.discountValue,
 				discountType: invoiceData.discountType,
@@ -650,6 +650,7 @@ export class InvoiceEditByRoleComponent extends PaginationFilterBaseComponent im
 				paid: false,
 				totalValue: +this.total.toFixed(2),
 				fromUserId: this.invoice.fromUser?.id,
+				fromUser: this.invoice?.fromUser,
 				toOrganization: this.invoice.toOrganization,
 				organizationId,
 				tenantId,
@@ -675,10 +676,13 @@ export class InvoiceEditByRoleComponent extends PaginationFilterBaseComponent im
 				};
 				switch (this.invoice.invoiceType) {
 					case InvoiceTypeEnum.BY_EMPLOYEE_HOURS:
-						itemToAdd['employeeId'] = invoiceItem.selectedItem;
+						itemToAdd['employeeId'] = this.invoice?.fromUser?.employee?.id;
 						break;
 					case InvoiceTypeEnum.BY_PROJECT_HOURS:
-						itemToAdd['projectId'] = invoiceItem.selectedItem;
+						itemToAdd['project'] = {
+							id: invoiceItem.selectedItem?.id,
+							name: invoiceItem.selectedItem?.name
+						};
 						break;
 					case InvoiceTypeEnum.BY_TASK_HOURS:
 						itemToAdd['taskId'] = invoiceItem.selectedItem;
diff --git a/apps/gauzy/src/app/pages/invoices/invoice-email/invoice-email-mutation.component.html b/apps/gauzy/src/app/pages/invoices/invoice-email/invoice-email-mutation.component.html
@@ -7,7 +7,7 @@ <h5 class="title">
 		</h5>
 	</nb-card-header>
 	<nb-card-body class="invoice-email-body">
-		<ga-invoice-pdf [invoice]="invoice"></ga-invoice-pdf>
+		<ga-invoice-pdf [invoice]="invoice" [alreadyGeneratedInvoice]="false"></ga-invoice-pdf>
 		<form [formGroup]="form" *ngIf="form">
 			<div class="row">
 				<div class="form-group col-12">
diff --git a/apps/gauzy/src/app/pages/invoices/invoice-email/invoice-email-mutation.component.ts b/apps/gauzy/src/app/pages/invoices/invoice-email/invoice-email-mutation.component.ts
@@ -1,16 +1,23 @@
 import { Component, OnInit } from '@angular/core';
 import { TranslationBaseComponent } from '@gauzy/ui-core/i18n';
-import { IInvoice, InvoiceStatusTypesEnum, IInvoiceItem } from '@gauzy/contracts';
+import { IInvoice, InvoiceStatusTypesEnum, IInvoiceItem, IInvoiceItemCreateInput } from '@gauzy/contracts';
 import { TranslateService } from '@ngx-translate/core';
 import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { NbDialogRef } from '@nebular/theme';
-import { InvoiceEstimateHistoryService, InvoicesService, Store, ToastrService } from '@gauzy/ui-core/core';
+import {
+	InvoiceEstimateHistoryService,
+	InvoiceItemService,
+	InvoicesService,
+	Store,
+	ToastrService
+} from '@gauzy/ui-core/core';
+import moment from 'moment';
 
 @Component({
-    selector: 'ga-invoice-email',
-    templateUrl: './invoice-email-mutation.component.html',
-    styleUrls: ['./invoice-email-mutation.component.scss'],
-    standalone: false
+	selector: 'ga-invoice-email',
+	templateUrl: './invoice-email-mutation.component.html',
+	styleUrls: ['./invoice-email-mutation.component.scss'],
+	standalone: false
 })
 export class InvoiceEmailMutationComponent extends TranslationBaseComponent implements OnInit {
 	invoice: IInvoice;
@@ -26,7 +33,9 @@ export class InvoiceEmailMutationComponent extends TranslationBaseComponent impl
 		private readonly toastrService: ToastrService,
 		private readonly invoiceService: InvoicesService,
 		private readonly store: Store,
-		private readonly invoiceEstimateHistoryService: InvoiceEstimateHistoryService
+		private readonly invoiceEstimateHistoryService: InvoiceEstimateHistoryService,
+		private readonly invoicesService: InvoicesService,
+		private readonly invoiceItemService: InvoiceItemService
 	) {
 		super(translateService);
 	}
@@ -47,6 +56,11 @@ export class InvoiceEmailMutationComponent extends TranslationBaseComponent impl
 
 		const { email } = this.form.value;
 
+		if (!this.invoice.id) {
+			const createdInvoice = await this.createInvoiceEstimate(InvoiceStatusTypesEnum.SENT);
+			if (createdInvoice) await this.createInvoiceEstimateItems();
+		}
+
 		await this.invoiceService.sendEmail(
 			email,
 			this.invoice.invoiceNumber,
@@ -90,6 +104,52 @@ export class InvoiceEmailMutationComponent extends TranslationBaseComponent impl
 		});
 	}
 
+	async createInvoiceEstimate(status: string, sendTo?: string) {
+		try {
+			const createdInvoice = await this.invoicesService.addOwn({
+				invoiceNumber: this.invoice.invoiceNumber,
+				invoiceDate: moment(this.invoice.invoiceDate).startOf('day').toDate(),
+				dueDate: moment(this.invoice.dueDate).endOf('day').toDate(),
+				currency: this.invoice.currency,
+				discountValue: this.invoice.discountValue,
+				discountType: this.invoice.discountType,
+				tax: this.invoice.tax,
+				tax2: this.invoice.tax2,
+				taxType: this.invoice.taxType,
+				tax2Type: this.invoice.tax2Type,
+				terms: this.invoice.terms,
+				paid: false,
+				totalValue: this.invoice.totalValue,
+				fromUserId: this.invoice.fromUserId,
+				fromOrganizationId: this.invoice.fromOrganization?.id,
+				organizationId: this.invoice.fromOrganization?.id,
+				tenantId: this.invoice.tenantId,
+				invoiceType: this.invoice.invoiceType,
+				tags: this.invoice.tags,
+				isEstimate: this.invoice.isEstimate,
+				status: status,
+				sentTo: sendTo,
+				isArchived: this.invoice.isArchived
+			});
+			this.createdInvoice = createdInvoice;
+			return createdInvoice;
+		} catch (error) {
+			this.toastrService.danger(error);
+		}
+	}
+
+	async createInvoiceEstimateItems() {
+		const invoiceItems: IInvoiceItemCreateInput[] = this.invoice.invoiceItems.map((item) => ({
+			...item,
+			invoiceId: this.createdInvoice.id
+		}));
+		try {
+			return await this.invoiceItemService.createBulk(this.createdInvoice?.id, invoiceItems);
+		} catch (error) {
+			this.toastrService.danger(error);
+		}
+	}
+
 	cancel() {
 		this.dialogRef.close();
 	}
diff --git a/apps/gauzy/src/app/pages/invoices/invoice-pdf/invoice-pdf.component.ts b/apps/gauzy/src/app/pages/invoices/invoice-pdf/invoice-pdf.component.ts
@@ -5,6 +5,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { tap } from 'rxjs/operators';
 import { InvoicesService } from '@gauzy/ui-core/core';
 import { TranslationBaseComponent } from '@gauzy/ui-core/i18n';
+import { Observable } from 'rxjs';
 
 @UntilDestroy({ checkProperties: true })
 @Component({
@@ -47,6 +48,7 @@ import { TranslationBaseComponent } from '@gauzy/ui-core/i18n';
 })
 export class InvoicePdfComponent extends TranslationBaseComponent implements OnInit {
 	@Input() invoice: IInvoice;
+	@Input() alreadyGeneratedInvoice?: boolean = true;
 	fileURL: string;
 	isLoading: boolean;
 	error: boolean;
@@ -62,15 +64,17 @@ export class InvoicePdfComponent extends TranslationBaseComponent implements OnI
 	}
 
 	loadInvoicePdf() {
-		if (!this.invoice?.id) {
-			this.isLoading = false;
-			return;
-		}
-
 		const { id: invoiceId } = this.invoice;
 
-		this.invoicesService
-			.downloadInvoicePdf(invoiceId)
+		let pdfObservable: Observable<Blob>;
+
+		if (this.alreadyGeneratedInvoice) {
+			pdfObservable = this.invoicesService.downloadInvoicePdf(invoiceId);
+		} else {
+			pdfObservable = this.invoicesService.downloadInvoicePdfByInvoice(this.invoice);
+		}
+
+		pdfObservable
 			.pipe(
 				tap((data) => {
 					if (data && data instanceof Blob) {
diff --git a/packages/contracts/src/lib/invoice-item.model.ts b/packages/contracts/src/lib/invoice-item.model.ts
@@ -34,7 +34,7 @@ export interface IInvoiceItemFindInput {
 export interface IInvoiceItemCreateInput extends IBasePerTenantAndOrganizationEntityModel {
 	price: number;
 	quantity: number;
-	totalValue: number;
+	totalValue?: number;
 	description?: string;
 	invoiceId?: string;
 	taskId?: string;
diff --git a/packages/core/src/lib/invoice/generate-invoice-pdf.ts b/packages/core/src/lib/invoice/generate-invoice-pdf.ts
@@ -21,7 +21,7 @@ export async function generateInvoicePdfDefinition(
 		switch (invoice.invoiceType) {
 			case InvoiceTypeEnum.BY_EMPLOYEE_HOURS: {
 				const employee = item.employee;
-				currentItem[0] = `${employee.user.name}`;
+				currentItem[0] = `${employee?.user?.name ?? invoice.fromUser?.name}`;
 				break;
 			}
 			case InvoiceTypeEnum.BY_PROJECT_HOURS: {
diff --git a/packages/core/src/lib/invoice/invoice.controller.ts b/packages/core/src/lib/invoice/invoice.controller.ts
diff --git a/packages/core/src/lib/invoice/invoice.service.ts b/packages/core/src/lib/invoice/invoice.service.ts
diff --git a/packages/ui-core/core/src/lib/services/invoice/invoices.service.ts b/packages/ui-core/core/src/lib/services/invoice/invoices.service.ts

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export async function generateInvoicePdfDefinition(`
`21`	`21`	`switch (invoice.invoiceType) {`
`22`	`22`	`case InvoiceTypeEnum.BY_EMPLOYEE_HOURS: {`
`23`	`23`	`const employee = item.employee;`
`24`		- currentItem[0] = `${employee.user.name}`;
	`24`	+ currentItem[0] = `${employee?.user?.name ?? invoice.fromUser?.name}`;
`25`	`25`	`break;`
`26`	`26`	`}`
`27`	`27`	`case InvoiceTypeEnum.BY_PROJECT_HOURS: {`