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

Merge pull request 'product-receipt' (#133) from product-receipt into main 

Reviewed-on: Pozomind/pozo-retail-app#133
This commit is contained in:
karthikalakshmi 2026-02-12 15:36:58 +05:30
parent dbf4657499 0e698b4e53
commit edfe6a780f
4 changed files with 183 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Pages/Product/StickerPrintModal.jsx
View File

@ -6,6 +6,7 @@ import { DefaultModal } from '../../Components/Modal/DefaultModal.jsx';
import Buttons from '../../Components/Forms/Buttons';
import { validateSafeInput } from '../../Services/Others';
import { useEffect } from 'react';
import "../../Pages/BarcodeSetup/BarcodeTemplateSetup.scss" //Vicky
const StickerPrintModel = ({
open,

6
src/Pages/PurchaseOrder/PurchaseOrder.jsx
View File

@ -110,7 +110,7 @@ const PurchaseOrder = () => {
const [isModalOpen, setIsModalOpen] = useState(false);
const [isLowStockModel, setisLowStockModel] = useState(false);
const [addressModel, setAddressModel] = useState(false);
const [deliveryAddress, setDeliveryAddress] = useState('');
const [deliveryAddress, setDeliveryAddress] = useState();
const [searchedText, setSearchedText] = useState('');
const [iSEmail, setiSEmail] = useState(false);
const [enteredEmail, setEnteredEmail] = useState('');
@ -972,7 +972,7 @@ const PurchaseOrder = () => {
PostData['LocationType'] = Supplierdata?.find(
(find) => find.SuppId === selecPurSupplier
)?.Type;
PostData['DeliveryAddressDetails'] = [deliveryAddress];
PostData['DeliveryAddressDetails'] = deliveryAddress ? [deliveryAddress]: [];
let PostPurOrder = await dispatch(postPurcOrderData(PostData)).unwrap();
if (PostPurOrder?.data?.statusCode === 1) {
setMessage({ type: 'success', data: PostPurOrder?.data?.response });
@ -997,7 +997,7 @@ const PurchaseOrder = () => {
formProductRef?.current?.resetFields();
formRef?.current?.resetFields();
deliveryAddressRef?.current?.resetFields();
setDeliveryAddress('');
setDeliveryAddress();
setselecPurSupplier(null);
getProductDatas(null);
setselecSuppDetails(null);

178
src/Pages/StockMaster/StockList.jsx
View File

@ -1,8 +1,8 @@
import { useState, useEffect, useRef, useCallback } from 'react';
import { useNavigate, useLocation } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux';
import { PlusOutlined, EyeOutlined, PrinterFilled } from '@ant-design/icons';
import { Image, Pagination, Space, Table, Tooltip } from 'antd';
import { PlusOutlined, EyeOutlined, PrinterFilled, CheckSquareOutlined } from '@ant-design/icons';
import { Checkbox, Image, Pagination, Space, Table, Tooltip } from 'antd';
import {
changeBreadCrumb,
getEmpAccess,
@ -149,7 +149,8 @@ const StockList = () => {
]);
const [SearchText, setSearchText] = useState(null);
const [debouncedSearchText, setDebouncedSearchText] = useState(null);
const [selectedRowKeys, setSelectedRowKeys] = useState([]);
const [multiQrCode, setMultiQrCode] = useState(false);
useEffect(() => {
const timer = setTimeout(() => {
setDebouncedSearchText(SearchText);
@ -276,7 +277,7 @@ const StockList = () => {
});
const filteredData = debouncedSearchText ? countData || [] : data || [];
console.log(data, countData, '1111111111111111', filteredData);
console.log('1111111111111111', filteredData);
async function searchData({ queryKey }) {
const [_, SearchText] = queryKey;
@ -412,6 +413,62 @@ const StockList = () => {
}
}
};
const handleSelectAll = (e) => {
if (e.target.checked) {
const currentPageKeys = filteredData
.filter((record) =>
record?.ProdDetails?.some((item) => item?.QRCode != null)
)
.map((record) => record.OrderId);
setSelectedRowKeys((prev) => [
...new Set([...prev, ...currentPageKeys])
]);
} else {
const currentPageKeys = filteredData.map((record) => record.OrderId);
setSelectedRowKeys((prev) =>
prev.filter((key) => !currentPageKeys.includes(key))
);
}
};
const handleRowSelect = (checked, record) => {
if (checked) {
setSelectedRowKeys([...selectedRowKeys, record.OrderId]);
} else {
setSelectedRowKeys(
selectedRowKeys.filter((key) => key !== record.OrderId)
);
}
};
const handleAllStickerPrint = async () => {
const Response = await dispatch(
getPurchaseData({
AppId: AppId,
BranchId: BranchId,
CompId: CompId,
OrderFromDate: formatDateForAPI(dateStrings?.[0]) ?? '',
OrderToDate: formatDateForAPI(dateStrings?.[1]) ?? '',
})
).unwrap();
if (Response?.data?.statusCode === 1) {
const allData = Response?.data?.data || [];
const selectedRecordsData = allData.filter((record) =>
selectedRowKeys.includes(record.OrderId)
);
const allProdDetails = selectedRecordsData.flatMap(
(record) => record.ProdDetails
);
setSelectedRecords(allProdDetails);
QrandBarcodeDats(allProdDetails);
setOpen(true);
}
};
const columns = [
{
title: 'Sl.No',
@ -503,29 +560,98 @@ const StockList = () => {
}
},
},
// {
// title: 'Print',
// key: 'Print',
// dataIndex: 'Print',
// width: '100px',
// align: 'center',
// render: (_, record) => (
// // productData.length >= 1 ? (
// <Space size="middle">
// {record?.ProdDetails?.some((item) => item?.QRCode != null) ? (
// <a>
// <PrinterFilled
// style={{ fontSize: '20px' }}
// onClick={() => Qrcode(record)}
// />
// </a>
// ) : (
// '-'
// )}
// </Space>
// ),
// // ) : null,
// },
{
title: 'Print',
key: 'Print',
dataIndex: 'Print',
width: '100px',
align: 'center',
render: (_, record) => (
// productData.length >= 1 ? (
<Space size="middle">
{record?.ProdDetails?.some((item) => item?.QRCode != null) ? (
<a>
<PrinterFilled
style={{ fontSize: '20px' }}
onClick={() => Qrcode(record)}
title: (
<Space>
{multiQrCode && (
<Checkbox
onChange={handleSelectAll}
checked={
filteredData.length > 0 &&
filteredData
.filter((record) =>
record?.ProdDetails?.some((item) => item?.QRCode != null)
)
.every((record) => selectedRowKeys.includes(record.OrderId))
}
/>
</a>
) : (
'-'
)}
Print
<CheckSquareOutlined
style={{
fontSize: '18px',
cursor: 'pointer',
marginLeft: '8px',
}}
onClick={() => {
setMultiQrCode((prev) => {
const newValue = !prev;
if (!newValue) {
setSelectedRowKeys([]);
}
return newValue;
});
}}
/>
</Space>
),
// ) : null,
key: 'Print',
width: '120px',
align: 'center',
render: (_, record) => {
const hasQRCode = record?.ProdDetails?.some(
(item) => item?.QRCode != null
);
if (!hasQRCode) return '-';
return (
<Space size="middle">
{multiQrCode && (
<Checkbox
checked={selectedRowKeys.includes(record.OrderId)}
onChange={(e) =>
handleRowSelect(e.target.checked, record)
}
/>
)}
{!multiQrCode && (
<PrinterFilled
style={{ fontSize: '18px', cursor: 'pointer' }}
onClick={() => Qrcode(record)}
/>
)}
</Space>
);
},
}
];
const Proddetailcolumns = [
{
@ -1241,6 +1367,16 @@ const StockList = () => {
/>
)}{' '}
</div>
{multiQrCode && selectedRowKeys.length > 0 && (
<div className="productMaster-Print">
<Buttons
buttonText={'Sticker Print'}
handleSubmit={() => handleAllStickerPrint()}
disabled={addnewAccess}
color="901D77"
/>
</div>
)}
</div>
<DefaultModal
open={open}

8
src/Styles/Employee/EmpMaster.scss
View File

@ -18,7 +18,7 @@
border: none;
}
.subinputForm .ant-input-affix-wrapper > input.ant-input {
.subinputForm .ant-input-affix-wrapper>input.ant-input {
font-size: inherit;
border: none;
padding: 18px 14px 6px 1px !important;
@ -164,3 +164,9 @@
width: max-content !important;
}
}
.productMaster-Print {
width: 100%;
display: flex;
justify-content: flex-end;
}