diff --git a/index.html b/index.html
index ea0a952..b510a46 100644
--- a/index.html
+++ b/index.html
@@ -16,6 +16,13 @@
href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,400;0,500;0,600;0,700;1,200&display=swap"
rel="stylesheet"
/>
+
+
+
+
diff --git a/src/Pages/AppPage/CenterPage.jsx b/src/Pages/AppPage/CenterPage.jsx
index 6742c7a..a510361 100644
--- a/src/Pages/AppPage/CenterPage.jsx
+++ b/src/Pages/AppPage/CenterPage.jsx
@@ -67,7 +67,7 @@ const CenterPage = ({ collapse, setCollapse }) => {
height: getDeviceType() ? '84vh' : '',
padding: isCurrentPath ? "0px" : "6px",
borderRadius: isCurrentPath ? "0px" : "12px",
- backgroundColor: isCurrentPath ? "unset" : "#fff"
+ backgroundColor: isCurrentPath ? "#f3f3f3" : "#fff"
}}
>
{/*
{
const dispatch = useDispatch();
diff --git a/src/Pages/Product/ProductMaster.jsx b/src/Pages/Product/ProductMaster.jsx
index 44e59cc..1745922 100644
--- a/src/Pages/Product/ProductMaster.jsx
+++ b/src/Pages/Product/ProductMaster.jsx
@@ -6,6 +6,7 @@ import ProductList from './ProductList';
import ComboList from '../ComboPack/ComboMasterlist';
import { ApplicationPreferences } from '../../Features/BrachLogin/BranchLogin';
import { useSelector } from 'react-redux';
+import "../../Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss"
const ProductMaster = ({ formType }) => {
const appPreferences = useSelector(ApplicationPreferences);
diff --git a/src/Pages/StockMaster/StockForm.jsx b/src/Pages/StockMaster/StockForm.jsx
index 2e85a1b..c0b4db8 100644
--- a/src/Pages/StockMaster/StockForm.jsx
+++ b/src/Pages/StockMaster/StockForm.jsx
@@ -39,6 +39,7 @@ import {
putStockData,
} from '../../Features/StockMaster/StockMaster.js';
import '../../Styles/Stock/StockMaster.scss';
+import "../../Styles/OverAllStyle/OverAllStyle.scss"
import {
getAdmin,
getUomData,
diff --git a/src/Pages/StockTransfer/Dispatch.jsx b/src/Pages/StockTransfer/Dispatch.jsx
index f3c49c9..209851c 100644
--- a/src/Pages/StockTransfer/Dispatch.jsx
+++ b/src/Pages/StockTransfer/Dispatch.jsx
@@ -10,6 +10,7 @@ import FormHeader from '../PageComponents/FormHeader';
import { Input, Form, DatePicker, Collapse, Tooltip } from 'antd';
import { IoEye } from 'react-icons/io5';
import './Dispatch.scss';
+import "../../Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss"
import { DefaultModal } from '../../Components/Modal/DefaultModal';
import {
getRequestedStockQty,
diff --git a/src/Pages/StockTransfer/StockReceivedList.jsx b/src/Pages/StockTransfer/StockReceivedList.jsx
index 758197a..b165f36 100644
--- a/src/Pages/StockTransfer/StockReceivedList.jsx
+++ b/src/Pages/StockTransfer/StockReceivedList.jsx
@@ -26,6 +26,7 @@ import {
} from '../../Features/stockReceivedGodown/ReceivedStock.js';
import { render } from 'react-dom';
import { GoPackageDependencies } from 'react-icons/go';
+import "../../Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss"
const subDirectory = import.meta.env.BASE_URL;
diff --git a/src/Pages/StockTransfer/TransferList.jsx b/src/Pages/StockTransfer/TransferList.jsx
index d401e9f..efdd0d5 100644
--- a/src/Pages/StockTransfer/TransferList.jsx
+++ b/src/Pages/StockTransfer/TransferList.jsx
@@ -17,6 +17,8 @@ import { changeBreadCrumb } from '../../Features/AppPage/CenterPage';
import { DatePicker, Modal, Table } from 'antd';
import { getRequestStock } from '../../Features/RequestStock/RequestStock';
import { EyeOutlined } from '@ant-design/icons';
+import "../../Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss"
+
const subDirectory = import.meta.env.BASE_URL;
const StockTransferList = () => {
diff --git a/src/Pages/openingStock/openingStockForm.scss b/src/Pages/openingStock/openingStockForm.scss
index 93fb1e4..d40e7bd 100644
--- a/src/Pages/openingStock/openingStockForm.scss
+++ b/src/Pages/openingStock/openingStockForm.scss
@@ -99,6 +99,7 @@
overflow-x: auto;
max-height: 500px;
overflow-y: auto;
+ scrollbar-width: thin;
width: 100%;
.ant-input {
padding: 6px 6px !important;
diff --git a/src/Styles/AppPage/AppPage.scss b/src/Styles/AppPage/AppPage.scss
index cb15c6e..69a8215 100644
--- a/src/Styles/AppPage/AppPage.scss
+++ b/src/Styles/AppPage/AppPage.scss
@@ -25,6 +25,8 @@
padding: 6px;
overflow: auto;
height: 97vh;
+ scrollbar-width: none; /* Firefox */
+ -ms-overflow-style: none; /* Internet Explorer 10+ */
@media (max-width: 500px) {
height: 95vh !important;
}
@@ -69,6 +71,8 @@
height: 100%;
overflow: auto;
margin: 0 16px;
+ scrollbar-width: none; /* Firefox */
+ -ms-overflow-style: none; /* Internet Explorer 10+ */
@media (max-width: 500px) {
width: 94%;
@@ -101,6 +105,7 @@
height: 74vh;
overflow: auto;
row-gap: 1.5rem;
+ scrollbar-width: thin;
}
.formDivAnt {
@@ -207,6 +212,8 @@
// padding-left: var(--TABLE_PAGE_PADDING);
overflow: auto;
padding-bottom: 4rem;
+ scrollbar-width: none; /* Firefox */
+ -ms-overflow-style: none; /* Internet Explorer 10+ */
// padding-bottom: 10rem;
@@ -234,6 +241,7 @@
// width: 80vw;
width: 100%;
height: 70vh !important;
+ scrollbar-width: thin;
.ant-table-column-sorter {
color: #fff !important;
}
@@ -330,7 +338,7 @@
.centerPage-tooltip {
position: relative;
display: inline-block;
- font-family: 'Gilroy';
+ font-family: "Gilroy";
}
.paypreLogoDiv {
@@ -372,7 +380,7 @@
padding-left: 100%;
animation: scrollText 10s linear infinite;
color: #ff4d4f;
- font-family: 'Poppins';
+ font-family: "Poppins";
font-size: 12px;
font-weight: 500;
}
@@ -418,49 +426,30 @@
font-weight: unset;
}
-.ant-table
- .ant-table-container
- .ant-table-content
- table
- tbody
- tr:nth-child(even):hover {
+.ant-table .ant-table-container .ant-table-content table tbody tr:nth-child(even):hover {
background-color: #2c88ee1c !important;
font-weight: unset;
}
-.ant-table
- .ant-table-container
- .ant-table-content
- table
- tbody
- tr:nth-child(even):hover
- td {
+.ant-table .ant-table-container .ant-table-content table tbody tr:nth-child(even):hover td {
background-color: #2c88ee1c !important;
font-weight: unset;
}
-.ant-table
- .ant-table-container
- .ant-table-content
- table
- tbody
- tr:nth-child(odd):hover {
+.ant-table .ant-table-container .ant-table-content table tbody tr:nth-child(odd):hover {
background-color: #2c88ee1c !important;
font-weight: unset;
}
-.ant-table
- .ant-table-container
- .ant-table-content
- table
- tbody
- tr:nth-child(odd):hover
- td {
+.ant-table .ant-table-container .ant-table-content table tbody tr:nth-child(odd):hover td {
background-color: #2c88ee1c !important;
font-weight: unset;
}
+.ant-table-thead tr {
+ background-color: #2c88ee !important;
+}
- .ant-table-thead tr {
- background-color: #2c88ee !important;
- }
\ No newline at end of file
+.ant-table-thead .ant-table-cell {
+ border: none !important;
+}
\ No newline at end of file
diff --git a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss
index 2884b12..796bc42 100644
--- a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss
+++ b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss
@@ -17,7 +17,7 @@
color: var(--DEFAULT_SELECTED_COLOR);
.BSBillingNavBar1-SearchBar {
font-size: 12px !important;
- font-family: 'Poppins' !important;
+ font-family: "Poppins" !important;
font-weight: 500;
justify-content: center;
white-space: nowrap;
@@ -39,7 +39,7 @@
.BSBillingNavBar1-SearchBar {
display: flex;
- font-family: 'Gilroy';
+ font-family: "Gilroy";
font-weight: 600;
border-radius: 5px;
color: #212529 !important;
@@ -312,7 +312,7 @@
.BSNavbar1-timer {
width: 8rem;
- font-family: 'Gilroy';
+ font-family: "Gilroy";
display: flex;
justify-content: center;
text-wrap: nowrap;
@@ -485,7 +485,6 @@
pointer-events: none;
}
-
.MultiSearchIconDiv {
background-color: #1292ee;
color: #fff !important;
@@ -498,7 +497,6 @@
height: 35px;
padding: 6px;
-
svg {
font-size: 22px;
width: 35px !important;
@@ -506,4 +504,4 @@
display: flex;
}
-}
\ No newline at end of file
+}
diff --git a/src/Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss b/src/Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss
index 3fe80f6..1cb2899 100644
--- a/src/Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss
+++ b/src/Styles/BookingScreen/Components/SelectionComponent/SelectionComponent.scss
@@ -300,13 +300,13 @@
display: inline-flex;
gap: 16px;
font-family: "Poppins";
- margin-bottom: 12px;
+ margin-bottom: 12px;
border-bottom: 1px solid #d1d5db;
}
.ProductMasterListSwitchBTN > div {
font-size: 22px;
- font-weight: 600;
+ font-weight: 600;
cursor: pointer;
color: #6b7280;
display: flex;
diff --git a/src/Styles/DashBoard/RetailDashBoard.scss b/src/Styles/DashBoard/RetailDashBoard.scss
index 94ed5cf..c965b07 100644
--- a/src/Styles/DashBoard/RetailDashBoard.scss
+++ b/src/Styles/DashBoard/RetailDashBoard.scss
@@ -1680,6 +1680,7 @@
border-radius: 8px;
flex-direction: column;
padding: 12px;
+ font-family: "Inter", sans-serif;
}
.todaySnapFlex {
diff --git a/src/Styles/OverAllStyle/OverAllStyle.scss b/src/Styles/OverAllStyle/OverAllStyle.scss
index c0c4cf6..7a77a0d 100644
--- a/src/Styles/OverAllStyle/OverAllStyle.scss
+++ b/src/Styles/OverAllStyle/OverAllStyle.scss
@@ -923,6 +923,9 @@
display: flex;
flex-direction: row;
gap: 1rem;
+ .ant-form-item{
+ margin-bottom: 0 !important;
+ }
}
.CommmasterPageHeader {
@@ -1606,3 +1609,63 @@ table {
.CustomerForm-Master {
width: 100%;
}
+
+
+// Sree
+.component-table-purchae {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ height: max-content;
+ max-height: 300px;
+ width: 100%;
+ overflow-y: scroll;
+ & .ant-table-wrapper table {
+ width: 80%;
+ }
+}
+
+.component-table-new {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ height: 400px;
+ width: 100%;
+ overflow-y: scroll;
+ & .ant-table-wrapper table {
+ width: 100%;
+ }
+}
+
+.component-table-new .ant-pagination {
+ position: sticky;
+ bottom: 0;
+ margin: 0 !important;
+ padding: 0.5rem;
+ background-color: #fafafa;
+}
+
+
+.userPageContent {
+ .wspreorder-input1 {
+ display: flex;
+ align-items: flex-start;
+ gap: 1rem;
+ flex-wrap: wrap;
+ }
+
+ .ant-form-item-control-input-content {
+ display: flex;
+ align-items: flex-start;
+ gap: 10px;
+ }
+
+ .submitButton1 {
+ width: 90%;
+
+ .primary_Button {
+ float: inline-end;
+ color: white;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Styles/Stock/StockMaster.scss b/src/Styles/Stock/StockMaster.scss
index 6c7b0a5..1e7dc79 100644
--- a/src/Styles/Stock/StockMaster.scss
+++ b/src/Styles/Stock/StockMaster.scss
@@ -87,7 +87,7 @@
width: 180px !important;
}
- >div:nth-child(2) {
+ > div:nth-child(2) {
p {
display: none !important;
}
@@ -99,7 +99,7 @@
}
.supplier-dtls {
- font-family: 'Poppins', sans-serif;
+ font-family: "Poppins", sans-serif;
font-size: 18px;
font-weight: 500 !important;
}
@@ -136,7 +136,7 @@
}
.product-extractor-table {
- font-family: 'Poppins';
+ font-family: "Poppins";
.ant-input {
padding: 6px 12px 6px 12px !important;
@@ -145,7 +145,7 @@
max-width: 130px !important;
}
- >td:nth-child(3) {
+ > td:nth-child(3) {
.ant-input {
width: max-content !important;
max-width: 70px !important;
@@ -153,7 +153,7 @@
}
}
- >td:nth-child(5) {
+ > td:nth-child(5) {
.ant-input {
width: max-content !important;
max-width: 100px !important;
@@ -273,7 +273,7 @@
.ant-switch-inner-checked,
.ant-switch-inner-unchecked {
- font-family: 'Poppins';
+ font-family: "Poppins";
font-weight: 500;
}
@@ -324,12 +324,12 @@
}
.purchase-status {
- >div:nth-child(1) {
+ > div:nth-child(1) {
display: flex;
align-items: center;
gap: 10px;
- >p {
+ > p {
padding-bottom: 0 !important;
}
}
@@ -411,7 +411,7 @@
padding: 8px 16px;
color: #ffffff;
background-color: #1b86dd;
- font-family: 'Poppins', sans-serif;
+ font-family: "Poppins", sans-serif;
font-size: 14px;
border-radius: 8px;
cursor: pointer;
@@ -447,8 +447,8 @@
.invoice-date {
.ant-form-item-control-input-content {
- >label {
- font-family: 'Poppins';
+ > label {
+ font-family: "Poppins";
font-weight: 500;
}
@@ -473,16 +473,16 @@
gap: 1rem;
margin-bottom: 10px;
- >button {
- font-family: 'Poppins';
+ > button {
+ font-family: "Poppins";
background-color: #ef4444;
color: #fff;
display: flex;
align-items: center;
.ant-btn-icon {
- >span {
- >svg {
+ > span {
+ > svg {
width: 13px;
height: 13px;
}
@@ -499,7 +499,7 @@
outline: none;
padding: 10px 16px;
font-weight: 400;
- font-family: 'Poppins';
+ font-family: "Poppins";
background-color: #1b86dd;
border-radius: 2px 8px 2px 8px;
color: #fff;
@@ -676,7 +676,7 @@
font-size: 15px;
color: #1292ee;
font-weight: 500;
- font-family: 'Poppins';
+ font-family: "Poppins";
}
@keyframes scanLine {
@@ -701,7 +701,7 @@
gap: 5px;
background-color: #f8f9fa;
border-radius: 8px;
- font-family: 'Poppins', sans-serif;
+ font-family: "Poppins", sans-serif;
}
.preview-field {
@@ -753,7 +753,7 @@
font-size: 16px;
color: #1292ee;
font-weight: 500;
- font-family: 'Poppins', sans-serif;
+ font-family: "Poppins", sans-serif;
}
@keyframes spin {
@@ -781,7 +781,7 @@
outline: none;
padding: 8px 16px;
width: max-content;
- font-family: 'Poppins';
+ font-family: "Poppins";
font-weight: 500;
font-size: 14px;
cursor: pointer;
@@ -822,7 +822,6 @@
}
}
-
.proReceiptTD {
.ant-input {
width: 100% !important;
@@ -833,19 +832,16 @@
}
@media (max-width: 500px) {
-
.tdProductrecipt,
.proReceiptTD {
font-size: 12px !important;
}
- .div-flex{
- padding-bottom: 18px !important;
+ .div-flex {
+ padding-bottom: 18px !important;
}
-
}
-
.div-flex {
display: flex;
align-items: center;
@@ -863,6 +859,6 @@
.div-flex {
flex-direction: column;
align-items: flex-start;
- padding-bottom: 8px !important;
+ padding-bottom: 8px !important;
}
-}
\ No newline at end of file
+}
diff --git a/src/Styles/UiComponentPage/ComponentPage.scss b/src/Styles/UiComponentPage/ComponentPage.scss
index fbfae32..8ec69fe 100644
--- a/src/Styles/UiComponentPage/ComponentPage.scss
+++ b/src/Styles/UiComponentPage/ComponentPage.scss
@@ -24,7 +24,7 @@
flex-direction: column;
flex-wrap: wrap;
height: max-content;
- max-height:300px;
+ max-height: 300px;
width: 100%;
overflow-y: scroll;
& .ant-table-wrapper table {
diff --git a/src/useSessionManager.js b/src/useSessionManager.js
index 85b6ec1..31b45d3 100644
--- a/src/useSessionManager.js
+++ b/src/useSessionManager.js
@@ -52,7 +52,7 @@ const useSessionManager = (dependencyTrigger) => {
}
};
- sessionCheckFun();
+ // sessionCheckFun();
}, [dependencyTrigger]);
// 🔹 Logout (shared everywhere)