From bdd9ea7a393dda6f3a2cc8440a8c18453bed8e14 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 25 Feb 2026 16:59:05 +0530 Subject: [PATCH] after resolve conflicts --- .../Template/SalesCountForStandard.jsx | 1357 +++++++++-------- .../Components/BSItemCards/BSItemCard.scss | 86 +- 2 files changed, 750 insertions(+), 693 deletions(-) diff --git a/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx b/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx index cb13822..63e91b5 100644 --- a/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx +++ b/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx @@ -1,4 +1,12 @@ -import { useEffect, useState, useMemo, useCallback, lazy } from 'react'; +import { + useEffect, + useState, + useMemo, + useCallback, + lazy, + Suspense, + useRef, +} from 'react'; import { useSelector, useDispatch } from 'react-redux'; import { FaChartLine, FaRupeeSign } from 'react-icons/fa'; import { Badge, Popconfirm, Tooltip } from 'antd'; @@ -8,6 +16,7 @@ import { getCardDataWithoutSub, getCardDataWithoutSubmodule, getLayoutproductCard, + getPreferenceData, getSelectedFavItems, GlobalOrderStatus, GlobalOtherSevices, @@ -482,10 +491,10 @@ const SalesCountForStandard = React.memo(() => { return ( DineInAccess?.SettingValue === 'Y' && DineInOrderCount + - TakeAwayOrderCount + - SelfTakeAwayOrderCount + - SelfDineInOrderCount > - 0 && + TakeAwayOrderCount + + SelfTakeAwayOrderCount + + SelfDineInOrderCount > + 0 && (takeAwayPreference || dinePreference) ); }, [DineInAccess, sales, dinePreference, takeAwayPreference]); @@ -579,715 +588,721 @@ const SalesCountForStandard = React.memo(() => { }; return ( -
- -
-
- {showSalesTooltip ? ( - - {takeAwayPreference && ( -
-
Takeaway:
-
{TakeAwayOrderCount + SelfTakeAwayOrderCount}
-
- )} - {dinePreference && ( -
-
Dine-in:
-
{DineInOrderCount + SelfDineInOrderCount}
-
- )} + Loading...
}> +
+ +
+
+ {showSalesTooltip ? ( + + {takeAwayPreference && ( +
+
Takeaway:
+
{TakeAwayOrderCount + SelfTakeAwayOrderCount}
+
+ )} + {dinePreference && ( +
+
Dine-in:
+
{DineInOrderCount + SelfDineInOrderCount}
+
+ )} +
+ } + onClick={() => + (OverAllOrderCount || 0) > 0 && setIsModalOpen(true) + } + > + +
+ {isMobile ? 'Count' : 'Sales Count'} : {OverAllOrderCount} +
+ + ) : ( +
+ (OverAllOrderCount || 0) > 0 && setIsModalOpen(true) + } + > + +
+ {isMobile ? 'Count' : 'Sales Count'} : {OverAllOrderCount}
- } - onClick={() => - (OverAllOrderCount || 0) > 0 && setIsModalOpen(true) - } - > - -
- {isMobile ? 'Count' : 'Sales Count'} : {OverAllOrderCount}
- - ) : ( -
- (OverAllOrderCount || 0) > 0 && setIsModalOpen(true) - } - > - -
- {isMobile ? 'Count' : 'Sales Count'} : {OverAllOrderCount} -
-
- )} -
-
- - {/* Rest of your component remains the same */} - {DineInAccess?.SettingValue === 'Y' && - takeAwayPreference && - (TakeAwayOrderCount || SelfTakeAwayOrderCount || PreOrderAmount) > - 0 && ( - -
-
{isMobile ? 'TA' : 'Take Away'} :
-
{`₹ ${safeRound(totalTakeAway)}`}
-
- - )} - - {DineInAccess?.SettingValue === 'Y' && - dinePreference && - (DineInOrderCount || SelfDineInOrderCount) > 0 && ( - -
-
{isMobile ? 'DI' : 'Dine In'} :
-
{`₹ ${safeRound(totalDineIn)}`}
-
- - )} - -
-
netAmount > 0 && setIsNetAmtModalOpen(true)} - style={{ cursor: 'pointer' }} - > - -
- {isMobile ? 'NA' : 'Net Amount'} : ₹ {safeRound(netAmount)} + )}
-
- {TableData?.length > 0 && !sportsAppPreference && AutoReceiveStock && ( - - )} - {preferenceshortcutkey && ( -
- + + {/* Rest of your component remains the same */} + {DineInAccess?.SettingValue === 'Y' && + takeAwayPreference && + (TakeAwayOrderCount || SelfTakeAwayOrderCount || PreOrderAmount) > + 0 && ( + +
+
{isMobile ? 'TA' : 'Take Away'} :
+
{`₹ ${safeRound(totalTakeAway)}`}
+
+ + )} + + {DineInAccess?.SettingValue === 'Y' && + dinePreference && + (DineInOrderCount || SelfDineInOrderCount) > 0 && ( + +
+
{isMobile ? 'DI' : 'Dine In'} :
+
{`₹ ${safeRound(totalDineIn)}`}
+
+ + )} + +
+
netAmount > 0 && setIsNetAmtModalOpen(true)} + style={{ cursor: 'pointer' }} + > + +
+ {isMobile ? 'NA' : 'Net Amount'} : ₹ {safeRound(netAmount)} +
+
- )} - -
- {Customisebillno && } - {SessionData?.FeatureAddonData?.FeatureDtls?.find( - (item) => item?.FeatureAddonName?.toLowerCase() === 'kiosk sales' - ) && - !sportsAppPreference && ( -
0 && !sportsAppPreference && AutoReceiveStock && ( + + )} + {preferenceshortcutkey && ( +
+ +
+ )} + +
+ {Customisebillno && } + {SessionData?.FeatureAddonData?.FeatureDtls?.find( + (item) => item?.FeatureAddonName?.toLowerCase() === 'kiosk sales' + ) && + !sportsAppPreference && ( +
0 ? 'none' : 'auto', + opacity: OrderStatus > 0 ? 0.5 : 1, + }} + > + {!OtherServicesglobal && ( + + + openModalKiosk()} + style={{ cursor: 'pointer', fontSize: '1.5rem' }} + className="iconsize" + /> + + + )} +
+ )} + {Kioskopen && ( + + )} + + {!OtherServicesglobal && !sportsAppPreference && ( + + {' '} + + + )} + + {!OtherServicesglobal && ( + <> + {CheckBookingStatus == 'Open' ? ( +
+ + {' '} + + +
+ ) : ( +
+ + BookingOpenFun('Open')} + > + + + + + +
+ )} + {!sportsAppPreference && ( +
+ + {''} + + +
+ )} + + )} + + {BookingModalOpen && ( + + )} + {ListOfInvoices && ( + + )} +
+ + {/* Modal with table for multiple bookings */} + + setIsModalOpen(false)} + handleSubmit={() => setIsModalOpen(false)} + width={700} + footer={false} + > +
+ 0 ? 'none' : 'auto', - opacity: OrderStatus > 0 ? 0.5 : 1, + width: '100%', + borderCollapse: 'collapse', + fontFamily: "'Segoe UI', Roboto, sans-serif", + fontSize: '14px', + borderRadius: '8px', + overflow: 'hidden', + boxShadow: '0 2px 8px rgba(0,0,0,0.1)', }} > - {!OtherServicesglobal && ( - - - openModalKiosk()} - style={{ cursor: 'pointer', fontSize: '1.5rem' }} - className="iconsize" - /> - - - )} - - )} - {Kioskopen && ( - - )} - - {!OtherServicesglobal && !sportsAppPreference && ( - - {' '} - - - )} + + + + + + + {/* */} + + + + - {!OtherServicesglobal && ( - <> - {CheckBookingStatus == 'Open' ? ( -
- - {' '} - - -
- ) : ( -
- - BookingOpenFun('Open')} - > - - - - - -
- )} - {!sportsAppPreference && ( -
- - {''} - - -
- )} - - )} - - {BookingModalOpen && ( - - )} - {ListOfInvoices && ( - - )} - - - {/* Modal with table for multiple bookings */} - - setIsModalOpen(false)} - handleSubmit={() => setIsModalOpen(false)} - width={700} - footer={false} - > -
-
+ S.No + + Order ID + + Customer + + Mobile + Booked By + Payment Type + + Amount (₹) +
- - - - - - - {/* */} - - - - - - - {currentData?.length > 0 ? ( - currentData?.map((item, index) => ( - - (e.currentTarget.style.backgroundColor = '#d6e4ff') - } - onMouseLeave={(e) => + + {currentData?.length > 0 ? ( + currentData?.map((item, index) => ( + + (e.currentTarget.style.backgroundColor = '#d6e4ff') + } + onMouseLeave={(e) => (e.currentTarget.style.backgroundColor = index % 2 === 0 ? '#f7faff' : '#e9f1ff') - } - > - - - - - {/* + + + + {/* */} - + + + + )) + ) : ( + - )) - ) : ( - -
- S.No - - Order ID - - Customer - - Mobile - Booked By - Payment Type - - Amount (₹) -
- {startIndex + index + 1} - - {extractLastNumberOrderId(item.OrderId)} - - {item.CustName || '—'} - - {item.CustMobile || '—'} - + } + > + + {startIndex + index + 1} + + {extractLastNumberOrderId(item.OrderId)} + + {item.CustName || '—'} + + {item.CustMobile || '—'} + {item.BookedBy || "—"} - {item.PaymentTypeName || '—'} - + {item.PaymentTypeName || '—'} + + ₹{item.Amount?.toLocaleString()} +
- ₹{item.Amount?.toLocaleString()} + No booking data available
+
+ + {/* Pagination */} + {totalPages > 1 && ( +
+ {currentPage == 1 ? ( + '' + ) : ( + + )} + + + Page {currentPage} of {totalPages} + - {/* Pagination */} - {totalPages > 1 && ( -
- {currentPage == 1 ? ( - '' - ) : ( - )} +
+ )} +
+ - - Page {currentPage} of {totalPages} - + {/* Modal with table for multiple Net Amt */} - -
- )} -
- - - {/* Modal with table for multiple Net Amt */} - - setIsNetAmtModalOpen(false)} - handleSubmit={() => setIsNetAmtModalOpen(false)} - width={800} - footer={false} - > -
- - - - - - - - - - - - - - - - - - - - - - - - - - {orderDetails?.map((item, index) => { - const total = - (item.CashAmount || 0) + - (item.UpiAmount || 0) + - (item.CardAmount || 0) + - (item.CreditAmount || 0); - - return ( - setIsNetAmtModalOpen(false)} + handleSubmit={() => setIsNetAmtModalOpen(false)} + width={800} + footer={false} + > +
+
- Cash - - UPI - - Card - - Credit - - Business UPI - - Total -
- Count - - Amt - - Count - - Amt - - Count - - Amt - - Count - - Amt - - Count - - Amt -
+ + + + + + + + + + + + + + + + + + + + + + + + + {orderDetails?.map((item, index) => { + const total = + (item.CashAmount || 0) + + (item.UpiAmount || 0) + + (item.CardAmount || 0) + + (item.CreditAmount || 0); + + return ( + + (e.currentTarget.style.backgroundColor = '#e6f2ff') + } + onMouseLeave={(e) => (e.currentTarget.style.backgroundColor = index % 2 === 0 ? '#f7faff' : '#ffffff') - } - > - - - - - - - - - - - - - ); - })} - -
+ Cash + + UPI + + Card + + Credit + + Business UPI + - (e.currentTarget.style.backgroundColor = '#e6f2ff') - } - onMouseLeave={(e) => + > + Total +
+ Count + + Amt + + Count + + Amt + + Count + + Amt + + Count + + Amt + + Count + + Amt +
- {item.CashCount} - - {item.CashAmount} - - {item.UpiCount} - - {item.UpiAmount} - - {item.CardCount} - - {item.CardAmount} - - {item.CreditCount} - - {item.CreditAmount} - - {item.BusinessUpiCount} - - {item.BusinessUpiAmount} - - {total} -
-
- + + {item.CashCount} + + + {item.CashAmount} + + + {item.UpiCount} + + + {item.UpiAmount} + + + {item.CardCount} + + + {item.CardAmount} + + + {item.CreditCount} + + + {item.CreditAmount} + + + {item.BusinessUpiCount} + + + {item.BusinessUpiAmount} + + + {total} + + + ); + })} + + +
+ - { - setIsReceivedModelOpen(false); - }} - columns={columns} - tableData={TableData} - handlePageChange={handlePageChange} - customTable={false} - /> + { + setIsReceivedModelOpen(false); + }} + columns={columns} + tableData={TableData} + handlePageChange={handlePageChange} + customTable={false} + /> - setModalProductDetails(d)} - onSubmit={handleModalSubmit} - /> -
+ setModalProductDetails(d)} + onSubmit={handleModalSubmit} + /> +
+ ); }); diff --git a/src/Styles/BookingScreen/Components/BSItemCards/BSItemCard.scss b/src/Styles/BookingScreen/Components/BSItemCards/BSItemCard.scss index eb9584d..0bbeb80 100644 --- a/src/Styles/BookingScreen/Components/BSItemCards/BSItemCard.scss +++ b/src/Styles/BookingScreen/Components/BSItemCards/BSItemCard.scss @@ -37,6 +37,7 @@ text-align: center; } + .BSItemCard-master-container { display: flex; flex-direction: row; @@ -162,6 +163,7 @@ column-gap: 0.3rem; row-gap: 0.5rem; cursor: pointer; + // vicky justify-content: space-around; } @@ -239,6 +241,7 @@ column-gap: 0.5rem !important; } + .ant-modal .ant-modal-content { padding: 1rem !important; } @@ -266,9 +269,12 @@ .BSItemCard-itemPrice { font-size: 9px !important; + //nk width: 60px !important; + // } + //nk .qtyUomName-itemCard { width: 78px !important; } @@ -309,7 +315,9 @@ .BSItemCard-master-container { padding: 0px 0px; justify-content: center !important; + // padding-bottom: 10rem !important; padding-bottom: 1rem !important; + // column-gap: 0.1rem !important; } .BSItemCard-container { @@ -325,6 +333,7 @@ width: 8rem !important; height: 6rem !important; } + .BSItemCard-itemName { width: 60px !important; font-size: 10px; @@ -335,10 +344,12 @@ .bs-item-card-masterdiv { height: inherit; } + } @media (min-width: 500px) and (max-width: 767px) { .bs-item-card-masterdiv { + // height: 77vh !important; height: inherit; } @@ -352,6 +363,7 @@ @media (min-width: 280px) and (max-width: 499px) { .bs-item-card-masterdiv { + // height: 60vh !important; height: inherit; } @@ -362,6 +374,7 @@ } } + .QRStockchange-table thead { position: sticky; top: 0; @@ -373,7 +386,7 @@ border-spacing: 0px; } -.QRStockchange-table .ant-table-wrapper .ant-table-thead > tr > th { +.QRStockchange-table .ant-table-wrapper .ant-table-thead>tr>th { color: black !important; font-weight: 600 !important; font-size: 14px; @@ -393,7 +406,10 @@ } .BkPrdCardDeActive { + // pointer-events: none; border: 1px solid #f10000; + + // border-radius: 8px; .BSItemCard-container-smallimage { width: 10.9rem; } @@ -496,6 +512,7 @@ flex-direction: column; justify-content: center; column-gap: 0.1rem; + border-radius: 2px; } @@ -505,19 +522,6 @@ font-family: "Gilroy"; text-align: center; } -.qtyprice { - font-size: 16px; - background-color: var(--DEFAULT_SELECTED_COLOR); - color: #fff; - // padding: 0rem 2rem; - width: 105px; - display: flex; - font-family: var(--PARA_FONT_FAMILY); - justify-content: center; - text-align: center; - border-bottom-left-radius: 6px; - border-bottom-right-radius: 6px; -} //nk .qtyUomName-itemCard { @@ -531,6 +535,20 @@ width: 105px; } +.qtyprice { + font-size: 16px; + background-color: var(--DEFAULT_SELECTED_COLOR); + color: #fff; + // padding: 0rem 2rem; + width: 105px; + display: flex; + font-family: var(--PARA_FONT_FAMILY); + justify-content: center; + text-align: center; + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; +} + .Card-modal-table .ant-pagination { position: sticky; bottom: 0; @@ -539,13 +557,13 @@ background-color: #fafafa; } -.Card-modal-table .ant-table-wrapper .ant-table-thead > tr > th { +.Card-modal-table .ant-table-wrapper .ant-table-thead>tr>th { color: black !important; font-weight: 600 !important; font-size: 14px; } -.Card-modal-table .ant-table-row > td { +.Card-modal-table .ant-table-row>td { color: black !important; font-weight: 500 !important; font-size: 16px; @@ -800,6 +818,8 @@ .Payment-loader1 { .Payment-loader { + + // column-gap: 1rem; .contener_mixte { top: 5px; right: 12rem; @@ -810,26 +830,28 @@ .EditQuantity-Master { .Re-Print-table { width: 100% !important; - scrollbar-width: none; - } - .ant-table-thead tr { - background-color: #1292ee !important; } } .webkit-ul { height: 35vh; overflow-y: auto; + + /* Firefox */ scrollbar-width: thin; + /* Options: auto | thin | none */ scrollbar-color: #c1c1c1 transparent; } +/* WebKit Browsers: Chrome, Edge, Safari */ .webkit-ul::-webkit-scrollbar { width: 25px; + /* Adjust width as needed */ } .webkit-ul::-webkit-scrollbar-track { background: #f0f0f0; + /* Optional: add contrast to track */ border-radius: 10px; } @@ -837,6 +859,7 @@ background-color: #c1c1c1; border-radius: 10px; border: 6px solid transparent; + /* Adjust for padding inside thumb */ background-clip: content-box; transition: background-color 0.3s ease; } @@ -999,6 +1022,7 @@ gap: 1.7rem !important; overflow: scroll; height: 100%; + scrollbar-width: none; @media (max-width: 500px) { gap: 0.5rem !important; @@ -1088,12 +1112,21 @@ } .booked-text { + // color: #070; color: rgb(241, 16, 16); + font-weight: 600; cursor: not-allowed !important; margin-top: 4px; } +// .Available-text{ +// color: rgb(41, 201, 41); +// font-weight: 600; +// cursor: not-allowed !important; +// margin-top: 4px; +// } + .slot-btn.incart { background: #ffe066; color: #222; @@ -1322,7 +1355,7 @@ font-family: "Poppins"; font-size: 0.8rem; - > div:nth-child(1) { + >div:nth-child(1) { font-size: 0.8rem; font-weight: 600; } @@ -1631,6 +1664,7 @@ color: #ffffff; border-color: #f44336; cursor: not-allowed; + &:hover { color: #c90b0b; background-color: #ffff; @@ -1647,6 +1681,7 @@ background-color: #ffe8bf; color: #5f4204; border-color: #ff9800; + &:hover { background-color: #5f4204; color: #ffe8bf; @@ -1658,6 +1693,10 @@ color: #ffffff; border-color: #31a0f0; cursor: not-allowed; + // &:hover{ + // color:#148498; + // background-color: #fff; + // } } &.selected { @@ -2221,9 +2260,11 @@ cursor: pointer; height: 270px; width: 195px; + // background-color: #fff; border-radius: 0.75rem; display: flex; flex-direction: column; + // justify-content: space-between; margin-top: 10px; position: relative; border: 2px solid rgba(0, 0, 0, 0.3); @@ -2231,6 +2272,7 @@ .voiceToTextIcon { position: fixed; + // width: max-content; top: 7px; left: 10px; display: flex; @@ -2275,4 +2317,4 @@ top: 2px; left: 8px; } -} +} \ No newline at end of file