From f69788cde15f00f20ee7479c1dad74de585428c1 Mon Sep 17 00:00:00 2001 From: Srinath Date: Thu, 5 Feb 2026 15:52:03 +0530 Subject: [PATCH 1/5] Preference align set --- src/Pages/Preference/PreferenceList.jsx | 85 ++++++++++++------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/src/Pages/Preference/PreferenceList.jsx b/src/Pages/Preference/PreferenceList.jsx index 614f123..abddc94 100644 --- a/src/Pages/Preference/PreferenceList.jsx +++ b/src/Pages/Preference/PreferenceList.jsx @@ -471,10 +471,6 @@ const PreferenceList = () => { 'dashboard', 'Stay on the Dashboard when you open the app?' )} - {renderCheckbox( - 'shortcutkeys', - 'Would you like to enable the shortcut keys?' - )} {renderCheckbox( 'autoreceivestock', 'Items received from godown. Add to stock Automatically ?' @@ -483,44 +479,6 @@ const PreferenceList = () => { 'decimal', 'Display values with 2 decimal places throughout the app?' )} - - {((allSettingsMap['dinein'] !== undefined && dinePreference) || - allSettingsMap['estimation'] !== undefined) && ( - - - {allSettingsMap['dinein'] !== undefined && - dinePreference && ( - Dine-In - )} - {allSettingsMap['estimation'] !== undefined && ( - Estimation - )} - - - )} - {(allSettingsMap['onbilltime'] !== undefined || - allSettingsMap['1daybefore'] !== undefined || - allSettingsMap['1hourbefore'] !== undefined) && ( - - - {allSettingsMap['onbilltime'] !== undefined && ( - On Bill Time - )} - {allSettingsMap['1daybefore'] !== undefined && ( - 1 Day Before - )} - {allSettingsMap['1hourbefore'] !== undefined && ( - 1 Hour Before - )} - - - )} {(allSettingsMap['onlineindividualslots'] !== undefined || allSettingsMap['allow individual booking'] !== undefined || allSettingsMap['single booking only'] !== undefined) && ( @@ -571,6 +529,26 @@ const PreferenceList = () => { 'notificationblink', 'Do you want to enable the low-stock blink notification?' )} + {(allSettingsMap['onbilltime'] !== undefined || + allSettingsMap['1daybefore'] !== undefined || + allSettingsMap['1hourbefore'] !== undefined) && ( + + + {allSettingsMap['onbilltime'] !== undefined && ( + On Bill Time + )} + {allSettingsMap['1daybefore'] !== undefined && ( + 1 Day Before + )} + {allSettingsMap['1hourbefore'] !== undefined && ( + 1 Hour Before + )} + + + )}
{ Sales Page
{renderCheckbox('searchfocus', 'Always focus the search bar?')} + {renderCheckbox( + 'shortcutkeys', + 'Would you like to enable the shortcut keys?' + )} {renderCheckbox( 'addproductcard', 'Would you like to remove Add Product card from sales page ?' @@ -607,6 +589,23 @@ const PreferenceList = () => { )} + {((allSettingsMap['dinein'] !== undefined && dinePreference) || + allSettingsMap['estimation'] !== undefined) && ( + + + {allSettingsMap['dinein'] !== undefined && + dinePreference && ( + Dine-In + )} + {allSettingsMap['estimation'] !== undefined && ( + Estimation + )} + + + )} {renderCheckbox('stockselection', 'Enable stock selection?')} {renderCheckbox('weightasquantity', 'Use Weight as Quantity?')} @@ -628,6 +627,7 @@ const PreferenceList = () => { 'customisedbillnumber', 'Do you Want Customised Bill Number?' )} + {renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')} {renderCheckbox('upiqr', 'Do you want to show the UPI QR code?')} {/* {renderCheckbox('editbill', 'Do you want to edit the previously created bill?')} */} @@ -750,7 +750,6 @@ const PreferenceList = () => { 'Do you want to include a header when printing Estimate bills?' )} - {renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
Date: Thu, 5 Feb 2026 15:53:34 +0530 Subject: [PATCH 2/5] Preferenec button fix one place --- src/Pages/Preference/PreferenceList.scss | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/Pages/Preference/PreferenceList.scss b/src/Pages/Preference/PreferenceList.scss index 4f7302a..747f92b 100644 --- a/src/Pages/Preference/PreferenceList.scss +++ b/src/Pages/Preference/PreferenceList.scss @@ -18,7 +18,7 @@ color: #1890ff; // Ant Design blue } - .ant-form-item-label > label { + .ant-form-item-label>label { font-weight: 500; color: #000000; font-size: 16px; @@ -62,7 +62,7 @@ .submitButton { position: unset; - > button { + >button { width: max-content; bottom: 30px; } @@ -83,7 +83,7 @@ .menu-section { padding: 10px 0; - > div { + >div { font-family: "Poppins"; font-weight: 400; font-size: 14px; @@ -109,15 +109,19 @@ gap: 0; width: 80%; } + .preferences-list { max-height: 80vh; width: 95%; + .preference-headers { font-size: 1rem; } - .ant-form-item-label > label { + + .ant-form-item-label>label { font-size: 14px; } + .ant-checkbox-wrapper { font-size: 13px; } @@ -137,7 +141,7 @@ margin: 0; text-decoration: underline; - > div { + >div { font-size: 12px; margin: 0; background-color: unset; @@ -149,13 +153,18 @@ } } } + .PreferencesBTN { display: flex; align-items: flex-start; justify-content: flex-end; width: 100%; margin-top: 1rem; + position: fixed; + bottom: 1.3rem; + right: 2.5rem; + .primary_Button { width: 200px !important; } -} +} \ No newline at end of file From c3529a07f7d8f6572d17ca375a507713e732f491 Mon Sep 17 00:00:00 2001 From: Srinath Date: Thu, 5 Feb 2026 15:55:58 +0530 Subject: [PATCH 3/5] Shortcut icon style --- .../Components/UtillComponents/ShortcutKeyHelper.jsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx b/src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx index b314106..9166a96 100644 --- a/src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx +++ b/src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx @@ -2,10 +2,8 @@ import React, { useState } from 'react'; import { List, Typography, Tooltip } from 'antd'; import { FaKeyboard } from 'react-icons/fa'; import { DefaultModal } from '../../../../Components/Modal/DefaultModal'; - const { Title, Text } = Typography; - -const ShortcutKeyHelper = ({}) => { +const ShortcutKeyHelper = ({ }) => { const [isModalOpen, setIsModalOpen] = useState(false); const shortcuts = [ @@ -32,8 +30,7 @@ const ShortcutKeyHelper = ({}) => { gap: '5px', padding: '5px 10px', borderRadius: '4px', - backgroundColor: '#f0f0f0', - fontSize: '14px', + fontSize: '18px', }} > From 4877e24ae1c24070fb78c64dbae86f0e2318fc49 Mon Sep 17 00:00:00 2001 From: Srinath Date: Thu, 5 Feb 2026 15:58:25 +0530 Subject: [PATCH 4/5] here removed shortcut key component --- src/Pages/BookingScreen/Template/SalesCountComponent.jsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Pages/BookingScreen/Template/SalesCountComponent.jsx b/src/Pages/BookingScreen/Template/SalesCountComponent.jsx index ae2b63c..c247949 100644 --- a/src/Pages/BookingScreen/Template/SalesCountComponent.jsx +++ b/src/Pages/BookingScreen/Template/SalesCountComponent.jsx @@ -85,13 +85,7 @@ const SalesCountComponent = React.memo( type?.PreferredSubCatName?.toLowerCase() === 'take away' && type?.PreferredStatus === 'Y' ); - const preferenceshortcutkey = preferencedata?.[0]?.[ - 'SettingDtlDetails' - ]?.some( - (item) => - item.SettingIdName.toLowerCase() === 'shortcutkeys' && - item.SettingValue === 'Y' - ); + const [messageType, setMessageType] = useState(null); const [messageData, setMessageData] = useState(null); @@ -1091,7 +1085,6 @@ const SalesCountComponent = React.memo( )}
- {preferenceshortcutkey && } Date: Thu, 5 Feb 2026 15:59:16 +0530 Subject: [PATCH 5/5] here shortcut key component added --- .../Template/BSLayout7/BSCombo1.jsx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx b/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx index a461a73..162aa39 100644 --- a/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx +++ b/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx @@ -71,6 +71,7 @@ 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'; +import ShortcutKeyHelper from '../../Components/UtillComponents/ShortcutKeyHelper.jsx'; const subDirectory = import.meta.env.BASE_URL; const commonDirectory = import.meta.env.COMMON_BASE_URL; @@ -103,6 +104,13 @@ export default function BSCombo1() { preference?.PreferredSubCatName === 'SportsApp' && preference?.PreferredStatus == 'Y' ); + const preferenceshortcutkey = SettingDataSelector?.[0]?.[ + 'SettingDtlDetails' + ]?.some( + (item) => + item.SettingIdName.toLowerCase() === 'shortcutkeys' && + item.SettingValue === 'Y' + ); const [popOverOpen, setPopOverOpen] = useState(false); // const [AppExpDate, setAppExpDate] = useState(0); @@ -535,12 +543,10 @@ export default function BSCombo1() { )} - - + {preferenceshortcutkey && (
- -
- + + )} {/* */}