diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
index 3878da4..1c3f736 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
@@ -3459,15 +3459,9 @@ const StandardTablePayment = () => {
Total :
₹
- {safeRound(
- orderCardDetail?.reduce(
- (acc, data) => parseFloat(data?.TotalAmt || 0) + acc,
- 0
- ) -
- ((OverAllSales > 0 ? OverAllSales : 0) +
- (OverAllEstimate > 0 ? OverAllEstimate : 0) +
- (Discount > 0 ? Discount : 0))
- )}
+ {safeRound(credit && overAllBal >= 0
+ ? Math.max(0, TotalAmount - overAllBal)
+ : TotalAmount)}
diff --git a/src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx b/src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx
index c89fe41..a1086e2 100644
--- a/src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx
+++ b/src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx
@@ -1278,6 +1278,7 @@ function BSReprint({ setOpenModel = () => { } }) {
VariantAvailableTo: item?.AvailableTo || null,
OrderQty: item?.SalesQty,
OrderRate: item?.Rate,
+ SellingPrice: item?.Rate,
// TotalAmt: formatAmount((item.TotalAmt - item.OfferValue)),
}));
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
index 5027bfb..d02210c 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
@@ -2434,7 +2434,8 @@ const InvoiceTemplate = ({
'REFUND'
? '-'
: '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2019,7 +2020,8 @@ const PrintA4Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2672,7 +2674,8 @@ const PrintA4Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -3238,7 +3241,8 @@ const PrintA4Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
index 8d34cdb..220a7b5 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
@@ -977,7 +977,8 @@ const PrintA5Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -1957,7 +1958,8 @@ const PrintA5Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2549,7 +2551,8 @@ const PrintA5Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2589,7 +2592,8 @@ const PrintA5Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -3136,7 +3140,8 @@ const PrintA5Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -3176,7 +3181,8 @@ const PrintA5Style11 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
index 74a9c94..4ff7674 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
@@ -1267,7 +1267,8 @@ const PrintStyle1 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2130,7 +2131,8 @@ const PrintStyle1 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2958,7 +2960,8 @@ const PrintStyle1 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -4443,7 +4446,8 @@ const PrintStyle1 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
index a378875..03f6566 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
@@ -1861,7 +1861,8 @@ const PrintStyle10 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2587,7 +2588,8 @@ const Printstyle2 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -4144,7 +4146,8 @@ const Printstyle2 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
index b1a067d..f69c9c4 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
@@ -536,7 +536,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -934,7 +935,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -1451,7 +1453,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
index 994362e..6cf469f 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
@@ -1679,7 +1679,8 @@ const Printstyle4 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2640,7 +2641,8 @@ const Printstyle4 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -4391,7 +4393,8 @@ const Printstyle4 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
index 9ddf38c..6479693 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
@@ -1498,7 +1498,8 @@ const PrintStyle5 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2238,7 +2239,8 @@ const PrintStyle5 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -3693,7 +3695,8 @@ const PrintStyle5 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
index e05dd88..35b8030 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
@@ -1695,7 +1695,8 @@ const Printstyle6 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -2696,7 +2697,8 @@ const Printstyle6 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
@@ -4372,7 +4374,8 @@ const Printstyle6 = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
index 9cb2131..058358c 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
@@ -1464,7 +1464,8 @@ const PrintStyle7 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
find.SessionName === dropdownValue
);
const templateAvailable = template === undefined ? false : true;
-
+ console.log(proName?.length > 12, "proNameproName")
function choosenPrintStyle(dropdownValue, templateAvailable) {
switch (dropdownValue) {
case '15X15 6cross':
@@ -98,35 +98,35 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- console.log(copyCount, 'copyCountcopyCountcopyCount');
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-

-
- )
- );
- })
+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ console.log(copyCount, 'copyCountcopyCountcopyCount');
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+

+
+ )
+ );
+ })
: Array.from({ length: copies })?.map((_, index) => (
-
-

-
- ))}
+
+

+
+ ))}
)}
@@ -135,50 +135,50 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- return Array?.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
-
8 ? 'text-clamp-2' : ''}`}
- >
- {record.ProdName} ({record.Size}
- {record.UomName})
-
-
{record.QRCode}
-
-

+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ return Array?.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+
8 ? 'text-clamp-2' : ''}`}
+ >
+ {record.ProdName} ({record.Size}
+ {record.UomName})
+
+
{record.QRCode}
- )
- );
- })
- : Array?.from({ length: copies })?.map((_, index) => (
-
-
-
8 ? 'text-ellipsis' : ''}`}
- >
- {proName} ({size})
-
-
{ProdId}
+
-

+ )
+ );
+ })
+ : Array?.from({ length: copies })?.map((_, index) => (
+
+
+
8 ? 'text-ellipsis' : ''}`}
+ >
+ {proName} ({size})
+
+
{ProdId}
- ))}
+

