Merge pull request #755 from bigcapitalhq/fix-upload-attachments

hotbug: upload attachments

packages/server/src/api/controllers/Purchases/Bills.ts

@@ -121,7 +121,7 @@ export default class BillsController extends BaseController {
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()

packages/server/src/api/controllers/Purchases/VendorCredit.ts

@@ -170,7 +170,7 @@ export default class VendorCreditController extends BaseController {
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()
@@ -209,7 +209,7 @@ export default class VendorCreditController extends BaseController {
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()

packages/server/src/api/controllers/Sales/CreditNotes.ts

@@ -233,7 +233,7 @@ export default class PaymentReceivesController extends BaseController {
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()
@@ -755,9 +755,8 @@ export default class PaymentReceivesController extends BaseController {
     const { tenantId } = req;
 
     try {
-      const data = await this.getCreditNoteStateService.getCreditNoteState(
+      const data =
-        tenantId
+        await this.getCreditNoteStateService.getCreditNoteState(tenantId);
-      );
       return res.status(200).send({ data });
     } catch (error) {
       next(error);

packages/server/src/api/controllers/Sales/SalesEstimates.ts

@@ -172,7 +172,7 @@ export default class SalesEstimatesController extends BaseController {
       check('entries').exists().isArray({ min: 1 }),
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
       check('entries.*.description').optional({ nullable: true }).trim(),
       check('entries.*.discount')
@@ -562,9 +562,8 @@ export default class SalesEstimatesController extends BaseController {
     const { tenantId } = req;
 
     try {
-      const data = await this.saleEstimatesApplication.getSaleEstimateState(
+      const data =
-        tenantId
+        await this.saleEstimatesApplication.getSaleEstimateState(tenantId);
-      );
       return res.status(200).send({ data });
     } catch (error) {
       next(error);

packages/server/src/api/controllers/Sales/SalesReceipts.ts

@@ -148,7 +148,7 @@ export default class SalesReceiptsController extends BaseController {
       check('entries.*.id').optional({ nullable: true }).isNumeric().toInt(),
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
@@ -392,9 +392,8 @@ export default class SalesReceiptsController extends BaseController {
 
     // Retrieves receipt in pdf format.
     try {
-      const data = await this.saleReceiptsApplication.getSaleReceiptState(
+      const data =
-        tenantId
+        await this.saleReceiptsApplication.getSaleReceiptState(tenantId);
-      );
       return res.status(200).send({ data });
     } catch (error) {
       next(error);

packages/server/src/api/controllers/ShareLink/PublicSharableLinkController.ts

@@ -102,12 +102,13 @@ export class PublicSharableLinkController extends BaseController {
     const { paymentLinkId } = req.params;
 
     try {
-      const pdfContent = await this.paymentLinkApp.getPaymentLinkInvoicePdf(
+      const [pdfContent, filename] =
-        paymentLinkId
+        await this.paymentLinkApp.getPaymentLinkInvoicePdf(paymentLinkId);
-      );
+
       res.set({
         'Content-Type': 'application/pdf',
         'Content-Length': pdfContent.length,
+        'Content-Disposition': `attachment; filename="${filename}"`,
       });
       res.send(pdfContent);
     } catch (error) {

packages/server/src/database/migrations/20241113113437_change_quantity_in_items_entries_to_decimal.js

@@ -0,0 +1,39 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema
+    .table('items_entries', (table) => {
+      table.decimal('quantity', 13, 3).alter();
+    })
+    .table('inventory_transactions', (table) => {
+      table.decimal('quantity', 13, 3).alter();
+    })
+    .table('inventory_cost_lot_tracker', (table) => {
+      table.decimal('quantity', 13, 3).alter();
+    })
+    .table('items', (table) => {
+      table.decimal('quantityOnHand', 13, 3).alter();
+    });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema
+    .table('items_entries', (table) => {
+      table.integer('quantity').alter();
+    })
+    .table('inventory_transactions', (table) => {
+      table.integer('quantity').alter();
+    })
+    .table('inventory_cost_lot_tracker', (table) => {
+      table.integer('quantity').alter();
+    })
+    .table('items', (table) => {
+      table.integer('quantityOnHand').alter();
+    });
+};

packages/server/src/services/PaymentLinks/GetInvoicePaymentLinkMetadata.ts

@@ -25,7 +25,7 @@ export class GetInvoicePaymentLinkMetadata {
       .findOne('linkId', linkId)
       .where('resourceType', 'SaleInvoice')
       .throwIfNotFound();
- 
+
     // Validate the expiry at date.
     if (paymentLink.expiryAt) {
       const currentDate = moment();
@@ -46,6 +46,7 @@ export class GetInvoicePaymentLinkMetadata {
       .withGraphFetched('customer')
       .withGraphFetched('taxes.taxRate')
       .withGraphFetched('paymentMethods.paymentIntegration')
+      .withGraphFetched('pdfTemplate')
       .throwIfNotFound();
 
     return this.transformer.transform(

packages/server/src/services/PaymentLinks/GetPaymentLinkInvoicePdf.ts

@@ -12,9 +12,11 @@ export class GetPaymentLinkInvoicePdf {
    * Retrieves the sale invoice PDF of the given payment link id.
    * @param {number} tenantId
    * @param {number} paymentLinkId
-   * @returns {Promise<Buffer>}
+   * @returns {Promise<Buffer, string>}
    */
-  async getPaymentLinkInvoicePdf(paymentLinkId: string): Promise<Buffer> {
+  async getPaymentLinkInvoicePdf(
+    paymentLinkId: string
+  ): Promise<[Buffer, string]> {
     const paymentLink = await PaymentLink.query()
       .findOne('linkId', paymentLinkId)
       .where('resourceType', 'SaleInvoice')

packages/server/src/services/PaymentLinks/PaymentLinksApplication.ts

@@ -11,7 +11,7 @@ export class PaymentLinksApplication {
 
   @Inject()
   private createInvoiceCheckoutSessionService: CreateInvoiceCheckoutSession;
-  
+
   @Inject()
   private getPaymentLinkInvoicePdfService: GetPaymentLinkInvoicePdf;
 
@@ -45,7 +45,9 @@ export class PaymentLinksApplication {
    * @param {number} paymentLinkId
    * @returns {Promise<Buffer> }
    */
-  public getPaymentLinkInvoicePdf(paymentLinkId: string): Promise<Buffer> {
+  public getPaymentLinkInvoicePdf(
+    paymentLinkId: string
+  ): Promise<[Buffer, string]> {
     return this.getPaymentLinkInvoicePdfService.getPaymentLinkInvoicePdf(
       paymentLinkId
     );

packages/server/src/services/Sales/Invoices/GetInvoicePaymentLinkTransformer.ts

@@ -4,6 +4,7 @@ import { SaleInvoiceTaxEntryTransformer } from './SaleInvoiceTaxEntryTransformer
 import { SaleInvoiceTransformer } from './SaleInvoiceTransformer';
 import { Transformer } from '@/lib/Transformer/Transformer';
 import { contactAddressTextFormat } from '@/utils/address-text-format';
+import { GetPdfTemplateTransformer } from '@/services/PdfTemplate/GetPdfTemplateTransformer';
 
 export class GetInvoicePaymentLinkMetaTransformer extends SaleInvoiceTransformer {
   /**
@@ -45,6 +46,7 @@ export class GetInvoicePaymentLinkMetaTransformer extends SaleInvoiceTransformer
       'isReceivable',
       'hasStripePaymentMethod',
       'formattedCustomerAddress',
+      'brandingTemplate',
     ];
   };
 
@@ -63,6 +65,18 @@ export class GetInvoicePaymentLinkMetaTransformer extends SaleInvoiceTransformer
     );
   }
 
+  /**
+   * Retrieves the branding template for the payment link.
+   * @param {} invoice
+   * @returns
+   */
+  public brandingTemplate(invoice) {
+    return this.item(
+      invoice.pdfTemplate,
+      new GetInvoicePaymentLinkBrandingTemplate()
+    );
+  }
+
   /**
    * Retrieves the entries of the sale invoice.
    * @param {ISaleInvoice} invoice
@@ -114,7 +128,7 @@ export class GetInvoicePaymentLinkMetaTransformer extends SaleInvoiceTransformer
 
   /**
    * Retrieves the formatted customer address.
-   * @param invoice 
+   * @param invoice
    * @returns {string}
    */
   protected formattedCustomerAddress(invoice) {
@@ -193,3 +207,17 @@ class GetInvoicePaymentLinkTaxEntryTransformer extends SaleInvoiceTaxEntryTransf
     return ['name', 'taxRateCode', 'taxRateAmount', 'taxRateAmountFormatted'];
   };
 }
+
+class GetInvoicePaymentLinkBrandingTemplate extends GetPdfTemplateTransformer {
+  public includeAttributes = (): string[] => {
+    return ['companyLogoUri', 'primaryColor'];
+  };
+
+  public excludeAttributes = (): string[] => {
+    return ['*'];
+  };
+
+  primaryColor = (template) => {
+    return template.attributes?.primaryColor;
+  };
+}

packages/webapp/src/components/DataTableCells/NumericInputCell.tsx

@@ -1,8 +1,6 @@
-// @ts-nocheck
 import React, { useState, useEffect } from 'react';
 import { FormGroup, NumericInput, Intent } from '@blueprintjs/core';
 import classNames from 'classnames';
-
 import { CellType } from '@/constants';
 import { CLASSES } from '@/constants/classes';
 
@@ -12,37 +10,44 @@ import { CLASSES } from '@/constants/classes';
 export default function NumericInputCell({
   row: { index },
   column: { id },
-  cell: { value: initialValue },
+  cell: { value: controlledInputValue },
   payload,
-}) {
+}: any) {
-  const [value, setValue] = useState(initialValue);
+  const [valueAsNumber, setValueAsNumber] = useState<number | null>(
+    controlledInputValue || null,
+  );
+  const handleInputValueChange = (
+    valueAsNumber: number,
+    valueAsString: string,
+  ) => {
+    setValueAsNumber(valueAsNumber);
+  };
+  const handleInputBlur = () => {
+    payload.updateData(index, id, valueAsNumber);
+  };
 
-  const handleValueChange = (newValue) => {
-    setValue(newValue);
-  };
-  const onBlur = () => {
-    payload.updateData(index, id, value);
-  };
   useEffect(() => {
-    setValue(initialValue);
+    setValueAsNumber(controlledInputValue);
-  }, [initialValue]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [controlledInputValue]);
 
   const error = payload.errors?.[index]?.[id];
 
   return (
     <FormGroup
-      intent={error ? Intent.DANGER : null}
+      intent={error ? Intent.DANGER : undefined}
       className={classNames(CLASSES.FILL)}
     >
       <NumericInput
-        value={value}
+        asyncControl
-        onValueChange={handleValueChange}
+        value={controlledInputValue}
-        onBlur={onBlur}
+        onValueChange={handleInputValueChange}
-        fill={true}
+        onBlur={handleInputBlur}
         buttonPosition={'none'}
+        fill
       />
     </FormGroup>
   );
 }
 
-NumericInputCell.cellType = CellType.Field;
+NumericInputCell.cellType = CellType.Field;

packages/webapp/src/containers/Accounting/MakeJournal/utils.tsx

@@ -4,7 +4,7 @@ import * as R from 'ramda';
 import moment from 'moment';
 import intl from 'react-intl-universal';
 import { Intent } from '@blueprintjs/core';
-import { sumBy, setWith, toSafeInteger, get, first } from 'lodash';
+import { sumBy, setWith, get, first, toNumber } from 'lodash';
 import {
   updateTableCell,
   repeatValue,
@@ -91,8 +91,8 @@ export function transformToEditForm(manualJournal) {
  * Entries adjustment.
  */
 function adjustmentEntries(entries) {
-  const credit = sumBy(entries, (e) => toSafeInteger(e.credit));
+  const credit = sumBy(entries, (e) => toNumber(e.credit));
-  const debit = sumBy(entries, (e) => toSafeInteger(e.debit));
+  const debit = sumBy(entries, (e) => toNumber(e.debit));
 
   return {
     debit: Math.max(credit - debit, 0),

packages/webapp/src/containers/Attachments/UploadAttachmentsPopoverContent.tsx

@@ -22,7 +22,7 @@ interface AttachmentFileCommon {
   size: number;
   mimeType: string;
 }
-interface AttachmentFileLoaded extends AttachmentFileCommon {}
+interface AttachmentFileLoaded extends AttachmentFileCommon { }
 interface AttachmentFileLoading extends AttachmentFileCommon {
   loading: boolean;
 }
@@ -74,11 +74,11 @@ export function UploadAttachmentsPopoverContent({
   };
   // Uploads the attachments.
   const { mutateAsync: uploadAttachments } = useUploadAttachments({
-    onSuccess: (data) => {
+    onSuccess: (data, formData) => {
       const newLocalFiles = stopLoadingAttachment(
         localFiles,
-        data.config.data.get('internalKey'),
+        formData.get('internalKey'),
-        data.data.data.key,
+        data.key,
       );
       handleFilesChange(newLocalFiles);
       onUploadedChange && onUploadedChange(newLocalFiles);

packages/webapp/src/containers/Drawers/BillDrawer/utils.tsx

@@ -13,7 +13,6 @@ import {
   Tag,
 } from '@blueprintjs/core';
 import {
-  FormatNumberCell,
   TextOverviewTooltipCell,
   FormattedMessage as T,
   Choose,
@@ -51,9 +50,8 @@ export const useBillReadonlyEntriesTableColumns = () => {
       },
       {
         Header: intl.get('quantity'),
-        accessor: 'quantity',
+        accessor: 'quantity_formatted',
-        Cell: FormatNumberCell,
+        width: getColumnWidth(entries, 'quantity_formatted', {
-        width: getColumnWidth(entries, 'quantity', {
           minWidth: 60,
           magicSpacing: 5,
         }),

packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/utils.tsx

@@ -48,9 +48,8 @@ export const useCreditNoteReadOnlyEntriesColumns = () => {
       },
       {
         Header: intl.get('quantity'),
-        accessor: 'quantity',
+        accessor: 'quantity_formatted',
-        Cell: FormatNumberCell,
+        width: getColumnWidth(entries, 'quantity_formatted', {
-        width: getColumnWidth(entries, 'quantity', {
           minWidth: 60,
           magicSpacing: 5,
         }),

packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/utils.tsx

@@ -54,11 +54,10 @@ export const useInvoiceReadonlyEntriesColumns = () => {
       {
         Header: intl.get('quantity'),
         accessor: 'quantity',
-        Cell: FormatNumberCell,
         align: 'right',
         disableSortBy: true,
         textOverview: true,
-        width: getColumnWidth(entries, 'quantity', {
+        width: getColumnWidth(entries, 'quantity_formatted', {
           minWidth: 60,
           magicSpacing: 5,
         }),

packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactions/components.tsx

@@ -72,7 +72,7 @@ export const useEstimateTransactionsColumns = () => {
       {
         id: 'qunatity',
         Header: intl.get('item.drawer_quantity_sold'),
-        accessor: 'quantity',
+        accessor: 'quantity_formatted',
         align: 'right',
         width: 100,
       },

packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/utils.tsx

@@ -31,9 +31,8 @@ export const useReceiptReadonlyEntriesTableColumns = () => {
       },
       {
         Header: intl.get('quantity'),
-        accessor: 'quantity',
+        accessor: 'quantity_formatted',
-        Cell: FormatNumberCell,
+        width: getColumnWidth(entries, 'quantity_formatted', {
-        width: getColumnWidth(entries, 'quantity', {
           minWidth: 60,
           magicSpacing: 5,
         }),

packages/webapp/src/containers/PaymentPortal/PaymentPortal.module.scss

@@ -1,6 +1,11 @@
 
+:root {
+  --payment-page-background-color: #fff;
+  --payment-page-primary-button: #0052cc;
+}
+
 .rootBodyPage {
-  background: #1c1d29;
+  background: var(--payment-page-background-color);
 }
 
 .root {

packages/webapp/src/containers/PaymentPortal/PaymentPortal.tsx

@@ -1,5 +1,6 @@
 import { Text, Classes, Button, Intent } from '@blueprintjs/core';
 import clsx from 'classnames';
+import { css } from '@emotion/css';
 import { AppToaster, Box, Group, Stack } from '@/components';
 import { usePaymentPortalBoot } from './PaymentPortalBoot';
 import { useDrawerActions } from '@/hooks/state';
@@ -66,11 +67,11 @@ export function PaymentPortal() {
       <Stack spacing={0} className={styles.body}>
         <Stack>
           <Group spacing={10}>
-            {sharableLinkMeta?.organization?.logoUri && (
+            {sharableLinkMeta?.brandingTemplate?.companyLogoUri && (
               <Box
                 className={styles.companyLogoWrap}
                 style={{
-                  backgroundImage: `url(${sharableLinkMeta?.organization?.logoUri})`,
+                  backgroundImage: `url(${sharableLinkMeta?.brandingTemplate?.companyLogoUri})`,
                 }}
               ></Box>
             )}
@@ -170,7 +171,22 @@ export function PaymentPortal() {
             sharableLinkMeta?.hasStripePaymentMethod && (
               <Button
                 intent={Intent.PRIMARY}
-                className={clsx(styles.footerButton, styles.buyButton)}
+                className={clsx(
+                  styles.footerButton,
+                  styles.buyButton,
+                  css`
+                    &.bp4-button.bp4-intent-primary {
+                      background-color: var(--payment-page-primary-button);
+
+                      &:hover,
+                      &:focus {
+                        background-color: var(
+                          --payment-page-primary-button-hover
+                        );
+                      }
+                    }
+                  `,
+                )}
                 loading={isStripeCheckoutLoading}
                 onClick={handlePayButtonClick}
               >

packages/webapp/src/containers/PaymentPortal/PaymentPortalPage.tsx

@@ -6,6 +6,8 @@ import { PaymentPortalBoot, usePaymentPortalBoot } from './PaymentPortalBoot';
 import { PaymentInvoicePreviewDrawer } from './drawers/PaymentInvoicePreviewDrawer/PaymentInvoicePreviewDrawer';
 import { DRAWERS } from '@/constants/drawers';
 import styles from './PaymentPortal.module.scss';
+import { useEffect } from 'react';
+import { hsl, lighten, parseToHsl } from 'polished';
 
 export default function PaymentPortalPage() {
   const { linkId } = useParams<{ linkId: string }>();
@@ -14,6 +16,7 @@ export default function PaymentPortalPage() {
     <BodyClassName className={styles.rootBodyPage}>
       <PaymentPortalBoot linkId={linkId}>
         <PaymentPortalHelmet />
+        <PaymentPortalCssVariables />
         <PaymentPortal />
         <PaymentInvoicePreviewDrawer name={DRAWERS.PAYMENT_INVOICE_PREVIEW} />
       </PaymentPortalBoot>
@@ -36,3 +39,33 @@ function PaymentPortalHelmet() {
     </Helmet>
   );
 }
+
+/**
+ * Renders the dynamic CSS variables for the current payment page.
+ * @returns {React.ReactNode}
+ */
+function PaymentPortalCssVariables() {
+  const { sharableLinkMeta } = usePaymentPortalBoot();
+
+  useEffect(() => {
+    if (sharableLinkMeta?.brandingTemplate?.primaryColor) {
+      const primaryColorHsl = parseToHsl(
+        sharableLinkMeta?.brandingTemplate?.primaryColor,
+      );
+      document.body.style.setProperty(
+        '--payment-page-background-color',
+        hsl(primaryColorHsl.hue, 0.19, 0.14),
+      );
+      document.body.style.setProperty(
+        '--payment-page-primary-button',
+        sharableLinkMeta?.brandingTemplate?.primaryColor,
+      );
+      document.body.style.setProperty(
+        '--payment-page-primary-button-hover',
+        lighten(0.05, sharableLinkMeta?.brandingTemplate?.primaryColor),
+      );
+    }
+  }, [sharableLinkMeta?.brandingTemplate?.primaryColor]);
+
+  return null;
+}

packages/webapp/src/hooks/query/payment-link.ts

@@ -106,6 +106,10 @@ export interface GetInvoicePaymentLinkResponse {
     taxRateAmountFormatted: string;
     taxRateCode: string;
   }>;
+  brandingTemplate: {
+    companyLogoUri: string;
+    primaryColor: string;
+  };
   organization: GetInvoicePaymentLinkOrganizationRes;
   hasStripePaymentMethod: boolean;
   isReceivable: boolean;