@powerhousedao/contributor-billing 0.0.33 → 0.0.35

package/dist/editors/invoice/editor.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState } from "react";
+import { generateId } from "document-model";
 import { actions, } from "../../document-models/invoice/index.js";
 import { LegalEntityForm } from "./legalEntity/legalEntity.js";
 import { LineItemsTable } from "./lineItems.js";
@@ -7,58 +8,26 @@ import { loadUBLFile } from "./ingestUBL.js";
 import PDFUploader from "./ingestPDF.js";
 import RequestFinance from "./requestFinance.js";
 import InvoiceToGnosis from "./invoiceToGnosis.js";
-import { toast, ToastContainer } from "@powerhousedao/design-system";
+import { toast, ToastContainer, } from "@powerhousedao/design-system";
 import { PDFDownloadLink } from "@react-pdf/renderer";
 import { InvoicePDF } from "./InvoicePDF.js";
 import { createRoot } from "react-dom/client";
 import { downloadUBL } from "./exportUBL.js";
 import { CurrencyForm, currencyList } from "./components/currencyForm.js";
 import { InputField } from "./components/inputField.js";
-import { validateField, } from "./validation/validationManager.js";
 import { DatePicker } from "./components/datePicker.js";
 import { SelectField } from "./components/selectField.js";
 import { formatNumber } from "./lineItems.js";
 import { Textarea } from "@powerhousedao/document-engineering/ui";
+import ConfirmationModal from "./components/confirmationModal.js";
+import { ClosePaymentModalContent, ConfirmPaymentModalContent, FinalRejectionModalContent, IssueInvoiceModalContent, RegisterPaymentTxModalContent, RejectInvoiceModalContent, ReportPaymentIssueModalContent, SchedulePaymentModalContent, } from "./components/statusModalComponents.js";
+import validateStatusBeforeContinue from "./validation/validationHandler.js";
 function isFiatCurrency(currency) {
     return currencyList.find((c) => c.ticker === currency)?.crypto === false;
 }
