karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixed bugs' (#181) from issue-fix/temp into main 

Reviewed-on: Pozomind/pozo-retail-app#181
This commit is contained in:
karthikalakshmi 2026-02-25 19:28:04 +05:30
parent d24945f7bd f07880a1fd
commit bc8dafa167
25 changed files with 6935 additions and 6813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Forms/CropUpload.jsx
View File

@ -11,6 +11,7 @@ import '../../Styles/Product/Product.scss';
import { Messages } from '../Notifications/Messages.jsx';
import { isMobile } from 'react-device-detect';
import Camera from '../MobileComponent/Camera.jsx';
import useHasCamera from '../../utils/useHasCamera.js';
const allowedTypes = [
'image/jpeg',
'image/png',
@ -27,6 +28,7 @@ const CropUpload = ({
handleClose = () => { }
}) => {
const dispatch = useDispatch();
const hasCamera = useHasCamera();
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
const [fileList, setFileList] = useState([]);
@ -407,7 +409,7 @@ const CropUpload = ({
<Modal visible={previewVisible} onCancel={handleCancel} footer={null}>
<img alt="Preview" style={{ width: '100%' }} src={previewImage} />
</Modal>
{isMobile && fileList?.length == 0 && <>
{isMobile && fileList?.length == 0 && hasCamera && <>
<div style={{ textAlign: "center", margin: "6px 0", fontFamily: "Poppins", fontWeight: "500" }}>OR</div>
<Camera
handleCapture={async (e) => {

5
src/Components/Forms/Upload.jsx
View File

@ -5,6 +5,8 @@ import { PlusOutlined } from '@ant-design/icons';
import { uploadImage } from '../../Features/upload/upload';
import Camera from '../MobileComponent/Camera';
import { isMobile } from 'react-device-detect';
import useHasCamera from '../../utils/useHasCamera';
const allowedTypes = [
'image/jpeg',
'image/png',
@ -27,6 +29,7 @@ const App = ({ singleImage, updateImageUrl, ImageLink = '', listType }) => {
const [previewImage, setPreviewImage] = useState('');
const [previewTitle, setPreviewTitle] = useState('');
const [fileList, setFileList] = useState([]);
const hasCamera = useHasCamera();
console.log(fileList, "fileList")
useEffect(() => {
@ -141,7 +144,7 @@ const App = ({ singleImage, updateImageUrl, ImageLink = '', listType }) => {
src={previewImage}
/>
</Modal>
{isMobile && fileList?.length == 0 && <>
{isMobile && fileList?.length == 0 && hasCamera && <>
<div style={{ textAlign: "center", margin: "6px 0", fontFamily: "Poppins", fontWeight: "500" }}>OR</div>
<Camera
handleCapture={(e) => {

2
src/Pages/BookingScreen/Components/BSBillingTables/ComboBillTableEdit/ComboEditQtyAndRate.jsx
View File

@ -268,8 +268,6 @@ const ComboEditQtyAndRate = (props) => {
}
const AddProductQuantity = async () => {
// debugger
let newPrice = editedPrice > 0 ? editedPrice : props.Productdata.OrderRate;
await dispatch(changeHoldOrderDtl(false));

9
src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
View File

@ -99,6 +99,11 @@ const InvoiceTemplate = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const keysLength = Object.keys(table2Data ?? {}).length;
console.log(GlobalDiscount, Discount, 'Discount');
@ -944,7 +949,7 @@ const InvoiceTemplate = ({
{/* Invoice Title */}
<div className="invoice-title">
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '14px',
@ -2744,7 +2749,7 @@ const InvoiceTemplate = ({
{/* Invoice Title */}
<div className="invoice-title">
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '14px',

7
src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
View File

@ -106,6 +106,11 @@ const PrintA4Style11 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const currentDate = new Date();
console.log(OrderDetailGST, 'OrderDetailGST');
const day = currentDate.getDate().toString().padStart(2, '0');
@ -394,7 +399,7 @@ const PrintA4Style11 = ({
</div>
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
textTransform: 'uppercase',

5
src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
View File

@ -106,6 +106,11 @@ const PrintA5Style11 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const currentDate = new Date();
console.log(FieldDetails, 'FieldDetails');
const day = currentDate.getDate().toString().padStart(2, '0');

7
src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
View File

@ -30,6 +30,11 @@ const TaxInvoice = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
let BillName = printDatas?.PrintHdrName;
let companyColour = printDatas?.PrintHdrColor ?? '#00000';
@ -374,7 +379,7 @@ const TaxInvoice = ({
>
<div></div>
<h2 style={{ margin: '0', fontSize: '20px', fontWeight: '700' }}>
{table2Data?.OrderType === 'E'
{table2Data?.OrderType === 'E' && estimateTitle
? 'Estimate'
: BillName
? BillName

14
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
View File

@ -123,6 +123,12 @@ const PrintStyle1 = ({
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const keysLength = Object.keys(table2Data ?? {}).length;
const paymentTypeUPI = PaymentStatus?.find(
(ps) => ps.PaymentTypeName === 'UPI'
@ -479,7 +485,7 @@ const PrintStyle1 = ({
Mobile : +91{' '}
{GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}
</div>}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '14px',
@ -521,7 +527,7 @@ const PrintStyle1 = ({
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '14px',
@ -3727,7 +3733,7 @@ const PrintStyle1 = ({
Mobile : +91{' '}
{GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}
</div>}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '14px',
@ -3768,7 +3774,7 @@ const PrintStyle1 = ({
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '14px',

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
View File

@ -106,6 +106,11 @@ const PrintStyle10 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -453,7 +458,7 @@ const PrintStyle10 = ({
? '8428XXXXXX'
: table2Data?.BrMobile}
</p>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}>
Estimate{' '}
{SalesModePref?.SettingValue == 'Y' &&
@ -481,7 +486,7 @@ const PrintStyle10 = ({
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{ textTransform: 'uppercase', textAlign: 'center' }}
>
@ -3113,7 +3118,7 @@ const PrintStyle10 = ({
Mobile:+91{' '}
{GlobaldummyData ? '8428XXXXXX' : table2Data?.BrMobile}
</p>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}>
Estimate{' '}
{SalesModePref?.SettingValue == 'Y' &&
@ -3140,7 +3145,7 @@ const PrintStyle10 = ({
</div>
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}>
Estimate{' '}
{SalesModePref?.SettingValue == 'Y' &&

9
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
View File

@ -110,6 +110,11 @@ const PrintStyle11 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -481,7 +486,7 @@ const PrintStyle11 = ({
</div>
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{ textTransform: 'uppercase', textAlign: 'center' }}
>
@ -3132,7 +3137,7 @@ const PrintStyle11 = ({
</div>
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase', textAlign: 'center' }}>
Estimate{' '}
{SalesModePref?.SettingValue == 'Y' &&

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
View File

@ -109,6 +109,11 @@ const Printstyle12 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -632,7 +637,7 @@ const Printstyle12 = ({
{table2Data?.SalesTableLinkDetails?.[0]?.WaiterName}
</div>
)}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: 'clamp(0.75rem, 2.5vw, 1rem)',
@ -668,7 +673,7 @@ const Printstyle12 = ({
) : null}
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: 'clamp(0.75rem, 2.5vw, 1rem)',
@ -3284,7 +3289,7 @@ const Printstyle12 = ({
{table2Data?.SalesTableLinkDetails?.[0]?.WaiterName}
</div>
)}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: 'clamp(0.75rem, 2.5vw, 1rem)',
@ -3317,7 +3322,7 @@ const Printstyle12 = ({
) : null}
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: 'clamp(0.75rem, 2.5vw, 1rem)',

9
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
View File

@ -112,6 +112,11 @@ const Printstyle2 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -450,7 +455,7 @@ const Printstyle2 = ({
</div>
)}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontWeight: '600',
@ -3076,7 +3081,7 @@ const Printstyle2 = ({
</div>
)}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontWeight: '600',

15
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
View File

@ -80,7 +80,12 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData);
const estimatePrintHeader = SettingData?.[0]?.SettingDtlDetails?.find(setting => setting?.SettingIdName?.toLowerCase() === 'estimateprintheader')?.SettingValue === 'Y'
const estimatePrintHeader = SettingData?.[0]?.SettingDtlDetails?.find(setting => setting?.SettingIdName?.toLowerCase() === 'estimateprintheader')?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find((preference) => preference?.PreferredCatName === 'Booking Type')?.PreferenceCatDetails
const dinePreference = bookingTypePreference?.find((type) => type?.PreferredSubCatName?.toLowerCase() === "dine in" && type?.PreferredStatus === 'Y')
const takeAwayPreference = bookingTypePreference?.find((type) => type?.PreferredSubCatName?.toLowerCase() === "take away" && type?.PreferredStatus === 'Y')
@ -223,13 +228,13 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{table2Data?.BrGSTIN && <div>GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : table2Data?.BrGSTIN},</div>}
<div style={{ fontWeight: '600' }}> Mobile : +91 {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}</div>
{table2Data?.OrderType === "E" && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
{table2Data?.OrderType === "E" && estimateTitle && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
{table2Data?.OrderType === "E" ? "" : <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>{GlobaldummyData ? 'Cash Bill' : BillName ? BillName : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""} {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} </div>}
</div>
</div>)}
{(!estimatePrintHeader && table2Data?.OrderType === "E") && <div style={{ fontSize: "14px", margin: "2px 0 0 0", textAlign: 'center', padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
{(!estimatePrintHeader && table2Data?.OrderType === "E" && estimateTitle) && <div style={{ fontSize: "14px", margin: "2px 0 0 0", textAlign: 'center', padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
<hr className="PrintStyle3-print-dottline" />
<div className="PrintStyle3-print-ordr-dtls">
@ -1150,12 +1155,12 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{table2Data?.BrGSTIN && <div>GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : table2Data?.BrGSTIN},</div>}
<div style={{ fontWeight: '600' }}> Mobile : +91 {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}</div>
{table2Data?.OrderType === "E" && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
{table2Data?.OrderType === "E" && estimateTitle && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
{table2Data?.OrderType === "E" ? "" : <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>{GlobaldummyData ? GlobalBilltext ? GlobalBilltext : "Cash" + ' Bill' : BillName ? BillName : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill' : ""} {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
</div>
</div>)}
{(!estimatePrintHeader && table2Data?.OrderType === "E") && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
{(!estimatePrintHeader && table2Data?.OrderType === "E" && estimateTitle) && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
<hr className="PrintStyle3-print-dottline" />
<div className="PrintStyle3-print-ordr-dtls">
<div style={{ lineheight: '50px' }}>

9
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
View File

@ -119,6 +119,11 @@ const Printstyle4 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -495,7 +500,7 @@ const Printstyle4 = ({
{/* <div>{GlobaldummyData ? formattedDate : Date1}</div> */}
</div>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
className="PrintStyle4-FourthSpan"
style={{ textTransform: 'uppercase', fontSize: '12px' }}
@ -3196,7 +3201,7 @@ const Printstyle4 = ({
</div>
</div>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
className="PrintStyle4-FourthSpan"
style={{ textTransform: 'uppercase', fontSize: '12px' }}

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
View File

@ -108,6 +108,11 @@ const PrintStyle5 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -429,7 +434,7 @@ const PrintStyle5 = ({
? '1234567890'
: table2Data?.BrMobile}{' '}
</div>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}>
Estimate{' '}
{SalesModePref?.SettingValue == 'Y' &&
@ -455,7 +460,7 @@ const PrintStyle5 = ({
<hr />
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{ textTransform: 'uppercase', textAlign: 'center' }}
>
@ -2721,7 +2726,7 @@ const PrintStyle5 = ({
Mobile :
{GlobaldummyData ? '1234567890' : table2Data?.BrMobile}{' '}
</div>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}>
Estimate{' '}
{SalesModePref?.SettingValue == 'Y' &&
@ -2749,7 +2754,7 @@ const PrintStyle5 = ({
<hr />
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase', textAlign: 'center' }}>
Estimate{' '}
{SalesModePref?.SettingValue == 'Y' &&

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
View File

@ -110,6 +110,11 @@ const Printstyle6 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -441,7 +446,7 @@ const Printstyle6 = ({
Mobile : {table2Data?.BrMobile}
</div>}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
textTransform: 'uppercase',
@ -478,7 +483,7 @@ const Printstyle6 = ({
)}
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
textTransform: 'uppercase',
@ -3297,7 +3302,7 @@ const Printstyle6 = ({
Mobile : {table2Data?.BrMobile}
</div>}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
textTransform: 'uppercase',
@ -3337,7 +3342,7 @@ const Printstyle6 = ({
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
textTransform: 'uppercase',

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
View File

@ -105,6 +105,11 @@ const PrintStyle7 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -453,7 +458,7 @@ const PrintStyle7 = ({
: '') + table2Data?.AddressDetails?.[0]?.Zip
: '')}
</div>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '12px',
@ -490,7 +495,7 @@ const PrintStyle7 = ({
)}
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '12px',
@ -2908,7 +2913,7 @@ const PrintStyle7 = ({
: '') + table2Data?.AddressDetails?.[0]?.Zip
: '')}
</div>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '12px',
@ -2947,7 +2952,7 @@ const PrintStyle7 = ({
)}
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
style={{
fontSize: '12px',

9
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
View File

@ -110,6 +110,11 @@ const Printstyle8 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -473,7 +478,7 @@ const Printstyle8 = ({
</div>
</div>
)}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
className="PrintStyle4-FourthSpan"
style={{ textTransform: 'uppercase', fontWeight: '600' }}
@ -3276,7 +3281,7 @@ const Printstyle8 = ({
</div>
</div>
)}
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
className="PrintStyle4-FourthSpan"
style={{ textTransform: 'uppercase', fontWeight: '600' }}

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
View File

@ -107,6 +107,11 @@ const PrintStyle9 = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -470,7 +475,7 @@ const PrintStyle9 = ({
Mobile : +91{' '}
{GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}
</div>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
className=""
style={{
@ -527,7 +532,7 @@ const PrintStyle9 = ({
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
className=""
style={{
@ -3211,7 +3216,7 @@ const PrintStyle9 = ({
Mobile : +91{' '}
{GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}
</div>
{table2Data?.OrderType === 'E' && (
{table2Data?.OrderType === 'E' && estimateTitle && (
<div
className=""
style={{
@ -3276,7 +3281,7 @@ const PrintStyle9 = ({
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && (
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div
className=""
style={{

2
src/Pages/EmpMaster/EmpMasterForm.jsx
View File

@ -33,8 +33,6 @@ import { getCommonAppPreference } from '../../Features/BrachLogin/BranchLogin.js
import { AiOutlineDownCircle, AiOutlineUpCircle } from 'react-icons/ai';
// import TextArea from 'antd/es/input/TextArea.js';
import CropUpload from '../../Components/Forms/CropUpload.jsx';
import { isMobile } from 'react-device-detect';
import Camera from '../../Components/MobileComponent/Camera.jsx';
const { Panel } = Collapse;
const { TextArea } = Input;
const subDirectory = import.meta.env.BASE_URL;

2
src/Pages/Payment/PaymentDetails/PaymentDetailsForm.jsx
View File

@ -96,7 +96,7 @@ const PaymentDetails = ({ formType }) => {
},
{
name: 'PaymentDetails',
name: 'Payment Details',
link: `${subDirectory}setting/payment-details`,
},
{

2
src/Pages/Payment/PaymentDetails/PaymentDetailsList.jsx
View File

@ -81,7 +81,7 @@ const PaymentDetailsList = () => {
},
{
name: 'PaymentDetails',
name: 'Payment Details',
link: `${subDirectory}setting/payment-details`,
},
];

26
src/Pages/Preference/PreferenceList.jsx
View File

@ -102,7 +102,10 @@ const PreferenceList = () => {
(k) => allSettingsMap[k]?.value === 'Y'
),
mobilea4: allSettingsMap['mobilea4']?.value === 'Y',
estimateprintheader: allSettingsMap['estimateprintheader']?.value === 'Y',
estimateSettings: [
...(allSettingsMap['estimateprintheader']?.value === 'Y' ? ['estimateprintheader'] : []),
...(allSettingsMap['estimatetitle']?.value === 'Y' ? ['estimatetitle'] : []),
],
scanlayout: allSettingsMap['scanlayout']?.value === 'Y',
verifyproduct: allSettingsMap['verifyproduct']?.value === 'Y',
customisedbillnumber: allSettingsMap['customisedbillnumber']?.value === 'Y',
@ -304,7 +307,6 @@ const PreferenceList = () => {
tokenonly: values.tokenonly,
allproductindividualtoken: values.allproductindividualtoken,
mobilea4: values.mobilea4,
estimateprintheader: values.estimateprintheader,
scanlayout: values.scanlayout,
verifyproduct: values.verifyproduct,
customisedbillnumber: values.customisedbillnumber,
@ -321,6 +323,8 @@ const PreferenceList = () => {
dinein: values.enabledModules,
estimation: values.enabledModules,
parking: values.enabledFeatures,
estimateprintheader: values.estimateSettings,
estimatetitle: values.estimateSettings,
offer: values.enabledFeatures,
whatsapp: values.pdfSendOptions,
sms: values.pdfSendOptions,
@ -783,9 +787,21 @@ const PreferenceList = () => {
'mobilea4',
'Prefer printing in A4/A5 on mobile?'
)}
{renderCheckbox(
'estimateprintheader',
'Do you want to include a header when printing Estimate bills?'
{(allSettingsMap['estimateprintheader'] !== undefined ||
allSettingsMap['estimatetitle'] !== undefined) && (
<Form.Item
name="estimateSettings"
label="Estimate Print Settings :"
>
<Checkbox.Group>
{allSettingsMap['estimateprintheader'] !== undefined && (
<Checkbox value="estimateprintheader">Show shop header (Name, Address, GST)</Checkbox>
)}
{allSettingsMap['estimatetitle'] !== undefined && (
<Checkbox value="estimatetitle">Show “Estimate (R/W)” title</Checkbox>
)}
</Checkbox.Group>
</Form.Item>
)}
</div>
<div className="PreferencesBTN">

7
src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
View File

@ -133,6 +133,11 @@ const PaymentPdfBooking = ({
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails;
@ -435,7 +440,7 @@ const PaymentPdfBooking = ({
</div>
)}
<div className="Re-print-top">
{table2Data?.OrderType === 'E' ? (
{table2Data?.OrderType === 'E' && estimateTitle ? (
<div
style={{
display: 'flex',

19
src/utils/useHasCamera.js Normal file
View File

@ -0,0 +1,19 @@
import { useState, useEffect } from "react";
export default function useHasCamera() {
const [hasCamera, setHasCamera] = useState(null);
useEffect(() => {
async function detectCamera() {
try {
const devices = await navigator.mediaDevices.enumerateDevices();
setHasCamera(devices.some(d => d.kind === "videoinput"));
} catch {
setHasCamera(false);
}
}
detectCamera();
}, []);
return hasCamera;
}