Merge pull request 'priceoverride' (#243) from priceoverride into main
Reviewed-on: Pozomind/pozo-retail-app#243
This commit is contained in:
commit
0ab58996a6
|
|
@ -22,3 +22,6 @@ dist-ssr
|
|||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
|
||||
src/routesConfig.jsx
|
||||
vite.config.js
|
||||
|
|
@ -2454,12 +2454,12 @@ const BSBillingTable1 = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${item.OfferPrice}`
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -2745,12 +2745,12 @@ const BSBillingTable1 = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${item.OfferPrice}`
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -3090,12 +3090,12 @@ const BSBillingTable1 = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${item.OfferPrice}`
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -3413,15 +3413,16 @@ const BSBillingTable1 = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${item.OfferPrice}`
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ export default function BST1Payment() {
|
|||
const RetailWSSalesType = useSelector(GlobalRetailWSSalesType);
|
||||
const SelCustId = useSelector(GlobalSelCustId);
|
||||
const selOption = useSelector(GlobalSelOption);
|
||||
console.log(selOption, 'selOptionbst234343',GetCustId);
|
||||
console.log(selOption, 'selOptionbst234343', GetCustId);
|
||||
|
||||
const SelectedTableDetails = useSelector(GlobalSelectedTableDetails);
|
||||
const GlobalAddCustomerDetails1 = useSelector(GlobalAddCustomerDetails);
|
||||
|
|
@ -2051,6 +2051,9 @@ export default function BST1Payment() {
|
|||
BatchRef: a.BatchRef,
|
||||
PackageDtl: a.PackageDtl,
|
||||
SetCount: a.SetCount,
|
||||
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
|
||||
...(a?.DiscountType && { DiscountType: a.DiscountType }),
|
||||
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
|
||||
}));
|
||||
const NotSlectedTypeFind = temporderdetail?.find(
|
||||
(a) => a?.BookingType != SelectedBookingType
|
||||
|
|
|
|||
|
|
@ -2130,7 +2130,9 @@ const BSBillingTable2 = () => {
|
|||
ModelNumber: a.ModelNumber,
|
||||
BatchRef: a.BatchRef,
|
||||
PackageDtl: a.PackageDtl,
|
||||
SetCount: a.SetCount,
|
||||
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
|
||||
...(a?.DiscountType && { DiscountType: a.DiscountType }),
|
||||
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
|
||||
}));
|
||||
const NotSlectedTypeFind = temporderdetail?.find(
|
||||
(a) => a?.BookingType != SelectedBookingType
|
||||
|
|
|
|||
|
|
@ -2599,12 +2599,12 @@ const BSBillingTable3 = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
:item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -2881,7 +2881,7 @@ const BSBillingTable3 = () => {
|
|||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -3206,7 +3206,7 @@ const BSBillingTable3 = () => {
|
|||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
|
||||
|
|
@ -3516,7 +3516,7 @@ const BSBillingTable3 = () => {
|
|||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
|
|||
|
|
@ -2154,6 +2154,9 @@ const BSBilling4Payment = () => {
|
|||
PackageDtl: a.PackageDtl,
|
||||
SetCount: a.SetCount,
|
||||
BookingDate: AvailableDate ? a.BookedDate : null,
|
||||
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
|
||||
...(a?.DiscountType && { DiscountType: a.DiscountType }),
|
||||
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
|
||||
}));
|
||||
const NotSlectedTypeFind = temporderdetail?.find(
|
||||
(a) => a?.BookingType != SelectedBookingType
|
||||
|
|
|
|||
|
|
@ -2594,12 +2594,12 @@ const BSBillingTable4 = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -2865,12 +2865,12 @@ const BSBillingTable4 = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -3189,12 +3189,12 @@ const BSBillingTable4 = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -3491,12 +3491,12 @@ const BSBillingTable4 = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
|
|||
|
|
@ -2147,6 +2147,9 @@ const BSBillingTable5 = () => {
|
|||
BatchRef: a.BatchRef,
|
||||
PackageDtl: a.PackageDtl,
|
||||
SetCount: a.SetCount,
|
||||
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
|
||||
...(a?.DiscountType && { DiscountType: a.DiscountType }),
|
||||
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
|
||||
}));
|
||||
const NotSlectedTypeFind = temporderdetail?.find(
|
||||
(a) => a?.BookingType != SelectedBookingType
|
||||
|
|
|
|||
|
|
@ -2398,14 +2398,14 @@ const BSBillingTable6 = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -2653,14 +2653,14 @@ const BSBillingTable6 = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -2954,14 +2954,14 @@ const BSBillingTable6 = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -3237,15 +3237,16 @@ const BSBillingTable6 = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import React, { useEffect, useState, useRef, lazy ,Suspense } from 'react';
|
||||
import React, { useEffect, useState, useRef, lazy, Suspense } from 'react';
|
||||
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import moment from 'moment';
|
||||
|
|
@ -2137,6 +2137,9 @@ const BST6Payment = () => {
|
|||
BatchRef: a.BatchRef,
|
||||
PackageDtl: a.PackageDtl,
|
||||
SetCount: a.SetCount,
|
||||
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
|
||||
...(a?.DiscountType && { DiscountType: a.DiscountType }),
|
||||
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
|
||||
}));
|
||||
const NotSlectedTypeFind = temporderdetail?.find(
|
||||
(a) => a?.BookingType != SelectedBookingType
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ const BSBilling7Payment = () => {
|
|||
const screenwidth = useSelector(GlobalScreenSize);
|
||||
const defaultBookingType = useSelector(GlobalDefaultBookingType);
|
||||
const printerTemplateStyle = useSelector(SelectedPrintTemplate);
|
||||
const AllBookingType=useSelector(GlobalAllBookingType)
|
||||
const AllBookingType = useSelector(GlobalAllBookingType)
|
||||
const FontFamily = useSelector(GlobalSelectedFont);
|
||||
const OrderCardDetail = useSelector(GlobalOrderCardDetails);
|
||||
const GetCustId = useSelector(GlobalCustId);
|
||||
|
|
@ -696,8 +696,7 @@ const BSBilling7Payment = () => {
|
|||
}, []);
|
||||
useEffect(() => {
|
||||
if (CompId && BranchId && AppId) {
|
||||
if(holdCheckedSalesSetup)
|
||||
{
|
||||
if (holdCheckedSalesSetup) {
|
||||
getHolddata();
|
||||
}
|
||||
// getUnpaiddatas();
|
||||
|
|
@ -1926,8 +1925,7 @@ const BSBilling7Payment = () => {
|
|||
setCurrentOrderNetAmount(0);
|
||||
setPreviousNetAmount(0);
|
||||
setUpinotSelected(false);
|
||||
if(holdCheckedSalesSetup)
|
||||
{
|
||||
if (holdCheckedSalesSetup) {
|
||||
getHolddata();
|
||||
}
|
||||
if (defaultBookingType === 'Both') {
|
||||
|
|
@ -2122,6 +2120,9 @@ const BSBilling7Payment = () => {
|
|||
BatchRef: a.BatchRef,
|
||||
PackageDtl: a.PackageDtl,
|
||||
SetCount: a.SetCount,
|
||||
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
|
||||
...(a?.DiscountType && { DiscountType: a.DiscountType }),
|
||||
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
|
||||
}));
|
||||
const NotSlectedTypeFind = temporderdetail?.find(
|
||||
(a) => a?.BookingType != SelectedBookingType
|
||||
|
|
@ -3328,10 +3329,10 @@ const BSBilling7Payment = () => {
|
|||
setDefaultPaymentMode([]);
|
||||
}
|
||||
};
|
||||
if(salesBillEdit){
|
||||
if (salesBillEdit) {
|
||||
setDefaultPaymentOption();
|
||||
}
|
||||
}, [defaultPaymentTrigger,salesBillEdit]);
|
||||
}, [defaultPaymentTrigger, salesBillEdit]);
|
||||
|
||||
const Otherserviceprint = async () => {
|
||||
if (OtherServicesPrintDetails?.length > 0) {
|
||||
|
|
|
|||
|
|
@ -2313,14 +2313,14 @@ const BSBillingTable7 = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -2539,14 +2539,14 @@ const BSBillingTable7 = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -2823,14 +2823,14 @@ const BSBillingTable7 = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -3080,14 +3080,14 @@ const BSBillingTable7 = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
|
|||
|
|
@ -2619,12 +2619,12 @@ const StandardTable = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -2943,12 +2943,12 @@ const StandardTable = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
@ -3319,12 +3319,12 @@ const StandardTable = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
|
||||
|
|
@ -3676,12 +3676,12 @@ const StandardTable = () => {
|
|||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: item.DiscountAmt ? item.DiscountAmt : '-'}
|
||||
</td>
|
||||
)}
|
||||
{tableitem.OptionName == 'Quantity' && (
|
||||
|
|
|
|||
|
|
@ -1445,6 +1445,9 @@ const StandardTablePayment = () => {
|
|||
BatchRef: a.BatchRef,
|
||||
PackageDtl: a.PackageDtl,
|
||||
SetCount: a.SetCount,
|
||||
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
|
||||
...(a?.DiscountType && { DiscountType: a.DiscountType }),
|
||||
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt }),
|
||||
BookingDate: AvailableDate
|
||||
? Object.keys(ReportholdData)?.length > 0
|
||||
? a?.BookingDate
|
||||
|
|
|
|||
|
|
@ -105,6 +105,12 @@ const InvoiceTemplate = ({
|
|||
const GlobalBilltext = useSelector(GlobalBillName);
|
||||
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -120,7 +126,7 @@ const InvoiceTemplate = ({
|
|||
)?.SettingValue === 'Y';
|
||||
const keysLength = Object.keys(table2Data ?? {}).length;
|
||||
console.log(GlobalDiscount, Discount, 'Discount');
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
|
|
@ -952,7 +958,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="header-section" style={{...headerStyle}}>
|
||||
<div className="header-section" style={{ ...headerStyle }}>
|
||||
<div>
|
||||
<div
|
||||
style={{ display: 'flex', alignItems: 'center' }}
|
||||
|
|
@ -1018,9 +1024,10 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
table2Data?.FYStatus
|
||||
)}
|
||||
</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>
|
||||
)}
|
||||
|
|
@ -1160,7 +1167,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
}}
|
||||
>
|
||||
<thead>
|
||||
<tr className="table-header" style={{...tableHeaderStyle}}>
|
||||
<tr className="table-header" style={{ ...tableHeaderStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th className="table-header-cell">S.No</th>
|
||||
|
|
@ -1508,9 +1515,9 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
fontFamily: 'sans-serif',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1548,10 +1555,9 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
fontFamily: 'sans-serif',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1988,7 +1994,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
</div>
|
||||
|
||||
{/* Footer */}
|
||||
<div className="footer-grid" style={{...footerColorStyle}}>
|
||||
<div className="footer-grid" style={{ ...footerColorStyle }}>
|
||||
<div className="footer-left">
|
||||
{BankDetails?.length > 0 && (
|
||||
<>
|
||||
|
|
@ -2551,7 +2557,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
</div>
|
||||
|
||||
{/* Footer */}
|
||||
<div className="footer-grid" style={{...footerColorStyle}}>
|
||||
<div className="footer-grid" style={{ ...footerColorStyle }}>
|
||||
<div className="footer-left">
|
||||
{BankDetails?.length > 0 && (
|
||||
<>
|
||||
|
|
@ -2773,7 +2779,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="header-section" style={{...headerStyle}}>
|
||||
<div className="header-section" style={{ ...headerStyle }}>
|
||||
<div>
|
||||
<div style={{ display: 'flex', alignItems: 'center' }}>
|
||||
{GlobalLogo && GlobaldummyData && (
|
||||
|
|
@ -2936,7 +2942,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
style={{ borderTop: '1px solid black' }}
|
||||
>
|
||||
<thead>
|
||||
<tr className="table-header" style={{...tableHeaderStyle}}>
|
||||
<tr className="table-header" style={{ ...tableHeaderStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th className="table-header-cell">S.No</th>
|
||||
|
|
@ -3224,9 +3230,9 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
className="table-header-cell"
|
||||
style={{ textAlign: 'right' }}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3261,9 +3267,9 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
className="table-header-cell"
|
||||
style={{ textAlign: 'right' }}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3539,7 +3545,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
</div>
|
||||
|
||||
{/* Footer */}
|
||||
<div className="footer-grid" style={{...footerColorStyle}}>
|
||||
<div className="footer-grid" style={{ ...footerColorStyle }}>
|
||||
<div className="footer-left">
|
||||
{(BankDetails?.length > 0 || GlobaldummyData) && (
|
||||
<>
|
||||
|
|
|
|||
|
|
@ -130,6 +130,12 @@ const PrintA4Style11 = ({
|
|||
const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor;
|
||||
const footerColor = printColors?.find(obj => obj.footerColor)?.footerColor;
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -533,9 +539,10 @@ const PrintA4Style11 = ({
|
|||
>
|
||||
{' '}
|
||||
<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>
|
||||
|
|
@ -612,8 +619,8 @@ const PrintA4Style11 = ({
|
|||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Item</th>
|
||||
: Item == true && <th style={{...tableHeaderStyle,}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Item</th>
|
||||
: Item == true && <th style={{ ...tableHeaderStyle, }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th
|
||||
|
|
@ -932,9 +939,9 @@ const PrintA4Style11 = ({
|
|||
)
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -955,11 +962,9 @@ const PrintA4Style11 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt -
|
||||
item?.OfferAmt || 0
|
||||
: item?.TotalAmt -
|
||||
item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1425,7 +1430,7 @@ const PrintA4Style11 = ({
|
|||
>{`*** Membership ${table2Data?.NetAmount === 0 ? 'Free Hours' : 'Discount'} Utilized - ${MembershipApplied?.Detail?.[0]?.MembershipName} ***`}</div>
|
||||
)}
|
||||
|
||||
<div style={{ ...footerColorStyle}}>
|
||||
<div style={{ ...footerColorStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
|
|
@ -1993,9 +1998,9 @@ const PrintA4Style11 = ({
|
|||
)
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -2016,11 +2021,9 @@ const PrintA4Style11 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt -
|
||||
item?.OfferAmt || 0
|
||||
: item?.TotalAmt -
|
||||
item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -2484,7 +2487,7 @@ const PrintA4Style11 = ({
|
|||
>{`*** Membership ${table2Data?.NetAmount === 0 ? 'Free Hours' : 'Discount'} Utilized - ${MembershipApplied?.Detail?.[0]?.MembershipName} ***`}</div>
|
||||
)}
|
||||
|
||||
<div style={{...footerColorStyle}}>
|
||||
<div style={{ ...footerColorStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
|
|
@ -3080,7 +3083,7 @@ const PrintA4Style11 = ({
|
|||
>{`*** Membership ${table2Data?.NetAmount === 0 ? 'Free Hours' : 'Discount'} Utilized - ${MembershipApplied?.Detail?.[0]?.MembershipName} ***`}</div>
|
||||
)}
|
||||
|
||||
<div style={{...footerColorStyle}}>
|
||||
<div style={{ ...footerColorStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
|
|
@ -3632,7 +3635,7 @@ const PrintA4Style11 = ({
|
|||
>{`*** Membership ${table2Data?.NetAmount === 0 ? 'Free Hours' : 'Discount'} Utilized - ${MembershipApplied?.Detail?.[0]?.MembershipName} ***`}</div>
|
||||
)}
|
||||
|
||||
<div style={{...footerColorStyle}}>
|
||||
<div style={{ ...footerColorStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -130,6 +130,12 @@ const PrintA5Style11 = ({
|
|||
const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor;
|
||||
const footerColor = printColors?.find(obj => obj.footerColor)?.footerColor;
|
||||
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 =
|
||||
SettingData?.[0]?.SettingDtlDetails?.find(
|
||||
(setting) =>
|
||||
|
|
@ -529,9 +535,10 @@ const PrintA5Style11 = ({
|
|||
>
|
||||
{' '}
|
||||
<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>
|
||||
|
|
@ -905,9 +912,9 @@ const PrintA5Style11 = ({
|
|||
)
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -927,11 +934,9 @@ const PrintA5Style11 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt -
|
||||
item?.OfferAmt || 0
|
||||
: item?.TotalAmt -
|
||||
item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1882,9 +1887,9 @@ const PrintA5Style11 = ({
|
|||
)
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1904,11 +1909,9 @@ const PrintA5Style11 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt -
|
||||
item?.OfferAmt || 0
|
||||
: item?.TotalAmt -
|
||||
item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -2929,7 +2932,7 @@ const PrintA5Style11 = ({
|
|||
>{`*** Membership ${table2Data?.NetAmount === 0 ? 'Free Hours' : 'Discount'} Utilized - ${MembershipApplied?.Detail?.[0]?.MembershipName} ***`}</div>
|
||||
)}
|
||||
|
||||
<div style={{...footerColorStyle}}>
|
||||
<div style={{ ...footerColorStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
|
|
@ -3515,7 +3518,7 @@ const PrintA5Style11 = ({
|
|||
>{`*** Membership ${table2Data?.NetAmount === 0 ? 'Free Hours' : 'Discount'} Utilized - ${MembershipApplied?.Detail?.[0]?.MembershipName} ***`}</div>
|
||||
)}
|
||||
|
||||
<div style={{...footerColorStyle}}>
|
||||
<div style={{ ...footerColorStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -47,6 +47,12 @@ const TaxInvoice = ({
|
|||
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
|
||||
)?.SettingValue === 'Y';
|
||||
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 SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
|
|
|
|||
|
|
@ -128,6 +128,13 @@ const PrintStyle1 = ({
|
|||
const GlobalBilltext = useSelector(GlobalBillName);
|
||||
const appPreferences = useSelector(ApplicationPreferences);
|
||||
const SettingData = useSelector(PreferenceData);
|
||||
const Retailshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||
(setting) => setting?.SettingIdName?.toLowerCase() === 'retailshortname'
|
||||
);
|
||||
const Wholesaleshortname = SettingData?.[0]?.SettingDtlDetails?.find(
|
||||
(setting) => setting?.SettingIdName?.toLowerCase() === 'wholesaleshortname'
|
||||
);
|
||||
|
||||
const bookingTypePreference = appPreferences?.find(
|
||||
(preference) => preference?.PreferredCatName === 'Booking Type'
|
||||
)?.PreferenceCatDetails;
|
||||
|
|
@ -494,7 +501,8 @@ const PrintStyle1 = ({
|
|||
width: '100%',
|
||||
}}
|
||||
>
|
||||
<div style={{ display: 'flex', justifyContent: 'center', ...(GlobaldummyData
|
||||
<div style={{
|
||||
display: 'flex', justifyContent: 'center', ...(GlobaldummyData
|
||||
? {
|
||||
color: SelectedHeaderFontColor,
|
||||
backgroundColor: SelectedHeaderColor,
|
||||
|
|
@ -502,7 +510,8 @@ const PrintStyle1 = ({
|
|||
: {
|
||||
color: headerColor?.font,
|
||||
backgroundColor: headerColor?.background,
|
||||
}), }}>
|
||||
}),
|
||||
}}>
|
||||
{GlobaldummyData ? (
|
||||
GlobalLogo && (
|
||||
<img
|
||||
|
|
@ -679,9 +688,10 @@ const PrintStyle1 = ({
|
|||
{' '}
|
||||
Date : {GlobaldummyData ? formattedDate : Date1}{' '}
|
||||
</div>
|
||||
|
||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||
{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||
|
||||
</div>}
|
||||
|
||||
|
|
@ -977,9 +987,9 @@ const PrintStyle1 = ({
|
|||
? GlobalDiscount && <td>{item.discount}</td>
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1002,10 +1012,9 @@ const PrintStyle1 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== "C"
|
||||
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
|
||||
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1216,9 +1225,9 @@ const PrintStyle1 = ({
|
|||
: Discount == true && (
|
||||
<td>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1241,10 +1250,9 @@ const PrintStyle1 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== "C"
|
||||
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
|
||||
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -4241,9 +4249,9 @@ const PrintStyle1 = ({
|
|||
? GlobalDiscount && <td>{item.discount}</td>
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -4266,9 +4274,10 @@ const PrintStyle1 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
|
||||
{item?.Type !== "C"
|
||||
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
|
||||
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -4459,9 +4468,10 @@ const PrintStyle1 = ({
|
|||
: Discount == true && (
|
||||
<td>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -4478,15 +4488,15 @@ const PrintStyle1 = ({
|
|||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
<td style={{ textAlign: "right" }}>
|
||||
{item?.TotalAmt}
|
||||
</td>
|
||||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
: Amount === true && (
|
||||
<td style={{ textAlign: "right" }}>
|
||||
{item?.Type !== "C"
|
||||
? item?.TotalAmt - (item?.OfferAmt ?? item?.DiscountAmt ?? 0)
|
||||
: item?.TotalAmt - (item?.OfferValue ?? item?.DiscountAmt ?? 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -111,6 +111,12 @@ const PrintStyle10 = ({
|
|||
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -577,9 +583,10 @@ const PrintStyle10 = ({
|
|||
{' '}
|
||||
{GlobaldummyData ? formattedDate : Date1}{' '}
|
||||
</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>}
|
||||
<hr class="straightline" />
|
||||
</div>
|
||||
|
|
@ -883,9 +890,9 @@ const PrintStyle10 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -919,10 +926,9 @@ const PrintStyle10 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1180,9 +1186,9 @@ const PrintStyle10 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1216,10 +1222,9 @@ const PrintStyle10 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3496,9 +3501,9 @@ const PrintStyle10 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3532,9 +3537,9 @@ const PrintStyle10 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3753,9 +3758,9 @@ const PrintStyle10 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3789,9 +3794,9 @@ const PrintStyle10 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -131,6 +131,12 @@ const PrintStyle11 = ({
|
|||
const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor;
|
||||
const footerColor = printColors?.find(obj => obj.footerColor)?.footerColor;
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -868,9 +874,9 @@ const PrintStyle11 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -904,10 +910,9 @@ const PrintStyle11 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -937,25 +942,25 @@ const PrintStyle11 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S.N</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S.N</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.N</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.N</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
)
|
||||
: Item && <th style={{...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
: Item && <th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
{' '}
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
|
|
@ -964,14 +969,14 @@ const PrintStyle11 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
|
|
@ -979,14 +984,14 @@ const PrintStyle11 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
|
|
@ -994,14 +999,14 @@ const PrintStyle11 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
|
|
@ -1009,7 +1014,7 @@ const PrintStyle11 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Tax %{' '}
|
||||
</th>
|
||||
|
|
@ -1017,7 +1022,7 @@ const PrintStyle11 = ({
|
|||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Tax %{' '}
|
||||
</th>
|
||||
|
|
@ -1025,14 +1030,14 @@ const PrintStyle11 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
|
|
@ -1040,14 +1045,14 @@ const PrintStyle11 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
|
|
@ -1140,9 +1145,9 @@ const PrintStyle11 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1176,10 +1181,9 @@ const PrintStyle11 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3211,9 +3215,10 @@ const PrintStyle11 = ({
|
|||
table2Data?.FYStatus
|
||||
)}
|
||||
</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>
|
||||
)}
|
||||
|
|
@ -3505,9 +3510,9 @@ const PrintStyle11 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3541,9 +3546,9 @@ const PrintStyle11 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3744,9 +3749,9 @@ const PrintStyle11 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3780,9 +3785,9 @@ const PrintStyle11 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -133,6 +133,12 @@ const Printstyle12 = ({
|
|||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[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 =
|
||||
SettingData?.[0]?.SettingDtlDetails?.find(
|
||||
(setting) =>
|
||||
|
|
@ -810,67 +816,67 @@ const Printstyle12 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle}}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle}}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle}}>Description</th>
|
||||
: Item && <th style={{...tableHeaderStyle}}>Des</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle }}>Description</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle }}>Des</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Qty</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Qty</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>
|
||||
{' '}
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{ ...tableHeaderStyle,textAlign: 'right' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>
|
||||
Tax (%)
|
||||
</th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>
|
||||
Tax (%)
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{ ...tableHeaderStyle,textAlign: 'right' }}>Amt</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
)}
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -1049,9 +1055,9 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1074,10 +1080,9 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1107,67 +1112,67 @@ const Printstyle12 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle,}}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle,}}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Description</th>
|
||||
: Item && <th style={{...tableHeaderStyle,}}>Des</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Description</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, }}>Des</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Qty</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Qty</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>
|
||||
{' '}
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{ ...tableHeaderStyle,textAlign: 'right' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>
|
||||
Tax (%)
|
||||
</th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>
|
||||
Tax (%)
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{ ...tableHeaderStyle,textAlign: 'right' }}>Amt</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
)}
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -1269,9 +1274,9 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1294,10 +1299,9 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3290,7 +3294,7 @@ const Printstyle12 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle12-firstDiv" style={{...headerStyle}}>
|
||||
<div className="PrintStyle12-firstDiv" style={{ ...headerStyle }}>
|
||||
{/* <h3>{table2Data?.BrName}</h3> */}
|
||||
<div style={{ display: 'flex', flexDirection: 'column' }}>
|
||||
<hr
|
||||
|
|
@ -3466,58 +3470,58 @@ const Printstyle12 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle}}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle}}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle}}>Description</th>
|
||||
: Item && <th style={{...tableHeaderStyle}}>Des</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle }}>Description</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle }}>Des</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Qty</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Qty</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>
|
||||
{' '}
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{ ...tableHeaderStyle,textAlign: 'right' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
)
|
||||
: MRP && <th style={{ ...tableHeaderStyle,textAlign: 'right' }}>MRP</th>}
|
||||
: MRP && <th style={{ ...tableHeaderStyle, textAlign: 'right' }}>MRP</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
)
|
||||
: Rate && <th style={{...tableHeaderStyle, textAlign: 'right' }}>Rate</th>}
|
||||
: Rate && <th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Rate</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{ ...tableHeaderStyle,textAlign: 'right' }}>Tax (%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Tax (%)</th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Tax (%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Tax (%)</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
)
|
||||
: Amount && <th style={{...tableHeaderStyle, textAlign: 'right' }}>Amt</th>}
|
||||
: Amount && <th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -3716,9 +3720,9 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3741,9 +3745,9 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3774,44 +3778,44 @@ const Printstyle12 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle}}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle}}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle}}>Description</th>
|
||||
: Item && <th style={{...tableHeaderStyle}}>Des</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle }}>Description</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle }}>Des</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Qty</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Qty</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>
|
||||
{' '}
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>MRP</th>
|
||||
)
|
||||
: MRP && <th style={{...tableHeaderStyle, textAlign: 'right' }}>MRP</th>}
|
||||
: MRP && <th style={{ ...tableHeaderStyle, textAlign: 'right' }}>MRP</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Rate</th>
|
||||
)
|
||||
: Rate && <th style={{...tableHeaderStyle, textAlign: 'right' }}>Rate</th>}
|
||||
: Rate && <th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Rate</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>HSN</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>(%)</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
|
|
@ -3819,13 +3823,13 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Tax (%)</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Tax (%)</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
)
|
||||
: Amount && <th style={{...tableHeaderStyle, textAlign: 'right' }}>Amt</th>}
|
||||
: Amount && <th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -3923,9 +3927,9 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3948,9 +3952,9 @@ const Printstyle12 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -4094,7 +4098,7 @@ const Printstyle12 = ({
|
|||
)}
|
||||
</>
|
||||
)}
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between',...netAmountStyle }}>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', ...netAmountStyle }}>
|
||||
<div style={{ width: '45%', fontWeight: '600' }}>Amount</div>
|
||||
<div> : </div>
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -126,6 +126,12 @@ const Printstyle2 = ({
|
|||
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -364,7 +370,7 @@ const Printstyle2 = ({
|
|||
: 0;
|
||||
|
||||
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 13);
|
||||
const headerStyle ={
|
||||
const headerStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
|
|
@ -373,7 +379,7 @@ const Printstyle2 = ({
|
|||
? SelectedHeaderFontColor
|
||||
: headerColor?.font,
|
||||
}
|
||||
const tableHeaderStyle ={
|
||||
const tableHeaderStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableHeaderColor
|
||||
: tableHeaderColor?.background,
|
||||
|
|
@ -382,7 +388,7 @@ const Printstyle2 = ({
|
|||
? SelectedTableHeaderFontColor
|
||||
: tableHeaderColor?.font,
|
||||
}
|
||||
const tableBodyStyle ={
|
||||
const tableBodyStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableBodyColor
|
||||
: tableBodyColor?.background,
|
||||
|
|
@ -390,8 +396,8 @@ const Printstyle2 = ({
|
|||
? SelectedTableBodyFontColor
|
||||
: tableBodyColor?.font,
|
||||
}
|
||||
const rowtypeStyle = GlobaldummyData? SelectedRowType: tableBodyColor?.rowType;
|
||||
const footerColorStyle ={
|
||||
const rowtypeStyle = GlobaldummyData ? SelectedRowType : tableBodyColor?.rowType;
|
||||
const footerColorStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableFooterColor
|
||||
: footerColor?.background,
|
||||
|
|
@ -400,7 +406,7 @@ const Printstyle2 = ({
|
|||
? SelectedTableFooterFontColor
|
||||
: footerColor?.font,
|
||||
}
|
||||
const netAmountStyle ={
|
||||
const netAmountStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedNetAmountColor
|
||||
: netAmtColor?.background,
|
||||
|
|
@ -461,7 +467,7 @@ const Printstyle2 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle2-fistDiv" style={{...headerStyle }}>
|
||||
<div className="PrintStyle2-fistDiv" style={{ ...headerStyle }}>
|
||||
<div style={{ display: 'flex', flexDirection: 'row' }}>
|
||||
{GlobaldummyData ? (
|
||||
GlobalLogo && (
|
||||
|
|
@ -584,7 +590,7 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData ? formattedDate : Date1}
|
||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||
{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||
|
||||
</div>}
|
||||
</div>
|
||||
|
|
@ -615,23 +621,23 @@ const Printstyle2 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '8px' }}>S.No</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px' }}>S.No</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '8px' }}>S.No</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '8px' }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle}}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
|
|
@ -639,14 +645,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
|
|
@ -654,14 +660,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
|
|
@ -669,14 +675,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
|
|
@ -684,14 +690,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
|
|
@ -723,14 +729,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
|
|
@ -814,7 +820,7 @@ const Printstyle2 = ({
|
|||
? item?.BrandName
|
||||
: ''}
|
||||
|
||||
<div style={{ display: "flex", gap: "3px" ,flexDirection:"column"}}>
|
||||
<div style={{ display: "flex", gap: "3px", flexDirection: "column" }}>
|
||||
{item?.ProductIdentifierDtls?.length >
|
||||
0
|
||||
? item?.ProductIdentifierDtls?.filter(
|
||||
|
|
@ -1000,23 +1006,23 @@ const Printstyle2 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '8px' }}>S.No</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px' }}>S.No</th>
|
||||
)
|
||||
: SLNO && <th style={{ ...tableHeaderStyle,width: '8px' }}>S.No</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '8px' }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle}}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
|
|
@ -1024,14 +1030,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
|
|
@ -1039,14 +1045,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
|
|
@ -1054,14 +1060,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
|
|
@ -1069,14 +1075,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
|
|
@ -1084,7 +1090,8 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th
|
||||
style={{ width: '10px',textAlign: 'center',...tableHeaderStyle,
|
||||
style={{
|
||||
width: '10px', textAlign: 'center', ...tableHeaderStyle,
|
||||
}}
|
||||
>
|
||||
Tax %
|
||||
|
|
@ -1093,7 +1100,7 @@ const Printstyle2 = ({
|
|||
: Tax == true &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'center',}}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center', }}
|
||||
>
|
||||
Tax %
|
||||
</th>
|
||||
|
|
@ -1101,14 +1108,14 @@ const Printstyle2 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
|
|
@ -1393,7 +1400,7 @@ const Printstyle2 = ({
|
|||
!shouldFooterBeOnNewPage &&
|
||||
FormatTheme && (
|
||||
<>
|
||||
<div className="PrintStyle2-ThirdDivMaster" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle2-ThirdDivMaster" style={{ ...netAmountStyle }}>
|
||||
<div className="PrintStyle2-ThirdP">
|
||||
<div>
|
||||
<div style={{ textAlign: 'left', fontWeight: '600' }}>
|
||||
|
|
@ -2278,7 +2285,7 @@ const Printstyle2 = ({
|
|||
}}
|
||||
>
|
||||
<>
|
||||
<div className="PrintStyle2-ThirdDivMaster" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle2-ThirdDivMaster" style={{ ...netAmountStyle }}>
|
||||
<div className="PrintStyle2-ThirdP">
|
||||
<div>
|
||||
<div style={{ textAlign: 'left', fontWeight: '600' }}>
|
||||
|
|
@ -3130,8 +3137,8 @@ const Printstyle2 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle2-fistDiv" style={{...headerStyle }}>
|
||||
<div style={{ display: 'flex', flexDirection: 'row'}}>
|
||||
<div className="PrintStyle2-fistDiv" style={{ ...headerStyle }}>
|
||||
<div style={{ display: 'flex', flexDirection: 'row' }}>
|
||||
{GlobaldummyData ? (
|
||||
GlobalLogo && (
|
||||
<img
|
||||
|
|
@ -3274,86 +3281,86 @@ const Printstyle2 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle,width: '8px' }}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '8px' }}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, width: '8px' }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '8px' }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle}}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)
|
||||
: Tax == true &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3435,7 +3442,7 @@ const Printstyle2 = ({
|
|||
? item?.BrandName
|
||||
: ''}
|
||||
|
||||
<div style={{ display: 'flex', gap: "3px",flexDirection:"column" }}>
|
||||
<div style={{ display: 'flex', gap: "3px", flexDirection: "column" }}>
|
||||
{item?.ProductIdentifierDtls?.length > 0
|
||||
? item?.ProductIdentifierDtls.filter(
|
||||
(items) =>
|
||||
|
|
@ -3611,86 +3618,86 @@ const Printstyle2 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle, width: '8px' }}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '8px' }}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, width: '8px' }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '8px' }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle}}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)
|
||||
: Tax == true &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{ ...tableHeaderStyle,width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '8px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3885,7 +3892,7 @@ const Printstyle2 = ({
|
|||
<hr className="PrintStyle2-print-dottline" />
|
||||
</div>
|
||||
)}
|
||||
<div className="PrintStyle2-ThirdDivMaster" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle2-ThirdDivMaster" style={{ ...netAmountStyle }}>
|
||||
<div className="PrintStyle2-ThirdP">
|
||||
<div>
|
||||
<div style={{ textAlign: 'left', fontWeight: '600' }}>Qty</div>
|
||||
|
|
|
|||
|
|
@ -101,6 +101,12 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
|||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -200,7 +206,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
|||
|
||||
if (hasMappedOffer) {
|
||||
|
||||
const productTotal = productsData?.reduce((acc, item) => acc + (item?.Type != "C" ? item.OfferAmt : item.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;
|
||||
} else {
|
||||
const Combothere = productsData?.filter(item => item?.Type == "C")
|
||||
|
|
@ -289,7 +295,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
|||
|
||||
{/* <div className="header" style={{ position: isMobile ? "" : GlobaldummyData ? "absolute" : "fixed", top: 0, width: "100%" }}> */}
|
||||
<div className="header" style={{ position: isMobile ? "" : GlobaldummyData ? "absolute" : isPdf ? "static" : "fixed", top: 0, width: "100%" }}>
|
||||
{((!estimatePrintHeader && table2Data?.OrderType === "E") ? '' : <div className="PrintStyle3-print" style={{ ...headerStyle,}} >
|
||||
{((!estimatePrintHeader && table2Data?.OrderType === "E") ? '' : <div className="PrintStyle3-print" style={{ ...headerStyle, }} >
|
||||
<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
|
||||
{GlobaldummyData && GlobalLogo ? <img className='PrintStyle2-BrandImage' src={Logo} alt='image' width={100} /> : null}
|
||||
{(base64Image && (PrintLogo?.SettingValue === "Y" || LogoField)) ? <img className='PrintStyle2-BrandImage' src={base64Image} alt='image' width={100} /> : null}
|
||||
|
|
@ -319,9 +325,10 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
|||
<div className="PrintStyle3-print-ordr-dtls">
|
||||
<div style={{ lineheight: '50px' }}>
|
||||
<div style={{ fontSize: '14px', fontWeight: 600 }} > BILL NO :{GlobaldummyData ? '51' : table2Data?.OrderId && extractLastNumberOrderId(table2Data?.OrderId, table2Data?.FYStatus)} </div>
|
||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '14px', fontWeight: 600 }}>
|
||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||
{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||
|
||||
</div>}
|
||||
<div style={{ fontSize: '14px', fontWeight: 600 }} > {GlobaldummyData ? formattedDate : Date1}</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 ? 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 ? 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 ? 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>
|
||||
|
|
@ -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 ? 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 ? 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 ? 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>
|
||||
|
|
@ -488,7 +503,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
|||
{((chunkIndex === paginatedChunks.length - 1) && (!shouldFooterBeOnNewPage)) && FormatTheme &&
|
||||
|
||||
<>
|
||||
<div className="PrintStyle3-print-ttlovrl" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle3-print-ttlovrl" style={{ ...netAmountStyle }}>
|
||||
<div>
|
||||
<div style={{ fontWeight: '600' }}> Items : </div>
|
||||
<div style={{ fontWeight: '600' }}> Qty : </div>
|
||||
|
|
@ -889,7 +904,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
|||
}}
|
||||
>
|
||||
<>
|
||||
<div className="PrintStyle3-print-ttlovrl" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle3-print-ttlovrl" style={{ ...netAmountStyle }}>
|
||||
<div>
|
||||
<div style={{ fontWeight: '600' }}> Items : </div>
|
||||
<div style={{ fontWeight: '600' }}> Qty : </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 ? 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 ? 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 ? 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>
|
||||
|
|
@ -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 ? 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 ? 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 ? 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>
|
||||
|
|
@ -1459,7 +1480,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
|
|||
</div>
|
||||
}
|
||||
{/* <br/> */}
|
||||
<div className="PrintStyle3-print-ttlovrl" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle3-print-ttlovrl" style={{ ...netAmountStyle }}>
|
||||
<div>
|
||||
<div style={{ fontWeight: '600' }}> Items : </div>
|
||||
<div style={{ fontWeight: '600' }}> Qty : </div>
|
||||
|
|
|
|||
|
|
@ -123,6 +123,12 @@ const Printstyle4 = ({
|
|||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
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 = [
|
||||
(OrderDetailGST || []).reduce(
|
||||
(acc, item) => ({
|
||||
|
|
@ -478,7 +484,7 @@ const Printstyle4 = ({
|
|||
) : (
|
||||
<div
|
||||
className="PrintStyle4-fistDiv"
|
||||
style={{ flexDirection: 'column',...headerStyle }}
|
||||
style={{ flexDirection: 'column', ...headerStyle }}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
|
|
@ -641,12 +647,12 @@ const Printstyle4 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>#</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>#</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>#</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>#</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle,}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th
|
||||
|
|
@ -923,8 +929,8 @@ const Printstyle4 = ({
|
|||
: Discount) && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type !== 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
|
||||
|
|
@ -940,9 +946,9 @@ const Printstyle4 = ({
|
|||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type !== 'C'
|
||||
? (item?.TotalAmt || 0) -
|
||||
(item?.OfferAmt || 0)
|
||||
(item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.TotalAmt || 0) -
|
||||
(item?.OfferValue || 0)}
|
||||
(item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -971,12 +977,12 @@ const Printstyle4 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>#</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>#</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>#</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>#</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle,}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th
|
||||
|
|
@ -1205,9 +1211,9 @@ const Printstyle4 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1242,10 +1248,9 @@ const Printstyle4 = ({
|
|||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3225,7 +3230,7 @@ const Printstyle4 = ({
|
|||
) : (
|
||||
<div
|
||||
className="PrintStyle4-fistDiv"
|
||||
style={{ flexDirection: 'column',...headerStyle }}
|
||||
style={{ flexDirection: 'column', ...headerStyle }}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
|
|
@ -3317,9 +3322,11 @@ const Printstyle4 = ({
|
|||
>
|
||||
<div>
|
||||
Dt: {GlobaldummyData ? formattedDate : Date1}
|
||||
{SalesModePref?.SettingValue == 'Y' && (
|
||||
<div> Name : {table2Data?.SalesMode == 'R' ? 'RT' : 'WS'} </div>
|
||||
)}
|
||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||
{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||
|
||||
</div>}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
|
|
@ -3388,52 +3395,52 @@ const Printstyle4 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle, width: '10px' }}>#</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>#</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, width: '10px' }}>#</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>#</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle,}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, width: '30px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '30px', textAlign: 'right' }}>
|
||||
Qty
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '30px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '30px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, width: '30px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '30px', textAlign: 'center' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{ ...tableHeaderStyle,width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, width: '25px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '25px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3461,23 +3468,23 @@ const Printstyle4 = ({
|
|||
)} */}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '30px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '30px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '30px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '30px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3714,9 +3721,9 @@ const Printstyle4 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
|
||||
|
|
@ -3740,9 +3747,9 @@ const Printstyle4 = ({
|
|||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3926,8 +3933,7 @@ const Printstyle4 = ({
|
|||
item1.IMEI2 ||
|
||||
item1.SerialNumber
|
||||
)?.Description
|
||||
? ` ${
|
||||
item.ProductIdentifierDtls.find(
|
||||
? ` ${item.ProductIdentifierDtls.find(
|
||||
(item1) =>
|
||||
item1.IMEI1 ||
|
||||
item1.IMEI2 ||
|
||||
|
|
@ -4001,9 +4007,9 @@ const Printstyle4 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -4038,9 +4044,9 @@ const Printstyle4 = ({
|
|||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -123,6 +123,12 @@ const PrintStyle5 = ({
|
|||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -949,9 +955,9 @@ const PrintStyle5 = ({
|
|||
<div
|
||||
style={{ width: '100%', textAlign: 'right' }}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</div>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -983,9 +989,9 @@ const PrintStyle5 = ({
|
|||
style={{ width: '100%', textAlign: 'right' }}
|
||||
>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
|
@ -1272,9 +1278,9 @@ const PrintStyle5 = ({
|
|||
<div
|
||||
style={{ width: '100%', textAlign: 'right' }}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</div>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1306,9 +1312,9 @@ const PrintStyle5 = ({
|
|||
style={{ width: '100%', textAlign: 'right' }}
|
||||
>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
|
@ -1523,7 +1529,7 @@ const PrintStyle5 = ({
|
|||
|
||||
<div
|
||||
className="align-style"
|
||||
style={{ fontWeight: '600', fontSize: '19px',...netAmountStyle, }}
|
||||
style={{ fontWeight: '600', fontSize: '19px', ...netAmountStyle, }}
|
||||
>
|
||||
{' '}
|
||||
<div>Amount </div> <div> : </div>{' '}
|
||||
|
|
@ -2271,7 +2277,7 @@ const PrintStyle5 = ({
|
|||
|
||||
<div
|
||||
className="align-style"
|
||||
style={{ fontWeight: '600', fontSize: '19px',...netAmountStyle, }}
|
||||
style={{ fontWeight: '600', fontSize: '19px', ...netAmountStyle, }}
|
||||
>
|
||||
{' '}
|
||||
<div>Amount </div> <div> : </div>{' '}
|
||||
|
|
@ -2895,9 +2901,10 @@ const PrintStyle5 = ({
|
|||
>
|
||||
{' '}
|
||||
<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>
|
||||
|
|
@ -3270,9 +3277,9 @@ const PrintStyle5 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<div style={{ width: '100%', textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</div>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3296,9 +3303,9 @@ const PrintStyle5 = ({
|
|||
: Amount && (
|
||||
<div style={{ width: '100%', textAlign: 'right' }}>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
|
@ -3561,9 +3568,9 @@ const PrintStyle5 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<div style={{ width: '100%', textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</div>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3587,9 +3594,9 @@ const PrintStyle5 = ({
|
|||
: Amount && (
|
||||
<div style={{ width: '100%', textAlign: 'right' }}>
|
||||
{' '}
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
|
@ -3775,7 +3782,7 @@ const PrintStyle5 = ({
|
|||
|
||||
<div
|
||||
className="align-style"
|
||||
style={{...netAmountStyle, fontWeight: '600', fontSize: '19px' }}
|
||||
style={{ ...netAmountStyle, fontWeight: '600', fontSize: '19px' }}
|
||||
>
|
||||
{' '}
|
||||
<div>Amount </div> <div> : </div>{' '}
|
||||
|
|
|
|||
|
|
@ -124,6 +124,12 @@ const Printstyle6 = ({
|
|||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
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")
|
||||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
|
|
@ -458,7 +464,7 @@ const Printstyle6 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle6-firstDiv" style={{...headerStyle}}>
|
||||
<div className="PrintStyle6-firstDiv" style={{ ...headerStyle }}>
|
||||
<div
|
||||
className="P6HdBrnchName"
|
||||
style={{
|
||||
|
|
@ -620,12 +626,12 @@ const Printstyle6 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
{GlobaldummyData ? (
|
||||
(GlobalItem || GlobalQuantity) && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{GlobaldummyData
|
||||
? GlobalItem && 'ITEM /DES/'
|
||||
: 'ITEM /DES/'}{' '}
|
||||
|
|
@ -635,7 +641,7 @@ const Printstyle6 = ({
|
|||
</th>
|
||||
)
|
||||
) : (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{GlobaldummyData
|
||||
? GlobalItem && 'ITEM /DES/'
|
||||
: Item && 'ITEM /DES/'}{' '}
|
||||
|
|
@ -957,9 +963,9 @@ const Printstyle6 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1005,10 +1011,9 @@ const Printstyle6 = ({
|
|||
// paddingRight: "20px",
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1038,12 +1043,12 @@ const Printstyle6 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
{GlobaldummyData ? (
|
||||
(GlobalItem || GlobalQuantity) && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{GlobaldummyData
|
||||
? GlobalItem && 'ITEM /DES/'
|
||||
: 'ITEM /DES/'}{' '}
|
||||
|
|
@ -1053,7 +1058,7 @@ const Printstyle6 = ({
|
|||
</th>
|
||||
)
|
||||
) : (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{GlobaldummyData
|
||||
? GlobalItem && 'ITEM /DES/'
|
||||
: Item && 'ITEM /DES/'}{' '}
|
||||
|
|
@ -1345,9 +1350,9 @@ const Printstyle6 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1393,10 +1398,9 @@ const Printstyle6 = ({
|
|||
// paddingRight: "20px",
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1797,7 +1801,7 @@ const Printstyle6 = ({
|
|||
</div>
|
||||
</div>
|
||||
)}
|
||||
<div className="PrintStyle6-secondDiv" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle6-secondDiv" style={{ ...netAmountStyle }}>
|
||||
<div
|
||||
style={{
|
||||
textAlign: 'left',
|
||||
|
|
@ -2799,7 +2803,7 @@ const Printstyle6 = ({
|
|||
</div>
|
||||
</div>
|
||||
)}
|
||||
<div className="PrintStyle6-secondDiv" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle6-secondDiv" style={{ ...netAmountStyle }}>
|
||||
<div
|
||||
style={{
|
||||
textAlign: 'left',
|
||||
|
|
@ -3400,7 +3404,7 @@ const Printstyle6 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle6-firstDiv" style={{...headerStyle}}>
|
||||
<div className="PrintStyle6-firstDiv" style={{ ...headerStyle }}>
|
||||
<div
|
||||
className="P6HdBrnchName"
|
||||
style={{
|
||||
|
|
@ -3526,9 +3530,10 @@ const Printstyle6 = ({
|
|||
table2Data?.FYStatus
|
||||
)}
|
||||
</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 style={{ fontSize: '12px' }}>{Date1}</div>
|
||||
|
|
@ -3553,11 +3558,11 @@ const Printstyle6 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
{GlobaldummyData ? (
|
||||
(GlobalItem || GlobalQuantity) && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{GlobaldummyData
|
||||
? GlobalItem && 'ITEM /DES/'
|
||||
: 'ITEM /DES/'}{' '}
|
||||
|
|
@ -3565,7 +3570,7 @@ const Printstyle6 = ({
|
|||
</th>
|
||||
)
|
||||
) : (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{GlobaldummyData
|
||||
? GlobalItem && 'ITEM /DES/'
|
||||
: Item && 'ITEM /DES/'}{' '}
|
||||
|
|
@ -3576,68 +3581,68 @@ const Printstyle6 = ({
|
|||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
AMt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3775,9 +3780,9 @@ const Printstyle6 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3823,9 +3828,9 @@ const Printstyle6 = ({
|
|||
// paddingRight: "20px",
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3855,11 +3860,11 @@ const Printstyle6 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
{GlobaldummyData ? (
|
||||
(GlobalItem || GlobalQuantity) && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{GlobaldummyData
|
||||
? GlobalItem && 'ITEM /DES/'
|
||||
: 'ITEM /DES/'}{' '}
|
||||
|
|
@ -3867,7 +3872,7 @@ const Printstyle6 = ({
|
|||
</th>
|
||||
)
|
||||
) : (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{GlobaldummyData
|
||||
? GlobalItem && 'ITEM /DES/'
|
||||
: Item && 'ITEM /DES/'}{' '}
|
||||
|
|
@ -3878,34 +3883,34 @@ const Printstyle6 = ({
|
|||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3917,29 +3922,29 @@ const Printstyle6 = ({
|
|||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
AMt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -4094,9 +4099,9 @@ const Printstyle6 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -4142,9 +4147,9 @@ const Printstyle6 = ({
|
|||
// paddingRight: "20px",
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -4519,7 +4524,7 @@ const Printstyle6 = ({
|
|||
</div>
|
||||
</div>
|
||||
)}
|
||||
<div className="PrintStyle6-secondDiv" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle6-secondDiv" style={{ ...netAmountStyle }}>
|
||||
<div
|
||||
style={{
|
||||
textAlign: 'left',
|
||||
|
|
|
|||
|
|
@ -129,6 +129,12 @@ const PrintStyle7 = ({
|
|||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[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 =
|
||||
SettingData?.[0]?.SettingDtlDetails?.find(
|
||||
(setting) =>
|
||||
|
|
@ -478,7 +484,7 @@ const PrintStyle7 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle7-print" style={{...headerStyle}}>
|
||||
<div className="PrintStyle7-print" style={{ ...headerStyle }}>
|
||||
{/* <div style={{ fontSize: '16px', fontWeight: '600' }}> {GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}</div> */}
|
||||
<div
|
||||
style={{
|
||||
|
|
@ -644,58 +650,58 @@ const PrintStyle7 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S</th>
|
||||
)
|
||||
: SLNO == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Item</th>
|
||||
: Item == true && <th style={{...tableHeaderStyle,}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Item</th>
|
||||
: Item == true && <th style={{ ...tableHeaderStyle, }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
)
|
||||
: HsnCode == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Qty</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Qty</th>
|
||||
)
|
||||
: Quantity == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
)
|
||||
: MRP == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
)
|
||||
: Rate == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
)
|
||||
: Discount == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
|
|
@ -859,9 +865,9 @@ const PrintStyle7 = ({
|
|||
? GlobalDiscount && <td>{item.discount}</td>
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -884,10 +890,9 @@ const PrintStyle7 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -918,58 +923,58 @@ const PrintStyle7 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
)
|
||||
: SLNO == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S.NO</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S.NO</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Item</th>
|
||||
: Item == true && <th style={{...tableHeaderStyle,}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Item</th>
|
||||
: Item == true && <th style={{ ...tableHeaderStyle, }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
)
|
||||
: HsnCode == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Qty</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Qty</th>
|
||||
)
|
||||
: Quantity == true && (
|
||||
<th style={{ ...tableHeaderStyle,width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
)
|
||||
: MRP == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
)
|
||||
: Rate == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
)
|
||||
: Discount == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
|
|
@ -1125,9 +1130,9 @@ const PrintStyle7 = ({
|
|||
? GlobalDiscount && <td>{item.discount}</td>
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1150,10 +1155,9 @@ const PrintStyle7 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -2984,7 +2988,7 @@ const PrintStyle7 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle7-print" style={{...headerStyle}}>
|
||||
<div className="PrintStyle7-print" style={{ ...headerStyle }}>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
|
|
@ -3108,9 +3112,10 @@ const PrintStyle7 = ({
|
|||
)}
|
||||
|
||||
</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 className="PrintStyle7-SecondDiv2">
|
||||
|
|
@ -3150,58 +3155,58 @@ const PrintStyle7 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle, width: '10%' }}>S.No</th>
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, width: '10%' }}>S.No</th>
|
||||
: SLNO == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && (
|
||||
<th style={{...tableHeaderStyle, width: '30%', textAlign: 'left' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '30%', textAlign: 'left' }}>
|
||||
Item
|
||||
</th>
|
||||
)
|
||||
: Item == true && <th style={{...tableHeaderStyle}}>Item</th>}
|
||||
: Item == true && <th style={{ ...tableHeaderStyle }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && <th style={{...tableHeaderStyle}}>HSN</th>
|
||||
? GlobalHsnCode && <th style={{ ...tableHeaderStyle }}>HSN</th>
|
||||
: HsnCode == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && <th style={{...tableHeaderStyle}}>Qty</th>
|
||||
? GlobalQuantity && <th style={{ ...tableHeaderStyle }}>Qty</th>
|
||||
: Quantity == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && <th style={{...tableHeaderStyle}}>MRP</th>
|
||||
? GlobalMRP && <th style={{ ...tableHeaderStyle }}>MRP</th>
|
||||
: MRP == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && <th style={{...tableHeaderStyle}}>Rate</th>
|
||||
? GlobalRate && <th style={{ ...tableHeaderStyle }}>Rate</th>
|
||||
: Rate == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && <th style={{...tableHeaderStyle,}}>Dis </th>
|
||||
? GlobalDiscount && <th style={{ ...tableHeaderStyle, }}>Dis </th>
|
||||
: Discount == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'right' }}>Amt</th>
|
||||
)
|
||||
: Amount == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3344,9 +3349,9 @@ const PrintStyle7 = ({
|
|||
? GlobalDiscount && <td>{item.discount}</td>
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3369,9 +3374,9 @@ const PrintStyle7 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3402,64 +3407,64 @@ const PrintStyle7 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle, width: '10px' }}>S</th>
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, width: '10px' }}>S</th>
|
||||
: SLNO == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle}}>Item</th>
|
||||
: Item == true && <th style={{...tableHeaderStyle}}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle }}>Item</th>
|
||||
: Item == true && <th style={{ ...tableHeaderStyle }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
)
|
||||
: HsnCode == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>HSN</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Qty</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Qty</th>
|
||||
)
|
||||
: Quantity == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && <th style={{...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
? GlobalMRP && <th style={{ ...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
: MRP == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>MRP</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
)
|
||||
: Rate == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Rate</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
)
|
||||
: Discount == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Dis </th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Tax % </th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount == true && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3583,9 +3588,9 @@ const PrintStyle7 = ({
|
|||
? GlobalDiscount && <td>{item.discount}</td>
|
||||
: Discount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3608,9 +3613,9 @@ const PrintStyle7 = ({
|
|||
)
|
||||
: Amount == true && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -115,6 +115,12 @@ const Printstyle8 = ({
|
|||
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -489,7 +495,7 @@ const Printstyle8 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle8-fistDiv" style={{...headerStyle}}>
|
||||
<div className="PrintStyle8-fistDiv" style={{ ...headerStyle }}>
|
||||
{/* <h3>{table2Data?.BrName}</h3> */}
|
||||
|
||||
<div
|
||||
|
|
@ -651,8 +657,8 @@ const Printstyle8 = ({
|
|||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Dis</th>
|
||||
: Item && <th style={{...tableHeaderStyle,}}>Des</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Dis</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, }}>Des</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th
|
||||
|
|
@ -944,9 +950,9 @@ const Printstyle8 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -990,10 +996,9 @@ const Printstyle8 = ({
|
|||
textAlign: 'right',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1047,8 +1052,8 @@ const Printstyle8 = ({
|
|||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Dis</th>
|
||||
: Item && <th style={{...tableHeaderStyle,}}>Des</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Dis</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, }}>Des</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th
|
||||
|
|
@ -1312,9 +1317,9 @@ const Printstyle8 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1358,10 +1363,9 @@ const Printstyle8 = ({
|
|||
textAlign: 'right',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -1379,7 +1383,7 @@ const Printstyle8 = ({
|
|||
FormatTheme && (
|
||||
<>
|
||||
<hr className="PrintStyle8-print-dottline" />
|
||||
<div style={{ fontSize: '12px',...netAmountStyle }}>
|
||||
<div style={{ fontSize: '12px', ...netAmountStyle }}>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
|
|
@ -2386,7 +2390,7 @@ const Printstyle8 = ({
|
|||
>
|
||||
<>
|
||||
<hr className="PrintStyle8-print-dottline" />
|
||||
<div style={{ fontSize: '12px',...netAmountStyle }}>
|
||||
<div style={{ fontSize: '12px', ...netAmountStyle }}>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
|
|
@ -3359,7 +3363,7 @@ const Printstyle8 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle8-fistDiv" style={{...headerStyle}}>
|
||||
<div className="PrintStyle8-fistDiv" style={{ ...headerStyle }}>
|
||||
{/* <h3>{table2Data?.BrName}</h3> */}
|
||||
<div
|
||||
style={{
|
||||
|
|
@ -3461,9 +3465,10 @@ const Printstyle8 = ({
|
|||
table2Data?.FYStatus
|
||||
)}
|
||||
</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 style={{ fontSize: "10px" }}>
|
||||
{GlobaldummyData ? formattedDate : Date1}
|
||||
|
|
@ -3494,95 +3499,95 @@ const Printstyle8 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
S.No
|
||||
</th>
|
||||
)
|
||||
: SLNO && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
S.No
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && (
|
||||
<th style={{...tableHeaderStyle, textAlign: 'left' }}>Dis</th>
|
||||
<th style={{ ...tableHeaderStyle, textAlign: 'left' }}>Dis</th>
|
||||
)
|
||||
: Item && <th style={{...tableHeaderStyle,}}>Des</th>}
|
||||
: Item && <th style={{ ...tableHeaderStyle, }}>Des</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{ ...tableHeaderStyle,width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{ ...tableHeaderStyle,width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rt
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
(%)
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
(%)
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3686,9 +3691,9 @@ const Printstyle8 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3732,9 +3737,9 @@ const Printstyle8 = ({
|
|||
textAlign: 'right',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3767,93 +3772,93 @@ const Printstyle8 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
S.No
|
||||
</th>
|
||||
)
|
||||
: SLNO && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'center' }}>
|
||||
S.No
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle,}}>Dis</th>
|
||||
: Item && <th style={{...tableHeaderStyle,}}>Des</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, }}>Dis</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, }}>Des</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rt
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
(%)
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
(%)
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3963,9 +3968,9 @@ const Printstyle8 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -4009,9 +4014,9 @@ const Printstyle8 = ({
|
|||
textAlign: 'right',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -4024,7 +4029,7 @@ const Printstyle8 = ({
|
|||
</>
|
||||
)}
|
||||
<hr className="PrintStyle8-print-dottline" />
|
||||
<div style={{ fontSize: '12px',...netAmountStyle }}>
|
||||
<div style={{ fontSize: '12px', ...netAmountStyle }}>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
|
||||
<div style={{ width: '40%' }}>Items </div>
|
||||
<div> : </div>
|
||||
|
|
|
|||
|
|
@ -112,6 +112,12 @@ const PrintStyle9 = ({
|
|||
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||
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(
|
||||
(i) => i.SettingIdName === 'PrintUom'
|
||||
)?.[0];
|
||||
|
|
@ -479,7 +485,7 @@ const PrintStyle9 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle9-print" style={{...headerStyle}}>
|
||||
<div className="PrintStyle9-print" style={{ ...headerStyle }}>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
|
|
@ -651,25 +657,25 @@ const PrintStyle9 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
)
|
||||
: Item && <th style={{...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
: Item && <th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
|
|
@ -677,14 +683,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
|
|
@ -692,14 +698,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
|
|
@ -707,14 +713,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
|
|
@ -722,7 +728,7 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Tax %
|
||||
</th>
|
||||
|
|
@ -730,7 +736,7 @@ const PrintStyle9 = ({
|
|||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Tax %
|
||||
</th>
|
||||
|
|
@ -738,14 +744,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
|
|
@ -753,14 +759,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
|
|
@ -907,9 +913,9 @@ const PrintStyle9 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -943,10 +949,9 @@ const PrintStyle9 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -975,25 +980,25 @@ const PrintStyle9 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && (
|
||||
<th style={{...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
)
|
||||
: Item && <th style={{...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
: Item && <th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
|
|
@ -1001,14 +1006,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
HSN
|
||||
</th>
|
||||
|
|
@ -1016,14 +1021,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
MRP
|
||||
</th>
|
||||
|
|
@ -1031,14 +1036,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Dis{' '}
|
||||
</th>
|
||||
|
|
@ -1046,7 +1051,7 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Tax %
|
||||
</th>
|
||||
|
|
@ -1054,7 +1059,7 @@ const PrintStyle9 = ({
|
|||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Tax %
|
||||
</th>
|
||||
|
|
@ -1062,14 +1067,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Rate
|
||||
</th>
|
||||
|
|
@ -1077,14 +1082,14 @@ const PrintStyle9 = ({
|
|||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th
|
||||
style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}
|
||||
>
|
||||
Amt
|
||||
</th>
|
||||
|
|
@ -1179,9 +1184,9 @@ const PrintStyle9 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -1215,10 +1220,9 @@ const PrintStyle9 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue ||
|
||||
0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -2338,7 +2342,7 @@ const PrintStyle9 = ({
|
|||
<hr className="PrintStyle9-print-dottline" />
|
||||
|
||||
<div
|
||||
style={{ display: 'flex', justifyContent: 'space-between',...netAmountStyle }}
|
||||
style={{ display: 'flex', justifyContent: 'space-between', ...netAmountStyle }}
|
||||
>
|
||||
<div style={{ fontWeight: '700' }}>Net Amount:</div>
|
||||
<div style={{ fontWeight: '700', marginRight: '0.5rem' }}>
|
||||
|
|
@ -3212,7 +3216,7 @@ const PrintStyle9 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle9-print" style={{...headerStyle}}>
|
||||
<div className="PrintStyle9-print" style={{ ...headerStyle }}>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
|
|
@ -3338,9 +3342,10 @@ const PrintStyle9 = ({
|
|||
table2Data?.FYStatus
|
||||
)}
|
||||
</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 style={{ fontSize: '12px', fontWeight: '400' }}>
|
||||
{' '}
|
||||
|
|
@ -3389,89 +3394,89 @@ const PrintStyle9 = ({
|
|||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'left' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'left' }}>
|
||||
S.No
|
||||
</th>
|
||||
)
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{ ...tableHeaderStyle,width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3583,11 +3588,12 @@ const PrintStyle9 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
|
|
@ -3619,9 +3625,9 @@ const PrintStyle9 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3650,86 +3656,86 @@ const PrintStyle9 = ({
|
|||
<thead>
|
||||
<tr>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
: SLNO && <th style={{...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
? GlobalSlNo && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>
|
||||
: SLNO && <th style={{ ...tableHeaderStyle, width: '10px' }}>S.No</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalItem && <th style={{...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
: Item && <th style={{...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
? GlobalItem && <th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>
|
||||
: Item && <th style={{ ...tableHeaderStyle, width: '10px' }}>Item</th>}
|
||||
{GlobaldummyData
|
||||
? GlobalQuantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Qty
|
||||
</th>
|
||||
)
|
||||
: Quantity && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
{WeightasKg ? 'Qty/Kg' : 'Qty'}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalHsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)
|
||||
: HsnCode && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
HSN
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalMRP && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)
|
||||
: MRP && (
|
||||
<th style={{...tableHeaderStyle,width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
MRP
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalDiscount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)
|
||||
: Discount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Dis{' '}
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalTax && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)
|
||||
: Tax &&
|
||||
table2Data?.OrderType !== 'E' && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Tax %
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalRate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)
|
||||
: Rate && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Rate
|
||||
</th>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
? GlobalAmount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)
|
||||
: Amount && (
|
||||
<th style={{...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
<th style={{ ...tableHeaderStyle, width: '10px', textAlign: 'right' }}>
|
||||
Amt
|
||||
</th>
|
||||
)}
|
||||
|
|
@ -3818,9 +3824,9 @@ const PrintStyle9 = ({
|
|||
)
|
||||
: Discount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.OfferAmt || 0
|
||||
: item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -3854,9 +3860,9 @@ const PrintStyle9 = ({
|
|||
)
|
||||
: Amount && (
|
||||
<td style={{ textAlign: 'right' }}>
|
||||
{item?.Type != 'C'
|
||||
? item?.TotalAmt - item?.OfferAmt || 0
|
||||
: item?.TotalAmt - item?.OfferValue || 0}
|
||||
{item?.Type !== 'C'
|
||||
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
|
||||
: item?.TotalAmt - (item?.OfferValue || item?.DiscountAmt || 0)}
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
|
|
@ -3961,7 +3967,7 @@ const PrintStyle9 = ({
|
|||
|
||||
<hr className="PrintStyle9-print-dottline" />
|
||||
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between',...netAmountStyle }}>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', ...netAmountStyle }}>
|
||||
<div style={{ fontWeight: '700' }}>Net Amount:</div>
|
||||
<div style={{ fontWeight: '700', marginRight: '0.5rem' }}>
|
||||
{GlobaldummyData
|
||||
|
|
|
|||
1993
src/routesConfig.jsx
1993
src/routesConfig.jsx
File diff suppressed because it is too large
Load Diff
|
|
@ -1,34 +0,0 @@
|
|||
import { defineConfig } from "vite";
|
||||
import react from "@vitejs/plugin-react";
|
||||
import { terser } from "rollup-plugin-terser";
|
||||
|
||||
export default defineConfig(({ command, mode }) => {
|
||||
if (mode === "production") {
|
||||
return {
|
||||
plugins: [
|
||||
react(),
|
||||
// terser({ // Add terser plugin for production
|
||||
// compress: {
|
||||
// drop_console: true, // This removes all console.* statements
|
||||
// },
|
||||
// }),
|
||||
],
|
||||
base: "/apps/retail/",
|
||||
envDir: "src",
|
||||
envPrefix: "ENV_",
|
||||
};
|
||||
} else {
|
||||
return {
|
||||
plugins: [react()],
|
||||
envDir: "src",
|
||||
envPrefix: "ENV_",
|
||||
server: {
|
||||
host: "192.168.1.50",
|
||||
port: process.env.PORT || 3015,
|
||||
},
|
||||
optimizeDeps: {
|
||||
exclude: ["console.log"],
|
||||
},
|
||||
};
|
||||
}
|
||||
});
|
||||
Loading…
Reference in New Issue