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

resolve rate bug

This commit is contained in:
Tamilselvan 2026-03-05 18:50:08 +05:30
parent 90ae54a261
commit 09eb9bb75a
17 changed files with 164 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx
View File

@ -3156,10 +3156,10 @@ const BSBillingEditQuantity = (props) => {
const updatedProduct = {
...editedProduct,
OrderQty: fixedQty,
OrderRate: newPrice > 0 ? newPrice : editedProduct?.OrderRate,
OrderRate: editedPrice > 0 ? editedPrice : editedProduct?.OrderRate,
...calculateTaxAmounts({
qty: qty,
rate: newPrice > 0 ? newPrice : editedProduct?.OrderRate,
rate: editedPrice > 0 ? editedPrice : editedProduct?.OrderRate,
taxPercentage: editedProduct?.TaxPercentage,
type: editedProduct?.Type,
product: editedProduct,
@ -3167,7 +3167,7 @@ const BSBillingEditQuantity = (props) => {
PackageDtl: PackageDtl,
// ✅ FIXED: Proper conditional property assignment
...(offerApply && {
Offer: qty * (newPrice > 0 ? newPrice : editedProduct?.OrderRate),
Offer: qty * (editedPrice > 0 ? editedPrice : editedProduct?.OrderRate),
}),
...(
!offerApply && itemDiscountPrice > 0
@ -3291,7 +3291,9 @@ const BSBillingEditQuantity = (props) => {
isOfferApply = false,
}) => {
const { OfferType = null, OfferPrice = 0 } = product;
const totalAmount = qty * rate;
let totalAmount = qty * rate;
totalAmount = totalAmount - (itemDiscountPrice || 0);
const taxAmount = (
(totalAmount * taxPercentage) /
(100 + taxPercentage)
@ -3307,7 +3309,7 @@ const BSBillingEditQuantity = (props) => {
return {
TotalAmt:
type === 'C' && OfferPrice > 0
? totalAmount - (offerValue || 0)
? totalAmount - (offerValue || 0)
: totalAmount,
TaxAmt: parseFloat(taxAmount),
WithoutTaxRate: parseFloat(withoutTaxRate),

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

@ -1556,8 +1556,8 @@ const InvoiceTemplate = ({
}}
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -510,9 +510,10 @@ const PrintA4Style11 = ({
table2Data?.OrderId,
table2Data?.FYStatus
)}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', margin: '0rem 0.5rem', fontWeight: 600 }}>
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
{GlobaldummyData && '685'}
</div>
@ -963,8 +964,8 @@ const PrintA4Style11 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -2022,8 +2023,8 @@ const PrintA4Style11 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -935,8 +935,8 @@ const PrintA5Style11 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1910,8 +1910,8 @@ const PrintA5Style11 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -1013,8 +1013,8 @@ const PrintStyle1 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== "C"
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
? item?.TotalAmt - (item?.OfferAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? 0)}
</td>
)}
</tr>
@ -1251,8 +1251,8 @@ const PrintStyle1 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== "C"
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
? item?.TotalAmt - (item?.OfferAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? 0)}
</td>
)}
</tr>
@ -4276,8 +4276,8 @@ const PrintStyle1 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== "C"
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
? item?.TotalAmt - (item?.OfferAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? 0)}
</td>
)}
</tr>
@ -4495,8 +4495,8 @@ const PrintStyle1 = ({
: Amount === true && (
<td style={{ textAlign: "right" }}>
{item?.Type !== "C"
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
? item?.TotalAmt - (item?.OfferAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? 0)}
</td>
)}
</tr>

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

@ -927,8 +927,8 @@ const PrintStyle10 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1223,8 +1223,8 @@ const PrintStyle10 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3538,8 +3538,8 @@ const PrintStyle10 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3795,8 +3795,8 @@ const PrintStyle10 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -563,10 +563,11 @@ const PrintStyle11 = ({
table2Data?.FYStatus
)}
</div>
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', margin: '0rem 0.5rem', fontWeight: 600 }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
</div>}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
</div>
)}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
@ -911,8 +912,8 @@ const PrintStyle11 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1182,8 +1183,8 @@ const PrintStyle11 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3547,8 +3548,8 @@ const PrintStyle11 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3786,8 +3787,8 @@ const PrintStyle11 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -1081,8 +1081,8 @@ const Printstyle12 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1300,8 +1300,8 @@ const Printstyle12 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3746,8 +3746,8 @@ const Printstyle12 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3953,8 +3953,8 @@ const Printstyle12 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -948,9 +948,9 @@ const Printstyle2 = ({
style={{ textAlign: 'right' }}
>
{' '}
{item?.Type != 'C'
? item?.OfferAmt || 0
: item?.OfferValue || 0}
{item?.Type !== 'C'
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}
</td>
)}
{GlobaldummyData
@ -1256,9 +1256,9 @@ const Printstyle2 = ({
style={{ textAlign: 'right' }}
>
{' '}
{item?.Type != 'C'
? item?.OfferAmt || 0
: item?.OfferValue || 0}
{item?.Type !== 'C'
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}
</td>
)}
{GlobaldummyData
@ -3837,9 +3837,9 @@ const Printstyle2 = ({
style={{ textAlign: 'right' }}
>
{' '}
{item?.Type != 'C'
? item?.OfferAmt || 0
: item?.OfferValue || 0}
{item?.Type !== 'C'
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}
</td>
)}
{GlobaldummyData

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

@ -206,7 +206,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
if (hasMappedOffer) {
const productTotal = productsData?.reduce((acc, item) => acc + (item?.Type !== 'C' ? (item?.OfferAmt || item?.DiscountAmt || 0) : (item?.OfferValue || item?.DiscountAmt || 0)), 0);
const productTotal = productsData?.reduce((acc, item) => acc + (item?.Type !== 'C' ? (item?.OfferAmt || 0) : (item?.OfferValue || 0)), 0);
TotalOfferAmount += productTotal;
} else {
const Combothere = productsData?.filter(item => item?.Type == "C")
@ -435,7 +435,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
}
{GlobaldummyData ? GlobalTax && <div style={{ width: '100%', textAlign: 'right' }}>{item?.ProdTaxPercentage || 0}</div> : (Tax == true && table2Data?.OrderType !== 'E') && (<div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.ProdTaxPercentage || 0}</div>)}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} >
{item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) : item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
{item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}
</div>}
</div>
))}
@ -481,7 +481,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}</div>}
{GlobaldummyData ? GlobalTax && <div style={{ width: '100%', textAlign: 'right' }}>{item?.ProdTaxPercentage || 0}</div> : (Tax == true && table2Data?.OrderType !== 'E') && (<div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.ProdTaxPercentage || 0}</div>)}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) : item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}</div>}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}</div>}
</div>
))}
</div>
@ -1313,11 +1313,11 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
<div className="PrintStyle3-print-ordr-dtls">
<div style={{ lineheight: '50px' }}>
<div style={{ fontSize: '14px', fontWeight: 600 }} > BILL NO :{GlobaldummyData ? '51' : table2Data?.OrderId && extractLastNumberOrderId(table2Data?.OrderId, table2Data?.FYStatus)} </div>
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '14px', fontWeight: 600 }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
</div>}
<div style={{ fontSize: '14px', fontWeight: 600 }} > {GlobaldummyData ? formattedDate : Date1}</div>
</div>
</div>
@ -1416,7 +1416,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}</div>}
{GlobaldummyData ? GlobalTax && <div style={{ width: '100%', textAlign: 'right' }}>{item?.ProdTaxPercentage || 0}</div> : (Tax == true && table2Data?.OrderType !== 'E') && (<div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.ProdTaxPercentage || 0}</div>)}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) : item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}</div>}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}</div>}
</div>
))}
</div>
@ -1463,7 +1463,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
: (item?.OfferValue || item?.DiscountAmt || 0)}
</div>}
{GlobaldummyData ? GlobalTax && <div style={{ width: '100%', textAlign: 'right' }}>{item?.ProdTaxPercentage || 0}</div> : (Tax == true && table2Data?.OrderType !== 'E') && (<div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.ProdTaxPercentage || 0}</div>)}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) : item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}</div>}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}</div>}
</div>
))}
</div>

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

