@powerhousedao/contributor-billing 0.0.65 → 0.0.66

package/dist/document-models/invoice/src/reducers/items.js

@@ -35,6 +35,7 @@ export const reducer = {
                 ...sanitizedInput,
             };
             validatePrices(nextItem);
+            applyInvariants(state, nextItem);
             Object.assign(stateItem, nextItem);
             updateTotals(state);
         }
@@ -142,3 +143,53 @@ function validatePrices(item) {
         throw new Error("Tax inclusive/exclusive totals failed comparison.");
     }
 }
+const applyInvariants = (state, nextItem) => {
+    const EPSILON = 0.00001; // Small value for floating point comparisons
+    // Helper function to compare floating point numbers
+    const isClose = (a, b) => Math.abs(a - b) < EPSILON;
+    // Helper function to check if a value has changed significantly
+    const hasChanged = (oldValue, newValue) => !isClose(oldValue, newValue);
+    // Find the current state of this line item
+    const currentItem = state.lineItems.find(item => item.id === nextItem.id);
+    if (!currentItem) {
+        // New item, no comparison needed
+        return;
+    }
+    const taxRate = nextItem.taxPercent / 100;
+    // Check if totalPriceTaxExcl was changed and update unitPriceTaxExcl accordingly
+    const expectedTotalPriceTaxExcl = nextItem.quantity * nextItem.unitPriceTaxExcl;
+    if (hasChanged(expectedTotalPriceTaxExcl, nextItem.totalPriceTaxExcl)) {
+        // Total was changed, update unit price
+        nextItem.unitPriceTaxExcl = nextItem.totalPriceTaxExcl / nextItem.quantity;
+        // Update tax-inclusive unit price to maintain tax relationship
+        nextItem.unitPriceTaxIncl = nextItem.unitPriceTaxExcl * (1 + taxRate);
+        // Update tax-inclusive total to maintain consistency
+        nextItem.totalPriceTaxIncl = nextItem.quantity * nextItem.unitPriceTaxIncl;
+    }
+    // Check if totalPriceTaxIncl was changed and update unitPriceTaxIncl accordingly
+    const expectedTotalPriceTaxIncl = nextItem.quantity * nextItem.unitPriceTaxIncl;
+    if (hasChanged(expectedTotalPriceTaxIncl, nextItem.totalPriceTaxIncl)) {
+        // Total was changed, update unit price
+        nextItem.unitPriceTaxIncl = nextItem.totalPriceTaxIncl / nextItem.quantity;
+        // Update tax-exclusive unit price to maintain tax relationship
+        nextItem.unitPriceTaxExcl = nextItem.unitPriceTaxIncl / (1 + taxRate);
+        // Update tax-exclusive total to maintain consistency
+        nextItem.totalPriceTaxExcl = nextItem.quantity * nextItem.unitPriceTaxExcl;
+    }
+    // Check if unitPriceTaxExcl was changed and update totals accordingly
+    const expectedUnitPriceTaxIncl = nextItem.unitPriceTaxExcl * (1 + taxRate);
+    if (hasChanged(expectedUnitPriceTaxIncl, nextItem.unitPriceTaxIncl)) {
+        // Unit price was changed, update tax-inclusive unit price and totals
+        nextItem.unitPriceTaxIncl = nextItem.unitPriceTaxExcl * (1 + taxRate);
+        nextItem.totalPriceTaxExcl = nextItem.quantity * nextItem.unitPriceTaxExcl;
+        nextItem.totalPriceTaxIncl = nextItem.quantity * nextItem.unitPriceTaxIncl;
+    }
+    // Check if unitPriceTaxIncl was changed and update totals accordingly
+    const expectedUnitPriceTaxExcl = nextItem.unitPriceTaxIncl / (1 + taxRate);
+    if (hasChanged(expectedUnitPriceTaxExcl, nextItem.unitPriceTaxExcl)) {
+        // Unit price was changed, update tax-exclusive unit price and totals
+        nextItem.unitPriceTaxExcl = nextItem.unitPriceTaxIncl / (1 + taxRate);
+        nextItem.totalPriceTaxExcl = nextItem.quantity * nextItem.unitPriceTaxExcl;
+        nextItem.totalPriceTaxIncl = nextItem.quantity * nextItem.unitPriceTaxIncl;
+    }
+};