-const useResponsiveEditorStyle = (options = { scale: 0.9, maxWidth: "1280px" }) => {
-    const baseStyle = {
-        width: "100vw",
-        minHeight: "100vh",
-        margin: 0,
-        padding: 0,
-        boxSizing: "border-box",
-        transform: `scale(${options.scale})`,
-        transformOrigin: "top left",
-    };
-    const [responsiveStyle, setResponsiveStyle] = useState(baseStyle);
-    useEffect(() => {
-        function handleResize() {
-            if (window.innerWidth >= 1024) {
-                setResponsiveStyle({
-                    ...baseStyle,
-                    maxWidth: options.maxWidth,
-                    marginLeft: "auto",
-                    marginRight: "auto",
-                    padding: "1rem",
-                });
-            }
-            else {
-                setResponsiveStyle(baseStyle);
-            }
-        }
-        handleResize();
-        window.addEventListener("resize", handleResize);
-        return () => window.removeEventListener("resize", handleResize);
-    }, [options.scale, options.maxWidth]);
-    return responsiveStyle;
-};
 export default function Editor(props) {
     const { document: doc, dispatch } = props;
     const state = doc.state.global;
-    // Only use the hook if you need custom scaling or maxWidth
-    const customStyle = useResponsiveEditorStyle({ scale: 0.9, maxWidth: "1280px" });
     const [fiatMode, setFiatMode] = useState(isFiatCurrency(state.currency));
     const [uploadDropdownOpen, setUploadDropdownOpen] = useState(false);
     const [exportDropdownOpen, setExportDropdownOpen] = useState(false);
@@ -81,6 +50,18 @@ export default function Editor(props) {
     const [lineItemValidation, setLineItemValidation] = useState(null);
     const [mainCountryValidation, setMainCountryValidation] = useState(null);
     const [bankCountryValidation, setBankCountryValidation] = useState(null);
+    // Replace showConfirmationModal and pendingStatus with a single modal state
+    const [activeModal, setActiveModal] = useState(null);
+    // Track warning state for modal
+    const [modalWarning, setModalWarning] = useState(false);
+    const [rejectReason, setRejectReason] = useState("");
+    const [finalReason, setFinalReason] = useState(false);
+    const [paymentRef, setPaymentRef] = useState("");
+    const [closureReason, setClosureReason] = useState("");
+    const [paymentDate, setPaymentDate] = useState("");
+    const [txnRef, setTxnRef] = useState("");
+    const [paymentIssue, setPaymentIssue] = useState("");
+    const [paymentAmount, setPaymentAmount] = useState("");
     const prevStatus = useRef(state.status);
     useEffect(() => {
         setFiatMode(isFiatCurrency(state.currency));
@@ -118,11 +99,11 @@ export default function Editor(props) {
         "CANCELLED",
         "ACCEPTED",
         "REJECTED",
-        "AWAITINGPAYMENT",
         "PAYMENTSCHEDULED",
         "PAYMENTSENT",
         "PAYMENTISSUE",
         "PAYMENTRECEIVED",
+        "PAYMENTCLOSED",
     ];
     const handleFileUpload = async (event) => {
         const file = event.target.files?.[0];
@@ -243,131 +224,100 @@ export default function Editor(props) {
             }
         });
     }
-    // Add validation check when status changes
+    // Replace handleStatusChange logic for opening modals
     const handleStatusChange = (newStatus) => {
-        if (newStatus === "PAYMENTSCHEDULED" || newStatus === "ISSUED") {
-            const context = {
-                currency: state.currency,
-                currentStatus: state.status,
-                targetStatus: newStatus === "PAYMENTSCHEDULED" ? "ISSUED" : "ISSUED",
-            };
-            // Collect all validation errors
-            const validationErrors = [];
-            // Validate invoice number
-            const invoiceValidation = validateField("invoiceNo", state.invoiceNo, context);
-            setInvoiceValidation(invoiceValidation);
-            if (invoiceValidation && !invoiceValidation.isValid) {
-                validationErrors.push(invoiceValidation);
-            }
-            // Validate wallet address if currency is crypto
-            if (!isFiatCurrency(state.currency)) {
-                const walletValidation = validateField("address", state.issuer.paymentRouting?.wallet?.address ?? "", context);
-                setWalletValidation(walletValidation);
-                if (walletValidation && !walletValidation.isValid) {
-                    validationErrors.push(walletValidation);
-                }
-            }
-            // Validate currency
-            const currencyValidation = validateField("currency", state.currency, context);
-            setCurrencyValidation(currencyValidation);
-            if (currencyValidation && !currencyValidation.isValid) {
-                validationErrors.push(currencyValidation);
-            }
-            // Validate main country
-            const mainCountry = state.issuer.country ?? "";
-            const mainCountryValidation = validateField("mainCountry", mainCountry, context);
-            setMainCountryValidation(mainCountryValidation);
-            if (mainCountryValidation && !mainCountryValidation.isValid) {
-                validationErrors.push(mainCountryValidation);
-            }
-            // Validate bank country
-            const bankCountry = state.issuer.paymentRouting?.bank?.address?.country ?? "";
-            const bankCountryValidation = validateField("bankCountry", bankCountry, context);
-            setBankCountryValidation(bankCountryValidation);
-            if (bankCountryValidation && !bankCountryValidation.isValid) {
-                validationErrors.push(bankCountryValidation);
-            }
-            // Validate EUR&GBP IBAN account number
-            const ibanValidation = validateField("accountNum", state.issuer.paymentRouting?.bank?.accountNum, context);
-            setIbanValidation(ibanValidation);
-            if (ibanValidation && !ibanValidation.isValid) {
-                validationErrors.push(ibanValidation);
-            }
-            // Validate BIC number
-            const bicValidation = validateField("bicNumber", state.issuer.paymentRouting?.bank?.BIC, context);
-            setBicValidation(bicValidation);
-            if (bicValidation && !bicValidation.isValid) {
-                validationErrors.push(bicValidation);
-            }
-            // Validate bank name
-            const bankNameValidation = validateField("bankName", state.issuer.paymentRouting?.bank?.name, context);
-            setBankNameValidation(bankNameValidation);
-            if (bankNameValidation && !bankNameValidation.isValid) {
-                validationErrors.push(bankNameValidation);
-            }
-            // Validate street address
-            const streetAddressValidation = validateField("streetAddress", state.issuer.address?.streetAddress, context);
-            setStreetAddressValidation(streetAddressValidation);
-            if (streetAddressValidation && !streetAddressValidation.isValid) {
-                validationErrors.push(streetAddressValidation);
-            }
-            // Validate city
-            const cityValidation = validateField("city", state.issuer.address?.city, context);
-            setCityValidation(cityValidation);
-            if (cityValidation && !cityValidation.isValid) {
-                validationErrors.push(cityValidation);
-            }
-            // Validate postal code
-            const postalCodeValidation = validateField("postalCode", state.issuer.address?.postalCode, context);
-            setPostalCodeValidation(postalCodeValidation);
-            if (postalCodeValidation && !postalCodeValidation.isValid) {
-                validationErrors.push(postalCodeValidation);
-            }
-            // Validate payer email
-            const payerEmailValidation = validateField("email", state.payer.contactInfo?.email, context);
-            setPayerEmailValidation(payerEmailValidation);
-            if (payerEmailValidation && !payerEmailValidation.isValid) {
-                validationErrors.push(payerEmailValidation);
-            }
-            // Validate line items
-            const lineItemValidation = validateField("lineItem", state.lineItems, context);
-            setLineItemValidation(lineItemValidation);
-            if (lineItemValidation && !lineItemValidation.isValid) {
-                validationErrors.push(lineItemValidation);
-            }
-            if (newStatus === "PAYMENTSCHEDULED" &&
-                !isFiatCurrency(state.currency) &&
-                state.issuer.paymentRouting?.wallet?.chainName === "") {
-                validationErrors.push({
-                    message: "Select currency and chain before accepting invoice",
-                    severity: "warning",
-                    isValid: false,
-                });
+        const validationResult = validateStatusBeforeContinue(newStatus, state, setInvoiceValidation, setWalletValidation, setCurrencyValidation, setMainCountryValidation, setBankCountryValidation, setIbanValidation, setBicValidation, setBankNameValidation, setStreetAddressValidation, setCityValidation, setPostalCodeValidation, setPayerEmailValidation, setLineItemValidation, isFiatCurrency);
+        if (validationResult) {
+            return;
+        }
+        if (newStatus === "ISSUED") {
+            const trueRejection = state.rejections.find((rejection) => rejection.final === true);
+            if (state.status === "REJECTED" && trueRejection) {
+                setRejectReason(trueRejection.reason);
+                setFinalReason(trueRejection.final);
+                setActiveModal("finalRejection");
+                return;
             }
-            // If there are any validation errors, show them and return
-            if (validationErrors.length > 0) {
-                validationErrors.forEach((error) => {
-                    toast(error.message, {
-                        type: error.severity === "error" ? "error" : "warning",
-                    });
-                });
+            setActiveModal("issueInvoice");
+            return;
+        }
+        if (newStatus === "CANCELLED") {
+            dispatch(actions.cancel({}));
+            return;
+        }
+        if (newStatus === "ACCEPTED") {
+            if (state.status === "PAYMENTCLOSED") {
+                dispatch(actions.reapprovePayment({}));
                 return;
             }
+            dispatch(actions.accept({ payAfter: new Date().toISOString() }));
+            return;
         }
-        dispatch(actions.editStatus({ status: newStatus }));
+        if (newStatus === "REJECTED") {
+            setActiveModal("rejectInvoice");
+            return;
+        }
+        if (newStatus === "DRAFT") {
+            dispatch(actions.reset({}));
+            return;
+        }
+        if (newStatus === "PAYMENTSCHEDULED") {
+            setActiveModal("schedulePayment");
+            return;
+        }
+        if (newStatus === "PAYMENTCLOSED") {
+            setActiveModal("closePayment");
+            return;
+        }
+        if (newStatus === "PAYMENTSENT") {
+            setActiveModal("registerPayment");
+            return;
+        }
+        if (newStatus === "PAYMENTISSUE") {
+            setActiveModal("reportPaymentIssue");
+            return;
+        }
+        if (newStatus === "PAYMENTRECEIVED") {
+            setActiveModal("confirmPayment");
+            return;
+        }
+        // Add more status checks for other modals as needed
     };
     const handleCurrencyChange = (currency) => {
-        if ((prevStatus.current === "PAYMENTSCHEDULED" ||
-            prevStatus.current === "DRAFT") &&
-            !isFiatCurrency(currency) &&
-            state.issuer.paymentRouting?.wallet?.chainName === "") {
-            dispatch(actions.editStatus({ status: "DRAFT" }));
-            toast("Select currency and chain before accepting invoice", {
-                type: "warning",
-            });
-        }
         dispatch(actions.editInvoice({ currency }));
     };
+    // Modal content map
+    const modalContentMap = {
+        issueInvoice: (_jsx(IssueInvoiceModalContent, { invoiceNoInput: invoiceNoInput, setInvoiceNoInput: setInvoiceNoInput, state: state, dispatch: dispatch, setWarning: setModalWarning })),
+        rejectInvoice: (_jsx(RejectInvoiceModalContent, { state: state, dispatch: dispatch, setWarning: setModalWarning, setRejectReason: setRejectReason, rejectReason: rejectReason, setFinalReason: setFinalReason, finalReason: finalReason })),
+        finalRejection: _jsx(FinalRejectionModalContent, { rejectReason: rejectReason }),
+        schedulePayment: (_jsx(SchedulePaymentModalContent, { paymentRef: paymentRef, setPaymentRef: setPaymentRef })),
+        closePayment: (_jsx(ClosePaymentModalContent, { closureReason: closureReason, setClosureReason: setClosureReason })),
+        registerPayment: (_jsx(RegisterPaymentTxModalContent, { paymentDate: paymentDate, setPaymentDate: setPaymentDate, txnRef: txnRef, setTxnRef: setTxnRef })),
+        reportPaymentIssue: (_jsx(ReportPaymentIssueModalContent, { paymentIssue: paymentIssue, setPaymentIssue: setPaymentIssue })),
+        confirmPayment: (_jsx(ConfirmPaymentModalContent, { paymentAmount: paymentAmount, setPaymentAmount: setPaymentAmount, payments: state.payments })),
+        // Add more modal content mappings here
+    };
+    const modalHeaders = {
+        issueInvoice: _jsx("div", { children: "Issue Invoice" }),
+        rejectInvoice: _jsx("div", { children: "Reject Invoice" }),
+        finalRejection: _jsx("div", { children: "Invoice Rejected" }),
+        schedulePayment: _jsx("div", { children: "Schedule Payment" }),
+        closePayment: _jsx("div", { children: "Close Payment" }),
+        registerPayment: _jsx("div", { children: "Register Payment" }),
+        reportPaymentIssue: _jsx("div", { children: "Report Payment Issue" }),
+        confirmPayment: _jsx("div", { children: "Confirm Payment" }),
+        // Add more headers as needed
+    };
+    const modalContinueLabels = {
+        issueInvoice: "Confirm",
+        rejectInvoice: "Confirm",
+        schedulePayment: "Confirm",
+        closePayment: "Confirm",
+        registerPayment: "Confirm",
+        reportPaymentIssue: "Confirm",
+        // Add more labels as needed
+    };
     return (_jsxs("div", { className: "editor-container", children: [_jsx(ToastContainer, { position: "bottom-right", autoClose: 5000, hideProgressBar: false, newestOnTop: false, closeOnClick: false, rtl: false, pauseOnFocusLoss: true, draggable: true, pauseOnHover: true, theme: "light" }), _jsxs("div", { className: "flex items-center justify-between gap-4 mb-6", children: [_jsxs("div", { className: "flex items-center gap-4 flex-nowrap", children: [_jsx("h1", { className: "text-3xl font-bold whitespace-nowrap", children: "Invoice" }), _jsx(InputField, { placeholder: "Add invoice number", value: invoiceNoInput, handleInputChange: (e) => setInvoiceNoInput(e.target.value), onBlur: (e) => {
                                     const newValue = e.target.value;
                                     if (newValue !== state.invoiceNo) {
@@ -392,11 +342,11 @@ export default function Editor(props) {
                                                 }, value: state.dateIssued })] }), _jsxs("div", { className: "mb-2", children: [_jsx("label", { className: "block mb-1 text-sm", children: "Delivery Date:" }), _jsx(DatePicker, { name: "deliveryDate", className: String.raw `w-full p-0`, onChange: (e) => {
                                                     const newValue = e.target.value.split("T")[0];
                                                     if (newValue !== state.dateDelivered) {
-                                                        dispatch(actions.editInvoice({
-                                                            dateDelivered: newValue,
-                                                        }));
+                                                        // Remove dateDelivered from editInvoice, as it's not a valid property
+                                                        // dispatch(actions.editInvoice({ dateDelivered: newValue }));
+                                                        // If you need to update delivery date, implement the correct action here
                                                     }
-                                                }, value: state.dateDelivered || "" })] })] }), _jsx(LegalEntityForm, { legalEntity: state.issuer, onChangeInfo: (input) => dispatch(actions.editIssuer(input)), onChangeBank: (input) => dispatch(actions.editIssuerBank(input)), onChangeWallet: (input) => dispatch(actions.editIssuerWallet(input)), basicInfoDisabled: false, bankDisabled: !fiatMode, walletDisabled: fiatMode, currency: state.currency, status: state.status, walletvalidation: walletValidation, mainCountryValidation: mainCountryValidation, bankCountryValidation: bankCountryValidation, ibanvalidation: ibanValidation, bicvalidation: bicValidation, banknamevalidation: bankNameValidation, streetaddressvalidation: streetAddressValidation, cityvalidation: cityValidation, postalcodevalidation: postalCodeValidation, payeremailvalidation: payerEmailValidation })] }), _jsxs("div", { className: "border border-gray-200 rounded-lg p-4", children: [_jsx("h3", { className: "text-lg font-semibold mb-4", children: "Payer" }), _jsxs("div", { className: "mb-2", children: [_jsx("label", { className: "block mb-1 text-sm", children: "Due Date:" }), _jsx(DatePicker, { name: "dateDue", className: 'w-64', onChange: (e) => dispatch(actions.editInvoice({
+                                                }, value: state.dateDelivered || "" })] })] }), _jsx(LegalEntityForm, { legalEntity: state.issuer, onChangeInfo: (input) => dispatch(actions.editIssuer(input)), onChangeBank: (input) => dispatch(actions.editIssuerBank(input)), onChangeWallet: (input) => dispatch(actions.editIssuerWallet(input)), basicInfoDisabled: false, bankDisabled: !fiatMode, walletDisabled: fiatMode, currency: state.currency, status: state.status, walletvalidation: walletValidation, mainCountryValidation: mainCountryValidation, bankCountryValidation: bankCountryValidation, ibanvalidation: ibanValidation, bicvalidation: bicValidation, banknamevalidation: bankNameValidation, streetaddressvalidation: streetAddressValidation, cityvalidation: cityValidation, postalcodevalidation: postalCodeValidation, payeremailvalidation: payerEmailValidation })] }), _jsxs("div", { className: "border border-gray-200 rounded-lg p-4", children: [_jsx("h3", { className: "text-lg font-semibold mb-4", children: "Payer" }), _jsxs("div", { className: "mb-2", children: [_jsx("label", { className: "block mb-1 text-sm", children: "Due Date:" }), _jsx(DatePicker, { name: "dateDue", className: "w-64", onChange: (e) => dispatch(actions.editInvoice({
                                             dateDue: e.target.value.split("T")[0],
                                         })), value: state.dateDue })] }), _jsx(LegalEntityForm, { bankDisabled: true, legalEntity: state.payer, onChangeInfo: (input) => dispatch(actions.editPayer(input)), currency: state.currency, status: state.status, payeremailvalidation: payerEmailValidation })] })] }), _jsx("div", { className: "mb-8", children: _jsx(LineItemsTable, { currency: state.currency, lineItems: state.lineItems.map((item) => ({
                         ...item,
@@ -411,5 +361,50 @@ export default function Editor(props) {
                                     }
                                 }, onChange: (e) => {
                                     setNotes(e.target.value);
-                                }, className: "p-2 mb-4" }) }) }), _jsx("div", { className: "col-span-1", children: _jsx("div", { className: "rounded-lg border border-gray-200 bg-gray-50 p-6 shadow-sm h-32", children: _jsxs("div", { className: "", children: [_jsxs("div", { className: "flex justify-between text-gray-700", children: [_jsx("span", { className: "font-medium", children: "Subtotal (excl. tax):" }), _jsxs("span", { children: [formatNumber(itemsTotalTaxExcl), " ", state.currency] })] }), _jsxs("div", { className: "flex justify-between border-t border-gray-200 pt-6 text-lg font-bold text-gray-900", children: [_jsx("span", { children: "Total (incl. tax):" }), _jsxs("span", { children: [formatNumber(itemsTotalTaxIncl), " ", state.currency] })] })] }) }) })] }), state.status === "PAYMENTSCHEDULED" && (_jsx("div", { className: "mt-8", children: !isFiatCurrency(state.currency) ? (_jsx(InvoiceToGnosis, { docState: state, dispatch: dispatch })) : (_jsx(RequestFinance, { docState: state })) }))] }));
+                                }, className: "p-2 mb-4" }) }) }), _jsx("div", { className: "col-span-1", children: _jsx("div", { className: "rounded-lg border border-gray-200 bg-gray-50 p-6 shadow-sm h-32", children: _jsxs("div", { className: "", children: [_jsxs("div", { className: "flex justify-between text-gray-700", children: [_jsx("span", { className: "font-medium", children: "Subtotal (excl. tax):" }), _jsxs("span", { children: [formatNumber(itemsTotalTaxExcl), " ", state.currency] })] }), _jsxs("div", { className: "flex justify-between border-t border-gray-200 pt-6 text-lg font-bold text-gray-900", children: [_jsx("span", { children: "Total (incl. tax):" }), _jsxs("span", { children: [formatNumber(itemsTotalTaxIncl), " ", state.currency] })] })] }) }) })] }), activeModal && (_jsx(ConfirmationModal, { open: !!activeModal, header: modalHeaders[activeModal], onCancel: () => setActiveModal(null), onContinue: () => {
+                    if (activeModal === "issueInvoice") {
+                        dispatch(actions.issue({
+                            invoiceNo: invoiceNoInput,
+                            dateIssued: state.dateIssued,
+                        }));
+                    }
+                    if (activeModal === "rejectInvoice") {
+                        dispatch(actions.reject({
+                            final: finalReason,
+                            id: generateId(),
+                            reason: rejectReason,
+                        }));
+                    }
+                    if (activeModal === "schedulePayment") {
+                        dispatch(actions.schedulePayment({
+                            id: generateId(),
+                            processorRef: paymentRef,
+                        }));
+                    }
+                    if (activeModal === "closePayment") {
+                        dispatch(actions.closePayment({
+                            closureReason: closureReason,
+                        }));
+                    }
+                    if (activeModal === "registerPayment") {
+                        dispatch(actions.registerPaymentTx({
+                            id: state.payments[state.payments.length - 1].id,
+                            timestamp: paymentDate,
+                            txRef: txnRef,
+                        }));
+                    }
+                    if (activeModal === "reportPaymentIssue") {
+                        dispatch(actions.reportPaymentIssue({
+                            id: state.payments[state.payments.length - 1].id,
+                            issue: paymentIssue,
+                        }));
+                    }
+                    if (activeModal === "confirmPayment") {
+                        dispatch(actions.confirmPayment({
+                            id: state.payments[state.payments.length - 1].id,
+                            amount: parseFloat(paymentAmount) || 0,
+                        }));
+                    }
+                    setActiveModal(null);
+                }, continueLabel: modalContinueLabels[activeModal], continueDisabled: modalWarning, children: modalContentMap[activeModal] })), (state.status === "ACCEPTED" || state.status === "PAYMENTSCHEDULED") && (_jsx("div", { className: "mt-8", children: !isFiatCurrency(state.currency) ? (_jsx(InvoiceToGnosis, { docState: state, dispatch: dispatch })) : (_jsx(RequestFinance, { docState: state, dispatch: dispatch })) }))] }));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ingestUBL.d.ts","sourceRoot":"","sources":["../../../editors/invoice/ingestUBL.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEd,MAAM,wCAAwC,CAAC;AAEhD,UAAU,gBAAgB;IACxB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAkC;gBAEtC,MAAM,EAAE,kBAAkB;IAItC,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAqBlC,cAAc,CACZ,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI;IAUhB,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,kBAAkB;IA2B1B,OAAO,CAAC,cAAc;IA8NtB,OAAO,CAAC,gBAAgB;CA4DzB;AAED,wBAAsB,WAAW,CAAC,EAChC,IAAI,EACJ,QAAQ,GACT,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBlC"}
+{"version":3,"file":"ingestUBL.d.ts","sourceRoot":"","sources":["../../../editors/invoice/ingestUBL.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEd,MAAM,wCAAwC,CAAC;AAEhD,UAAU,gBAAgB;IACxB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAkC;gBAEtC,MAAM,EAAE,kBAAkB;IAItC,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAqBlC,cAAc,CACZ,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI;IAUhB,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,cAAc;IA8NtB,OAAO,CAAC,gBAAgB;CA4DzB;AAED,wBAAsB,WAAW,CAAC,EAChC,IAAI,EACJ,QAAQ,GACT,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBlC"}

package/dist/editors/invoice/ingestUBL.js

@@ -40,9 +40,6 @@ export class UBLConverter {
             invoiceNo: this.getElementText(invoice, "ID, cbc\\:ID"),
             dateIssued: this.getElementText(invoice, "IssueDate, cbc\\:IssueDate"),
             dateDue: this.getElementText(invoice, "PaymentDueDate, cbc\\:PaymentDueDate"),
-            dateDelivered: this.getElementText(invoice, "ActualDeliveryDate, cbc\\:ActualDeliveryDate") ||
-                this.getElementText(invoice, "TaxPointDate, cbc\\:TaxPointDate") ||
-                null,
             currency: this.getElementText(invoice, "CurrencyCode, cbc\\:CurrencyCode") ||
                 this.getElementText(invoice, "DocumentCurrencyCode, cbc\\:DocumentCurrencyCode"),
         }));

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;AAWxC,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA2LnD,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;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"}