@ -567,12 +567,11 @@ const Printstyle4 = ({
>
<div style={{ fontSize: '12px', fontWeight: '500' }}>
Dt: {GlobaldummyData ? formattedDate : Date1}
{SalesModePref?.SettingValue == 'Y' && (
<div style={{ fontSize: '12px', fontWeight: '500' }}>
{' '}
Name : {table2Data?.SalesMode == 'R' ? 'RT' : 'WS'}{' '}
</div>
)}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
</div>
<div style={{ fontSize: '12px', fontWeight: '500' }}>
@ -946,9 +945,9 @@ const Printstyle4 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? (item?.TotalAmt || 0) -
(item?.OfferAmt || item?.DiscountAmt || 0)
(item?.OfferAmt || 0)
: (item?.TotalAmt || 0) -
(item?.OfferValue || item?.DiscountAmt || 0)}
(item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1249,8 +1248,8 @@ const Printstyle4 = ({
<td style={{ textAlign: 'right' }}>
{' '}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3748,8 +3747,8 @@ const Printstyle4 = ({
<td style={{ textAlign: 'right' }}>
{' '}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -4045,8 +4044,8 @@ const Printstyle4 = ({
<td style={{ textAlign: 'right' }}>
{' '}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -556,10 +556,11 @@ const PrintStyle5 = ({
>
{' '}
<div> {GlobaldummyData ? formattedDate : Date1}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '14px', fontWeight: 600 }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
</div>}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
</div>{' '}
<div>
@ -990,8 +991,8 @@ const PrintStyle5 = ({
>
{' '}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</div>
)}
</div>
@ -1313,8 +1314,8 @@ const PrintStyle5 = ({
>
{' '}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</div>
)}
</div>
@ -3304,8 +3305,8 @@ const PrintStyle5 = ({
<div style={{ width: '100%', textAlign: 'right' }}>
{' '}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</div>
)}
</div>
@ -3595,8 +3596,8 @@ const PrintStyle5 = ({
<div style={{ width: '100%', textAlign: 'right' }}>
{' '}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</div>
)}
</div>

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

@ -592,10 +592,11 @@ const Printstyle6 = ({
table2Data?.FYStatus
)}
</div>
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '14px', fontWeight: 600 }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
</div>}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
<div style={{ fontSize: '12px' }}>{Date1}</div>
<hr className="PrintStyle6-HrLine" />
@ -1013,7 +1014,7 @@ const Printstyle6 = ({
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1400,7 +1401,7 @@ const Printstyle6 = ({
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3830,7 +3831,7 @@ const Printstyle6 = ({
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -4149,7 +4150,7 @@ const Printstyle6 = ({
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -605,10 +605,11 @@ const PrintStyle7 = ({
table2Data?.FYStatus
)}
</div>
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '10px', fontWeight: 600 }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
</div>}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
</div>
<div className="PrintStyle7-SecondDiv2">
<div
@ -892,7 +893,7 @@ const PrintStyle7 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1157,7 +1158,7 @@ const PrintStyle7 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3376,7 +3377,7 @@ const PrintStyle7 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3615,7 +3616,7 @@ const PrintStyle7 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -599,7 +599,7 @@ const Printstyle8 = ({
</div>
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '10px', fontWeight: 600 }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
<div style={{ fontSize: "10px" }}>
{GlobaldummyData ? formattedDate : Date1}
@ -997,8 +997,8 @@ const Printstyle8 = ({
}}
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1364,8 +1364,8 @@ const Printstyle8 = ({
}}
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3738,8 +3738,8 @@ const Printstyle8 = ({
}}
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -4015,8 +4015,8 @@ const Printstyle8 = ({
}}
>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -602,10 +602,11 @@ const PrintStyle9 = ({
table2Data?.FYStatus
)}
</div>
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', fontWeight: 600 }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
</div>}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
<div style={{ fontSize: '12px', fontWeight: '400' }}>
{' '}
{GlobaldummyData ? formattedDate : Date1}{' '}
@ -950,8 +951,8 @@ const PrintStyle9 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -1221,8 +1222,8 @@ const PrintStyle9 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3626,8 +3627,8 @@ const PrintStyle9 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>
@ -3861,8 +3862,8 @@ const PrintStyle9 = ({
: Amount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
</tr>

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

@ -95,6 +95,12 @@ const PaymentPdfBooking = ({
console.log(printerTemplateStyle, "printerTemplateStyle")
const appPreferences = useSelector(ApplicationPreferences);
const SettingData = useSelector(PreferenceData);
const Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
);
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
);
const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
@ -483,11 +489,11 @@ const PaymentPdfBooking = ({
table2Data?.FYStatus
)}
</div>
{SalesModePref?.SettingValue == 'Y' &&
<div style={{ fontSize: '12px', fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
</div>}
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
</div>}
<div className="Re-print-bold1">Date:{Date1}</div>
</div>
{TakeawayData?.length > 0 && (
@ -586,9 +592,9 @@ const PaymentPdfBooking = ({
<td className="Re-print-body-Rate">{item?.Rate}</td>
{TakeawayTotalOfferAmt > 0 && (
<td className="Re-print-body-Rate">
{item?.Type != 'C'
? item?.OfferAmt || 0
: item?.OfferValue || 0}
{item?.Type !== 'C'
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}
</td>
)}
{table2Data?.OrderType !== 'E' ? (
@ -606,9 +612,9 @@ const PaymentPdfBooking = ({
(accumulator, currentValue) => accumulator + currentValue,
0,
) +item?.TotalAmt:item?.TotalAmt} */}
{item?.Type != 'C'
? item?.TotalAmt - item?.OfferAmt || 0
: item?.TotalAmt - item?.OfferValue || 0}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
</tr>
);
@ -669,9 +675,9 @@ const PaymentPdfBooking = ({
<td className="Re-print-body-Rate">{item?.Rate}</td>
{DineinTotalOfferAmt > 0 && (
<td className="Re-print-body-Rate">
{item?.Type != 'C'
? item?.OfferAmt || 0
: item?.OfferValue || 0}
{item?.Type !== 'C'
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}
</td>
)}
{table2Data?.OrderType !== 'E' ? (
@ -689,9 +695,9 @@ const PaymentPdfBooking = ({
(accumulator, currentValue) => accumulator + currentValue,
0,
) +item?.TotalAmt:item?.TotalAmt} */}
{item?.Type != 'C'
? item?.TotalAmt - item?.OfferAmt || 0
: item?.TotalAmt - item?.OfferValue || 0}
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
</tr>
);