package/dist/editors/invoice/editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../../../editors/invoice/editor.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,wCAAwC,CAAC;AA6ChD,MAAM,MAAM,MAAM,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;AAElD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,KAAK,EAAE,MAAM,2CAu0B3C"}
+{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../../../editors/invoice/editor.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,wCAAwC,CAAC;AA6ChD,MAAM,MAAM,MAAM,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;AAElD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,KAAK,EAAE,MAAM,2CAu2B3C"}

package/dist/editors/invoice/editor.js

@@ -62,6 +62,7 @@ export default function Editor(props) {
     const [txnRef, setTxnRef] = useState("");
     const [paymentIssue, setPaymentIssue] = useState("");
     const [paymentAmount, setPaymentAmount] = useState("");
+    const [editingItemValues, setEditingItemValues] = useState(null);
     const prevStatus = useRef(state.status);
     useEffect(() => {
         setFiatMode(isFiatCurrency(state.currency));
@@ -84,15 +85,35 @@ export default function Editor(props) {
         };
     }, []);
     const itemsTotalTaxExcl = useMemo(() => {
-        return state.lineItems.reduce((total, lineItem) => {
-            return total + lineItem.quantity * lineItem.unitPriceTaxExcl;
+        let total = state.lineItems.reduce((sum, lineItem) => {
+            return sum + lineItem.quantity * lineItem.unitPriceTaxExcl;
         }, 0.0);
-    }, [state.lineItems]);
+        // If there's an item being edited, replace its contribution with the edited values
+        if (editingItemValues) {
+            const originalItem = state.lineItems.find(item => item.id === editingItemValues.id);
+            if (originalItem) {
+                // Subtract the original contribution and add the edited contribution
+                total = total - (originalItem.quantity * originalItem.unitPriceTaxExcl) +
+                    (editingItemValues.quantity * editingItemValues.unitPriceTaxExcl);
+            }
+        }
+        return total;
+    }, [state.lineItems, editingItemValues]);
     const itemsTotalTaxIncl = useMemo(() => {
-        return state.lineItems.reduce((total, lineItem) => {
-            return total + lineItem.quantity * lineItem.unitPriceTaxIncl;
+        let total = state.lineItems.reduce((sum, lineItem) => {
+            return sum + lineItem.quantity * lineItem.unitPriceTaxIncl;
         }, 0.0);
-    }, [state.lineItems]);
+        // If there's an item being edited, replace its contribution with the edited values
+        if (editingItemValues) {
+            const originalItem = state.lineItems.find(item => item.id === editingItemValues.id);
+            if (originalItem) {
+                // Subtract the original contribution and add the edited contribution
+                total = total - (originalItem.quantity * originalItem.unitPriceTaxIncl) +
+                    (editingItemValues.quantity * editingItemValues.unitPriceTaxIncl);
+            }
+        }
+        return total;
+    }, [state.lineItems, editingItemValues]);
     const STATUS_OPTIONS = [
         "DRAFT",
         "ISSUED",
@@ -354,7 +375,7 @@ export default function Editor(props) {
                     })), onAddItem: (item) => dispatch(actions.addLineItem(item)), onDeleteItem: (input) => dispatch(actions.deleteLineItem(input)), onUpdateCurrency: (input) => {
                         setFiatMode(input.currency !== "USDS");
                         dispatch(actions.editInvoice(input));
-                    }, onUpdateItem: (item) => dispatch(actions.editLineItem(item)), dispatch: dispatch, paymentAccounts: state.invoiceTags || [] }) }), _jsxs("div", { className: "grid grid-cols-2 md:grid-cols-2 gap-4", children: [_jsx("div", { className: "col-span-1", children: _jsx("div", { className: "", children: _jsx(Textarea, { label: "Notes", placeholder: "Add notes", autoExpand: false, rows: 4, multiline: true, value: notes, onBlur: (e) => {
+                    }, onUpdateItem: (item) => dispatch(actions.editLineItem(item)), onEditingItemChange: setEditingItemValues, dispatch: dispatch, paymentAccounts: state.invoiceTags || [] }) }), _jsxs("div", { className: "grid grid-cols-2 md:grid-cols-2 gap-4", children: [_jsx("div", { className: "col-span-1", children: _jsx("div", { className: "", children: _jsx(Textarea, { label: "Notes", placeholder: "Add notes", autoExpand: false, rows: 4, multiline: true, value: notes, onBlur: (e) => {
                                     const newValue = e.target.value;
                                     if (newValue !== state.notes) {
                                         dispatch(actions.editInvoice({ notes: newValue }));

package/dist/editors/invoice/ingestPDF.js

@@ -6,7 +6,7 @@ import { uploadPdfChunked } from "./uploadPdfChunked.js";
 import { getCountryCodeFromName } from "./utils/utils.js";
 let GRAPHQL_URL = 'http://localhost:4001/graphql/invoice';
 if (!window.document.baseURI.includes('localhost')) {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+    GRAPHQL_URL = 'https://switchboard-dev.powerhouse.xyz/graphql/invoice';
 }
 export async function loadPDFFile({ file, dispatch, }) {
     if (!file)

package/dist/editors/invoice/invoiceToGnosis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invoiceToGnosis.d.ts","sourceRoot":"","sources":["../../../editors/invoice/invoiceToGnosis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAYxC,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA6LnD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"invoiceToGnosis.d.ts","sourceRoot":"","sources":["../../../editors/invoice/invoiceToGnosis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAUxC,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAmQnD,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/editors/invoice/invoiceToGnosis.js

@@ -1,12 +1,12 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState } from "react";
-import { actions, } from "../../document-models/invoice/index.js";
+import { actions } from "../../document-models/invoice/index.js";
 import { generateId } from "document-model";
 let GRAPHQL_URL = "http://localhost:4001/graphql/invoice";
-if (!window.document.baseURI.includes('localhost')) {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+if (!window.document.baseURI.includes("localhost")) {
+    GRAPHQL_URL = "https://switchboard-dev.powerhouse.xyz/graphql/invoice";
 }
-const InvoiceToGnosis = ({ docState, dispatch }) => {
+const InvoiceToGnosis = ({ docState, dispatch, }) => {
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
     const [responseData, setResponseData] = useState(null);
@@ -14,6 +14,7 @@ const InvoiceToGnosis = ({ docState, dispatch }) => {
     const [safeTxHash, setsafeTxHash] = useState(null);
     const currency = docState.currency;
     const chainName = docState.issuer.paymentRouting.wallet.chainName;
+    const invoiceStatus = docState.status;
     const TOKEN_ADDRESSES = {
         BASE: {
             USDC: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
@@ -92,11 +93,19 @@ const InvoiceToGnosis = ({ docState, dispatch }) => {
             if (data.success) {
                 const dataObj = typeof data.data === "string" ? JSON.parse(data.data) : data.data;
                 setsafeTxHash(dataObj.txHash);
-                // add gnosis tx hash to invoice
-                dispatch(actions.schedulePayment({
-                    id: generateId(),
-                    processorRef: dataObj.txHash,
-                }));
+                if (invoiceStatus === "ACCEPTED") {
+                    dispatch(actions.schedulePayment({
+                        id: generateId(),
+                        processorRef: dataObj.txHash,
+                    }));
+                }
+                else {
+                    dispatch(actions.addPayment({
+                        id: generateId(),
+                        processorRef: dataObj.txHash,
+                        confirmed: false,
+                    }));
+                }
                 if (dataObj.paymentDetails) {
                     // Format the payment details for better readability
                     const formattedDetails = {
@@ -109,12 +118,24 @@ const InvoiceToGnosis = ({ docState, dispatch }) => {
             }
             else {
                 setError(data.error);
+                dispatch(actions.addPayment({
+                    id: generateId(),
+                    processorRef: "",
+                    confirmed: false,
+                    issue: data.error.message,
+                }));
             }
             setIsLoading(false);
         }
         catch (error) {
-            console.error("Error during transfer:", error);
             setIsLoading(false);
+            console.error("Error during transfer:", error);
+            dispatch(actions.addPayment({
+                id: generateId(),
+                processorRef: "",
+                confirmed: false,
+                issue: error.message,
+            }));
         }
     };
     if (!currency || !chainName || currency === "" || chainName === "") {
@@ -131,6 +152,15 @@ const InvoiceToGnosis = ({ docState, dispatch }) => {
         }
     };
     const urlChainName = parseChainName(chainName);
-    return (_jsxs("div", { className: "space-y-4", children: [currency && chainName && currency !== "" && chainName !== "" && (_jsx("button", { className: "bg-blue-500 text-black px-4 py-2 rounded-md hover:bg-blue-600", onClick: handleInvoiceToGnosis, disabled: isLoading, children: isLoading ? "Processing..." : "Send Payment to Gnosis >" })), error && (_jsx("div", { className: "text-red-500 bg-red-50 p-3 rounded-md", children: error })), safeTxHash && (_jsxs("div", { className: "bg-gray-50 p-4 rounded-md space-y-2", children: [_jsxs("p", { className: "font-medium", children: ["Safe Transaction Hash:", _jsx("span", { className: "font-mono text-sm ml-2 break-all", children: safeTxHash })] }), _jsx("a", { href: `https://app.safe.global/transactions/queue?safe=${urlChainName}:0xF130f741d4E3185b29412c65397363f8c23A0460`, target: "_blank", rel: "noopener noreferrer", className: "text-blue-500 hover:text-blue-600 underline block", children: "View Transaction" })] })), invoiceStatusResponse && (_jsxs("div", { className: "bg-gray-50 p-4 rounded-md", children: [_jsx("p", { className: "font-medium", children: "Payment Details:" }), _jsx("p", { className: "text-gray-700", children: invoiceStatusResponse })] }))] }));
+    const linkText = "Gnosis Safe [>]";
+    return (_jsxs("div", { className: "space-y-4", children: [currency && chainName && currency !== "" && chainName !== "" && (_jsx("button", { className: "bg-blue-500 text-black px-4 py-2 rounded-md hover:bg-blue-600", onClick: handleInvoiceToGnosis, disabled: isLoading, children: isLoading
+                    ? "Processing..."
+                    : invoiceStatus === "ACCEPTED"
+                        ? "Schedule Payment in Gnosis Safe"
+                        : "Reschedule Payment in Gnosis Safe" })), error && (_jsx("div", { className: "text-red-500 bg-red-50 p-3 rounded-md", children: error })), safeTxHash && (_jsxs("div", { className: "bg-gray-50 mt-4 rounded-md space-y-2", children: [_jsx("a", { href: `https://app.safe.global/transactions/queue?safe=${urlChainName}:0x1FB6bEF04230d67aF0e3455B997a28AFcCe1F45e`, target: "_blank", rel: "noopener noreferrer", className: "text-blue-500 hover:text-blue-600 underline block", children: linkText }), _jsxs("p", { className: "font-medium", children: ["Safe Transaction Hash:", _jsx("span", { className: "font-mono text-sm ml-2 break-all", children: safeTxHash })] })] })), !safeTxHash &&
+                !error &&
+                invoiceStatus === "PAYMENTSCHEDULED" &&
+                docState.payments.length > 0 && (_jsx(_Fragment, { children: docState.payments[docState.payments.length - 1].issue !== "" ? (_jsx("div", { className: "mt-4", children: _jsxs("p", { className: "text-red-700 font-medium", children: ["Issue: ", docState.payments[docState.payments.length - 1].issue] }) })) : (_jsxs("div", { className: "mt-4", children: [_jsx("div", { className: "invoice-link text-blue-900 hover:text-blue-600", children: _jsx("a", { className: "view-invoice-button", href: `https://app.safe.global/transactions/queue?safe=${urlChainName}:0x1FB6bEF04230d67aF0e3455B997a28AFcCe1F45e`, target: "_blank", rel: "noopener noreferrer", children: linkText }) }), _jsxs("p", { className: "mt-4 font-medium", children: ["Safe Transaction Hash:", _jsx("span", { className: "font-mono text-sm ml-2 break-all", children: docState.payments[docState.payments.length - 1]
+                                        .processorRef })] })] })) })), invoiceStatusResponse && (_jsxs("div", { className: "bg-gray-50 p-4 rounded-md", children: [_jsx("p", { className: "font-medium", children: "Payment Details:" }), _jsx("p", { className: "text-gray-700", children: invoiceStatusResponse })] }))] }));
 };
 export default InvoiceToGnosis;

package/dist/editors/invoice/lineItems.d.ts

@@ -20,9 +20,15 @@ type LineItemsTableProps = {
     readonly onUpdateItem: (item: LineItem) => void;
     readonly onDeleteItem: (input: DeleteLineItemInput) => void;
     readonly onUpdateCurrency: (input: EditInvoiceInput) => void;
+    readonly onEditingItemChange?: (values: {
+        id: string;
+        quantity: number;
+        unitPriceTaxExcl: number;
+        unitPriceTaxIncl: number;
+    } | null) => void;
     readonly dispatch: Dispatch<any>;
     readonly paymentAccounts: InvoiceTag[];
 };
-export declare function LineItemsTable({ lineItems, currency, onAddItem, onUpdateItem, onDeleteItem, onUpdateCurrency, dispatch, paymentAccounts, }: LineItemsTableProps): import("react/jsx-runtime").JSX.Element;
+export declare function LineItemsTable({ lineItems, currency, onAddItem, onUpdateItem, onDeleteItem, onUpdateCurrency, onEditingItemChange, dispatch, paymentAccounts, }: LineItemsTableProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=lineItems.d.ts.map

package/dist/editors/invoice/lineItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lineItems.d.ts","sourceRoot":"","sources":["../../../editors/invoice/lineItems.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,UAAU,EAChB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAKL,KAAK,QAAQ,EACd,MAAM,OAAO,CAAC;AAaf,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAsBlD;AAED,KAAK,QAAQ,GAAG;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAC;AAwNF,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IAC7C,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC5D,QAAQ,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC7D,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,UAAU,EAAE,CAAC;CACxC,CAAC;AAEF,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACR,eAAe,GAChB,EAAE,mBAAmB,2CA6LrB"}
+{"version":3,"file":"lineItems.d.ts","sourceRoot":"","sources":["../../../editors/invoice/lineItems.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,UAAU,EAChB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAKL,KAAK,QAAQ,EAEd,MAAM,OAAO,CAAC;AAYf,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKlD;AAED,KAAK,QAAQ,GAAG;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAC;AA+aF,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IAC7C,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC5D,QAAQ,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC7D,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAC7B,MAAM,EAAE;QACN,EAAE,EAAE,MAAM,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,MAAM,CAAC;QACzB,gBAAgB,EAAE,MAAM,CAAC;KAC1B,GAAG,IAAI,KACL,IAAI,CAAC;IACV,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,UAAU,EAAE,CAAC;CACxC,CAAC;AAEF,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,QAAQ,EACR,eAAe,GAChB,EAAE,mBAAmB,2CA+LrB"}

package/dist/editors/invoice/lineItems.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { RWAButton } from "@powerhousedao/design-system";
-import { forwardRef, useState, useMemo, useRef, } from "react";
+import { forwardRef, useState, useMemo, useRef, useEffect, } from "react";
 import { generateId } from "document-model";
 import { Tag } from "lucide-react";
 import { NumberForm } from "./components/numberForm.js";
@@ -11,33 +11,21 @@ function getCurrencyPrecision(currency) {
     return currency === "USDS" || currency === "DAI" ? 6 : 2;
 }
 export function formatNumber(value) {
-    // Check if the value has decimal places
-    const hasDecimals = value % 1 !== 0;
-    // If no decimals or only trailing zeros after 2 decimal places, show 2 decimal places
-    if (!hasDecimals || value.toFixed(5).endsWith("000")) {
-        return value.toLocaleString("en-US", {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-        });
-    }
-    // Otherwise, show actual decimal places up to 5
-    const stringValue = value.toString();
-    const decimalPart = stringValue.split(".")[1] || "";
-    // Determine how many decimal places to show (up to 5)
-    const decimalPlaces = Math.min(Math.max(2, decimalPart.length), 5);
     return value.toLocaleString("en-US", {
-        minimumFractionDigits: decimalPlaces,
-        maximumFractionDigits: decimalPlaces,
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
     });
 }
 const EditableLineItem = forwardRef(function EditableLineItem(props, ref) {
-    const { item, onSave, onCancel, currency } = props;
+    const { item, onSave, onCancel, currency, onEditingItemChange } = props;
     const [editedItem, setEditedItem] = useState({
         ...item,
         currency,
         quantity: item.quantity ?? "",
         taxPercent: item.taxPercent ?? "",
         unitPriceTaxExcl: item.unitPriceTaxExcl ?? "",
+        totalPriceTaxExcl: item.totalPriceTaxExcl ?? "",
+        totalPriceTaxIncl: item.totalPriceTaxIncl ?? "",
     });
     const calculatedValues = useMemo(() => {
         const quantity = typeof editedItem.quantity === "string"
@@ -55,16 +43,103 @@ const EditableLineItem = forwardRef(function EditableLineItem(props, ref) {
                 ? 0
                 : Number(editedItem.taxPercent)
             : (editedItem.taxPercent ?? 0);
-        const totalPriceTaxExcl = quantity * unitPriceTaxExcl;
-        const taxAmount = totalPriceTaxExcl * (taxPercent / 100);
-        const totalPriceTaxIncl = totalPriceTaxExcl + taxAmount;
-        const unitPriceTaxIncl = unitPriceTaxExcl * (1 + taxPercent / 100);
+        const totalPriceTaxExcl = typeof editedItem.totalPriceTaxExcl === "string"
+            ? editedItem.totalPriceTaxExcl === ""
+                ? 0
+                : Number(editedItem.totalPriceTaxExcl)
+            : (editedItem.totalPriceTaxExcl ?? 0);
+        const totalPriceTaxIncl = typeof editedItem.totalPriceTaxIncl === "string"
+            ? editedItem.totalPriceTaxIncl === ""
+                ? 0
+                : Number(editedItem.totalPriceTaxIncl)
+            : (editedItem.totalPriceTaxIncl ?? 0);
+        const taxRate = taxPercent / 100;
+        const EPSILON = 0.00001;
+        // Helper function to compare floating point numbers
+        const isClose = (a, b) => Math.abs(a - b) < EPSILON;
+        // Check if user explicitly edited any fields
+        const userEditedQuantity = editedItem.quantity !== undefined &&
+            editedItem.quantity !== item.quantity;
+        const userEditedUnitPriceTaxExcl = editedItem.unitPriceTaxExcl !== undefined &&
+            editedItem.unitPriceTaxExcl !== item.unitPriceTaxExcl;
+        const userEditedTotalPriceTaxExcl = editedItem.totalPriceTaxExcl !== undefined &&
+            editedItem.totalPriceTaxExcl !== item.totalPriceTaxExcl;
+        const userEditedTotalPriceTaxIncl = editedItem.totalPriceTaxIncl !== undefined &&
+            editedItem.totalPriceTaxIncl !== item.totalPriceTaxIncl;
+        let finalUnitPriceTaxExcl = unitPriceTaxExcl;
+        let finalUnitPriceTaxIncl = unitPriceTaxExcl * (1 + taxRate);
+        let finalTotalPriceTaxExcl = quantity * unitPriceTaxExcl;
+        let finalTotalPriceTaxIncl = quantity * finalUnitPriceTaxIncl;
+        // If user explicitly edited totalPriceTaxExcl, use that value and calculate unit price
+        if (userEditedTotalPriceTaxExcl && totalPriceTaxExcl !== 0) {
+            finalTotalPriceTaxExcl = totalPriceTaxExcl;
+            finalUnitPriceTaxExcl = totalPriceTaxExcl / quantity;
+            finalUnitPriceTaxIncl = finalUnitPriceTaxExcl * (1 + taxRate);
+            finalTotalPriceTaxIncl = quantity * finalUnitPriceTaxIncl;
+        }
+        // If user explicitly edited totalPriceTaxIncl, use that value and calculate unit price
+        else if (userEditedTotalPriceTaxIncl && totalPriceTaxIncl !== 0) {
+            finalTotalPriceTaxIncl = totalPriceTaxIncl;
+            finalUnitPriceTaxIncl = totalPriceTaxIncl / quantity;
+            finalUnitPriceTaxExcl = finalUnitPriceTaxIncl / (1 + taxRate);
+            finalTotalPriceTaxExcl = quantity * finalUnitPriceTaxExcl;
+        }
+        // If user explicitly edited unitPriceTaxExcl, use that value and calculate totals
+        else if (userEditedUnitPriceTaxExcl && unitPriceTaxExcl !== 0) {
+            finalUnitPriceTaxExcl = unitPriceTaxExcl;
+            finalUnitPriceTaxIncl = unitPriceTaxExcl * (1 + taxRate);
+            finalTotalPriceTaxExcl = quantity * finalUnitPriceTaxExcl;
+            finalTotalPriceTaxIncl = quantity * finalUnitPriceTaxIncl;
+        }
+        // If user explicitly edited quantity, recalculate totals
+        else if (userEditedQuantity) {
+            finalTotalPriceTaxExcl = quantity * finalUnitPriceTaxExcl;
+            finalTotalPriceTaxIncl = quantity * finalUnitPriceTaxIncl;
+        }
         return {
-            totalPriceTaxExcl,
-            totalPriceTaxIncl,
-            unitPriceTaxIncl,
+            quantity: quantity,
+            taxPercent: taxPercent,
+            totalPriceTaxExcl: finalTotalPriceTaxExcl,
+            totalPriceTaxIncl: finalTotalPriceTaxIncl,
+            unitPriceTaxIncl: finalUnitPriceTaxIncl,
+            unitPriceTaxExcl: finalUnitPriceTaxExcl,
         };
-    }, [editedItem.quantity, editedItem.unitPriceTaxExcl, editedItem.taxPercent]);
+    }, [
+        editedItem.quantity,
+        editedItem.unitPriceTaxExcl,
+        editedItem.taxPercent,
+        editedItem.totalPriceTaxExcl,
+        editedItem.totalPriceTaxIncl,
+        item.quantity,
+        item.unitPriceTaxExcl,
+        item.totalPriceTaxExcl,
+        item.totalPriceTaxIncl,
+    ]);
+    // Update parent component with current editing values for live totals
+    useEffect(() => {
+        if (onEditingItemChange && item.id) {
+            onEditingItemChange({
+                id: item.id,
+                quantity: calculatedValues.quantity,
+                unitPriceTaxExcl: calculatedValues.unitPriceTaxExcl,
+                unitPriceTaxIncl: calculatedValues.unitPriceTaxIncl,
+            });
+        }
+    }, [
+        calculatedValues.quantity,
+        calculatedValues.unitPriceTaxExcl,
+        calculatedValues.unitPriceTaxIncl,
+        onEditingItemChange,
+        item.id,
+    ]);
+    // Clean up when component unmounts
+    useEffect(() => {
+        return () => {
+            if (onEditingItemChange && item.id) {
+                onEditingItemChange(null);
+            }
+        };
+    }, [onEditingItemChange, item.id]);
     function handleInputChange(field) {
         return function handleChange(event) {
             const value = event.target.value;
@@ -99,6 +174,24 @@ const EditableLineItem = forwardRef(function EditableLineItem(props, ref) {
                     setEditedItem((prev) => ({ ...prev, [field]: value }));
                 }
             }
+            else if (field === "totalPriceTaxExcl") {
+                // For total price, allow up to dynamic decimal places based on currency
+                const maxDecimals = getCurrencyPrecision(currency);
+                // Allow negative numbers with optional minus sign at start
+                const regex = new RegExp(`^-?\\d*\\.?\\d{0,${maxDecimals}}$`);
+                if (regex.test(value)) {
+                    setEditedItem((prev) => ({ ...prev, [field]: Number(value) }));
+                }
+            }
+            else if (field === "totalPriceTaxIncl") {
+                // For total price, allow up to dynamic decimal places based on currency
+                const maxDecimals = getCurrencyPrecision(currency);
+                // Allow negative numbers with optional minus sign at start
+                const regex = new RegExp(`^-?\\d*\\.?\\d{0,${maxDecimals}}$`);
+                if (regex.test(value)) {
+                    setEditedItem((prev) => ({ ...prev, [field]: value }));
+                }
+            }
             else {
                 // For other decimal fields
                 if (/^-?\d*\.?\d*$/.test(value)) {
@@ -108,40 +201,82 @@ const EditableLineItem = forwardRef(function EditableLineItem(props, ref) {
         };
     }
     function handleSave() {
-        const quantity = typeof editedItem.quantity === "string"
-            ? editedItem.quantity === ""
-                ? 0
-                : Number(editedItem.quantity)
-            : (editedItem.quantity ?? 0);
-        const unitPriceTaxExcl = typeof editedItem.unitPriceTaxExcl === "string"
-            ? editedItem.unitPriceTaxExcl === ""
-                ? 0
-                : Number(editedItem.unitPriceTaxExcl)
-            : (editedItem.unitPriceTaxExcl ?? 0);
-        const taxPercent = typeof editedItem.taxPercent === "string"
-            ? editedItem.taxPercent === ""
-                ? 0
-                : Number(editedItem.taxPercent)
-            : (editedItem.taxPercent ?? 0);
-        const completeItem = {
+        // Helper function for floating point comparison
+        const isClose = (a, b) => Math.abs(a - b) < 0.00001;
+        // Create an object with only the fields that have changed
+        const updateInput = {
             id: editedItem.id ?? generateId(),
-            currency: editedItem.currency,
-            description: editedItem.description ?? "",
-            quantity: quantity,
-            taxPercent: taxPercent,
-            unitPriceTaxExcl: unitPriceTaxExcl,
-            unitPriceTaxIncl: calculatedValues.unitPriceTaxIncl,
-            totalPriceTaxExcl: calculatedValues.totalPriceTaxExcl,
-            totalPriceTaxIncl: calculatedValues.totalPriceTaxIncl,
-            lineItemTag: [],
+            currency,
         };
-        onSave(completeItem);
+        // Check if any field was explicitly edited by the user
+        const hasEditedDescription = editedItem.description !== undefined &&
+            editedItem.description !== item.description;
+        const hasEditedQuantity = editedItem.quantity !== undefined &&
+            editedItem.quantity !== item.quantity;
+        const hasEditedTaxPercent = editedItem.taxPercent !== undefined &&
+            editedItem.taxPercent !== item.taxPercent;
+        const hasEditedUnitPriceTaxExcl = editedItem.unitPriceTaxExcl !== undefined &&
+            editedItem.unitPriceTaxExcl !== item.unitPriceTaxExcl;
+        const hasEditedTotalPriceTaxExcl = editedItem.totalPriceTaxExcl !== undefined &&
+            editedItem.totalPriceTaxExcl !== item.totalPriceTaxExcl;
+        const hasEditedTotalPriceTaxIncl = editedItem.totalPriceTaxIncl !== undefined &&
+            editedItem.totalPriceTaxIncl !== item.totalPriceTaxIncl;
+        // Always include fields that were explicitly edited
+        if (hasEditedDescription) {
+            updateInput.description = editedItem.description ?? "";
+        }
+        if (hasEditedQuantity) {
+            updateInput.quantity = calculatedValues.quantity;
+        }
+        if (hasEditedTaxPercent) {
+            updateInput.taxPercent = calculatedValues.taxPercent;
+        }
+        if (hasEditedUnitPriceTaxExcl) {
+            updateInput.unitPriceTaxExcl = calculatedValues.unitPriceTaxExcl;
+        }
+        if (hasEditedTotalPriceTaxExcl) {
+            updateInput.totalPriceTaxExcl = calculatedValues.totalPriceTaxExcl;
+        }
+        if (hasEditedTotalPriceTaxIncl) {
+            updateInput.totalPriceTaxIncl = calculatedValues.totalPriceTaxIncl;
+        }
+        // Also include fields that changed due to calculations (even if not explicitly edited)
+        if (!hasEditedQuantity &&
+            !isClose(calculatedValues.quantity, item.quantity ?? 0)) {
+            updateInput.quantity = calculatedValues.quantity;
+        }
+        if (!hasEditedTaxPercent &&
+            !isClose(calculatedValues.taxPercent, item.taxPercent ?? 0)) {
+            updateInput.taxPercent = calculatedValues.taxPercent;
+        }
+        if (!hasEditedUnitPriceTaxExcl &&
+            !isClose(calculatedValues.unitPriceTaxExcl, item.unitPriceTaxExcl ?? 0)) {
+            updateInput.unitPriceTaxExcl = calculatedValues.unitPriceTaxExcl;
+        }
+        if (!isClose(calculatedValues.unitPriceTaxIncl, item.unitPriceTaxIncl ?? 0)) {
+            updateInput.unitPriceTaxIncl = calculatedValues.unitPriceTaxIncl;
+        }
+        if (!hasEditedTotalPriceTaxExcl &&
+            !isClose(calculatedValues.totalPriceTaxExcl, item.totalPriceTaxExcl ?? 0)) {
+            updateInput.totalPriceTaxExcl = calculatedValues.totalPriceTaxExcl;
+        }
+        if (!hasEditedTotalPriceTaxIncl &&
+            !isClose(calculatedValues.totalPriceTaxIncl, item.totalPriceTaxIncl ?? 0)) {
+            updateInput.totalPriceTaxIncl = calculatedValues.totalPriceTaxIncl;
+        }
+        onSave(updateInput);
     }
     return (_jsxs("tr", { ref: ref, className: "hover:bg-gray-50 table-row", children: [_jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsx(InputField, { onBlur: () => { }, handleInputChange: (e) => {
                         setEditedItem((prev) => ({ ...prev, description: e.target.value }));
-                    }, value: editedItem.description ?? "", placeholder: "Description", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsx(NumberForm, { number: editedItem.quantity ?? "", precision: 0, handleInputChange: handleInputChange("quantity"), placeholder: "Quantity", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsx(NumberForm, { number: editedItem.unitPriceTaxExcl ?? "", precision: getCurrencyPrecision(currency), handleInputChange: handleInputChange("unitPriceTaxExcl"), pattern: "^-?\\d*\\.?\\d*$", placeholder: "Unit Price (excl. tax)", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsx(NumberForm, { number: editedItem.taxPercent ?? "", precision: 0, pattern: "^(100|[1-9]?[0-9])$", handleInputChange: handleInputChange("taxPercent"), placeholder: "Tax %", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 text-right font-medium table-cell", children: formatNumber(calculatedValues.totalPriceTaxExcl) }), _jsx("td", { className: "border border-gray-200 p-3 text-right font-medium table-cell", children: formatNumber(calculatedValues.totalPriceTaxIncl) }), _jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsxs("div", { className: "flex space-x-2", children: [_jsx("button", { className: "rounded bg-blue-500 px-3 py-1 text-white hover:bg-blue-700", onClick: handleSave, children: "Save" }), _jsx("button", { className: "rounded bg-gray-500 px-3 py-1 text-white hover:bg-gray-600", onClick: onCancel, children: "Cancel" })] }) })] }));
+                    }, value: editedItem.description ?? "", placeholder: "Description", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsx(NumberForm, { number: calculatedValues.quantity, precision: 0, handleInputChange: handleInputChange("quantity"), placeholder: "Quantity", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsx(NumberForm, { number: calculatedValues.unitPriceTaxExcl % 1 === 0
+                        ? calculatedValues.unitPriceTaxExcl.toString()
+                        : calculatedValues.unitPriceTaxExcl.toFixed(2), precision: 2, handleInputChange: handleInputChange("unitPriceTaxExcl"), pattern: "^-?\\d*\\.?\\d*$", placeholder: "Unit Price (excl. tax)", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsx(NumberForm, { number: calculatedValues.taxPercent, precision: 0, pattern: "^(100|[1-9]?[0-9])$", handleInputChange: handleInputChange("taxPercent"), placeholder: "Tax %", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 text-right font-medium table-cell", children: _jsx(NumberForm, { number: calculatedValues.totalPriceTaxExcl % 1 === 0
+                        ? calculatedValues.totalPriceTaxExcl.toString()
+                        : calculatedValues.totalPriceTaxExcl.toFixed(2), precision: 2, handleInputChange: handleInputChange("totalPriceTaxExcl"), pattern: "^-?\\d*\\.?\\d*$", placeholder: "Total (excl. tax)", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 text-right font-medium table-cell", children: _jsx(NumberForm, { number: calculatedValues.totalPriceTaxIncl % 1 === 0
+                        ? calculatedValues.totalPriceTaxIncl.toString()
+                        : calculatedValues.totalPriceTaxIncl.toFixed(2), precision: 2, handleInputChange: handleInputChange("totalPriceTaxIncl"), pattern: "^-?\\d*\\.?\\d*$", placeholder: "Total (incl. tax)", className: "" }) }), _jsx("td", { className: "border border-gray-200 p-3 table-cell", children: _jsxs("div", { className: "flex space-x-2", children: [_jsx("button", { className: "rounded bg-blue-500 px-3 py-1 text-white hover:bg-blue-700", onClick: handleSave, children: "Save" }), _jsx("button", { className: "rounded bg-gray-500 px-3 py-1 text-white hover:bg-gray-600", onClick: onCancel, children: "Cancel" })] }) })] }));
 });
-export function LineItemsTable({ lineItems, currency, onAddItem, onUpdateItem, onDeleteItem, onUpdateCurrency, dispatch, paymentAccounts, }) {
+export function LineItemsTable({ lineItems, currency, onAddItem, onUpdateItem, onDeleteItem, onUpdateCurrency, onEditingItemChange, dispatch, paymentAccounts, }) {
     const [editingId, setEditingId] = useState(null);
     const [isAddingNew, setIsAddingNew] = useState(false);
     const [showTagTable, setShowTagTable] = useState(false);
@@ -180,7 +315,7 @@ export function LineItemsTable({ lineItems, currency, onAddItem, onUpdateItem, o
                                                         } })] }) })] }) }), _jsxs("tbody", { children: [lineItems.map((item) => editingId === item.id ? (_jsx(EditableLineItem, { currency: currency, item: item, onCancel: () => setEditingId(null), onSave: (updatedItem) => {
                                             onUpdateItem(updatedItem);
                                             setEditingId(null);
-                                        } }, item.id)) : (_jsxs("tr", { className: "hover:bg-gray-50 table-row", children: [_jsx("td", { className: "border-b border-gray-200 p-3 table-cell", children: item.description }), _jsx("td", { className: "border-b border-gray-200 p-3 text-right table-cell", children: item.quantity }), _jsx("td", { className: "border-b border-gray-200 p-3 text-right table-cell", children: formatNumber(item.unitPriceTaxExcl) }), _jsxs("td", { className: "border-b border-gray-200 p-3 text-right table-cell", children: [typeof item.taxPercent === "number"
+                                        }, onEditingItemChange: onEditingItemChange }, item.id)) : (_jsxs("tr", { className: "hover:bg-gray-50 table-row", children: [_jsx("td", { className: "border-b border-gray-200 p-3 table-cell", children: item.description }), _jsx("td", { className: "border-b border-gray-200 p-3 text-right table-cell", children: item.quantity }), _jsx("td", { className: "border-b border-gray-200 p-3 text-right table-cell", children: formatNumber(item.unitPriceTaxExcl) }), _jsxs("td", { className: "border-b border-gray-200 p-3 text-right table-cell", children: [typeof item.taxPercent === "number"
                                                         ? Math.round(item.taxPercent)
-                                                        : 0, "%"] }), _jsx("td", { className: "border-b border-gray-200 p-3 text-right font-medium table-cell", children: formatNumber(item.totalPriceTaxExcl) }), _jsx("td", { className: "border-b border-gray-200 p-3 text-right font-medium table-cell", children: formatNumber(item.totalPriceTaxIncl) }), _jsx("td", { className: "border-b border-gray-200 p-3 table-cell", children: _jsxs("div", { className: "flex justify-center space-x-2", children: [_jsx("button", { className: "rounded bg-blue-500 px-3 py-1 text-white hover:bg-blue-200", onClick: () => setEditingId(item.id), children: "Edit" }), _jsx("button", { className: "rounded bg-red-600 px-3 py-1 text-white hover:bg-red-700", onClick: () => onDeleteItem({ id: item.id }), children: "Delete" })] }) })] }, item.id))), isAddingNew ? (_jsx(EditableLineItem, { currency: currency, item: {}, onCancel: handleCancelNewItem, onSave: handleSaveNewItem })) : null] })] }) })] }) }));
+                                                        : 0, "%"] }), _jsx("td", { className: "border-b border-gray-200 p-3 text-right font-medium table-cell", children: formatNumber(item.totalPriceTaxExcl) }), _jsx("td", { className: "border-b border-gray-200 p-3 text-right font-medium table-cell", children: formatNumber(item.totalPriceTaxIncl) }), _jsx("td", { className: "border-b border-gray-200 p-3 table-cell", children: _jsxs("div", { className: "flex justify-center space-x-2", children: [_jsx("button", { className: "rounded bg-blue-500 px-3 py-1 text-white hover:bg-blue-200", onClick: () => setEditingId(item.id), children: "Edit" }), _jsx("button", { className: "rounded bg-red-600 px-3 py-1 text-white hover:bg-red-700", onClick: () => onDeleteItem({ id: item.id }), children: "Delete" })] }) })] }, item.id))), isAddingNew ? (_jsx(EditableLineItem, { currency: currency, item: {}, onCancel: handleCancelNewItem, onSave: handleSaveNewItem, onEditingItemChange: onEditingItemChange })) : null] })] }) })] }) }));
 }

