diff --git a/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx b/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx index a4e883c..a461a73 100644 --- a/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx +++ b/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx @@ -68,8 +68,9 @@ import ComboSalesBillTable from '../../Components/BSBillingTables/ComboSalesBill import { GiBasket } from 'react-icons/gi'; import { FaRegKeyboard } from 'react-icons/fa'; import { CgSearchLoading } from "react-icons/cg"; - import { DefaultModal } from '../../../../Components/Modal/DefaultModal.jsx'; +import { DefaultModal } from '../../../../Components/Modal/DefaultModal.jsx'; import MultipleSearch from '../../Components/UtillComponents/MultipleSearch.jsx'; +import VerfiedProducts from '../../Components/BSNavbar/verfiedProduct/VerfiedProducts.jsx'; const subDirectory = import.meta.env.BASE_URL; const commonDirectory = import.meta.env.COMMON_BASE_URL; @@ -114,6 +115,11 @@ export default function BSCombo1() { const DineInAccess = SettingDataSelector?.[0]?.SettingDtlDetails.filter( (i) => i.SettingIdName === 'DineIn' )?.[0]; + const VerifyTheProducts = SettingDataSelector?.[0]?.SettingDtlDetails?.find( + (item) => + item.SettingIdName === 'VerifyProduct' && item?.SettingValue === 'Y' + ); + const AppName = SessionData?.AppName; const AppId = SessionData?.AppId; const CompId = SessionData?.CompId; @@ -299,7 +305,7 @@ export default function BSCombo1() { AppExpDate?.RemainingHours < 1 && AppExpDate?.RemainingMinutes < 1 && AppExpDate?.RemainingSeconds < 1) || - AppExpDate === 'undefined' ? ( + AppExpDate === 'undefined' ? ( Subscription expired  
- setMultiple(true)} /> + setMultiple(true)} />
@@ -494,6 +500,14 @@ export default function BSCombo1() { )} + {/* Verify Products */} + {VerifyTheProducts && ( + +
+ +
+
+ )}
div { + >div { width: 100%; font-size: 14px; display: flex; diff --git a/src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss b/src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss index 5444a46..9aa23aa 100644 --- a/src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss +++ b/src/Styles/BookingScreen/Template/BSLayout7/Combo1.scss @@ -101,6 +101,7 @@ padding-bottom: 10rem !important; padding: 0 3px; } + .BS1ComboTableComboSalesBillTable { height: 100%; overflow: auto; @@ -398,9 +399,11 @@ .overall-bscombo-container { overflow: hidden; + .BSC1Search-div1 { height: 45px !important; } + .ant-select-selection-search { top: 10px !important; } @@ -464,9 +467,7 @@ height: 10px; } -.overall-bscombo-container.BSC1Search-div1 - .ant-select:not(.ant-select-customize-input) - .ant-select-selector { +.overall-bscombo-container.BSC1Search-div1 .ant-select:not(.ant-select-customize-input) .ant-select-selector { width: 100%; } @@ -480,20 +481,24 @@ .ComboSubNavbar { flex-wrap: nowrap !important; + @media (max-width: 1024px) { overflow: auto; padding-bottom: 5px; } + .price-change-btn { background-color: #1292ee; color: #fff !important; width: 32px; height: 32px; margin-right: unset !important; + img { filter: invert(1); } } + .pricing-name-details { margin-left: unset; display: flex; @@ -513,9 +518,11 @@ justify-content: space-between; width: 100%; padding: 0 6px; + .SalesCountComponent-Master { width: unset; gap: 10px; + p { font-size: 13px !important; } @@ -530,52 +537,64 @@ .billtable3th { padding: 3px !important; } + .del-all-btn { padding: 0.2rem 0.1rem; } + .BSBill-Table3-throw { height: 2rem; } + .BSBilling3-tablediv { tr { height: 28px; } - th > span { + + th>span { font-size: 14px !important; + @media (max-width: 500px) { font-size: 12px !important; } } + td:nth-child(2) { display: flex; align-items: center; gap: 10px; } + td:nth-child(3), th:nth-child(3) { width: 100px !important; text-align: right; } + td:nth-child(4), th:nth-child(4) { width: 100px !important; text-align: center; } + td:nth-child(5), th:nth-child(5) { width: 100px !important; text-align: center; } + td:nth-child(6), th:nth-child(6) { width: 100px !important; text-align: right; } + td:nth-child(7), th:nth-child(7) { width: 100px !important; text-align: right; } + td:nth-child(8), th:nth-child(8) { width: 40px !important; @@ -592,6 +611,7 @@ display: flex; align-items: center; justify-content: center; + svg { width: 25px !important; height: 25px !important; @@ -600,8 +620,7 @@ } .SearchSubnavbar-combo { - @media (max-width: 1024px) { - } + @media (max-width: 1024px) {} } .combuSubNavbarRightSide { @@ -619,11 +638,24 @@ align-items: center; justify-content: center; color: #fff; + svg { color: #fff !important; } } + + .RiVerifiedBadgeFill { + width: 32px; + height: 32px; + background-color: #1292ee; + border-radius: 6px; + display: flex; + align-items: center; + justify-content: center; + padding: 5px; + } } + .keyboardShortcut { width: 32px; height: 32px; @@ -634,4 +666,4 @@ justify-content: center; cursor: pointer; color: #fff; -} +} \ No newline at end of file