Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import Download from "@requestnetwork/shared-icons/download.svelte";
// Utils
import { formatDate } from "@requestnetwork/shared-utils/formatDate";
import { checkStatus } from "@requestnetwork/shared-utils/checkStatus";
import { calculateItemTotal } from "@requestnetwork/shared-utils/invoiceTotals";
import { exportToPDF } from "@requestnetwork/shared-utils/generateInvoice";
import { getCurrencyFromManager } from "@requestnetwork/shared-utils/getCurrency";
Expand Down Expand Up @@ -73,6 +74,8 @@
| Types.Extension.IPaymentNetworkState<any>
| undefined;
let status = checkStatus(requestData || request);
const generateDetailParagraphs = (info: any) => {
const fullName = [info?.firstName, info?.lastName]
.filter(Boolean)
Expand Down Expand Up @@ -186,7 +189,8 @@
} else {
approved = true;
}
isPaid = requestData?.balance?.balance! >= requestData?.expectedAmount;
status = checkStatus(requestData || request);
} catch (err: any) {
console.error("Error while checking invoice: ", err);
if (String(err).includes("Unsupported payment")) {
Expand Down Expand Up @@ -368,7 +372,7 @@
<h2 class="invoice-number">
Invoice #{request?.contentData?.invoiceNumber || "-"}
<p class={`invoice-status ${isPaid ? "bg-green" : "bg-zinc"}`}>
{isPaid ? "Paid" : "Created"}
{status}
</p>
<Tooltip text="Download PDF">
<Download
Expand Down
14 changes: 2 additions & 12 deletions packages/invoice-dashboard/src/lib/view-requests.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@
import type { IConfig } from "@requestnetwork/shared-types";
import type { RequestNetwork } from "@requestnetwork/request-client.js";
// Utils
import { checkStatus } from "@requestnetwork/shared-utils/checkStatus";
import { config as defaultConfig } from "@requestnetwork/shared-utils/config";
import { initializeCurrencyManager } from "@requestnetwork/shared-utils/initCurrencyManager";
import { exportToPDF } from "@requestnetwork/shared-utils/generateInvoice";
import { getCurrencyFromManager } from "@requestnetwork/shared-utils/getCurrency";
import { CurrencyManager } from "@requestnetwork/currency";
import { onDestroy, onMount, tick } from "svelte";
import { formatUnits } from "viem";
import { capitalize, debounce, formatAddress } from "../utils";
import { debounce, formatAddress } from "../utils";
import { Drawer, InvoiceView } from "./dashboard";
import { getPaymentNetworkExtension } from "@requestnetwork/payment-detection";
import { CurrencyTypes } from "@requestnetwork/types";
Expand Down Expand Up @@ -381,17 +382,6 @@
const handleRemoveSelectedRequest = () => {
activeRequest = undefined;
};

const checkStatus = (request: any) => {
switch (request?.balance?.balance > 0) {
case true:
return request?.balance?.balance >= request?.expectedAmount
? "Paid"
: "Partially Paid";
default:
return capitalize(request?.state);
}
};
</script>

<div
Expand Down
2 changes: 2 additions & 0 deletions shared/utils/capitalize.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const capitalize = (str: string) =>
(str && str[0].toUpperCase() + str.slice(1)) || "";
51 changes: 51 additions & 0 deletions shared/utils/checkStatus.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { capitalize } from "./capitalize";
import { Types } from "@requestnetwork/request-client.js";

export const checkStatus = (request: Types.IRequestDataWithEvents | null) => {
const balance = BigInt(request?.balance?.balance ?? 0);
const expectedAmount = BigInt(request?.expectedAmount ?? 0);
const today = new Date();
let dueDate: Date | null = null;
const isPaid = balance >= expectedAmount ? "Paid" : "Partially Paid";

try {
const rawDueDate = request?.contentData?.paymentTerms?.dueDate;
if (rawDueDate) {
dueDate = new Date(rawDueDate);
if (isNaN(dueDate.getTime())) {
console.warn("Invalid due date format");
dueDate = null;
}
}
} catch (e) {
console.error("Error parsing due date:", e);
dueDate = null;
}

const eventStatus = {
reject: "Rejected",
cancel: "Canceled",
};

for (const [event, status] of Object.entries(eventStatus)) {
if (
request?.events?.some(
(e: { name?: string }) => e?.name?.toLowerCase() === event.toLowerCase()
)
) {
return capitalize(status);
}
}

if (dueDate && dueDate < today) {
if (balance === BigInt(0)) {
return "Overdue";
}
return isPaid;
} else {
if (balance === BigInt(0)) {
return "Awaiting Payment";
}
return isPaid;
}
};