diff --git a/.vscode/launch.json b/.vscode/launch.json index d2438414..b81cb57b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,5 +1,5 @@ { - "version": "0.2.0", + "version": "0.2.7", "configurations": [ { "name": "WEB: Vite (Chrome)", diff --git a/apps/server/.env.development b/apps/server/.env.development index d00c7f3f..17fcf9e4 100644 --- a/apps/server/.env.development +++ b/apps/server/.env.development @@ -29,4 +29,4 @@ DOCUMENTS_PATH=/home/rodax/Documentos/uecko-erp/out/rodax/documents SIGN_DOCUMENTS=false SIGNED_DOCUMENTS_PATH=/home/rodax/Documentos/uecko-erp/out/rodax/signed-documents -FASTREPORT_BIN=/home/rodax/Documentos/uecko-erp/tools/fastreport-cli/publish/linux/FastReportCliGenerator \ No newline at end of file +FASTREPORT_BIN=/home/rodax/Documentos/uecko-erp/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator \ No newline at end of file diff --git a/apps/server/package.json b/apps/server/package.json index bfd95a89..9ebcf8ce 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -1,6 +1,6 @@ { "name": "@erp/factuges-server", - "version": "0.1.7", + "version": "0.2.7", "private": true, "scripts": { "build": "tsup src/index.ts --config tsup.config.ts", diff --git a/apps/web/package.json b/apps/web/package.json index 2d4765da..40308c4b 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,7 +1,7 @@ { "name": "@erp/factuges-web", "private": true, - "version": "0.1.7", + "version": "0.2.7", "type": "module", "scripts": { "dev": "vite --host --clearScreen false", diff --git a/modules/customer-invoices/src/api/application/presenters/reports/issued-invoices/issued-invoice-items.report.presenter.ts b/modules/customer-invoices/src/api/application/presenters/reports/issued-invoices/issued-invoice-items.report.presenter.ts index 54f91f2e..d447832b 100644 --- a/modules/customer-invoices/src/api/application/presenters/reports/issued-invoices/issued-invoice-items.report.presenter.ts +++ b/modules/customer-invoices/src/api/application/presenters/reports/issued-invoices/issued-invoice-items.report.presenter.ts @@ -12,7 +12,7 @@ export class IssuedInvoiceItemsReportPresenter extends Presenter; + +export class IssuedInvoiceReportJSONRenderer extends Renderer< + DTO, + IssuedInvoiceReportJSONRenderOutput +> { + render(source: DTO) { + return Result.ok({ + payload: source, + templateChecksum: "", + }); + } +} diff --git a/modules/customer-invoices/src/api/infrastructure/renderers/issued-invoice-report-pdf.renderer.ts b/modules/customer-invoices/src/api/infrastructure/renderers/issued-invoice-report-pdf.renderer.ts index b3def1d7..dbf2d08f 100644 --- a/modules/customer-invoices/src/api/infrastructure/renderers/issued-invoice-report-pdf.renderer.ts +++ b/modules/customer-invoices/src/api/infrastructure/renderers/issued-invoice-report-pdf.renderer.ts @@ -1,5 +1,6 @@ import type { DTO } from "@erp/core"; import { FastReportRenderer } from "@erp/core/api"; +import { Result } from "@repo/rdx-utils"; export type IssuedInvoiceReportPDFRendererParams = { companySlug: string; @@ -10,10 +11,10 @@ export class IssuedInvoiceReportPDFRenderer extends FastReportRenderer { protected readonly templateName = "issued-invoice.frx"; protected companySlug!: string; - render(source: DTO, params: IssuedInvoiceReportPDFRendererParams) { + async render(source: DTO, params: IssuedInvoiceReportPDFRendererParams) { this.companySlug = params.companySlug; - return this.renderInternal({ + const callResult = await this.renderInternal({ inputData: source, format: "PDF", storageKey: { @@ -22,6 +23,17 @@ export class IssuedInvoiceReportPDFRenderer extends FastReportRenderer { format: "PDF", }, }); + + if (callResult.isFailure) { + return Result.fail(callResult.error); + } + + const { payload, templateChecksum } = callResult.data; + + return Result.ok({ + payload, + templateChecksum, + }); } protected resolveTemplatePath(): string { diff --git a/modules/customer-invoices/templates/rodax/issued-invoice.frx b/modules/customer-invoices/templates/rodax/issued-invoice.frx index d8d56778..a2970b97 100644 --- a/modules/customer-invoices/templates/rodax/issued-invoice.frx +++ b/modules/customer-invoices/templates/rodax/issued-invoice.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -23,7 +23,7 @@ namespace FastReport } - + @@ -175,22 +175,22 @@ namespace FastReport - - + + - - + + - - - + + + - - - + + + @@ -205,24 +205,24 @@ namespace FastReport - + - + - - + + - - + + - + diff --git a/packages/rdx-criteria/package.json b/packages/rdx-criteria/package.json index 25b4a012..0a00605b 100644 --- a/packages/rdx-criteria/package.json +++ b/packages/rdx-criteria/package.json @@ -1,6 +1,6 @@ { "name": "@repo/rdx-criteria", - "version": "0.1.7", + "version": "0.2.7", "private": true, "type": "module", "sideEffects": false, diff --git a/packages/rdx-ddd/package.json b/packages/rdx-ddd/package.json index 6d0738d7..1cf14520 100644 --- a/packages/rdx-ddd/package.json +++ b/packages/rdx-ddd/package.json @@ -1,6 +1,6 @@ { "name": "@repo/rdx-ddd", - "version": "0.1.7", + "version": "0.2.7", "private": true, "type": "module", "sideEffects": false, diff --git a/packages/rdx-logger/package.json b/packages/rdx-logger/package.json index 9493b35e..66be1e42 100644 --- a/packages/rdx-logger/package.json +++ b/packages/rdx-logger/package.json @@ -1,6 +1,6 @@ { "name": "@repo/rdx-logger", - "version": "0.1.7", + "version": "0.2.7", "private": true, "type": "module", "sideEffects": false, diff --git a/packages/rdx-utils/package.json b/packages/rdx-utils/package.json index ba95e642..b1890854 100644 --- a/packages/rdx-utils/package.json +++ b/packages/rdx-utils/package.json @@ -1,6 +1,6 @@ { "name": "@repo/rdx-utils", - "version": "0.1.7", + "version": "0.2.7", "private": true, "type": "module", "sideEffects": false, diff --git a/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator b/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator index 3b101ace..e221ce0c 100755 Binary files a/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator and b/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/linux/FastReportCliGenerator differ diff --git a/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/windows/FastReportCliGenerator.exe b/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/windows/FastReportCliGenerator.exe index 88707477..0fb4b180 100755 Binary files a/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/windows/FastReportCliGenerator.exe and b/tools/fastreportcli-net-core-skia/FastReportCliGenerator/publish/windows/FastReportCliGenerator.exe differ