diff --git a/src/Pages/Product/ProductList.jsx b/src/Pages/Product/ProductList.jsx
index 67b24f8..abd3608 100644
--- a/src/Pages/Product/ProductList.jsx
+++ b/src/Pages/Product/ProductList.jsx
@@ -158,7 +158,7 @@ const ProductList = () => {
UomTypePreference?.some?.(
(e) =>
e?.PreferredSubCatName?.toLowerCase() ==
- item?.ConfigName?.toLowerCase() && e?.PreferredStatus == 'Y'
+ item?.ConfigName?.toLowerCase() && e?.PreferredStatus == 'Y'
)
);
@@ -965,19 +965,19 @@ const ProductList = () => {
},
...(brandColumn && subCategory
? [
- {
- title: 'Brand',
- dataIndex: 'BrandName',
- key: 'BrandName',
- columnKey: 'BrandName',
- width: '100px',
- render: (text) => {text},
- sorter: (a, b) => a?.BrandName?.localeCompare(b?.BrandName),
- sortOrder:
- sortedInfo.columnKey === 'BrandName' ? sortedInfo.order : null,
- ellipsis: true,
- },
- ]
+ {
+ title: 'Brand',
+ dataIndex: 'BrandName',
+ key: 'BrandName',
+ columnKey: 'BrandName',
+ width: '100px',
+ render: (text) => {text},
+ sorter: (a, b) => a?.BrandName?.localeCompare(b?.BrandName),
+ sortOrder:
+ sortedInfo.columnKey === 'BrandName' ? sortedInfo.order : null,
+ ellipsis: true,
+ },
+ ]
: []),
{
@@ -996,127 +996,127 @@ const ProductList = () => {
...(qrCodeColumn
? [
- {
- title: 'QRCode',
- dataIndex: 'QRCode',
- key: 'QRCode',
- width: '100px',
- align: 'center',
- render: (text) => (
- {text ? text : '-'}
- ),
- ellipsis: true,
- },
- {
- title: (
-
-
- {MultiCode && (
- 0 &&
- productData
- .filter((p) => p?.QRCode)
- .every((p) =>
- selectedRecords.some((r) => r.ProdId === p.ProdId)
- )
- }
- onChange={(e) => {
- const productsWithQR = productData.filter(
- (p) => p?.QRCode
- );
- if (e.target.checked) {
- const newSelections = productsWithQR.filter(
- (p) =>
- !selectedRecords.some(
- (r) => r.ProdId === p.ProdId
- )
- );
- setSelectedRecords((prev) => [
- ...prev,
- ...newSelections,
- ]);
- // Create QR codes for newly selected products
- CreateQrcodesBatch(newSelections, true);
- } else {
- // Remove QR codes for deselected products
- CreateQrcodesBatch(productsWithQR, false);
- setSelectedRecords((prev) =>
- prev.filter(
- (r) =>
- !productsWithQR.some(
- (p) => p.ProdId === r.ProdId
- )
+ {
+ title: 'QRCode',
+ dataIndex: 'QRCode',
+ key: 'QRCode',
+ width: '100px',
+ align: 'center',
+ render: (text) => (
+ {text ? text : '-'}
+ ),
+ ellipsis: true,
+ },
+ {
+ title: (
+
+
+ {MultiCode && (
+ 0 &&
+ productData
+ .filter((p) => p?.QRCode)
+ .every((p) =>
+ selectedRecords.some((r) => r.ProdId === p.ProdId)
+ )
+ }
+ onChange={(e) => {
+ const productsWithQR = productData.filter(
+ (p) => p?.QRCode
+ );
+ if (e.target.checked) {
+ const newSelections = productsWithQR.filter(
+ (p) =>
+ !selectedRecords.some(
+ (r) => r.ProdId === p.ProdId
)
- );
- }
- }}
- />
- )}
- Print QRCode
- {
- setMultiCode((prev) => {
- const newValue = !prev;
- if (!newValue) {
- setSelectedRecords([]);
- }
-
- return newValue;
- });
+ );
+ setSelectedRecords((prev) => [
+ ...prev,
+ ...newSelections,
+ ]);
+ // Create QR codes for newly selected products
+ CreateQrcodesBatch(newSelections, true);
+ } else {
+ // Remove QR codes for deselected products
+ CreateQrcodesBatch(productsWithQR, false);
+ setSelectedRecords((prev) =>
+ prev.filter(
+ (r) =>
+ !productsWithQR.some(
+ (p) => p.ProdId === r.ProdId
+ )
+ )
+ );
+ }
}}
/>
-
-
- ),
- key: 'Print',
- dataIndex: 'Print',
- width: '100px',
- align: 'center',
- render: (_, record) =>
- productData.length >= 1 ? (
-
- {MultiCode ? (
- record?.QRCode ? (
- r.ProdId == record.ProdId
- )}
- onChange={(e) => {
- handleCheckboxChange(record, e.target.checked);
- CreateQrcode(
- e.target.checked,
- record.QRCode,
- record?.ProdName,
- record?.StockAvailable,
- record?.TotalBalanceQty
- );
- }}
- />
- ) : (
- '-'
- )
- ) : record?.QRCode ? (
-
- Qrcode(record)}
- />
-
+ )}
+ Print QRCode
+ {
+ setMultiCode((prev) => {
+ const newValue = !prev;
+ if (!newValue) {
+ setSelectedRecords([]);
+ }
+
+ return newValue;
+ });
+ }}
+ />
+
+
+ ),
+ key: 'Print',
+ dataIndex: 'Print',
+ width: '100px',
+ align: 'center',
+ render: (_, record) =>
+ productData.length >= 1 ? (
+
+ {MultiCode ? (
+ record?.QRCode ? (
+ r.ProdId == record.ProdId
+ )}
+ onChange={(e) => {
+ handleCheckboxChange(record, e.target.checked);
+ CreateQrcode(
+ e.target.checked,
+ record.QRCode,
+ record?.ProdName,
+ record?.StockAvailable,
+ record?.TotalBalanceQty
+ );
+ }}
+ />
) : (
'-'
- )}
-
- ) : null,
- },
- ]
+ )
+ ) : record?.QRCode ? (
+
+ Qrcode(record)}
+ />
+
+ ) : (
+ '-'
+ )}
+
+ ) : null,
+ },
+ ]
: []),
{
@@ -1134,11 +1134,11 @@ const ProductList = () => {
style={{ color: '#1292EE' }}
onClick={() =>
UserType === 'Super Admin' ||
- (UserType === 'Super Admin User' &&
- SAAccessCommonMaster?.UpdateAccess === 'Y') ||
- (UserType === 'Employee' &&
- empData?.UpdateAccess === 'Y') ||
- UserType === 'Admin'
+ (UserType === 'Super Admin User' &&
+ SAAccessCommonMaster?.UpdateAccess === 'Y') ||
+ (UserType === 'Employee' &&
+ empData?.UpdateAccess === 'Y') ||
+ UserType === 'Admin'
? actionsFormatter(record, index)
: null
}
@@ -1155,11 +1155,11 @@ const ProductList = () => {
}}
onClick={() =>
UserType === 'Super Admin' ||
- (UserType === 'Super Admin User' &&
- SAAccessCommonMaster?.DeleteAccess === 'Y') ||
- (UserType === 'Employee' &&
- empData?.DeleteAccess === 'Y') ||
- UserType === 'Admin'
+ (UserType === 'Super Admin User' &&
+ SAAccessCommonMaster?.DeleteAccess === 'Y') ||
+ (UserType === 'Employee' &&
+ empData?.DeleteAccess === 'Y') ||
+ UserType === 'Admin'
? statusFormatter(record)
: null
}
@@ -1171,11 +1171,11 @@ const ProductList = () => {
}}
onClick={() =>
UserType === 'Super Admin' ||
- (UserType === 'Super Admin User' &&
- SAAccessCommonMaster?.DeleteAccess === 'Y') ||
- (UserType === 'Employee' &&
- empData?.DeleteAccess === 'Y') ||
- UserType === 'Admin'
+ (UserType === 'Super Admin User' &&
+ SAAccessCommonMaster?.DeleteAccess === 'Y') ||
+ (UserType === 'Employee' &&
+ empData?.DeleteAccess === 'Y') ||
+ UserType === 'Admin'
? statusFormatter(record)
: null
}
@@ -2269,7 +2269,7 @@ const ProductList = () => {
: generateBarcode(currentCode)
: !MultiCode
? base64Image
- : generateQRCode(QrandbarcodeDatas, code)
+ : generateQRCode(QrandbarcodeDatas, currentCode)
}
alt="Barcode"
/>
@@ -2641,7 +2641,7 @@ const ProductList = () => {
generateQRCodeCopy={(code) =>
generateQRCodeCopy(QrandbarcodeDatas, code)
}
- generateCodeImage={generateCodeImage}
+ generateCodeImage={(code, codeType = 'Q') => generateCodeImage(code, codeType, QrandbarcodeDatas) }
imageTagBarcodeAndQR={imageTagBarcodeAndQR}
dropdownValue={dropdownValue}
barcodeTemplateDetails={barcodeTemplateDetails}
@@ -2747,7 +2747,7 @@ const ProductList = () => {
}}
onlineImage={onlineImage}
ImageLink={rowRecord?.ProdLogo || null}
- updateImageUrl={imageModalRowIndex ? updateImageUrl : () => {}}
+ updateImageUrl={imageModalRowIndex ? updateImageUrl : () => { }}
handleClose={handleImageModalClose}
/>