@powerhousedao/contributor-billing 0.0.20 → 0.0.21

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

@@ -36,7 +36,7 @@ export function LineItemTagsTable({ lineItems, onClose, dispatch, paymentAccount
                                                     id: item.id,
                                                     description: e.target.value,
                                                 }));
-                                            }, className: "w-full" }) }), _jsx("td", { className: "border-b border-gray-200 p-3", style: { width: "100px" }, children: _jsx(DatePicker, { name: "period", dateFormat: "YYYY-MM-DD", autoClose: true, placeholder: "Select Period", value: item.lineItemTag.find((tag) => tag.dimension === "accounting-period")?.label || "", onChange: (e) => dispatch(actions.setLineItemTag({
+                                            } }) }), _jsx("td", { className: "border-b border-gray-200 w-48", children: _jsx(DatePicker, { name: "period", dateFormat: "YYYY-MM-DD", autoClose: true, placeholder: "Select Period", value: item.lineItemTag.find((tag) => tag.dimension === "accounting-period")?.label || "", onChange: (e) => dispatch(actions.setLineItemTag({
                                                 lineItemId: item.id,
                                                 dimension: "accounting-period",
                                                 value: new Date(e.target.value)

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,EA6D/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;AAEtE,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,5 +1,6 @@
 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" },
@@ -7,12 +8,13 @@ export const expenseAccountOptions = [
     { 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: "Fnance and Accounting Fees Switzerland", value: "4004" },
+    { 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" },
@@ -36,6 +38,7 @@ export const expenseAccountOptions = [
     { 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" },
@@ -45,6 +48,7 @@ export const expenseAccountOptions = [
     { 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" },

package/dist/editors/invoice/requestFinance.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from "react";
 let GRAPHQL_URL = 'http://localhost:4001/graphql/invoice';
 if (window.document.baseURI !== 'http://localhost:3000/') {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+    GRAPHQL_URL = 'https://switchboard-dev.powerhouse.xyz/graphql/invoice';
 }
 const RequestFinance = ({ docState }) => {
     const [isLoading, setIsLoading] = useState(false);

package/dist/editors/invoice/uploadPdfChunked.js

@@ -7,7 +7,7 @@
  */
 let GRAPHQL_URL = 'http://localhost:4001/graphql/invoice';
 if (window.document.baseURI !== 'http://localhost:3000/') {
-    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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gnosisTransactionBuilder.d.ts","sourceRoot":"","sources":["../../../scripts/invoice/gnosisTransactionBuilder.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,IAAI,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AA6BD,iBAAe,uBAAuB,CACpC,SAAS,EAAE,MAAM,EACjB,mBAAmB,EAAE,aAAa,GAAG,aAAa,EAAE,GACnD,OAAO,CAAC,cAAc,CAAC,CAqFzB;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
+{"version":3,"file":"gnosisTransactionBuilder.d.ts","sourceRoot":"","sources":["../../../scripts/invoice/gnosisTransactionBuilder.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,IAAI,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AA6BD,iBAAe,uBAAuB,CACpC,SAAS,EAAE,MAAM,EACjB,mBAAmB,EAAE,aAAa,GAAG,aAAa,EAAE,GACnD,OAAO,CAAC,cAAc,CAAC,CA6FzB;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAA"}

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');
 }
@@ -49,6 +49,8 @@ async function executeTransferProposal(chainName, paymentDetailsInput) {
     const safeApiKit = new SafeApiKit({
         chainId: Number(payerWallet.chainId),
     });
+    const nextNonce = await safeApiKit.getNextNonce(safeAddress);
+    console.log("Next Nonce: ", nextNonce);
     // @ts-ignore - Ignoring constructor error as per requirements
     const protocolKit = await Safe.init({
         provider: payerWallet.rpc,
@@ -78,7 +80,12 @@ async function executeTransferProposal(chainName, paymentDetailsInput) {
         };
     });
     console.log('\n=== Creating Safe transaction ===');
-    const safeTx = await protocolKit.createTransaction({ transactions });
+    const safeTx = await protocolKit.createTransaction({
+        transactions,
+        options: {
+            nonce: nextNonce
+        }
+    });
     console.log('\n=== Signing & proposing ===');
     const safeTxHash = await protocolKit.getTransactionHash(safeTx);
     const signature = await protocolKit.signHash(safeTxHash);

package/dist/style.css

@@ -400,9 +400,6 @@
   .h-full {
     height: 100%;
   }
-  .max-h-\[500px\] {
-    max-height: 500px;
-  }
   .w-4 {
     width: calc(var(--spacing) * 4);
   }
@@ -424,6 +421,9 @@
   .w-48 {
     width: calc(var(--spacing) * 48);
   }
+  .w-50 {
+    width: calc(var(--spacing) * 50);
+  }
   .w-64 {
     width: calc(var(--spacing) * 64);
   }
@@ -544,6 +544,9 @@
       margin-inline-end: calc(calc(var(--spacing) * 2) * calc(1 - var(--tw-space-x-reverse)));
     }
   }
+  .justify-self-end {
+    justify-self: flex-end;
+  }
   .overflow-hidden {
     overflow: hidden;
   }
@@ -784,6 +787,9 @@
   .text-gray-900 {
     color: var(--color-gray-900);
   }
+  .text-green-500 {
+    color: var(--color-green-500);
+  }
   .text-green-600 {
     color: var(--color-green-600);
   }
@@ -970,6 +976,11 @@
       padding: calc(var(--spacing) * 0);
     }
   }
+  .sm\:mt-6 {
+    @media (width >= 40rem) {
+      margin-top: calc(var(--spacing) * 6);
+    }
+  }
   .sm\:grid-cols-2 {
     @media (width >= 40rem) {
       grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -6355,11 +6366,6 @@ input[type="number"] {
     transform: none;
   }
 }
-@media (min-width: 640px) {
-  .two-column-grid {
-    grid-template-columns: 1fr 1fr;
-  }
-}
 @property --tw-border-spacing-x {
   syntax: "<length>";
   inherits: false;

package/dist/subgraphs/invoice/resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/resolvers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAQ3D,eAAO,MAAM,YAAY,GAAI,UAAU,QAAQ,KAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CA8SnE,CAAC"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/resolvers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAQ3D,eAAO,MAAM,YAAY,GAAI,UAAU,QAAQ,KAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CA0UnE,CAAC"}

package/dist/subgraphs/invoice/resolvers.js

@@ -99,6 +99,20 @@ export const getResolvers = (subgraph) => {
                 await reactor.addAction(driveId, docId, actions.deleteRef({ ...args.input }));
                 return doc.revision.global + 1;
             },
+            Invoice_editPaymentData: async (_, args) => {
+                const driveId = args.driveId || DEFAULT_DRIVE_ID;
+                const docId = args.docId || "";
+                const doc = await reactor.getDocument(driveId, docId);
+                await reactor.addAction(driveId, docId, actions.editPaymentData({ ...args.input }));
+                return doc.revision.global + 1;
+            },
+            Invoice_setExported: async (_, args) => {
+                const driveId = args.driveId || DEFAULT_DRIVE_ID;
+                const docId = args.docId || "";
+                const doc = await reactor.getDocument(driveId, docId);
+                await reactor.addAction(driveId, docId, actions.setExported({ ...args.input }));
+                return doc.revision.global + 1;
+            },
             Invoice_editIssuer: async (_, args) => {
                 const driveId = args.driveId || DEFAULT_DRIVE_ID;
                 const docId = args.docId || "";

package/dist/subgraphs/invoice/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YA8cpB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YAkepB,CAAC"}

package/dist/subgraphs/invoice/schema.js

@@ -18,6 +18,9 @@ export const schema = gql `
     totalPriceTaxIncl: Float!
     invoiceTags: [InvoiceTag!]! # e.g. {'xero-payment-account', '090', 'PowerhouseUSD'}
     notes: String
+    paymentDate: String
+    txnHash: String
+    exported: Boolean
   }
 
   type Ref {
@@ -192,6 +195,16 @@ export const schema = gql `
       docId: PHID
       input: Invoice_DeleteRefInput
     ): Int
+    Invoice_editPaymentData(
+      driveId: String
+      docId: PHID
+      input: Invoice_EditPaymentDataInput
+    ): Int
+    Invoice_setExported(
+      driveId: String
+      docId: PHID
+      input: Invoice_SetExportedInput
+    ): Int
     Invoice_editIssuer(
       driveId: String
       docId: PHID
@@ -318,6 +331,13 @@ export const schema = gql `
   input Invoice_DeleteRefInput {
     id: OID!
   }
+  input Invoice_EditPaymentDataInput {
+    paymentDate: String
+    txnHash: String
+  }
+  input Invoice_SetExportedInput {
+    exported: Boolean
+  }
 
   """
   Module: Parties

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.20",
+  "version": "0.0.21",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [
@@ -60,7 +60,7 @@
     "@powerhousedao/builder-tools": "^0.10.2",
     "@powerhousedao/common": "^1.11.2",
     "@powerhousedao/design-system": "^1.40.2",
-    "@powerhousedao/document-engineering": "^1.12.0",
+    "@powerhousedao/document-engineering": "^1.13.0",
     "@react-pdf/renderer": "^4.3.0",
     "@safe-global/api-kit": "^3.0.1",
     "@safe-global/protocol-kit": "^6.0.3",