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

sales bill edit fix after testing

This commit is contained in:
unknown 2026-02-06 19:41:52 +05:30
parent d514d2ca70
commit 1664a6d568
20 changed files with 1523 additions and 1469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
View File

@ -3457,15 +3457,9 @@ const StandardTablePayment = () => {
<div>Total :</div>
<p>
₹
{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)}
</p>
</div>
</div>

1
src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx
View File

@ -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)),
}));

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

@ -2434,7 +2434,8 @@ const InvoiceTemplate = ({
'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -3405,7 +3406,8 @@ const InvoiceTemplate = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div

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

@ -976,7 +976,8 @@ const PrintA4Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2019,7 +2020,8 @@ const PrintA4Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2672,7 +2674,8 @@ const PrintA4Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -3238,7 +3241,8 @@ const PrintA4Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>

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

@ -977,7 +977,8 @@ const PrintA5Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -1957,7 +1958,8 @@ const PrintA5Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2549,7 +2551,8 @@ const PrintA5Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2589,7 +2592,8 @@ const PrintA5Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -3136,7 +3140,8 @@ const PrintA5Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -3176,7 +3181,8 @@ const PrintA5Style11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>

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

@ -1267,7 +1267,8 @@ const PrintStyle1 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2130,7 +2131,8 @@ const PrintStyle1 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>
@ -2958,7 +2960,8 @@ const PrintStyle1 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>
@ -4443,7 +4446,8 @@ const PrintStyle1 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>

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

@ -1861,7 +1861,8 @@ const PrintStyle10 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -2810,7 +2811,8 @@ const PrintStyle10 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -4360,7 +4362,8 @@ const PrintStyle10 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div

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

@ -1829,7 +1829,8 @@ const PrintStyle11 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -2782,7 +2783,8 @@ const PrintStyle11 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -4290,7 +4292,8 @@ const PrintStyle11 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div

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

@ -1826,7 +1826,8 @@ const Printstyle12 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -2813,7 +2814,8 @@ const Printstyle12 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -4379,7 +4381,8 @@ const Printstyle12 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div

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

@ -1716,7 +1716,8 @@ const Printstyle2 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2587,7 +2588,8 @@ const Printstyle2 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -4144,7 +4146,8 @@ const Printstyle2 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>

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

@ -536,7 +536,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -934,7 +935,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -1451,7 +1453,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>

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

@ -1679,7 +1679,8 @@ const Printstyle4 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2640,7 +2641,8 @@ const Printstyle4 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -4391,7 +4393,8 @@ const Printstyle4 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>

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

@ -1498,7 +1498,8 @@ const PrintStyle5 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2238,7 +2239,8 @@ const PrintStyle5 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -3693,7 +3695,8 @@ const PrintStyle5 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>

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

@ -1695,7 +1695,8 @@ const Printstyle6 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -2696,7 +2697,8 @@ const Printstyle6 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
@ -4372,7 +4374,8 @@ const Printstyle6 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>

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

@ -1464,7 +1464,8 @@ const PrintStyle7 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -2370,7 +2371,8 @@ const PrintStyle7 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -3855,7 +3857,8 @@ const PrintStyle7 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div

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

@ -1738,7 +1738,8 @@ const Printstyle8 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -2734,7 +2735,8 @@ const Printstyle8 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -4322,7 +4324,8 @@ const Printstyle8 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div

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

@ -1887,7 +1887,8 @@ const PrintStyle9 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -2869,7 +2870,8 @@ const PrintStyle9 = ({
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div
@ -4448,7 +4450,8 @@ const PrintStyle9 = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div

10
src/Pages/Product/Printstyles.js
View File

@ -600,7 +600,7 @@ height: 149mm;
line-height: 1;
white-space: nowrap;
text-align: center;
max-width: 100%;
}
.productNameBQSmall {
@ -826,6 +826,14 @@ height: 149mm;
text-overflow: ellipsis;
}
.text-ellipsis2 {
width: 80%;
white-space: nowrap;
overflow: hidden;
text-align: center;
text-overflow: ellipsis;
}
.text-clamp-2 {
display: -webkit-box;
-webkit-line-clamp: 2;

5
src/Pages/Product/StickerTemplates.jsx
View File

@ -20,7 +20,7 @@ const StickerPrintTemplates = ({
(find) => find.SessionName === dropdownValue
);
const templateAvailable = template === undefined ? false : true;
console.log(proName?.length > 12, "proNameproName")
function choosenPrintStyle(dropdownValue, templateAvailable) {
switch (dropdownValue) {
case '15X15 6cross':
@ -1792,11 +1792,12 @@ const StickerPrintTemplates = ({
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
width: '100%',
}}
>
{templateOptions.productName && (
<div
className={`productNameBQ ${templateOptions.codeType === 'B' ? '' : 'productNameBQSmall'} ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis' : ''}`}
className={`productNameBQ ${templateOptions.codeType === 'B' ? '' : 'productNameBQSmall'} ${nickName ? '' : proName?.length > 12 ? 'text-ellipsis2' : ''}`}
>
{nickName
? nickName

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

@ -1182,7 +1182,8 @@ const PaymentPdfBooking = ({
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>