QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 05:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Pdf branding templates request data

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-10-07 16:03:56 +02:00
parent bbdfe00c7a
commit 9edfb83221
20 changed files with 142 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptCustomizeContent.tsx
View File

@@ -2,12 +2,13 @@ import { useFormikContext } from 'formik';
import { ElementCustomize } from '@/containers/ElementCustomize/ElementCustomize';
import { ReceiptCustomizeGeneralField } from './ReceiptCustomizeFieldsGeneral';
import { ReceiptCustomizeFieldsContent } from './ReceiptCustomizeFieldsContent';
import { ReceiptPaperTemplate } from './ReceiptPaperTemplate';
import { ReceiptCustomizeValues } from './types';
import { ReceiptPaperTemplate, ReceiptPaperTemplateProps } from './ReceiptPaperTemplate';
import { EstimateBrandingState, ReceiptCustomizeValues } from './types';
import { initialValues } from './constants';
import { BrandingTemplateForm } from '@/containers/BrandingTemplates/BrandingTemplateForm';
import { useDrawerActions } from '@/hooks/state';
import { useDrawerContext } from '@/components/Drawer/DrawerProvider';
import { useElementCustomizeContext } from '@/containers/ElementCustomize/ElementCustomizeProvider';
export function ReceiptCustomizeContent() {
const { payload, name } = useDrawerContext();
@@ -19,7 +20,7 @@ export function ReceiptCustomizeContent() {
};
return (
<BrandingTemplateForm<ReceiptCustomizeValues>
<BrandingTemplateForm<ReceiptCustomizeValues, EstimateBrandingState>
resource={'SaleReceipt'}
templateId={templateId}
defaultValues={initialValues}
@@ -42,6 +43,9 @@ export function ReceiptCustomizeContent() {
function ReceiptPaperTemplateFormConnected() {
const { values } = useFormikContext<ReceiptCustomizeValues>();
const { brandingState } = useElementCustomizeContext();
return <ReceiptPaperTemplate {...values} />;
const mergedProps: ReceiptPaperTemplateProps = { ...brandingState, ...values, };
return <ReceiptPaperTemplate {...mergedProps} />;
}

3
packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/constants.ts
View File

@@ -18,9 +18,6 @@ export const initialValues = {
showReceiptDate: true,
receiptDateLabel: 'Date of Issue',
// Company name
companyName: 'Bigcapital Technology, Inc.',
// Customer address
showCustomerAddress: true,

9
packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/types.ts
View File

@@ -1,4 +1,8 @@
import { BrandingTemplateValues } from "@/containers/BrandingTemplates/types";
import { BrandingState, BrandingTemplateValues } from "@/containers/BrandingTemplates/types";
export interface EstimateBrandingState extends BrandingState {
}
export interface ReceiptCustomizeValues extends BrandingTemplateValues {
// Colors
@@ -16,9 +20,6 @@ export interface ReceiptCustomizeValues extends BrandingTemplateValues {
showReceiptDate?: boolean;
receiptDateLabel?: string;
// Company name
companyName?: string;
// Addresses
showBilledFromAddress?: boolean;
showBilledToAddress?: boolean;