Merge pull request 'mobile-apk-and-web-qrscan' (#160) from mobile-apk-and-web-qrscan into main

Reviewed-on: Pozomind/pozo-retail-app#160
This commit is contained in:
karthikalakshmi 2026-02-20 16:01:55 +05:30
commit 1b5b56257f
2 changed files with 15 additions and 5 deletions

View File

@ -13,6 +13,7 @@
"dependencies": {
"@ant-design/plots": "^1.2.6",
"@autocomplete/material-ui": "0.0.17",
"@capacitor-mlkit/barcode-scanning": "^8.0.1",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@emotion/react": "^11.11.4",
@ -23,6 +24,7 @@
"@tanstack/react-query": "^5.90.11",
"@tanstack/react-query-devtools": "^5.91.1",
"@tanstack/react-virtual": "^3.13.18",
"@zxing/library": "^0.21.3",
"antd": "^5.17.4",
"antd-img-crop": "^4.22.0",
"aos": "^2.3.4",
@ -52,6 +54,7 @@
"mui-autocomplete": "^2.0.1",
"number-to-words": "^1.2.4",
"pdf-lib": "^1.17.1",
"qr-scanner": "^1.4.2",
"qrcode": "^1.5.3",
"qrcode.react": "^4.2.0",
"react": "^18.3.1",

View File

@ -56,6 +56,7 @@ import { changeBreadCrumb } from '../../Features/AppPage/CenterPage.js';
import { BiBarcodeReader } from 'react-icons/bi';
import BarcodeScanner from '../BookingScreen/Components/UtillComponents/BarcodeScanner.jsx';
import BarcodeScannerTurbo from '../BookingScreen/Components/UtillComponents/BarcodeScannerTurbo.jsx';
import BarCodeScan from '../../Services/BarCodeScan.jsx';
const subDirectory = import.meta.env.ENV_BASE_URL;
const items = [
@ -1930,10 +1931,16 @@ const TurboAddForm = () => {
</div>
<div className="toolbar-right">
{isMobile && window.innerWidth <= 768 && (
<BiBarcodeReader
// className="search-icon barcode-scanner-icon"
onClick={() => handleQrcode()}
style={{ cursor: 'pointer', marginLeft: '8px' }}
// <BiBarcodeReader
// // className="search-icon barcode-scanner-icon"
// onClick={() => handleQrcode()}
// style={{ cursor: 'pointer', marginLeft: '8px' }}
// />
<BarCodeScan
style={{FontSize:'12px', marginLeft: '8px' }}
onScan={(value) => {
changeSearchedData(value);
}}
/>
)}
<EnhancedVoiceForm