+
+ ))}
)}
@@ -187,112 +187,112 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- console.log(copyCount, 'copyCount2');
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
14 ? 'text-ellipsis' : ''}`}
- >
-
- {record?.NickName || record?.ProdName}
-
-
- ({record?.Size}
- {record?.UomName})
-
-
-
-

-
- {record?.QRCode || record?.ProdId}
-
-
-
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
14 ? 'text-ellipsis' : ''}`}
- >
-
- {nickName
- ? nickName
- : proName
- ? proName
- : 'Product Name'}
-
-
- ({size})
-
-
+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ console.log(copyCount, 'copyCount2');
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
-

-
{ProdId}
+
14 ? 'text-ellipsis' : ''}`}
+ >
+
+ {record?.NickName || record?.ProdName}
+
+
+ ({record?.Size}
+ {record?.UomName})
+
+
+
+

+
+ {record?.QRCode || record?.ProdId}
+
+
+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
14 ? 'text-ellipsis' : ''}`}
+ >
+
+ {nickName
+ ? nickName
+ : proName
+ ? proName
+ : 'Product Name'}
+
+
+ ({size})
+
+
+
+

+
{ProdId}
- ))}
+
+ ))}
)}
@@ -301,53 +301,53 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- console.log(copyCount, 'copyCount3');
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
-
12 ? 'text-clamp-2' : ''}`}
- >
- {record?.NickName || record?.ProdName} (
- {record?.Size}
- {record?.UomName})
-
-
{record?.QRCode || record?.ProdId}
-
-

+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ console.log(copyCount, 'copyCount3');
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+
12 ? 'text-clamp-2' : ''}`}
+ >
+ {record?.NickName || record?.ProdName} (
+ {record?.Size}
+ {record?.UomName})
+
+
{record?.QRCode || record?.ProdId}
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
-
12 ? 'text-clamp-2' : ''}`}
- >
- {proName} ({size})
-
-
{ProdId}
+
-

+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
+
12 ? 'text-clamp-2' : ''}`}
+ >
+ {proName} ({size})
+
+
{ProdId}
- ))}
+

+
+ ))}
)}
@@ -356,53 +356,53 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- console.log(copyCount, 'copyCount4');
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName || record?.ProdName} (
- {record?.Size}
- {record?.UomName})
-
-
{record?.QRCode || record?.ProdId}
-
-

+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ console.log(copyCount, 'copyCount4');
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName || record?.ProdName} (
+ {record?.Size}
+ {record?.UomName})
+
+
{record?.QRCode || record?.ProdId}
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
-
12 ? 'text-ellipsis' : ''}`}
- >
- {proName} ({size})
-
-
{ProdId}
+
-

+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {proName} ({size})
+
+
{ProdId}
- ))}
+

+
+ ))}
)}
@@ -411,53 +411,53 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- console.log(copyCount, 'copyCount5');
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName || record?.ProdName} (
- {record?.Size}
- {record?.UomName})
-
-
{record?.QRCode || record?.ProdId}
-
-

+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ console.log(copyCount, 'copyCount5');
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName || record?.ProdName} (
+ {record?.Size}
+ {record?.UomName})
+
+
{record?.QRCode || record?.ProdId}
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
-
12 ? 'text-ellipsis' : ''}`}
- >
- {proName} ({size})
-
-
{ProdId}
+
-

+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {proName} ({size})
+
+
{ProdId}
- ))}
+

+
+ ))}
)}
@@ -466,53 +466,53 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- console.log(copyCount, 'copyCount6');
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName || record?.ProdName} (
- {record?.Size}
- {record?.UomName})
-
-
{record?.QRCode || record?.ProdId}
-
-

+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ console.log(copyCount, 'copyCount6');
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName || record?.ProdName} (
+ {record?.Size}
+ {record?.UomName})
+
+
{record?.QRCode || record?.ProdId}
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
-
12 ? 'text-ellipsis' : ''}`}
- >
- {proName} ({size})
-
-
{ProdId}
+
-

+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {proName} ({size})
+
+
{ProdId}
- ))}
+

+
+ ))}
)}
@@ -521,53 +521,53 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- console.log(copyCount, 'copyCount7');
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName || record?.ProdName} (
- {record?.Size}
- {record?.UomName})
-
-
{record?.QRCode || record?.ProdId}
-
-

+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ console.log(copyCount, 'copyCount7');
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName || record?.ProdName} (
+ {record?.Size}
+ {record?.UomName})
+
+
{record?.QRCode || record?.ProdId}
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
-
12 ? 'text-ellipsis' : ''}`}
- >
- {proName} ({size})
-
-
{ProdId}
+
-