package/dist/editors/invoice/invoiceToGnosis.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from "react";
 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-dev.powerhouse.xyz/graphql/invoice';
@@ -92,9 +93,9 @@ const InvoiceToGnosis = ({ docState, dispatch }) => {
                 const dataObj = typeof data.data === "string" ? JSON.parse(data.data) : data.data;
                 setsafeTxHash(dataObj.txHash);
                 // add gnosis tx hash to invoice
-                dispatch(actions.editPaymentData({
-                    txnHash: dataObj.txHash,
-                    paymentDate: new Date().toISOString(),
+                dispatch(actions.schedulePayment({
+                    id: generateId(),
+                    processorRef: dataObj.txHash,
                 }));
                 if (dataObj.paymentDetails) {
                     // Format the payment details for better readability

package/dist/editors/invoice/lineItemTags/tagMapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tagMapping.d.ts","sourceRoot":"","sources":["../../../../editors/invoice/lineItemTags/tagMapping.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,eAAO,MAAM,qBAAqB,EAAE,YAAY,EAiE/C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,YAAY,EAc/C,CAAC"}
+{"version":3,"file":"tagMapping.d.ts","sourceRoot":"","sources":["../../../../editors/invoice/lineItemTags/tagMapping.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAGtE,eAAO,MAAM,qBAAqB,EAAE,YAAY,EAiE/C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,YAAY,EAc/C,CAAC"}

package/dist/editors/invoice/lineItemTags/tagMapping.js

@@ -1,68 +1,69 @@
+// Removed non expense accounts from the list
 export const expenseAccountOptions = [
-    { label: "Grants from Maker DAO", value: "200" },
-    { label: "Clearing Account", value: "2001" },
-    { label: "Request Finance IC account", value: "2222" },
-    { label: "Interest Income", value: "270" },
-    { label: "Activities and Events", value: "3000" },
-    { label: "Meals", value: "3001" },
-    { label: "Airfare", value: "3002" },
-    { label: "Hotels", value: "3003" },
-    { label: "Transportation (Uber, Taxi etc)", value: "3004" },
-    { label: "Other travel cost", value: "3005" },
-    { label: "Cost of Goods Sold", value: "310" },
-    { label: "Advertising", value: "400" },
-    { label: "Legal Fees Abroad", value: "4001" },
-    { label: "Legal Fees Switzerland", value: "4002" },
-    { label: "Finance Team Fees Abroad", value: "4003" },
-    { label: "Finance and Accounting Fees Switzerland", value: "4004" },
-    { label: "Software Development Team Fees", value: "4005" },
-    { label: "Research Team Fees", value: "4006" },
-    { label: "Marketing Team Fees", value: "4007" },
-    { label: "Health Care Fees", value: "4008" },
-    { label: "Contractor Fees", value: "4009" },
-    { label: "Insurance Fees Team", value: "4010" },
-    { label: "HR Fees", value: "4011" },
-    { label: "Team Bonus", value: "4012" },
-    { label: "Refferal Fees", value: "4013" },
-    { label: "Depreciation", value: "416" },
-    { label: "Freight & Courier", value: "425" },
-    { label: "Interest Expense", value: "437" },
-    { label: "Office Expenses", value: "453" },
-    { label: "Rent", value: "469" },
-    { label: "Subscriptions", value: "485" },
-    { label: "Bank Revaluations", value: "497" },
-    { label: "Unrealised Currency Gains", value: "498" },
-    { label: "Realised Currency Gains", value: "499" },
-    { label: "Income Tax Expense", value: "505" },
-    { label: "Accounts Receivable", value: "610" },
-    { label: "Prepayments", value: "620" },
-    { label: "Inventory", value: "630" },
-    { label: "Software/IT Subscriptions", value: "701" },
-    { label: "Telephone and Internet Charges", value: "702" },
-    { label: "Office Equipment", value: "710" },
-    { label: "Less Accumulated Depreciation on Office Equipment", value: "711" },
-    { label: "Computer Equipment", value: "720" },
-    { label: "Less Accumulated Depreciation on Computer Equipment", value: "721" },
-    { label: "Accounts Payable", value: "800" },
-    { label: "Bank Fees", value: "8000" },
-    { label: "Gas Fees", value: "8001" },
-    { label: "Exchange Fees", value: "8003" },
-    { label: "Unpaid Expense Claims", value: "801" },
-    { label: "Accrued Expenses", value: "802" },
-    { label: "Wages Payable", value: "803" },
-    { label: "Sales Tax", value: "820" },
-    { label: "Employee Tax Payable", value: "825" },
-    { label: "Superannuation Payable", value: "826" },
-    { label: "Income Tax Payable", value: "830" },
-    { label: "Historical Adjustment", value: "840" },
-    { label: "Suspense", value: "850" },
-    { label: "Rounding", value: "860" },
-    { label: "Tracking Transfers", value: "877" },
-    { label: "Owner A Drawings", value: "880" },
-    { label: "Owner A Funds Introduced", value: "881" },
-    { label: "Loan", value: "900" },
-    { label: "Retained Earnings", value: "960" },
-    { label: "Owner A Share Capital", value: "970" }
+    //{ label: "200 - Grants from Maker DAO", value: "200" },
+    { label: "2001 - Clearing Account", value: "2001" },
+    { label: "2222 - Request Finance IC account", value: "2222" },
+    //{ label: "270 - Interest Income", value: "270" },
+    { label: "3000 - Activities and Events", value: "3000" },
+    { label: "3001 - Meals", value: "3001" },
+    { label: "3002 - Airfare", value: "3002" },
+    { label: "3003 - Hotels", value: "3003" },
+    { label: "3004 - Transportation (Uber, Taxi etc)", value: "3004" },
+    { label: "3005 - Other travel cost", value: "3005" },
+    //{ label: "310 - Cost of Goods Sold", value: "310" },
+    { label: "400 - Advertising", value: "400" },
+    { label: "4001 - Legal Fees Abroad", value: "4001" },
+    { label: "4002 - Legal Fees Switzerland", value: "4002" },
+    { label: "4003 - Finance Team Fees Abroad", value: "4003" },
+    { label: "4004 - Finance and Accounting Fees Switzerland", value: "4004" },
+    { label: "4005 - Software Development Team Fees", value: "4005" },
+    { label: "4006 - Research Team Fees", value: "4006" },
+    { label: "4007 - Marketing Team Fees", value: "4007" },
+    { label: "4008 - Health Care Fees", value: "4008" },
+    { label: "4009 - Contractor Fees", value: "4009" },
+    { label: "4010 - Insurance Fees Team", value: "4010" },
+    { label: "4011 - HR Fees", value: "4011" },
+    { label: "4012 - Team Bonus", value: "4012" },
+    { label: "4013 - Refferal Fees", value: "4013" },
+    { label: "416 - Depreciation", value: "416" },
+    { label: "425 - Freight & Courier", value: "425" },
+    { label: "437 - Interest Expense", value: "437" },
+    { label: "453 - Office Expenses", value: "453" },
+    { label: "469 - Rent", value: "469" },
+    { label: "485 - Subscriptions", value: "485" },
+    //{ label: "497 - Bank Revaluations", value: "497" },
+    //{ label: "498 - Unrealised Currency Gains", value: "498" },
+    //{ label: "499 - Realised Currency Gains", value: "499" },
+    { label: "505 - Income Tax Expense", value: "505" },
+    //{ label: "610 - Accounts Receivable", value: "610" },
+    //{ label: "620 - Prepayments", value: "620" },
+    //{ label: "630 - Inventory", value: "630" },
+    { label: "701 - Software/IT Subscriptions", value: "701" },
+    { label: "702 - Telephone and Internet Charges", value: "702" },
+    //{ label: "710 - Office Equipment", value: "710" },
+    //{ label: "711 - Less Accumulated Depreciation on Office Equipment", value: "711" },
+    //{ label: "720 - Computer Equipment", value: "720" },
+    //{ label: "721 - Less Accumulated Depreciation on Computer Equipment", value: "721" },
+    //{ label: "800 - Accounts Payable", value: "800" },
+    { label: "8000 - Bank Fees", value: "8000" },
+    { label: "8001 - Gas Fees", value: "8001" },
+    { label: "8003 - Exchange Fees", value: "8003" },
+    //{ label: "801 - Unpaid Expense Claims", value: "801" },
+    //{ label: "802 - Accrued Expenses", value: "802" },
+    //{ label: "803 - Wages Payable", value: "803" },
+    // { label: "820 - Sales Tax", value: "820" },
+    // { label: "825 - Employee Tax Payable", value: "825" },
+    // { label: "826 - Superannuation Payable", value: "826" },
+    // { label: "830 - Income Tax Payable", value: "830" },
+    // { label: "840 - Historical Adjustment", value: "840" },
+    // { label: "850 - Suspense", value: "850" },
+    // { label: "860 - Rounding", value: "860" },
+    // { label: "877 - Tracking Transfers", value: "877" },
+    // { label: "880 - Owner A Drawings", value: "880" },
+    // { label: "881 - Owner A Funds Introduced", value: "881" },
+    // { label: "900 - Loan", value: "900" },
+    // { label: "960 - Retained Earnings", value: "960" },
+    // { label: "970 - Owner A Share Capital", value: "970" }
 ];
 export const paymentAccountOptions = [
     { label: "Clearing Account USD", value: "USD" },

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

@@ -1,6 +1,7 @@
 import React from "react";
 interface RequestFinanceProps {
     docState: any;
+    dispatch: any;
 }
 declare const RequestFinance: React.FC<RequestFinanceProps>;
 export default RequestFinance;

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;AAQxC,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA2MjD,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;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"}

package/dist/editors/invoice/requestFinance.js

@@ -1,10 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from "react";
+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-dev.powerhouse.xyz/graphql/invoice';
 }
-const RequestFinance = ({ docState }) => {
+const RequestFinance = ({ docState, dispatch }) => {
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
     const [responseData, setResponseData] = useState(null);
@@ -84,7 +86,8 @@ const RequestFinance = ({ docState }) => {
                 })),
                 invoiceNumber: docState.invoiceNo,
                 buyerInfo: {
-                    email: docState.payer.contactInfo.email,
+                    // email: docState.payer.contactInfo.email,
+                    email: 'prometheus@powerhouse.inc',
                     firstName: docState.payer.name,
                     // lastName: docState.payer.name.split(" ")[1] || "Liberty",
                     businessName: docState.payer.name,
@@ -134,6 +137,10 @@ const RequestFinance = ({ docState }) => {
             // Process the response
             if (directPaymentResult?.response?.invoiceLinks?.pay) {
                 setInvoiceLink(directPaymentResult.response.invoiceLinks.pay);
+                dispatch(actions.schedulePayment({
+                    id: generateId(),
+                    processorRef: directPaymentResult.response.invoiceLinks.pay,
+                }));
             }
             setResponseData(directPaymentResult);
             setDirectPaymentStatus("Direct payment created successfully");