karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Design isued fix in all modal

This commit is contained in:
Your Name 2026-02-25 18:29:17 +05:30
parent 65eb86ffdd
commit 49017e7307
17 changed files with 825 additions and 807 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx
View File

@ -16,6 +16,8 @@ import { TiDelete } from 'react-icons/ti';
import BSBillingEbill from '../BSBillingEwayBill/BSBillingEbill';
import Search from '../../../../../Components/Forms/Search';
import { IoEye } from 'react-icons/io5';
// src\Styles\BookingScreen\Components\UtillComponents\BSNavBarComponents.scss
import "../../../../../Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss"
const { RangePicker } = DatePicker;
const ListOfSalesInvoices = (props) => {
@ -422,16 +424,6 @@ const ListOfSalesInvoices = (props) => {
/>
</div>
</div>
{/* <Button
className="BSC1Payment-HoldModel-cancleall"
type="primary"
danger
onClick={removeAll}
// onClick={() => statusFormatter(record,index)}
>
Clear All
</Button> */}
<div className="BSC1Payment-Tablediv">
<Tables

9
src/Pages/BookingScreen/Components/UtillComponents/BSExpireProductsList.jsx
View File

@ -21,6 +21,7 @@ import { TbAlertTriangleFilled } from 'react-icons/tb';
import { IoEye } from 'react-icons/io5';
import { DefaultModal } from '../../../../Components/Modal/DefaultModal';
import { Tables } from '../../../../Components/Tables/Table';
import '../../../../Styles/OverAllStyle/OverAllStyle.scss';
const NoDataComponent = () => (
<div style={{ textAlign: 'center', padding: 20 }}>
@ -301,10 +302,12 @@ const BSExpireProductsList = () => {
</span>
) : (
(expiredList?.length > 0 || lowStockList?.length > 0) && (
<span style={{ position: 'relative', display: 'inline-block' }} onClick={onClickExpiredIcon}>
<span
style={{ position: 'relative', display: 'inline-block' }}
onClick={onClickExpiredIcon}
>
<AiFillAlert
className="alert-badge stock-alert-animation"
style={{ fontSize: 23, cursor: 'pointer', color: '#ff4d4f' }}
/>
{
@ -341,6 +344,7 @@ const BSExpireProductsList = () => {
footer={null} // You can enable this if you want default buttons
width={700}
centered
className="LowStockAlterModal"
>
<Messages
messageType={message.type}
@ -377,6 +381,7 @@ const BSExpireProductsList = () => {
</div>
<Table
className='LowStockAlterModalTable'
rowKey="InwardDtlId"
columns={
selectedSegment === 'expired' ? expiredColumns : lowStockColumns

10
src/Pages/BookingScreen/Components/UtillComponents/BSNavBarDragItems.jsx
View File

@ -190,7 +190,15 @@ const BSNavBarDragItems = ({
{Isdragging && favopen && (
<div className="AddFavList addfavlist-master">
<div className="AddFavList-subContainer">
<div style={{ display: 'flex', alignItems: 'center', gap: '5px' }}>
<div
style={{
display: 'flex',
alignItems: 'center',
gap: '5px',
justifyContent: 'space-between',
width: '100%',
}}
>
<div className="DragChooseBTNs">
{PurProductdata.map((item) => (
<button

2
src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx
View File

@ -20,8 +20,8 @@ import { useDispatch } from 'react-redux';
import { PutStockPrice } from '../../../../Features/StockPriceUpdate/StockPriceUpdateMaster';
import PriceChange from '../../../../Images/PayOptImgs/PriceChange.svg';
import { v4 as uuidv4 } from 'uuid';
// src\Styles\BookingScreen\Template\BSLayout2\BSLayout2.scss
import '../../../../Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss';
import '../../../../Styles/OverAllStyle/OverAllStyle.scss';
const ProductPriceChange = ({
showButton = true,

1
src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx
View File

@ -319,7 +319,6 @@ const BSLayout1 = () => {
const handleInvoiceClose = () => {
setListOfInvoices(false);
};
// BSLayout1Data?.BookingNavbar?.[1]?.some((item) => item?.OptionName === "AddCustomer")
return (
<Suspense fallback={<CardSkeleton />}>
{' '}

29
src/Pages/BookingScreen/Template/SalesCountForStandard.jsx
View File

@ -1,12 +1,4 @@
import {
useEffect,
useState,
useMemo,
useCallback,
lazy,
Suspense,
useRef,
} from 'react';
import { useEffect, useState, useMemo, useCallback, lazy, useRef } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import { FaChartLine, FaRupeeSign } from 'react-icons/fa';
import { Badge, Popconfirm, Tooltip } from 'antd';
@ -588,7 +580,6 @@ const SalesCountForStandard = React.memo(() => {
};
return (
<Suspense fallback={<div>Loading...</div>}>
<div className="NewLayoutBillContainer">
<Messages
messageType={messageType}
@ -921,8 +912,7 @@ const SalesCountForStandard = React.memo(() => {
<tr
key={item.OrderId}
style={{
backgroundColor:
index % 2 === 0 ? '#f7faff' : '#e9f1ff',
backgroundColor: index % 2 === 0 ? '#f7faff' : '#e9f1ff',
textAlign: 'center',
transition: 'background 0.3s',
}}
@ -1063,9 +1053,10 @@ const SalesCountForStandard = React.memo(() => {
overflow: 'hidden',
boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
}}
className='SCTableInPageSales'
>
<thead>
<tr style={{ backgroundColor: '#003366', color: '#fff' }}>
<tr style={{ backgroundColor: '#2c88ee', color: '#fff' }}>
<th
colSpan="2"
style={{ border: '1px solid #ddd', padding: '10px' }}
@ -1101,14 +1092,14 @@ const SalesCountForStandard = React.memo(() => {
style={{
border: '1px solid #ddd',
padding: '10px',
backgroundColor: '#002244',
backgroundColor: '#055ec0',
color: '#fff',
}}
>
Total
</th>
</tr>
<tr style={{ backgroundColor: '#004080', color: '#fff' }}>
<tr style={{ backgroundColor: '#2c88ee', color: '#fff' }}>
<th style={{ border: '1px solid #ddd', padding: '8px' }}>
Count
</th>
@ -1154,8 +1145,7 @@ const SalesCountForStandard = React.memo(() => {
<tr
key={index}
style={{
backgroundColor:
index % 2 === 0 ? '#f7faff' : '#ffffff',
backgroundColor: index % 2 === 0 ? '#f7faff' : '#ffffff',
transition: 'background 0.3s',
}}
onMouseEnter={(e) =>
@ -1291,9 +1281,7 @@ const SalesCountForStandard = React.memo(() => {
onClose={handleModalCancel}
productDetails={modalProductDetails}
headerData={{
dateTime: dateFormatChange1(
TableData?.[SelectedIndex]?.CreatedDate
),
dateTime: dateFormatChange1(TableData?.[SelectedIndex]?.CreatedDate),
fromBranch: TableData?.[SelectedIndex]?.FromBranchName,
Dispatch_Id: TableData?.[SelectedIndex]?.DispatchId,
Created_By: TableData?.[SelectedIndex]?.Created_By,
@ -1302,7 +1290,6 @@ const SalesCountForStandard = React.memo(() => {
onSubmit={handleModalSubmit}
/>
</div>
</Suspense>
);
});

2
src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx
View File

@ -743,7 +743,7 @@ const CounterCategoryMappingForm = () => {
</Form> */}
{CounterDetail?.length > 0 && (
<div style={{ height: '400px', overflowY: 'scroll' }}>
<div style={{ height: '400px', overflowY: 'scroll',scrollbarWidth:"thin" }}>
<Table
dataSource={CounterDetail}
columns={TableColumns}

20
src/Pages/DashBoard/TopSellingProductsChart.scss
View File

@ -3,7 +3,7 @@
// background-color: #f3f4f6;
// padding: 1.5rem;
width: 100%;
font-family: 'Poppins', sans-serif !important;
font-family: "Poppins", sans-serif !important;
scrollbar-width: thin;
height: 88vh;
overflow: auto;
@ -11,12 +11,10 @@
background: #fff !important;
// padding-right: 1rem;
.header-title {
font-size: 1.5rem;
font-weight: 600;
padding: 0.1rem 0;
}
.header-date-picker {
@ -59,7 +57,6 @@
color: #1d4ed8;
}
.header-actions {
display: flex;
gap: 0.5rem;
@ -88,7 +85,6 @@
// justify-content: space-between;
}
.metric-controls {
display: flex;
gap: 0.5rem;
@ -109,10 +105,9 @@
}
.bar-pie-switch {
.ant-switch-inner-checked,
.ant-switch-inner-unchecked {
font-family: 'Poppins';
font-family: "Poppins";
font-weight: 500;
}
@ -126,7 +121,6 @@
background-color: #52c41a !important;
background: #52c41a !important;
}
}
.btn-chart-type {
@ -196,7 +190,6 @@
border-radius: 0.5rem;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
padding: 1rem;
}
.stat-card1 {
@ -472,7 +465,6 @@
align-items: center;
outline: none !important;
.chart-data-item {
display: flex;
align-items: center;
@ -497,8 +489,6 @@
// >div:nth-child(2) {
// width: 5%;
// }
}
}
}
@ -558,7 +548,6 @@
justify-content: space-between;
align-items: center;
gap: 10px;
}
.axis-label-wrapper {
@ -629,7 +618,7 @@
position: relative;
&::after {
content: '';
content: "";
position: absolute;
bottom: -4px;
left: 50%;
@ -750,7 +739,8 @@
.pie-legend {
flex: 1 1 100%;
max-width: 100%;
width: 100%;
justify-content: center;
}
}

5
src/Pages/Reports/PurchaseReport/PurchaseOrderReport.scss
View File

@ -228,16 +228,13 @@
background-color: #e9e8e8 !important;
border: none;
}
//dhana
// height: clamp(30vh, 50vh, 95vh);
}
// writed by sree
.ItemWiseReport-table1 {
overflow: auto;
height: clamp(40vh, 30vh, 95vh);
width: 79vw !important;
scrollbar-width: thin;
}
.ItemWiseReport-table .ant-table-thead tr .ant-table-cell {

9
src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss
View File

@ -84,6 +84,15 @@
.BsnavbarSearchMain {
width: 25vw;
position: relative;
.BarCodeScanMaster {
position: absolute;
right: 0;
padding: 0 !important;
top: 30%;
svg {
font-size: 20px !important;
}
}
.searchDiv .ant-input {
color: #fff !important;

6
src/Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss
View File

@ -296,7 +296,7 @@
}
.BSC1Payment-Tablediv .ant-table-wrapper .ant-table-thead > tr > th {
color: black !important;
color: rgb(255, 255, 255) !important;
font-weight: 600 !important;
font-size: 14px;
}
@ -325,9 +325,7 @@
box-shadow: unset !important;
}
.ant-select:not(.ant-select-customize-input)
.ant-select-selector
.ant-select-selection-search-input {
.ant-select:not(.ant-select-customize-input) .ant-select-selector .ant-select-selection-search-input {
bottom: 14px;
}

12
src/Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss
View File

@ -469,3 +469,15 @@ body {
font-size: 14px;
background-color: rgb(240, 240, 240);
}
.SCTableInPageSales {
th {
font-weight: 500;
text-transform: uppercase;
font-size: 12px !important;
letter-spacing: 0.1px;
}
td {
font-weight: 500 !important;
font-family: "Poppins" !important;
}
}

17
src/Styles/OverAllStyle/OverAllStyle.scss
View File

@ -851,6 +851,9 @@
}
.price-change-table {
.ant-table-thead tr {
background-color: #2c88ee !important;
}
.ant-form-item {
margin-bottom: 0 !important;
}
@ -1634,3 +1637,17 @@ table {
}
}
}
.LowStockAlterModal {
.ant-input-affix-wrapper {
width: 300px !important;
}
.ant-input {
padding: 5px 14px 6px 11px !important;
}
}
.LowStockAlterModalTable {
margin-top: 1rem;
.ant-table-thead tr {
background-color: #2c88ee !important;
}
}

5
src/Styles/PrinterSetting/PrinterSetting.scss
View File

@ -204,3 +204,8 @@
.printer-settings-tabs {
font-family: "Poppins";
}
.PrinterSettingTab {
.ant-tabs-tab-active {
background-color: #2c5282 !important;
}
}

3
src/Styles/Reports/DateWiseReport/DateWiseReport.scss
View File

@ -8,7 +8,8 @@
flex-grow: 1;
width: 100%;
height: 40vh;
overflow: scroll;
overflow: auto;
scrollbar-width: thin;
}
.DateWiseReport-denomination {

4
src/Styles/Reports/ItemWiseReport/ItemWiseReport.scss
View File

@ -229,15 +229,13 @@
border: none;
}
//dhana
// height: clamp(30vh, 50vh, 95vh);
}
// writed by sree
.ItemWiseReport-table1 {
overflow: auto;
height: clamp(40vh, 30vh, 95vh);
width: 79vw !important;
scrollbar-width: thin;
}
.ItemWiseReport-table .ant-table-thead tr .ant-table-cell {