Merge pull request 'verify-product' (#78) from verify-product into main
Reviewed-on: Pozomind/pozo-retail-app#78
This commit is contained in:
commit
8869799267
|
|
@ -68,8 +68,9 @@ import ComboSalesBillTable from '../../Components/BSBillingTables/ComboSalesBill
|
||||||
import { GiBasket } from 'react-icons/gi';
|
import { GiBasket } from 'react-icons/gi';
|
||||||
import { FaRegKeyboard } from 'react-icons/fa';
|
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 { DefaultModal } from '../../../../Components/Modal/DefaultModal.jsx';
|
||||||
import MultipleSearch from '../../Components/UtillComponents/MultipleSearch.jsx';
|
import MultipleSearch from '../../Components/UtillComponents/MultipleSearch.jsx';
|
||||||
|
import VerfiedProducts from '../../Components/BSNavbar/verfiedProduct/VerfiedProducts.jsx';
|
||||||
|
|
||||||
const subDirectory = import.meta.env.BASE_URL;
|
const subDirectory = import.meta.env.BASE_URL;
|
||||||
const commonDirectory = import.meta.env.COMMON_BASE_URL;
|
const commonDirectory = import.meta.env.COMMON_BASE_URL;
|
||||||
|
|
@ -114,6 +115,11 @@ export default function BSCombo1() {
|
||||||
const DineInAccess = SettingDataSelector?.[0]?.SettingDtlDetails.filter(
|
const DineInAccess = SettingDataSelector?.[0]?.SettingDtlDetails.filter(
|
||||||
(i) => i.SettingIdName === 'DineIn'
|
(i) => i.SettingIdName === 'DineIn'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
const VerifyTheProducts = SettingDataSelector?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(item) =>
|
||||||
|
item.SettingIdName === 'VerifyProduct' && item?.SettingValue === 'Y'
|
||||||
|
);
|
||||||
|
|
||||||
const AppName = SessionData?.AppName;
|
const AppName = SessionData?.AppName;
|
||||||
const AppId = SessionData?.AppId;
|
const AppId = SessionData?.AppId;
|
||||||
const CompId = SessionData?.CompId;
|
const CompId = SessionData?.CompId;
|
||||||
|
|
@ -299,7 +305,7 @@ export default function BSCombo1() {
|
||||||
AppExpDate?.RemainingHours < 1 &&
|
AppExpDate?.RemainingHours < 1 &&
|
||||||
AppExpDate?.RemainingMinutes < 1 &&
|
AppExpDate?.RemainingMinutes < 1 &&
|
||||||
AppExpDate?.RemainingSeconds < 1) ||
|
AppExpDate?.RemainingSeconds < 1) ||
|
||||||
AppExpDate === 'undefined' ? (
|
AppExpDate === 'undefined' ? (
|
||||||
<span className="ExpiredMessage">
|
<span className="ExpiredMessage">
|
||||||
Subscription expired
|
Subscription expired
|
||||||
<a
|
<a
|
||||||
|
|
@ -358,7 +364,7 @@ export default function BSCombo1() {
|
||||||
{/* Multiple search */}
|
{/* Multiple search */}
|
||||||
<Tooltip title={'Multiple Search'}>
|
<Tooltip title={'Multiple Search'}>
|
||||||
<div className='MultiSearchIconDiv'>
|
<div className='MultiSearchIconDiv'>
|
||||||
<CgSearchLoading onClick={() => setMultiple(true)} />
|
<CgSearchLoading onClick={() => setMultiple(true)} />
|
||||||
</div>
|
</div>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|
||||||
|
|
@ -494,6 +500,14 @@ export default function BSCombo1() {
|
||||||
</TooltipWrapper>
|
</TooltipWrapper>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{/* Verify Products */}
|
||||||
|
{VerifyTheProducts && (
|
||||||
|
<TooltipWrapper title={'Verfied Products'} isMobile={isMobile}>
|
||||||
|
<div>
|
||||||
|
<VerfiedProducts />
|
||||||
|
</div>
|
||||||
|
</TooltipWrapper>
|
||||||
|
)}
|
||||||
<div
|
<div
|
||||||
style={{ display: 'flex', alignItems: 'center' }}
|
style={{ display: 'flex', alignItems: 'center' }}
|
||||||
className="comboPrichangeBTN"
|
className="comboPrichangeBTN"
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,11 @@
|
||||||
padding: 0rem 1rem;
|
padding: 0rem 1rem;
|
||||||
box-shadow: var(--BOX_SHADOW_LEVEL2);
|
box-shadow: var(--BOX_SHADOW_LEVEL2);
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
|
|
||||||
// background-color: #ffffff;
|
// background-color: #ffffff;
|
||||||
|
.RiVerifiedBadgeFill {
|
||||||
|
color: #1292ee !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.BSBillingNav2div2 {
|
.BSBillingNav2div2 {
|
||||||
|
|
@ -14,6 +18,7 @@
|
||||||
justify-content: space-evenly;
|
justify-content: space-evenly;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
.bs-membership__icon-btn {
|
.bs-membership__icon-btn {
|
||||||
svg {
|
svg {
|
||||||
color: #fbbf24;
|
color: #fbbf24;
|
||||||
|
|
@ -131,7 +136,8 @@
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
transition-duration: 0.6s;
|
transition-duration: 0.6s;
|
||||||
.anticon{
|
|
||||||
|
.anticon {
|
||||||
color: red !important;
|
color: red !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -168,7 +174,7 @@
|
||||||
padding: 10px 1rem;
|
padding: 10px 1rem;
|
||||||
font-family: 'Poppins';
|
font-family: 'Poppins';
|
||||||
|
|
||||||
> div {
|
>div {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,7 @@
|
||||||
padding-bottom: 10rem !important;
|
padding-bottom: 10rem !important;
|
||||||
padding: 0 3px;
|
padding: 0 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.BS1ComboTableComboSalesBillTable {
|
.BS1ComboTableComboSalesBillTable {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
@ -398,9 +399,11 @@
|
||||||
|
|
||||||
.overall-bscombo-container {
|
.overall-bscombo-container {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
.BSC1Search-div1 {
|
.BSC1Search-div1 {
|
||||||
height: 45px !important;
|
height: 45px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ant-select-selection-search {
|
.ant-select-selection-search {
|
||||||
top: 10px !important;
|
top: 10px !important;
|
||||||
}
|
}
|
||||||
|
|
@ -464,9 +467,7 @@
|
||||||
height: 10px;
|
height: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.overall-bscombo-container.BSC1Search-div1
|
.overall-bscombo-container.BSC1Search-div1 .ant-select:not(.ant-select-customize-input) .ant-select-selector {
|
||||||
.ant-select:not(.ant-select-customize-input)
|
|
||||||
.ant-select-selector {
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -480,20 +481,24 @@
|
||||||
|
|
||||||
.ComboSubNavbar {
|
.ComboSubNavbar {
|
||||||
flex-wrap: nowrap !important;
|
flex-wrap: nowrap !important;
|
||||||
|
|
||||||
@media (max-width: 1024px) {
|
@media (max-width: 1024px) {
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
padding-bottom: 5px;
|
padding-bottom: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.price-change-btn {
|
.price-change-btn {
|
||||||
background-color: #1292ee;
|
background-color: #1292ee;
|
||||||
color: #fff !important;
|
color: #fff !important;
|
||||||
width: 32px;
|
width: 32px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
margin-right: unset !important;
|
margin-right: unset !important;
|
||||||
|
|
||||||
img {
|
img {
|
||||||
filter: invert(1);
|
filter: invert(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.pricing-name-details {
|
.pricing-name-details {
|
||||||
margin-left: unset;
|
margin-left: unset;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -513,9 +518,11 @@
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 0 6px;
|
padding: 0 6px;
|
||||||
|
|
||||||
.SalesCountComponent-Master {
|
.SalesCountComponent-Master {
|
||||||
width: unset;
|
width: unset;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
|
|
||||||
p {
|
p {
|
||||||
font-size: 13px !important;
|
font-size: 13px !important;
|
||||||
}
|
}
|
||||||
|
|
@ -530,52 +537,64 @@
|
||||||
.billtable3th {
|
.billtable3th {
|
||||||
padding: 3px !important;
|
padding: 3px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.del-all-btn {
|
.del-all-btn {
|
||||||
padding: 0.2rem 0.1rem;
|
padding: 0.2rem 0.1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.BSBill-Table3-throw {
|
.BSBill-Table3-throw {
|
||||||
height: 2rem;
|
height: 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.BSBilling3-tablediv {
|
.BSBilling3-tablediv {
|
||||||
tr {
|
tr {
|
||||||
height: 28px;
|
height: 28px;
|
||||||
}
|
}
|
||||||
th > span {
|
|
||||||
|
th>span {
|
||||||
font-size: 14px !important;
|
font-size: 14px !important;
|
||||||
|
|
||||||
@media (max-width: 500px) {
|
@media (max-width: 500px) {
|
||||||
font-size: 12px !important;
|
font-size: 12px !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
td:nth-child(2) {
|
td:nth-child(2) {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
td:nth-child(3),
|
td:nth-child(3),
|
||||||
th:nth-child(3) {
|
th:nth-child(3) {
|
||||||
width: 100px !important;
|
width: 100px !important;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
td:nth-child(4),
|
td:nth-child(4),
|
||||||
th:nth-child(4) {
|
th:nth-child(4) {
|
||||||
width: 100px !important;
|
width: 100px !important;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
td:nth-child(5),
|
td:nth-child(5),
|
||||||
th:nth-child(5) {
|
th:nth-child(5) {
|
||||||
width: 100px !important;
|
width: 100px !important;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
td:nth-child(6),
|
td:nth-child(6),
|
||||||
th:nth-child(6) {
|
th:nth-child(6) {
|
||||||
width: 100px !important;
|
width: 100px !important;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
td:nth-child(7),
|
td:nth-child(7),
|
||||||
th:nth-child(7) {
|
th:nth-child(7) {
|
||||||
width: 100px !important;
|
width: 100px !important;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
td:nth-child(8),
|
td:nth-child(8),
|
||||||
th:nth-child(8) {
|
th:nth-child(8) {
|
||||||
width: 40px !important;
|
width: 40px !important;
|
||||||
|
|
@ -592,6 +611,7 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
||||||
svg {
|
svg {
|
||||||
width: 25px !important;
|
width: 25px !important;
|
||||||
height: 25px !important;
|
height: 25px !important;
|
||||||
|
|
@ -600,8 +620,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.SearchSubnavbar-combo {
|
.SearchSubnavbar-combo {
|
||||||
@media (max-width: 1024px) {
|
@media (max-width: 1024px) {}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.combuSubNavbarRightSide {
|
.combuSubNavbarRightSide {
|
||||||
|
|
@ -619,11 +638,24 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
||||||
svg {
|
svg {
|
||||||
color: #fff !important;
|
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 {
|
.keyboardShortcut {
|
||||||
width: 32px;
|
width: 32px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue