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

Merge pull request 'taxinvoicechangesandeditbill' (#257) from priceoverride into main 

Reviewed-on: Pozomind/pozo-retail-app#257
This commit is contained in:
karthikalakshmi 2026-03-06 14:50:58 +05:30
parent 1941b68d9e cfddaef6ad
commit 255a9b8df5
2 changed files with 77 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3180,13 +3180,13 @@ const BSBillingEditQuantity = (props) => {
...( ...(
!offerApply && itemDiscountPrice > 0 !offerApply && itemDiscountPrice > 0
? { ? {
DiscountAmt: safeRound(itemDiscountPrice), DiscountAmt: safeRound(itemDiscountPrice*fixedQty ),
DiscountType: itemDiscountPercentageSelection === 'Fixed' ? 'F' : 'P', DiscountType: itemDiscountPercentageSelection === 'Fixed' ? 'F' : 'P',
DiscountValue: DiscountValue:
itemDiscountPercentageSelection === 'Fixed' itemDiscountPercentageSelection === 'Fixed'
? itemDiscountPrice ? itemDiscountPrice*fixedQty
: ( : (
(itemDiscountPrice / (itemDiscountPrice*fixedQty /
(newPrice > 0 ? newPrice : editedProduct?.OrderRate)) * 100 (newPrice > 0 ? newPrice : editedProduct?.OrderRate)) * 100
) )
} }
@ -3301,7 +3301,7 @@ const BSBillingEditQuantity = (props) => {
const { OfferType = null, OfferPrice = 0 } = product; const { OfferType = null, OfferPrice = 0 } = product;
let totalAmount = qty * rate; let totalAmount = qty * rate;
totalAmount = totalAmount - (itemDiscountPrice || 0); totalAmount = totalAmount - (itemDiscountPrice*qty|| 0);
const taxAmount = ( const taxAmount = (
(totalAmount * taxPercentage) / (totalAmount * taxPercentage) /
(100 + taxPercentage) (100 + taxPercentage)

83
src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
View File

@ -13,6 +13,7 @@ import {
GlobalSelectedFooterFontColor, GlobalSelectedFooterFontColor,
GlobalSelectedNetAmountColor, GlobalSelectedNetAmountColor,
GlobalSelectedNetAmountFontColor, GlobalSelectedNetAmountFontColor,
GloabalFieldDetails,
} from '../../../../Features/ThemeChange/ThemeChange'; } from '../../../../Features/ThemeChange/ThemeChange';
import { isMobile } from 'react-device-detect'; import { isMobile } from 'react-device-detect';
import { extractLastNumberOrderId } from '../../../../Services/Others'; import { extractLastNumberOrderId } from '../../../../Services/Others';
@ -70,6 +71,10 @@ const TaxInvoice = ({
const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor; const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor;
const footerColor = printColors?.find(obj => obj.footerColor)?.footerColor; const footerColor = printColors?.find(obj => obj.footerColor)?.footerColor;
const netAmtColor = printColors?.find(obj => obj.netAmtColor)?.netAmtColor; const netAmtColor = printColors?.find(obj => obj.netAmtColor)?.netAmtColor;
const FieldDetails = useSelector(GloabalFieldDetails);
console.log(FieldDetails,"FieldDetails")
const Discount = FieldDetails?.['Discount'];
console.log(Discount, "Discount")
// Function to convert number to words // Function to convert number to words
const numberToWords = (num) => { const numberToWords = (num) => {
const a = [ const a = [
@ -802,7 +807,8 @@ const TaxInvoice = ({
<div <div
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 8% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// '5% 40% 12% 11% 16% 8% 16%',
fontSize: '10px', fontSize: '10px',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
borderBottom: '1px solid #000', borderBottom: '1px solid #000',
@ -855,6 +861,15 @@ const TaxInvoice = ({
> >
Rate Rate
</div> </div>
{Discount && <div
style={{
padding: '8px 4px',
borderRight: '1px solid #000',
textAlign: 'center',
}}
>
Disc
</div>}
{/* <div style={{ padding: '8px 4px', borderRight: '1px solid #000', textAlign: 'center' }}>per</div> */} {/* <div style={{ padding: '8px 4px', borderRight: '1px solid #000', textAlign: 'center' }}>per</div> */}
<div style={{ padding: '8px 4px', textAlign: 'center' }}> <div style={{ padding: '8px 4px', textAlign: 'center' }}>
Amount Amount
@ -869,7 +884,7 @@ const TaxInvoice = ({
key={index} key={index}
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
...(index % 2 === 0 && rowtypeStyle === "even" ...(index % 2 === 0 && rowtypeStyle === "even"
? tableBodyStyle ? tableBodyStyle
@ -976,6 +991,21 @@ const TaxInvoice = ({
maximumFractionDigits: 2, maximumFractionDigits: 2,
})} })}
</div> </div>
{Discount && <div
style={{
padding: '4px 4px',
borderRight: '1px solid #000',
textAlign: 'right',
}}
>
{Number(
(item.DiscountAmt / item.SalesQty) || 0
).toLocaleString('en-IN', {
minimumFractionDigits: 2,
maximumFractionDigits: 2,
})}
</div>}
{/* <div style={{ padding: '8px 4px', borderRight: '1px solid #000', textAlign: 'center' }}>{item.UomName || 'NOS'}</div> */} {/* <div style={{ padding: '8px 4px', borderRight: '1px solid #000', textAlign: 'center' }}>{item.UomName || 'NOS'}</div> */}
<div <div
style={{ style={{
@ -1003,7 +1033,7 @@ const TaxInvoice = ({
<div <div
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16% ' : '5% 40% 12% 11% 16% 16% ',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
fontSize: '15px', fontSize: '15px',
minHeight: '22px', minHeight: '22px',
@ -1017,6 +1047,7 @@ const TaxInvoice = ({
borderRight: '1px solid #000', borderRight: '1px solid #000',
}} }}
></div> ></div>
{Discount && <div style={{ borderRight: '1px solid #000' }}></div>}
<div style={{ borderRight: '1px solid #000' }}></div> <div style={{ borderRight: '1px solid #000' }}></div>
<div style={{ borderRight: '1px solid #000' }}></div> <div style={{ borderRight: '1px solid #000' }}></div>
<div style={{ borderRight: '1px solid #000' }}></div> <div style={{ borderRight: '1px solid #000' }}></div>
@ -1048,7 +1079,7 @@ const TaxInvoice = ({
<div <div
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
fontSize: '11px', fontSize: '11px',
fontWeight: '700', fontWeight: '700',
@ -1067,6 +1098,9 @@ const TaxInvoice = ({
> >
CGST CGST
</div> </div>
{Discount && <div
style={{ borderRight: '1px solid #000' }}
></div>}
<div <div
style={{ borderRight: '1px solid #000' }} style={{ borderRight: '1px solid #000' }}
></div> ></div>
@ -1100,7 +1134,7 @@ const TaxInvoice = ({
<div <div
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
fontSize: '11px', fontSize: '11px',
fontWeight: '700', fontWeight: '700',
@ -1119,6 +1153,9 @@ const TaxInvoice = ({
> >
SGST SGST
</div> </div>
{Discount && <div
style={{ borderRight: '1px solid #000' }}
></div>}
<div <div
style={{ borderRight: '1px solid #000' }} style={{ borderRight: '1px solid #000' }}
></div> ></div>
@ -1155,7 +1192,7 @@ const TaxInvoice = ({
<div <div
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
fontSize: '11px', fontSize: '11px',
fontWeight: '700', fontWeight: '700',
@ -1174,6 +1211,9 @@ const TaxInvoice = ({
> >
IGST IGST
</div> </div>
{Discount && <div
style={{ borderRight: '1px solid #000' }}
></div>}
<div <div
style={{ borderRight: '1px solid #000' }} style={{ borderRight: '1px solid #000' }}
></div> ></div>
@ -1211,7 +1251,7 @@ const TaxInvoice = ({
<div <div
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
// borderBottom: '1px solid #000', // borderBottom: '1px solid #000',
fontSize: '11px', fontSize: '11px',
@ -1229,6 +1269,10 @@ const TaxInvoice = ({
> >
ROUNDING OFF ROUNDING OFF
</div> </div>
{Discount && <div
style={{ borderRight: '1px solid #000' }}
></div>}
<div style={{ borderRight: '1px solid #000' }}></div> <div style={{ borderRight: '1px solid #000' }}></div>
<div style={{ borderRight: '1px solid #000' }}></div> <div style={{ borderRight: '1px solid #000' }}></div>
<div style={{ borderRight: '1px solid #000' }}></div> <div style={{ borderRight: '1px solid #000' }}></div>
@ -1248,7 +1292,7 @@ const TaxInvoice = ({
key={`empty-${idx}`} key={`empty-${idx}`}
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
minHeight: '32px', // Adjust height as needed for your design minHeight: '32px', // Adjust height as needed for your design
@ -1272,6 +1316,15 @@ const TaxInvoice = ({
> >
&nbsp; &nbsp;
</div> </div>
{Discount && <div
style={{
padding: '4px 4px',
borderRight: '1px solid #000',
textAlign: 'center',
}}
>
&nbsp;
</div>}
<div <div
style={{ style={{
padding: '4px 4px', padding: '4px 4px',
@ -1311,7 +1364,7 @@ const TaxInvoice = ({
<div <div
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 11% 16% 16%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// borderRight: '1px solid #000', // borderRight: '1px solid #000',
borderBottom: '1px solid #000', borderBottom: '1px solid #000',
borderTop: '1px solid #000', borderTop: '1px solid #000',
@ -1347,6 +1400,7 @@ const TaxInvoice = ({
0}{' '} 0}{' '}
NOS NOS
</div> </div>
{Discount && <div style={{ borderRight: '1px solid #000' }}></div>}
<div style={{ borderRight: '1px solid #000' }}></div> <div style={{ borderRight: '1px solid #000' }}></div>
{/* <div style={{ borderRight: '1px solid #000'}}></div> */} {/* <div style={{ borderRight: '1px solid #000'}}></div> */}
<div <div
@ -1376,7 +1430,7 @@ const TaxInvoice = ({
<div <div
style={{ style={{
display: 'grid', display: 'grid',
gridTemplateColumns: '5% 40% 12% 10% 12% 8% 13%', gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
// borderBottom: '1px solid #000', // borderBottom: '1px solid #000',
borderLeft: '1px solid #000', borderLeft: '1px solid #000',
borderRight: '1px solid #000', borderRight: '1px solid #000',
@ -1403,6 +1457,15 @@ const TaxInvoice = ({
> >
No items to display No items to display
</div> </div>
{Discount && <div
style={{
padding: '8px 4px',
borderRight: '1px solid #000',
textAlign: 'center',
}}
>
-
</div>}
<div <div
style={{ style={{
padding: '8px 4px', padding: '8px 4px',