-
+ {/*
USD
-
+ */}
{
- setActiveButton(location.pathname); // Set the active button based on the current location
+ setActiveButton(location.pathname); // Set the active button based on the current location
}, [location.pathname]);
const dropdownRef = useRef(null);
@@ -156,46 +156,46 @@ function BankDeposit() {
-
- handleLinkClick('/')}
- >
- Add Invoice
-
- handleLinkClick('/payInvoice')}
- >
- Pay Invoice
-
- handleLinkClick('/bankDeposit')}
- >
- Bank Deposit
-
- handleLinkClick('/atmDeposit')}
- >
- ATM Deposit
-
-
-
+
+ handleLinkClick('/')}
+ >
+ Add Invoice
+
+ handleLinkClick('/payInvoice')}
+ >
+ Pay Invoice
+
+ handleLinkClick('/bankDeposit')}
+ >
+ Bank Deposit
+
+ handleLinkClick('/atmDeposit')}
+ >
+ ATM Deposit
+
+
+
diff --git a/src/components/Pages/AppPAges/Dashboard/Invoice/BankDepositTable.js b/src/components/Pages/AppPAges/Dashboard/Invoice/BankDepositTable.js
index 9ddd464..a13585a 100644
--- a/src/components/Pages/AppPAges/Dashboard/Invoice/BankDepositTable.js
+++ b/src/components/Pages/AppPAges/Dashboard/Invoice/BankDepositTable.js
@@ -270,7 +270,7 @@ const BankDepositTable = (props) => {
return (
-
{
>
+ */}
{paginationItems}
-
{
>
+ */}
);
};
@@ -675,10 +675,8 @@ const BankDepositTable = (props) => {
style={{
paddingLeft: index === 0 ? "30px" : "0",
cursor: "pointer",
- borderTopLeftRadius: index === 0 ? "60px" : "0",
- borderBottomLeftRadius: index === 0 ? "60px" : "0",
- borderTopRightRadius: index === 5 ? "60px" : "0",
- borderBottomRightRadius: index === 5 ? "60px" : "0",
+ backgroundColor:'#282e26',
+ color:'#ffffff',
textAlign: "start",
alignContent: "center",
}}
diff --git a/src/components/Pages/AppPAges/Dashboard/Invoice/Invoice.css b/src/components/Pages/AppPAges/Dashboard/Invoice/Invoice.css
index 81dc0b9..60bc52a 100644
--- a/src/components/Pages/AppPAges/Dashboard/Invoice/Invoice.css
+++ b/src/components/Pages/AppPAges/Dashboard/Invoice/Invoice.css
@@ -94,7 +94,7 @@
.input-group .form-control {
border: none;
- background-color: transparent;
+ /* background-color: transparent; */
outline: none; /* Removes the outline */
}
@@ -310,8 +310,7 @@ input[type="color"]:focus,
width:.30%; /* Make it 30% smaller (i.e., 70% width) */
}
}
-
-
+/* style for dropdown --> select type in bank deposite and atm deposite */
.custom-select {
border: none; /* Remove default borders */
border-bottom: 2px solid #e4e5e7; /* Add a bottom border */
diff --git a/src/components/Pages/AppPAges/Expense/expense.js b/src/components/Pages/AppPAges/Expense/expense.js
index dd3e4b3..88d1998 100644
--- a/src/components/Pages/AppPAges/Expense/expense.js
+++ b/src/components/Pages/AppPAges/Expense/expense.js
@@ -9,6 +9,9 @@ import { useNavigate } from "react-router-dom";
import AddExpenseTypeModal from "../ReusableForm/AddExpenseModal";
import AddVendorModal from "../ReusableForm/AddVendorModal";
import Swal from "sweetalert2";
+import invoiceIcon from '../../../../assets/Image/invoiceIcon.png'
+import expensetype from '../../../../assets/Image/expenses type .png'
+import vendor from '../../../../assets/Image/vendor.png'
export default function Expense() {
const { user } = useContext(AuthContext);
@@ -448,24 +451,24 @@ export default function Expense() {
try {
let response;
if (editingInvoiceId) {
- // Editing an existing invoice
- const originalInvoice = invoices.find((invoice) => invoice.id === editingInvoiceId);
- if (!originalInvoice) {
- console.error("Invoice not found for editingInvoiceId:", editingInvoiceId);
- return;
- }
+ // Editing an existing invoice
+ const originalInvoice = invoices.find((invoice) => invoice.id === editingInvoiceId);
+ if (!originalInvoice) {
+ console.error("Invoice not found for editingInvoiceId:", editingInvoiceId);
+ return;
+ }
- // Determine the new status based on payment method and remaining amount
- const newRemainingAmount = Math.max(0, originalInvoice.amount - (formData.pay_amount || 0));
- let newStatus = originalInvoice.status; // Start with the original status
+ // Determine the new status based on payment method and remaining amount
+ const newRemainingAmount = Math.max(0, originalInvoice.amount - (formData.pay_amount || 0));
+ let newStatus = originalInvoice.status; // Start with the original status
- if (formData.pay_method_status === "pay_now") {
- newStatus = "paid"; // Always "paid" if paid now
- } else if (formData.pay_method_status === "pay_later") {
- newStatus = "unpaid"; // Ensure unpaid if paying later
- } else if (newRemainingAmount < originalInvoice.amount) {
- newStatus = "partially_paid"; // Adjust if partially paid
- }
+ if (formData.pay_method_status === "pay_now") {
+ newStatus = "paid"; // Always "paid" if paid now
+ } else if (formData.pay_method_status === "pay_later") {
+ newStatus = "unpaid"; // Ensure unpaid if paying later
+ } else if (newRemainingAmount < originalInvoice.amount) {
+ newStatus = "partially_paid"; // Adjust if partially paid
+ }
// Ensure pay_amount is included when editing
@@ -625,15 +628,148 @@ export default function Expense() {
-
-
Expense
-
- {" "}
+
+
+
+ Add Invoice
+
+
+
+
+
+ + Add New Vendor
+
+
+ + Add Expense Type
+
+
+
+
+ {/* Invoice due this month */}
+
+
+ $500
+
+
+ Invoice due this month
+
+
+
+ {/* Last 7 days sale */}
+
+
+ $1900
+
+
+ Last 7 days sale
+
+
+
+ {/* Expense this month */}
+
+
+ $0.00
+
+
+ Expense this month
+
+
+
+
+
e.stopPropagation()}
style={{
- width: "700px",
+ width: "1200px",
backgroundColor: "white",
margin: "100px auto",
padding: "20px",
@@ -694,13 +830,16 @@ export default function Expense() {