Sonali
/
Paisa_vara
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

" new update"

23_12__sonali
sonali 2024-12-23 18:56:43 +05:30
parent f0bf773985
commit e6a93e1431
29 changed files with 1622 additions and 1034 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/Image/Department.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 555 B

BIN
src/assets/Image/employee.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 657 B

BIN
src/assets/Image/owner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 965 B

BIN
src/assets/Image/store.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 675 B

BIN
src/assets/Image/user.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 484 B

2
src/components/Pages/AppPAges/Dashboard/Invoice/Invoice.css
View File

@ -94,7 +94,7 @@
.input-group .form-control { .input-group .form-control {
border: none; border: none;
/* background-color: transparent; */ background-color: transparent;
outline: none; /* Removes the outline */ outline: none; /* Removes the outline */
} }

98
src/components/Pages/AppPAges/Expense/expense.js
View File

@ -811,6 +811,7 @@ export default function Expense() {
</h5> </h5>
<svg <svg
onClick={toggleModal} onClick={toggleModal}
width="14" width="14"
height="14" height="14"
@ -1079,53 +1080,53 @@ export default function Expense() {
{showPaymentOptions && ( {showPaymentOptions && (
<div <div
className="d-flex col-md-6 mb-3" className="d-flex col-md-6 mb-3"
style={{ style={{
border: '2px solid #ACB4AA', border: '2px solid #ACB4AA',
padding: '10px 10px', padding: '10px 10px',
width: 'fit-content', width: 'fit-content',
borderRadius: '40px', borderRadius: '40px',
display: 'flex', // Use flexbox for inner items display: 'flex', // Use flexbox for inner items
gap: '10px', // Add spacing between the options gap: '10px', // Add spacing between the options
marginTop: '20px', // Keep this if you want some space above marginTop: '20px', // Keep this if you want some space above
}} }}
> >
{[ {[
{ value: "cash", label: "Cash" }, { value: "cash", label: "Cash" },
{ value: "cheque", label: "Check" }, { value: "cheque", label: "Check" },
{ value: "bank", label: "Bank Card/ACH/EFT" } { value: "bank", label: "Bank Card/ACH/EFT" }
].map((method) => ( ].map((method) => (
<label <label
key={method.value} key={method.value}
className="radio-inline" className="radio-inline"
style={{ style={{
backgroundColor: formData.pay_method === method.value ? "#4a5546" : "transparent", backgroundColor: formData.pay_method === method.value ? "#4a5546" : "transparent",
color: formData.pay_method === method.value ? "white" : "black", color: formData.pay_method === method.value ? "white" : "black",
padding: '5px 10px', // Add padding for better appearance padding: '5px 10px', // Add padding for better appearance
borderRadius: '20px', // Optional: Round the corners of the label borderRadius: '20px', // Optional: Round the corners of the label
cursor: "pointer", cursor: "pointer",
}} }}
> >
<input <input
type="radio" type="radio"
name="specificPaymentMethod" name="specificPaymentMethod"
value={method.value} value={method.value}
onChange={handleSpecificPaymentMethodChange} onChange={handleSpecificPaymentMethodChange}
style={{ display: 'none' }} style={{ display: 'none' }}
/> />
{method.label} {/* Use the label defined in the array */} {method.label} {/* Use the label defined in the array */}
</label> </label>
))} ))}
</div> </div>
)} )}
{(formData.pay_method_status === "pay_later" || {(formData.pay_method_status === "pay_later" ||
formData.pay_method_status === "credit_invoice") && ( formData.pay_method_status === "credit_invoice") && (
<div className="col-md-6 d-flex" style={{ paddingRight: "10px", marginTop:'20px' }}> <div className="col-md-6 d-flex" style={{ paddingRight: "10px", marginTop: '20px' }}>
<select <select
className="form-control col-md-6 me-2" className="form-control col-md-6 me-2"
name="days" name="days"
@ -1133,7 +1134,7 @@ export default function Expense() {
onChange={handleChange} onChange={handleChange}
style={{ style={{
backgroundColor: "#fff", backgroundColor: "#fff",
border: "none", // Remove all borders border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius borderRadius: "0px", // Remove border radius
@ -1153,7 +1154,7 @@ export default function Expense() {
type="text" type="text"
style={{ style={{
backgroundColor: "#fff", backgroundColor: "#fff",
border: "none", // Remove all borders border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius borderRadius: "0px", // Remove border radius
@ -1175,7 +1176,7 @@ export default function Expense() {
<select <select
style={{ style={{
backgroundColor: "#fff", backgroundColor: "#fff",
border: "none", // Remove all borders border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius borderRadius: "0px", // Remove border radius
@ -1239,8 +1240,8 @@ export default function Expense() {
style={{ style={{
backgroundColor: "#fff", backgroundColor: "#fff",
border: "none", // Remove all borders border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius borderRadius: "0px", // Remove border radius
height: "52px", height: "52px",
marginRight: "10px", marginRight: "10px",
}} }}
@ -1347,12 +1348,13 @@ export default function Expense() {
type="button" type="button"
className="btn btn-secondary-outline" className="btn btn-secondary-outline"
onClick={toggleModal} onClick={toggleModal}
style={{ border: " 1px solid #282e26", borderRadius: '20px' }}
> >
Close Close
</button> </button>
<button <button
type="submit" type="submit"
style={{backgroundColor:'#282E26' ,color:"#fff"}} style={{ color: "white", backgroundColor: '#282e26', borderRadius: '20px' }}
className="btn" className="btn"
onClick={handleSubmit} onClick={handleSubmit}
> >

2
src/components/Pages/AppPAges/Gas/GasTypeTable.js
View File

@ -296,7 +296,7 @@ const GasTypeTable = ({
</select> </select>
</div> </div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
<th scope="col" className="no-column"> <th scope="col" className="no-column">

2
src/components/Pages/AppPAges/Gas/HouseChargeTable.js
View File

@ -321,7 +321,7 @@ const HouseChargeTable = ({
</select> </select>
</div> </div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
<th scope="col" className="no-column"> <th scope="col" className="no-column">

2
src/components/Pages/AppPAges/Lottery/LotteryInventoryTable.js
View File

@ -90,7 +90,7 @@ const LotteryInventoryTable = ({
return ( return (
<div> <div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
{columns.map((col, index) => ( {columns.map((col, index) => (

2
src/components/Pages/AppPAges/Lottery/LotteryReportTable.js
View File

@ -194,7 +194,7 @@ const LotteryReportTable = ({
<div className="d-flex mb-3"> <div className="d-flex mb-3">
<div className="expense-searchcontainerstart d-flex"></div> <div className="expense-searchcontainerstart d-flex"></div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
<th scope="col" className="no-column"> <th scope="col" className="no-column">

2
src/components/Pages/AppPAges/Lottery/LotteryTable.js
View File

@ -190,7 +190,7 @@ const LotteryTable = ({
</select> </select>
</div> </div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
{columns.map((col, index) => ( {columns.map((col, index) => (

2
src/components/Pages/AppPAges/Lottery/WeeklyInvoiceTable.js
View File

@ -335,7 +335,7 @@ const WeeklyInvoiceTable = ({
</select> </select>
</div> </div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
<th scope="col" className="no-column"> <th scope="col" className="no-column">

10
src/components/Pages/AppPAges/ManageSettings/DataTable.js
View File

@ -84,7 +84,7 @@ const DataTable = ({
}; };
return ( return (
<div className="data-table-container"> <div className="data-table-container">
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
<th scope="col" className="no-column"> <th scope="col" className="no-column">
@ -180,7 +180,7 @@ const DataTable = ({
{showFooter && ( {showFooter && (
<nav> <nav>
<ul className="pagination"> <ul className="pagination">
<li className={`prev-next ${currentPage === 1 ? "disabled" : ""}`}> {/* <li className={`prev-next ${currentPage === 1 ? "disabled" : ""}`}>
<span <span
style={{ style={{
@ -196,9 +196,9 @@ const DataTable = ({
textAlign: "center" textAlign: "center"
}} }}
onClick={handlePrev}>&lt;</span>&nbsp; onClick={handlePrev}>&lt;</span>&nbsp;
</li> </li> */}
{renderPagination()} {renderPagination()}
<li {/* <li
className={`prev-next ${currentPage === totalPages ? "disabled" : "" className={`prev-next ${currentPage === totalPages ? "disabled" : ""
}`} }`}
> >
@ -219,7 +219,7 @@ const DataTable = ({
textAlign: "center" textAlign: "center"
}} }}
onClick={handleNext}>&gt; </span> onClick={handleNext}>&gt; </span>
</li> </li> */}
</ul> </ul>
</nav> </nav>
)} )}

96
src/components/Pages/AppPAges/ManageSettings/DataTables.js
View File

@ -134,24 +134,24 @@ const PayrollTable = ({
color: "#fff", color: "#fff",
borderRadius: "10px", borderRadius: "10px",
padding: "5px 20px", padding: "5px 20px",
textAlign:'center', textAlign: 'center',
alignItems:'center' alignItems: 'center'
}, },
paid: { paid: {
backgroundColor: "#198f51", backgroundColor: "#198f51",
color: "#fff", color: "#fff",
borderRadius: "10px", borderRadius: "10px",
padding: "5px 20px", padding: "5px 20px",
textAlign:'center', textAlign: 'center',
alignItems:'center' alignItems: 'center'
}, },
partially_paid: { partially_paid: {
backgroundColor: "#0c8ce9", backgroundColor: "#0c8ce9",
color: "#fff", color: "#fff",
borderRadius: "10px", borderRadius: "10px",
padding: "5px 20px", padding: "5px 20px",
textAlign:'center', textAlign: 'center',
alignItems:'center' alignItems: 'center'
}, },
}; };
const paymentMethodStyles = { const paymentMethodStyles = {
@ -250,55 +250,55 @@ const PayrollTable = ({
</button> */} </button> */}
</div> </div>
<div style={{marginRight:"60%"}}> <div style={{ marginRight: "60%" }}>
<div <div
className="expense-search d-flex align-items-center" className="expense-search d-flex align-items-center"
style={{
backgroundColor: "#4A5546",
boxShadow: "none",
outline: "none",
width: "auto",
height: "42px",
padding: "8px 12px",
fontSize: "16px",
border: "none",
borderRadius: "10px",
color: "#F4FFEE",
cursor: "pointer",
}}
>
<h6 className="" style={{margin:'10px'}}>Show</h6>
<select
name="option"
id="pageSelect"
className="selectoptions"
style={{ style={{
height: "30px", backgroundColor: "#4A5546",
boxShadow: "none",
outline: "none",
width: "auto",
height: "42px",
padding: "2px 6px", padding: "8px 12px",
border: "1px solid #ccc", fontSize: "16px",
backgroundColor: "#282E26", border: "none",
color: "#fff", borderRadius: "10px",
fontSize: "14px", color: "#F4FFEE",
}} cursor: "pointer",
value={rowsPerPage}
onChange={(e) => {
setRowsPerPage(Number(e.target.value));
setCurrentPage(1); // Reset to first page on change
}} }}
> >
<option value={5}>5</option> <h6 className="" style={{ margin: '10px' }}>Show</h6>
<option value={10}>10</option> <select
<option value={15}>15</option> name="option"
<option value={20}>20</option> id="pageSelect"
</select> className="selectoptions"
style={{
height: "30px",
padding: "2px 6px",
border: "1px solid #ccc",
backgroundColor: "#282E26",
color: "#fff",
fontSize: "14px",
}}
value={rowsPerPage}
onChange={(e) => {
setRowsPerPage(Number(e.target.value));
setCurrentPage(1); // Reset to first page on change
}}
>
<option value={5}>5</option>
<option value={10}>10</option>
<option value={15}>15</option>
<option value={20}>20</option>
</select>
</div>
</div> </div>
</div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header" >
<tr> <tr>
{columns.map((col, index) => ( {columns.map((col, index) => (
<th key={index} scope="col" onClick={() => handleSort(col.field)}> <th key={index} scope="col" onClick={() => handleSort(col.field)}>

69
src/components/Pages/AppPAges/ManageSettings/ManageUserTable.js
View File

@ -179,6 +179,7 @@ const ManageUserTable = ({
<div className="expense-searchcontainerstart d-flex"> <div className="expense-searchcontainerstart d-flex">
<div className="search-container"> <div className="search-container">
<input <input
style={{ height: "50px", backgroundColor: "#fff", border: '1px solid #DBDBDB', boxShadow: "0px 0px 10px rgba(187, 187, 187, 0.25)" }}
type="text" type="text"
value={searchTerm} value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)} onChange={(e) => setSearchTerm(e.target.value)}
@ -276,26 +277,54 @@ const ManageUserTable = ({
</div> </div>
)} )}
</div> </div>
<div className="expense-searchcontainerend d-flex align-items-center"> <div style={{ marginRight: "70%" }}>
<h3 className="me-2">Show</h3> <div
<select className="expense-search d-flex align-items-center"
name="option" style={{
id="pageSelect" backgroundColor: "#4A5546",
className="selectoptions" boxShadow: "none",
value={rowsPerPage} outline: "none",
onChange={(e) => { width: "auto",
setRowsPerPage(Number(e.target.value)); height: "42px",
setCurrentPage(1); // Reset to first page on change
padding: "8px 12px",
fontSize: "16px",
border: "none",
borderRadius: "10px",
color: "#F4FFEE",
cursor: "pointer",
}} }}
> >
<option value={5}>5</option> <h6 className="" style={{ margin: '10px' }}>Show</h6>
<option value={10}>10</option> <select
<option value={15}>15</option> name="option"
<option value={20}>20</option> id="pageSelect"
</select> className="selectoptions"
style={{
height: "30px",
padding: "2px 6px",
border: "1px solid #ccc",
backgroundColor: "#282E26",
color: "#fff",
fontSize: "14px",
}}
value={rowsPerPage}
onChange={(e) => {
setRowsPerPage(Number(e.target.value));
setCurrentPage(1); // Reset to first page on change
}}
>
<option value={5}>5</option>
<option value={10}>10</option>
<option value={15}>15</option>
<option value={20}>20</option>
</select>
</div>
</div> </div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
<th scope="col" className="no-column"> <th scope="col" className="no-column">
@ -418,7 +447,7 @@ const ManageUserTable = ({
{showFooter && ( {showFooter && (
<nav> <nav>
<ul className="pagination"> <ul className="pagination">
<li className={`prev-next ${currentPage === 1 ? "disabled" : ""}`}> {/* <li className={`prev-next ${currentPage === 1 ? "disabled" : ""}`}>
<span <span
style={{ style={{
fontSize: "24px", fontSize: "24px",
@ -437,9 +466,9 @@ const ManageUserTable = ({
&lt; &lt;
</span> </span>
&nbsp; &nbsp;
</li> </li> */}
{renderPagination()} {renderPagination()}
<li {/* <li
className={`prev-next ${ className={`prev-next ${
currentPage === totalPages ? "disabled" : "" currentPage === totalPages ? "disabled" : ""
}`} }`}
@ -462,7 +491,7 @@ const ManageUserTable = ({
> >
&gt;{" "} &gt;{" "}
</span> </span>
</li> </li> */}
</ul> </ul>
</nav> </nav>
)} )}

90
src/components/Pages/AppPAges/ManageSettings/ManageUsers.js
View File

@ -10,6 +10,10 @@ import { toast, ToastContainer } from "react-toastify";
import CustomSwitch from "./CustomSwitch"; import CustomSwitch from "./CustomSwitch";
import ManageUserTable from "./ManageUserTable"; import ManageUserTable from "./ManageUserTable";
import Swal from "sweetalert2"; import Swal from "sweetalert2";
import userIcon from '../../../../assets/Image/user.png'
import storeIcon from '../../../../assets/Image/store.png'
import ownerIcon from '../../../../assets/Image/owner.png'
function ManageUsers() { function ManageUsers() {
@ -387,29 +391,69 @@ function ManageUsers() {
<> <>
<ToastContainer /> <ToastContainer />
<div className="due-days"> <div className="due-days">
<div className="header-row"> <div className="header-row">
<div className="setting-title">Manage Users</div> <div className="setting-title">Manage Users</div>
<div className="btn-position"> <div className="btn-position" style={{ display: "flex", gap: "10px" }}> {/* Set up flex with gap */}
<button <button
className="vendor-add-button" className="btn cus d-flex align-items-center"
onClick={() => handleShowUserModal()} // Open modal for adding a user onClick={() => handleShowUserModal()} // Open modal for adding a user
> >
+ Add New User + Add New User
</button> <img
<button src={userIcon}
className="vendor-add-button" alt="user Icon"
onClick={() => handleShowStoreModal()} // Open modal for adding a user style={{ width: "20px", height: "20px", marginLeft: "8px" }}
> />
+ Add New Store </button>
</button> <button
<button style={{
className="vendor-add-button" backgroundColor: "#4A5546",
onClick={() => setAssignOwnerModal(true)} // Open modal for assigning an owner boxShadow: "none",
> outline: "none",
+ Assign Existing User As Owner width: "auto",
</button> height: "42px",
</div> padding: "8px 12px",
</div> fontSize: "16px",
border: "none",
borderRadius: "10px",
color: "#F4FFEE",
cursor: "pointer",
}}
onClick={() => handleShowStoreModal()} // Open modal for adding a user
>
+ Add New Store
<img
src={storeIcon}
alt="store Icon"
style={{ width: "20px", height: "20px", marginLeft: "8px" }}
/>
</button>
<button
style={{
backgroundColor: "#4A5546",
boxShadow: "none",
outline: "none",
width: "auto",
height: "42px",
padding: "8px 12px",
fontSize: "16px",
border: "none",
borderRadius: "10px",
color: "#F4FFEE",
cursor: "pointer",
}}
onClick={() => setAssignOwnerModal(true)} // Open modal for assigning an owner
>
+ Assign Existing User As Owner
<img
src={ownerIcon}
alt="owner Icon"
style={{ width: "20px", height: "20px", marginLeft: "8px" }}
/>
</button>
</div>
</div>
<ManageUserTable <ManageUserTable
data={users} data={users}
columns={columns} columns={columns}

51
src/components/Pages/AppPAges/ManageSettings/ReusableModal.js
View File

@ -47,7 +47,7 @@ const ReusableModal = ({
}; };
const modalContentStyle = { const modalContentStyle = {
borderRadius: "15px", borderRadius: "30px",
overflow: "hidden", overflow: "hidden",
width: width, // use the width prop width: width, // use the width prop
height: height, // use the height prop height: height, // use the height prop
@ -57,21 +57,32 @@ const ReusableModal = ({
}; };
const headerStyle = { const headerStyle = {
backgroundColor: "#F0F0F0", backgroundColor: "#fff",
borderTopLeftRadius: "15px", borderTopLeftRadius: "15px",
borderTopRightRadius: "15px", borderTopRightRadius: "15px",
height: "55px", height: "55px",
display: "flex", display: "flex",
border:'none',
justifyContent: "space-between", justifyContent: "space-between",
alignItems: "center", alignItems: "center",
padding: "0 16px", // Add padding for space between the content and edges
}; };
const titleStyle = { const titleStyle = {
fontFamily: "'Manrope', sans-serif", fontFamily: "'Manrope', sans-serif",
fontWeight: "600", // semibold fontWeight: "600",
fontSize: "20px", fontSize: "20px",
color: "#002300", color: "#002300",
margin: 0, // remove default margin margin: 0,
textAlign: "center",
flex: 1, // Allow the title to take up available space
};
const closeButtonStyle = {
cursor: "pointer",
marginLeft: "auto", // Push the close button to the far right
}; };
return ( return (
@ -88,21 +99,23 @@ const ReusableModal = ({
<h5 className="modal-title" style={titleStyle}> <h5 className="modal-title" style={titleStyle}>
{title} {title}
</h5> </h5>
<svg <div style={closeButtonStyle}>
onClick={handleClose} <svg
width="26" onClick={handleClose}
height="24" width="26"
viewBox="0 0 26 24" height="24"
fill="none" viewBox="0 0 26 24"
xmlns="http://www.w3.org/2000/svg" fill="none"
> xmlns="http://www.w3.org/2000/svg"
<path >
fillRule="evenodd" <path
clipRule="evenodd" fillRule="evenodd"
d="M20.4226 6.45104C20.5153 6.36563 20.5888 6.26421 20.6389 6.15258C20.6891 6.04094 20.715 5.92127 20.7151 5.80041C20.7152 5.67954 20.6894 5.55985 20.6394 5.44815C20.5894 5.33646 20.516 5.23496 20.4235 5.14944C20.331 5.06393 20.2211 4.99607 20.1001 4.94975C19.9792 4.90343 19.8496 4.87955 19.7186 4.87947C19.5877 4.8794 19.458 4.90313 19.337 4.94931C19.216 4.9955 19.1061 5.06323 19.0134 5.14864L13.0005 10.699L6.98928 5.14864C6.80218 4.97593 6.54841 4.87891 6.28381 4.87891C6.01921 4.87891 5.76545 4.97593 5.57835 5.14864C5.39125 5.32135 5.28613 5.55559 5.28613 5.79984C5.28613 6.04409 5.39125 6.27833 5.57835 6.45104L11.5913 11.9998L5.57835 17.5486C5.4857 17.6342 5.41221 17.7357 5.36208 17.8474C5.31194 17.9591 5.28613 18.0789 5.28613 18.1998C5.28613 18.3208 5.31194 18.4405 5.36208 18.5523C5.41221 18.664 5.4857 18.7655 5.57835 18.851C5.76545 19.0237 6.01921 19.1208 6.28381 19.1208C6.41483 19.1208 6.54456 19.097 6.66561 19.0507C6.78665 19.0044 6.89664 18.9366 6.98928 18.851L13.0005 13.3006L19.0134 18.851C19.2005 19.0235 19.4542 19.1204 19.7186 19.1202C19.9831 19.1201 20.2366 19.0229 20.4235 18.8502C20.6104 18.6775 20.7152 18.4434 20.7151 18.1993C20.7149 17.9552 20.6097 17.7211 20.4226 17.5486L14.4097 11.9998L20.4226 6.45104Z" clipRule="evenodd"
fill="black" d="M20.4226 6.45104C20.5153 6.36563 20.5888 6.26421 20.6389 6.15258C20.6891 6.04094 20.715 5.92127 20.7151 5.80041C20.7152 5.67954 20.6894 5.55985 20.6394 5.44815C20.5894 5.33646 20.516 5.23496 20.4235 5.14944C20.331 5.06393 20.2211 4.99607 20.1001 4.94975C19.9792 4.90343 19.8496 4.87955 19.7186 4.87947C19.5877 4.8794 19.458 4.90313 19.337 4.94931C19.216 4.9955 19.1061 5.06323 19.0134 5.14864L13.0005 10.699L6.98928 5.14864C6.80218 4.97593 6.54841 4.87891 6.28381 4.87891C6.01921 4.87891 5.76545 4.97593 5.57835 5.14864C5.39125 5.32135 5.28613 5.55559 5.28613 5.79984C5.28613 6.04409 5.39125 6.27833 5.57835 6.45104L11.5913 11.9998L5.57835 17.5486C5.4857 17.6342 5.41221 17.7357 5.36208 17.8474C5.31194 17.9591 5.28613 18.0789 5.28613 18.1998C5.28613 18.3208 5.31194 18.4405 5.36208 18.5523C5.41221 18.664 5.4857 18.7655 5.57835 18.851C5.76545 19.0237 6.01921 19.1208 6.28381 19.1208C6.41483 19.1208 6.54456 19.097 6.66561 19.0507C6.78665 19.0044 6.89664 18.9366 6.98928 18.851L13.0005 13.3006L19.0134 18.851C19.2005 19.0235 19.4542 19.1204 19.7186 19.1202C19.9831 19.1201 20.2366 19.0229 20.4235 18.8502C20.6104 18.6775 20.7152 18.4434 20.7151 18.1993C20.7149 17.9552 20.6097 17.7211 20.4226 17.5486L14.4097 11.9998L20.4226 6.45104Z"
/> fill="black"
</svg> />
</svg>
</div>
</div> </div>
<div className="modal-body">{children}</div> <div className="modal-body">{children}</div>
</div> </div>

2
src/components/Pages/AppPAges/ManageSettings/SettingTable.js
View File

@ -312,7 +312,7 @@ const SettingTable = ({
</select> </select>
</div> </div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table" style={{borderRadius:"none"}} >
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
<th scope="col" className="no-column"> <th scope="col" className="no-column">

23
src/components/Pages/AppPAges/ManageSettings/Settings.css
View File

@ -284,7 +284,7 @@
padding: 10px; padding: 10px;
width: 600px; width: 600px;
height: 40px; height: 40px;
background-color: #f6f6f6; background-color: #fff;
border: 1px solid #f6f6f6; border: 1px solid #f6f6f6;
border-radius: 5px; border-radius: 5px;
} }
@ -516,18 +516,18 @@ input[type="date"] {
width: 100%; width: 100%;
border: 1px solid #F4F4F4; border: 1px solid #F4F4F4;
border-collapse: collapse; border-collapse: collapse;
border-radius: 20px 20px 0 0; /* border-radius: 20px 20px 0 0; */
overflow: hidden; overflow: hidden;
} }
.table-header th, .table-body td { .table-header th, .table-body td {
border: 1px solid #F4F4F4; /* border: 1px solid #F4F4F4; */
padding: 12px; padding: 12px;
text-align: left; text-align: left;
padding-left: 20px; padding-left: 20px;
} }
.table-header th { .table-header th {
background-color: #f2f2f2; background-color: #282e26;
color: #002300; color: white;
cursor: pointer; /* Added cursor for sortable columns */ cursor: pointer; /* Added cursor for sortable columns */
} }
.table-body td { .table-body td {
@ -568,6 +568,7 @@ input[type="date"] {
display: flex; display: flex;
justify-content: end; justify-content: end;
padding: 10px 0; padding: 10px 0;
} }
.pagination .page-item { .pagination .page-item {
margin: 0 5px; margin: 0 5px;
@ -576,20 +577,24 @@ input[type="date"] {
padding: 10px; padding: 10px;
border: 1px solid #F4F4F4; border: 1px solid #F4F4F4;
background-color: #b6d7a8; background-color: #b6d7a8;
border-radius: 50%; border-radius: 30px;
color: #002300; color: #002300;
text-decoration: none; text-decoration: none;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 36px; width: 30px;
height: 36px; height: 30px;
transition: background-color 0.3s, color 0.3s; transition: background-color 0.3s, color 0.3s;
} }
.pagination .page-link:hover { .pagination .page-link:hover {
background-color: #ffaf32; background-color: red;
} }
.pagination .page-item.active .page-link { .pagination .page-item.active .page-link {
width: 30px;
height: 30px;
border-radius: 30px;
background-color: #ffaf32; /* Yellow background */ background-color: #ffaf32; /* Yellow background */
color: #002300; color: #002300;
border-color:#fbfbfbfb; border-color:#fbfbfbfb;

610
src/components/Pages/AppPAges/Payroll/Payroll.js
View File

@ -7,6 +7,8 @@ import useApi from "../../../../utils/api-manager/Helper/useApi";
import { toast, ToastContainer } from "react-toastify"; import { toast, ToastContainer } from "react-toastify";
import PayrollTableWithButton from "./PayrollTableWithButton"; import PayrollTableWithButton from "./PayrollTableWithButton";
import Swal from "sweetalert2"; import Swal from "sweetalert2";
import employeeIcon from '../../../../assets/Image/employee.png'
export default function Payroll() { export default function Payroll() {
const { user } = useContext(AuthContext); const { user } = useContext(AuthContext);
@ -112,7 +114,7 @@ export default function Payroll() {
const handleChange = (e) => { const handleChange = (e) => {
const { name, value } = e.target; const { name, value } = e.target;
// Restrict non-numeric input for contact_no // Restrict non-numeric input for contact_no
if (name === "contact_no") { if (name === "contact_no") {
const numericValue = value.replace(/[^0-9]/g, ""); // Allow only digits const numericValue = value.replace(/[^0-9]/g, ""); // Allow only digits
@ -121,7 +123,7 @@ export default function Payroll() {
setFormData((prevData) => ({ ...prevData, [name]: value })); setFormData((prevData) => ({ ...prevData, [name]: value }));
} }
}; };
const handlePaymentChange = (e) => { const handlePaymentChange = (e) => {
const { name, value } = e.target; const { name, value } = e.target;
@ -210,53 +212,53 @@ export default function Payroll() {
const updatedFormData = { ...formData, store: storeId }; const updatedFormData = { ...formData, store: storeId };
try { try {
let response; let response;
// If there's an editing payroll ID, we want to PATCH the payroll employee data // If there's an editing payroll ID, we want to PATCH the payroll employee data
if (editingPayrollId) { if (editingPayrollId) {
response = await Patch("payrollEmployeeData", editingPayrollId, updatedFormData); response = await Patch("payrollEmployeeData", editingPayrollId, updatedFormData);
if (response.status === 200) { if (response.status === 200) {
setPayrollData(prevData => setPayrollData(prevData =>
prevData.map(payroll => prevData.map(payroll =>
payroll.id === editingPayrollId ? { ...payroll, ...updatedFormData } : payroll payroll.id === editingPayrollId ? { ...payroll, ...updatedFormData } : payroll
) )
); );
toast.success("Payroll updated successfully!"); toast.success("Payroll updated successfully!");
}
} else {
// If there's no editingPayrollId, it's a new payroll record
response = await Post("payrollEmployeeData", updatedFormData);
if (response.status === 201) {
setPayrollData(prevData => [...prevData, response.data]);
toast.success("Payroll added successfully!");
} else if (response.data) {
// Extract specific error messages and display them
const errorMessages = Object.entries(response.data)
.map(([field, messages]) => `${messages.join(", ")}`)
.join("\n");
toast.error(errorMessages || "An unknown error occurred.");
} else {
toast.error("Please Validate Fields");
}
}
closeModal(); // Close the modal after submitting the form
} catch (error) {
console.error("Error submitting form", error);
if (error.response?.data) {
// Handle API response errors
const errorMessages = Object.entries(error.response.data)
.map(([field, messages]) => `${field}: ${messages.join(", ")}`)
.join("\n");
toast.error(errorMessages || "An unknown error occurred.");
} else {
// Handle generic errors
toast.error("Error submitting form: " + error.message);
}
} }
} else {
// If there's no editingPayrollId, it's a new payroll record
response = await Post("payrollEmployeeData", updatedFormData);
if (response.status === 201) {
setPayrollData(prevData => [...prevData, response.data]);
toast.success("Payroll added successfully!");
} else if (response.data) {
// Extract specific error messages and display them
const errorMessages = Object.entries(response.data)
.map(([field, messages]) => `${messages.join(", ")}`)
.join("\n");
toast.error(errorMessages || "An unknown error occurred.");
} else {
toast.error("Please Validate Fields");
}
}
closeModal(); // Close the modal after submitting the form
} catch (error) {
console.error("Error submitting form", error);
if (error.response?.data) {
// Handle API response errors
const errorMessages = Object.entries(error.response.data)
.map(([field, messages]) => `${field}: ${messages.join(", ")}`)
.join("\n");
toast.error(errorMessages || "An unknown error occurred.");
} else {
// Handle generic errors
toast.error("Error submitting form: " + error.message);
}
}
} }
@ -297,11 +299,11 @@ export default function Payroll() {
bank: paymentData.payment_method === "cheque" ? paymentData.bank : "", bank: paymentData.payment_method === "cheque" ? paymentData.bank : "",
bank_name: bankName, // Include bank_name in the payload bank_name: bankName, // Include bank_name in the payload
cheque_no: cheque_no:
paymentData.payment_method === "cheque" paymentData.payment_method === "cheque"
? paymentData.cheque_no || "" ? paymentData.cheque_no || ""
: editingPayrollId : editingPayrollId
? paymentData.cheque_no // Preserve existing cheque_no if editing ? paymentData.cheque_no // Preserve existing cheque_no if editing
: null, : null,
note: paymentData.note, note: paymentData.note,
}; };
@ -332,45 +334,45 @@ export default function Payroll() {
const handleDelete = async (id, type) => { const handleDelete = async (id, type) => {
const result = await Swal.fire({ const result = await Swal.fire({
title: "Are you sure?", title: "Are you sure?",
text: "You won't be able to revert this!", text: "You won't be able to revert this!",
icon: "warning", icon: "warning",
showCancelButton: true, showCancelButton: true,
confirmButtonColor: "#d33", confirmButtonColor: "#d33",
cancelButtonColor: "#3085d6", cancelButtonColor: "#3085d6",
confirmButtonText: "Yes, delete it!", confirmButtonText: "Yes, delete it!",
}); });
// Check if the user clicked the confirm button // Check if the user clicked the confirm button
if (!result.isConfirmed) return; // Exit if the user cancels if (!result.isConfirmed) return; // Exit if the user cancels
try { try {
if (type === "payroll") { if (type === "payroll") {
// Delete payroll record // Delete payroll record
await Delete(`payrollEmployeeData`, id); await Delete(`payrollEmployeeData`, id);
// Update payroll data in the frontend // Update payroll data in the frontend
setPayrollData((prevPayrollData) => prevPayrollData.filter((p) => p.id !== id)); setPayrollData((prevPayrollData) => prevPayrollData.filter((p) => p.id !== id));
// Fetch updated salary history data from the backend // Fetch updated salary history data from the backend
const updatedSalaryHistory = await Get("payrollSalaryData"); const updatedSalaryHistory = await Get("payrollSalaryData");
setSalaryHistory(updatedSalaryHistory); setSalaryHistory(updatedSalaryHistory);
toast.success("Payroll record deleted successfully!"); toast.success("Payroll record deleted successfully!");
} else if (type === "salaryHistory") { } else if (type === "salaryHistory") {
// Delete salary history record // Delete salary history record
await Delete(`payrollSalaryData`, id); await Delete(`payrollSalaryData`, id);
// Update salary history data in the frontend // Update salary history data in the frontend
setSalaryHistory((prevSalaryHistory) => setSalaryHistory((prevSalaryHistory) =>
prevSalaryHistory.filter((s) => s.id !== id) prevSalaryHistory.filter((s) => s.id !== id)
); );
toast.success("Salary history record deleted successfully!"); toast.success("Salary history record deleted successfully!");
} }
} catch (error) { } catch (error) {
console.error("Error deleting record:", error); console.error("Error deleting record:", error);
toast.error("Error deleting record: " + (error.response?.data || error.message)); toast.error("Error deleting record: " + (error.response?.data || error.message));
} }
}; };
return ( return (
@ -378,9 +380,9 @@ export default function Payroll() {
<div className="p-2"> <div className="p-2">
<div className="expensecontainer d-flex flex-column pd-2 mb-2"> <div className="expensecontainer d-flex flex-column pd-2 mb-2">
<div className="d-flex justify-content-between align-items-center mb-3"> <div className="d-flex justify-content-between align-items-center mb-3">
<h3 className="mb-1">Manage Payroll</h3> <h3 className="mb-1">Manage Employee</h3>
<button <button
className="btn btn-primary cus" className="btn cus d-flex align-items-center"
onClick={() => { onClick={() => {
// fetchBankData(); // fetchBankData();
setModalType('new'); setModalType('new');
@ -388,6 +390,11 @@ export default function Payroll() {
}} }}
> >
+ Add Employee + Add Employee
<img
src={employeeIcon}
alt="employee Icon"
style={{ width: "20px", height: "20px", marginLeft: "8px" }}
/>
</button> </button>
</div> </div>
<PayrollTableWithButton <PayrollTableWithButton
@ -411,16 +418,42 @@ export default function Payroll() {
<div <div
className="modal-container" className="modal-container"
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
style={{ width: modalType === 'payment' ? '800px' : '700px' }} style={{ width: modalType === 'payment' ? '800px' : '700px', borderRadius: '40px' }}
> >
<div className="modal-header" style={{ borderBottom: "1px solid lightgray" }}> <div
<h3> className="modal-header"
{modalType === 'new' && "Add Employee"} style={{
{modalType === 'edit' && "Edit Employee"} display: 'flex',
{modalType === 'payment' && `Process Payment for ${selectedPayroll?.full_name || ''}`} justifyContent: 'space-between', // Distribute space between items
</h3> alignItems: 'center',
<button className="btn" onClick={closeModal}>X</button> border: "none"
}}
>
<div style={{ flex: 1, textAlign: 'center' }}>
<h3 style={{ margin: 0 }}>
{modalType === 'new' && 'Add Employee'}
{modalType === 'edit' && 'Edit Employee'}
{modalType === 'payment' && `Pay Salary For ${selectedPayroll?.full_name || ''}`}
</h3>
</div>
<svg
onClick={closeModal}
width="14"
height="14"
marginLeft="20px"
marginBottom="20px"
viewBox="0 0 14 14"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M1 1L13 13M13 1L1 13"
stroke="black"
stroke-linecap="round"
/>
</svg>
</div> </div>
{ } { }
{(modalType === 'new' || modalType === 'edit') && ( {(modalType === 'new' || modalType === 'edit') && (
<form onSubmit={handleSubmit}> <form onSubmit={handleSubmit}>
@ -434,6 +467,12 @@ export default function Payroll() {
name="full_name" name="full_name"
value={formData.full_name} value={formData.full_name}
onChange={handleChange} onChange={handleChange}
style={{
backgroundColor: "#ffffff",
border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
}}
required required
/> />
</div> </div>
@ -448,6 +487,12 @@ export default function Payroll() {
onChange={handleChange} onChange={handleChange}
required required
maxLength={10} maxLength={10}
style={{
backgroundColor: "#ffffff",
border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
}}
/> />
@ -461,15 +506,21 @@ export default function Payroll() {
name="email" name="email"
value={formData.email} value={formData.email}
onChange={handleChange} onChange={handleChange}
style={{
backgroundColor: "#ffffff",
border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
}}
required required
/> />
</div> </div>
</div> </div>
<div className="modal-footer"> <div className="modal-footer" style={{ border: "none" }}>
<button type="submit" className="btn btn-primary"> <button type="submit" style={{ color: "white", backgroundColor: '#282e26', borderRadius: '20px', padding: '5px 15px' }}>
{modalType === 'edit' ? "Update Employee" : "Add Employee"} {modalType === 'edit' ? "Update Employee" : "Add Employee"}
</button> </button>
<button type="button" className="btn btn-contained" onClick={closeModal}> <button type="button" onClick={closeModal} style={{ border: '1px solid #282E26', backgroundColor: "transparent", borderRadius: '20px', padding: '5px 45px' }}>
Close Close
</button> </button>
</div> </div>
@ -478,166 +529,253 @@ export default function Payroll() {
{ } { }
{modalType === 'payment' && ( {modalType === 'payment' && (
<form onSubmit={handlePaymentSubmit}> <form onSubmit={handlePaymentSubmit}>
<div className="modal-body"> <div className="modal-body" >
<div className="form-group"> <div className="form-group row col-md-12">
<label htmlFor="salary_amount">Amount</label> {/* Salary Amount Input */}
<div className="input-group"> <div className="col-md-5">
<div className="input-group-prepend"> <input
<span className="input-group-text">$</span> type="text"
</div>
<input
type="text" // Keeping text type for more flexible input control
className="form-control"
id="salary_amount"
name="salary_amount"
value={paymentData.salary_amount}
onChange={handlePaymentChange}
onKeyDown={(e) => {
// Prevent negative and positive signs
if (e.key === "-" || e.key === "+") {
e.preventDefault();
}
}}
required
onInput={(e) => {
let value = e.target.value;
// Remove all characters except numbers and the decimal point
value = value.replace(/[^0-9.]/g, '');
// Ensure only one decimal point
if (value.indexOf('.') !== -1) {
const parts = value.split('.');
value = parts[0] + '.' + parts[1].substring(0, 2); // Keep only two digits after the decimal
}
// Update the value on the input element
e.target.value = value;
// Call the onChange handler to update the state
handlePaymentChange(e);
}}
/>
</div>
</div>
<div className="form-row form-group col-md-6">
<label htmlFor="salary_unit">Salary Unit</label>
<select
className="form-control"
name="salary_unit"
value={paymentData.salary_unit}
onChange={handlePaymentChange}
required
>
<option value="hourly">Hourly</option>
<option value="weekly">Weekly</option>
<option value="bi weekly">Bi Weekly</option>
<option value="monthly">Monthly</option>
</select>
</div>
<div className="form-row form-group col-md-6">
<label htmlFor="start_date">Start Date</label>
<input
type="date"
className="form-control"
name="start_date"
value={paymentData.start_date}
onChange={handlePaymentChange}
required
/>
</div>
<div className="form-row form-group col-md-6">
<label htmlFor="end_date">End Date</label>
<input
type="date"
className="form-control"
name="end_date"
value={paymentData.end_date}
onChange={handlePaymentChange}
required
/>
</div>
{/* <ToastContainer /> */}
<div className="form-row form-group col-md-6">
<label htmlFor="total_hour">Total Hours</label>
<input
type="number"
className="form-control"
placeholder="Total Hours"
name="total_hour"
value={paymentData.total_hour}
onChange={handlePaymentChange}
onInput={(e) => {
// Allow only numbers and a decimal point with two digits after it
e.target.value = e.target.value
.replace(/[^0-9]/g, '') // Remove non-numeric characters
.slice(0, 3); // Limit input length (10 digits + 1 decimal + 2 decimal places)
}}
required
/>
</div>
<div className="form-group">
<label htmlFor="payment_method">Payment Method</label>
<select
name="payment_method"
id="payment_method"
className="form-control"
value={paymentData.payment_method}
onChange={handlePaymentChange}
>
<option value="cash">Cash</option>
<option value="cheque">Bank Transfer</option>
</select>
</div>
{paymentData.payment_method === "cheque" && (
<div className="form-group">
<label htmlFor="bank">Bank</label>
<select
name="bank"
id="bank"
className="form-control" className="form-control"
value={paymentData.bank} id="salary_amount"
name="salary_amount"
placeholder="Amount"
value={paymentData.salary_amount}
onChange={handlePaymentChange} onChange={handlePaymentChange}
onKeyDown={(e) => {
if (e.key === "-" || e.key === "+") {
e.preventDefault();
}
}}
style={{
backgroundColor: "#ffffff",
border: "none",
borderBottom: "2px solid #ccc",
borderRadius: "0px",
}}
required
onInput={(e) => {
let value = e.target.value;
value = value.replace(/[^0-9.]/g, "");
if (value.indexOf(".") !== -1) {
const parts = value.split(".");
value = parts[0] + "." + parts[1].substring(0, 2);
}
e.target.value = value;
handlePaymentChange(e);
}}
/>
</div>
{/* Salary Unit Select */}
<div className="col-md-5">
<select
className="form-control"
name="salary_unit"
value={paymentData.salary_unit}
onChange={handlePaymentChange}
required
style={{
backgroundColor: "#ffffff",
border: "none",
borderBottom: "2px solid #ccc",
borderRadius: "0px",
}}
> >
<option value="">Select Bank</option> <option value="" disabled>
{bankdata.map((bank) => ( Per Unit
<option key={bank.id} value={bank.id}> </option>
{bank.name} <option value="hourly">Hourly</option>
</option> <option value="weekly">Weekly</option>
))} <option value="bi weekly">Bi Weekly</option>
<option value="monthly">Monthly</option>
</select> </select>
<label htmlFor="cheque_no">Cheque Number</label> </div>
</div>
<div className="form-group row col-md-12">
{/* Start Date Input */}
<div className="form-group col-md-5">
<label htmlFor="start_date">Start Date</label>
<input
type="date"
className="form-control"
name="start_date"
value={paymentData.start_date}
onChange={handlePaymentChange}
required
style={{
backgroundColor: "#ffffff",
border: "none",
borderBottom: "2px solid #ccc",
borderRadius: "0px",
}}
/>
</div>
{/* End Date Input */}
<div className="form-group col-md-5">
<label htmlFor="end_date">End Date</label>
<input
type="date"
className="form-control"
name="end_date"
value={paymentData.end_date}
onChange={handlePaymentChange}
required
style={{
backgroundColor: "#ffffff",
border: "none",
borderBottom: "2px solid #ccc",
borderRadius: "0px",
}}
/>
</div>
</div>
{/* <ToastContainer /> */}
<div className="form-group row col-md-12">
{/* Total Hours Input */}
<div className="form-group col-md-5">
<input <input
type="number" type="number"
className="form-control" className="form-control"
id="cheque_no" placeholder="Total Hours"
name="cheque_no" name="total_hour"
value={paymentData.cheque_no} value={paymentData.total_hour}
onChange={handlePaymentChange} onChange={handlePaymentChange}
onInput={(e) => {
// Allow only numbers and limit input to 3 digits
e.target.value = e.target.value.replace(/[^0-9]/g, '').slice(0, 3);
}}
style={{
backgroundColor: "#ffffff",
border: "none",
borderBottom: "2px solid #ccc",
borderRadius: "0px",
}}
required required
/> />
</div> </div>
)}
<div className="form-row form-group col-md-6"> {/* Payment Method Select */}
<label htmlFor="note">Notes</label> <div className="form-group col-md-5">
<input <div style={{ border: '2px solid #ACB4AA', padding: '5px 10px', width: "fit-content", borderRadius: '40px', display: 'flex', gap: '10px' }}>
type="text" <button
className="form-control" type="button"
placeholder="Notes" className="btn"
name="note" onClick={() => handlePaymentChange({ target: { name: "payment_method", value: "cash" } })}
value={paymentData.note} style={{
onChange={handlePaymentChange} backgroundColor: paymentData.payment_method === "cash" ? "#4a5546" : "transparent",
/> color: paymentData.payment_method === "cash" ? "#ffffff" : "#000000",
border: 'none',
padding: '10px 10px',
borderRadius: '20px',
cursor: 'pointer',
}}
>
Cash
</button>
<button
type="button"
className="btn"
onClick={() => handlePaymentChange({ target: { name: "payment_method", value: "cheque" } })}
style={{
backgroundColor: paymentData.payment_method === "cheque" ? "#4a5546" : "transparent",
color: paymentData.payment_method === "cheque" ? "#ffffff" : "#000000",
border: 'none',
padding: '10px 10px',
borderRadius: '20px',
cursor: 'pointer',
}}
>
Bank Transfer
</button>
</div>
</div>
</div> </div>
{paymentData.payment_method === "cheque" && (
<div className="form-group row col-md-12">
<div className="form-group col-md-5">
<select
name="bank"
id="bank"
className="form-control"
value={paymentData.bank}
onChange={handlePaymentChange}
style={{
backgroundColor: "#ffffff",
border: "none",
borderBottom: "2px solid #ccc",
borderRadius: "0px",
}}
>
<option value="">Select Bank</option>
{bankdata.map((bank) => (
<option key={bank.id} value={bank.id}>
{bank.name}
</option>
))}
</select>
</div>
<div className="form-group col-md-5">
<input
type="number"
className="form-control"
id="cheque_no"
placeholder="Cheque No"
name="cheque_no"
value={paymentData.cheque_no}
onChange={handlePaymentChange}
required
style={{
backgroundColor: "#ffffff",
border: "none",
borderBottom: "2px solid #ccc",
borderRadius: "0px",
}}
/>
</div>
<div className="form-group col-md-5">
<input
type="text"
className="form-control"
placeholder="Notes"
name="note"
value={paymentData.note}
onChange={handlePaymentChange}
style={{
backgroundColor: "#ffffff",
border: "none",
borderBottom: "2px solid #ccc",
borderRadius: "0px",
}}
/>
</div>
</div>
)}
</div> </div>
<div className="modal-footer"> <div className="modal-footer">
<button type="submit" className="btn btn-primary" style={{}}> <button type="submit" className="btn " style={{ color: "white", backgroundColor: '#282e26', borderRadius: '20px' }}>
Payment Payment
</button> </button>
<button type="button" className="btn btn-contained" onClick={closeModal}> <button type="button" className="btn " onClick={closeModal} style={{ border: " 1px solid #282e26", borderRadius: '20px' }}>
Close Close
</button> </button>
</div> </div>

119
src/components/Pages/AppPAges/Payroll/PayrollTable.js
View File

@ -16,6 +16,7 @@ const DataTable = ({
direction: "ascending", direction: "ascending",
}); });
const [rowsPerPage, setRowsPerPage] = useState(5); const [rowsPerPage, setRowsPerPage] = useState(5);
const [searchTerm, setSearchTerm] = useState(""); // State for search term
const totalPages = Math.ceil(data.length / rowsPerPage); const totalPages = Math.ceil(data.length / rowsPerPage);
@ -32,7 +33,7 @@ const DataTable = ({
const getDisplayedData = () => { const getDisplayedData = () => {
const startIndex = (currentPage - 1) * rowsPerPage; const startIndex = (currentPage - 1) * rowsPerPage;
const endIndex = startIndex + rowsPerPage; const endIndex = startIndex + rowsPerPage;
return data.slice(startIndex, endIndex); return sortedData.slice(startIndex, endIndex); // Return sorted data
}; };
// Sorting the data based on the selected column // Sorting the data based on the selected column
@ -51,8 +52,16 @@ const DataTable = ({
return dataToSort; return dataToSort;
}; };
// Search functionality
const filteredData = data.filter(item =>
columns.some(col => {
const value = item[col.field] ? item[col.field].toString().toLowerCase() : "";
return value.includes(searchTerm.toLowerCase());
})
);
const sortedData = sortData(filteredData);
const displayedData = getDisplayedData(); const displayedData = getDisplayedData();
const sortedData = sortData(displayedData);
// Pagination // Pagination
const handleNext = () => { const handleNext = () => {
@ -90,7 +99,40 @@ const DataTable = ({
return ( return (
<div className="data-table-container"> <div className="data-table-container">
<table className="data-table custom-table rounded-table"> <div className="search-container" style={{marginBottom:"20px"}}>
<input
type="text"
style={{ width: "300px", height: "50px", backgroundColor: "#fff", border: '1px solid #DBDBDB', boxShadow: "0px 0px 10px rgba(187, 187, 187, 0.25)" }}
placeholder="Search..."
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
className="search-input"
/>
<svg
className="search-container-icon"
width="22"
height="22"
viewBox="0 0 22 22"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M10.5416 19.2497C15.3511 19.2497 19.2499 15.3508 19.2499 10.5413C19.2499 5.73186 15.3511 1.83301 10.5416 1.83301C5.73211 1.83301 1.83325 5.73186 1.83325 10.5413C1.83325 15.3508 5.73211 19.2497 10.5416 19.2497Z"
stroke="#292D32"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M20.1666 20.1663L18.3333 18.333"
stroke="#292D32"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
</div>
<table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
{columns.map((col, index) => ( {columns.map((col, index) => (
@ -134,17 +176,19 @@ const DataTable = ({
<tbody className="table-body"> <tbody className="table-body">
{sortedData.length === 0 ? ( {sortedData.length === 0 ? (
<tr> <tr>
<td colSpan={columns.length + (showAction ? 2 : 1)} style={{ textAlign: "center", fontFamily: 'Manrope', <td colSpan={columns.length + (showAction ? 2 : 1)} style={{
fontWeight: '600', textAlign: "center", fontFamily: 'Manrope',
fontSize: '40px', fontWeight: '600',
background: 'linear-gradient(180deg, rgba(255, 255, 255, 0.1) -92.86%, #4545DB 71.43%)', fontSize: '40px',
WebkitBackgroundClip: 'text', background: 'linear-gradient(180deg, rgba(255, 255, 255, 0.1) -92.86%, #4545DB 71.43%)',
WebkitTextFillColor: 'transparent', }}> WebkitBackgroundClip: 'text',
WebkitTextFillColor: 'transparent',
}}>
No data found No data found
</td> </td>
</tr> </tr>
) : ( ) : (
sortedData.map((item, index) => ( displayedData.map((item, index) => (
<tr key={item.id || index}> <tr key={item.id || index}>
{columns.map((col, colIndex) => ( {columns.map((col, colIndex) => (
<td key={colIndex}> <td key={colIndex}>
@ -200,55 +244,18 @@ const DataTable = ({
)} )}
</tbody> </tbody>
</table> </table>
{showFooter && ( {showFooter && (
<nav> <div className="pagination">
<ul className="pagination"> <button onClick={handlePrev} disabled={currentPage === 1}>
<li className={`prev-next ${currentPage === 1 ? "disabled" : ""}`}> Previous
<span </button>
style={{ <ul className="pagination-list">
fontSize: "24px",
width: "40px",
height: "40px",
paddingLeft: "10px",
paddingRight: "10px",
borderRadius: "50%",
border: "1px solid #bfbfbfbf",
alignItems: "center",
justifyContent: "center",
display: "flex",
cursor: "pointer",
}}
onClick={handlePrev}
>
{"<"}
&lt;
</span>
&nbsp;
</li>
{renderPagination()} {renderPagination()}
<li className={`prev-next ${currentPage === totalPages ? "disabled" : ""}`}>
<span
style={{
fontSize: "24px",
width: "40px",
height: "40px",
paddingLeft: "10px",
paddingRight: "10px",
borderRadius: "50%",
border: "1px solid #bfbfbfbf",
alignItems: "center",
justifyContent: "center",
display: "flex",
cursor: "pointer",
}}
onClick={handleNext}
>
{">"}
</span>
</li>
</ul> </ul>
</nav> <button onClick={handleNext} disabled={currentPage === totalPages}>
Next
</button>
</div>
)} )}
</div> </div>
); );

222
src/components/Pages/AppPAges/Payroll/PayrollTableWithButton.js
View File

@ -154,18 +154,19 @@ const PayrollTableWithButton = ({
borderRadius: "4px", borderRadius: "4px",
zIndex: "1", zIndex: "1",
}; };
// Calculate the total net sales from the data // Calculate the total net sales from the data
// const totalNetSales = data.reduce((acc, item) => { // const totalNetSales = data.reduce((acc, item) => {
// const amount = Number(item.total_net_sales) || 0; // Make sure to handle non-numeric values // const amount = Number(item.total_net_sales) || 0; // Make sure to handle non-numeric values
// return acc + amount; // return acc + amount;
// }, 0).toFixed(2); // // }, 0).toFixed(2); //
return ( return (
<div className="data-table-container"> <div className="data-table-container">
<div className="d-flex mb-3"> <div className="d-flex mb-3">
<div className="expense-searchcontainerstart d-flex"> <div className="expense-searchcontainerstart d-flex" >
<div className="search-container"> <div className="search-container" >
<input <input
type="text" type="text"
style={{ width: "300px", height: "50px", backgroundColor: "#fff", border: '1px solid #DBDBDB', boxShadow: "0px 0px 10px rgba(187, 187, 187, 0.25)" }}
value={searchTerm} value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)} onChange={(e) => setSearchTerm(e.target.value)}
placeholder="Search" placeholder="Search"
@ -237,7 +238,7 @@ const PayrollTableWithButton = ({
Export To Excel Export To Excel
</button> </button>
)} )}
{showFilter && ( {showFilter && (
<div className="filter-button-container" style={{ position: "relative" }}> <div className="filter-button-container" style={{ position: "relative" }}>
<button className="btn custbtn2" type="button" onClick={handleFilterClick}> <button className="btn custbtn2" type="button" onClick={handleFilterClick}>
<svg <svg
@ -262,26 +263,54 @@ const PayrollTableWithButton = ({
</div> </div>
)} )}
</div> </div>
<div className="expense-searchcontainerend d-flex align-items-center"> <div >
<h3 className="me-2">Show</h3> <div
<select className="expense-search d-flex align-items-center"
name="option" style={{
id="pageSelect" backgroundColor: "#4A5546",
className="selectoptions" boxShadow: "none",
value={rowsPerPage} outline: "none",
onChange={(e) => { width: "auto",
setRowsPerPage(Number(e.target.value)); height: "42px",
setCurrentPage(1); // Reset to first page on change
padding: "8px 12px",
fontSize: "16px",
border: "none",
borderRadius: "10px",
color: "#F4FFEE",
cursor: "pointer",
}} }}
> >
<option value={5}>5</option> <h6 className="" style={{ margin: '10px' }}>Show</h6>
<option value={10}>10</option> <select
<option value={15}>15</option> name="option"
<option value={20}>20</option> id="pageSelect"
</select> className="selectoptions"
style={{
height: "30px",
padding: "2px 6px",
border: "1px solid #ccc",
backgroundColor: "#282E26",
color: "#fff",
fontSize: "14px",
}}
value={rowsPerPage}
onChange={(e) => {
setRowsPerPage(Number(e.target.value));
setCurrentPage(1); // Reset to first page on change
}}
>
<option value={5}>5</option>
<option value={10}>10</option>
<option value={15}>15</option>
<option value={20}>20</option>
</select>
</div>
</div> </div>
</div> </div>
<table className="data-table custom-table rounded-table"> <table className="data-table custom-table ">
<thead className="table-header"> <thead className="table-header">
<tr> <tr>
<th scope="col" className="no-column"> <th scope="col" className="no-column">
@ -324,78 +353,80 @@ const PayrollTableWithButton = ({
</tr> </tr>
</thead> </thead>
<tbody className="table-body"> <tbody className="table-body">
{sortedDisplayedData.length === 0 ? ( {sortedDisplayedData.length === 0 ? (
<tr> <tr>
<td colSpan={columns.length + (showAction ? 2 : 1)} style={{ textAlign: "center", fontFamily: 'Manrope', <td colSpan={columns.length + (showAction ? 2 : 1)} style={{
fontWeight: '600', textAlign: "center", fontFamily: 'Manrope',
fontSize: '40px', fontWeight: '600',
background: 'linear-gradient(180deg, rgba(255, 255, 255, 0.1) -92.86%, #4545DB 71.43%)', fontSize: '40px',
WebkitBackgroundClip: 'text', background: 'linear-gradient(180deg, rgba(255, 255, 255, 0.1) -92.86%, #4545DB 71.43%)',
WebkitTextFillColor: 'transparent', }}> WebkitBackgroundClip: 'text',
No data found WebkitTextFillColor: 'transparent',
</td> }}>
</tr> No data found
) : ( </td>
sortedDisplayedData.map((item) => ( </tr>
<tr key={item.id || item.index}> ) : (
<td> sortedDisplayedData.map((item) => (
{(currentPage - 1) * rowsPerPage + sortedDisplayedData.indexOf(item) + 1} <tr key={item.id || item.index}>
</td> <td>
{columns.map((col, colIndex) => ( {(currentPage - 1) * rowsPerPage + sortedDisplayedData.indexOf(item) + 1}
<td key={colIndex}>
{col.field === "status" ? (
<div className={`status ${item[col.field]}`}>{item[col.field]}</div>
) : col.field === "pay_salary" ? (
<button
className="btn btn-primary"
onClick={() => togglePaymentModal(item)} // Pass item to payment modal
>
Pay Salary
</button>
) : (
item[col.field]
)}
</td> </td>
))} {columns.map((col, colIndex) => (
{showAction && ( <td key={colIndex}>
<td className="action-column"> {col.field === "status" ? (
<button className="action-button" onClick={() => onEdit(item.id)}> <div className={`status ${item[col.field]}`}>{item[col.field]}</div>
) : col.field === "pay_salary" ? (
<button
style={{ backgroundColor: "#CCF4BB", border: 'none', boxShadow: "4px 4px 4px rgba(0, 0, 0, 0.25)", borderRadius: '4px', fontSize: "16px", alignItems: "center", width: '122px' }}
onClick={() => togglePaymentModal(item)} // Pass item to payment modal
>
Pay Salary
</button>
) : (
item[col.field]
)}
</td>
))}
{showAction && (
<td className="action-column">
<button className="action-button" onClick={() => onEdit(item.id)}>
<svg <svg
width="16" width="16"
height="16" height="16"
viewBox="0 0 16 16" viewBox="0 0 16 16"
fill="none" fill="none"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
> >
<path <path
d="M13.8067 4.695C14.0667 4.435 14.0667 4.00167 13.8067 3.755L12.2467 2.195C12 1.935 11.5667 1.935 11.3067 2.195L10.08 3.415L12.58 5.915M2 11.5017V14.0017H4.5L11.8733 6.62167L9.37333 4.12167L2 11.5017Z" d="M13.8067 4.695C14.0667 4.435 14.0667 4.00167 13.8067 3.755L12.2467 2.195C12 1.935 11.5667 1.935 11.3067 2.195L10.08 3.415L12.58 5.915M2 11.5017V14.0017H4.5L11.8733 6.62167L9.37333 4.12167L2 11.5017Z"
fill="#002300" fill="#002300"
/> />
</svg> </svg>
</button> </button>
<button className="action-button" onClick={() => onDelete(item.id)}> <button className="action-button" onClick={() => onDelete(item.id)}>
{/* Delete icon */} {/* Delete icon */}
<svg <svg
width="16" width="16"
height="16" height="16"
viewBox="0 0 16 16" viewBox="0 0 16 16"
fill="none" fill="none"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
> >
<path <path
d="M4.00016 12.6667C4.00016 13.4 4.60016 14 5.3335 14H10.6668C11.4002 14 12.0002 13.4 12.0002 12.6667V6C12.0002 5.26667 11.4002 4.66667 10.6668 4.66667H5.3335C4.60016 4.66667 4.00016 5.26667 4.00016 6V12.6667ZM12.0002 2.66667H10.3335L9.86016 2.19333C9.74016 2.07333 9.56683 2 9.3935 2H6.60683C6.4335 2 6.26016 2.07333 6.14016 2.19333L5.66683 2.66667H4.00016C3.6335 2.66667 3.3335 2.96667 3.3335 3.33333C3.3335 3.7 3.6335 4 4.00016 4H12.0002C12.3668 4 12.6668 3.7 12.6668 3.33333C12.6668 2.96667 12.3668 2.66667 12.0002 2.66667Z" d="M4.00016 12.6667C4.00016 13.4 4.60016 14 5.3335 14H10.6668C11.4002 14 12.0002 13.4 12.0002 12.6667V6C12.0002 5.26667 11.4002 4.66667 10.6668 4.66667H5.3335C4.60016 4.66667 4.00016 5.26667 4.00016 6V12.6667ZM12.0002 2.66667H10.3335L9.86016 2.19333C9.74016 2.07333 9.56683 2 9.3935 2H6.60683C6.4335 2 6.26016 2.07333 6.14016 2.19333L5.66683 2.66667H4.00016C3.6335 2.66667 3.3335 2.96667 3.3335 3.33333C3.3335 3.7 3.6335 4 4.00016 4H12.0002C12.3668 4 12.6668 3.7 12.6668 3.33333C12.6668 2.96667 12.3668 2.66667 12.0002 2.66667Z"
fill="#002300" fill="#002300"
/> />
</svg> </svg>
</button> </button>
</td> </td>
)} )}
</tr> </tr>
)) ))
)} )}
</tbody> </tbody>
</table> </table>
{showFooter && ( {showFooter && (
@ -423,9 +454,8 @@ const PayrollTableWithButton = ({
</li> </li>
{renderPagination()} {renderPagination()}
<li <li
className={`prev-next ${ className={`prev-next ${currentPage === totalPages ? "disabled" : ""
currentPage === totalPages ? "disabled" : "" }`}
}`}
> >
&nbsp; &nbsp;
<span <span

516
src/components/Pages/AppPAges/Purchase/purchase.js
View File

@ -8,6 +8,9 @@ import { toast, ToastContainer } from "react-toastify";
import AddDepartmentModal from "../ReusableForm/AddDepartmentModal"; import AddDepartmentModal from "../ReusableForm/AddDepartmentModal";
import AddVendorModal from "../ReusableForm/AddVendorModal"; import AddVendorModal from "../ReusableForm/AddVendorModal";
import Swal from "sweetalert2"; import Swal from "sweetalert2";
import invoiceIcon from '../../../../assets/Image/invoiceIcon.png'
import vendor from '../../../../assets/Image/vendor.png'
import department from '../../../../assets/Image/Department.png'
export default function Purchase() { export default function Purchase() {
const { user } = useContext(AuthContext); const { user } = useContext(AuthContext);
@ -40,7 +43,7 @@ export default function Purchase() {
const { Get, Post, Delete, Patch } = useApi(); const { Get, Post, Delete, Patch } = useApi();
const [reloadTotal, setReloadTotal] = useState(false); const [reloadTotal, setReloadTotal] = useState(false);
const [filteredDepartments, setFilteredDepartments] = useState([]); const [filteredDepartments, setFilteredDepartments] = useState([]);
const [selectedPaymentMethod, setSelectedPaymentMethod] = useState("");
// Handle checkbox change // Handle checkbox change
const [formData, setFormData] = useState({ const [formData, setFormData] = useState({
@ -200,6 +203,7 @@ export default function Purchase() {
const handleSpecificPaymentMethodChange = (e) => { const handleSpecificPaymentMethodChange = (e) => {
const value = e.target.value; const value = e.target.value;
setSelectedPaymentMethod(value); // Update selected payment method state
setShowCheckFields(value === "cheque"); setShowCheckFields(value === "cheque");
setShowBankFields(value === "bank"); setShowBankFields(value === "bank");
@ -514,8 +518,8 @@ export default function Purchase() {
// Editing an existing invoice // Editing an existing invoice
const originalInvoice = invoices.find((invoice) => invoice.id === editingInvoiceId); const originalInvoice = invoices.find((invoice) => invoice.id === editingInvoiceId);
if (!originalInvoice) { if (!originalInvoice) {
console.error("Invoice not found for editingInvoiceId:", editingInvoiceId); console.error("Invoice not found for editingInvoiceId:", editingInvoiceId);
return; return;
} }
// Determine the new status based on payment method and remaining amount // Determine the new status based on payment method and remaining amount
@ -523,11 +527,11 @@ export default function Purchase() {
let newStatus = originalInvoice.status; // Start with the original status let newStatus = originalInvoice.status; // Start with the original status
if (formData.pay_method_status === "pay_now") { if (formData.pay_method_status === "pay_now") {
newStatus = "paid"; // Always "paid" if paid now newStatus = "paid"; // Always "paid" if paid now
} else if (formData.pay_method_status === "pay_later") { } else if (formData.pay_method_status === "pay_later") {
newStatus = "unpaid"; // Ensure unpaid if paying later newStatus = "unpaid"; // Ensure unpaid if paying later
} else if (newRemainingAmount < originalInvoice.amount) { } else if (newRemainingAmount < originalInvoice.amount) {
newStatus = "partially_paid"; // Adjust if partially paid newStatus = "partially_paid"; // Adjust if partially paid
} }
@ -619,12 +623,141 @@ export default function Purchase() {
<div className="main-container"> <div className="main-container">
<div className="d-flex p-2"> <div className="d-flex p-2">
<div className="expensecontainer d-flex flex-column pd-2"> <div className="expensecontainer d-flex flex-column pd-2">
<div className="d-flex justify-content-between align-items-center mb-3"> <div className="d-flex align-items-center mb-3" style={{ gap: "10px" }}>
<h3 className="mb-1">Purchase</h3> <button className="btn cus d-flex align-items-center" onClick={toggleModal}>
<button className="btn btn-primary cus" onClick={toggleModal}>
{" "} {" "}
+ Add Invoice + Add Invoice
<img
src={invoiceIcon}
alt="Invoice Icon"
style={{ width: "20px", height: "20px", marginLeft: "8px" }}
/>
</button> </button>
<button style={{
backgroundColor: "#4A5546",
boxShadow: "none",
outline: "none",
width: "auto",
height: "42px",
padding: "8px 12px",
fontSize: "16px",
border: "none",
borderRadius: "10px",
color: "#F4FFEE",
cursor: "pointer",
}}>
+ Add New Vendor
<img
src={vendor}
alt="Invoice Icon"
style={{ width: "20px", height: "20px", marginLeft: "8px" }}
/>
</button>
<button style={{
backgroundColor: "#4A5546",
boxShadow: "none",
outline: "none",
width: "auto",
height: "42px",
padding: "8px 12px",
fontSize: "16px",
border: "none",
borderRadius: "10px",
color: "#F4FFEE",
cursor: "pointer",
}}
>
+ Add Department
<img
src={department}
alt="Invoice Icon"
style={{ width: "20px", height: "20px", marginLeft: "8px" }}
/>
</button>
<div
style={{
display: "flex",
gap: "16px",
justifyContent: "center",
alignItems: "center",
margin: "20px",
}}
>
{/* Invoice due this month */}
<div
style={{
backgroundColor: "#fff8e6",
border: "1px solid #ffd700",
borderRadius: "8px",
padding: "16px 24px",
display: "flex",
flexDirection: "column",
justifyContent: "center",
alignItems: "flex-start",
width: "300px",
textAlign: "left",
}}
>
<p style={{ fontSize: "24px", fontWeight: "bold", margin: "0" }}>
$500
</p>
<p style={{ fontSize: "14px", color: "#555", margin: "4px 0" }}>
Invoice due this month
</p>
</div>
{/* Last 7 days sale */}
<div
style={{
backgroundColor: "#e6ffee",
border: "1px solid #00b300",
borderRadius: "8px",
padding: "16px 24px",
display: "flex",
flexDirection: "column",
justifyContent: "center",
alignItems: "flex-start",
width: "300px",
textAlign: "left",
}}
>
<p style={{ fontSize: "24px", fontWeight: "bold", margin: "0" }}>
$1900
</p>
<p style={{ fontSize: "14px", color: "#555", margin: "4px 0" }}>
Last 7 days sale
</p>
</div>
{/* Expense this month */}
<div
style={{
backgroundColor: "#ffe6e6",
border: "1px solid #ff4d4d",
borderRadius: "8px",
padding: "16px 24px",
display: "flex",
flexDirection: "column",
justifyContent: "center",
alignItems: "flex-start",
width: "300px",
textAlign: "left",
}}
>
<p style={{ fontSize: "24px", fontWeight: "bold", margin: "0" }}>
$0.00
</p>
<p style={{ fontSize: "14px", color: "#555", margin: "4px 0" }}>
Expense this month
</p>
</div>
</div>
</div> </div>
{/* Table Start */} {/* Table Start */}
@ -695,8 +828,10 @@ export default function Purchase() {
<input <input
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#ffffff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px", height: "52px",
}} }}
type="date" type="date"
@ -714,8 +849,10 @@ export default function Purchase() {
<input <input
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#ffffff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px", height: "52px",
}} }}
type="text" type="text"
@ -733,8 +870,9 @@ export default function Purchase() {
<div className="col-md-6" style={{ paddingRight: "10px" }}> <div className="col-md-6" style={{ paddingRight: "10px" }}>
<select <select
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#ffffff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
height: "52px", height: "52px",
}} }}
className="form-control" className="form-control"
@ -771,8 +909,9 @@ export default function Purchase() {
<select <select
className="form-control" className="form-control"
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#ffffff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
height: "52px", height: "52px",
}} }}
name="vendor_department_service_titles" name="vendor_department_service_titles"
@ -807,107 +946,204 @@ export default function Purchase() {
</div> </div>
</div> </div>
<div className="d-flex col-md-12"> <div className="d-flex col-md-12 mt-2">
<div
className="form-row d-flex col-md-5 p-2 mt-2"
style={{ marginLeft: "10px" }}
>
<div className="input-group col-md-6">
<div
className="input-group-prepend"
style={{
</div> background: "#ffffff",
<div height: "100%",
className="d-flex col-md-12"
style={{ paddingLeft: "5px", paddingTop: "15px" }} display: "flex",
> alignItems: "center",
<p>Payment Method : </p> }}
<label >
className="radio-inline" {/* <span className="input-group-text prefixtext"
style={{ paddingLeft: "10px" }} style={{ border: "none", fontSize: "14px" }}>
USD
</span> */}
</div>
<input
required
type="number"
className="form-control sampletext"
placeholder="Amount"
aria-label="Username"
aria-describedby="addon-wrapping"
name={editingInvoiceId ? "pay_amount" : "amount"}
value={
editingInvoiceId && formData.pay_amount === undefined
? formData.remaining_amount
: formData.pay_amount || formData.amount
}
onChange={handleChange}
onInput={(e) => {
// Allow only numbers and a decimal point with two digits after it
e.target.value = e.target.value
.replace(/[^0-9.]/g, '') // Remove non-numeric characters except the decimal point
.replace(/^(\d*\.?\d{0,2}).*/g, '$1') // Allow only two decimal places
.slice(0, 12); // Limit input length (10 digits + 1 decimal + 2 decimal places)
}}
/>
</div>
</div>
<div
style={{
border: '2px solid #ACB4AA',
padding: '5px 10px',
marginTop: '20px',
width: 'fit-content',
borderRadius: '40px',
display: 'flex', // Use flexbox
gap: '10px', // Add spacing between the options
}}
> >
<input
type="radio"
name="pay_method_status"
value="pay_later"
checked={formData.pay_method_status === "pay_later"}
onChange={handlePaymentMethodChange}
/>{" "}
Pay Later
</label>
<label
className="radio-inline"
style={{ paddingLeft: "10px" }}
>
<input
type="radio"
name="pay_method_status"
value="pay_now"
checked={formData.pay_method_status === "pay_now"}
onChange={handlePaymentMethodChange}
/>{" "}
Pay Now
</label>
<label
className="radio-inline"
style={{ paddingLeft: "10px" }}
>
<input
type="radio"
name="pay_method_status"
value="credit_invoice"
checked={
formData.pay_method_status === "credit_invoice"
}
onChange={handlePaymentMethodChange}
/>{" "}
Credit Invoice
</label>
</div>
{showPaymentOptions && (
<div className="d-flex col-md-6 mb-3">
<label <label
className="radio-inline" className="radio-inline"
style={{ paddingLeft: "10px" }} style={{
backgroundColor: formData.pay_method_status === "pay_later" ? "#4a5546" : "transparent",
color: formData.pay_method_status === "pay_later" ? "white" : "black",
padding: '5px 10px',
borderRadius: '20px',
}}
> >
<input <input
type="radio" type="radio"
name="specificPaymentMethod" name="pay_method_status"
value="cash" value="pay_later"
onChange={handleSpecificPaymentMethodChange} checked={formData.pay_method_status === "pay_later"}
onChange={handlePaymentMethodChange}
style={{ display: 'none' }} // Hide the radio button
/>{" "} />{" "}
Cash Pay Later
</label> </label>
<label <label
className="radio-inline" className="radio-inline"
style={{ paddingLeft: "10px" }} style={{
backgroundColor: formData.pay_method_status === "pay_now" ? "#4a5546" : "transparent",
color: formData.pay_method_status === "pay_now" ? "white" : "black",
padding: '5px 10px',
borderRadius: '20px',
}}
> >
<input <input
type="radio" type="radio"
name="specificPaymentMethod" name="pay_method_status"
value="cheque" value="pay_now"
onChange={handleSpecificPaymentMethodChange} checked={formData.pay_method_status === "pay_now"}
onChange={handlePaymentMethodChange}
style={{ display: 'none' }} // Hide the radio button
/>{" "} />{" "}
Check Pay Now
</label> </label>
<label <label
className="radio-inline" className="radio-inline"
style={{ paddingLeft: "10px" }} style={{
backgroundColor: formData.pay_method_status === "credit_invoice" ? "#4a5546" : "transparent",
color: formData.pay_method_status === "credit_invoice" ? "white" : "black",
padding: '5px 10px',
borderRadius: '20px',
}}
> >
<input <input
type="radio" type="radio"
name="specificPaymentMethod" name="pay_method_status"
value="bank" value="credit_invoice"
onChange={handleSpecificPaymentMethodChange} checked={formData.pay_method_status === "credit_invoice"}
onChange={handlePaymentMethodChange}
style={{ display: 'none' }} // Hide the radio button
/>{" "} />{" "}
Bank Card/ACH/EFT Credit Invoice
</label> </label>
</div> </div>
</div>
{showPaymentOptions && (
<div
className="d-flex col-md-6 mb-3"
style={{
border: "2px solid #ACB4AA",
padding: "5px 10px",
width: "fit-content",
borderRadius: "40px",
display: "flex",
gap: "10px",
marginTop: "20px",
}}
>
<div
className="payment-option"
onClick={() => handleSpecificPaymentMethodChange({ target: { value: "cash" } })}
style={{
padding: '5px 10px',
cursor: "pointer",
borderRadius: "20px",
backgroundColor: selectedPaymentMethod === "cash" ? "#4a5546" : "transparent", // Change background based on selection
color: selectedPaymentMethod === "cash" ? "white" : "black", // Change text color based on selection
textAlign: "center",
}}
>
Cash
</div>
<div
className="payment-option"
onClick={() => handleSpecificPaymentMethodChange({ target: { value: "cheque" } })}
style={{
padding: '5px 10px',
cursor: "pointer",
borderRadius: "20px",
backgroundColor: selectedPaymentMethod === "cheque" ? "#4a5546" : "transparent",
color: selectedPaymentMethod === "cheque" ? "white" : "black",
textAlign: "center",
}}
>
Check
</div>
<div
className="payment-option"
onClick={() => handleSpecificPaymentMethodChange({ target: { value: "bank" } })}
style={{
padding: '5px 10px',
cursor: "pointer",
borderRadius: "20px",
backgroundColor: selectedPaymentMethod === "bank" ? "#4a5546" : "transparent",
color: selectedPaymentMethod === "bank" ? "white" : "black",
textAlign: "center",
}}
>
Bank Card/ACH/EFT
</div>
</div>
)} )}
{showAdditionalFields && ( {showAdditionalFields && (
<div className="d-flex col-md-5 mt-2"> <div className="d-flex col-md-5 mt-2" style={{ marginTop: '20px' }}>
<select <select
className="form-control col-md-5 me-2" className="form-control col-md-5 me-2"
name="days" name="days"
value={formData.days || ""} value={formData.days || ""}
onChange={handleChange} onChange={handleChange}
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#fff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px", height: "52px",
}} }}
required required
> >
@ -920,8 +1156,11 @@ export default function Purchase() {
</select> </select>
<input <input
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#fff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "50px", height: "50px",
}} }}
className="form-control d-flex col-md-5" className="form-control d-flex col-md-5"
@ -938,8 +1177,11 @@ export default function Purchase() {
<div className="d-flex col-md-4 mt-2"> <div className="d-flex col-md-4 mt-2">
<select <select
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#fff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px",
height: "52px", height: "52px",
marginRight: "10px", marginRight: "10px",
}} }}
@ -962,8 +1204,11 @@ export default function Purchase() {
className="form-control me-2" className="form-control me-2"
placeholder="Check Number" placeholder="Check Number"
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#fff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px",
height: "52px", height: "52px",
marginRight: "10px", marginRight: "10px",
}} }}
@ -978,8 +1223,11 @@ export default function Purchase() {
<div className="d-flex col-md-4 mt-2"> <div className="d-flex col-md-4 mt-2">
<input <input
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#fff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px",
height: "52px", height: "52px",
}} }}
className="form-control col-md-3" className="form-control col-md-3"
@ -994,8 +1242,11 @@ export default function Purchase() {
<div className="d-flex col-md-6 mt-2"> <div className="d-flex col-md-6 mt-2">
<select <select
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#fff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px",
height: "52px", height: "52px",
marginRight: "10px", marginRight: "10px",
}} }}
@ -1015,8 +1266,11 @@ export default function Purchase() {
<div className="d-flex col-md-6 mt-2"> <div className="d-flex col-md-6 mt-2">
<input <input
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#fff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px",
height: "52px", height: "52px",
}} }}
className="form-control col-md-3" className="form-control col-md-3"
@ -1047,8 +1301,11 @@ export default function Purchase() {
<div <div
className="form-row d-flex col-md-6 p-2 mt-2" className="form-row d-flex col-md-6 p-2 mt-2"
style={{ style={{
backgroundColor: "#0023000C", backgroundColor: "#fff",
borderRadius: "10px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
height: "52px",
height: "52px", height: "52px",
}} }}
> >
@ -1056,19 +1313,19 @@ export default function Purchase() {
<div <div
className="input-group-prepend" className="input-group-prepend"
style={{ style={{
background: "#F5F5F5", background: "#ffffff",
height: "100%", height: "100%",
borderRadius: "10px 0 0 10px",
display: "flex", display: "flex",
alignItems: "center", alignItems: "center",
}} }}
> >
<span {/* <span
className="input-group-text prefixtext" className="input-group-text prefixtext"
style={{ border: "none", fontSize: "14px" }} style={{ border: "none", fontSize: "14px" }}
> >
USD USD
</span> </span> */}
</div> </div>
<input <input
type="text" type="text"
@ -1089,56 +1346,7 @@ export default function Purchase() {
</div> </div>
</div> </div>
)} )}
<div
className="form-row d-flex col-md-6 p-2 mt-2"
style={{
backgroundColor: "#0023000C",
borderRadius: "10px",
height: "52px",
}}
>
<div className="input-group col-md-6">
<div
className="input-group-prepend"
style={{
background: "#F5F5F5",
height: "100%",
borderRadius: "10px 0 0 10px",
display: "flex",
alignItems: "center",
}}
>
<span className="input-group-text prefixtext"
style={{ border: "none", fontSize: "14px" }}>
USD
</span>
</div>
<input
required
type="number"
className="form-control sampletext"
placeholder="Amount"
aria-label="Username"
aria-describedby="addon-wrapping"
name={editingInvoiceId ? "pay_amount" : "amount"}
value={
editingInvoiceId && formData.pay_amount === undefined
? formData.remaining_amount
: formData.pay_amount || formData.amount
}
onChange={handleChange}
onInput={(e) => {
// Allow only numbers and a decimal point with two digits after it
e.target.value = e.target.value
.replace(/[^0-9.]/g, '') // Remove non-numeric characters except the decimal point
.replace(/^(\d*\.?\d{0,2}).*/g, '$1') // Allow only two decimal places
.slice(0, 12); // Limit input length (10 digits + 1 decimal + 2 decimal places)
}}
/>
</div>
</div>
</form> </form>
</div> </div>
<div className="modal-footer" style={{ border: "none" }}> <div className="modal-footer" style={{ border: "none" }}>
@ -1146,13 +1354,15 @@ export default function Purchase() {
type="button" type="button"
className="btn btn-secondary-outline" className="btn btn-secondary-outline"
onClick={toggleModal} onClick={toggleModal}
style={{ border: " 1px solid #282e26", borderRadius: '20px' }}
> >
Close Close
</button> </button>
<button <button
type="submit" type="submit"
className="btn btn-primary" className="btn "
onClick={handleSubmit} onClick={handleSubmit}
style={{ color: "white", backgroundColor: '#282e26', borderRadius: '20px' }}
> >
Submit Submit
</button> </button>

20
src/components/Pages/AppPAges/ReusableForm/AddDepartmentModal.js
View File

@ -37,23 +37,33 @@ const AddDepartmentModal = ({ show, handleClose, onDepartmentAdded }) => {
}; };
return ( return (
<ReusableModal show={show} handleClose={handleClose} title="Add Department" width="760px" height="175px"> <ReusableModal show={show} handleClose={handleClose} title="Add Department" width="760px" height="250px">
<form onSubmit={handleSave}> <form onSubmit={handleSave}>
<div className="form-group d-flex align-items-center mt-1"> <div className="form-group ">
<input <input
type="text" type="text"
className="input-field" className="input-field"
placeholder="Department Name" placeholder="Department Name"
value={departmentName} value={departmentName}
onChange={(e) => setDepartmentName(e.target.value)} onChange={(e) => setDepartmentName(e.target.value)}
style={{ width: "483px", marginRight: "10px" }} style={{ width: "483px", border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
marginBottom: "20px",
borderRadius: "0px", // Remove border radius
}}
required required
/> />
</div>
<div
style={{
textAlign: "right", // Align content to the right
}}
>
<button <button
type="submit" type="submit"
style={{ style={{
padding: "6px 8px", padding: "6px 8px",
backgroundColor: "#4545db", backgroundColor: "#282e26",
color: "white", color: "white",
border: "none", border: "none",
borderRadius: "40px", borderRadius: "40px",
@ -61,11 +71,11 @@ const AddDepartmentModal = ({ show, handleClose, onDepartmentAdded }) => {
width: "103px", width: "103px",
height: "42px", height: "42px",
fontSize: "18px", fontSize: "18px",
marginLeft: "20px",
}} }}
> >
Submit Submit
</button> </button>
</div> </div>
</form> </form>
</ReusableModal> </ReusableModal>

24
src/components/Pages/AppPAges/ReusableForm/AddExpenseModal.js
View File

@ -37,23 +37,35 @@ const AddExpenseTypeModal = ({ show, handleClose, onExpenseTypeAdded }) => {
}; };
return ( return (
<ReusableModal show={show} handleClose={handleClose} title="Add Expense Type" width="760px" height="175px"> <ReusableModal show={show} handleClose={handleClose} title="Add Expense Type" width="760px" height="250px">
<form onSubmit={handleSave}> <form onSubmit={handleSave}>
<div className="form-group d-flex align-items-center"> <div className="form-group">
<input <input
type="text" type="text"
className="input-field" className="input-field"
placeholder="Expense Type" placeholder="Expense Type"
value={expenseType} value={expenseType}
onChange={(e) => setExpenseType(e.target.value)} onChange={(e) => setExpenseType(e.target.value)}
style={{ width: "483px", marginRight: "10px" }} style={{
width: "483px",
border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
marginBottom: "20px",
borderRadius: "0px", // Remove border radius
}}
required required
/> />
</div>
<div
style={{
textAlign: "right", // Align content to the right
}}
>
<button <button
type="submit" type="submit"
style={{ style={{
padding: "6px 8px", padding: "6px 8px",
backgroundColor: "#4545db", backgroundColor: "#282e26",
color: "white", color: "white",
border: "none", border: "none",
borderRadius: "40px", borderRadius: "40px",
@ -61,7 +73,6 @@ const AddExpenseTypeModal = ({ show, handleClose, onExpenseTypeAdded }) => {
width: "103px", width: "103px",
height: "42px", height: "42px",
fontSize: "18px", fontSize: "18px",
marginLeft: "20px",
}} }}
> >
Submit Submit
@ -70,6 +81,5 @@ const AddExpenseTypeModal = ({ show, handleClose, onExpenseTypeAdded }) => {
</form> </form>
</ReusableModal> </ReusableModal>
); );
}; }
export default AddExpenseTypeModal; export default AddExpenseTypeModal;

28
src/components/Pages/AppPAges/ReusableForm/AddVendorModal.js
View File

@ -93,18 +93,26 @@ const AddVendorModal = ({ show, handleClose, reloadData }) => {
placeholder="Vendor Name" placeholder="Vendor Name"
value={vendorName} value={vendorName}
onChange={(e) => setVendorName(e.target.value)} onChange={(e) => setVendorName(e.target.value)}
style={{ width: "400px", marginRight: "10px", height: "44px" }} style={{ width: "400px", marginRight: "10px", height: "44px" ,
border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
}}
/> />
<select <select
className="input-field" className="input-field"
value={vendorType} value={vendorType}
onChange={(e) => { onChange={(e) => {
setVendorType(e.target.value); setVendorType(e.target.value);
setVendorDepartments([]); // Reset departments when type changes setVendorDepartments([]); // Reset departments when type changes
setOpeningBalance(""); setOpeningBalance("");
}} }}
style={{ width: "400px", marginRight: "10px", height: "44px" }} style={{ width: "400px", marginRight: "10px", height: "44px" , border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
}}
> >
<option value="">Vendor Type</option> <option value="">Vendor Type</option>
@ -136,7 +144,10 @@ const AddVendorModal = ({ show, handleClose, reloadData }) => {
<select <select
className="input-field" className="input-field"
onChange={handleDepartmentChange} onChange={handleDepartmentChange}
style={{ width: "400px", marginRight: "10px", height: "44px" }} style={{ width: "400px", marginRight: "10px", height: "44px" , border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
}}
> >
<option value=""> <option value="">
{vendorType === "purchase" {vendorType === "purchase"
@ -159,7 +170,10 @@ const AddVendorModal = ({ show, handleClose, reloadData }) => {
placeholder="Opening Balance" placeholder="Opening Balance"
value={openingBalance} value={openingBalance}
onChange={(e) => setOpeningBalance(e.target.value)} onChange={(e) => setOpeningBalance(e.target.value)}
style={{ width: "400px", marginRight: "10px", height: "44px" }} style={{ width: "400px", marginRight: "10px", height: "44px" , border: "none", // Remove all borders
borderBottom: "2px solid #ccc", // Set bottom border
borderRadius: "0px", // Remove border radius
}}
/> />
)} )}
</div> </div>
@ -170,10 +184,10 @@ const AddVendorModal = ({ show, handleClose, reloadData }) => {
style={{ style={{
marginLeft: "690px", marginLeft: "690px",
padding: "4px 8px", padding: "4px 8px",
backgroundColor: "#4545db", backgroundColor: "#282e26",
color: "white", color: "white",
border: "none", border: "none",
borderRadius: "40px", borderRadius: "20px",
cursor: "pointer", cursor: "pointer",
width: "124px", width: "124px",
height: "42px", height: "42px",

663
src/components/common/Header.js
View File

@ -34,9 +34,14 @@ const Header = () => {
const settingsRef = useRef(null); const settingsRef = useRef(null);
const lotteryRef = useRef(null); const lotteryRef = useRef(null);
const gasRef = useRef(null); const gasRef = useRef(null);
const [selectedNav, setSelectedNav] = useState("/"); // const [selectedNav, setSelectedNav] = useState("/");
const { Get, getAPI, Post } = useApi(); const { Get, getAPI, Post } = useApi();
const [parentLabel, setParentLabel] = useState("Expense"); // Parent label
const [selectedChild, setSelectedChild] = useState(""); // Selected child label
const [selectedNav, setSelectedNav] = useState("Expense");
const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false); const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
const toggleMobileMenu = () => { const toggleMobileMenu = () => {
setIsMobileMenuOpen(!isMobileMenuOpen); setIsMobileMenuOpen(!isMobileMenuOpen);
@ -59,6 +64,18 @@ const Header = () => {
logOutUser(); logOutUser();
}; };
const handleChildSelection = (childLabel) => {
setSelectedChild(childLabel); // Update the selected child label
setExpenseDropdownOpen(false); // Close the dropdown
};
const toggleDropdown = () => {
setExpenseDropdownOpen(!expenseDropdownOpen);
if (expenseDropdownOpen) {
setSelectedChild(""); // Clear selected child if closing
}
};
const handleStoreManageClick = async () => { const handleStoreManageClick = async () => {
setDropdownVisible(!isDropdownVisible); setDropdownVisible(!isDropdownVisible);
@ -141,6 +158,8 @@ const Header = () => {
setLotteryDropdownOpen(false); setLotteryDropdownOpen(false);
setGasDropdownOpen(false); setGasDropdownOpen(false);
setDropdownVisible(false); setDropdownVisible(false);
setSelectedChild("");
}; };
useEffect(() => { useEffect(() => {
@ -151,43 +170,42 @@ const Header = () => {
}, []); }, []);
return ( return (
<header className="header-container"> <header className="header-container">
<div className="navbar-left"> <div className="navbar-left">
<img src={paisavalaLogo} alt="Logo" /> <img src={paisavalaLogo} alt="Logo" />
</div> </div>
<nav className="navbar navbar-expand-lg"> <nav className="navbar navbar-expand-lg">
<div className="container-fluid"> <div className="container-fluid">
{/* <Link to="/"> {/* <Link to="/">
<img src={logo} alt="Logo" className="logo" /> <img src={logo} alt="Logo" className="logo" />
</Link> */} </Link> */}
<button <button
className="navbar-toggler" className="navbar-toggler"
type="button" type="button"
onClick={toggleMobileMenu} onClick={toggleMobileMenu}
>
<i className="fas fa-bars"></i>
</button>
<div
className={`collapse navbar-collapse ${isMobileMenuOpen ? 'show' : ''}`}
id="navbarNav"
> <ul className="navbar-nav me-auto">
{userRole === "store owner" && (
<li
className={`nav-item ${
selectedNav === "/owner-dashboard" ? "active" : ""
}`}
> >
<Link <i className="fas fa-bars"></i>
className="nav-link" </button>
to="/owner-dashboard" <div
onClick={() => { className={`collapse navbar-collapse ${isMobileMenuOpen ? 'show' : ''}`}
setSelectedNav("/owner-dashboard"); id="navbarNav"
closeDropdowns(); > <ul className="navbar-nav me-auto">
}} {userRole === "store owner" && (
> <li
Owner Dashboard className={`nav-item ${selectedNav === "/owner-dashboard" ? "active" : ""
</Link> }`}
</li> >
)} <Link
className="nav-link"
to="/owner-dashboard"
onClick={() => {
setSelectedNav("/owner-dashboard");
closeDropdowns();
}}
>
Owner Dashboard
</Link>
</li>
)}
<li className={`nav-item ${selectedNav === "/" ? "active" : ""}`}> <li className={`nav-item ${selectedNav === "/" ? "active" : ""}`}>
<Link <Link
@ -201,28 +219,80 @@ const Header = () => {
Dashboard Dashboard
</Link> </Link>
</li> </li>
<li <li
className={`nav-item ${selectedNav === "#" ? "active" : ""}`} className={`nav-item ${expenseDropdownOpen ? "active" : ""}`}
ref={expenseRef} ref={expenseRef}
onClick={() => { onClick={() => {
closeDropdowns();
setExpenseDropdownOpen(!expenseDropdownOpen); setExpenseDropdownOpen(!expenseDropdownOpen);
}} }}
style={{
display: "flex",
flexDirection: "column", // Ensures child label is displayed below
alignItems: "flex-start", // Align labels to the left
position: "relative",
marginTop: "12px",
}}
> >
{/* Parent Label */}
<a <a
className="nav-link" className="nav-link"
href="#" href="#"
onClick={(e) => e.preventDefault()} onClick={(e) => e.preventDefault()}
> >
Expense {parentLabel}
</a> </a>
{/* Selected Child Label Below Parent Label */}
{selectedChild && (
<span
style={{
fontSize: "14px",
color: "white",
// borderBottom:'1px solid blue',
backgroundColor: "#282e26",
padding: "0px 20px",
borderRadius: '20px',
fontStyle: "normal",
}}
>
{selectedChild}
</span>
)}
{/* Dropdown Menu */}
{expenseDropdownOpen && ( {expenseDropdownOpen && (
<ul className="nav-menu-drop"> <ul
className="nav-menu-drop"
style={{
listStyle: "none",
padding: "10px",
margin: "0px",
border: "1px solid #ccc",
borderRadius: "4px",
boxShadow: "0 2px 4px rgba(0,0,0,0.1)",
backgroundColor: "#fff",
position: "absolute",
top: "100%", // Ensures dropdown appears below labels
left: "0",
zIndex: 10,
transform: "translateY(20px)", // Moves dropdown below header area
}}
>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/expense" to="/expense"
onClick={closeDropdowns} onClick={() => handleChildSelection("Expense")}
style={{
display: "block",
padding: "8px 12px",
color: "#000",
textDecoration: "none",
}}
> >
Expense Expense
</Link> </Link>
@ -231,7 +301,13 @@ const Header = () => {
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/purchase" to="/purchase"
onClick={closeDropdowns} onClick={() => handleChildSelection("Purchase")}
style={{
display: "block",
padding: "8px 12px",
color: "#000",
textDecoration: "none",
}}
> >
Purchase Purchase
</Link> </Link>
@ -239,10 +315,10 @@ const Header = () => {
</ul> </ul>
)} )}
</li> </li>
<li <li
className={`nav-item ${ className={`nav-item ${selectedNav === "/payroll" ? "active" : ""
selectedNav === "/payroll" ? "active" : "" }`}
}`}
> >
<Link <Link
className="nav-link" className="nav-link"
@ -257,9 +333,8 @@ const Header = () => {
</li> </li>
<li <li
className={`nav-item ${ className={`nav-item ${selectedNav === "/reportDateSelection" ? "active" : ""
selectedNav === "/reportDateSelection" ? "active" : "" }`}
}`}
> >
<Link <Link
className="nav-link" className="nav-link"
@ -272,92 +347,92 @@ const Header = () => {
Reports Reports
</Link> </Link>
</li> </li>
{(userRole === "store owner" || userRole === "store manager") &&( {(userRole === "store owner" || userRole === "store manager") && (
<li <li
className={`nav-item ${selectedNav === "#" ? "active" : ""}`} className={`nav-item ${selectedNav === "#" ? "active" : ""}`}
ref={generalRef} ref={generalRef}
onClick={() => { onClick={() => {
closeDropdowns(); closeDropdowns();
setGeneralDropdownOpen(!generalDropdownOpen); setGeneralDropdownOpen(!generalDropdownOpen);
}} }}
>
<a
className="nav-link"
href="#"
onClick={(e) => e.preventDefault()}
> >
General <a
</a> className="nav-link"
{generalDropdownOpen && ( href="#"
<ul className="nav-menu-drop"> onClick={(e) => e.preventDefault()}
<li> >
<Link General
className="nav-menu-drop-item" </a>
to="/ATM" {generalDropdownOpen && (
onClick={closeDropdowns} <ul className="nav-menu-drop">
> <li>
ATM <Link
</Link> className="nav-menu-drop-item"
</li> to="/ATM"
<li> onClick={closeDropdowns}
<Link >
className="nav-menu-drop-item" ATM
to="/Bank" </Link>
onClick={closeDropdowns} </li>
> <li>
Bank <Link
</Link> className="nav-menu-drop-item"
</li> to="/Bank"
<li> onClick={closeDropdowns}
<Link >
className="nav-menu-drop-item" Bank
to="/OtherIncome" </Link>
onClick={closeDropdowns} </li>
> <li>
Other Income <Link
</Link> className="nav-menu-drop-item"
</li> to="/OtherIncome"
<li> onClick={closeDropdowns}
<Link >
className="nav-menu-drop-item" Other Income
to="/SalesTax" </Link>
onClick={closeDropdowns} </li>
> <li>
Sales Tax <Link
</Link> className="nav-menu-drop-item"
</li> to="/SalesTax"
<li> onClick={closeDropdowns}
<Link >
className="nav-menu-drop-item" Sales Tax
to="/bankLedger" </Link>
onClick={closeDropdowns} </li>
> <li>
Bank Ledger <Link
</Link> className="nav-menu-drop-item"
</li> to="/bankLedger"
onClick={closeDropdowns}
>
Bank Ledger
</Link>
</li>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/cashLedger" to="/cashLedger"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Cash Ledger Cash Ledger
</Link> </Link>
</li> </li>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/OwnerDist" to="/OwnerDist"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Owner Distribution Owner Distribution
</Link> </Link>
</li> </li>
</ul> </ul>
)} )}
</li> </li>
)} )}
<li <li
className={`nav-item ${selectedNav === "#" ? "active" : ""}`} className={`nav-item ${selectedNav === "#" ? "active" : ""}`}
@ -472,191 +547,191 @@ const Header = () => {
</ul> </ul>
)} )}
</li> </li>
{userRole === "store owner" &&( {userRole === "store owner" && (
<li <li
className={`nav-item ${selectedNav === "#" ? "active" : ""}`} className={`nav-item ${selectedNav === "#" ? "active" : ""}`}
ref={settingsRef} ref={settingsRef}
onClick={() => { onClick={() => {
closeDropdowns(); closeDropdowns();
setSettingsDropdownOpen(!settingsDropdownOpen); setSettingsDropdownOpen(!settingsDropdownOpen);
}} }}
> >
<a <a
className="nav-link" className="nav-link"
href="#" href="#"
onClick={(e) => e.preventDefault()} onClick={(e) => e.preventDefault()}
> >
Settings Settings
</a> </a>
{settingsDropdownOpen && ( {settingsDropdownOpen && (
<ul className="nav-menu-drop"> <ul className="nav-menu-drop">
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/store-information" to="/store-information"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Store Information Store Information
</Link> </Link>
</li> </li>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/manage-users" to="/manage-users"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Manage Users Manage Users
</Link> </Link>
</li> </li>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/manage-departments" to="/manage-departments"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Manage Departments Manage Departments
</Link> </Link>
</li> </li>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/manage-expense-type" to="/manage-expense-type"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Manage Expense Type Manage Expense Type
</Link> </Link>
</li> </li>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/other-income-type" to="/other-income-type"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Other Income Type Other Income Type
</Link> </Link>
</li> </li>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/manage-vendor" to="/manage-vendor"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Manage Vendor Manage Vendor
</Link> </Link>
</li> </li>
<li> <li>
<Link <Link
className="nav-menu-drop-item" className="nav-menu-drop-item"
to="/manage-settings" to="/manage-settings"
onClick={closeDropdowns} onClick={closeDropdowns}
> >
Manage Settings Manage Settings
</Link> </Link>
</li> </li>
</ul> </ul>
)} )}
</li> </li>
)} )}
</ul> </ul>
<div className="d-flex align-items-center" > <div className="d-flex align-items-center" >
{/* <div className={`trail me-3 ${getColorClass()}`}> {/* <div className={`trail me-3 ${getColorClass()}`}>
<p>Remaining days: {remainingDays}</p> <p>Remaining days: {remainingDays}</p>
</div> */} </div> */}
</div> </div>
</div> </div>
</div> </div>
</nav> </nav>
<div className="navbar-left"> <div className="navbar-left">
<div className="avatar-container" ref={avatarRef}> <div className="avatar-container" ref={avatarRef}>
<img <img
src={shopeKeeper} src={shopeKeeper}
className="avatar" className="avatar"
alt="User Avatar" alt="User Avatar"
/>
{/* Display role_name here */}
<div className="user-role">
{userRole && <span>{userRole}</span>}
</div>
{/* Settings Icon Button */}
<button
className="settings-button"
onClick={(e) => {
e.stopPropagation(); // Prevent the click from triggering the avatar's click
closeDropdowns();
setsettingsDropOpen(!settingsDropOpen); // Toggle dropdown
}}
>
{/* Optional: Add an icon here */}
</button>
{settingsDropOpen && ( />
<ul className="nav-menu-drop"> {/* Display role_name here */}
<li> <div className="user-role">
<Link className="nav-menu-drop-item" to="#" onClick={closeDropdowns}> {userRole && <span>{userRole}</span>}
Profile
</Link>
</li>
{(userRole === "store owner" || userRole === "store manager") && (
<li>
<a
className="nav-menu-drop-item"
href="#"
onClick={(e) => {
e.preventDefault();
handleStoreManageClick();
}}
>
Switch Store
</a>
</li>
)}
{isDropdownVisible && (
<div className="dropdown-container">
<ul className="dropdown-list">
{loading ? (
<li>Loading...</li>
) : (
stores.map((store) => (
<li key={store.id} className="dropdown-item">
<a
href="#"
className="dropdown-link"
onClick={(e) => {
handleStoreClick(store.id);
window.location.reload();
}}
>
{store.name}
</a>
</li>
))
)}
</ul>
</div> </div>
)} {/* Settings Icon Button */}
<li> <button
<a className="settings-button"
className="nav-menu-drop-item" onClick={(e) => {
href="#" e.stopPropagation(); // Prevent the click from triggering the avatar's click
onClick={() => {
handleLogout();
closeDropdowns(); closeDropdowns();
setsettingsDropOpen(!settingsDropOpen); // Toggle dropdown
}} }}
> >
Logout {/* Optional: Add an icon here */}
</a> </button>
</li>
</ul> {settingsDropOpen && (
)} <ul className="nav-menu-drop">
</div> <li>
</div> <Link className="nav-menu-drop-item" to="#" onClick={closeDropdowns}>
Profile
</Link>
</li>
{(userRole === "store owner" || userRole === "store manager") && (
<li>
<a
className="nav-menu-drop-item"
href="#"
onClick={(e) => {
e.preventDefault();
handleStoreManageClick();
}}
>
Switch Store
</a>
</li>
)}
{isDropdownVisible && (
<div className="dropdown-container">
<ul className="dropdown-list">
{loading ? (
<li>Loading...</li>
) : (
stores.map((store) => (
<li key={store.id} className="dropdown-item">
<a
href="#"
className="dropdown-link"
onClick={(e) => {
handleStoreClick(store.id);
window.location.reload();
}}
>
{store.name}
</a>
</li>
))
)}
</ul>
</div>
)}
<li>
<a
className="nav-menu-drop-item"
href="#"
onClick={() => {
handleLogout();
closeDropdowns();
}}
>
Logout
</a>
</li>
</ul>
)}
</div>
</div>

1
src/components/common/header.css
View File

@ -49,6 +49,7 @@
.navbar-nav { .navbar-nav {
flex-direction: column; flex-direction: column;
} }
.nav-menu-drop { .nav-menu-drop {