+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {proName} ({size})
+
+
{ProdId}
- ))}
+

+
+ ))}
)}
@@ -576,108 +576,108 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- console.log(copyCount, 'copyCount8');
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
-
{record?.BrName || detail?.BrName}
-
-
-
-
- Product Name:{' '}
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName || record?.ProdName}
-
-
-
- SIZE:{' '}
-
- {record?.Size}
- {record?.UomName}
-
-
-
- Id:{' '}
-
- {record?.QRCode || record?.ProdId}
-
-
-
- MRP:{' '}
-
- {'MRP : ' + record?.MRP}
-
-
-
- Selling Price:{' '}
-
- {record?.SellPrice}
-
-
-
-

-
+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ console.log(copyCount, 'copyCount8');
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+
{record?.BrName || detail?.BrName}
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
-
-
-
- Product Name:{' '}
-
12 ? 'text-ellipsis' : ''}`}
- >
- {proName}
+
+
+
+ Product Name:{' '}
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName || record?.ProdName}
+
-
-
- SIZE: {size}
-
-
- Id: {ProdId}
-
-
- MRP:{' '}
-
- {'MRP : ' + detail?.MRP}
-
-
-
- Selling Price:{' '}
-
- {detail?.SellPrice}
-
-
+
+ SIZE:{' '}
+
+ {record?.Size}
+ {record?.UomName}
+
+
+
+ Id:{' '}
+
+ {record?.QRCode || record?.ProdId}
+
+
+
+ MRP:{' '}
+
+ {'MRP : ' + record?.MRP}
+
+
+
+ Selling Price:{' '}
+
+ {record?.SellPrice}
+
+
+
+
-
+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
- ))}
+
+
+
+ Product Name:{' '}
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {proName}
+
+
+
+ SIZE: {size}
+
+
+ Id: {ProdId}
+
+
+ MRP:{' '}
+
+ {'MRP : ' + detail?.MRP}
+
+
+
+ Selling Price:{' '}
+
+ {detail?.SellPrice}
+
+
+
+

+
+
+ ))}
)}
@@ -686,349 +686,349 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => {
- const hasProductName = !!templateOptions.productName;
- const hasMrp = !!templateOptions.mrp;
+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => {
+ const hasProductName = !!templateOptions.productName;
+ const hasMrp = !!templateOptions.mrp;
- const hasMDate =
- templateOptions.mDate && record?.ManufDate;
+ const hasMDate =
+ templateOptions.mDate && record?.ManufDate;
- const hasEDate = templateOptions.eDate && record?.ExpDate;
+ const hasEDate = templateOptions.eDate && record?.ExpDate;
- // IMAGE SIZE LOGIC
- let imageSize = 50;
- if (!hasMDate && !hasEDate) {
- imageSize = 52;
- }
-
- if (!hasProductName || !hasMrp) {
- imageSize = 60;
- }
-
- if (!hasProductName && !hasMrp) {
- imageSize = 80;
- }
-
- // FLEX DIRECTION LOGIC
- const forceColumnLayout =
- !hasProductName || !hasMrp || (!hasMDate && !hasEDate);
- return (
-
-
- {templateOptions.value === 'T' && (
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '90%'
- : `${imageSize}%`,
- '7px',
- record?.QRCode || record?.ProdId
- )}
-
- )}
- {hasProductName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName || record?.ProdName}
-
- )}
- {hasMrp && (
-
- {'₹' + record?.MRP}
-
- )}
- {templateOptions.value === 'C' && (
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '90%'
- : `${imageSize}%`,
- '7px',
- record?.QRCode || record?.ProdId
- )}
-
- )}
- {(hasMDate || hasEDate) && (
-
- {hasMDate && (
-
- {hasMDate && !hasEDate ? 'MFG: ' : ''}
- {formatDate(record?.ManufDate)}
-
- )}
- {hasMDate && hasEDate && (
-
|
- )}
- {hasEDate && (
-
- {!hasMDate && hasEDate ? 'EXP: ' : ''}
- {formatDate(record?.ExpDate)}
-
- )}
-
- )}
- {templateOptions.value === 'B' && (
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '25mm'
- : `${imageSize}%`,
- '7px',
- record?.QRCode || record?.ProdId
- )}
-
- )}
-
-
- );
+ // IMAGE SIZE LOGIC
+ let imageSize = 50;
+ if (!hasMDate && !hasEDate) {
+ imageSize = 52;
}
- );
- })
- : Array.from({ length: copies })?.map((_, index) => {
- const hasProductName = !!templateOptions.productName;
- const hasMrp = !!templateOptions.mrp;
- const hasMDate =
- templateOptions.mDate &&
- detail?.ProdVariantPriceDetails?.[0]?.ManufDate;
+ if (!hasProductName || !hasMrp) {
+ imageSize = 60;
+ }
- const hasEDate =
- templateOptions.eDate &&
- detail?.ProdVariantPriceDetails?.[0]?.ExpDate;
+ if (!hasProductName && !hasMrp) {
+ imageSize = 80;
+ }
- // IMAGE SIZE LOGIC
- let imageSize = 50;
- if (!hasMDate && !hasEDate) {
- imageSize = 52;
- }
-
- if (!hasProductName || !hasMrp) {
- imageSize = 60;
- }
-
- if (!hasProductName && !hasMrp) {
- imageSize = 80;
- }
-
- // FLEX DIRECTION LOGIC
- const forceColumnLayout =
- !hasProductName || !hasMrp || (!hasMDate && !hasEDate);
- return (
-
-
- {templateOptions.value === 'T' && (
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '90%'
- : `${imageSize}%`,
- '7px'
- )}
-
- )}
- {hasProductName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {nickName
- ? nickName
- : proName
- ? proName
- : 'Product Name'}
-
- )}
- {hasMrp && (
-
- {'₹' + detail?.MRP}
-
- )}
- {templateOptions.value === 'C' && (
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '90%'
- : `${imageSize}%`,
- '7px'
- )}
-
- )}
- {(hasMDate || hasEDate) && (
-
- {hasMDate && (
-
- {hasMDate && !hasEDate ? 'MFG: ' : ''}
- {formatDate(
- detail?.ProdVariantPriceDetails?.[0]
- ?.ManufDate
- )}
-
- )}
- {hasMDate && hasEDate && (
-
|
- )}
- {hasEDate && (
-
- {!hasMDate && hasEDate ? 'EXP: ' : ''}
- {formatDate(
- detail?.ProdVariantPriceDetails?.[0]?.ExpDate
- )}
-
- )}
-
- )}
- {templateOptions.value === 'B' && (
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '25mm'
- : `${imageSize}%`,
- '7px'
- )}
-
- )}
+ // FLEX DIRECTION LOGIC
+ const forceColumnLayout =
+ !hasProductName || !hasMrp || (!hasMDate && !hasEDate);
+ return (
+
+
+ {templateOptions.value === 'T' && (
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '90%'
+ : `${imageSize}%`,
+ '7px',
+ record?.QRCode || record?.ProdId
+ )}
+
+ )}
+ {hasProductName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName || record?.ProdName}
+
+ )}
+ {hasMrp && (
+
+ {'₹' + record?.MRP}
+
+ )}
+ {templateOptions.value === 'C' && (
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '90%'
+ : `${imageSize}%`,
+ '7px',
+ record?.QRCode || record?.ProdId
+ )}
+
+ )}
+ {(hasMDate || hasEDate) && (
+
+ {hasMDate && (
+
+ {hasMDate && !hasEDate ? 'MFG: ' : ''}
+ {formatDate(record?.ManufDate)}
+
+ )}
+ {hasMDate && hasEDate && (
+
|
+ )}
+ {hasEDate && (
+
+ {!hasMDate && hasEDate ? 'EXP: ' : ''}
+ {formatDate(record?.ExpDate)}
+
+ )}
+
+ )}
+ {templateOptions.value === 'B' && (
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '25mm'
+ : `${imageSize}%`,
+ '7px',
+ record?.QRCode || record?.ProdId
+ )}
+
+ )}
+
+ );
+ }
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => {
+ const hasProductName = !!templateOptions.productName;
+ const hasMrp = !!templateOptions.mrp;
+
+ const hasMDate =
+ templateOptions.mDate &&
+ detail?.ProdVariantPriceDetails?.[0]?.ManufDate;
+
+ const hasEDate =
+ templateOptions.eDate &&
+ detail?.ProdVariantPriceDetails?.[0]?.ExpDate;
+
+ // IMAGE SIZE LOGIC
+ let imageSize = 50;
+ if (!hasMDate && !hasEDate) {
+ imageSize = 52;
+ }
+
+ if (!hasProductName || !hasMrp) {
+ imageSize = 60;
+ }
+
+ if (!hasProductName && !hasMrp) {
+ imageSize = 80;
+ }
+
+ // FLEX DIRECTION LOGIC
+ const forceColumnLayout =
+ !hasProductName || !hasMrp || (!hasMDate && !hasEDate);
+ return (
+
+
+ {templateOptions.value === 'T' && (
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '90%'
+ : `${imageSize}%`,
+ '7px'
+ )}
+
+ )}
+ {hasProductName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {nickName
+ ? nickName
+ : proName
+ ? proName
+ : 'Product Name'}
+
+ )}
+ {hasMrp && (
+
+ {'₹' + detail?.MRP}
+
+ )}
+ {templateOptions.value === 'C' && (
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '90%'
+ : `${imageSize}%`,
+ '7px'
+ )}
+
+ )}
+ {(hasMDate || hasEDate) && (
+
+ {hasMDate && (
+
+ {hasMDate && !hasEDate ? 'MFG: ' : ''}
+ {formatDate(
+ detail?.ProdVariantPriceDetails?.[0]
+ ?.ManufDate
+ )}
+
+ )}
+ {hasMDate && hasEDate && (
+
|
+ )}
+ {hasEDate && (
+
+ {!hasMDate && hasEDate ? 'EXP: ' : ''}
+ {formatDate(
+ detail?.ProdVariantPriceDetails?.[0]?.ExpDate
+ )}
+
+ )}
+
+ )}
+ {templateOptions.value === 'B' && (
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '25mm'
+ : `${imageSize}%`,
+ '7px'
+ )}
+
+ )}
- );
- })}
+
+ );
+ })}
)}
@@ -1038,63 +1038,63 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B' ? '45mm' : '16mm',
- '6px',
- record?.QRCode || record?.ProdId
- )}
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName || record?.ProdName}
-
- )}
- {templateOptions.mrp && (
-
- {'MRP : ' + record?.MRP}
-
- )}
-
-
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B' ? '45mm' : '16mm'
- )}
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {proName}
-
- )}
- {templateOptions.mrp && (
-
- {'MRP : ' + detail?.MRP}
-
- )}
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B' ? '45mm' : '16mm',
+ '6px',
+ record?.QRCode || record?.ProdId
+ )}
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName || record?.ProdName}
+
+ )}
+ {templateOptions.mrp && (
+
+ {'MRP : ' + record?.MRP}
+
+ )}
+
+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B' ? '45mm' : '16mm'
+ )}
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {proName}
+
+ )}
+ {templateOptions.mrp && (
+
+ {'MRP : ' + detail?.MRP}
+
+ )}
- ))}
+
+ ))}
)}
@@ -1103,26 +1103,136 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
+ const copyCount = generateQRCodeCopy(record?.QRCode);
+
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName || record?.ProdName}
+
+ )}
+ {templateOptions.mDate && record?.ManufDate && (
+
+ {record?.ManufDate}
+
+ )}
+ {templateOptions.eDate && record?.ExpDate && (
+
+ {record?.ExpDate}
+
+ )}
+
+
+ {imageTagBarcodeAndQR(
+ '70%',
+ '6px',
+ record?.QRCode || record?.ProdId
+ )}
+ {templateOptions.mrp && (
+
{'MRP : ' + record?.MRP}
+ )}
+
+
+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {nickName
+ ? nickName
+ : proName
+ ? proName
+ : 'Product Name'}
+
+ )}
+ {templateOptions.mDate &&
+ detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
+
+ {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
+
+ )}
+ {templateOptions.eDate &&
+ detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
+
+ {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
+
+ )}
+
+
+ {imageTagBarcodeAndQR('70%')}
+ {templateOptions.mrp && (
+
{'MRP : ' + detail?.MRP}
+ )}
+
+
+ ))}
+
+ )}
+
+ {selectStyle == '50X25Single' && (
+
+
+ {selectedRecords?.length > 0
+ ? selectedRecords?.map((record, recordIndex) => {
const copyCount = generateQRCodeCopy(record?.QRCode);
return Array.from({ length: copyCount })?.map(
(_, copyIndex) => (
-
+
{templateOptions.productName && (
12 ? 'text-ellipsis' : ''}`}
+ className={`productNameBQ ${nickName ? '' : record?.ProdName?.length > 12 ? 'text-ellipsis' : ''}`}
>
{record?.NickName || record?.ProdName}
)}
{templateOptions.mDate && record?.ManufDate && (
{record?.ManufDate}
@@ -1130,7 +1240,7 @@ const StickerPrintTemplates = ({
)}
{templateOptions.eDate && record?.ExpDate && (
{record?.ExpDate}
@@ -1138,29 +1248,38 @@ const StickerPrintTemplates = ({
)}
{imageTagBarcodeAndQR(
- '70%',
+ '90%',
'6px',
record?.QRCode || record?.ProdId
)}
{templateOptions.mrp && (
-
{'MRP : ' + record?.MRP}
+
+ {'MRP : ' + record?.MRP}
+
)}
)
);
})
- : Array.from({ length: copies })?.map((_, index) => (
+ : Array.from({ length: copies })?.map((_, index) => (
-
+
{templateOptions.productName && (
12 ? 'text-ellipsis' : ''}`}
@@ -1175,7 +1294,7 @@ const StickerPrintTemplates = ({
{templateOptions.mDate &&
detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
{detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
@@ -1184,7 +1303,7 @@ const StickerPrintTemplates = ({
{templateOptions.eDate &&
detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
{detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
@@ -1192,139 +1311,20 @@ const StickerPrintTemplates = ({
)}
- {imageTagBarcodeAndQR('70%')}
+ {imageTagBarcodeAndQR('90%')}
{templateOptions.mrp && (
{'MRP : ' + detail?.MRP}
)}
))}
-
- )}
-
- {selectStyle == '50X25Single' && (
-
-
- {selectedRecords?.length > 0
- ? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
-
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName || record?.ProdName}
-
- )}
- {templateOptions.mDate && record?.ManufDate && (
-
- {record?.ManufDate}
-
- )}
- {templateOptions.eDate && record?.ExpDate && (
-
- {record?.ExpDate}
-
- )}
-
-
- {imageTagBarcodeAndQR(
- '90%',
- '6px',
- record?.QRCode || record?.ProdId
- )}
- {templateOptions.mrp && (
-
- {'MRP : ' + record?.MRP}
-
- )}
-
-
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {nickName
- ? nickName
- : proName
- ? proName
- : 'Product Name'}
-
- )}
- {templateOptions.mDate &&
- detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
-
- {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
-
- )}
- {templateOptions.eDate &&
- detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
-
- {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
-
- )}
-
-
- {imageTagBarcodeAndQR('90%')}
- {templateOptions.mrp && (
-
{'MRP : ' + detail?.MRP}
- )}
-
-
- ))}
)}
@@ -1334,57 +1334,57 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
- {imageTagBarcodeAndQR(
- 'auto',
- '6px',
- record?.QRCode || record?.ProdId
+ const copyCount = generateQRCodeCopy(record?.QRCode);
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+ {imageTagBarcodeAndQR(
+ 'auto',
+ '6px',
+ record?.QRCode || record?.ProdId
+ )}
+
+ {templateOptions.productName && (
+
+ {'Product Name :' +
+ (record?.NickName || record?.ProdName)}
+
+ )}
+ {templateOptions.sellingPrice && (
+
+ {'Selling Price :' + record?.SellPrice}
+
)}
-
- {templateOptions.productName && (
-
- {'Product Name :' +
- (record?.NickName || record?.ProdName)}
-
- )}
- {templateOptions.sellingPrice && (
-
- {'Selling Price :' + record?.SellPrice}
-
- )}
-
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
- {imageTagBarcodeAndQR()}
-
- {templateOptions.productName && (
-
- {'Product Name :' + proName}
-
- )}
- {templateOptions.sellingPrice && (
-
- {'Selling Price :' + detail?.SellPrice}
-
- )}
+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+ {imageTagBarcodeAndQR()}
+
+ {templateOptions.productName && (
+
+ {'Product Name :' + proName}
+
+ )}
+ {templateOptions.sellingPrice && (
+
+ {'Selling Price :' + detail?.SellPrice}
+
+ )}
- ))}
+
+ ))}
)}
@@ -1394,74 +1394,74 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
+ const copyCount = generateQRCodeCopy(record?.QRCode);
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
-
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {'Product Name: ' +
- (record?.NickName || record?.ProdName)}
-
- )}
- {templateOptions.mrp && (
-
- {'MRP : ' + record?.MRP}
-
- )}
- {templateOptions.sellingPrice && (
-
- {'Selling Price :' + record?.SellPrice}
-
- )}
-
-
- {imageTagBarcodeAndQR(
- 'auto',
- '6px',
- record?.QRCode || record?.ProdId
- )}
-
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {'Product Name: ' +
+ (record?.NickName || record?.ProdName)}
+
+ )}
+ {templateOptions.mrp && (
+
+ {'MRP : ' + record?.MRP}
+
+ )}
+ {templateOptions.sellingPrice && (
+
+ {'Selling Price :' + record?.SellPrice}
+
+ )}
- )
- );
- })
+
+ {imageTagBarcodeAndQR(
+ 'auto',
+ '6px',
+ record?.QRCode || record?.ProdId
+ )}
+
+
+ )
+ );
+ })
: Array.from({ length: copies })?.map((_, index) => (
-
-
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {'Product Name' + proName}
-
- )}
- {templateOptions.mrp && (
-
{'MRP : ' + detail?.MRP}
- )}
- {templateOptions.sellingPrice && (
-
- {'Selling Price :' + detail?.SellPrice}
-
- )}
-
-
- {imageTagBarcodeAndQR()}
-
+
+
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {'Product Name' + proName}
+
+ )}
+ {templateOptions.mrp && (
+
{'MRP : ' + detail?.MRP}
+ )}
+ {templateOptions.sellingPrice && (
+
+ {'Selling Price :' + detail?.SellPrice}
+
+ )}
- ))}
+
+ {imageTagBarcodeAndQR()}
+
+
+ ))}
)}
@@ -1470,124 +1470,124 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
+ const copyCount = generateQRCodeCopy(record?.QRCode);
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
-
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {'Product Name: ' +
- (record?.NickName || record?.ProdName)}
-
- )}
- {templateOptions.sellingPrice && (
-
- {'Selling Price :' + record?.SellPrice}
-
- )}
- {templateOptions.mDate && record?.ManufDate && (
-
{record?.ManufDate}
- )}
- {templateOptions.eDate && record?.ExpDate && (
-
{record?.ExpDate}
- )}
- {templateOptions.color && (
-
- {record?.Color || colorText}
-
- )}
-
-
- {
-
- {imageTagBarcodeAndQR(
- '70%',
- '6px',
- record?.QRCode || record?.ProdId
- )}
-
- }
- {templateOptions.mrp && (
-
- {'MRP : ' + record?.MRP}
-
- )}
-
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {'Product Name: ' +
+ (record?.NickName || record?.ProdName)}
+
+ )}
+ {templateOptions.sellingPrice && (
+
+ {'Selling Price :' + record?.SellPrice}
+
+ )}
+ {templateOptions.mDate && record?.ManufDate && (
+
{record?.ManufDate}
+ )}
+ {templateOptions.eDate && record?.ExpDate && (
+
{record?.ExpDate}
+ )}
+ {templateOptions.color && (
+
+ {record?.Color || colorText}
+
+ )}
- )
- );
- })
+
+ {
+
+ {imageTagBarcodeAndQR(
+ '70%',
+ '6px',
+ record?.QRCode || record?.ProdId
+ )}
+
+ }
+ {templateOptions.mrp && (
+
+ {'MRP : ' + record?.MRP}
+
+ )}
+
+
+ )
+ );
+ })
: Array.from({ length: copies })?.map((_, index) => (
+
-
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {'Product Name' + (nickName ? nickName : proName)}
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {'Product Name' + (nickName ? nickName : proName)}
+
+ )}
+ {templateOptions.sellingPrice && (
+
+ {'Selling Price :' + detail?.SellPrice}
+
+ )}
+ {templateOptions.mDate &&
+ detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
+
+ {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
)}
- {templateOptions.sellingPrice && (
-
- {'Selling Price :' + detail?.SellPrice}
+ {templateOptions.eDate &&
+ detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
+
+ {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
)}
- {templateOptions.mDate &&
- detail?.ProdVariantPriceDetails?.[0]?.ManufDate && (
-
- {detail?.ProdVariantPriceDetails?.[0]?.ManufDate}
-
- )}
- {templateOptions.eDate &&
- detail?.ProdVariantPriceDetails?.[0]?.ExpDate && (
-
- {detail?.ProdVariantPriceDetails?.[0]?.ExpDate}
-
- )}
- {templateOptions.color && (
-
{colorText}
- )}
-
-
- {
{imageTagBarcodeAndQR('70%')}
}
- {templateOptions.mrp && (
-
{'MRP : ' + detail?.MRP}
- )}
-
+ {templateOptions.color && (
+
{colorText}
+ )}
- ))}
+
+ {
{imageTagBarcodeAndQR('70%')}
}
+ {templateOptions.mrp && (
+
{'MRP : ' + detail?.MRP}
+ )}
+
+
+ ))}
)}
@@ -1596,102 +1596,102 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
+ const copyCount = generateQRCodeCopy(record?.QRCode);
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
-
- {templateOptions.value === 'T' &&
- imageTagBarcodeAndQR(
- templateOptions.codeType === 'B' ? '100%' : '6mm',
- '6px',
- record?.QRCode || record?.ProdId
- )}
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {record?.NickName
- ? record?.NickName
- : record?.ProdName}
-
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
+ {templateOptions.value === 'T' &&
+ imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B' ? '100%' : '6mm',
+ '6px',
+ record?.QRCode || record?.ProdId
)}
- {templateOptions.value === 'C' &&
- imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '80%'
- : !templateOptions.productName &&
- !templateOptions.mrp
- ? '80%'
- : '35%',
- '6px',
- record?.QRCode || record?.ProdId
- )}
- {templateOptions.mrp && (
-
- {'₹:' + record?.MRP}
-
- )}
- {templateOptions.value === 'B' &&
- imageTagBarcodeAndQR(
- templateOptions.codeType === 'B' ? '100%' : '50%',
- '6px',
- record?.QRCode || record?.ProdId
- )}
-
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
- {templateOptions.value === 'T' &&
- imageTagBarcodeAndQR(
- templateOptions.codeType === 'B' ? '100%' : '6mm'
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {record?.NickName
+ ? record?.NickName
+ : record?.ProdName}
+
)}
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {nickName
- ? nickName
- : proName
- ? proName
- : 'Product Name'}
-
- )}
- {templateOptions.value === 'C' &&
- imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '80%'
- : !templateOptions.productName && !templateOptions.mrp
+ {templateOptions.value === 'C' &&
+ imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
? '80%'
- : '7.5mm',
- '5px'
+ : !templateOptions.productName &&
+ !templateOptions.mrp
+ ? '80%'
+ : '35%',
+ '6px',
+ record?.QRCode || record?.ProdId
+ )}
+ {templateOptions.mrp && (
+
+ {'₹:' + record?.MRP}
+
)}
- {templateOptions.mrp && (
-
- {'₹:' + (detail?.MRP ? detail?.MRP : 10.0)}
-
+ {templateOptions.value === 'B' &&
+ imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B' ? '100%' : '50%',
+ '6px',
+ record?.QRCode || record?.ProdId
+ )}
+
+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+ {templateOptions.value === 'T' &&
+ imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B' ? '100%' : '6mm'
)}
- {templateOptions.value === 'B' &&
- imageTagBarcodeAndQR(
- templateOptions.codeType === 'B' ? '100%' : '7.5mm'
- )}
-
- ))}
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis' : ''}`}
+ >
+ {nickName
+ ? nickName
+ : proName
+ ? proName
+ : 'Product Name'}
+
+ )}
+ {templateOptions.value === 'C' &&
+ imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '80%'
+ : !templateOptions.productName && !templateOptions.mrp
+ ? '80%'
+ : '7.5mm',
+ '5px'
+ )}
+ {templateOptions.mrp && (
+
+ {'₹:' + (detail?.MRP ? detail?.MRP : 10.0)}
+
+ )}
+ {templateOptions.value === 'B' &&
+ imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B' ? '100%' : '7.5mm'
+ )}
+
+ ))}
)}
@@ -1701,36 +1701,36 @@ const StickerPrintTemplates = ({
{selectedRecords?.length > 0
? selectedRecords?.map((record, recordIndex) => {
- const copyCount = generateQRCodeCopy(record?.QRCode);
+ const copyCount = generateQRCodeCopy(record?.QRCode);
- return Array.from({ length: copyCount })?.map(
- (_, copyIndex) => (
+ return Array.from({ length: copyCount })?.map(
+ (_, copyIndex) => (
+
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '100%'
- : !templateOptions.mrp &&
- !templateOptions.productName
- ? '60%'
- : '40%',
- '8px',
- record?.QRCode || record?.ProdId
- )}
- {(templateOptions.productName ||
- templateOptions.mrp) && (
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '100%'
+ : !templateOptions.mrp &&
+ !templateOptions.productName
+ ? '60%'
+ : '40%',
+ '8px',
+ record?.QRCode || record?.ProdId
+ )}
+ {(templateOptions.productName ||
+ templateOptions.mrp) && (
)}
-
- )
- );
- })
- : Array.from({ length: copies })?.map((_, index) => (
-
-
- {imageTagBarcodeAndQR(
- templateOptions.codeType === 'B'
- ? '100%'
- : !templateOptions.mrp && !templateOptions.productName
- ? '60%'
- : '40%',
- '8px'
- )}
- {(templateOptions.productName || templateOptions.mrp) && (
-
- {templateOptions.productName && (
-
12 ? 'text-ellipsis' : ''}`}
- >
- {nickName
- ? nickName
- : proName
- ? proName
- : 'Product Name'}
-
- )}
- {templateOptions.mrp && (
-
- {'MRP : ' + detail?.MRP}
-
- )}
-
- )}
+ )
+ );
+ })
+ : Array.from({ length: copies })?.map((_, index) => (
+
+
+ {imageTagBarcodeAndQR(
+ templateOptions.codeType === 'B'
+ ? '100%'
+ : !templateOptions.mrp && !templateOptions.productName
+ ? '60%'
+ : '40%',
+ '8px'
+ )}
+ {(templateOptions.productName || templateOptions.mrp) && (
+
+ {templateOptions.productName && (
+
12 ? 'text-ellipsis2' : ''}`}
+ >
+ {nickName
+ ? nickName
+ : proName
+ ? proName
+ : 'Product Name'}
+
+ )}
+ {templateOptions.mrp && (
+
+ {'MRP : ' + detail?.MRP}
+
+ )}
+
+ )}
- ))}
+
+ ))}
)}
diff --git a/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx b/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
index a787009..1712d21 100644
--- a/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
+++ b/src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
@@ -1182,7 +1182,8 @@ const PaymentPdfBooking = ({
{'Adjustment Amount'}
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
- {(lastTransaction?.Amount || 0).toFixed(2)}
+ {Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
+ (lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}