Merge pull request #3030 from DFXswiss/develop

Release: develop -> main

Author: TaprootFreak

src/subdomains/core/history/controllers/transaction.controller.ts

@@ -435,9 +435,10 @@ export class TransactionController {
   @UseGuards(AuthGuard(), RoleGuard(UserRole.ACCOUNT), IpGuard, UserActiveGuard())
   @ApiOkResponse({ type: PdfDto })
   async generateInvoiceFromTransaction(@GetJwt() jwt: JwtPayload, @Param('id') id: string): Promise<PdfDto> {
+    const txIdOrUid = isNaN(+id) ? id : +id;
     const txStatementDetails = await this.transactionHelper.getTxStatementDetails(
       jwt.account,
-      +id,
+      txIdOrUid,
       TxStatementType.INVOICE,
     );
 
@@ -453,9 +454,10 @@ export class TransactionController {
   @UseGuards(AuthGuard(), RoleGuard(UserRole.ACCOUNT), IpGuard, UserActiveGuard())
   @ApiOkResponse({ type: PdfDto })
   async generateReceiptFromTransaction(@GetJwt() jwt: JwtPayload, @Param('id') id: string): Promise<PdfDto> {
+    const txIdOrUid = isNaN(+id) ? id : +id;
     const txStatementDetails = await this.transactionHelper.getTxStatementDetails(
       jwt.account,
-      +id,
+      txIdOrUid,
       TxStatementType.RECEIPT,
     );
 

src/subdomains/supporting/payment/services/transaction-helper.ts

@@ -493,20 +493,26 @@ export class TransactionHelper implements OnModuleInit {
 
   async getTxStatementDetails(
     userDataId: number,
-    txId: number,
+    txIdOrUid: number | string,
     statementType: TxStatementType,
   ): Promise<TxStatementDetails> {
-    const transaction = await this.transactionService.getTransactionById(txId, {
+    const relations = {
       userData: { organization: true },
       buyCrypto: { buy: { user: { wallet: true } }, cryptoRoute: true, cryptoInput: true },
       buyFiat: { sell: true, cryptoInput: true },
       refReward: { user: { userData: true } },
-    });
+    };
+
+    const transaction =
+      typeof txIdOrUid === 'number'
+        ? await this.transactionService.getTransactionById(txIdOrUid, relations)
+        : await this.transactionService.getTransactionByUid(txIdOrUid, relations);
 
     if (!transaction || !transaction.targetEntity || transaction.targetEntity instanceof BankTxReturn)
       throw new BadRequestException('Transaction not found');
     if (!transaction.userData.isDataComplete) throw new BadRequestException('User data is not complete');
-    if (!transaction.targetEntity.isComplete) throw new BadRequestException('Transaction not completed');
+    if (statementType === TxStatementType.RECEIPT && !transaction.targetEntity.isComplete)
+      throw new BadRequestException('Transaction not completed');
     if (transaction.userData.id !== userDataId) throw new ForbiddenException('Not your transaction');
 
     if (transaction.buyCrypto && !transaction.buyCrypto.isCryptoCryptoTransaction) {