From 8999ed1bf0240646f55b40ca2df37ba6101d0e98 Mon Sep 17 00:00:00 2001 From: shancheas Date: Mon, 5 Aug 2024 14:43:42 +0700 Subject: [PATCH] fix: error image and typo --- .../templates/helpers/generate-pdf.helper.ts | 10 +-- .../export/domain/templates/image}/logo.jpeg | Bin .../domain/templates/invoice.template.ts | 66 +++++++++--------- .../mail/domain/helpers/send-email.helper.ts | 2 +- .../mail/infrastructure/mail.controller.ts | 4 +- .../managers/recap-reconciliation.manager.ts | 6 +- 6 files changed, 43 insertions(+), 45 deletions(-) rename {image => src/modules/configuration/export/domain/templates/image}/logo.jpeg (100%) diff --git a/src/modules/configuration/export/domain/templates/helpers/generate-pdf.helper.ts b/src/modules/configuration/export/domain/templates/helpers/generate-pdf.helper.ts index aab5da3..3326b7a 100644 --- a/src/modules/configuration/export/domain/templates/helpers/generate-pdf.helper.ts +++ b/src/modules/configuration/export/domain/templates/helpers/generate-pdf.helper.ts @@ -1,9 +1,9 @@ -import { InvoiceTempalte } from '../invoice.template'; -const PdfPrinter = require('pdfmake'); -const { PassThrough } = require('stream'); +import { InvoiceTemplate } from '../invoice.template'; +import * as PdfPrinter from 'pdfmake'; +import { PassThrough } from 'stream'; export async function GeneratePdf(transaction, invoiceType, banks) { - var fonts = { + const fonts = { Roboto: { normal: './fonts/Roboto-Regular.ttf', bold: './fonts/Roboto-Medium.ttf', @@ -14,7 +14,7 @@ export async function GeneratePdf(transaction, invoiceType, banks) { const printer = new PdfPrinter(fonts); - const docDefinition = InvoiceTempalte(transaction, invoiceType, banks); + const docDefinition = InvoiceTemplate(transaction, invoiceType, banks); const createPdfBuffer = (docDefinition) => { return new Promise((resolve, reject) => { diff --git a/image/logo.jpeg b/src/modules/configuration/export/domain/templates/image/logo.jpeg similarity index 100% rename from image/logo.jpeg rename to src/modules/configuration/export/domain/templates/image/logo.jpeg diff --git a/src/modules/configuration/export/domain/templates/invoice.template.ts b/src/modules/configuration/export/domain/templates/invoice.template.ts index ba639dc..5b22eb9 100644 --- a/src/modules/configuration/export/domain/templates/invoice.template.ts +++ b/src/modules/configuration/export/domain/templates/invoice.template.ts @@ -11,7 +11,7 @@ import { InvoiceType } from '../../constants'; import { PaymentMethodEntity } from 'src/modules/transaction/payment-method/domain/entities/payment-method.entity'; import * as fs from 'fs'; -export function InvoiceTempalte( +export function InvoiceTemplate( transaction: TransactionEntity, invoiceType: InvoiceType, banks: PaymentMethodEntity[], @@ -52,37 +52,37 @@ export function InvoiceTempalte( { layout: { defaultBorder: false, - hLineWidth: function (i, node) { + hLineWidth: function () { return 1; }, - vLineWidth: function (i, node) { + vLineWidth: function () { return 1; }, - hLineColor: function (i, node) { + hLineColor: function (i) { return i === 0 ? '#000000' : '#eaeaea'; }, - vLineColor: function (i, node) { + vLineColor: function () { return '#eaeaea'; }, - hLineStyle: function (i, node) { + hLineStyle: function () { // if (i === 0 || i === node.table.body.length) { return null; //} }, // vLineStyle: function (i, node) { return {dash: { length: 10, space: 4 }}; }, - paddingLeft: function (i, node) { + paddingLeft: function () { return 10; }, - paddingRight: function (i, node) { + paddingRight: function () { return 10; }, - paddingTop: function (i, node) { + paddingTop: function () { return 3; }, - paddingBottom: function (i, node) { + paddingBottom: function () { return 3; }, - fillColor: function (rowIndex, node, columnIndex) { + fillColor: function () { return '#fff'; }, }, @@ -95,37 +95,37 @@ export function InvoiceTempalte( { layout: { defaultBorder: false, - hLineWidth: function (i, node) { + hLineWidth: function () { return 1; }, - vLineWidth: function (i, node) { + vLineWidth: function () { return 1; }, - hLineColor: function (i, node) { + hLineColor: function (i) { return i === 3 ? '#000000' : '#eaeaea'; }, - vLineColor: function (i, node) { + vLineColor: function () { return '#eaeaea'; }, - hLineStyle: function (i, node) { + hLineStyle: function () { // if (i === 0 || i === node.table.body.length) { return null; //} }, - // vLineStyle: function (i, node) { return {dash: { length: 10, space: 4 }}; }, - paddingLeft: function (i, node) { + // vLineStyle: function () { return {dash: { length: 10, space: 4 }}; }, + paddingLeft: function () { return 10; }, - paddingRight: function (i, node) { + paddingRight: function () { return 10; }, - paddingTop: function (i, node) { + paddingTop: function () { return 3; }, - paddingBottom: function (i, node) { + paddingBottom: function (i) { return i === 2 ? 20 : 3; }, - fillColor: function (rowIndex, node, columnIndex) { + fillColor: function () { return '#fff'; }, }, @@ -145,37 +145,37 @@ export function InvoiceTempalte( { layout: { defaultBorder: false, - hLineWidth: function (i, node) { + hLineWidth: function () { return 1; }, - vLineWidth: function (i, node) { + vLineWidth: function () { return 1; }, - hLineColor: function (i, node) { + hLineColor: function (i) { return i === 0 ? '#000000' : '#eaeaea'; }, - vLineColor: function (i, node) { + vLineColor: function () { return '#eaeaea'; }, - hLineStyle: function (i, node) { + hLineStyle: function () { // if (i === 0 || i === node.table.body.length) { return null; //} }, - // vLineStyle: function (i, node) { return {dash: { length: 10, space: 4 }}; }, - paddingLeft: function (i, node) { + // vLineStyle: function () { return {dash: { length: 10, space: 4 }}; }, + paddingLeft: function () { return 10; }, - paddingRight: function (i, node) { + paddingRight: function () { return 10; }, - paddingTop: function (i, node) { + paddingTop: function () { return 20; }, - paddingBottom: function (i, node) { + paddingBottom: function () { return 3; }, - fillColor: function (rowIndex, node, columnIndex) { + fillColor: function () { return '#fff'; }, }, diff --git a/src/modules/configuration/mail/domain/helpers/send-email.helper.ts b/src/modules/configuration/mail/domain/helpers/send-email.helper.ts index 0166d3a..681e7a6 100644 --- a/src/modules/configuration/mail/domain/helpers/send-email.helper.ts +++ b/src/modules/configuration/mail/domain/helpers/send-email.helper.ts @@ -44,7 +44,7 @@ export async function sendEmail(receivers, invoiceType, attachment?) { await new Promise((f) => setTimeout(f, 2000)); - smtpTransport.sendMail(emailContext, function (err, data) { + smtpTransport.sendMail(emailContext, function (err) { if (err) { console.log(err, `Error occurs on send to ${receiver.email}`); } else { diff --git a/src/modules/configuration/mail/infrastructure/mail.controller.ts b/src/modules/configuration/mail/infrastructure/mail.controller.ts index 75e6d82..c2afa9d 100644 --- a/src/modules/configuration/mail/infrastructure/mail.controller.ts +++ b/src/modules/configuration/mail/infrastructure/mail.controller.ts @@ -9,8 +9,6 @@ import * as fs from 'fs'; @Public() @Injectable() export class MailTemplateController { - constructor() {} - getTemplate(templateName) { const templatePath = path.join( __dirname, @@ -52,6 +50,6 @@ export class MailTemplateController { @Get('refund-request') async getRefundRequest() { - return this.getTemplate('refunr-request'); + return this.getTemplate('refund-request'); } } diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts index 9b9418e..8c584c7 100644 --- a/src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts +++ b/src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts @@ -4,7 +4,7 @@ import { EventTopics } from 'src/core/strings/constants/interface.constants'; import { TransactionType } from 'src/modules/transaction/transaction/constants'; import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model'; import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity'; -import { Between, ILike } from 'typeorm'; +import { Between } from 'typeorm'; import * as _ from 'lodash'; import * as moment from 'moment'; import { EMPTY_UUID, STATUS } from 'src/core/strings/constants/base.constants'; @@ -35,7 +35,7 @@ export class RecapReconciliationManager extends BaseCustomManager