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);
|
||||
|
|
@ -728,7 +728,7 @@ export default function BST1Payment() {
|
|||
setEmpData(datas?.[0]);
|
||||
};
|
||||
const getCustomerData = async () => {
|
||||
await dispatch(
|
||||
await dispatch(
|
||||
getAddCustomerDetails({
|
||||
CompId: CompId,
|
||||
AppId: AppId,
|
||||
|
|
@ -905,7 +905,7 @@ export default function BST1Payment() {
|
|||
|
||||
const selectedStyle =
|
||||
stylesMap[
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
];
|
||||
|
||||
if (selectedStyle) {
|
||||
|
|
@ -2026,15 +2026,15 @@ export default function BST1Payment() {
|
|||
OrderStatus: 'O',
|
||||
OrderType:
|
||||
BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
? 'S'
|
||||
: GlobEstBooking === 'OvrAllEst'
|
||||
? 'E'
|
||||
: GlobEstBooking === 'ParEst'
|
||||
? GlobProdwisedata?.includes(
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
? 'E'
|
||||
: 'S'
|
||||
: 'S',
|
||||
|
|
@ -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
|
||||
|
|
@ -2124,7 +2127,7 @@ export default function BST1Payment() {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
OrderDtlDetails:
|
||||
|
|
@ -2141,9 +2144,9 @@ export default function BST1Payment() {
|
|||
? globalTipAmount === 0
|
||||
? SelectedTableDetails
|
||||
: SelectedTableDetails?.map((item) => ({
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
: null,
|
||||
|
||||
SalesPaymentType: 'normal',
|
||||
|
|
@ -2159,8 +2162,8 @@ export default function BST1Payment() {
|
|||
? PaymentgatewayUPI?.[0]?.ModeId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
: paybtnselected
|
||||
: paybtnselected
|
||||
? paybtnselected
|
||||
|
|
@ -2173,15 +2176,15 @@ export default function BST1Payment() {
|
|||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? null
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
|
||||
?.MerchantId
|
||||
?.MerchantId
|
||||
: null,
|
||||
PaymentOptionType:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
? 'PC'
|
||||
: Paybtnnameselected?.toLowerCase() === 'cash'
|
||||
? 'PC'
|
||||
|
|
@ -2201,29 +2204,29 @@ export default function BST1Payment() {
|
|||
? null
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
|
||||
?.UPIDetailId
|
||||
?.UPIDetailId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
: null,
|
||||
AccountDtl:
|
||||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? []
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentDevice
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentGateway
|
||||
: [],
|
||||
PaymentStatus:
|
||||
|
|
@ -2234,13 +2237,13 @@ export default function BST1Payment() {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
Debit:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
? Math.round(previousNetAmount - currentOrderNetAmount)
|
||||
: 0,
|
||||
Credit: salesBillEdit
|
||||
|
|
@ -2316,14 +2319,14 @@ export default function BST1Payment() {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2480,14 +2483,14 @@ export default function BST1Payment() {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2588,14 +2591,14 @@ export default function BST1Payment() {
|
|||
}
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
if (response?.data?.OrderDetails?.length > 0) {
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2770,14 +2773,14 @@ export default function BST1Payment() {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
bookingpaymentupdate?.data?.response +
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([bookingpaymentupdate?.data]);
|
||||
|
|
@ -2795,7 +2798,7 @@ export default function BST1Payment() {
|
|||
if (
|
||||
Date.now() - startTime >
|
||||
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
|
||||
60000
|
||||
60000
|
||||
) {
|
||||
// 60,000 ms = 1 minute
|
||||
|
||||
|
|
@ -3575,31 +3578,31 @@ export default function BST1Payment() {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
}}
|
||||
>
|
||||
{paybtns?.length > 0 &&
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
paybtns?.map((payment) => (
|
||||
<div className="Table3-cash">
|
||||
<button
|
||||
className={
|
||||
paybtnselected === payment.ModeId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: paybtnselected === payment.ModeId &&
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -3613,13 +3616,13 @@ export default function BST1Payment() {
|
|||
onClick={() =>
|
||||
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
|
||||
? handleUPIButtonClick(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
: handlePaymentMode(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
}
|
||||
>
|
||||
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
|
||||
|
|
@ -3678,10 +3681,10 @@ export default function BST1Payment() {
|
|||
<button
|
||||
className={
|
||||
refundPaySelected === payment.ConfigId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: refundPaySelected === payment.ConfigId &&
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -3756,9 +3759,9 @@ export default function BST1Payment() {
|
|||
OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '28px',
|
||||
|
|
@ -3808,16 +3811,16 @@ export default function BST1Payment() {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
}}
|
||||
|
|
@ -3836,14 +3839,14 @@ export default function BST1Payment() {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -3860,39 +3863,39 @@ export default function BST1Payment() {
|
|||
|
||||
{/* Customer Orders */}
|
||||
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
|
||||
{OtherServicesglobal && OrderCardDetail.length >= 1 && (
|
||||
<TooltipWrapper title="Vehicle Number" isMobile={isMobile}>
|
||||
|
|
@ -3908,14 +3911,14 @@ export default function BST1Payment() {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -3997,58 +4000,58 @@ export default function BST1Payment() {
|
|||
<div>
|
||||
{unpaidFlow == false
|
||||
? holdCheckedSalesSetup &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
CheckOrderType?.length === 0 &&
|
||||
OrderType != 'Failed' &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
paybtns?.length > 0 &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Hold'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
style={{
|
||||
fontSize: '30px',
|
||||
cursor: 'pointer',
|
||||
color: '' ? '#52c41a' : '#1292EE',
|
||||
}}
|
||||
/>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
CheckOrderType?.length === 0 &&
|
||||
OrderType != 'Failed' &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
paybtns?.length > 0 &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Hold'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
style={{
|
||||
fontSize: '30px',
|
||||
cursor: 'pointer',
|
||||
color: '' ? '#52c41a' : '#1292EE',
|
||||
}}
|
||||
/>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
: ''}
|
||||
{unpaidFlow == false
|
||||
? holdCheckedSalesSetup &&
|
||||
paybtns?.length > 0 &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
Holddata?.length > 0 &&
|
||||
OrderCardDetail?.length == 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Recall'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<Badge
|
||||
count={Holddata?.length}
|
||||
size={'small'}
|
||||
offset={[0, 7]}
|
||||
>
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => HandleholdModelOpen()}
|
||||
style={{
|
||||
fontSize: '28px',
|
||||
cursor: 'pointer',
|
||||
color: Holddata ? '#52c41a' : 'default',
|
||||
pointerEvents:
|
||||
OrderType === 'Failed' ? 'none' : 'auto',
|
||||
}}
|
||||
/>
|
||||
</Badge>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
paybtns?.length > 0 &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
Holddata?.length > 0 &&
|
||||
OrderCardDetail?.length == 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Recall'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<Badge
|
||||
count={Holddata?.length}
|
||||
size={'small'}
|
||||
offset={[0, 7]}
|
||||
>
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => HandleholdModelOpen()}
|
||||
style={{
|
||||
fontSize: '28px',
|
||||
cursor: 'pointer',
|
||||
color: Holddata ? '#52c41a' : 'default',
|
||||
pointerEvents:
|
||||
OrderType === 'Failed' ? 'none' : 'auto',
|
||||
}}
|
||||
/>
|
||||
</Badge>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
: ''}
|
||||
</div>
|
||||
)}
|
||||
|
|
@ -4091,9 +4094,9 @@ export default function BST1Payment() {
|
|||
addnewAccess
|
||||
? 'price-button-disabled'
|
||||
: FirstPaymentclick === false &&
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
? !OrderStatus
|
||||
? salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount
|
||||
|
|
@ -4115,7 +4118,7 @@ export default function BST1Payment() {
|
|||
{isMobile ? (
|
||||
!OrderStatus ? (
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount ? (
|
||||
currentOrderNetAmount < previousNetAmount ? (
|
||||
<div>
|
||||
Refund: ₹
|
||||
{(previousNetAmount || 0) -
|
||||
|
|
@ -4341,14 +4344,14 @@ export default function BST1Payment() {
|
|||
OrderType === 'Failed'
|
||||
? FailedTotalAmt
|
||||
: Math.round(
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
}
|
||||
failedOrderData={failedOrderData}
|
||||
/>
|
||||
|
|
@ -4481,9 +4484,9 @@ export default function BST1Payment() {
|
|||
|
||||
const qty = isGroup
|
||||
? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
: item.OrderQty || 1;
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -1545,7 +1545,7 @@ const BSBillingTable2 = () => {
|
|||
|
||||
const selectedStyle =
|
||||
stylesMap[
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
];
|
||||
|
||||
if (selectedStyle) {
|
||||
|
|
@ -2106,15 +2106,15 @@ const BSBillingTable2 = () => {
|
|||
OrderStatus: 'O',
|
||||
OrderType:
|
||||
BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
? 'S'
|
||||
: GlobEstBooking === 'OvrAllEst'
|
||||
? 'E'
|
||||
: GlobEstBooking === 'ParEst'
|
||||
? GlobProdwisedata?.includes(
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
? 'E'
|
||||
: 'S'
|
||||
: 'S',
|
||||
|
|
@ -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
|
||||
|
|
@ -2206,7 +2208,7 @@ const BSBillingTable2 = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
OrderDtlDetails:
|
||||
|
|
@ -2223,9 +2225,9 @@ const BSBillingTable2 = () => {
|
|||
? globalTipAmount === 0
|
||||
? SelectedTableDetails
|
||||
: SelectedTableDetails?.map((item) => ({
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
: null,
|
||||
// "Credit": TotalAmount,
|
||||
// "Debit": 0,
|
||||
|
|
@ -2242,8 +2244,8 @@ const BSBillingTable2 = () => {
|
|||
? PaymentgatewayUPI?.[0]?.ModeId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
: paybtnselected
|
||||
: paybtnselected
|
||||
? paybtnselected
|
||||
|
|
@ -2256,15 +2258,15 @@ const BSBillingTable2 = () => {
|
|||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? null
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
|
||||
?.MerchantId
|
||||
?.MerchantId
|
||||
: null,
|
||||
PaymentOptionType:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
? 'PC'
|
||||
: Paybtnnameselected?.toLowerCase() === 'cash'
|
||||
? 'PC'
|
||||
|
|
@ -2284,29 +2286,29 @@ const BSBillingTable2 = () => {
|
|||
? null
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
|
||||
?.UPIDetailId
|
||||
?.UPIDetailId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
: null,
|
||||
AccountDtl:
|
||||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? []
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentDevice
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentGateway
|
||||
: [],
|
||||
PaymentStatus:
|
||||
|
|
@ -2317,13 +2319,13 @@ const BSBillingTable2 = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
Debit:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
? Math.round(previousNetAmount - currentOrderNetAmount)
|
||||
: 0,
|
||||
Credit: salesBillEdit
|
||||
|
|
@ -2402,14 +2404,14 @@ const BSBillingTable2 = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2566,14 +2568,14 @@ const BSBillingTable2 = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2677,14 +2679,14 @@ const BSBillingTable2 = () => {
|
|||
}
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
if (response?.data?.OrderDetails?.length > 0) {
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2861,14 +2863,14 @@ const BSBillingTable2 = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
bookingpaymentupdate?.data?.response +
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([bookingpaymentupdate?.data]);
|
||||
|
|
@ -2887,7 +2889,7 @@ const BSBillingTable2 = () => {
|
|||
if (
|
||||
Date.now() - startTime >
|
||||
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
|
||||
60000
|
||||
60000
|
||||
) {
|
||||
// 60,000 ms = 1 minute
|
||||
|
||||
|
|
@ -3660,7 +3662,7 @@ const BSBillingTable2 = () => {
|
|||
);
|
||||
};
|
||||
return (
|
||||
<Suspense fallback={<BillingTableSkeleton />}>
|
||||
<Suspense fallback={<BillingTableSkeleton />}>
|
||||
<div
|
||||
className={
|
||||
templateData?.BookingLayout?.[0] === 'Layout6'
|
||||
|
|
@ -3814,16 +3816,16 @@ const BSBillingTable2 = () => {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
width: '2rem',
|
||||
|
|
@ -3843,14 +3845,14 @@ const BSBillingTable2 = () => {
|
|||
width: '1.6rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -3876,14 +3878,14 @@ const BSBillingTable2 = () => {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -3985,31 +3987,31 @@ const BSBillingTable2 = () => {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
}}
|
||||
>
|
||||
{paybtns?.length > 0 &&
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
paybtns?.map((payment) => (
|
||||
<div className="Table3-cash">
|
||||
<button
|
||||
className={
|
||||
paybtnselected === payment.ModeId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: paybtnselected === payment.ModeId &&
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -4023,13 +4025,13 @@ const BSBillingTable2 = () => {
|
|||
onClick={() =>
|
||||
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
|
||||
? handleUPIButtonClick(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
: handlePaymentMode(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
}
|
||||
>
|
||||
<div
|
||||
|
|
@ -4086,10 +4088,10 @@ const BSBillingTable2 = () => {
|
|||
<button
|
||||
className={
|
||||
refundPaySelected === payment.ConfigId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: refundPaySelected === payment.ConfigId &&
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -4160,9 +4162,9 @@ const BSBillingTable2 = () => {
|
|||
OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '28px',
|
||||
|
|
@ -4179,39 +4181,39 @@ const BSBillingTable2 = () => {
|
|||
|
||||
{/* Customer Orders */}
|
||||
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
{tabledata?.length > 0 && (
|
||||
<div style={{ width: '2rem' }}>
|
||||
{tableOptions
|
||||
|
|
@ -4280,68 +4282,68 @@ const BSBillingTable2 = () => {
|
|||
<>
|
||||
{unpaidFlow == false
|
||||
? item?.OptionName == 'Hold' &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
!OrderStatus &&
|
||||
OrderType != 'Failed' &&
|
||||
paybtns?.length > 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<>
|
||||
<TooltipWrapper title={'Hold'} isMobile={isMobile}>
|
||||
<button
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
className={
|
||||
FirstPaymentclick === false
|
||||
? 'hold-btn'
|
||||
: 'hold-btn-disable'
|
||||
}
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
!OrderStatus &&
|
||||
OrderType != 'Failed' &&
|
||||
paybtns?.length > 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<>
|
||||
<TooltipWrapper title={'Hold'} isMobile={isMobile}>
|
||||
<button
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
className={
|
||||
FirstPaymentclick === false
|
||||
? 'hold-btn'
|
||||
: 'hold-btn-disable'
|
||||
}
|
||||
>
|
||||
<BsPauseFill />
|
||||
<p
|
||||
className="hold-btn-txt"
|
||||
style={{
|
||||
fontFamily: FontFamily['para'],
|
||||
}}
|
||||
>
|
||||
<BsPauseFill />
|
||||
<p
|
||||
className="hold-btn-txt"
|
||||
style={{
|
||||
fontFamily: FontFamily['para'],
|
||||
}}
|
||||
>
|
||||
Hold
|
||||
</p>
|
||||
</button>
|
||||
</TooltipWrapper>
|
||||
</>
|
||||
)
|
||||
Hold
|
||||
</p>
|
||||
</button>
|
||||
</TooltipWrapper>
|
||||
</>
|
||||
)
|
||||
: ''}
|
||||
{unpaidFlow == false
|
||||
? item?.OptionName == 'Hold' &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
Holddata?.length > 0 &&
|
||||
OrderCardDetail?.length == 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
paybtns?.length > 0 &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Recall'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<Badge
|
||||
count={Holddata?.length}
|
||||
size={'small'}
|
||||
offset={[0, 7]}
|
||||
>
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => HandleholdModelOpen()}
|
||||
style={{
|
||||
fontSize: '28px',
|
||||
cursor: 'pointer',
|
||||
color: Holddata ? '#52c41a' : 'default',
|
||||
pointerEvents:
|
||||
OrderType === 'Failed' ? 'none' : 'auto',
|
||||
}}
|
||||
/>
|
||||
</Badge>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
Holddata?.length > 0 &&
|
||||
OrderCardDetail?.length == 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
paybtns?.length > 0 &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Recall'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<Badge
|
||||
count={Holddata?.length}
|
||||
size={'small'}
|
||||
offset={[0, 7]}
|
||||
>
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => HandleholdModelOpen()}
|
||||
style={{
|
||||
fontSize: '28px',
|
||||
cursor: 'pointer',
|
||||
color: Holddata ? '#52c41a' : 'default',
|
||||
pointerEvents:
|
||||
OrderType === 'Failed' ? 'none' : 'auto',
|
||||
}}
|
||||
/>
|
||||
</Badge>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
: ''}
|
||||
</>
|
||||
))}
|
||||
|
|
@ -4357,9 +4359,9 @@ const BSBillingTable2 = () => {
|
|||
addnewAccess
|
||||
? 'billing-btn-deactive'
|
||||
: FirstPaymentclick === false &&
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
? salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount
|
||||
? 'billing-btn'
|
||||
|
|
@ -4610,14 +4612,14 @@ const BSBillingTable2 = () => {
|
|||
OrderType === 'Failed'
|
||||
? FailedTotalAmt
|
||||
: Math.round(
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
}
|
||||
failedOrderData={failedOrderData}
|
||||
/>
|
||||
|
|
@ -4752,9 +4754,9 @@ const BSBillingTable2 = () => {
|
|||
|
||||
const qty = isGroup
|
||||
? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
: item.OrderQty || 1;
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -2596,15 +2596,15 @@ const BSBillingTable3 = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
{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' && (
|
||||
|
|
|
|||
|
|
@ -881,7 +881,7 @@ const BSBilling4Payment = () => {
|
|||
|
||||
const selectedStyle =
|
||||
stylesMap[
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
];
|
||||
console.log(selectedStyle, style, 'style');
|
||||
if (selectedStyle) {
|
||||
|
|
@ -2128,15 +2128,15 @@ const BSBilling4Payment = () => {
|
|||
OrderStatus: 'O',
|
||||
OrderType:
|
||||
BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
? 'S'
|
||||
: GlobEstBooking === 'OvrAllEst'
|
||||
? 'E'
|
||||
: GlobEstBooking === 'ParEst'
|
||||
? GlobProdwisedata?.includes(
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
? 'E'
|
||||
: 'S'
|
||||
: 'S',
|
||||
|
|
@ -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
|
||||
|
|
@ -2229,7 +2232,7 @@ const BSBilling4Payment = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
OrderDtlDetails:
|
||||
|
|
@ -2246,9 +2249,9 @@ const BSBilling4Payment = () => {
|
|||
? globalTipAmount === 0
|
||||
? SelectedTableDetails
|
||||
: SelectedTableDetails?.map((item) => ({
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
: null,
|
||||
SalesPaymentType: 'normal',
|
||||
PaymentDetail: [
|
||||
|
|
@ -2263,8 +2266,8 @@ const BSBilling4Payment = () => {
|
|||
? PaymentgatewayUPI?.[0]?.ModeId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
: paybtnselected
|
||||
: paybtnselected
|
||||
? paybtnselected
|
||||
|
|
@ -2277,15 +2280,15 @@ const BSBilling4Payment = () => {
|
|||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? null
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
|
||||
?.MerchantId
|
||||
?.MerchantId
|
||||
: null,
|
||||
PaymentOptionType:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
? 'PC'
|
||||
: Paybtnnameselected?.toLowerCase() === 'cash'
|
||||
? 'PC'
|
||||
|
|
@ -2305,29 +2308,29 @@ const BSBilling4Payment = () => {
|
|||
? null
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
|
||||
?.UPIDetailId
|
||||
?.UPIDetailId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
: null,
|
||||
AccountDtl:
|
||||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? []
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentDevice
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentGateway
|
||||
: [],
|
||||
PaymentStatus:
|
||||
|
|
@ -2338,13 +2341,13 @@ const BSBilling4Payment = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
Debit:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
? Math.round(previousNetAmount - currentOrderNetAmount)
|
||||
: 0,
|
||||
Credit: salesBillEdit
|
||||
|
|
@ -2422,14 +2425,14 @@ const BSBilling4Payment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2590,14 +2593,14 @@ const BSBilling4Payment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2704,14 +2707,14 @@ const BSBilling4Payment = () => {
|
|||
}
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
if (response?.data?.OrderDetails?.length > 0) {
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2887,14 +2890,14 @@ const BSBilling4Payment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
bookingpaymentupdate?.data?.response +
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([bookingpaymentupdate?.data]);
|
||||
|
|
@ -2913,7 +2916,7 @@ const BSBilling4Payment = () => {
|
|||
if (
|
||||
Date.now() - startTime >
|
||||
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
|
||||
60000
|
||||
60000
|
||||
) {
|
||||
// 60,000 ms = 1 minute
|
||||
|
||||
|
|
@ -3150,9 +3153,9 @@ const BSBilling4Payment = () => {
|
|||
AppId: AppId,
|
||||
...(AvailableDate && selectedDate
|
||||
? {
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
: {}),
|
||||
};
|
||||
await dispatch(getSelectedFavItems(data)).unwrap();
|
||||
|
|
@ -3164,9 +3167,9 @@ const BSBilling4Payment = () => {
|
|||
ProdSubCat: ProdSubCat,
|
||||
...(AvailableDate && selectedDate
|
||||
? {
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
: {}),
|
||||
};
|
||||
|
||||
|
|
@ -3177,9 +3180,9 @@ const BSBilling4Payment = () => {
|
|||
prodCat: prodCat,
|
||||
...(AvailableDate && selectedDate
|
||||
? {
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
: {}),
|
||||
};
|
||||
|
||||
|
|
@ -3806,9 +3809,9 @@ const BSBilling4Payment = () => {
|
|||
'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '28px',
|
||||
|
|
@ -3829,16 +3832,16 @@ const BSBilling4Payment = () => {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
width: '2rem',
|
||||
|
|
@ -3859,14 +3862,14 @@ const BSBilling4Payment = () => {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -3896,14 +3899,14 @@ const BSBilling4Payment = () => {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -3921,39 +3924,39 @@ const BSBilling4Payment = () => {
|
|||
|
||||
{/* Customer Orders */}
|
||||
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
{tabledata?.length > 0 && (
|
||||
<div style={{ width: '2rem' }}>
|
||||
{tableOptions
|
||||
|
|
@ -4021,66 +4024,66 @@ const BSBilling4Payment = () => {
|
|||
<>
|
||||
{unpaidFlow == false
|
||||
? item?.OptionName == 'Hold' &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
CheckOrderType?.length === 0 &&
|
||||
OrderType != 'Failed' &&
|
||||
paybtns?.length > 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper
|
||||
title={'Hold'}
|
||||
isMobile={isMobile}
|
||||
>
|
||||
{' '}
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
style={{
|
||||
fontSize: '30px',
|
||||
cursor: 'pointer',
|
||||
color: '' ? '#52c41a' : '#1292EE',
|
||||
}}
|
||||
/>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
CheckOrderType?.length === 0 &&
|
||||
OrderType != 'Failed' &&
|
||||
paybtns?.length > 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper
|
||||
title={'Hold'}
|
||||
isMobile={isMobile}
|
||||
>
|
||||
{' '}
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
style={{
|
||||
fontSize: '30px',
|
||||
cursor: 'pointer',
|
||||
color: '' ? '#52c41a' : '#1292EE',
|
||||
}}
|
||||
/>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
: ''}
|
||||
{unpaidFlow == false
|
||||
? item?.OptionName == 'Hold' &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
Holddata?.length > 0 &&
|
||||
OrderCardDetail?.length == 0 &&
|
||||
paybtns?.length > 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper
|
||||
title={'Recall'}
|
||||
isMobile={isMobile}
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
Holddata?.length > 0 &&
|
||||
OrderCardDetail?.length == 0 &&
|
||||
paybtns?.length > 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper
|
||||
title={'Recall'}
|
||||
isMobile={isMobile}
|
||||
>
|
||||
{' '}
|
||||
<Badge
|
||||
count={Holddata?.length}
|
||||
size={'small'}
|
||||
offset={[0, 7]}
|
||||
>
|
||||
{' '}
|
||||
<Badge
|
||||
count={Holddata?.length}
|
||||
size={'small'}
|
||||
offset={[0, 7]}
|
||||
>
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => HandleholdModelOpen()}
|
||||
style={{
|
||||
fontSize: '28px',
|
||||
cursor: 'pointer',
|
||||
color: Holddata ? '#52c41a' : 'default',
|
||||
pointerEvents:
|
||||
OrderType === 'Failed'
|
||||
? 'none'
|
||||
: 'auto',
|
||||
}}
|
||||
/>
|
||||
</Badge>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => HandleholdModelOpen()}
|
||||
style={{
|
||||
fontSize: '28px',
|
||||
cursor: 'pointer',
|
||||
color: Holddata ? '#52c41a' : 'default',
|
||||
pointerEvents:
|
||||
OrderType === 'Failed'
|
||||
? 'none'
|
||||
: 'auto',
|
||||
}}
|
||||
/>
|
||||
</Badge>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
: ''}
|
||||
</>
|
||||
))}
|
||||
|
|
@ -4106,31 +4109,31 @@ const BSBilling4Payment = () => {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
}}
|
||||
>
|
||||
{paybtns?.length > 0 &&
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
paybtns?.map((payment) => (
|
||||
<div className="Table3-cash">
|
||||
<button
|
||||
className={
|
||||
paybtnselected === payment.ModeId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: paybtnselected === payment.ModeId &&
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -4144,13 +4147,13 @@ const BSBilling4Payment = () => {
|
|||
onClick={() =>
|
||||
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
|
||||
? handleUPIButtonClick(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
: handlePaymentMode(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
}
|
||||
>
|
||||
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
|
||||
|
|
@ -4209,10 +4212,10 @@ const BSBilling4Payment = () => {
|
|||
<button
|
||||
className={
|
||||
refundPaySelected === payment.ConfigId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: refundPaySelected === payment.ConfigId &&
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -4476,9 +4479,9 @@ const BSBilling4Payment = () => {
|
|||
addnewAccess
|
||||
? 'Table4-Btn-final-price-disabled'
|
||||
: FirstPaymentclick === false &&
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
? !OrderStatus
|
||||
? salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount
|
||||
|
|
@ -4498,7 +4501,7 @@ const BSBilling4Payment = () => {
|
|||
>
|
||||
{!OrderStatus ? (
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount ? (
|
||||
currentOrderNetAmount < previousNetAmount ? (
|
||||
<p className="Table4-Order">
|
||||
Refund: ₹
|
||||
{(previousNetAmount || 0) -
|
||||
|
|
@ -4509,7 +4512,7 @@ const BSBilling4Payment = () => {
|
|||
<div
|
||||
className="Table4-rate"
|
||||
style={{ fontFamily: FontFamily['head'] }}
|
||||
// onClick={() => AddBookingDetails(BookingType, true)}
|
||||
// onClick={() => AddBookingDetails(BookingType, true)}
|
||||
>
|
||||
{isMobile ? (
|
||||
`₹ ${Math.round(
|
||||
|
|
@ -4530,9 +4533,9 @@ const BSBilling4Payment = () => {
|
|||
? FailedTotalAmt
|
||||
: credit && overAllBal >= 0
|
||||
? Math.max(
|
||||
0,
|
||||
TotalAmount - overAllBal
|
||||
)
|
||||
0,
|
||||
TotalAmount - overAllBal
|
||||
)
|
||||
: TotalAmount
|
||||
)}
|
||||
/>
|
||||
|
|
@ -4708,8 +4711,8 @@ const BSBilling4Payment = () => {
|
|||
columns={columns}
|
||||
data={TableData}
|
||||
dataSource={TableData}
|
||||
// pagination={handlePageChange}
|
||||
// onChange={handleChange}
|
||||
// pagination={handlePageChange}
|
||||
// onChange={handleChange}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
|
@ -4740,14 +4743,14 @@ const BSBilling4Payment = () => {
|
|||
OrderType === 'Failed'
|
||||
? FailedTotalAmt
|
||||
: Math.round(
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
}
|
||||
failedOrderData={failedOrderData}
|
||||
/>
|
||||
|
|
@ -4825,9 +4828,9 @@ const BSBilling4Payment = () => {
|
|||
|
||||
const qty = isGroup
|
||||
? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
: item.OrderQty || 1;
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -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' && (
|
||||
|
|
|
|||
|
|
@ -1166,7 +1166,7 @@ const BSBillingTable5 = () => {
|
|||
|
||||
const selectedStyle =
|
||||
stylesMap[
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
];
|
||||
|
||||
if (selectedStyle) {
|
||||
|
|
@ -2122,15 +2122,15 @@ const BSBillingTable5 = () => {
|
|||
OrderStatus: 'O',
|
||||
OrderType:
|
||||
BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
? 'S'
|
||||
: GlobEstBooking === 'OvrAllEst'
|
||||
? 'E'
|
||||
: GlobEstBooking === 'ParEst'
|
||||
? GlobProdwisedata?.includes(
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
? 'E'
|
||||
: 'S'
|
||||
: 'S',
|
||||
|
|
@ -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
|
||||
|
|
@ -2221,7 +2224,7 @@ const BSBillingTable5 = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
OrderDtlDetails:
|
||||
|
|
@ -2238,9 +2241,9 @@ const BSBillingTable5 = () => {
|
|||
? globalTipAmount === 0
|
||||
? SelectedTableDetails
|
||||
: SelectedTableDetails?.map((item) => ({
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
: null,
|
||||
SalesPaymentType: 'normal',
|
||||
PaymentDetail: [
|
||||
|
|
@ -2255,8 +2258,8 @@ const BSBillingTable5 = () => {
|
|||
? PaymentgatewayUPI?.[0]?.ModeId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
: paybtnselected
|
||||
: paybtnselected
|
||||
? paybtnselected
|
||||
|
|
@ -2269,15 +2272,15 @@ const BSBillingTable5 = () => {
|
|||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? null
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
|
||||
?.MerchantId
|
||||
?.MerchantId
|
||||
: null,
|
||||
PaymentOptionType:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
? 'PC'
|
||||
: Paybtnnameselected?.toLowerCase() === 'cash'
|
||||
? 'PC'
|
||||
|
|
@ -2297,29 +2300,29 @@ const BSBillingTable5 = () => {
|
|||
? null
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
|
||||
?.UPIDetailId
|
||||
?.UPIDetailId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
: null,
|
||||
AccountDtl:
|
||||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? []
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentDevice
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentGateway
|
||||
: [],
|
||||
PaymentStatus:
|
||||
|
|
@ -2330,13 +2333,13 @@ const BSBillingTable5 = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
Debit:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
? Math.round(previousNetAmount - currentOrderNetAmount)
|
||||
: 0,
|
||||
Credit: salesBillEdit
|
||||
|
|
@ -2411,14 +2414,14 @@ const BSBillingTable5 = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2577,14 +2580,14 @@ const BSBillingTable5 = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2691,14 +2694,14 @@ const BSBillingTable5 = () => {
|
|||
}
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
if (response?.data?.OrderDetails?.length > 0) {
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2874,14 +2877,14 @@ const BSBillingTable5 = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
bookingpaymentupdate?.data?.response +
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
rbookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
rbookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([bookingpaymentupdate?.data]);
|
||||
|
|
@ -2900,7 +2903,7 @@ const BSBillingTable5 = () => {
|
|||
if (
|
||||
Date.now() - startTime >
|
||||
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
|
||||
60000
|
||||
60000
|
||||
) {
|
||||
// 60,000 ms = 1 minute
|
||||
|
||||
|
|
@ -3746,32 +3749,32 @@ const BSBillingTable5 = () => {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
}}
|
||||
>
|
||||
{paybtns?.length > 0 &&
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
paybtns?.map((payment) => (
|
||||
<div className="Table3-cash">
|
||||
<button
|
||||
className={
|
||||
paybtnselected === payment.ModeId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: paybtnselected === payment.ModeId &&
|
||||
(!UpinotSelected ||
|
||||
!CardoptionnotSelected)
|
||||
(!UpinotSelected ||
|
||||
!CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -3785,13 +3788,13 @@ const BSBillingTable5 = () => {
|
|||
onClick={() =>
|
||||
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
|
||||
? handleUPIButtonClick(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
: handlePaymentMode(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
}
|
||||
>
|
||||
<div
|
||||
|
|
@ -3804,16 +3807,16 @@ const BSBillingTable5 = () => {
|
|||
{payment.ModeName}
|
||||
{payment?.ModeName?.toLowerCase() ===
|
||||
'card' && (
|
||||
<CardPopover
|
||||
CardPayOption={CardPayOption}
|
||||
SelectedCardOption={SelectedCardOption}
|
||||
AddCardOption={AddCardOption}
|
||||
CardOptionOpen={CardOptionOpen}
|
||||
EnableCardOptions={EnableCardOptions}
|
||||
paygate={paygate}
|
||||
paydevice={paydevice}
|
||||
/>
|
||||
)}
|
||||
<CardPopover
|
||||
CardPayOption={CardPayOption}
|
||||
SelectedCardOption={SelectedCardOption}
|
||||
AddCardOption={AddCardOption}
|
||||
CardOptionOpen={CardOptionOpen}
|
||||
EnableCardOptions={EnableCardOptions}
|
||||
paygate={paygate}
|
||||
paydevice={paydevice}
|
||||
/>
|
||||
)}
|
||||
{payment?.ModeName?.toLowerCase() === 'upi' && (
|
||||
<UpiPopover
|
||||
defaultPaymentMode={defaultPaymentMode}
|
||||
|
|
@ -3849,11 +3852,11 @@ const BSBillingTable5 = () => {
|
|||
<button
|
||||
className={
|
||||
refundPaySelected === payment.ConfigId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: refundPaySelected === payment.ConfigId &&
|
||||
(!UpinotSelected ||
|
||||
!CardoptionnotSelected)
|
||||
(!UpinotSelected ||
|
||||
!CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -4064,16 +4067,16 @@ const BSBillingTable5 = () => {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
width: '2rem',
|
||||
|
|
@ -4093,14 +4096,14 @@ const BSBillingTable5 = () => {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -4147,9 +4150,9 @@ const BSBillingTable5 = () => {
|
|||
OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '28px',
|
||||
|
|
@ -4165,38 +4168,38 @@ const BSBillingTable5 = () => {
|
|||
{/* Customer Orders */}
|
||||
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
{tabledata?.length > 0 && dinePreference && (
|
||||
<div style={{ width: '2rem' }}>
|
||||
{tableOptions
|
||||
|
|
@ -4240,14 +4243,14 @@ const BSBillingTable5 = () => {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -4297,28 +4300,28 @@ const BSBillingTable5 = () => {
|
|||
<>
|
||||
{unpaidFlow == false
|
||||
? item?.OptionName == 'Hold' &&
|
||||
!BookingTypeBoth &&
|
||||
BookingType !== 'Dine In' &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
CheckOrderType?.length === 0 &&
|
||||
OrderType != 'Failed' &&
|
||||
paybtns?.length > 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Hold'} isMobile={isMobile}>
|
||||
<button
|
||||
className="BSBIllingTable5-cnclbtn"
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
style={{
|
||||
color: 'default',
|
||||
backgroundColor: '#eef3f3',
|
||||
}}
|
||||
>
|
||||
<p className="BigScreen">HOLD ✋</p>
|
||||
<span className="SmallScreen">✋</span>
|
||||
</button>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
!BookingTypeBoth &&
|
||||
BookingType !== 'Dine In' &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
CheckOrderType?.length === 0 &&
|
||||
OrderType != 'Failed' &&
|
||||
paybtns?.length > 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Hold'} isMobile={isMobile}>
|
||||
<button
|
||||
className="BSBIllingTable5-cnclbtn"
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
style={{
|
||||
color: 'default',
|
||||
backgroundColor: '#eef3f3',
|
||||
}}
|
||||
>
|
||||
<p className="BigScreen">HOLD ✋</p>
|
||||
<span className="SmallScreen">✋</span>
|
||||
</button>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
: ''}
|
||||
{unpaidFlow === false &&
|
||||
item?.OptionName === 'Hold' &&
|
||||
|
|
@ -4357,9 +4360,9 @@ const BSBillingTable5 = () => {
|
|||
addnewAccess
|
||||
? 'BSBIllingTable5-paybtn-noitems-disable'
|
||||
: FirstPaymentclick === false &&
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
? !OrderStatus
|
||||
? salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount
|
||||
|
|
@ -4378,7 +4381,7 @@ const BSBillingTable5 = () => {
|
|||
>
|
||||
{!OrderStatus ? (
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount ? (
|
||||
currentOrderNetAmount < previousNetAmount ? (
|
||||
<div>
|
||||
Refund: ₹
|
||||
{(previousNetAmount || 0) -
|
||||
|
|
@ -4601,14 +4604,14 @@ const BSBillingTable5 = () => {
|
|||
OrderType === 'Failed'
|
||||
? FailedTotalAmt
|
||||
: Math.round(
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
}
|
||||
failedOrderData={failedOrderData}
|
||||
/>
|
||||
|
|
@ -4636,14 +4639,14 @@ const BSBillingTable5 = () => {
|
|||
{(filteredSettingNames?.includes('Print') ||
|
||||
!MobileNoWhatsApp ||
|
||||
!MobileNoWhatsApp.value) && (
|
||||
<FaPrint
|
||||
size={32}
|
||||
color="#1292EE"
|
||||
style={{ cursor: 'pointer' }}
|
||||
onClick={handlePrintOrToken}
|
||||
title="Print"
|
||||
/>
|
||||
)}
|
||||
<FaPrint
|
||||
size={32}
|
||||
color="#1292EE"
|
||||
style={{ cursor: 'pointer' }}
|
||||
onClick={handlePrintOrToken}
|
||||
title="Print"
|
||||
/>
|
||||
)}
|
||||
|
||||
{filteredSettingNames?.includes('SMS') && isMobile && (
|
||||
<MdSms
|
||||
|
|
@ -4726,9 +4729,9 @@ const BSBillingTable5 = () => {
|
|||
|
||||
const qty = isGroup
|
||||
? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
: item.OrderQty || 1;
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -2397,15 +2397,15 @@ const BSBillingTable6 = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer
|
||||
{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' && (
|
||||
|
|
@ -2652,15 +2652,15 @@ const BSBillingTable6 = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer
|
||||
{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' && (
|
||||
|
|
@ -2954,14 +2954,14 @@ const BSBillingTable6 = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer
|
||||
? 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' && (
|
||||
|
|
@ -3237,15 +3237,16 @@ const BSBillingTable6 = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
|
||||
{item?.Type != 'C'
|
||||
? item.Offer
|
||||
? 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' && (
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
@ -469,7 +469,7 @@ const BST6Payment = () => {
|
|||
// for customised invoice number
|
||||
const { invoiceDate, clearInvoiceDate } = useDateStore();
|
||||
const CurrentOrderId = useSelector(GlobalCurrentOrderId);
|
||||
const holdCheckedSalesSetup = tableOptions?.some(
|
||||
const holdCheckedSalesSetup = tableOptions?.some(
|
||||
(item) => item?.OptionName === 'Hold'
|
||||
);
|
||||
|
||||
|
|
@ -759,7 +759,7 @@ const BST6Payment = () => {
|
|||
|
||||
const selectedStyle =
|
||||
stylesMap[
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
];
|
||||
|
||||
if (selectedStyle) {
|
||||
|
|
@ -2112,15 +2112,15 @@ const BST6Payment = () => {
|
|||
OrderStatus: 'O',
|
||||
OrderType:
|
||||
BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
? 'S'
|
||||
: GlobEstBooking === 'OvrAllEst'
|
||||
? 'E'
|
||||
: GlobEstBooking === 'ParEst'
|
||||
? GlobProdwisedata?.includes(
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
? 'E'
|
||||
: 'S'
|
||||
: 'S',
|
||||
|
|
@ -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
|
||||
|
|
@ -2210,7 +2213,7 @@ const BST6Payment = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
OrderDtlDetails:
|
||||
|
|
@ -2227,9 +2230,9 @@ const BST6Payment = () => {
|
|||
? globalTipAmount === 0
|
||||
? SelectedTableDetails
|
||||
: SelectedTableDetails?.map((item) => ({
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
: null,
|
||||
SalesPaymentType: 'normal',
|
||||
PaymentDetail: [
|
||||
|
|
@ -2244,8 +2247,8 @@ const BST6Payment = () => {
|
|||
? PaymentgatewayUPI?.[0]?.ModeId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
: paybtnselected
|
||||
: paybtnselected
|
||||
? paybtnselected
|
||||
|
|
@ -2258,15 +2261,15 @@ const BST6Payment = () => {
|
|||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? null
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
|
||||
?.MerchantId
|
||||
?.MerchantId
|
||||
: null,
|
||||
PaymentOptionType:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
? 'PC'
|
||||
: Paybtnnameselected?.toLowerCase() === 'cash'
|
||||
? 'PC'
|
||||
|
|
@ -2286,29 +2289,29 @@ const BST6Payment = () => {
|
|||
? null
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
|
||||
?.UPIDetailId
|
||||
?.UPIDetailId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
: null,
|
||||
AccountDtl:
|
||||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? []
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentDevice
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentGateway
|
||||
: [],
|
||||
PaymentStatus:
|
||||
|
|
@ -2319,13 +2322,13 @@ const BST6Payment = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
Debit:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
? Math.round(previousNetAmount - currentOrderNetAmount)
|
||||
: 0,
|
||||
Credit: salesBillEdit
|
||||
|
|
@ -2402,14 +2405,14 @@ const BST6Payment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2570,14 +2573,14 @@ const BST6Payment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2684,14 +2687,14 @@ const BST6Payment = () => {
|
|||
}
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
if (response?.data?.OrderDetails?.length > 0) {
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2867,14 +2870,14 @@ const BST6Payment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
bookingpaymentupdate?.data?.response +
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([bookingpaymentupdate?.data]);
|
||||
|
|
@ -2893,7 +2896,7 @@ const BST6Payment = () => {
|
|||
if (
|
||||
Date.now() - startTime >
|
||||
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
|
||||
60000
|
||||
60000
|
||||
) {
|
||||
// 60,000 ms = 1 minute
|
||||
|
||||
|
|
@ -3596,59 +3599,59 @@ const BST6Payment = () => {
|
|||
<>
|
||||
{unpaidFlow == false
|
||||
? item?.OptionName == 'Hold' &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
CheckOrderType?.length === 0 &&
|
||||
OrderType != 'Failed' &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
paybtns?.length > 0 &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Hold'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
style={{
|
||||
fontSize: '30px',
|
||||
cursor: 'pointer',
|
||||
color: '' ? '#52c41a' : '#1292EE',
|
||||
}}
|
||||
/>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
OrderCardDetail?.length != 0 &&
|
||||
CheckOrderType?.length === 0 &&
|
||||
OrderType != 'Failed' &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
paybtns?.length > 0 &&
|
||||
!addnewAccess && (
|
||||
<TooltipWrapper title={'Hold'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => AddBookingDetails('Hold')}
|
||||
style={{
|
||||
fontSize: '30px',
|
||||
cursor: 'pointer',
|
||||
color: '' ? '#52c41a' : '#1292EE',
|
||||
}}
|
||||
/>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
: ''}
|
||||
{unpaidFlow == false
|
||||
? item?.OptionName == 'Hold' &&
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
Holddata?.length > 0 &&
|
||||
OrderCardDetail?.length == 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess &&
|
||||
paybtns?.length > 0 &&
|
||||
!OtherServicesglobal && (
|
||||
<TooltipWrapper title={'Recall'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<Badge
|
||||
count={Holddata?.length}
|
||||
size={'small'}
|
||||
offset={[0, 7]}
|
||||
>
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => HandleholdModelOpen()}
|
||||
style={{
|
||||
fontSize: '28px',
|
||||
cursor: 'pointer',
|
||||
color: Holddata ? '#52c41a' : 'default',
|
||||
pointerEvents:
|
||||
OrderType === 'Failed' ? 'none' : 'auto',
|
||||
}}
|
||||
/>
|
||||
</Badge>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
BookingType !== 'Dine In' &&
|
||||
!BookingTypeBoth &&
|
||||
Holddata?.length > 0 &&
|
||||
OrderCardDetail?.length == 0 &&
|
||||
CheckBookingStatus != 'Close' &&
|
||||
!addnewAccess &&
|
||||
paybtns?.length > 0 &&
|
||||
!OtherServicesglobal && (
|
||||
<TooltipWrapper title={'Recall'} isMobile={isMobile}>
|
||||
{' '}
|
||||
<Badge
|
||||
count={Holddata?.length}
|
||||
size={'small'}
|
||||
offset={[0, 7]}
|
||||
>
|
||||
<PozoHoldIcon
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => HandleholdModelOpen()}
|
||||
style={{
|
||||
fontSize: '28px',
|
||||
cursor: 'pointer',
|
||||
color: Holddata ? '#52c41a' : 'default',
|
||||
pointerEvents:
|
||||
OrderType === 'Failed' ? 'none' : 'auto',
|
||||
}}
|
||||
/>
|
||||
</Badge>
|
||||
</TooltipWrapper>
|
||||
)
|
||||
: ''}
|
||||
</>
|
||||
))}
|
||||
|
|
@ -3659,16 +3662,16 @@ const BST6Payment = () => {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
width: '2rem',
|
||||
|
|
@ -3688,14 +3691,14 @@ const BST6Payment = () => {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -3761,31 +3764,31 @@ const BST6Payment = () => {
|
|||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 'none'
|
||||
: 'auto',
|
||||
opacity:
|
||||
(BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
CheckOrderType?.length > 0) &&
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
!unpaidFlow &&
|
||||
OrderStatus
|
||||
? 0.5
|
||||
: 1,
|
||||
}}
|
||||
>
|
||||
{paybtns?.length > 0 &&
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
paybtns?.map((payment) => (
|
||||
<div className="Table6-cash">
|
||||
<button
|
||||
className={
|
||||
paybtnselected === payment.ModeId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: paybtnselected === payment.ModeId &&
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -3799,13 +3802,13 @@ const BST6Payment = () => {
|
|||
onClick={() =>
|
||||
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
|
||||
? handleUPIButtonClick(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
: handlePaymentMode(
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
payment.ModeId,
|
||||
payment.ModeName
|
||||
)
|
||||
}
|
||||
>
|
||||
{/* {UpiOption === "" && payment?.Name?.toLowerCase() === "upi" && <p> UPI</p>} */}
|
||||
|
|
@ -3864,10 +3867,10 @@ const BST6Payment = () => {
|
|||
<button
|
||||
className={
|
||||
refundPaySelected === payment.ConfigId &&
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
(UpinotSelected || CardoptionnotSelected)
|
||||
? 'Btn-payment-mode-notupisel'
|
||||
: refundPaySelected === payment.ConfigId &&
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
(!UpinotSelected || !CardoptionnotSelected)
|
||||
? 'Btn-payment-mode'
|
||||
: 'Btn-payment-mode-sel'
|
||||
}
|
||||
|
|
@ -3918,9 +3921,9 @@ const BST6Payment = () => {
|
|||
addnewAccess
|
||||
? 'BST6Payment-Button-pay-disabled'
|
||||
: FirstPaymentclick === false &&
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
OrderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus != 'Close'
|
||||
? !OrderStatus
|
||||
? salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount
|
||||
|
|
@ -3942,7 +3945,7 @@ const BST6Payment = () => {
|
|||
>
|
||||
{!OrderStatus ? (
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount ? (
|
||||
currentOrderNetAmount < previousNetAmount ? (
|
||||
<div>
|
||||
Refund: ₹
|
||||
{(previousNetAmount || 0) -
|
||||
|
|
@ -4094,9 +4097,9 @@ const BST6Payment = () => {
|
|||
>
|
||||
<div className="BST6Payment-buttons">
|
||||
{paybtnselected ==
|
||||
paybtns?.filter(
|
||||
(item) => item?.ModeName?.toLowerCase() === 'cash'
|
||||
)?.[0]?.ModeId ? (
|
||||
paybtns?.filter(
|
||||
(item) => item?.ModeName?.toLowerCase() === 'cash'
|
||||
)?.[0]?.ModeId ? (
|
||||
<PaymentInput
|
||||
totalAmount={TotalAmount}
|
||||
BillingTableName="BillingTable6"
|
||||
|
|
@ -4135,9 +4138,9 @@ const BST6Payment = () => {
|
|||
OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '28px',
|
||||
|
|
@ -4154,38 +4157,38 @@ const BST6Payment = () => {
|
|||
{/* Customer Orders */}
|
||||
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
{tabledata?.length > 0 && dinePreference && (
|
||||
<div style={{ width: '2rem' }}>
|
||||
{tableOptions
|
||||
|
|
@ -4229,14 +4232,14 @@ const BST6Payment = () => {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
OrderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -4474,14 +4477,14 @@ const BST6Payment = () => {
|
|||
OrderType === 'Failed'
|
||||
? FailedTotalAmt
|
||||
: Math.round(
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
OrderCardDetail?.reduce(
|
||||
(acc, data) => data?.TotalAmt + acc,
|
||||
0
|
||||
) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)
|
||||
}
|
||||
failedOrderData={failedOrderData}
|
||||
/>
|
||||
|
|
@ -4588,9 +4591,9 @@ const BST6Payment = () => {
|
|||
|
||||
const qty = isGroup
|
||||
? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
: item.OrderQty || 1;
|
||||
|
||||
return (
|
||||
|
|
@ -4781,9 +4784,9 @@ const BST6Payment = () => {
|
|||
|
||||
const qty = isGroup
|
||||
? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
(sum, o) => sum + (o.OrderQty || 1),
|
||||
0
|
||||
)
|
||||
: item.OrderQty || 1;
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -471,7 +471,7 @@ const BSBilling7Payment = () => {
|
|||
// for customised invoice number
|
||||
const { invoiceDate, clearInvoiceDate } = useDateStore();
|
||||
const CurrentOrderId = useSelector(GlobalCurrentOrderId);
|
||||
const holdCheckedSalesSetup = tableOptions?.some(
|
||||
const holdCheckedSalesSetup = tableOptions?.some(
|
||||
(item) => item?.OptionName === 'Hold'
|
||||
);
|
||||
|
||||
|
|
@ -570,7 +570,7 @@ const BSBilling7Payment = () => {
|
|||
if (!preOrder) {
|
||||
const totalSum = OrderCardDetail?.reduce(
|
||||
// (acc, card) => acc + parseFloat(card.OrderRate * card.OrderQty || 0),
|
||||
(acc, card) => acc + parseFloat(card.TotalAmt || 0),
|
||||
(acc, card) => acc + parseFloat(card.TotalAmt || 0),
|
||||
0
|
||||
);
|
||||
|
||||
|
|
@ -696,9 +696,8 @@ const BSBilling7Payment = () => {
|
|||
}, []);
|
||||
useEffect(() => {
|
||||
if (CompId && BranchId && AppId) {
|
||||
if(holdCheckedSalesSetup)
|
||||
{
|
||||
getHolddata();
|
||||
if (holdCheckedSalesSetup) {
|
||||
getHolddata();
|
||||
}
|
||||
// getUnpaiddatas();
|
||||
getCustomerData();
|
||||
|
|
@ -1627,14 +1626,14 @@ const BSBilling7Payment = () => {
|
|||
};
|
||||
|
||||
const getBookingTypeId = async () => {
|
||||
setConfigDataList(AllBookingType);
|
||||
let configdata = AllBookingType;
|
||||
let checkName = BookingTypeBoth ? 'DineIn,TakeAway' : BookingType;
|
||||
setConfigDataList(AllBookingType);
|
||||
let configdata = AllBookingType;
|
||||
let checkName = BookingTypeBoth ? 'DineIn,TakeAway' : BookingType;
|
||||
|
||||
let filterconfigdata = configdata?.find(
|
||||
(a) => a?.ConfigName === checkName
|
||||
);
|
||||
setSelectedBookingType(filterconfigdata?.ConfigId);
|
||||
let filterconfigdata = configdata?.find(
|
||||
(a) => a?.ConfigName === checkName
|
||||
);
|
||||
setSelectedBookingType(filterconfigdata?.ConfigId);
|
||||
};
|
||||
const gettodaydate = () => {
|
||||
const currentDate = new Date();
|
||||
|
|
@ -1926,9 +1925,8 @@ const BSBilling7Payment = () => {
|
|||
setCurrentOrderNetAmount(0);
|
||||
setPreviousNetAmount(0);
|
||||
setUpinotSelected(false);
|
||||
if(holdCheckedSalesSetup)
|
||||
{
|
||||
getHolddata();
|
||||
if (holdCheckedSalesSetup) {
|
||||
getHolddata();
|
||||
}
|
||||
if (defaultBookingType === 'Both') {
|
||||
await dispatch(changeBookingType('TakeAway'));
|
||||
|
|
@ -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) {
|
||||
|
|
@ -3652,39 +3653,39 @@ const BSBilling7Payment = () => {
|
|||
|
||||
{/* Customer Orders */}
|
||||
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(OrderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
OrderCardDetail?.length > 0 ||
|
||||
(OrderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
{tabledata?.length > 0 && dinePreference && (
|
||||
<div style={{ width: '2rem' }}>
|
||||
{tableOptions
|
||||
|
|
|
|||
|
|
@ -2312,15 +2312,15 @@ const BSBillingTable7 = () => {
|
|||
fontFamily: 'Poppins',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: 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?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: 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' && (
|
||||
|
|
@ -2822,15 +2822,15 @@ const BSBillingTable7 = () => {
|
|||
fontFamily: 'Poppins',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: 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' && (
|
||||
|
|
@ -3079,15 +3079,15 @@ const BSBillingTable7 = () => {
|
|||
fontFamily: 'Poppins',
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
: 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' && (
|
||||
|
|
|
|||
|
|
@ -2616,15 +2616,15 @@ const StandardTable = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
{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' && (
|
||||
|
|
@ -2940,15 +2940,15 @@ const StandardTable = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
{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' && (
|
||||
|
|
@ -3317,14 +3317,14 @@ const StandardTable = () => {
|
|||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
? 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>
|
||||
)}
|
||||
|
||||
|
|
@ -3673,15 +3673,15 @@ const StandardTable = () => {
|
|||
}
|
||||
}}
|
||||
>
|
||||
{item?.Type != 'C'
|
||||
? item.Offer && item.Offer > 0
|
||||
? item.Offer
|
||||
: '-'
|
||||
: item?.OfferPrice && item?.OfferPrice > 0
|
||||
? item?.OfferType === 'F'
|
||||
? `₹${safeRound(item.OfferPrice)}`
|
||||
: `${item.OfferPrice}%`
|
||||
: '-'}
|
||||
{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' && (
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ import {
|
|||
getExpireProductsList,
|
||||
getLowStockAlertProductsList,
|
||||
} from '../../../../../Features/ProductPage/ProductPage.js';
|
||||
|
||||
|
||||
// Jsx Files
|
||||
const CustomerOrders = lazy(
|
||||
() => import('../../BookingFunctionality/CustomerOrders.jsx')
|
||||
|
|
@ -1420,15 +1420,15 @@ const StandardTablePayment = () => {
|
|||
OrderStatus: 'O',
|
||||
OrderType:
|
||||
BookingType === 'Dine In' ||
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
BookingTypeBoth ||
|
||||
Estimation?.SettingValue == 'N'
|
||||
? 'S'
|
||||
: GlobEstBooking === 'OvrAllEst'
|
||||
? 'E'
|
||||
: GlobEstBooking === 'ParEst'
|
||||
? GlobProdwisedata?.includes(
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
a.InwardDtlId + ' ' + a?.BookingTypeName
|
||||
)
|
||||
? 'E'
|
||||
: 'S'
|
||||
: 'S',
|
||||
|
|
@ -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
|
||||
|
|
@ -1524,7 +1527,7 @@ const StandardTablePayment = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
OrderDtlDetails:
|
||||
|
|
@ -1541,9 +1544,9 @@ const StandardTablePayment = () => {
|
|||
? globalTipAmount === 0
|
||||
? SelectedTableDetails
|
||||
: SelectedTableDetails?.map((item) => ({
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
...item,
|
||||
TipsAmount: globalTipAmount,
|
||||
}))
|
||||
: null,
|
||||
|
||||
SalesPaymentType: 'normal',
|
||||
|
|
@ -1559,8 +1562,8 @@ const StandardTablePayment = () => {
|
|||
? PaymentgatewayUPI?.[0]?.ModeId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.ModeId
|
||||
: paybtnselected
|
||||
: paybtnselected
|
||||
? paybtnselected
|
||||
|
|
@ -1573,15 +1576,15 @@ const StandardTablePayment = () => {
|
|||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? null
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
|
||||
?.MerchantId
|
||||
?.MerchantId
|
||||
: null,
|
||||
PaymentOptionType:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
(refundPaySelectedName?.toLowerCase() === 'cash' ||
|
||||
refundPaySelectedName?.toLowerCase() === 'credit')
|
||||
? 'PC'
|
||||
: Paybtnnameselected?.toLowerCase() === 'cash'
|
||||
? 'PC'
|
||||
|
|
@ -1601,29 +1604,29 @@ const StandardTablePayment = () => {
|
|||
? null
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
|
||||
?.UPIDetailId
|
||||
?.UPIDetailId
|
||||
: SelectedUPIPayOption?.toLowerCase() === 'business'
|
||||
? BusinessPayOption?.find(
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
(busupi) => busupi?.ModeId === UpiId
|
||||
)?.MerchantUPIId
|
||||
: null,
|
||||
AccountDtl:
|
||||
salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? []
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
(upipay) => upipay?.UPIId === UpiId
|
||||
)
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pd') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pd')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentDevice
|
||||
: (Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
SelectedUPIPayOption?.toLowerCase() === 'pg') ||
|
||||
(Paybtnnameselected?.toLowerCase() === 'card' &&
|
||||
SelectedCardOption?.toLowerCase() === 'pg')
|
||||
? useOptions?.[0]?.PaymentDetails?.PaymentGateway
|
||||
: [],
|
||||
PaymentStatus:
|
||||
|
|
@ -1634,13 +1637,13 @@ const StandardTablePayment = () => {
|
|||
: Paybtnnameselected?.toLowerCase() === 'credit'
|
||||
? 'S'
|
||||
: Paybtnnameselected?.toLowerCase() === 'upi' &&
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
SelectedUPIPayOption?.toLowerCase() === 'default'
|
||||
? 'S'
|
||||
: 'P',
|
||||
Debit:
|
||||
salesBillEdit &&
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
currentOrderNetAmount < previousNetAmount &&
|
||||
refundPaySelectedName?.toLowerCase() === 'credit'
|
||||
? Math.round(previousNetAmount - currentOrderNetAmount)
|
||||
: 0,
|
||||
Credit: salesBillEdit
|
||||
|
|
@ -1742,14 +1745,14 @@ const StandardTablePayment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -1908,14 +1911,14 @@ const StandardTablePayment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
response?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2020,14 +2023,14 @@ const StandardTablePayment = () => {
|
|||
}
|
||||
setMessageData(
|
||||
response?.data?.response +
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(response?.data?.OrderDetails?.length > 0
|
||||
? response?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
response?.data?.OrderId,
|
||||
response?.data?.OrderDetails?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
if (response?.data?.OrderDetails?.length > 0) {
|
||||
setPrintOrderDetails([response?.data]);
|
||||
|
|
@ -2101,9 +2104,9 @@ const StandardTablePayment = () => {
|
|||
AppId: AppId,
|
||||
...(AvailableDate && selectedDate
|
||||
? {
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
: {}),
|
||||
};
|
||||
|
||||
|
|
@ -2116,9 +2119,9 @@ const StandardTablePayment = () => {
|
|||
ProdSubCat: ProdSubCat,
|
||||
...(AvailableDate && selectedDate
|
||||
? {
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
: {}),
|
||||
};
|
||||
|
||||
|
|
@ -2129,9 +2132,9 @@ const StandardTablePayment = () => {
|
|||
prodCat: prodCat,
|
||||
...(AvailableDate && selectedDate
|
||||
? {
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
fromDate: selectedDate?.[0],
|
||||
toDate: selectedDate?.[1],
|
||||
}
|
||||
: {}),
|
||||
};
|
||||
|
||||
|
|
@ -2311,14 +2314,14 @@ const StandardTablePayment = () => {
|
|||
setMessageType('success');
|
||||
setMessageData(
|
||||
bookingpaymentupdate?.data?.response +
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
' ' +
|
||||
(bookingpaymentupdate?.data?.OrderDetails?.length > 0
|
||||
? bookingpaymentupdate?.data?.OrderId &&
|
||||
extractLastNumberOrderId(
|
||||
bookingpaymentupdate?.data?.OrderId,
|
||||
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
|
||||
)
|
||||
: '')
|
||||
);
|
||||
bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
|
||||
setPrintOrderDetails([bookingpaymentupdate?.data]);
|
||||
|
|
@ -2336,7 +2339,7 @@ const StandardTablePayment = () => {
|
|||
if (
|
||||
Date.now() - startTime >
|
||||
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
|
||||
60000
|
||||
60000
|
||||
) {
|
||||
// 60,000 ms = 1 minute
|
||||
|
||||
|
|
@ -2975,7 +2978,7 @@ const StandardTablePayment = () => {
|
|||
|
||||
const selectedStyle =
|
||||
stylesMap[
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
|
||||
];
|
||||
|
||||
if (selectedStyle) {
|
||||
|
|
@ -3479,9 +3482,9 @@ const StandardTablePayment = () => {
|
|||
cursor: orderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
orderCardDetail?.length > 0 ||
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
(selOption?.value === undefined &&
|
||||
GlobalAddCustomerDetails1?.length === 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '28px',
|
||||
|
|
@ -3504,14 +3507,14 @@ const StandardTablePayment = () => {
|
|||
width: '1.5rem',
|
||||
cursor:
|
||||
orderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'not-allowed'
|
||||
: 'pointer',
|
||||
color:
|
||||
orderCardDetail?.length === 0 ||
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
CheckBookingStatus == 'Close' ||
|
||||
addnewAccess
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
display: 'flex',
|
||||
|
|
@ -3526,39 +3529,39 @@ const StandardTablePayment = () => {
|
|||
|
||||
{/* Customer Orders */}
|
||||
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(orderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: orderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
orderCardDetail?.length > 0 ||
|
||||
(orderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
.length === 1) && (
|
||||
<Tooltip title="Customer Orders" isMobile={isMobile}>
|
||||
{' '}
|
||||
<div
|
||||
className="BSBillingNav-icon-table-icon"
|
||||
onClick={() => {
|
||||
if (
|
||||
CheckBookingStatus !== 'Close' &&
|
||||
!addnewAccess &&
|
||||
!(orderCardDetail?.length > 0)
|
||||
) {
|
||||
setCustomerPreviesOrders(true);
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
cursor: orderCardDetail?.length > 0 && 'not-allowed',
|
||||
color:
|
||||
orderCardDetail?.length > 0 ||
|
||||
(orderCardDetail?.length > 0 &&
|
||||
GetCustId?.CustMobile === undefined)
|
||||
? 'gray'
|
||||
: 'rgb(18, 146, 238)',
|
||||
fontSize: '25px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
height: '2.46rem',
|
||||
width: '1.5rem',
|
||||
}}
|
||||
>
|
||||
<FaCartPlus />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
|
||||
{tabledata?.length > 0 && dinePreference && (
|
||||
<div style={{ width: '2rem' }}>
|
||||
|
|
@ -3612,14 +3615,14 @@ const StandardTablePayment = () => {
|
|||
{(filteredSettingNames?.includes('Print') ||
|
||||
!MobileNoWhatsApp ||
|
||||
!MobileNoWhatsApp.value) && (
|
||||
<FaPrint
|
||||
size={32}
|
||||
color="#1292EE"
|
||||
style={{ cursor: 'pointer' }}
|
||||
onClick={handlePrintOrToken}
|
||||
title="Print"
|
||||
/>
|
||||
)}
|
||||
<FaPrint
|
||||
size={32}
|
||||
color="#1292EE"
|
||||
style={{ cursor: 'pointer' }}
|
||||
onClick={handlePrintOrToken}
|
||||
title="Print"
|
||||
/>
|
||||
)}
|
||||
|
||||
{filteredSettingNames?.includes('SMS') && isMobile && (
|
||||
<MdSms
|
||||
|
|
@ -3702,7 +3705,7 @@ const StandardTablePayment = () => {
|
|||
}}
|
||||
>
|
||||
{payBtns?.length > 0 &&
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
currentOrderNetAmount >= previousNetAmount ? (
|
||||
payBtns.map((payment) => {
|
||||
const mode = payment?.ModeName?.toLowerCase();
|
||||
const isSelected = paybtnselected === payment?.ModeId;
|
||||
|
|
@ -3713,9 +3716,9 @@ const StandardTablePayment = () => {
|
|||
const handleClick =
|
||||
mode === 'upi'
|
||||
? () =>
|
||||
handleUPIButtonClick(payment?.ModeId, payment?.ModeName)
|
||||
handleUPIButtonClick(payment?.ModeId, payment?.ModeName)
|
||||
: () =>
|
||||
handlePaymentMode(payment?.ModeId, payment?.ModeName);
|
||||
handlePaymentMode(payment?.ModeId, payment?.ModeName);
|
||||
|
||||
return (
|
||||
<div className="standard-pay-btns" key={payment?.ModeId}>
|
||||
|
|
@ -3867,9 +3870,9 @@ const StandardTablePayment = () => {
|
|||
addnewAccess
|
||||
? 'standard-pay-btn-disabled'
|
||||
: FirstPaymentclick === false &&
|
||||
orderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus !== 'Close'
|
||||
orderCardDetail?.length > 0 &&
|
||||
paybtnselected &&
|
||||
CheckBookingStatus !== 'Close'
|
||||
? !OrderStatus
|
||||
? salesBillEdit && currentOrderNetAmount < previousNetAmount
|
||||
? 'standard-pay-btn-refund'
|
||||
|
|
@ -3942,8 +3945,8 @@ const StandardTablePayment = () => {
|
|||
columns={columns}
|
||||
data={TableData}
|
||||
dataSource={TableData}
|
||||
// pagination={handlePageChange}
|
||||
// onChange={handleChange}
|
||||
// pagination={handlePageChange}
|
||||
// onChange={handleChange}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
|
@ -4109,11 +4112,11 @@ const StandardTablePayment = () => {
|
|||
handlesplitpaymentclose={handlesplitpaymentclose}
|
||||
TotalNetAmount={Math.round(
|
||||
orderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) -
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
((OverAllSales > 0 ? OverAllSales : 0) +
|
||||
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
|
||||
(Discount > 0 ? Discount : 0))
|
||||
)}
|
||||
// failedOrderData={failedOrderData}
|
||||
// failedOrderData={failedOrderData}
|
||||
/>
|
||||
)}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,17 +27,17 @@ import {
|
|||
GlobalprintCashierName,
|
||||
GlobalprintLogo,
|
||||
GlobalprintTax,
|
||||
GlobalSelectedPrintHeaderColor,
|
||||
GlobalSelectedPrintHeaderFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
GlobalSelectedPrintHeaderColor,
|
||||
GlobalSelectedPrintHeaderFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
} from '../../../../Features/ThemeChange/ThemeChange';
|
||||
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.scss';
|
||||
import QRCode from 'react-qr-code';
|
||||
|
|
@ -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);
|
||||
|
|
@ -516,7 +522,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
},
|
||||
];
|
||||
|
||||
const headerStyle = {
|
||||
const headerStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
|
|
@ -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>
|
||||
|
|
@ -1309,17 +1316,17 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
{((GlobaldummyData ? products : dataChunk) || []).map(
|
||||
(item, idx) => (
|
||||
<tr key={idx} className="table-row"
|
||||
style={
|
||||
idx % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: idx % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
idx % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: idx % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td
|
||||
|
|
@ -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 && (
|
||||
<>
|
||||
|
|
@ -2251,7 +2257,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
alignItems: 'flex-end',
|
||||
justifyContent: 'space-around',
|
||||
width: '100%',
|
||||
padding: '0 10px',
|
||||
padding: '0 10px',
|
||||
padding: '0 10px',
|
||||
whiteSpace: 'nowrap',
|
||||
fontSize: '10px',
|
||||
|
|
@ -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>
|
||||
|
|
@ -3046,18 +3052,18 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
<tbody>
|
||||
{((GlobaldummyData ? products : productsData) || []).map(
|
||||
(item, idx) => (
|
||||
<tr key={idx} className="table-row"
|
||||
style={
|
||||
idx % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: idx % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
<tr key={idx} className="table-row"
|
||||
style={
|
||||
idx % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: idx % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td
|
||||
|
|
@ -3139,7 +3145,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
);
|
||||
})()}
|
||||
|
||||
|
||||
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -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>
|
||||
|
|
@ -3279,7 +3285,7 @@ const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
|||
alignItems: 'flex-start',
|
||||
justifyContent: 'space-around',
|
||||
width: '100%',
|
||||
padding: '0 10px',
|
||||
padding: '0 10px',
|
||||
whiteSpace: 'nowrap',
|
||||
fontSize: '10px',
|
||||
flexWrap: 'wrap',
|
||||
|
|
@ -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) && (
|
||||
<>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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>
|
||||
|
|
@ -764,7 +771,7 @@ const PrintA5Style11 = ({
|
|||
<tbody>
|
||||
{dataChunk?.map((item, index) => (
|
||||
<tr key={index}
|
||||
style={
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
|
|
@ -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>
|
||||
|
|
@ -1765,7 +1770,7 @@ const PrintA5Style11 = ({
|
|||
<tbody>
|
||||
{dataChunk?.map((item, index) => (
|
||||
<tr key={index}
|
||||
style={
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
|
|
@ -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,179 +2932,179 @@ const PrintA5Style11 = ({
|
|||
>{`*** Membership ${table2Data?.NetAmount === 0 ? 'Free Hours' : 'Discount'} Utilized - ${MembershipApplied?.Detail?.[0]?.MembershipName} ***`}</div>
|
||||
)}
|
||||
|
||||
<div style={{...footerColorStyle}}>
|
||||
<div style={{ ...footerColorStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
<p style={{ padding: '0rem 1rem' }}>
|
||||
Notes : 10 days Return policy
|
||||
</p>
|
||||
|
||||
<hr className="PrintA4Style11-print-dottline" />
|
||||
</div>
|
||||
)
|
||||
: Notestext && (
|
||||
<div>
|
||||
<p
|
||||
style={{
|
||||
padding: '0rem 1rem',
|
||||
textAlign: 'center',
|
||||
}}
|
||||
>
|
||||
{Notestext}
|
||||
</p>
|
||||
|
||||
<hr className="PrintA4Style11-print-dottline" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
width: '90%',
|
||||
padding: '0 1rem',
|
||||
justifyContent: GlobaltermsAndConditions
|
||||
? 'space-between'
|
||||
: 'flex-end',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
{GlobaldummyData
|
||||
? GlobaltermsAndConditions && (
|
||||
<div
|
||||
style={{
|
||||
margin: '8px 0',
|
||||
padding: '8px',
|
||||
fontFamily: 'sans-serif',
|
||||
width: '100%',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Terms & Conditions
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
<p style={{ padding: '0rem 1rem' }}>
|
||||
Notes : 10 days Return policy
|
||||
</p>
|
||||
<ol
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
paddingLeft: '18px',
|
||||
margin: 0,
|
||||
lineHeight: '1',
|
||||
}}
|
||||
>
|
||||
<li>
|
||||
Once goods are sold, they are not exchangeable
|
||||
or refundable.
|
||||
</li>
|
||||
<li>
|
||||
Please check the product before leaving the
|
||||
counter.
|
||||
</li>
|
||||
</ol>
|
||||
|
||||
<hr className="PrintA4Style11-print-dottline" />
|
||||
</div>
|
||||
)
|
||||
: TermsnAdCondition == true &&
|
||||
TermsAndConditions?.length > 0 && (
|
||||
<div
|
||||
style={{
|
||||
margin: '8px 0',
|
||||
fontFamily: 'sans-serif',
|
||||
width: '100%',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-start',
|
||||
}}
|
||||
>
|
||||
: Notestext && (
|
||||
<div>
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
padding: '0rem 1rem',
|
||||
textAlign: 'center',
|
||||
}}
|
||||
>
|
||||
Terms & Conditions
|
||||
{Notestext}
|
||||
</p>
|
||||
<ol
|
||||
|
||||
<hr className="PrintA4Style11-print-dottline" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
width: '90%',
|
||||
padding: '0 1rem',
|
||||
justifyContent: GlobaltermsAndConditions
|
||||
? 'space-between'
|
||||
: 'flex-end',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
{GlobaldummyData
|
||||
? GlobaltermsAndConditions && (
|
||||
<div
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
paddingLeft: '18px',
|
||||
margin: 0,
|
||||
lineHeight: '1',
|
||||
margin: '8px 0',
|
||||
padding: '8px',
|
||||
fontFamily: 'sans-serif',
|
||||
width: '100%',
|
||||
}}
|
||||
>
|
||||
{TermsAndConditions?.map((item) => (
|
||||
<li style={{ textAlign: 'start' }}>
|
||||
{item?.TermsandConditions}
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Terms & Conditions
|
||||
</p>
|
||||
<ol
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
paddingLeft: '18px',
|
||||
margin: 0,
|
||||
lineHeight: '1',
|
||||
}}
|
||||
>
|
||||
<li>
|
||||
Once goods are sold, they are not exchangeable
|
||||
or refundable.
|
||||
</li>
|
||||
))}
|
||||
{/* <li>Please check the product before leaving the counter.</li> */}
|
||||
</ol>
|
||||
</div>
|
||||
)}
|
||||
<li>
|
||||
Please check the product before leaving the
|
||||
counter.
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
)
|
||||
: TermsnAdCondition == true &&
|
||||
TermsAndConditions?.length > 0 && (
|
||||
<div
|
||||
style={{
|
||||
margin: '8px 0',
|
||||
fontFamily: 'sans-serif',
|
||||
width: '100%',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-start',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Terms & Conditions
|
||||
</p>
|
||||
<ol
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
paddingLeft: '18px',
|
||||
margin: 0,
|
||||
lineHeight: '1',
|
||||
}}
|
||||
>
|
||||
{TermsAndConditions?.map((item) => (
|
||||
<li style={{ textAlign: 'start' }}>
|
||||
{item?.TermsandConditions}
|
||||
</li>
|
||||
))}
|
||||
{/* <li>Please check the product before leaving the counter.</li> */}
|
||||
</ol>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{GlobaldummyData
|
||||
? GlobalSignature && (
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-end',
|
||||
paddingBottom: '1rem',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
{GlobaldummyData
|
||||
? GlobalSignature && (
|
||||
<div
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-end',
|
||||
paddingBottom: '1rem',
|
||||
}}
|
||||
>
|
||||
Signature
|
||||
</p>
|
||||
<img
|
||||
style={{ width: '70px', height: '40px' }}
|
||||
src={
|
||||
GlobalSignatureImages
|
||||
? GlobalSignatureImages
|
||||
: signature
|
||||
}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
: Signature == true && (
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'center',
|
||||
marginTop: '1rem',
|
||||
paddingBottom: '1rem',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Signature
|
||||
</p>
|
||||
<img
|
||||
style={{ width: '70px', height: '40px' }}
|
||||
src={
|
||||
GlobalSignatureImages
|
||||
? GlobalSignatureImages
|
||||
: signature
|
||||
}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
: Signature == true && (
|
||||
<div
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'center',
|
||||
marginTop: '1rem',
|
||||
paddingBottom: '1rem',
|
||||
}}
|
||||
>
|
||||
Signature
|
||||
</p>
|
||||
<img
|
||||
style={{ width: '100px', height: '60px' }}
|
||||
src={SignatureImg}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Signature
|
||||
</p>
|
||||
<img
|
||||
style={{ width: '100px', height: '60px' }}
|
||||
src={SignatureImg}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
|
|
@ -3515,173 +3518,173 @@ const PrintA5Style11 = ({
|
|||
>{`*** Membership ${table2Data?.NetAmount === 0 ? 'Free Hours' : 'Discount'} Utilized - ${MembershipApplied?.Detail?.[0]?.MembershipName} ***`}</div>
|
||||
)}
|
||||
|
||||
<div style={{...footerColorStyle}}>
|
||||
<div style={{ ...footerColorStyle }}>
|
||||
{GlobaldummyData
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
<p style={{ padding: '0rem 1rem' }}>
|
||||
Notes : 10 days Return policy
|
||||
</p>
|
||||
|
||||
<hr className="PrintA4Style11-print-dottline" />
|
||||
</div>
|
||||
)
|
||||
: Notestext && (
|
||||
<div>
|
||||
<p style={{ padding: '0rem 1rem', textAlign: 'center' }}>
|
||||
{Notestext}
|
||||
</p>
|
||||
|
||||
<hr className="PrintA4Style11-print-dottline" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
width: '90%',
|
||||
padding: '0 1rem',
|
||||
justifyContent: GlobaltermsAndConditions
|
||||
? 'space-between'
|
||||
: 'flex-end',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
{GlobaldummyData
|
||||
? GlobaltermsAndConditions && (
|
||||
<div
|
||||
style={{
|
||||
margin: '8px 0',
|
||||
padding: '8px',
|
||||
fontFamily: 'sans-serif',
|
||||
width: '100%',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Terms & Conditions
|
||||
? GlobalIsnotes && (
|
||||
<div>
|
||||
<p style={{ padding: '0rem 1rem' }}>
|
||||
Notes : 10 days Return policy
|
||||
</p>
|
||||
<ol
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
paddingLeft: '18px',
|
||||
margin: 0,
|
||||
lineHeight: '1',
|
||||
}}
|
||||
>
|
||||
<li>
|
||||
Once goods are sold, they are not exchangeable or
|
||||
refundable.
|
||||
</li>
|
||||
<li>
|
||||
Please check the product before leaving the counter.
|
||||
</li>
|
||||
</ol>
|
||||
|
||||
<hr className="PrintA4Style11-print-dottline" />
|
||||
</div>
|
||||
)
|
||||
: TermsnAdCondition == true &&
|
||||
TermsAndConditions?.length > 0 && (
|
||||
<div
|
||||
style={{
|
||||
margin: '8px 0',
|
||||
fontFamily: 'sans-serif',
|
||||
width: '100%',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-start',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Terms & Conditions
|
||||
: Notestext && (
|
||||
<div>
|
||||
<p style={{ padding: '0rem 1rem', textAlign: 'center' }}>
|
||||
{Notestext}
|
||||
</p>
|
||||
<ol
|
||||
|
||||
<hr className="PrintA4Style11-print-dottline" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
width: '90%',
|
||||
padding: '0 1rem',
|
||||
justifyContent: GlobaltermsAndConditions
|
||||
? 'space-between'
|
||||
: 'flex-end',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
{GlobaldummyData
|
||||
? GlobaltermsAndConditions && (
|
||||
<div
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
paddingLeft: '18px',
|
||||
margin: 0,
|
||||
lineHeight: '1',
|
||||
margin: '8px 0',
|
||||
padding: '8px',
|
||||
fontFamily: 'sans-serif',
|
||||
width: '100%',
|
||||
}}
|
||||
>
|
||||
{TermsAndConditions?.map((item) => (
|
||||
<li style={{ textAlign: 'start' }}>
|
||||
{item?.TermsandConditions}
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Terms & Conditions
|
||||
</p>
|
||||
<ol
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
paddingLeft: '18px',
|
||||
margin: 0,
|
||||
lineHeight: '1',
|
||||
}}
|
||||
>
|
||||
<li>
|
||||
Once goods are sold, they are not exchangeable or
|
||||
refundable.
|
||||
</li>
|
||||
))}
|
||||
{/* <li>Please check the product before leaving the counter.</li> */}
|
||||
</ol>
|
||||
</div>
|
||||
)}
|
||||
<li>
|
||||
Please check the product before leaving the counter.
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
)
|
||||
: TermsnAdCondition == true &&
|
||||
TermsAndConditions?.length > 0 && (
|
||||
<div
|
||||
style={{
|
||||
margin: '8px 0',
|
||||
fontFamily: 'sans-serif',
|
||||
width: '100%',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-start',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Terms & Conditions
|
||||
</p>
|
||||
<ol
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
paddingLeft: '18px',
|
||||
margin: 0,
|
||||
lineHeight: '1',
|
||||
}}
|
||||
>
|
||||
{TermsAndConditions?.map((item) => (
|
||||
<li style={{ textAlign: 'start' }}>
|
||||
{item?.TermsandConditions}
|
||||
</li>
|
||||
))}
|
||||
{/* <li>Please check the product before leaving the counter.</li> */}
|
||||
</ol>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{GlobaldummyData
|
||||
? GlobalSignature && (
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-end',
|
||||
paddingBottom: '1rem',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
{GlobaldummyData
|
||||
? GlobalSignature && (
|
||||
<div
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-end',
|
||||
paddingBottom: '1rem',
|
||||
}}
|
||||
>
|
||||
Signature
|
||||
</p>
|
||||
<img
|
||||
style={{ width: '70px', height: '40px' }}
|
||||
src={
|
||||
GlobalSignatureImages
|
||||
? GlobalSignatureImages
|
||||
: signature
|
||||
}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
: Signature == true && (
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'center',
|
||||
marginTop: '1rem',
|
||||
paddingBottom: '1rem',
|
||||
}}
|
||||
>
|
||||
<p
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Signature
|
||||
</p>
|
||||
<img
|
||||
style={{ width: '70px', height: '40px' }}
|
||||
src={
|
||||
GlobalSignatureImages
|
||||
? GlobalSignatureImages
|
||||
: signature
|
||||
}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
: Signature == true && (
|
||||
<div
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'center',
|
||||
marginTop: '1rem',
|
||||
paddingBottom: '1rem',
|
||||
}}
|
||||
>
|
||||
Signature
|
||||
</p>
|
||||
<img
|
||||
style={{ width: '100px', height: '60px' }}
|
||||
src={SignatureImg}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
<p
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
fontWeight: 'bold',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
Signature
|
||||
</p>
|
||||
<img
|
||||
style={{ width: '100px', height: '60px' }}
|
||||
src={SignatureImg}
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</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);
|
||||
|
|
@ -496,7 +502,7 @@ const TaxInvoice = ({
|
|||
style={{
|
||||
fontWeight: '700',
|
||||
fontSize: '15px',
|
||||
color: headerColor?.font
|
||||
color: headerColor?.font
|
||||
}}
|
||||
>
|
||||
{invoiceData.companyName}
|
||||
|
|
|
|||
|
|
@ -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,15 +501,17 @@ const PrintStyle1 = ({
|
|||
width: '100%',
|
||||
}}
|
||||
>
|
||||
<div style={{ display: 'flex', justifyContent: 'center', ...(GlobaldummyData
|
||||
? {
|
||||
color: SelectedHeaderFontColor,
|
||||
backgroundColor: SelectedHeaderColor,
|
||||
}
|
||||
: {
|
||||
color: headerColor?.font,
|
||||
backgroundColor: headerColor?.background,
|
||||
}), }}>
|
||||
<div style={{
|
||||
display: 'flex', justifyContent: 'center', ...(GlobaldummyData
|
||||
? {
|
||||
color: SelectedHeaderFontColor,
|
||||
backgroundColor: SelectedHeaderColor,
|
||||
}
|
||||
: {
|
||||
color: headerColor?.font,
|
||||
backgroundColor: headerColor?.background,
|
||||
}),
|
||||
}}>
|
||||
{GlobaldummyData ? (
|
||||
GlobalLogo && (
|
||||
<img
|
||||
|
|
@ -526,13 +535,13 @@ const PrintStyle1 = ({
|
|||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
''
|
||||
) : (
|
||||
<div className="PrintStyle1-print"
|
||||
style={{
|
||||
fontSize: 'clamp(2rem, 2.5vw, 2rem)',
|
||||
fontWeight: '600',
|
||||
color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
|
||||
backgroundColor: GlobaldummyData ? SelectedHeaderColor : headerColor?.background,
|
||||
}}>
|
||||
<div className="PrintStyle1-print"
|
||||
style={{
|
||||
fontSize: 'clamp(2rem, 2.5vw, 2rem)',
|
||||
fontWeight: '600',
|
||||
color: GlobaldummyData ? SelectedHeaderFontColor : headerColor?.font,
|
||||
backgroundColor: GlobaldummyData ? SelectedHeaderColor : headerColor?.background,
|
||||
}}>
|
||||
<div>
|
||||
{' '}
|
||||
{GlobaldummyData ? 'XYZ Shop' : table2Data?.BrName}
|
||||
|
|
@ -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>
|
||||
|
|
@ -1058,17 +1063,17 @@ const PrintStyle11 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && (
|
||||
|
|
@ -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>
|
||||
|
|
@ -1283,7 +1287,7 @@ const PrintStyle11 = ({
|
|||
textAlign: 'right',
|
||||
fontWeight: '600',
|
||||
fontSize: '18px',
|
||||
...netAmountStyle
|
||||
...netAmountStyle
|
||||
}}
|
||||
>
|
||||
Amount :
|
||||
|
|
@ -2255,7 +2259,7 @@ const PrintStyle11 = ({
|
|||
textAlign: 'right',
|
||||
fontWeight: '600',
|
||||
fontSize: '18px',
|
||||
...netAmountStyle
|
||||
...netAmountStyle
|
||||
}}
|
||||
>
|
||||
Amount :
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -31,16 +31,16 @@ import {
|
|||
GlobalprintCredit,
|
||||
GlobalprintTax,
|
||||
GlobalSelectedPrintHeaderColor,
|
||||
GlobalSelectedPrintHeaderFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
GlobalSelectedPrintHeaderFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
} from '../../../../Features/ThemeChange/ThemeChange';
|
||||
import {
|
||||
GlobalUpiIDprint,
|
||||
|
|
@ -114,25 +114,31 @@ const Printstyle12 = ({
|
|||
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||
const SettingData = useSelector(PreferenceData);
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
let printColors = printDatas?.PrintColors;
|
||||
const headerColor = printColors?.find(obj => obj.headerColor)?.headerColor;
|
||||
const tableHeaderColor = printColors?.find(obj => obj.tableHeaderColor)?.tableHeaderColor;
|
||||
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
let printColors = printDatas?.PrintColors;
|
||||
const headerColor = printColors?.find(obj => obj.headerColor)?.headerColor;
|
||||
const tableHeaderColor = printColors?.find(obj => obj.tableHeaderColor)?.tableHeaderColor;
|
||||
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 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) =>
|
||||
|
|
@ -504,7 +510,7 @@ const Printstyle12 = ({
|
|||
await printDiv('PrintStyle12', style12, 'FontApply');
|
||||
};
|
||||
|
||||
const headerStyle = {
|
||||
const headerStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
|
|
@ -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>
|
||||
|
|
@ -878,17 +884,17 @@ const Printstyle12 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && (
|
||||
|
|
@ -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>
|
||||
|
|
@ -1175,17 +1180,17 @@ const Printstyle12 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && (
|
||||
|
|
@ -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>
|
||||
|
|
@ -3525,17 +3529,17 @@ const Printstyle12 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && <td>{index + 1}</td>}
|
||||
|
|
@ -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>
|
||||
|
|
@ -3833,17 +3837,17 @@ const Printstyle12 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && <td>{index + 1}</td>}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -105,16 +105,16 @@ const Printstyle2 = ({
|
|||
(ps) => ps.PaymentTypeName === 'UPI'
|
||||
);
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
const GlobalSignature = useSelector(GlobalprintSignature);
|
||||
const GlobaltermsAndConditions = useSelector(GlobalprinttermsAndConditions);
|
||||
const GlobalSignatureImages = useSelector(GlobalSignatureImage);
|
||||
|
|
@ -126,9 +126,15 @@ const Printstyle2 = ({
|
|||
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||
const SettingData = useSelector(PreferenceData);
|
||||
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
|
||||
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];
|
||||
)?.[0];
|
||||
const estimatePrintHeader =
|
||||
SettingData?.[0]?.SettingDtlDetails?.find(
|
||||
(setting) =>
|
||||
|
|
@ -364,50 +370,50 @@ const Printstyle2 = ({
|
|||
: 0;
|
||||
|
||||
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 13);
|
||||
const headerStyle ={
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
const headerStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
|
||||
color: GlobaldummyData
|
||||
? SelectedHeaderFontColor
|
||||
: headerColor?.font,
|
||||
color: GlobaldummyData
|
||||
? SelectedHeaderFontColor
|
||||
: headerColor?.font,
|
||||
}
|
||||
const tableHeaderStyle ={
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableHeaderColor
|
||||
: tableHeaderColor?.background,
|
||||
const tableHeaderStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableHeaderColor
|
||||
: tableHeaderColor?.background,
|
||||
|
||||
color: GlobaldummyData
|
||||
? SelectedTableHeaderFontColor
|
||||
: tableHeaderColor?.font,
|
||||
color: GlobaldummyData
|
||||
? SelectedTableHeaderFontColor
|
||||
: tableHeaderColor?.font,
|
||||
}
|
||||
const tableBodyStyle ={
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableBodyColor
|
||||
: tableBodyColor?.background,
|
||||
color: GlobaldummyData
|
||||
? SelectedTableBodyFontColor
|
||||
: tableBodyColor?.font,
|
||||
const tableBodyStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableBodyColor
|
||||
: tableBodyColor?.background,
|
||||
color: GlobaldummyData
|
||||
? SelectedTableBodyFontColor
|
||||
: tableBodyColor?.font,
|
||||
}
|
||||
const rowtypeStyle = GlobaldummyData? SelectedRowType: tableBodyColor?.rowType;
|
||||
const footerColorStyle ={
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableFooterColor
|
||||
: footerColor?.background,
|
||||
const rowtypeStyle = GlobaldummyData ? SelectedRowType : tableBodyColor?.rowType;
|
||||
const footerColorStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedTableFooterColor
|
||||
: footerColor?.background,
|
||||
|
||||
color: GlobaldummyData
|
||||
? SelectedTableFooterFontColor
|
||||
: footerColor?.font,
|
||||
color: GlobaldummyData
|
||||
? SelectedTableFooterFontColor
|
||||
: footerColor?.font,
|
||||
}
|
||||
const netAmountStyle ={
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedNetAmountColor
|
||||
: netAmtColor?.background,
|
||||
const netAmountStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedNetAmountColor
|
||||
: netAmtColor?.background,
|
||||
|
||||
color: GlobaldummyData
|
||||
? SelectedNetAmountFontColor
|
||||
: netAmtColor?.font,
|
||||
color: GlobaldummyData
|
||||
? SelectedNetAmountFontColor
|
||||
: netAmtColor?.font,
|
||||
}
|
||||
return (
|
||||
<>
|
||||
|
|
@ -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>
|
||||
|
|
@ -741,17 +747,17 @@ const Printstyle2 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td className="Re-print-body-Rate">
|
||||
|
|
@ -797,8 +803,8 @@ const Printstyle2 = ({
|
|||
</span>
|
||||
))}
|
||||
</div>
|
||||
) : UomPrint?.SettingValue === 'Y' && (
|
||||
|
||||
) : UomPrint?.SettingValue === 'Y' && (
|
||||
|
||||
<div>
|
||||
({item?.Size ? item?.Size : '1'}{' '}
|
||||
{item?.SinglePc == 'Y'
|
||||
|
|
@ -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>
|
||||
|
|
@ -1119,17 +1126,17 @@ const Printstyle2 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td className="Re-print-body-Rate">
|
||||
|
|
@ -1156,17 +1163,17 @@ const Printstyle2 = ({
|
|||
}}
|
||||
>
|
||||
<div>{item?.ProdName}</div>
|
||||
{UomPrint?.SettingValue === 'Y' &&
|
||||
<div>
|
||||
({item?.Size ? item?.Size : '1'}{' '}
|
||||
{item?.SinglePc == 'Y'
|
||||
? 'PCS'
|
||||
: item?.Type != 'C'
|
||||
? item?.UomName
|
||||
: 'COMBO'}
|
||||
)
|
||||
</div>
|
||||
}
|
||||
{UomPrint?.SettingValue === 'Y' &&
|
||||
<div>
|
||||
({item?.Size ? item?.Size : '1'}{' '}
|
||||
{item?.SinglePc == 'Y'
|
||||
? 'PCS'
|
||||
: item?.Type != 'C'
|
||||
? item?.UomName
|
||||
: 'COMBO'}
|
||||
)
|
||||
</div>
|
||||
}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -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' }}>
|
||||
|
|
@ -2061,7 +2068,7 @@ const Printstyle2 = ({
|
|||
pageBreakBefore: 'avoid',
|
||||
pageBreakInside: 'avoid',
|
||||
minHeight: 'auto',
|
||||
...footerColorStyle
|
||||
...footerColorStyle
|
||||
}}
|
||||
>
|
||||
{GlobaldummyData
|
||||
|
|
@ -2274,11 +2281,11 @@ const Printstyle2 = ({
|
|||
pageBreakBefore: 'avoid',
|
||||
pageBreakInside: 'avoid',
|
||||
minHeight: 'auto',
|
||||
...footerColorStyle
|
||||
...footerColorStyle
|
||||
}}
|
||||
>
|
||||
<>
|
||||
<div className="PrintStyle2-ThirdDivMaster" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle2-ThirdDivMaster" style={{ ...netAmountStyle }}>
|
||||
<div className="PrintStyle2-ThirdP">
|
||||
<div>
|
||||
<div style={{ textAlign: 'left', fontWeight: '600' }}>
|
||||
|
|
@ -2932,7 +2939,7 @@ const Printstyle2 = ({
|
|||
pageBreakBefore: 'avoid',
|
||||
pageBreakInside: 'avoid',
|
||||
minHeight: 'auto',
|
||||
...footerColorStyle
|
||||
...footerColorStyle
|
||||
}}
|
||||
>
|
||||
{GlobaldummyData
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3363,18 +3370,18 @@ const Printstyle2 = ({
|
|||
{(GlobaldummyData ? products : TakeawayData)?.map(
|
||||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td className="Re-print-body-Rate">
|
||||
|
|
@ -3419,7 +3426,7 @@ const Printstyle2 = ({
|
|||
</span>
|
||||
))}
|
||||
</div>
|
||||
) : UomPrint?.SettingValue === 'Y' && (
|
||||
) : UomPrint?.SettingValue === 'Y' && (
|
||||
<div>
|
||||
({item?.Size ? item?.Size : '1'}{' '}
|
||||
{item?.SinglePc == 'Y'
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3701,17 +3708,17 @@ const Printstyle2 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td className="Re-print-body-Rate">
|
||||
|
|
@ -3738,17 +3745,17 @@ const Printstyle2 = ({
|
|||
}}
|
||||
>
|
||||
<div>{item?.ProdName}</div>
|
||||
{UomPrint?.SettingValue === 'Y' &&
|
||||
<div>
|
||||
({item?.Size ? item?.Size : '1'}{' '}
|
||||
{item?.SinglePc == 'Y'
|
||||
? 'PCS'
|
||||
: item?.Type != 'C'
|
||||
? item?.UomName
|
||||
: 'COMBO'}
|
||||
)
|
||||
</div>
|
||||
}
|
||||
{UomPrint?.SettingValue === 'Y' &&
|
||||
<div>
|
||||
({item?.Size ? item?.Size : '1'}{' '}
|
||||
{item?.SinglePc == 'Y'
|
||||
? 'PCS'
|
||||
: item?.Type != 'C'
|
||||
? item?.UomName
|
||||
: 'COMBO'}
|
||||
)
|
||||
</div>
|
||||
}
|
||||
</td>
|
||||
)}
|
||||
{GlobaldummyData
|
||||
|
|
@ -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>
|
||||
|
|
@ -4499,7 +4506,7 @@ const Printstyle2 = ({
|
|||
pageBreakBefore: 'avoid',
|
||||
pageBreakInside: 'avoid',
|
||||
minHeight: 'auto',
|
||||
...footerColorStyle
|
||||
...footerColorStyle
|
||||
}}
|
||||
>
|
||||
{GlobaldummyData
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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>{' '}
|
||||
|
|
|
|||
|
|
@ -29,17 +29,17 @@ import {
|
|||
GlobalprintLogo,
|
||||
GlobalprintCredit,
|
||||
GlobalprintTax,
|
||||
GlobalSelectedPrintHeaderColor,
|
||||
GlobalSelectedPrintHeaderFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
GlobalSelectedPrintHeaderColor,
|
||||
GlobalSelectedPrintHeaderFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
} from '../../../../Features/ThemeChange/ThemeChange';
|
||||
import {
|
||||
GlobalUpiIDprint,
|
||||
|
|
@ -113,17 +113,23 @@ const Printstyle6 = ({
|
|||
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||
const SettingData = useSelector(PreferenceData);
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
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'
|
||||
|
|
@ -356,7 +362,7 @@ const Printstyle6 = ({
|
|||
? paginatedChunks[paginatedChunks.length - 1].length
|
||||
: 0;
|
||||
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 13);
|
||||
const headerStyle = {
|
||||
const headerStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
|
|
@ -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/'}{' '}
|
||||
|
|
@ -789,17 +795,17 @@ const Printstyle6 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && (
|
||||
|
|
@ -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/'}{' '}
|
||||
|
|
@ -1207,17 +1212,17 @@ const Printstyle6 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && (
|
||||
|
|
@ -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',
|
||||
|
|
@ -2197,7 +2201,7 @@ const Printstyle6 = ({
|
|||
pageBreakBefore: 'avoid',
|
||||
pageBreakInside: 'avoid',
|
||||
minHeight: 'auto',
|
||||
...footerColorStyle
|
||||
...footerColorStyle
|
||||
}}
|
||||
>
|
||||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
|
|
@ -2799,7 +2803,7 @@ const Printstyle6 = ({
|
|||
</div>
|
||||
</div>
|
||||
)}
|
||||
<div className="PrintStyle6-secondDiv" style={{...netAmountStyle}}>
|
||||
<div className="PrintStyle6-secondDiv" style={{ ...netAmountStyle }}>
|
||||
<div
|
||||
style={{
|
||||
textAlign: 'left',
|
||||
|
|
@ -3193,7 +3197,7 @@ const Printstyle6 = ({
|
|||
pageBreakBefore: 'avoid',
|
||||
pageBreakInside: 'avoid',
|
||||
minHeight: 'auto',
|
||||
...footerColorStyle
|
||||
...footerColorStyle
|
||||
}}
|
||||
>
|
||||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3648,17 +3653,17 @@ const Printstyle6 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && <td>{index + 1}</td>}
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3950,17 +3955,17 @@ const Printstyle6 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && <td>{index + 1}</td>}
|
||||
|
|
@ -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',
|
||||
|
|
@ -4896,7 +4901,7 @@ const Printstyle6 = ({
|
|||
pageBreakBefore: 'avoid',
|
||||
pageBreakInside: 'avoid',
|
||||
minHeight: 'auto',
|
||||
...footerColorStyle
|
||||
...footerColorStyle
|
||||
}}
|
||||
>
|
||||
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
|
||||
|
|
|
|||
|
|
@ -109,18 +109,18 @@ const PrintStyle7 = ({
|
|||
const GlobalLogo = useSelector(GlobalprintLogo);
|
||||
const GlobalCredit = useSelector(GlobalprintCredit);
|
||||
const SettingData = useSelector(PreferenceData);
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
let printColors = printDatas?.PrintColors;
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
let printColors = printDatas?.PrintColors;
|
||||
const headerColor = printColors?.find(obj => obj.headerColor)?.headerColor;
|
||||
const tableHeaderColor = printColors?.find(obj => obj.tableHeaderColor)?.tableHeaderColor;
|
||||
const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor;
|
||||
|
|
@ -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) =>
|
||||
|
|
@ -375,7 +381,7 @@ const PrintStyle7 = ({
|
|||
? paginatedChunks[paginatedChunks.length - 1].length
|
||||
: 0;
|
||||
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 10);
|
||||
const headerStyle = {
|
||||
const headerStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
|
|
@ -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 && (
|
||||
|
|
@ -725,17 +731,17 @@ const PrintStyle7 = ({
|
|||
<tbody>
|
||||
{dataChunk?.map((item, index) => (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td style={{ textAlign: 'center' }}>
|
||||
|
|
@ -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 && (
|
||||
|
|
@ -999,17 +1004,17 @@ const PrintStyle7 = ({
|
|||
<tbody>
|
||||
{dataChunk?.map((item, index) => (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td style={{ textAlign: 'center' }}>
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3211,17 +3216,17 @@ const PrintStyle7 = ({
|
|||
{(GlobaldummyData ? products : TakeawayData)?.map(
|
||||
(item, index) => (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td style={{ textAlign: 'center' }}>
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3469,17 +3474,17 @@ const PrintStyle7 = ({
|
|||
{(GlobaldummyData ? products : DineInData)?.map(
|
||||
(item, index) => (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td style={{ textAlign: 'center' }}>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -30,15 +30,15 @@ import {
|
|||
GlobalprintTax,
|
||||
GlobalSelectedPrintHeaderColor,
|
||||
GlobalSelectedPrintHeaderFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
} from '../../../../Features/ThemeChange/ThemeChange';
|
||||
import Logo from '../../../../Images/Logo.jpg';
|
||||
import {
|
||||
|
|
@ -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];
|
||||
|
|
@ -160,17 +166,17 @@ const Printstyle8 = ({
|
|||
);
|
||||
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
let printColors = printDatas?.PrintColors;
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
let printColors = printDatas?.PrintColors;
|
||||
const headerColor = printColors?.find(obj => obj.headerColor)?.headerColor;
|
||||
const tableHeaderColor = printColors?.find(obj => obj.tableHeaderColor)?.tableHeaderColor;
|
||||
const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor;
|
||||
|
|
@ -387,7 +393,7 @@ const Printstyle8 = ({
|
|||
? paginatedChunks[paginatedChunks.length - 1].length
|
||||
: 0;
|
||||
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 13);
|
||||
const headerStyle = {
|
||||
const headerStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
|
|
@ -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
|
||||
|
|
@ -821,17 +827,17 @@ const Printstyle8 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td style={{ textAlign: 'center' }}>
|
||||
|
|
@ -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
|
||||
|
|
@ -1217,17 +1222,17 @@ const Printstyle8 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td style={{ textAlign: 'center' }}>
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3593,17 +3598,17 @@ const Printstyle8 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td style={{ textAlign: 'center' }}>
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3864,17 +3869,17 @@ const Printstyle8 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && (
|
||||
<td style={{ textAlign: 'center' }}>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -30,15 +30,15 @@ import {
|
|||
GlobalprintTax,
|
||||
GlobalSelectedPrintHeaderColor,
|
||||
GlobalSelectedPrintHeaderFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
GlobalSelectedTableHeaderColor,
|
||||
GlobalSelectedTableHeaderFontColor,
|
||||
GlobalSelectedTableBodyFontColor,
|
||||
GlobalSelectedTableBodyColor,
|
||||
GlobalRowType,
|
||||
GlobalSelectedFooterColor,
|
||||
GlobalSelectedFooterFontColor,
|
||||
GlobalSelectedNetAmountColor,
|
||||
GlobalSelectedNetAmountFontColor,
|
||||
} from '../../../../Features/ThemeChange/ThemeChange';
|
||||
import Logo from '../../../../Images/Logo.jpg';
|
||||
import {
|
||||
|
|
@ -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];
|
||||
|
|
@ -154,18 +160,18 @@ const PrintStyle9 = ({
|
|||
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
|
||||
);
|
||||
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
let printColors = printDatas?.PrintColors;
|
||||
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
|
||||
const SelectedHeaderFontColor = useSelector(GlobalSelectedPrintHeaderFontColor);
|
||||
const SelectedTableHeaderColor = useSelector(GlobalSelectedTableHeaderColor);
|
||||
const SelectedTableHeaderFontColor = useSelector(GlobalSelectedTableHeaderFontColor);
|
||||
const SelectedTableBodyColor = useSelector(GlobalSelectedTableBodyColor);
|
||||
const SelectedTableBodyFontColor = useSelector(GlobalSelectedTableBodyFontColor);
|
||||
const SelectedRowType = useSelector(GlobalRowType);
|
||||
const SelectedTableFooterColor = useSelector(GlobalSelectedFooterColor);
|
||||
const SelectedTableFooterFontColor = useSelector(GlobalSelectedFooterFontColor);
|
||||
const SelectedNetAmountColor = useSelector(GlobalSelectedNetAmountColor);
|
||||
const SelectedNetAmountFontColor = useSelector(GlobalSelectedNetAmountFontColor);
|
||||
let printColors = printDatas?.PrintColors;
|
||||
const headerColor = printColors?.find(obj => obj.headerColor)?.headerColor;
|
||||
const tableHeaderColor = printColors?.find(obj => obj.tableHeaderColor)?.tableHeaderColor;
|
||||
const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor;
|
||||
|
|
@ -377,7 +383,7 @@ const PrintStyle9 = ({
|
|||
? paginatedChunks[paginatedChunks.length - 1].length
|
||||
: 0;
|
||||
const shouldFooterBeOnNewPage = lastChunkRows > (PageSize == 'A5' ? 5 : 10);
|
||||
const headerStyle = {
|
||||
const headerStyle = {
|
||||
backgroundColor: GlobaldummyData
|
||||
? SelectedHeaderColor
|
||||
: headerColor?.background,
|
||||
|
|
@ -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>
|
||||
|
|
@ -771,17 +777,17 @@ const PrintStyle9 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && (
|
||||
|
|
@ -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>
|
||||
|
|
@ -1095,17 +1100,17 @@ const PrintStyle9 = ({
|
|||
{dataChunk?.map((item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && (
|
||||
|
|
@ -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,10 +3342,11 @@ const PrintStyle9 = ({
|
|||
table2Data?.FYStatus
|
||||
)}
|
||||
</div>
|
||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', fontWeight: 600 }}>
|
||||
{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
|
||||
</div>}
|
||||
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
|
||||
{' '}
|
||||
Name : {table2Data?.SalesMode == "R" ? Retailshortname?.Comments : Wholesaleshortname?.Comments}{' '}
|
||||
|
||||
</div>}
|
||||
<div style={{ fontSize: '12px', fontWeight: '400' }}>
|
||||
{' '}
|
||||
{GlobaldummyData ? formattedDate : Date1}{' '}
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3482,17 +3487,17 @@ const PrintStyle9 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && <td>{index + 1}</td>}
|
||||
|
|
@ -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>
|
||||
)}
|
||||
|
|
@ -3740,17 +3746,17 @@ const PrintStyle9 = ({
|
|||
(item, index) => {
|
||||
return (
|
||||
<tr key={index}
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
style={
|
||||
index % 2 !== 1 && rowtypeStyle === "even"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: index % 2 === 1 && rowtypeStyle === "odd"
|
||||
? {
|
||||
...tableBodyStyle
|
||||
}
|
||||
: {}
|
||||
}>
|
||||
{GlobaldummyData
|
||||
? GlobalSlNo && <td>{index + 1}</td>
|
||||
: SLNO && <td>{index + 1}</td>}
|
||||
|
|
@ -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