package/dist/editors/invoice/requestFinance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestFinance.d.ts","sourceRoot":"","sources":["../../../editors/invoice/requestFinance.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAYxC,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAgNjD,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"requestFinance.d.ts","sourceRoot":"","sources":["../../../editors/invoice/requestFinance.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAUxC,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAgQjD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/editors/invoice/requestFinance.js

@@ -1,17 +1,18 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState } from "react";
-import { actions, } from "../../document-models/invoice/index.js";
+import { actions } from "../../document-models/invoice/index.js";
 import { generateId } from "document-model";
-let GRAPHQL_URL = 'http://localhost:4001/graphql/invoice';
-if (!window.document.baseURI.includes('localhost')) {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+let GRAPHQL_URL = "http://localhost:4001/graphql/invoice";
+if (!window.document.baseURI.includes("localhost")) {
+    GRAPHQL_URL = "https://switchboard-dev.powerhouse.xyz/graphql/invoice";
 }
-const RequestFinance = ({ docState, dispatch }) => {
+const RequestFinance = ({ docState, dispatch, }) => {
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
     const [responseData, setResponseData] = useState(null);
     const [invoiceLink, setInvoiceLink] = useState(null);
     const [directPaymentStatus, setDirectPaymentStatus] = useState(null);
+    const invoiceStatus = docState.status;
     // Function to call the createDirectPayment mutation
     const createDirectPayment = async (paymentData) => {
         try {
@@ -45,7 +46,8 @@ const RequestFinance = ({ docState, dispatch }) => {
                 return result.data.Invoice_createRequestFinancePayment.data;
             }
             else {
-                throw new Error(result.data?.Invoice_createRequestFinancePayment?.error || "Unknown error");
+                throw new Error(result.data?.Invoice_createRequestFinancePayment?.error ||
+                    "Unknown error");
             }
         }
         catch (err) {
@@ -87,7 +89,7 @@ const RequestFinance = ({ docState, dispatch }) => {
                 invoiceNumber: docState.invoiceNo,
                 buyerInfo: {
                     // email: docState.payer.contactInfo.email,
-                    email: '',
+                    email: "",
                     firstName: docState.payer.name,
                     // lastName: docState.payer.name.split(" ")[1] || "Liberty",
                     businessName: docState.payer.name,
@@ -102,7 +104,7 @@ const RequestFinance = ({ docState, dispatch }) => {
                 sellerInfo: {
                     email: docState.issuer.contactInfo.email,
                     firstName: docState.issuer.name,
-                    lastName: '',
+                    lastName: "",
                     address: {
                         country: docState.issuer.address.country,
                         city: docState.issuer.address.city,
@@ -137,10 +139,19 @@ const RequestFinance = ({ docState, dispatch }) => {
             // Process the response
             if (directPaymentResult?.response?.invoiceLinks?.pay) {
                 setInvoiceLink(directPaymentResult.response.invoiceLinks.pay);
-                dispatch(actions.schedulePayment({
-                    id: generateId(),
-                    processorRef: directPaymentResult.response.invoiceLinks.pay,
-                }));
+                if (invoiceStatus === "ACCEPTED") {
+                    dispatch(actions.schedulePayment({
+                        id: generateId(),
+                        processorRef: directPaymentResult.response.invoiceLinks.pay,
+                    }));
+                }
+                else {
+                    dispatch(actions.addPayment({
+                        id: generateId(),
+                        processorRef: directPaymentResult.response.invoiceLinks.pay,
+                        confirmed: false,
+                    }));
+                }
             }
             setResponseData(directPaymentResult);
             setDirectPaymentStatus("Direct payment created successfully");
@@ -152,11 +163,25 @@ const RequestFinance = ({ docState, dispatch }) => {
                 errorMessage = err.message;
             }
             setError(errorMessage);
+            dispatch(actions.addPayment({
+                id: generateId(),
+                processorRef: "",
+                confirmed: false,
+                issue: errorMessage,
+            }));
         }
         finally {
             setIsLoading(false);
         }
     };
-    return (_jsxs("div", { children: [_jsx("button", { className: "bg-blue-500 text-black px-4 py-2 rounded-md", onClick: handleRequestFinance, disabled: isLoading, children: isLoading ? "Processing..." : "Send Payment to Request Finance >" }), error && (_jsx("div", { className: "error-message", style: { color: "red" }, children: error })), invoiceLink && (_jsxs("div", { children: [_jsx("div", { className: "direct-payment-status", children: _jsx("p", { children: directPaymentStatus }) }), _jsx("div", { className: "invoice-link", children: _jsx("a", { style: { color: "blue" }, href: invoiceLink, target: "_blank", rel: "noopener noreferrer", className: "view-invoice-button", children: "View Invoice" }) })] }))] }));
+    const liktText = "Request Finance [>]";
+    return (_jsxs("div", { children: [_jsx("button", { className: "bg-blue-500 text-black px-4 py-2 rounded-md", onClick: handleRequestFinance, disabled: isLoading, children: isLoading
+                    ? "Processing..."
+                    : invoiceStatus === "ACCEPTED"
+                        ? "Schedule Payment in Request Finance"
+                        : "Reschedule Payment in Request Finance" }), invoiceLink && (_jsxs("div", { children: [_jsx("div", { className: "direct-payment-status", children: _jsx("p", { children: directPaymentStatus }) }), _jsx("div", { className: "invoice-link text-blue-900 hover:text-blue-600", children: _jsx("a", { href: invoiceLink, target: "_blank", rel: "noopener noreferrer", className: "view-invoice-button", children: liktText }) })] })), !invoiceLink &&
+                invoiceStatus === "PAYMENTSCHEDULED" &&
+                docState.payments.length > 0 && (_jsx(_Fragment, { children: docState.payments[docState.payments.length - 1].issue !== "" ? (_jsx("div", { className: "mt-4", children: _jsxs("p", { className: "text-red-700 font-medium", children: ["Issue: ", docState.payments[docState.payments.length - 1].issue] }) })) : (_jsx("div", { className: "mt-4", children: _jsx("div", { className: "invoice-link text-blue-900 hover:text-blue-600", children: _jsx("a", { className: "view-invoice-button", href: docState.payments[docState.payments.length - 1]
+                                .processorRef, target: "_blank", rel: "noopener noreferrer", children: liktText }) }) })) }))] }));
 };
 export default RequestFinance;

package/dist/editors/invoice/uploadPdfChunked.js

@@ -7,7 +7,7 @@
  */
 let GRAPHQL_URL = 'http://localhost:4001/graphql/invoice';
 if (!window.document.baseURI.includes('localhost')) {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+    GRAPHQL_URL = 'https://switchboard-dev.powerhouse.xyz/graphql/invoice';
 }
 export async function uploadPdfChunked(pdfData, endpoint = GRAPHQL_URL, chunkSize = 500 * 1024, // 500KB chunks
 onProgress) {

package/dist/scripts/invoice/gnosisTransactionBuilder.js

@@ -4,7 +4,7 @@ import { OperationType } from '@safe-global/types-kit';
 import { ethers, AbiCoder } from 'ethers';
 import dotenv from 'dotenv';
 dotenv.config();
-const safeAddress = process.env.PRODUCTION_SAFE_ADDRESS;
+const safeAddress = process.env.DEV_STAGING_SAFE_ADDRESS;
 if (!safeAddress) {
     throw new Error('Missing SAFE_ADDRESS in .env');
 }

package/dist/style.css

@@ -871,6 +871,9 @@
   .text-blue-600 {
     color: var(--color-blue-600);
   }
+  .text-blue-900 {
+    color: var(--color-blue-900);
+  }
   .text-gray-50 {
     color: var(--color-gray-50);
   }
@@ -904,6 +907,9 @@
   .text-red-600 {
     color: var(--color-red-600);
   }
+  .text-red-700 {
+    color: var(--color-red-700);
+  }
   .text-slate-800 {
     color: var(--color-slate-800);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/contributor-billing",
   "description": "Document models that help contributors of open organisations get paid anonymously for their work on a monthly basis.",
-  "version": "0.0.65",
+  "version": "0.0.66",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [