diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/ComboBillTableEdit/ComboEditQtyAndRate.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/ComboBillTableEdit/ComboEditQtyAndRate.jsx index 243f7f4..99827d9 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/ComboBillTableEdit/ComboEditQtyAndRate.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/ComboBillTableEdit/ComboEditQtyAndRate.jsx @@ -3209,6 +3209,7 @@ const ComboEditQtyAndRate = (props) => { AddProductQuantity(); } }} + min={0} className="EditQTYcomboInput" placeholder="Enter Qty" /> diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx index f25d3f5..649de84 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx @@ -148,13 +148,13 @@ const ComboSalesBillTable = () => { OrderType === 'Hold' ? tableData?.filter((a, b) => a.BookingTypeName === 'TakeAway') : tableData?.filter( - (a, b) => a.BookingTypeName === 'TakeAway' && !a?.SalesId - ); + (a, b) => a.BookingTypeName === 'TakeAway' && !a?.SalesId + ); const OldtableDataTakeAway = OrderType != 'Hold' ? tableData?.filter( - (a, b) => a.BookingTypeName === 'TakeAway' && a?.SalesId - ) + (a, b) => a.BookingTypeName === 'TakeAway' && a?.SalesId + ) : []; const [EditQuantity, setEditQuantity] = useState(false); @@ -188,6 +188,26 @@ const ComboSalesBillTable = () => { } }; + const [isAltPressed, setIsAltPressed] = useState(false); + + useEffect(() => { + const handleKeyDown = (e) => { + if (e.key === 'F2') setIsAltPressed(true); + }; + + const handleKeyUp = (e) => { + if (e.key === 'F2') setIsAltPressed(false); + }; + + window.addEventListener('keydown', handleKeyDown); + window.addEventListener('keyup', handleKeyUp); + + return () => { + window.removeEventListener('keydown', handleKeyDown); + window.removeEventListener('keyup', handleKeyUp); + }; + }, []); + // Outside click handler for quantity edit useEffect(() => { @@ -302,7 +322,6 @@ const ComboSalesBillTable = () => { event.preventDefault(); handleShortcut('weightAmount'); } - }; window.addEventListener('keydown', handleKeyDown); @@ -1158,9 +1177,9 @@ const ComboSalesBillTable = () => { )?.map((item, idx) => idx === 0 ? { - ...item, - FreeQty, - } + ...item, + FreeQty, + } : item ), }; @@ -2098,7 +2117,9 @@ const ComboSalesBillTable = () => { const visibleCols = tableOptions?.filter((opt) => - ['Item', 'Quantity', 'Rate', 'Total'].includes(opt.OptionName) + ['Item', 'Quantity', 'Rate', 'Total', 'Delete'].includes( + opt.OptionName + ) ) || []; // Arrow Up/Down - Row navigation @@ -2153,9 +2174,12 @@ const ComboSalesBillTable = () => { e.preventDefault(); const row = combinedTableData[activeRowIndex]; const col = visibleCols[activeColIndex]; - if (row && col && editField) { - if (col.OptionName === 'Quantity') handleEditQuantityCombo(row); - else if (col.OptionName === 'Rate') handleEditRateCombo(row); + if (row && col) { + if (col.OptionName === 'Quantity' && editField) + handleEditQuantityCombo(row); + else if (col.OptionName === 'Rate' && editField) + handleEditRateCombo(row); + else if (col.OptionName === 'Delete') removeFromCart(row); } } }; @@ -2216,19 +2240,26 @@ const ComboSalesBillTable = () => { {/* Quantity */} {item.OptionName === 'Quantity' && ( - - tableData?.length > 0 && OpenEditTotalAmount() - } + - {!isMobile ? ( - Qty - ) : ( -
Qty
- )} - + + tableData?.length > 0 && OpenEditTotalAmount() + } + > + {!isMobile ? ( + Qty + ) : ( +
Qty
+ )} + +
)} {/* Rate */} @@ -2371,20 +2402,20 @@ const ComboSalesBillTable = () => { tableDataDinein?.length >= PreviousdataLength ? 'wheat' : BookingType !== 'Dine In' && - triggerAnimation && - OldtableDataTakeAway?.length + index === 0 && - tableDataDinein?.length >= PreviousdataLength && - !HoldOrderDtl && - !UnpaidData + triggerAnimation && + OldtableDataTakeAway?.length + index === 0 && + tableDataDinein?.length >= PreviousdataLength && + !HoldOrderDtl && + !UnpaidData ? 'wheat' : 'inherit' : 'none', background: row?.SalesId ? 'rgb(243, 248, 213)' : GlobEstBooking === 'ParEst' && - GlobProdwisedata?.includes( - row?.InwardDtlId + ' ' + row?.BookingTypeName - ) + GlobProdwisedata?.includes( + row?.InwardDtlId + ' ' + row?.BookingTypeName + ) ? '#b2d1f7' : (OldtableDataTakeAway?.length + index) % 2 === 0 ? 'white' @@ -2407,7 +2438,7 @@ const ComboSalesBillTable = () => { const isActiveCell = activeRowIndex === index && activeColIndex !== null && - ['Item', 'Quantity', 'Rate', 'Total'].indexOf( + ['Item', 'Quantity', 'Rate', 'Total', 'Delete'].indexOf( item.OptionName ) === activeColIndex; @@ -2427,37 +2458,44 @@ const ComboSalesBillTable = () => { {/* Product Name / Item */} {(item.OptionName === 'Item' || item.OptionName === 'Product Name') && ( - - row.FullProductIdentifierDtls?.length > 0 || - row.ProductIdentifierDtls?.length > 0 - ? handleImeiDetails(row) - : editField && handleEditQuantity(row) - } - > - {row?.Type !== 'OS' ? row.ProdName : row.ServiceName} - {row?.BrandName ? ` ${row.BrandName}` : ''} - {row?.Type !== 'C' && ( -

- {/* {row?.ProdVariantName} {row?.Size} {row?.UomName} */} - ( - {!row?.ProdVariantName?.toLowerCase()?.includes( - 'variant' - ) && {row?.ProdVariantName} } - {row?.Size} - {row?.SinglePc == 'Y' ? 'PCS' : row?.UomName}) + + row.FullProductIdentifierDtls?.length > 0 || + row.ProductIdentifierDtls?.length > 0 + ? handleImeiDetails(row) + : editField && handleEditQuantity(row) + } + > + {row?.Type !== 'OS' ? row.ProdName : row.ServiceName} + {row?.BrandName ? ` ${row.BrandName}` : ''} + {row?.Type !== 'C' && ( +

+ {/* {row?.ProdVariantName} {row?.Size} {row?.UomName} */} + ( + {!row?.ProdVariantName?.toLowerCase()?.includes( + 'variant' + ) && {row?.ProdVariantName} } + {row?.Size} + {row?.SinglePc == 'Y' ? 'PCS' : row?.UomName}) +

+ )} + {row?.Type === 'C' && + row.ProdDetail?.map((prod, idx) => ( +

+ {prod.ProdName} - {prod.Size} {prod.UomName}

- )} - {row?.Type === 'C' && - row.ProdDetail?.map((prod, idx) => ( -

- {prod.ProdName} - {prod.Size} {prod.UomName} -

- ))} - - )} + ))} + + )} {/* Barcode */} {item.OptionName === 'Barcode' && ( @@ -2484,28 +2522,29 @@ const ComboSalesBillTable = () => { }} key={`qty-${index}`} tabIndex={0} - className={`${EditQtyCombo && row?.localId === Index - ? 'EditQTYcomboTD' - : 'qtyTd' - } ${isActiveCell ? 'active-cell' : ''}`} - onClick={() => - editField && handleEditQuantityCombo(row) - } + className={`${ + EditQtyCombo && row?.localId === Index + ? 'EditQTYcomboTD' + : 'qtyTd' + } ${isActiveCell ? 'active-cell' : ''}`} + onClick={() => + editField && handleEditQuantityCombo(row) + } > {(!EditQtyCombo || row?.localId !== Index) && ( <>{row.OrderQty} )} {EditQtyCombo && row?.localId === Index && ( - )} @@ -2518,24 +2557,24 @@ const ComboSalesBillTable = () => { className={`${EditRateCombo ? 'rateTdEditRate' : 'rateTd'} ${isActiveCell ? 'active-cell' : ''}`} onClick={() => editField && handleEditRateCombo(row)} > - {!EditRateCombo || row?.localId !== Index ? ( + {!EditRateCombo || row?.localId !== Index ? ( <> {allowDecimal ? Number(row?.OrderRate).toFixed(2) : Number(row?.OrderRate)} - ) : null} + ) : null} {EditRateCombo && row?.localId === Index && ( - )} @@ -2550,9 +2589,9 @@ const ComboSalesBillTable = () => { > {row?.Offer > 0 ? `${( - (row.Offer / (row?.OrderQty * row?.OrderRate)) * - 100 - ).toFixed(2)}%` + (row.Offer / (row?.OrderQty * row?.OrderRate)) * + 100 + ).toFixed(2)}%` : '-'} )} @@ -2584,8 +2623,8 @@ const ComboSalesBillTable = () => { > {allowDecimal ? Number(row.TotalAmt - (row?.Offer || 0)).toFixed( - 2 - ) + 2 + ) : Number(row.TotalAmt - (row?.Offer || 0))} )} @@ -2625,11 +2664,15 @@ const ComboSalesBillTable = () => { {/* Delete */} {item.OptionName === 'Delete' && ( - + removeFromCart(row)} style={{ - color: '#FF4D4F', + color: isActiveCell ? '#fff' : '#FF4D4F', cursor: 'pointer', textAlign: 'center', width: '100%', diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.scss b/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.scss index 5c1975d..d881f7e 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.scss +++ b/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.scss @@ -28,9 +28,9 @@ } tbody { - >tr:last-child { + > tr:last-child { // background-color: #e5d434 !important; - background-color: #ffffff !important; + background-color: #dde9ff !important; position: sticky; bottom: 0; } @@ -207,7 +207,7 @@ box-shadow: 0 0 5px rgba(255, 193, 7, 0.5); } - -:where(.css-dev-only-do-not-override-mncuj7).ant-select-dropdown .ant-select-item-option-active:not(.ant-select-item-option-disabled) { +:where(.css-dev-only-do-not-override-mncuj7).ant-select-dropdown + .ant-select-item-option-active:not(.ant-select-item-option-disabled) { background-color: rgba(116, 107, 107, 0.356); -} \ No newline at end of file +} diff --git a/src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx b/src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx index 5c7f72a..4379a9c 100644 --- a/src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx +++ b/src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx @@ -41,7 +41,7 @@ import UserRelieveManager from '../../Template/RealivingUser.jsx'; import BSNavBarUserInfo from '../BSNavbar/BSNavBarUserInfo.jsx'; import BSScanTemplate from '../UtillComponents/BSScanTemplate.jsx'; import { RiFullscreenExitFill, RiFullscreenFill } from 'react-icons/ri'; -import { Tooltip } from 'antd'; +import { Popconfirm, Tooltip } from 'antd'; import { FaCaretDown } from 'react-icons/fa'; const subDirectory = import.meta.env.ENV_BASE_URL; @@ -253,11 +253,17 @@ const BSC1NavBar = (props) => { >
- + + + {' '}
diff --git a/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx b/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx index c11959d..477d529 100644 --- a/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx @@ -3,7 +3,7 @@ import { FaWhatsapp, FaPrint, FaParking } from 'react-icons/fa'; import { useDispatch, useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; import moment from 'moment'; -import { Badge, Popover, Modal } from 'antd'; +import { Badge, Popover, Modal, Tooltip } from 'antd'; import { AiOutlineClose, AiOutlineArrowRight } from 'react-icons/ai'; import { GiBasket } from 'react-icons/gi'; import { @@ -573,6 +573,27 @@ const BSC1Payment = (props) => { ), '11111111111111' ); + + const [isAltPressed, setIsAltPressed] = useState(false); + + useEffect(() => { + const handleKeyDown = (e) => { + if (e.key === 'F2') setIsAltPressed(true); + }; + + const handleKeyUp = (e) => { + if (e.key === 'F2') setIsAltPressed(false); + }; + + window.addEventListener('keydown', handleKeyDown); + window.addEventListener('keyup', handleKeyUp); + + return () => { + window.removeEventListener('keydown', handleKeyDown); + window.removeEventListener('keyup', handleKeyUp); + }; + }, []); + // Usage useEffect(() => { const setDefaultPaymentOption = async () => { @@ -3551,32 +3572,45 @@ const BSC1Payment = (props) => { {BSComboNavbar?.[1]?.map((item) => ( <> {item?.OptionName == 'QuickAdd' && ( - -
- + +
- Quick Add - +
- (Alt + N) - + Quick Add + {!isAltPressed && ( + + (Alt + N) + + )} +
-
-
+ + )} {item?.OptionName == 'DineIn' && DineInPreference?.SettingValue === 'Y' && @@ -3662,61 +3696,86 @@ const BSC1Payment = (props) => {
)} {item?.OptionName == 'ExtraCharge' && ( - -
-
- - {/* EXTRA CHARGE */} - Extra Charge -
- -
- (Alt + A) -
-
-
- )} - {item?.OptionName == 'RePrint' && ( - -
+ +
- - Re-Print - - (Alt + R) - +
+ + {/* EXTRA CHARGE */} + Extra Charge +
+ + {!isAltPressed && ( +
+ (Alt + A) +
+ )}
-
-
+ + + )} + {item?.OptionName == 'RePrint' && ( + + +
+
+ + Re-Print + {!isAltPressed && ( + + (Alt + R) + + )} +
+
+
+
)} ))} @@ -4209,32 +4268,39 @@ const BSC1Payment = (props) => { OrderType != 'Failed' && CheckBookingStatus != 'Close' && !addnewAccess && ( - - {' '} -
- AddBookingDetails('Hold')} + + + {' '} +
{' '} - {/*

Hold

*/} -
-
+ > + AddBookingDetails('Hold')} + style={{ + cursor: 'pointer', + // color: '' ? '#52c41a' : '#1292EE', + }} + />{' '} + {/*

Hold

*/} +
+
+ ) : ''} @@ -4542,101 +4608,119 @@ const BSC1Payment = (props) => { {BSComboData?.BookingBilling?.[1]?.map((item) => ( <> {item?.OptionName == 'AddCustomer' && !preOrderOpen && ( -
- - -
- -
-
-
+
+ + +
+ +
+
+
+ )} ))}
- - - +
ORDER
+ )} + + + diff --git a/src/Pages/BookingScreen/Components/BSCombo/BSC1Search.jsx b/src/Pages/BookingScreen/Components/BSCombo/BSC1Search.jsx index 76097ab..c30c8a4 100644 --- a/src/Pages/BookingScreen/Components/BSCombo/BSC1Search.jsx +++ b/src/Pages/BookingScreen/Components/BSCombo/BSC1Search.jsx @@ -83,7 +83,7 @@ import { useSaleswiseOfferWatcher } from '../BSItemCards/SalesWiseOffer.jsx'; import ExpireConfirmModal from '../BookingFunctionality/ExpireConfirmModal.jsx'; export default function BSC1Search(props) { - const dispatch = useDispatch(); + const dispatch = useDispatch(); const searchPromiseRef = useRef(null); const debounceTimerRef = useRef(null); const SessionData = useSelector(StoredSessionData); @@ -4761,7 +4761,7 @@ export default function BSC1Search(props) {
-
+
diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx index d1ebc47..a0b2f90 100644 --- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx +++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx @@ -10,6 +10,7 @@ import { GlobalCompBranchData } from '../../../../Features/BrachLogin/BranchLogi import { userDataByUserId } from '../../../../Features/UserAccount/userData'; import { useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; +import "../../../../Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss" const subDirectory = import.meta.env.ENV_BASE_URL; const BSNavBarUserInfo = ({ diff --git a/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx b/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx index d67a25f..7036e02 100644 --- a/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx +++ b/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx @@ -66,7 +66,7 @@ import BSExpireProductsList from '../../Components/UtillComponents/BSExpireProdu import ComboSalesBillTable from '../../Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx'; import { GiBasket } from 'react-icons/gi'; import { FaRegKeyboard } from 'react-icons/fa'; -import { CgSearchLoading } from "react-icons/cg"; +import { CgSearchLoading } from 'react-icons/cg'; import { DefaultModal } from '../../../../Components/Modal/DefaultModal.jsx'; import MultipleSearch from '../../Components/UtillComponents/MultipleSearch.jsx'; import VerfiedProducts from '../../Components/BSNavbar/verfiedProduct/VerfiedProducts.jsx'; @@ -134,10 +134,30 @@ export default function BSCombo1() { ?.ScreenStatus ?? 'Open'; const [BookingModalOpen, setBookingModalOpen] = useState(false); const currentDateValue = moment().format('YYYY-MM-DD HH:mm:ss'); - + const [ListOfInvoices, setListOfInvoices] = useState(false); const [ComboDropDown, setComboDropDown] = useState(); + const [isAltPressed, setIsAltPressed] = useState(false); + + useEffect(() => { + const handleKeyDown = (e) => { + if (e.key === 'F2') setIsAltPressed(true); + }; + + const handleKeyUp = (e) => { + if (e.key === 'F2') setIsAltPressed(false); + }; + + window.addEventListener('keydown', handleKeyDown); + window.addEventListener('keyup', handleKeyUp); + + return () => { + window.removeEventListener('keydown', handleKeyDown); + window.removeEventListener('keyup', handleKeyUp); + }; + }, []); + useEffect(() => { fetchAmount(); if ( @@ -149,7 +169,6 @@ export default function BSCombo1() { } }, [SessionData]); - useEffect(() => { Combodata(); if (AppId && CompId && BranchId && UserId) { @@ -185,7 +204,6 @@ export default function BSCombo1() { await dispatch(getSalesDetailData(data)).unwrap(); }; - const openModalKiosk = () => { setKioskopen(true); }; @@ -284,8 +302,10 @@ export default function BSCombo1() { /> {UserType != 'Super Admin' && UserType != 'Super Admin User' && - (AppExpDate?.RemainingDays <= 7 || AppExpDate === 'undefined' || AppExpDate?.PlanType?.toLowerCase() === 'extend') && ( - + (AppExpDate?.RemainingDays <= 7 || + AppExpDate === 'undefined' || + AppExpDate?.PlanType?.toLowerCase() === 'extend') && ( + )} {/* Combo Container */} @@ -295,25 +315,38 @@ export default function BSCombo1() {
{/* Multiple search */} -
+
setMultiple(true)} />
- {Comboglobal === false && ( - + + + )} {Comboglobal === true && ( -
-
-
- + +
+
+
+ +
-
+ )} {/*
*/} @@ -434,7 +467,10 @@ export default function BSCombo1() { )} {/* Verify Products */} {VerifyTheProducts && ( - +
@@ -562,9 +598,7 @@ export default function BSCombo1() { destroyOnClose={true} children={ <> - + } /> diff --git a/src/Pages/BookingScreen/Template/RetailBookingClosing.scss b/src/Pages/BookingScreen/Template/RetailBookingClosing.scss index 9033133..a62166b 100644 --- a/src/Pages/BookingScreen/Template/RetailBookingClosing.scss +++ b/src/Pages/BookingScreen/Template/RetailBookingClosing.scss @@ -11,7 +11,7 @@ border-radius: 6px; cursor: pointer; font-weight: 700; - font-family: 'Poppins' !important; + font-family: "Poppins" !important; align-items: center; gap: 5px; height: 30px; @@ -31,7 +31,7 @@ color: #000000; font-size: 14px; font-weight: 500; - font-family: 'Poppins'; + font-family: "Poppins"; } .Retail-PaymentCloseButtondiv { display: flex; @@ -40,5 +40,38 @@ .Retail-PaymentClose-Title { font-size: 16px; font-weight: 600; - font-family: 'Gilroy' !important; + font-family: "Gilroy" !important; +} + +.PaymentCloseButtondiv { + display: flex; + justify-content: flex-end; +} + +.PaymentCloseButton { + font-size: 12px; + border: none; + padding: 2px 5px; + border-radius: 6px; + cursor: pointer; + font-weight: 400; + font-family: "Poppins" !important; + align-items: center; + gap: 5px; + height: 30px; + background-color: #f62121; + color: #fff; + width: 150px; +} +.PaymentClosingOverAll-sub { + color: #000000; + font-size: 14px; + font-weight: 500; + font-family: "Poppins"; + width: 250px; + div { + display: flex; + align-items: center; + justify-content: space-between; + } } diff --git a/src/Pages/BookingScreen/Template/SalesCountComponent.jsx b/src/Pages/BookingScreen/Template/SalesCountComponent.jsx index 2fa0f76..99b6ce3 100644 --- a/src/Pages/BookingScreen/Template/SalesCountComponent.jsx +++ b/src/Pages/BookingScreen/Template/SalesCountComponent.jsx @@ -86,13 +86,12 @@ const SalesCountComponent = React.memo( type?.PreferredStatus === 'Y' ); const preferenceshortcutkey = preferencedata?.[0]?.[ - 'SettingDtlDetails' - ]?.some( - (item) => - item.SettingIdName.toLowerCase() === 'shortcutkeys' && - item.SettingValue === 'Y' - ); - + 'SettingDtlDetails' + ]?.some( + (item) => + item.SettingIdName.toLowerCase() === 'shortcutkeys' && + item.SettingValue === 'Y' + ); const [messageType, setMessageType] = useState(null); const [messageData, setMessageData] = useState(null); @@ -122,6 +121,26 @@ const SalesCountComponent = React.memo( const startIndex = (currentPage - 1) * rowsPerPage; const currentData = bookings?.slice(startIndex, startIndex + rowsPerPage); + const [isAltPressed, setIsAltPressed] = useState(false); + + useEffect(() => { + const handleKeyDown = (e) => { + if (e.key === 'F2') setIsAltPressed(true); + }; + + const handleKeyUp = (e) => { + if (e.key === 'F2') setIsAltPressed(false); + }; + + window.addEventListener('keydown', handleKeyDown); + window.addEventListener('keyup', handleKeyUp); + + return () => { + window.removeEventListener('keydown', handleKeyDown); + window.removeEventListener('keyup', handleKeyUp); + }; + }, []); + console.log(dailySalesData, 'dailySalesDatadailySalesData', bookings); function safeRound(amountStr) { @@ -238,7 +257,7 @@ const SalesCountComponent = React.memo( }) ); } else { - setTableData([]); + setTableData([]); console.warn('API returned unsuccessful status', response); } } catch (error) { @@ -270,9 +289,7 @@ const SalesCountComponent = React.memo( key: 'RequestId', align: 'center', width: '70px', - render: (text, record, index) => ( - record?.RequestId?.split('-')?.pop() - ), + render: (text, record, index) => record?.RequestId?.split('-')?.pop(), }, { title: 'Date & Time', @@ -362,13 +379,14 @@ const SalesCountComponent = React.memo( className="sr-stock-recieve-button" title="Receive Stock" onClick={() => handleModalOpen(index)} - > Receive + > + {' '} + Receive -
), - } + }, ]; const handlePageChange = (current) => { setpage(current); @@ -1079,26 +1097,34 @@ const SalesCountComponent = React.memo(
- - {TableData?.length > 0 && AutoReceiveStock && ( - - )} - + + {TableData?.length > 0 && AutoReceiveStock && ( + + )} +
{/* {preferenceshortcutkey && } */} {preferenceshortcutkey && ( -
- -
)} +
+ +
+ )} - + + + { @@ -1107,7 +1133,7 @@ const SalesCountComponent = React.memo( columns={columns} tableData={TableData} handlePageChange={handlePageChange} - customTable={false} + customTable={false} /> thead { position: sticky; @@ -298,7 +296,6 @@ font-size: 12px !important; } - .custom-table tbody tr td { text-align: left; @@ -307,7 +304,7 @@ } } -.custom-table tbody tr td[colspan='7'] { +.custom-table tbody tr td[colspan="7"] { padding: 20px; } @@ -351,8 +348,6 @@ } } - - .custom-table { Button:disabled, Button[disabled] { @@ -362,20 +357,18 @@ } } - - .openingStock-ignoreProductBTN { - width: max-content; - white-space: nowrap; - height: max-content; - padding: 10px 16px; - color: #fff; - border-radius: 8px; - cursor: pointer; - border: none; - background-color: #e42006; - font-size: 14px; - font-weight: 400; - font-family: "Poppins"; - margin-left: 6px; + width: max-content; + white-space: nowrap; + height: max-content; + padding: 10px 16px; + color: #fff; + border-radius: 8px; + cursor: pointer; + border: none; + background-color: #e42006; + font-size: 14px; + font-weight: 400; + font-family: "Poppins"; + margin-left: 6px; } diff --git a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss index 1cd3d48..1fd1c43 100644 --- a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss +++ b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss @@ -999,6 +999,10 @@ .Tbl3-Variant { font-size: 10px; } +.Tbl3VariantActve{ + color: #000; + font-size: 11px; +} .css-w9q2zk-Input2 { color: black !important; diff --git a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss index 796bc42..89e2601 100644 --- a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss +++ b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss @@ -505,3 +505,39 @@ display: flex; } } + +.salesUserProfile { + display: flex; + align-items: center; + gap: 6px; + flex-direction: column; + padding: 10px 1rem; + font-family: "Poppins"; + + > div { + width: 100%; + font-size: 14px; + display: flex; + align-items: center; + gap: 10px; + } + + .BSNavBar1-Acc-menu-list { + padding: 6px 10px; + background-color: #ee0000; + color: #fff; + border-radius: 6px; + cursor: pointer; + display: flex; + align-items: center; + gap: 1rem; + } + + img { + width: 70px; + height: 70px; + border-radius: 1000px; + border: 1px solid #a1a1a1; + background-position: center; + } +} diff --git a/src/Styles/BookingScreen/Template/BSLayout7/BSC1Search.scss b/src/Styles/BookingScreen/Template/BSLayout7/BSC1Search.scss index 0eed9be..38662f4 100644 --- a/src/Styles/BookingScreen/Template/BSLayout7/BSC1Search.scss +++ b/src/Styles/BookingScreen/Template/BSLayout7/BSC1Search.scss @@ -6,9 +6,7 @@ width: 100%; display: flex; flex-direction: row; - /* padding: 0.5rem 22px 0 1.5rem; */ gap: 0.5rem; - /* padding-bottom: 8px; */ align-items: center; justify-content: center; padding: 4px 8px; @@ -49,9 +47,7 @@ align-items: center; justify-content: center; } -.BSC1Search-div1 - .ant-select:not(.ant-select-customize-input) - .ant-select-selector { +.BSC1Search-div1 .ant-select:not(.ant-select-customize-input) .ant-select-selector { border: none; height: 35px; } @@ -75,17 +71,11 @@ background-color: var(--ERROR_COLOR); border: none; font-size: 15px; - font-family: 'Poppins', sans-serif; + font-family: "Poppins", sans-serif; font-weight: 600; color: #fff; cursor: pointer; } -// .BSC1Search-button1:hover{ -// opacity: 0.5; -// } -// .BSC1Search-button1:focus{ -// background-color: var(--DEFAULT_SELECTED_COLOR); -// } .BSC1Search-button2 { width: 100px; height: 57px; @@ -93,7 +83,7 @@ background-color: #dddddd; border: none; font-size: 15px; - font-family: 'Poppins', sans-serif; + font-family: "Poppins", sans-serif; font-weight: 600; cursor: pointer; opacity: 1; @@ -146,3 +136,9 @@ padding: 0.3rem; } } + +.StockVariantModal { + height: 40vh; + overflow: auto; + scrollbar-width: thin; +} diff --git a/src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss b/src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss index ebf5bd9..f12e48f 100644 --- a/src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss +++ b/src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss @@ -485,9 +485,15 @@ width: 32px; height: 32px; margin-right: unset !important; - + outline: none !important; + border: none; + border-radius: 4px; + padding: 2px; + cursor: pointer; img { filter: invert(1); + width: 25px !important; + height: 25px !important; } } @@ -638,6 +644,10 @@ svg { color: #fff !important; } + img { + width: 20px !important; + height: 20px !important; + } } .RiVerifiedBadgeFill { @@ -690,3 +700,24 @@ font-size: 10px !important; } } + +.MultiSearchIconDiv3 { + background-color: #ffffff; + color: #1292ee !important; + border-radius: 4px; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + width: 32px !important; + height: 32px; + padding: 4px; + + svg { + font-size: 22px; + width: 32px !important; + height: 32px; + + display: flex; + } +} diff --git a/src/Styles/Reports/Denomination/Denomination.scss b/src/Styles/Reports/Denomination/Denomination.scss index 999c987..9fc948a 100644 --- a/src/Styles/Reports/Denomination/Denomination.scss +++ b/src/Styles/Reports/Denomination/Denomination.scss @@ -105,7 +105,8 @@ width: 100%; text-align: end; font-size: 16px; - font-weight: 700; + font-weight: 500; + font-family: "Poppins"; padding: 0.5rem 0; } .Denomination-ul {