printstylechanges
This commit is contained in:
parent
b1a4f3ec16
commit
52bcdcff12
|
|
@ -22,3 +22,6 @@ dist-ssr
|
||||||
*.njsproj
|
*.njsproj
|
||||||
*.sln
|
*.sln
|
||||||
*.sw?
|
*.sw?
|
||||||
|
|
||||||
|
src/routesConfig.jsx
|
||||||
|
vite.config.js
|
||||||
|
|
@ -105,6 +105,12 @@ const InvoiceTemplate = ({
|
||||||
const GlobalBilltext = useSelector(GlobalBillName);
|
const GlobalBilltext = useSelector(GlobalBillName);
|
||||||
const GlobalLogo = useSelector(GlobalprintLogo);
|
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||||
const SettingData = useSelector(PreferenceData);
|
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -1018,9 +1024,10 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||||
table2Data?.FYStatus
|
table2Data?.FYStatus
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', margin: '0rem 0rem', fontWeight: '600' }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
@ -1508,9 +1515,9 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||||
fontFamily: 'sans-serif',
|
fontFamily: 'sans-serif',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1548,10 +1555,9 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||||
fontFamily: 'sans-serif',
|
fontFamily: 'sans-serif',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3224,9 +3230,9 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||||
className="table-header-cell"
|
className="table-header-cell"
|
||||||
style={{ textAlign: 'right' }}
|
style={{ textAlign: 'right' }}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3261,9 +3267,9 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||||
className="table-header-cell"
|
className="table-header-cell"
|
||||||
style={{ textAlign: 'right' }}
|
style={{ textAlign: 'right' }}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -130,6 +130,12 @@ const PrintA4Style11 = ({
|
||||||
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 Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||||
|
);
|
||||||
|
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||||
|
);
|
||||||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -533,9 +539,10 @@ const PrintA4Style11 = ({
|
||||||
>
|
>
|
||||||
{' '}
|
{' '}
|
||||||
<div>{Date1}</div>{' '}
|
<div>{Date1}</div>{' '}
|
||||||
{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>}
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -932,9 +939,9 @@ const PrintA4Style11 = ({
|
||||||
)
|
)
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -955,11 +962,9 @@ const PrintA4Style11 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt -
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
item?.OfferAmt || 0
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
: item?.TotalAmt -
|
|
||||||
item?.OfferValue || 0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1993,9 +1998,9 @@ const PrintA4Style11 = ({
|
||||||
)
|
)
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -2016,11 +2021,9 @@ const PrintA4Style11 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt -
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
item?.OfferAmt || 0
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
: item?.TotalAmt -
|
|
||||||
item?.OfferValue || 0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -130,6 +130,12 @@ const PrintA5Style11 = ({
|
||||||
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 Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||||
|
);
|
||||||
|
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||||
|
);
|
||||||
const estimatePrintHeader =
|
const estimatePrintHeader =
|
||||||
SettingData?.[0]?.SettingDtlDetails?.find(
|
SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
(setting) =>
|
(setting) =>
|
||||||
|
|
@ -529,9 +535,10 @@ const PrintA5Style11 = ({
|
||||||
>
|
>
|
||||||
{' '}
|
{' '}
|
||||||
<div>{Date1}</div>{' '}
|
<div>{Date1}</div>{' '}
|
||||||
{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>}
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -905,9 +912,9 @@ const PrintA5Style11 = ({
|
||||||
)
|
)
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -927,11 +934,9 @@ const PrintA5Style11 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt -
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
item?.OfferAmt || 0
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
: item?.TotalAmt -
|
|
||||||
item?.OfferValue || 0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1882,9 +1887,9 @@ const PrintA5Style11 = ({
|
||||||
)
|
)
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1904,11 +1909,9 @@ const PrintA5Style11 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt -
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
item?.OfferAmt || 0
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
: item?.TotalAmt -
|
|
||||||
item?.OfferValue || 0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,12 @@ const TaxInvoice = ({
|
||||||
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
|
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
|
||||||
)?.SettingValue === 'Y';
|
)?.SettingValue === 'Y';
|
||||||
let BillName = printDatas?.PrintHdrName;
|
let BillName = printDatas?.PrintHdrName;
|
||||||
|
const Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||||
|
);
|
||||||
|
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||||
|
);
|
||||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||||
|
|
|
||||||
|
|
@ -128,6 +128,13 @@ const PrintStyle1 = ({
|
||||||
const GlobalBilltext = useSelector(GlobalBillName);
|
const GlobalBilltext = useSelector(GlobalBillName);
|
||||||
const appPreferences = useSelector(ApplicationPreferences);
|
const appPreferences = useSelector(ApplicationPreferences);
|
||||||
const SettingData = useSelector(PreferenceData);
|
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 bookingTypePreference = appPreferences?.find(
|
const bookingTypePreference = appPreferences?.find(
|
||||||
(preference) => preference?.PreferredCatName === 'Booking Type'
|
(preference) => preference?.PreferredCatName === 'Booking Type'
|
||||||
)?.PreferenceCatDetails;
|
)?.PreferenceCatDetails;
|
||||||
|
|
@ -494,7 +501,8 @@ const PrintStyle1 = ({
|
||||||
width: '100%',
|
width: '100%',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div style={{ display: 'flex', justifyContent: 'center', ...(GlobaldummyData
|
<div style={{
|
||||||
|
display: 'flex', justifyContent: 'center', ...(GlobaldummyData
|
||||||
? {
|
? {
|
||||||
color: SelectedHeaderFontColor,
|
color: SelectedHeaderFontColor,
|
||||||
backgroundColor: SelectedHeaderColor,
|
backgroundColor: SelectedHeaderColor,
|
||||||
|
|
@ -502,7 +510,8 @@ const PrintStyle1 = ({
|
||||||
: {
|
: {
|
||||||
color: headerColor?.font,
|
color: headerColor?.font,
|
||||||
backgroundColor: headerColor?.background,
|
backgroundColor: headerColor?.background,
|
||||||
}), }}>
|
}),
|
||||||
|
}}>
|
||||||
{GlobaldummyData ? (
|
{GlobaldummyData ? (
|
||||||
GlobalLogo && (
|
GlobalLogo && (
|
||||||
<img
|
<img
|
||||||
|
|
@ -679,9 +688,10 @@ const PrintStyle1 = ({
|
||||||
{' '}
|
{' '}
|
||||||
Date : {GlobaldummyData ? formattedDate : Date1}{' '}
|
Date : {GlobaldummyData ? formattedDate : Date1}{' '}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
|
|
||||||
|
|
@ -977,9 +987,9 @@ const PrintStyle1 = ({
|
||||||
? GlobalDiscount && <td>{item.discount}</td>
|
? GlobalDiscount && <td>{item.discount}</td>
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1002,10 +1012,9 @@ const PrintStyle1 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== "C"
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1216,9 +1225,9 @@ const PrintStyle1 = ({
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td>
|
<td>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1241,10 +1250,9 @@ const PrintStyle1 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== "C"
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -4241,9 +4249,9 @@ const PrintStyle1 = ({
|
||||||
? GlobalDiscount && <td>{item.discount}</td>
|
? GlobalDiscount && <td>{item.discount}</td>
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -4266,9 +4274,10 @@ const PrintStyle1 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
{item?.Type !== "C"
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
|
||||||
|
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -4459,9 +4468,10 @@ const PrintStyle1 = ({
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td>
|
<td>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -4478,15 +4488,15 @@ const PrintStyle1 = ({
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
? GlobalAmount && (
|
? GlobalAmount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: "right" }}>
|
||||||
{item?.TotalAmt}
|
{item?.TotalAmt}
|
||||||
</td>
|
</td>
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount === true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: "right" }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== "C"
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -111,6 +111,12 @@ const PrintStyle10 = ({
|
||||||
const GlobalLogo = useSelector(GlobalprintLogo);
|
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||||
const SettingData = useSelector(PreferenceData);
|
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -577,9 +583,10 @@ const PrintStyle10 = ({
|
||||||
{' '}
|
{' '}
|
||||||
{GlobaldummyData ? formattedDate : Date1}{' '}
|
{GlobaldummyData ? formattedDate : Date1}{' '}
|
||||||
</div>
|
</div>
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', fontWeight: 600, textAlign: 'right' }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
<hr class="straightline" />
|
<hr class="straightline" />
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -883,9 +890,9 @@ const PrintStyle10 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -919,10 +926,9 @@ const PrintStyle10 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1180,9 +1186,9 @@ const PrintStyle10 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1216,10 +1222,9 @@ const PrintStyle10 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3496,9 +3501,9 @@ const PrintStyle10 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3532,9 +3537,9 @@ const PrintStyle10 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3753,9 +3758,9 @@ const PrintStyle10 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3789,9 +3794,9 @@ const PrintStyle10 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -131,6 +131,12 @@ const PrintStyle11 = ({
|
||||||
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 Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||||
|
);
|
||||||
|
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||||
|
);
|
||||||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -868,9 +874,9 @@ const PrintStyle11 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -904,10 +910,9 @@ const PrintStyle11 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1140,9 +1145,9 @@ const PrintStyle11 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1176,10 +1181,9 @@ const PrintStyle11 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3211,9 +3215,10 @@ const PrintStyle11 = ({
|
||||||
table2Data?.FYStatus
|
table2Data?.FYStatus
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{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>}
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
@ -3505,9 +3510,9 @@ const PrintStyle11 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3541,9 +3546,9 @@ const PrintStyle11 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3744,9 +3749,9 @@ const PrintStyle11 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3780,9 +3785,9 @@ const PrintStyle11 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -133,6 +133,12 @@ const Printstyle12 = ({
|
||||||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
const Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||||
|
);
|
||||||
|
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||||
|
);
|
||||||
const estimatePrintHeader =
|
const estimatePrintHeader =
|
||||||
SettingData?.[0]?.SettingDtlDetails?.find(
|
SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
(setting) =>
|
(setting) =>
|
||||||
|
|
@ -1049,9 +1055,9 @@ const Printstyle12 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1074,10 +1080,9 @@ const Printstyle12 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1269,9 +1274,9 @@ const Printstyle12 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1294,10 +1299,9 @@ const Printstyle12 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3716,9 +3720,9 @@ const Printstyle12 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3741,9 +3745,9 @@ const Printstyle12 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3923,9 +3927,9 @@ const Printstyle12 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3948,9 +3952,9 @@ const Printstyle12 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -126,6 +126,12 @@ const Printstyle2 = ({
|
||||||
const GlobalLogo = useSelector(GlobalprintLogo);
|
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||||
const SettingData = useSelector(PreferenceData);
|
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -584,7 +590,7 @@ const Printstyle2 = ({
|
||||||
{GlobaldummyData ? formattedDate : Date1}
|
{GlobaldummyData ? formattedDate : Date1}
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1084,7 +1090,8 @@ const Printstyle2 = ({
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
? GlobalTax && (
|
? GlobalTax && (
|
||||||
<th
|
<th
|
||||||
style={{ width: '10px',textAlign: 'center',...tableHeaderStyle,
|
style={{
|
||||||
|
width: '10px', textAlign: 'center', ...tableHeaderStyle,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Tax %
|
Tax %
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,12 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
||||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||||
const SettingData = useSelector(PreferenceData);
|
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -200,7 +206,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
||||||
|
|
||||||
if (hasMappedOffer) {
|
if (hasMappedOffer) {
|
||||||
|
|
||||||
const productTotal = productsData?.reduce((acc, item) => acc + (item?.Type != "C" ? item.OfferAmt : item.OfferValue || 0), 0);
|
const productTotal = productsData?.reduce((acc, item) => acc + (item?.Type !== 'C' ? (item?.OfferAmt || item?.DiscountAmt || 0) : (item?.OfferValue || item?.DiscountAmt || 0)), 0);
|
||||||
TotalOfferAmount += productTotal;
|
TotalOfferAmount += productTotal;
|
||||||
} else {
|
} else {
|
||||||
const Combothere = productsData?.filter(item => item?.Type == "C")
|
const Combothere = productsData?.filter(item => item?.Type == "C")
|
||||||
|
|
@ -319,9 +325,10 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
||||||
<div className="PrintStyle3-print-ordr-dtls">
|
<div className="PrintStyle3-print-ordr-dtls">
|
||||||
<div style={{ lineheight: '50px' }}>
|
<div style={{ lineheight: '50px' }}>
|
||||||
<div style={{ fontSize: '14px', fontWeight: 600 }} > BILL NO :{GlobaldummyData ? '51' : table2Data?.OrderId && extractLastNumberOrderId(table2Data?.OrderId, table2Data?.FYStatus)} </div>
|
<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 }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
<div style={{ fontSize: '14px', fontWeight: 600 }} > {GlobaldummyData ? formattedDate : Date1}</div>
|
<div style={{ fontSize: '14px', fontWeight: 600 }} > {GlobaldummyData ? formattedDate : Date1}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -421,9 +428,15 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
||||||
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
|
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
|
||||||
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'center' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
|
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'center' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
|
||||||
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
|
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
|
||||||
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0}</div>}
|
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>
|
||||||
|
{item?.Type !== 'C'
|
||||||
|
? (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 ? 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 || 0 : item?.TotalAmt - item?.OfferValue || 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>}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -464,9 +477,11 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
||||||
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
|
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
|
||||||
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'right' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
|
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'right' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
|
||||||
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
|
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
|
||||||
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0}</div>}
|
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Type !== 'C'
|
||||||
|
? (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 ? 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 || 0 : item?.TotalAmt - item?.OfferValue || 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>}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1397,9 +1412,11 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
||||||
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
|
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
|
||||||
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'center' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
|
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'center' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
|
||||||
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
|
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
|
||||||
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0}</div>}
|
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Type !== 'C'
|
||||||
|
? (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 ? 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 || 0 : item?.TotalAmt - item?.OfferValue || 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>}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1440,9 +1457,13 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
||||||
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
|
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
|
||||||
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'right' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
|
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'right' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
|
||||||
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
|
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
|
||||||
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Type != "C" ? item?.OfferAmt || 0 : item?.OfferValue || 0}</div>}
|
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>
|
||||||
|
{item?.Type !== 'C'
|
||||||
|
? (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 ? 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 || 0 : item?.TotalAmt - item?.OfferValue || 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>}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -123,6 +123,12 @@ const Printstyle4 = ({
|
||||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||||
const SettingData = useSelector(PreferenceData);
|
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 totalGSTData = [
|
const totalGSTData = [
|
||||||
(OrderDetailGST || []).reduce(
|
(OrderDetailGST || []).reduce(
|
||||||
(acc, item) => ({
|
(acc, item) => ({
|
||||||
|
|
@ -923,8 +929,8 @@ const Printstyle4 = ({
|
||||||
: Discount) && (
|
: Discount) && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type !== 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
@ -940,9 +946,9 @@ const Printstyle4 = ({
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type !== 'C'
|
{item?.Type !== 'C'
|
||||||
? (item?.TotalAmt || 0) -
|
? (item?.TotalAmt || 0) -
|
||||||
(item?.OfferAmt || 0)
|
(item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: (item?.TotalAmt || 0) -
|
: (item?.TotalAmt || 0) -
|
||||||
(item?.OfferValue || 0)}
|
(item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1205,9 +1211,9 @@ const Printstyle4 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1242,10 +1248,9 @@ const Printstyle4 = ({
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3317,9 +3322,11 @@ const Printstyle4 = ({
|
||||||
>
|
>
|
||||||
<div>
|
<div>
|
||||||
Dt: {GlobaldummyData ? formattedDate : Date1}
|
Dt: {GlobaldummyData ? formattedDate : Date1}
|
||||||
{SalesModePref?.SettingValue == 'Y' && (
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
<div> Name : {table2Data?.SalesMode == 'R' ? 'RT' : 'WS'} </div>
|
{' '}
|
||||||
)}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -3714,9 +3721,9 @@ const Printstyle4 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
@ -3740,9 +3747,9 @@ const Printstyle4 = ({
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3926,8 +3933,7 @@ const Printstyle4 = ({
|
||||||
item1.IMEI2 ||
|
item1.IMEI2 ||
|
||||||
item1.SerialNumber
|
item1.SerialNumber
|
||||||
)?.Description
|
)?.Description
|
||||||
? ` ${
|
? ` ${item.ProductIdentifierDtls.find(
|
||||||
item.ProductIdentifierDtls.find(
|
|
||||||
(item1) =>
|
(item1) =>
|
||||||
item1.IMEI1 ||
|
item1.IMEI1 ||
|
||||||
item1.IMEI2 ||
|
item1.IMEI2 ||
|
||||||
|
|
@ -4001,9 +4007,9 @@ const Printstyle4 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -4038,9 +4044,9 @@ const Printstyle4 = ({
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -123,6 +123,12 @@ const PrintStyle5 = ({
|
||||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||||
|
const Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||||
|
);
|
||||||
|
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||||
|
);
|
||||||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -949,9 +955,9 @@ const PrintStyle5 = ({
|
||||||
<div
|
<div
|
||||||
style={{ width: '100%', textAlign: 'right' }}
|
style={{ width: '100%', textAlign: 'right' }}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -983,9 +989,9 @@ const PrintStyle5 = ({
|
||||||
style={{ width: '100%', textAlign: 'right' }}
|
style={{ width: '100%', textAlign: 'right' }}
|
||||||
>
|
>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1272,9 +1278,9 @@ const PrintStyle5 = ({
|
||||||
<div
|
<div
|
||||||
style={{ width: '100%', textAlign: 'right' }}
|
style={{ width: '100%', textAlign: 'right' }}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1306,9 +1312,9 @@ const PrintStyle5 = ({
|
||||||
style={{ width: '100%', textAlign: 'right' }}
|
style={{ width: '100%', textAlign: 'right' }}
|
||||||
>
|
>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -2895,9 +2901,10 @@ const PrintStyle5 = ({
|
||||||
>
|
>
|
||||||
{' '}
|
{' '}
|
||||||
<div> {GlobaldummyData ? formattedDate : Date1}
|
<div> {GlobaldummyData ? formattedDate : Date1}
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '14px', fontWeight: 600 }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
</div>{' '}
|
</div>{' '}
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -3270,9 +3277,9 @@ const PrintStyle5 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<div style={{ width: '100%', textAlign: 'right' }}>
|
<div style={{ width: '100%', textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3296,9 +3303,9 @@ const PrintStyle5 = ({
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<div style={{ width: '100%', textAlign: 'right' }}>
|
<div style={{ width: '100%', textAlign: 'right' }}>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -3561,9 +3568,9 @@ const PrintStyle5 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<div style={{ width: '100%', textAlign: 'right' }}>
|
<div style={{ width: '100%', textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3587,9 +3594,9 @@ const PrintStyle5 = ({
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<div style={{ width: '100%', textAlign: 'right' }}>
|
<div style={{ width: '100%', textAlign: 'right' }}>
|
||||||
{' '}
|
{' '}
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -124,6 +124,12 @@ const Printstyle6 = ({
|
||||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||||
|
const Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||||
|
);
|
||||||
|
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||||
|
);
|
||||||
console.log(CashierNameField, "GlobaldummyData")
|
console.log(CashierNameField, "GlobaldummyData")
|
||||||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
|
|
@ -957,9 +963,9 @@ const Printstyle6 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1005,10 +1011,9 @@ const Printstyle6 = ({
|
||||||
// paddingRight: "20px",
|
// paddingRight: "20px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1345,9 +1350,9 @@ const Printstyle6 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1393,10 +1398,9 @@ const Printstyle6 = ({
|
||||||
// paddingRight: "20px",
|
// paddingRight: "20px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3526,9 +3530,10 @@ const Printstyle6 = ({
|
||||||
table2Data?.FYStatus
|
table2Data?.FYStatus
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '10px', fontWeight: 600 }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
|
|
||||||
<div style={{ fontSize: '12px' }}>{Date1}</div>
|
<div style={{ fontSize: '12px' }}>{Date1}</div>
|
||||||
|
|
@ -3775,9 +3780,9 @@ const Printstyle6 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3823,9 +3828,9 @@ const Printstyle6 = ({
|
||||||
// paddingRight: "20px",
|
// paddingRight: "20px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -4094,9 +4099,9 @@ const Printstyle6 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -4142,9 +4147,9 @@ const Printstyle6 = ({
|
||||||
// paddingRight: "20px",
|
// paddingRight: "20px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -129,6 +129,12 @@ const PrintStyle7 = ({
|
||||||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
const Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||||
|
);
|
||||||
|
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
|
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||||
|
);
|
||||||
const estimatePrintHeader =
|
const estimatePrintHeader =
|
||||||
SettingData?.[0]?.SettingDtlDetails?.find(
|
SettingData?.[0]?.SettingDtlDetails?.find(
|
||||||
(setting) =>
|
(setting) =>
|
||||||
|
|
@ -859,9 +865,9 @@ const PrintStyle7 = ({
|
||||||
? GlobalDiscount && <td>{item.discount}</td>
|
? GlobalDiscount && <td>{item.discount}</td>
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -884,10 +890,9 @@ const PrintStyle7 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1125,9 +1130,9 @@ const PrintStyle7 = ({
|
||||||
? GlobalDiscount && <td>{item.discount}</td>
|
? GlobalDiscount && <td>{item.discount}</td>
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1150,10 +1155,9 @@ const PrintStyle7 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3108,9 +3112,10 @@ const PrintStyle7 = ({
|
||||||
)}
|
)}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '10px', fontWeight: 600 }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
</div>
|
</div>
|
||||||
<div className="PrintStyle7-SecondDiv2">
|
<div className="PrintStyle7-SecondDiv2">
|
||||||
|
|
@ -3344,9 +3349,9 @@ const PrintStyle7 = ({
|
||||||
? GlobalDiscount && <td>{item.discount}</td>
|
? GlobalDiscount && <td>{item.discount}</td>
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3369,9 +3374,9 @@ const PrintStyle7 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3583,9 +3588,9 @@ const PrintStyle7 = ({
|
||||||
? GlobalDiscount && <td>{item.discount}</td>
|
? GlobalDiscount && <td>{item.discount}</td>
|
||||||
: Discount == true && (
|
: Discount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3608,9 +3613,9 @@ const PrintStyle7 = ({
|
||||||
)
|
)
|
||||||
: Amount == true && (
|
: Amount == true && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -115,6 +115,12 @@ const Printstyle8 = ({
|
||||||
const GlobalLogo = useSelector(GlobalprintLogo);
|
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||||
const SettingData = useSelector(PreferenceData);
|
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -944,9 +950,9 @@ const Printstyle8 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -990,10 +996,9 @@ const Printstyle8 = ({
|
||||||
textAlign: 'right',
|
textAlign: 'right',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1312,9 +1317,9 @@ const Printstyle8 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1358,10 +1363,9 @@ const Printstyle8 = ({
|
||||||
textAlign: 'right',
|
textAlign: 'right',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3461,9 +3465,10 @@ const Printstyle8 = ({
|
||||||
table2Data?.FYStatus
|
table2Data?.FYStatus
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '10px', fontWeight: 600 }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
<div style={{ fontSize: "10px" }}>
|
<div style={{ fontSize: "10px" }}>
|
||||||
{GlobaldummyData ? formattedDate : Date1}
|
{GlobaldummyData ? formattedDate : Date1}
|
||||||
|
|
@ -3686,9 +3691,9 @@ const Printstyle8 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3732,9 +3737,9 @@ const Printstyle8 = ({
|
||||||
textAlign: 'right',
|
textAlign: 'right',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3963,9 +3968,9 @@ const Printstyle8 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -4009,9 +4014,9 @@ const Printstyle8 = ({
|
||||||
textAlign: 'right',
|
textAlign: 'right',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -112,6 +112,12 @@ const PrintStyle9 = ({
|
||||||
const GlobalLogo = useSelector(GlobalprintLogo);
|
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||||
const SettingData = useSelector(PreferenceData);
|
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||||
(i) => i.SettingIdName === 'PrintUom'
|
(i) => i.SettingIdName === 'PrintUom'
|
||||||
)?.[0];
|
)?.[0];
|
||||||
|
|
@ -907,9 +913,9 @@ const PrintStyle9 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -943,10 +949,9 @@ const PrintStyle9 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -1179,9 +1184,9 @@ const PrintStyle9 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -1215,10 +1220,9 @@ const PrintStyle9 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue ||
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
0}
|
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3338,9 +3342,10 @@ const PrintStyle9 = ({
|
||||||
table2Data?.FYStatus
|
table2Data?.FYStatus
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', fontWeight: 600 }}>
|
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||||
{' '}
|
{' '}
|
||||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||||
|
|
||||||
</div>}
|
</div>}
|
||||||
<div style={{ fontSize: '12px', fontWeight: '400' }}>
|
<div style={{ fontSize: '12px', fontWeight: '400' }}>
|
||||||
{' '}
|
{' '}
|
||||||
|
|
@ -3583,11 +3588,12 @@ const PrintStyle9 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
? GlobalTax && (
|
? GlobalTax && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
|
|
@ -3619,9 +3625,9 @@ const PrintStyle9 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -3818,9 +3824,9 @@ const PrintStyle9 = ({
|
||||||
)
|
)
|
||||||
: Discount && (
|
: Discount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.OfferAmt || 0
|
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.OfferValue || 0}
|
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{GlobaldummyData
|
{GlobaldummyData
|
||||||
|
|
@ -3854,9 +3860,9 @@ const PrintStyle9 = ({
|
||||||
)
|
)
|
||||||
: Amount && (
|
: Amount && (
|
||||||
<td style={{ textAlign: 'right' }}>
|
<td style={{ textAlign: 'right' }}>
|
||||||
{item?.Type != 'C'
|
{item?.Type !== 'C'
|
||||||
? item?.TotalAmt - item?.OfferAmt || 0
|
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||||
: item?.TotalAmt - item?.OfferValue || 0}
|
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue