diff --git a/packages/server/src/constants/event-tracker.ts b/packages/server/src/constants/event-tracker.ts index 3fafc76a6..d5d21a508 100644 --- a/packages/server/src/constants/event-tracker.ts +++ b/packages/server/src/constants/event-tracker.ts @@ -1,5 +1,5 @@ export const SALE_INVOICE_CREATED = 'Sale invoice created'; -export const SALE_INVOICE_EDITED = 'Sale invoice d'; +export const SALE_INVOICE_EDITED = 'Sale invoice edited'; export const SALE_INVOICE_DELETED = 'Sale invoice deleted'; export const SALE_INVOICE_MAIL_DELIVERED = 'Sale invoice mail delivered'; diff --git a/packages/server/src/services/Sales/Estimates/SaleEstimatesPdf.ts b/packages/server/src/services/Sales/Estimates/SaleEstimatesPdf.ts index ef89fc919..36e4bf8f0 100644 --- a/packages/server/src/services/Sales/Estimates/SaleEstimatesPdf.ts +++ b/packages/server/src/services/Sales/Estimates/SaleEstimatesPdf.ts @@ -43,9 +43,10 @@ export class SaleEstimatesPdf { } /** - * - * @param {number} tenantId - * @param {number} estimateId + * Retrieves the given estimate branding attributes. + * @param {number} tenantId - Tenant id. + * @param {number} estimateId - Estimate id. + * @returns {Promise} */ async getEstimateBrandingAttributes( tenantId: number, diff --git a/packages/server/src/services/Sales/Receipts/SaleReceiptsPdfService.ts b/packages/server/src/services/Sales/Receipts/SaleReceiptsPdfService.ts index c72c9b0c0..7b056c1c5 100644 --- a/packages/server/src/services/Sales/Receipts/SaleReceiptsPdfService.ts +++ b/packages/server/src/services/Sales/Receipts/SaleReceiptsPdfService.ts @@ -5,6 +5,7 @@ import { GetSaleReceipt } from './GetSaleReceipt'; import HasTenancyService from '@/services/Tenancy/TenancyService'; import { SaleReceiptBrandingTemplate } from './SaleReceiptBrandingTemplate'; import { transformReceiptToBrandingTemplateAttributes } from './utils'; +import { ISaleReceiptBrandingTemplateAttributes } from '@/interfaces'; @Service() export class SaleReceiptsPdf { @@ -34,26 +35,26 @@ export class SaleReceiptsPdf { tenantId, saleReceiptId ); - console.log(brandingAttributes, 'attributes'); - + // Converts the receipt template to html content. const htmlContent = await this.templateInjectable.render( tenantId, 'modules/receipt-regular', brandingAttributes ); + // Renders the html content to pdf document. return this.chromiumlyTenancy.convertHtmlContent(tenantId, htmlContent); } /** * Retrieves receipt branding attributes. * @param {number} tenantId - * @param {number] receiptId - * @returns + * @param {number} receiptId + * @returns {Promise} */ public async getReceiptBrandingAttributes( tenantId: number, receiptId: number - ) { + ): Promise { const { PdfTemplate } = this.tenancy.models(tenantId); const saleReceipt = await this.getSaleReceiptService.getSaleReceipt( diff --git a/packages/webapp/src/containers/BrandingTemplates/alerts/MarkDefaultBrandingTemplateAlert.tsx b/packages/webapp/src/containers/BrandingTemplates/alerts/MarkDefaultBrandingTemplateAlert.tsx index 41b9c8244..8329c0f02 100644 --- a/packages/webapp/src/containers/BrandingTemplates/alerts/MarkDefaultBrandingTemplateAlert.tsx +++ b/packages/webapp/src/containers/BrandingTemplates/alerts/MarkDefaultBrandingTemplateAlert.tsx @@ -32,7 +32,7 @@ function MarkDefaultBrandingTemplateAlert({ .then(() => { AppToaster.show({ message: - 'The branding template has been marked as default successfully.', + 'The branding template has been marked as a default template.', intent: Intent.SUCCESS, }); closeAlert(name); @@ -60,8 +60,7 @@ function MarkDefaultBrandingTemplateAlert({ onConfirm={handleConfirmDelete} >

- Are you sure want to mark the given branding template as default - template? + Are you sure want to mark the given branding template as a default template?

); diff --git a/packages/webapp/src/style/components/DataTable/DataTable.scss b/packages/webapp/src/style/components/DataTable/DataTable.scss index 3d6387028..a96d7a003 100644 --- a/packages/webapp/src/style/components/DataTable/DataTable.scss +++ b/packages/webapp/src/style/components/DataTable/DataTable.scss @@ -20,7 +20,7 @@ .th { padding: 0.68rem 0.5rem; - background: #f6f7f9; + background: #f5f5f5; font-size: 14px; color: #424853; font-weight: 400;