QT/bigcapital
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: Estimate customize values

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-10-07 17:20:45 +02:00
parent 682d40cbf8
commit d92b46aa7b
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/webapp/src/containers/BrandingTemplates/BrandingTemplateBoot.tsx
View File

@@ -11,7 +11,7 @@ interface PdfTemplateContextValue {
templateId: number | string;
// Pdf template.
pdfTemplate: GetPdfTemplateResponse;
pdfTemplate: GetPdfTemplateResponse | undefined;
isPdfTemplateLoading: boolean;
// Branding state.
@@ -42,8 +42,7 @@ export const BrandingTemplateBoot = ({
const isLoading = isPdfTemplateLoading ||
isBrandingTemplateLoading ||
!brandingTemplateState ||
!pdfTemplate;
!brandingTemplateState;
if (isLoading) {
return <Spinner size={20} />;

2
packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeContent.tsx
View File

@@ -49,7 +49,7 @@ function EstimatePaperTemplateFormConnected() {
const { values } = useFormikContext<EstimateCustomizeValues>();
const { brandingState } = useElementCustomizeContext()
const mergedProps: EstimatePaperTemplateProps = { ...values, ...brandingState }
const mergedProps: EstimatePaperTemplateProps = { ...brandingState, ...values, }
return <EstimatePaperTemplate {...mergedProps} />;
}

2
packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx
View File

@@ -63,7 +63,7 @@ const withInvoicePreviewTemplateProps = <P extends object>(
const { values } = useFormikContext<InvoiceCustomizeFormValues>();
const { brandingState, } = useElementCustomizeContext();
const mergedProps: InvoicePaperTemplateProps = { ...brandingState, ...values }
const mergedProps: InvoicePaperTemplateProps = { ...brandingState, ...values };
return <Component {...(props as P)} {...mergedProps} />;
};