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

priceoveride

This commit is contained in:
Tamilselvan 2026-03-05 11:30:24 +05:30
parent 0236fee8af
commit a123ddfe5e
13 changed files with 1300 additions and 1280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBillingTable1.jsx
View File

@ -2454,12 +2454,12 @@ const BSBillingTable1 = () => {
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${item.OfferPrice}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -2745,12 +2745,12 @@ const BSBillingTable1 = () => {
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${item.OfferPrice}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -3090,12 +3090,12 @@ const BSBillingTable1 = () => {
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${item.OfferPrice}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -3413,15 +3413,16 @@ const BSBillingTable1 = () => {
} }
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${item.OfferPrice}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (

389
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx
View File

@ -260,7 +260,7 @@ export default function BST1Payment() {
const RetailWSSalesType = useSelector(GlobalRetailWSSalesType); const RetailWSSalesType = useSelector(GlobalRetailWSSalesType);
const SelCustId = useSelector(GlobalSelCustId); const SelCustId = useSelector(GlobalSelCustId);
const selOption = useSelector(GlobalSelOption); const selOption = useSelector(GlobalSelOption);
console.log(selOption, 'selOptionbst234343',GetCustId); console.log(selOption, 'selOptionbst234343', GetCustId);
const SelectedTableDetails = useSelector(GlobalSelectedTableDetails); const SelectedTableDetails = useSelector(GlobalSelectedTableDetails);
const GlobalAddCustomerDetails1 = useSelector(GlobalAddCustomerDetails); const GlobalAddCustomerDetails1 = useSelector(GlobalAddCustomerDetails);
@ -728,7 +728,7 @@ export default function BST1Payment() {
setEmpData(datas?.[0]); setEmpData(datas?.[0]);
}; };
const getCustomerData = async () => { const getCustomerData = async () => {
await dispatch( await dispatch(
getAddCustomerDetails({ getAddCustomerDetails({
CompId: CompId, CompId: CompId,
AppId: AppId, AppId: AppId,
@ -905,7 +905,7 @@ export default function BST1Payment() {
const selectedStyle = const selectedStyle =
stylesMap[ stylesMap[
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
]; ];
if (selectedStyle) { if (selectedStyle) {
@ -2026,15 +2026,15 @@ export default function BST1Payment() {
OrderStatus: 'O', OrderStatus: 'O',
OrderType: OrderType:
BookingType === 'Dine In' || BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
Estimation?.SettingValue == 'N' Estimation?.SettingValue == 'N'
? 'S' ? 'S'
: GlobEstBooking === 'OvrAllEst' : GlobEstBooking === 'OvrAllEst'
? 'E' ? 'E'
: GlobEstBooking === 'ParEst' : GlobEstBooking === 'ParEst'
? GlobProdwisedata?.includes( ? GlobProdwisedata?.includes(
a.InwardDtlId + ' ' + a?.BookingTypeName a.InwardDtlId + ' ' + a?.BookingTypeName
) )
? 'E' ? 'E'
: 'S' : 'S'
: 'S', : 'S',
@ -2051,6 +2051,9 @@ export default function BST1Payment() {
BatchRef: a.BatchRef, BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl, PackageDtl: a.PackageDtl,
SetCount: a.SetCount, SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
})); }));
const NotSlectedTypeFind = temporderdetail?.find( const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType (a) => a?.BookingType != SelectedBookingType
@ -2124,7 +2127,7 @@ export default function BST1Payment() {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
OrderDtlDetails: OrderDtlDetails:
@ -2141,9 +2144,9 @@ export default function BST1Payment() {
? globalTipAmount === 0 ? globalTipAmount === 0
? SelectedTableDetails ? SelectedTableDetails
: SelectedTableDetails?.map((item) => ({ : SelectedTableDetails?.map((item) => ({
...item, ...item,
TipsAmount: globalTipAmount, TipsAmount: globalTipAmount,
})) }))
: null, : null,
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
@ -2159,8 +2162,8 @@ export default function BST1Payment() {
? PaymentgatewayUPI?.[0]?.ModeId ? PaymentgatewayUPI?.[0]?.ModeId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.ModeId )?.ModeId
: paybtnselected : paybtnselected
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
@ -2173,15 +2176,15 @@ export default function BST1Payment() {
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? null ? null
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'business' SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantId ?.MerchantId
: null, : null,
PaymentOptionType: PaymentOptionType:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
(refundPaySelectedName?.toLowerCase() === 'cash' || (refundPaySelectedName?.toLowerCase() === 'cash' ||
refundPaySelectedName?.toLowerCase() === 'credit') refundPaySelectedName?.toLowerCase() === 'credit')
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'cash' : Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
@ -2201,29 +2204,29 @@ export default function BST1Payment() {
? null ? null
: SelectedUPIPayOption?.toLowerCase() === 'default' : SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.MerchantUPIId )?.MerchantUPIId
: null, : null,
AccountDtl: AccountDtl:
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? [] ? []
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
(upipay) => upipay?.UPIId === UpiId (upipay) => upipay?.UPIId === UpiId
) )
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pd') || SelectedUPIPayOption?.toLowerCase() === 'pd') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pd') SelectedCardOption?.toLowerCase() === 'pd')
? useOptions?.[0]?.PaymentDetails?.PaymentDevice ? useOptions?.[0]?.PaymentDetails?.PaymentDevice
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pg') || SelectedUPIPayOption?.toLowerCase() === 'pg') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: PaymentStatus:
@ -2234,13 +2237,13 @@ export default function BST1Payment() {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: Debit:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
refundPaySelectedName?.toLowerCase() === 'credit' refundPaySelectedName?.toLowerCase() === 'credit'
? Math.round(previousNetAmount - currentOrderNetAmount) ? Math.round(previousNetAmount - currentOrderNetAmount)
: 0, : 0,
Credit: salesBillEdit Credit: salesBillEdit
@ -2316,14 +2319,14 @@ export default function BST1Payment() {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2480,14 +2483,14 @@ export default function BST1Payment() {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2588,14 +2591,14 @@ export default function BST1Payment() {
} }
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
if (response?.data?.OrderDetails?.length > 0) { if (response?.data?.OrderDetails?.length > 0) {
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2770,14 +2773,14 @@ export default function BST1Payment() {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
bookingpaymentupdate?.data?.response + bookingpaymentupdate?.data?.response +
' ' + ' ' +
(bookingpaymentupdate?.data?.OrderDetails?.length > 0 (bookingpaymentupdate?.data?.OrderDetails?.length > 0
? bookingpaymentupdate?.data?.OrderId && ? bookingpaymentupdate?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
bookingpaymentupdate?.data?.OrderId, bookingpaymentupdate?.data?.OrderId,
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
) )
: '') : '')
); );
bookingpaymentupdate?.data?.OrderDetails?.length > 0 && bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([bookingpaymentupdate?.data]); setPrintOrderDetails([bookingpaymentupdate?.data]);
@ -2795,7 +2798,7 @@ export default function BST1Payment() {
if ( if (
Date.now() - startTime > Date.now() - startTime >
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes * useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
60000 60000
) { ) {
// 60,000 ms = 1 minute // 60,000 ms = 1 minute
@ -3575,31 +3578,31 @@ export default function BST1Payment() {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && {paybtns?.length > 0 &&
currentOrderNetAmount >= previousNetAmount ? ( currentOrderNetAmount >= previousNetAmount ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
className={ className={
paybtnselected === payment.ModeId && paybtnselected === payment.ModeId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: paybtnselected === payment.ModeId && : paybtnselected === payment.ModeId &&
(!UpinotSelected || !CardoptionnotSelected) (!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -3613,13 +3616,13 @@ export default function BST1Payment() {
onClick={() => onClick={() =>
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
? handleUPIButtonClick( ? handleUPIButtonClick(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
: handlePaymentMode( : handlePaymentMode(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
} }
> >
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */} {/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
@ -3678,10 +3681,10 @@ export default function BST1Payment() {
<button <button
className={ className={
refundPaySelected === payment.ConfigId && refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId && : refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected) (!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -3756,9 +3759,9 @@ export default function BST1Payment() {
OrderCardDetail?.length > 0 && 'not-allowed', OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(selOption?.value === undefined && (selOption?.value === undefined &&
GlobalAddCustomerDetails1?.length === 0 && GlobalAddCustomerDetails1?.length === 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '28px', fontSize: '28px',
@ -3808,16 +3811,16 @@ export default function BST1Payment() {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
}} }}
@ -3836,14 +3839,14 @@ export default function BST1Payment() {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -3860,39 +3863,39 @@ export default function BST1Payment() {
{/* Customer Orders */} {/* Customer Orders */}
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch') {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
.length === 1) && ( .length === 1) && (
<Tooltip title="Customer Orders" isMobile={isMobile}> <Tooltip title="Customer Orders" isMobile={isMobile}>
{' '} {' '}
<div <div
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => { onClick={() => {
if ( if (
CheckBookingStatus !== 'Close' && CheckBookingStatus !== 'Close' &&
!addnewAccess && !addnewAccess &&
!(OrderCardDetail?.length > 0) !(OrderCardDetail?.length > 0)
) { ) {
setCustomerPreviesOrders(true); setCustomerPreviesOrders(true);
} }
}} }}
style={{ style={{
cursor: OrderCardDetail?.length > 0 && 'not-allowed', cursor: OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(OrderCardDetail?.length > 0 && (OrderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '25px', fontSize: '25px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
height: '2.46rem', height: '2.46rem',
width: '1.5rem', width: '1.5rem',
}} }}
> >
<FaCartPlus /> <FaCartPlus />
</div> </div>
</Tooltip> </Tooltip>
)} )}
{OtherServicesglobal && OrderCardDetail.length >= 1 && ( {OtherServicesglobal && OrderCardDetail.length >= 1 && (
<TooltipWrapper title="Vehicle Number" isMobile={isMobile}> <TooltipWrapper title="Vehicle Number" isMobile={isMobile}>
@ -3908,14 +3911,14 @@ export default function BST1Payment() {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -3997,58 +4000,58 @@ export default function BST1Payment() {
<div> <div>
{unpaidFlow == false {unpaidFlow == false
? holdCheckedSalesSetup && ? holdCheckedSalesSetup &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
!BookingTypeBoth && !BookingTypeBoth &&
OrderCardDetail?.length != 0 && OrderCardDetail?.length != 0 &&
CheckOrderType?.length === 0 && CheckOrderType?.length === 0 &&
OrderType != 'Failed' && OrderType != 'Failed' &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
paybtns?.length > 0 && paybtns?.length > 0 &&
!addnewAccess && ( !addnewAccess && (
<TooltipWrapper title={'Hold'} isMobile={isMobile}> <TooltipWrapper title={'Hold'} isMobile={isMobile}>
{' '} {' '}
<PozoHoldIcon <PozoHoldIcon
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => AddBookingDetails('Hold')} onClick={() => AddBookingDetails('Hold')}
style={{ style={{
fontSize: '30px', fontSize: '30px',
cursor: 'pointer', cursor: 'pointer',
color: '' ? '#52c41a' : '#1292EE', color: '' ? '#52c41a' : '#1292EE',
}} }}
/> />
</TooltipWrapper> </TooltipWrapper>
) )
: ''} : ''}
{unpaidFlow == false {unpaidFlow == false
? holdCheckedSalesSetup && ? holdCheckedSalesSetup &&
paybtns?.length > 0 && paybtns?.length > 0 &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
!BookingTypeBoth && !BookingTypeBoth &&
Holddata?.length > 0 && Holddata?.length > 0 &&
OrderCardDetail?.length == 0 && OrderCardDetail?.length == 0 &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
!addnewAccess && ( !addnewAccess && (
<TooltipWrapper title={'Recall'} isMobile={isMobile}> <TooltipWrapper title={'Recall'} isMobile={isMobile}>
{' '} {' '}
<Badge <Badge
count={Holddata?.length} count={Holddata?.length}
size={'small'} size={'small'}
offset={[0, 7]} offset={[0, 7]}
> >
<PozoHoldIcon <PozoHoldIcon
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => HandleholdModelOpen()} onClick={() => HandleholdModelOpen()}
style={{ style={{
fontSize: '28px', fontSize: '28px',
cursor: 'pointer', cursor: 'pointer',
color: Holddata ? '#52c41a' : 'default', color: Holddata ? '#52c41a' : 'default',
pointerEvents: pointerEvents:
OrderType === 'Failed' ? 'none' : 'auto', OrderType === 'Failed' ? 'none' : 'auto',
}} }}
/> />
</Badge> </Badge>
</TooltipWrapper> </TooltipWrapper>
) )
: ''} : ''}
</div> </div>
)} )}
@ -4091,9 +4094,9 @@ export default function BST1Payment() {
addnewAccess addnewAccess
? 'price-button-disabled' ? 'price-button-disabled'
: FirstPaymentclick === false && : FirstPaymentclick === false &&
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? !OrderStatus
? salesBillEdit && ? salesBillEdit &&
currentOrderNetAmount < previousNetAmount currentOrderNetAmount < previousNetAmount
@ -4115,7 +4118,7 @@ export default function BST1Payment() {
{isMobile ? ( {isMobile ? (
!OrderStatus ? ( !OrderStatus ? (
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount ? ( currentOrderNetAmount < previousNetAmount ? (
<div> <div>
Refund: ₹ Refund: ₹
{(previousNetAmount || 0) - {(previousNetAmount || 0) -
@ -4341,14 +4344,14 @@ export default function BST1Payment() {
OrderType === 'Failed' OrderType === 'Failed'
? FailedTotalAmt ? FailedTotalAmt
: Math.round( : Math.round(
OrderCardDetail?.reduce( OrderCardDetail?.reduce(
(acc, data) => data?.TotalAmt + acc, (acc, data) => data?.TotalAmt + acc,
0 0
) - ) -
((OverAllSales > 0 ? OverAllSales : 0) + ((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) + (OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)) (Discount > 0 ? Discount : 0))
) )
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />
@ -4481,9 +4484,9 @@ export default function BST1Payment() {
const qty = isGroup const qty = isGroup
? OrderCardDetail.filter((o) => o.id === groupKey).reduce( ? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
(sum, o) => sum + (o.OrderQty || 1), (sum, o) => sum + (o.OrderQty || 1),
0 0
) )
: item.OrderQty || 1; : item.OrderQty || 1;
return ( return (

404
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx
View File

@ -1545,7 +1545,7 @@ const BSBillingTable2 = () => {
const selectedStyle = const selectedStyle =
stylesMap[ stylesMap[
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
]; ];
if (selectedStyle) { if (selectedStyle) {
@ -2106,15 +2106,15 @@ const BSBillingTable2 = () => {
OrderStatus: 'O', OrderStatus: 'O',
OrderType: OrderType:
BookingType === 'Dine In' || BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
Estimation?.SettingValue == 'N' Estimation?.SettingValue == 'N'
? 'S' ? 'S'
: GlobEstBooking === 'OvrAllEst' : GlobEstBooking === 'OvrAllEst'
? 'E' ? 'E'
: GlobEstBooking === 'ParEst' : GlobEstBooking === 'ParEst'
? GlobProdwisedata?.includes( ? GlobProdwisedata?.includes(
a.InwardDtlId + ' ' + a?.BookingTypeName a.InwardDtlId + ' ' + a?.BookingTypeName
) )
? 'E' ? 'E'
: 'S' : 'S'
: 'S', : 'S',
@ -2130,7 +2130,9 @@ const BSBillingTable2 = () => {
ModelNumber: a.ModelNumber, ModelNumber: a.ModelNumber,
BatchRef: a.BatchRef, BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl, 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( const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType (a) => a?.BookingType != SelectedBookingType
@ -2206,7 +2208,7 @@ const BSBillingTable2 = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
OrderDtlDetails: OrderDtlDetails:
@ -2223,9 +2225,9 @@ const BSBillingTable2 = () => {
? globalTipAmount === 0 ? globalTipAmount === 0
? SelectedTableDetails ? SelectedTableDetails
: SelectedTableDetails?.map((item) => ({ : SelectedTableDetails?.map((item) => ({
...item, ...item,
TipsAmount: globalTipAmount, TipsAmount: globalTipAmount,
})) }))
: null, : null,
// "Credit": TotalAmount, // "Credit": TotalAmount,
// "Debit": 0, // "Debit": 0,
@ -2242,8 +2244,8 @@ const BSBillingTable2 = () => {
? PaymentgatewayUPI?.[0]?.ModeId ? PaymentgatewayUPI?.[0]?.ModeId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.ModeId )?.ModeId
: paybtnselected : paybtnselected
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
@ -2256,15 +2258,15 @@ const BSBillingTable2 = () => {
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? null ? null
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'business' SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantId ?.MerchantId
: null, : null,
PaymentOptionType: PaymentOptionType:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
(refundPaySelectedName?.toLowerCase() === 'cash' || (refundPaySelectedName?.toLowerCase() === 'cash' ||
refundPaySelectedName?.toLowerCase() === 'credit') refundPaySelectedName?.toLowerCase() === 'credit')
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'cash' : Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
@ -2284,29 +2286,29 @@ const BSBillingTable2 = () => {
? null ? null
: SelectedUPIPayOption?.toLowerCase() === 'default' : SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.MerchantUPIId )?.MerchantUPIId
: null, : null,
AccountDtl: AccountDtl:
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? [] ? []
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
(upipay) => upipay?.UPIId === UpiId (upipay) => upipay?.UPIId === UpiId
) )
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pd') || SelectedUPIPayOption?.toLowerCase() === 'pd') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pd') SelectedCardOption?.toLowerCase() === 'pd')
? useOptions?.[0]?.PaymentDetails?.PaymentDevice ? useOptions?.[0]?.PaymentDetails?.PaymentDevice
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pg') || SelectedUPIPayOption?.toLowerCase() === 'pg') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: PaymentStatus:
@ -2317,13 +2319,13 @@ const BSBillingTable2 = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: Debit:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
refundPaySelectedName?.toLowerCase() === 'credit' refundPaySelectedName?.toLowerCase() === 'credit'
? Math.round(previousNetAmount - currentOrderNetAmount) ? Math.round(previousNetAmount - currentOrderNetAmount)
: 0, : 0,
Credit: salesBillEdit Credit: salesBillEdit
@ -2402,14 +2404,14 @@ const BSBillingTable2 = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2566,14 +2568,14 @@ const BSBillingTable2 = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2677,14 +2679,14 @@ const BSBillingTable2 = () => {
} }
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
if (response?.data?.OrderDetails?.length > 0) { if (response?.data?.OrderDetails?.length > 0) {
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2861,14 +2863,14 @@ const BSBillingTable2 = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
bookingpaymentupdate?.data?.response + bookingpaymentupdate?.data?.response +
' ' + ' ' +
(bookingpaymentupdate?.data?.OrderDetails?.length > 0 (bookingpaymentupdate?.data?.OrderDetails?.length > 0
? bookingpaymentupdate?.data?.OrderId && ? bookingpaymentupdate?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
bookingpaymentupdate?.data?.OrderId, bookingpaymentupdate?.data?.OrderId,
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
) )
: '') : '')
); );
bookingpaymentupdate?.data?.OrderDetails?.length > 0 && bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([bookingpaymentupdate?.data]); setPrintOrderDetails([bookingpaymentupdate?.data]);
@ -2887,7 +2889,7 @@ const BSBillingTable2 = () => {
if ( if (
Date.now() - startTime > Date.now() - startTime >
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes * useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
60000 60000
) { ) {
// 60,000 ms = 1 minute // 60,000 ms = 1 minute
@ -3660,7 +3662,7 @@ const BSBillingTable2 = () => {
); );
}; };
return ( return (
<Suspense fallback={<BillingTableSkeleton />}> <Suspense fallback={<BillingTableSkeleton />}>
<div <div
className={ className={
templateData?.BookingLayout?.[0] === 'Layout6' templateData?.BookingLayout?.[0] === 'Layout6'
@ -3814,16 +3816,16 @@ const BSBillingTable2 = () => {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
width: '2rem', width: '2rem',
@ -3843,14 +3845,14 @@ const BSBillingTable2 = () => {
width: '1.6rem', width: '1.6rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -3876,14 +3878,14 @@ const BSBillingTable2 = () => {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -3985,31 +3987,31 @@ const BSBillingTable2 = () => {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && {paybtns?.length > 0 &&
currentOrderNetAmount >= previousNetAmount ? ( currentOrderNetAmount >= previousNetAmount ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
className={ className={
paybtnselected === payment.ModeId && paybtnselected === payment.ModeId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: paybtnselected === payment.ModeId && : paybtnselected === payment.ModeId &&
(!UpinotSelected || !CardoptionnotSelected) (!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -4023,13 +4025,13 @@ const BSBillingTable2 = () => {
onClick={() => onClick={() =>
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
? handleUPIButtonClick( ? handleUPIButtonClick(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
: handlePaymentMode( : handlePaymentMode(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
} }
> >
<div <div
@ -4086,10 +4088,10 @@ const BSBillingTable2 = () => {
<button <button
className={ className={
refundPaySelected === payment.ConfigId && refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId && : refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected) (!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -4160,9 +4162,9 @@ const BSBillingTable2 = () => {
OrderCardDetail?.length > 0 && 'not-allowed', OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(selOption?.value === undefined && (selOption?.value === undefined &&
GlobalAddCustomerDetails1?.length === 0 && GlobalAddCustomerDetails1?.length === 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '28px', fontSize: '28px',
@ -4179,39 +4181,39 @@ const BSBillingTable2 = () => {
{/* Customer Orders */} {/* Customer Orders */}
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch') {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
.length === 1) && ( .length === 1) && (
<Tooltip title="Customer Orders" isMobile={isMobile}> <Tooltip title="Customer Orders" isMobile={isMobile}>
{' '} {' '}
<div <div
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => { onClick={() => {
if ( if (
CheckBookingStatus !== 'Close' && CheckBookingStatus !== 'Close' &&
!addnewAccess && !addnewAccess &&
!(OrderCardDetail?.length > 0) !(OrderCardDetail?.length > 0)
) { ) {
setCustomerPreviesOrders(true); setCustomerPreviesOrders(true);
} }
}} }}
style={{ style={{
cursor: OrderCardDetail?.length > 0 && 'not-allowed', cursor: OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(OrderCardDetail?.length > 0 && (OrderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '25px', fontSize: '25px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
height: '2.46rem', height: '2.46rem',
width: '1.5rem', width: '1.5rem',
}} }}
> >
<FaCartPlus /> <FaCartPlus />
</div> </div>
</Tooltip> </Tooltip>
)} )}
{tabledata?.length > 0 && ( {tabledata?.length > 0 && (
<div style={{ width: '2rem' }}> <div style={{ width: '2rem' }}>
{tableOptions {tableOptions
@ -4280,68 +4282,68 @@ const BSBillingTable2 = () => {
<> <>
{unpaidFlow == false {unpaidFlow == false
? item?.OptionName == 'Hold' && ? item?.OptionName == 'Hold' &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
!BookingTypeBoth && !BookingTypeBoth &&
OrderCardDetail?.length != 0 && OrderCardDetail?.length != 0 &&
!OrderStatus && !OrderStatus &&
OrderType != 'Failed' && OrderType != 'Failed' &&
paybtns?.length > 0 && paybtns?.length > 0 &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
!addnewAccess && ( !addnewAccess && (
<> <>
<TooltipWrapper title={'Hold'} isMobile={isMobile}> <TooltipWrapper title={'Hold'} isMobile={isMobile}>
<button <button
onClick={() => AddBookingDetails('Hold')} onClick={() => AddBookingDetails('Hold')}
className={ className={
FirstPaymentclick === false FirstPaymentclick === false
? 'hold-btn' ? 'hold-btn'
: 'hold-btn-disable' : 'hold-btn-disable'
} }
>
<BsPauseFill />
<p
className="hold-btn-txt"
style={{
fontFamily: FontFamily['para'],
}}
> >
<BsPauseFill /> Hold
<p </p>
className="hold-btn-txt" </button>
style={{ </TooltipWrapper>
fontFamily: FontFamily['para'], </>
}} )
>
Hold
</p>
</button>
</TooltipWrapper>
</>
)
: ''} : ''}
{unpaidFlow == false {unpaidFlow == false
? item?.OptionName == 'Hold' && ? item?.OptionName == 'Hold' &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
!BookingTypeBoth && !BookingTypeBoth &&
Holddata?.length > 0 && Holddata?.length > 0 &&
OrderCardDetail?.length == 0 && OrderCardDetail?.length == 0 &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
paybtns?.length > 0 && paybtns?.length > 0 &&
!addnewAccess && ( !addnewAccess && (
<TooltipWrapper title={'Recall'} isMobile={isMobile}> <TooltipWrapper title={'Recall'} isMobile={isMobile}>
{' '} {' '}
<Badge <Badge
count={Holddata?.length} count={Holddata?.length}
size={'small'} size={'small'}
offset={[0, 7]} offset={[0, 7]}
> >
<PozoHoldIcon <PozoHoldIcon
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => HandleholdModelOpen()} onClick={() => HandleholdModelOpen()}
style={{ style={{
fontSize: '28px', fontSize: '28px',
cursor: 'pointer', cursor: 'pointer',
color: Holddata ? '#52c41a' : 'default', color: Holddata ? '#52c41a' : 'default',
pointerEvents: pointerEvents:
OrderType === 'Failed' ? 'none' : 'auto', OrderType === 'Failed' ? 'none' : 'auto',
}} }}
/> />
</Badge> </Badge>
</TooltipWrapper> </TooltipWrapper>
) )
: ''} : ''}
</> </>
))} ))}
@ -4357,9 +4359,9 @@ const BSBillingTable2 = () => {
addnewAccess addnewAccess
? 'billing-btn-deactive' ? 'billing-btn-deactive'
: FirstPaymentclick === false && : FirstPaymentclick === false &&
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? salesBillEdit && ? salesBillEdit &&
currentOrderNetAmount < previousNetAmount currentOrderNetAmount < previousNetAmount
? 'billing-btn' ? 'billing-btn'
@ -4610,14 +4612,14 @@ const BSBillingTable2 = () => {
OrderType === 'Failed' OrderType === 'Failed'
? FailedTotalAmt ? FailedTotalAmt
: Math.round( : Math.round(
OrderCardDetail?.reduce( OrderCardDetail?.reduce(
(acc, data) => data?.TotalAmt + acc, (acc, data) => data?.TotalAmt + acc,
0 0
) - ) -
((OverAllSales > 0 ? OverAllSales : 0) + ((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) + (OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)) (Discount > 0 ? Discount : 0))
) )
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />
@ -4752,9 +4754,9 @@ const BSBillingTable2 = () => {
const qty = isGroup const qty = isGroup
? OrderCardDetail.filter((o) => o.id === groupKey).reduce( ? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
(sum, o) => sum + (o.OrderQty || 1), (sum, o) => sum + (o.OrderQty || 1),
0 0
) )
: item.OrderQty || 1; : item.OrderQty || 1;
return ( return (

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

@ -2596,15 +2596,15 @@ const BSBillingTable3 = () => {
} }
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
:item.DiscountAmt ? item.DiscountAmt : '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -2881,7 +2881,7 @@ const BSBillingTable3 = () => {
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -3206,7 +3206,7 @@ const BSBillingTable3 = () => {
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
@ -3516,7 +3516,7 @@ const BSBillingTable3 = () => {
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (

429
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx
View File

@ -881,7 +881,7 @@ const BSBilling4Payment = () => {
const selectedStyle = const selectedStyle =
stylesMap[ stylesMap[
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
]; ];
console.log(selectedStyle, style, 'style'); console.log(selectedStyle, style, 'style');
if (selectedStyle) { if (selectedStyle) {
@ -2128,15 +2128,15 @@ const BSBilling4Payment = () => {
OrderStatus: 'O', OrderStatus: 'O',
OrderType: OrderType:
BookingType === 'Dine In' || BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
Estimation?.SettingValue == 'N' Estimation?.SettingValue == 'N'
? 'S' ? 'S'
: GlobEstBooking === 'OvrAllEst' : GlobEstBooking === 'OvrAllEst'
? 'E' ? 'E'
: GlobEstBooking === 'ParEst' : GlobEstBooking === 'ParEst'
? GlobProdwisedata?.includes( ? GlobProdwisedata?.includes(
a.InwardDtlId + ' ' + a?.BookingTypeName a.InwardDtlId + ' ' + a?.BookingTypeName
) )
? 'E' ? 'E'
: 'S' : 'S'
: 'S', : 'S',
@ -2154,6 +2154,9 @@ const BSBilling4Payment = () => {
PackageDtl: a.PackageDtl, PackageDtl: a.PackageDtl,
SetCount: a.SetCount, SetCount: a.SetCount,
BookingDate: AvailableDate ? a.BookedDate : null, BookingDate: AvailableDate ? a.BookedDate : null,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
})); }));
const NotSlectedTypeFind = temporderdetail?.find( const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType (a) => a?.BookingType != SelectedBookingType
@ -2229,7 +2232,7 @@ const BSBilling4Payment = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
OrderDtlDetails: OrderDtlDetails:
@ -2246,9 +2249,9 @@ const BSBilling4Payment = () => {
? globalTipAmount === 0 ? globalTipAmount === 0
? SelectedTableDetails ? SelectedTableDetails
: SelectedTableDetails?.map((item) => ({ : SelectedTableDetails?.map((item) => ({
...item, ...item,
TipsAmount: globalTipAmount, TipsAmount: globalTipAmount,
})) }))
: null, : null,
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
@ -2263,8 +2266,8 @@ const BSBilling4Payment = () => {
? PaymentgatewayUPI?.[0]?.ModeId ? PaymentgatewayUPI?.[0]?.ModeId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.ModeId )?.ModeId
: paybtnselected : paybtnselected
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
@ -2277,15 +2280,15 @@ const BSBilling4Payment = () => {
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? null ? null
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'business' SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantId ?.MerchantId
: null, : null,
PaymentOptionType: PaymentOptionType:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
(refundPaySelectedName?.toLowerCase() === 'cash' || (refundPaySelectedName?.toLowerCase() === 'cash' ||
refundPaySelectedName?.toLowerCase() === 'credit') refundPaySelectedName?.toLowerCase() === 'credit')
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'cash' : Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
@ -2305,29 +2308,29 @@ const BSBilling4Payment = () => {
? null ? null
: SelectedUPIPayOption?.toLowerCase() === 'default' : SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.MerchantUPIId )?.MerchantUPIId
: null, : null,
AccountDtl: AccountDtl:
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? [] ? []
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
(upipay) => upipay?.UPIId === UpiId (upipay) => upipay?.UPIId === UpiId
) )
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pd') || SelectedUPIPayOption?.toLowerCase() === 'pd') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pd') SelectedCardOption?.toLowerCase() === 'pd')
? useOptions?.[0]?.PaymentDetails?.PaymentDevice ? useOptions?.[0]?.PaymentDetails?.PaymentDevice
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pg') || SelectedUPIPayOption?.toLowerCase() === 'pg') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: PaymentStatus:
@ -2338,13 +2341,13 @@ const BSBilling4Payment = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: Debit:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
refundPaySelectedName?.toLowerCase() === 'credit' refundPaySelectedName?.toLowerCase() === 'credit'
? Math.round(previousNetAmount - currentOrderNetAmount) ? Math.round(previousNetAmount - currentOrderNetAmount)
: 0, : 0,
Credit: salesBillEdit Credit: salesBillEdit
@ -2422,14 +2425,14 @@ const BSBilling4Payment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2590,14 +2593,14 @@ const BSBilling4Payment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2704,14 +2707,14 @@ const BSBilling4Payment = () => {
} }
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
if (response?.data?.OrderDetails?.length > 0) { if (response?.data?.OrderDetails?.length > 0) {
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2887,14 +2890,14 @@ const BSBilling4Payment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
bookingpaymentupdate?.data?.response + bookingpaymentupdate?.data?.response +
' ' + ' ' +
(bookingpaymentupdate?.data?.OrderDetails?.length > 0 (bookingpaymentupdate?.data?.OrderDetails?.length > 0
? bookingpaymentupdate?.data?.OrderId && ? bookingpaymentupdate?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
bookingpaymentupdate?.data?.OrderId, bookingpaymentupdate?.data?.OrderId,
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
) )
: '') : '')
); );
bookingpaymentupdate?.data?.OrderDetails?.length > 0 && bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([bookingpaymentupdate?.data]); setPrintOrderDetails([bookingpaymentupdate?.data]);
@ -2913,7 +2916,7 @@ const BSBilling4Payment = () => {
if ( if (
Date.now() - startTime > Date.now() - startTime >
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes * useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
60000 60000
) { ) {
// 60,000 ms = 1 minute // 60,000 ms = 1 minute
@ -3150,9 +3153,9 @@ const BSBilling4Payment = () => {
AppId: AppId, AppId: AppId,
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
await dispatch(getSelectedFavItems(data)).unwrap(); await dispatch(getSelectedFavItems(data)).unwrap();
@ -3164,9 +3167,9 @@ const BSBilling4Payment = () => {
ProdSubCat: ProdSubCat, ProdSubCat: ProdSubCat,
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
@ -3177,9 +3180,9 @@ const BSBilling4Payment = () => {
prodCat: prodCat, prodCat: prodCat,
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
@ -3806,9 +3809,9 @@ const BSBilling4Payment = () => {
'not-allowed', 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(selOption?.value === undefined && (selOption?.value === undefined &&
GlobalAddCustomerDetails1?.length === 0 && GlobalAddCustomerDetails1?.length === 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '28px', fontSize: '28px',
@ -3829,16 +3832,16 @@ const BSBilling4Payment = () => {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
width: '2rem', width: '2rem',
@ -3859,14 +3862,14 @@ const BSBilling4Payment = () => {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -3896,14 +3899,14 @@ const BSBilling4Payment = () => {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -3921,39 +3924,39 @@ const BSBilling4Payment = () => {
{/* Customer Orders */} {/* Customer Orders */}
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch') {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
.length === 1) && ( .length === 1) && (
<Tooltip title="Customer Orders" isMobile={isMobile}> <Tooltip title="Customer Orders" isMobile={isMobile}>
{' '} {' '}
<div <div
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => { onClick={() => {
if ( if (
CheckBookingStatus !== 'Close' && CheckBookingStatus !== 'Close' &&
!addnewAccess && !addnewAccess &&
!(OrderCardDetail?.length > 0) !(OrderCardDetail?.length > 0)
) { ) {
setCustomerPreviesOrders(true); setCustomerPreviesOrders(true);
} }
}} }}
style={{ style={{
cursor: OrderCardDetail?.length > 0 && 'not-allowed', cursor: OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(OrderCardDetail?.length > 0 && (OrderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '25px', fontSize: '25px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
height: '2.46rem', height: '2.46rem',
width: '1.5rem', width: '1.5rem',
}} }}
> >
<FaCartPlus /> <FaCartPlus />
</div> </div>
</Tooltip> </Tooltip>
)} )}
{tabledata?.length > 0 && ( {tabledata?.length > 0 && (
<div style={{ width: '2rem' }}> <div style={{ width: '2rem' }}>
{tableOptions {tableOptions
@ -4021,66 +4024,66 @@ const BSBilling4Payment = () => {
<> <>
{unpaidFlow == false {unpaidFlow == false
? item?.OptionName == 'Hold' && ? item?.OptionName == 'Hold' &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
!BookingTypeBoth && !BookingTypeBoth &&
OrderCardDetail?.length != 0 && OrderCardDetail?.length != 0 &&
CheckOrderType?.length === 0 && CheckOrderType?.length === 0 &&
OrderType != 'Failed' && OrderType != 'Failed' &&
paybtns?.length > 0 && paybtns?.length > 0 &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
!addnewAccess && ( !addnewAccess && (
<TooltipWrapper <TooltipWrapper
title={'Hold'} title={'Hold'}
isMobile={isMobile} isMobile={isMobile}
> >
{' '} {' '}
<PozoHoldIcon <PozoHoldIcon
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => AddBookingDetails('Hold')} onClick={() => AddBookingDetails('Hold')}
style={{ style={{
fontSize: '30px', fontSize: '30px',
cursor: 'pointer', cursor: 'pointer',
color: '' ? '#52c41a' : '#1292EE', color: '' ? '#52c41a' : '#1292EE',
}} }}
/> />
</TooltipWrapper> </TooltipWrapper>
) )
: ''} : ''}
{unpaidFlow == false {unpaidFlow == false
? item?.OptionName == 'Hold' && ? item?.OptionName == 'Hold' &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
!BookingTypeBoth && !BookingTypeBoth &&
Holddata?.length > 0 && Holddata?.length > 0 &&
OrderCardDetail?.length == 0 && OrderCardDetail?.length == 0 &&
paybtns?.length > 0 && paybtns?.length > 0 &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
!addnewAccess && ( !addnewAccess && (
<TooltipWrapper <TooltipWrapper
title={'Recall'} title={'Recall'}
isMobile={isMobile} isMobile={isMobile}
>
{' '}
<Badge
count={Holddata?.length}
size={'small'}
offset={[0, 7]}
> >
{' '} <PozoHoldIcon
<Badge className="BSBillingNav-icon-table-icon"
count={Holddata?.length} onClick={() => HandleholdModelOpen()}
size={'small'} style={{
offset={[0, 7]} fontSize: '28px',
> cursor: 'pointer',
<PozoHoldIcon color: Holddata ? '#52c41a' : 'default',
className="BSBillingNav-icon-table-icon" pointerEvents:
onClick={() => HandleholdModelOpen()} OrderType === 'Failed'
style={{ ? 'none'
fontSize: '28px', : 'auto',
cursor: 'pointer', }}
color: Holddata ? '#52c41a' : 'default', />
pointerEvents: </Badge>
OrderType === 'Failed' </TooltipWrapper>
? 'none' )
: 'auto',
}}
/>
</Badge>
</TooltipWrapper>
)
: ''} : ''}
</> </>
))} ))}
@ -4106,31 +4109,31 @@ const BSBilling4Payment = () => {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && {paybtns?.length > 0 &&
currentOrderNetAmount >= previousNetAmount ? ( currentOrderNetAmount >= previousNetAmount ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
className={ className={
paybtnselected === payment.ModeId && paybtnselected === payment.ModeId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: paybtnselected === payment.ModeId && : paybtnselected === payment.ModeId &&
(!UpinotSelected || !CardoptionnotSelected) (!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -4144,13 +4147,13 @@ const BSBilling4Payment = () => {
onClick={() => onClick={() =>
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
? handleUPIButtonClick( ? handleUPIButtonClick(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
: handlePaymentMode( : handlePaymentMode(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
} }
> >
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */} {/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
@ -4209,10 +4212,10 @@ const BSBilling4Payment = () => {
<button <button
className={ className={
refundPaySelected === payment.ConfigId && refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId && : refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected) (!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -4476,9 +4479,9 @@ const BSBilling4Payment = () => {
addnewAccess addnewAccess
? 'Table4-Btn-final-price-disabled' ? 'Table4-Btn-final-price-disabled'
: FirstPaymentclick === false && : FirstPaymentclick === false &&
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? !OrderStatus
? salesBillEdit && ? salesBillEdit &&
currentOrderNetAmount < previousNetAmount currentOrderNetAmount < previousNetAmount
@ -4498,7 +4501,7 @@ const BSBilling4Payment = () => {
> >
{!OrderStatus ? ( {!OrderStatus ? (
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount ? ( currentOrderNetAmount < previousNetAmount ? (
<p className="Table4-Order"> <p className="Table4-Order">
Refund: ₹ Refund: ₹
{(previousNetAmount || 0) - {(previousNetAmount || 0) -
@ -4509,7 +4512,7 @@ const BSBilling4Payment = () => {
<div <div
className="Table4-rate" className="Table4-rate"
style={{ fontFamily: FontFamily['head'] }} style={{ fontFamily: FontFamily['head'] }}
// onClick={() => AddBookingDetails(BookingType, true)} // onClick={() => AddBookingDetails(BookingType, true)}
> >
{isMobile ? ( {isMobile ? (
`₹ ${Math.round( `₹ ${Math.round(
@ -4530,9 +4533,9 @@ const BSBilling4Payment = () => {
? FailedTotalAmt ? FailedTotalAmt
: credit && overAllBal >= 0 : credit && overAllBal >= 0
? Math.max( ? Math.max(
0, 0,
TotalAmount - overAllBal TotalAmount - overAllBal
) )
: TotalAmount : TotalAmount
)} )}
/> />
@ -4708,8 +4711,8 @@ const BSBilling4Payment = () => {
columns={columns} columns={columns}
data={TableData} data={TableData}
dataSource={TableData} dataSource={TableData}
// pagination={handlePageChange} // pagination={handlePageChange}
// onChange={handleChange} // onChange={handleChange}
/> />
</div> </div>
} }
@ -4740,14 +4743,14 @@ const BSBilling4Payment = () => {
OrderType === 'Failed' OrderType === 'Failed'
? FailedTotalAmt ? FailedTotalAmt
: Math.round( : Math.round(
OrderCardDetail?.reduce( OrderCardDetail?.reduce(
(acc, data) => data?.TotalAmt + acc, (acc, data) => data?.TotalAmt + acc,
0 0
) - ) -
((OverAllSales > 0 ? OverAllSales : 0) + ((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) + (OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)) (Discount > 0 ? Discount : 0))
) )
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />
@ -4825,9 +4828,9 @@ const BSBilling4Payment = () => {
const qty = isGroup const qty = isGroup
? OrderCardDetail.filter((o) => o.id === groupKey).reduce( ? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
(sum, o) => sum + (o.OrderQty || 1), (sum, o) => sum + (o.OrderQty || 1),
0 0
) )
: item.OrderQty || 1; : item.OrderQty || 1;
return ( return (

16
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBillingTable4.jsx
View File

@ -2594,12 +2594,12 @@ const BSBillingTable4 = () => {
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -2865,12 +2865,12 @@ const BSBillingTable4 = () => {
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -3189,12 +3189,12 @@ const BSBillingTable4 = () => {
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -3491,12 +3491,12 @@ const BSBillingTable4 = () => {
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (

369
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx
View File

@ -1166,7 +1166,7 @@ const BSBillingTable5 = () => {
const selectedStyle = const selectedStyle =
stylesMap[ stylesMap[
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
]; ];
if (selectedStyle) { if (selectedStyle) {
@ -2122,15 +2122,15 @@ const BSBillingTable5 = () => {
OrderStatus: 'O', OrderStatus: 'O',
OrderType: OrderType:
BookingType === 'Dine In' || BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
Estimation?.SettingValue == 'N' Estimation?.SettingValue == 'N'
? 'S' ? 'S'
: GlobEstBooking === 'OvrAllEst' : GlobEstBooking === 'OvrAllEst'
? 'E' ? 'E'
: GlobEstBooking === 'ParEst' : GlobEstBooking === 'ParEst'
? GlobProdwisedata?.includes( ? GlobProdwisedata?.includes(
a.InwardDtlId + ' ' + a?.BookingTypeName a.InwardDtlId + ' ' + a?.BookingTypeName
) )
? 'E' ? 'E'
: 'S' : 'S'
: 'S', : 'S',
@ -2147,6 +2147,9 @@ const BSBillingTable5 = () => {
BatchRef: a.BatchRef, BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl, PackageDtl: a.PackageDtl,
SetCount: a.SetCount, SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
})); }));
const NotSlectedTypeFind = temporderdetail?.find( const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType (a) => a?.BookingType != SelectedBookingType
@ -2221,7 +2224,7 @@ const BSBillingTable5 = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
OrderDtlDetails: OrderDtlDetails:
@ -2238,9 +2241,9 @@ const BSBillingTable5 = () => {
? globalTipAmount === 0 ? globalTipAmount === 0
? SelectedTableDetails ? SelectedTableDetails
: SelectedTableDetails?.map((item) => ({ : SelectedTableDetails?.map((item) => ({
...item, ...item,
TipsAmount: globalTipAmount, TipsAmount: globalTipAmount,
})) }))
: null, : null,
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
@ -2255,8 +2258,8 @@ const BSBillingTable5 = () => {
? PaymentgatewayUPI?.[0]?.ModeId ? PaymentgatewayUPI?.[0]?.ModeId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.ModeId )?.ModeId
: paybtnselected : paybtnselected
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
@ -2269,15 +2272,15 @@ const BSBillingTable5 = () => {
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? null ? null
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'business' SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantId ?.MerchantId
: null, : null,
PaymentOptionType: PaymentOptionType:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
(refundPaySelectedName?.toLowerCase() === 'cash' || (refundPaySelectedName?.toLowerCase() === 'cash' ||
refundPaySelectedName?.toLowerCase() === 'credit') refundPaySelectedName?.toLowerCase() === 'credit')
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'cash' : Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
@ -2297,29 +2300,29 @@ const BSBillingTable5 = () => {
? null ? null
: SelectedUPIPayOption?.toLowerCase() === 'default' : SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.MerchantUPIId )?.MerchantUPIId
: null, : null,
AccountDtl: AccountDtl:
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? [] ? []
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
(upipay) => upipay?.UPIId === UpiId (upipay) => upipay?.UPIId === UpiId
) )
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pd') || SelectedUPIPayOption?.toLowerCase() === 'pd') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pd') SelectedCardOption?.toLowerCase() === 'pd')
? useOptions?.[0]?.PaymentDetails?.PaymentDevice ? useOptions?.[0]?.PaymentDetails?.PaymentDevice
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pg') || SelectedUPIPayOption?.toLowerCase() === 'pg') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: PaymentStatus:
@ -2330,13 +2333,13 @@ const BSBillingTable5 = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: Debit:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
refundPaySelectedName?.toLowerCase() === 'credit' refundPaySelectedName?.toLowerCase() === 'credit'
? Math.round(previousNetAmount - currentOrderNetAmount) ? Math.round(previousNetAmount - currentOrderNetAmount)
: 0, : 0,
Credit: salesBillEdit Credit: salesBillEdit
@ -2411,14 +2414,14 @@ const BSBillingTable5 = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2577,14 +2580,14 @@ const BSBillingTable5 = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2691,14 +2694,14 @@ const BSBillingTable5 = () => {
} }
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
if (response?.data?.OrderDetails?.length > 0) { if (response?.data?.OrderDetails?.length > 0) {
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2874,14 +2877,14 @@ const BSBillingTable5 = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
bookingpaymentupdate?.data?.response + bookingpaymentupdate?.data?.response +
' ' + ' ' +
(bookingpaymentupdate?.data?.OrderDetails?.length > 0 (bookingpaymentupdate?.data?.OrderDetails?.length > 0
? bookingpaymentupdate?.data?.OrderId && ? bookingpaymentupdate?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
bookingpaymentupdate?.data?.OrderId, bookingpaymentupdate?.data?.OrderId,
rbookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus rbookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
) )
: '') : '')
); );
bookingpaymentupdate?.data?.OrderDetails?.length > 0 && bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([bookingpaymentupdate?.data]); setPrintOrderDetails([bookingpaymentupdate?.data]);
@ -2900,7 +2903,7 @@ const BSBillingTable5 = () => {
if ( if (
Date.now() - startTime > Date.now() - startTime >
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes * useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
60000 60000
) { ) {
// 60,000 ms = 1 minute // 60,000 ms = 1 minute
@ -3746,32 +3749,32 @@ const BSBillingTable5 = () => {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && {paybtns?.length > 0 &&
currentOrderNetAmount >= previousNetAmount ? ( currentOrderNetAmount >= previousNetAmount ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
className={ className={
paybtnselected === payment.ModeId && paybtnselected === payment.ModeId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: paybtnselected === payment.ModeId && : paybtnselected === payment.ModeId &&
(!UpinotSelected || (!UpinotSelected ||
!CardoptionnotSelected) !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -3785,13 +3788,13 @@ const BSBillingTable5 = () => {
onClick={() => onClick={() =>
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
? handleUPIButtonClick( ? handleUPIButtonClick(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
: handlePaymentMode( : handlePaymentMode(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
} }
> >
<div <div
@ -3804,16 +3807,16 @@ const BSBillingTable5 = () => {
{payment.ModeName} {payment.ModeName}
{payment?.ModeName?.toLowerCase() === {payment?.ModeName?.toLowerCase() ===
'card' && ( 'card' && (
<CardPopover <CardPopover
CardPayOption={CardPayOption} CardPayOption={CardPayOption}
SelectedCardOption={SelectedCardOption} SelectedCardOption={SelectedCardOption}
AddCardOption={AddCardOption} AddCardOption={AddCardOption}
CardOptionOpen={CardOptionOpen} CardOptionOpen={CardOptionOpen}
EnableCardOptions={EnableCardOptions} EnableCardOptions={EnableCardOptions}
paygate={paygate} paygate={paygate}
paydevice={paydevice} paydevice={paydevice}
/> />
)} )}
{payment?.ModeName?.toLowerCase() === 'upi' && ( {payment?.ModeName?.toLowerCase() === 'upi' && (
<UpiPopover <UpiPopover
defaultPaymentMode={defaultPaymentMode} defaultPaymentMode={defaultPaymentMode}
@ -3849,11 +3852,11 @@ const BSBillingTable5 = () => {
<button <button
className={ className={
refundPaySelected === payment.ConfigId && refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId && : refundPaySelected === payment.ConfigId &&
(!UpinotSelected || (!UpinotSelected ||
!CardoptionnotSelected) !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -4064,16 +4067,16 @@ const BSBillingTable5 = () => {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
width: '2rem', width: '2rem',
@ -4093,14 +4096,14 @@ const BSBillingTable5 = () => {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -4147,9 +4150,9 @@ const BSBillingTable5 = () => {
OrderCardDetail?.length > 0 && 'not-allowed', OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(selOption?.value === undefined && (selOption?.value === undefined &&
GlobalAddCustomerDetails1?.length === 0 && GlobalAddCustomerDetails1?.length === 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '28px', fontSize: '28px',
@ -4165,38 +4168,38 @@ const BSBillingTable5 = () => {
{/* Customer Orders */} {/* Customer Orders */}
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch') {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
.length === 1) && ( .length === 1) && (
<Tooltip title="Customer Orders" isMobile={isMobile}> <Tooltip title="Customer Orders" isMobile={isMobile}>
{' '} {' '}
<div <div
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => { onClick={() => {
if ( if (
CheckBookingStatus !== 'Close' && CheckBookingStatus !== 'Close' &&
!addnewAccess && !addnewAccess &&
!(OrderCardDetail?.length > 0) !(OrderCardDetail?.length > 0)
) { ) {
setCustomerPreviesOrders(true); setCustomerPreviesOrders(true);
} }
}} }}
style={{ style={{
cursor: OrderCardDetail?.length > 0 && 'not-allowed', cursor: OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(OrderCardDetail?.length > 0 && (OrderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '25px', fontSize: '25px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
height: '2.46rem', height: '2.46rem',
width: '1.5rem', width: '1.5rem',
}} }}
> >
<FaCartPlus /> <FaCartPlus />
</div> </div>
</Tooltip> </Tooltip>
)} )}
{tabledata?.length > 0 && dinePreference && ( {tabledata?.length > 0 && dinePreference && (
<div style={{ width: '2rem' }}> <div style={{ width: '2rem' }}>
{tableOptions {tableOptions
@ -4240,14 +4243,14 @@ const BSBillingTable5 = () => {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -4297,28 +4300,28 @@ const BSBillingTable5 = () => {
<> <>
{unpaidFlow == false {unpaidFlow == false
? item?.OptionName == 'Hold' && ? item?.OptionName == 'Hold' &&
!BookingTypeBoth && !BookingTypeBoth &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
OrderCardDetail?.length != 0 && OrderCardDetail?.length != 0 &&
CheckOrderType?.length === 0 && CheckOrderType?.length === 0 &&
OrderType != 'Failed' && OrderType != 'Failed' &&
paybtns?.length > 0 && paybtns?.length > 0 &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
!addnewAccess && ( !addnewAccess && (
<TooltipWrapper title={'Hold'} isMobile={isMobile}> <TooltipWrapper title={'Hold'} isMobile={isMobile}>
<button <button
className="BSBIllingTable5-cnclbtn" className="BSBIllingTable5-cnclbtn"
onClick={() => AddBookingDetails('Hold')} onClick={() => AddBookingDetails('Hold')}
style={{ style={{
color: 'default', color: 'default',
backgroundColor: '#eef3f3', backgroundColor: '#eef3f3',
}} }}
> >
<p className="BigScreen">HOLD ✋</p> <p className="BigScreen">HOLD ✋</p>
<span className="SmallScreen">✋</span> <span className="SmallScreen">✋</span>
</button> </button>
</TooltipWrapper> </TooltipWrapper>
) )
: ''} : ''}
{unpaidFlow === false && {unpaidFlow === false &&
item?.OptionName === 'Hold' && item?.OptionName === 'Hold' &&
@ -4357,9 +4360,9 @@ const BSBillingTable5 = () => {
addnewAccess addnewAccess
? 'BSBIllingTable5-paybtn-noitems-disable' ? 'BSBIllingTable5-paybtn-noitems-disable'
: FirstPaymentclick === false && : FirstPaymentclick === false &&
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? !OrderStatus
? salesBillEdit && ? salesBillEdit &&
currentOrderNetAmount < previousNetAmount currentOrderNetAmount < previousNetAmount
@ -4378,7 +4381,7 @@ const BSBillingTable5 = () => {
> >
{!OrderStatus ? ( {!OrderStatus ? (
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount ? ( currentOrderNetAmount < previousNetAmount ? (
<div> <div>
Refund: ₹ Refund: ₹
{(previousNetAmount || 0) - {(previousNetAmount || 0) -
@ -4601,14 +4604,14 @@ const BSBillingTable5 = () => {
OrderType === 'Failed' OrderType === 'Failed'
? FailedTotalAmt ? FailedTotalAmt
: Math.round( : Math.round(
OrderCardDetail?.reduce( OrderCardDetail?.reduce(
(acc, data) => data?.TotalAmt + acc, (acc, data) => data?.TotalAmt + acc,
0 0
) - ) -
((OverAllSales > 0 ? OverAllSales : 0) + ((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) + (OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)) (Discount > 0 ? Discount : 0))
) )
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />
@ -4636,14 +4639,14 @@ const BSBillingTable5 = () => {
{(filteredSettingNames?.includes('Print') || {(filteredSettingNames?.includes('Print') ||
!MobileNoWhatsApp || !MobileNoWhatsApp ||
!MobileNoWhatsApp.value) && ( !MobileNoWhatsApp.value) && (
<FaPrint <FaPrint
size={32} size={32}
color="#1292EE" color="#1292EE"
style={{ cursor: 'pointer' }} style={{ cursor: 'pointer' }}
onClick={handlePrintOrToken} onClick={handlePrintOrToken}
title="Print" title="Print"
/> />
)} )}
{filteredSettingNames?.includes('SMS') && isMobile && ( {filteredSettingNames?.includes('SMS') && isMobile && (
<MdSms <MdSms
@ -4726,9 +4729,9 @@ const BSBillingTable5 = () => {
const qty = isGroup const qty = isGroup
? OrderCardDetail.filter((o) => o.id === groupKey).reduce( ? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
(sum, o) => sum + (o.OrderQty || 1), (sum, o) => sum + (o.OrderQty || 1),
0 0
) )
: item.OrderQty || 1; : item.OrderQty || 1;
return ( return (

29
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BSBillingTable6.jsx
View File

@ -2397,15 +2397,15 @@ const BSBillingTable6 = () => {
} }
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -2652,15 +2652,15 @@ const BSBillingTable6 = () => {
} }
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -2954,14 +2954,14 @@ const BSBillingTable6 = () => {
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -3237,15 +3237,16 @@ const BSBillingTable6 = () => {
} }
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (

401
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx
View File

@ -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 { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import moment from 'moment'; import moment from 'moment';
@ -469,7 +469,7 @@ const BST6Payment = () => {
// for customised invoice number // for customised invoice number
const { invoiceDate, clearInvoiceDate } = useDateStore(); const { invoiceDate, clearInvoiceDate } = useDateStore();
const CurrentOrderId = useSelector(GlobalCurrentOrderId); const CurrentOrderId = useSelector(GlobalCurrentOrderId);
const holdCheckedSalesSetup = tableOptions?.some( const holdCheckedSalesSetup = tableOptions?.some(
(item) => item?.OptionName === 'Hold' (item) => item?.OptionName === 'Hold'
); );
@ -759,7 +759,7 @@ const BST6Payment = () => {
const selectedStyle = const selectedStyle =
stylesMap[ stylesMap[
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
]; ];
if (selectedStyle) { if (selectedStyle) {
@ -2112,15 +2112,15 @@ const BST6Payment = () => {
OrderStatus: 'O', OrderStatus: 'O',
OrderType: OrderType:
BookingType === 'Dine In' || BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
Estimation?.SettingValue == 'N' Estimation?.SettingValue == 'N'
? 'S' ? 'S'
: GlobEstBooking === 'OvrAllEst' : GlobEstBooking === 'OvrAllEst'
? 'E' ? 'E'
: GlobEstBooking === 'ParEst' : GlobEstBooking === 'ParEst'
? GlobProdwisedata?.includes( ? GlobProdwisedata?.includes(
a.InwardDtlId + ' ' + a?.BookingTypeName a.InwardDtlId + ' ' + a?.BookingTypeName
) )
? 'E' ? 'E'
: 'S' : 'S'
: 'S', : 'S',
@ -2137,6 +2137,9 @@ const BST6Payment = () => {
BatchRef: a.BatchRef, BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl, PackageDtl: a.PackageDtl,
SetCount: a.SetCount, SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
})); }));
const NotSlectedTypeFind = temporderdetail?.find( const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType (a) => a?.BookingType != SelectedBookingType
@ -2210,7 +2213,7 @@ const BST6Payment = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
OrderDtlDetails: OrderDtlDetails:
@ -2227,9 +2230,9 @@ const BST6Payment = () => {
? globalTipAmount === 0 ? globalTipAmount === 0
? SelectedTableDetails ? SelectedTableDetails
: SelectedTableDetails?.map((item) => ({ : SelectedTableDetails?.map((item) => ({
...item, ...item,
TipsAmount: globalTipAmount, TipsAmount: globalTipAmount,
})) }))
: null, : null,
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
@ -2244,8 +2247,8 @@ const BST6Payment = () => {
? PaymentgatewayUPI?.[0]?.ModeId ? PaymentgatewayUPI?.[0]?.ModeId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.ModeId )?.ModeId
: paybtnselected : paybtnselected
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
@ -2258,15 +2261,15 @@ const BST6Payment = () => {
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? null ? null
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'business' SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantId ?.MerchantId
: null, : null,
PaymentOptionType: PaymentOptionType:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
(refundPaySelectedName?.toLowerCase() === 'cash' || (refundPaySelectedName?.toLowerCase() === 'cash' ||
refundPaySelectedName?.toLowerCase() === 'credit') refundPaySelectedName?.toLowerCase() === 'credit')
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'cash' : Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
@ -2286,29 +2289,29 @@ const BST6Payment = () => {
? null ? null
: SelectedUPIPayOption?.toLowerCase() === 'default' : SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.MerchantUPIId )?.MerchantUPIId
: null, : null,
AccountDtl: AccountDtl:
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? [] ? []
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
(upipay) => upipay?.UPIId === UpiId (upipay) => upipay?.UPIId === UpiId
) )
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pd') || SelectedUPIPayOption?.toLowerCase() === 'pd') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pd') SelectedCardOption?.toLowerCase() === 'pd')
? useOptions?.[0]?.PaymentDetails?.PaymentDevice ? useOptions?.[0]?.PaymentDetails?.PaymentDevice
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pg') || SelectedUPIPayOption?.toLowerCase() === 'pg') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: PaymentStatus:
@ -2319,13 +2322,13 @@ const BST6Payment = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: Debit:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
refundPaySelectedName?.toLowerCase() === 'credit' refundPaySelectedName?.toLowerCase() === 'credit'
? Math.round(previousNetAmount - currentOrderNetAmount) ? Math.round(previousNetAmount - currentOrderNetAmount)
: 0, : 0,
Credit: salesBillEdit Credit: salesBillEdit
@ -2402,14 +2405,14 @@ const BST6Payment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2570,14 +2573,14 @@ const BST6Payment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2684,14 +2687,14 @@ const BST6Payment = () => {
} }
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
if (response?.data?.OrderDetails?.length > 0) { if (response?.data?.OrderDetails?.length > 0) {
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2867,14 +2870,14 @@ const BST6Payment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
bookingpaymentupdate?.data?.response + bookingpaymentupdate?.data?.response +
' ' + ' ' +
(bookingpaymentupdate?.data?.OrderDetails?.length > 0 (bookingpaymentupdate?.data?.OrderDetails?.length > 0
? bookingpaymentupdate?.data?.OrderId && ? bookingpaymentupdate?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
bookingpaymentupdate?.data?.OrderId, bookingpaymentupdate?.data?.OrderId,
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
) )
: '') : '')
); );
bookingpaymentupdate?.data?.OrderDetails?.length > 0 && bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([bookingpaymentupdate?.data]); setPrintOrderDetails([bookingpaymentupdate?.data]);
@ -2893,7 +2896,7 @@ const BST6Payment = () => {
if ( if (
Date.now() - startTime > Date.now() - startTime >
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes * useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
60000 60000
) { ) {
// 60,000 ms = 1 minute // 60,000 ms = 1 minute
@ -3596,59 +3599,59 @@ const BST6Payment = () => {
<> <>
{unpaidFlow == false {unpaidFlow == false
? item?.OptionName == 'Hold' && ? item?.OptionName == 'Hold' &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
!BookingTypeBoth && !BookingTypeBoth &&
OrderCardDetail?.length != 0 && OrderCardDetail?.length != 0 &&
CheckOrderType?.length === 0 && CheckOrderType?.length === 0 &&
OrderType != 'Failed' && OrderType != 'Failed' &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
paybtns?.length > 0 && paybtns?.length > 0 &&
!addnewAccess && ( !addnewAccess && (
<TooltipWrapper title={'Hold'} isMobile={isMobile}> <TooltipWrapper title={'Hold'} isMobile={isMobile}>
{' '} {' '}
<PozoHoldIcon <PozoHoldIcon
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => AddBookingDetails('Hold')} onClick={() => AddBookingDetails('Hold')}
style={{ style={{
fontSize: '30px', fontSize: '30px',
cursor: 'pointer', cursor: 'pointer',
color: '' ? '#52c41a' : '#1292EE', color: '' ? '#52c41a' : '#1292EE',
}} }}
/> />
</TooltipWrapper> </TooltipWrapper>
) )
: ''} : ''}
{unpaidFlow == false {unpaidFlow == false
? item?.OptionName == 'Hold' && ? item?.OptionName == 'Hold' &&
BookingType !== 'Dine In' && BookingType !== 'Dine In' &&
!BookingTypeBoth && !BookingTypeBoth &&
Holddata?.length > 0 && Holddata?.length > 0 &&
OrderCardDetail?.length == 0 && OrderCardDetail?.length == 0 &&
CheckBookingStatus != 'Close' && CheckBookingStatus != 'Close' &&
!addnewAccess && !addnewAccess &&
paybtns?.length > 0 && paybtns?.length > 0 &&
!OtherServicesglobal && ( !OtherServicesglobal && (
<TooltipWrapper title={'Recall'} isMobile={isMobile}> <TooltipWrapper title={'Recall'} isMobile={isMobile}>
{' '} {' '}
<Badge <Badge
count={Holddata?.length} count={Holddata?.length}
size={'small'} size={'small'}
offset={[0, 7]} offset={[0, 7]}
> >
<PozoHoldIcon <PozoHoldIcon
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => HandleholdModelOpen()} onClick={() => HandleholdModelOpen()}
style={{ style={{
fontSize: '28px', fontSize: '28px',
cursor: 'pointer', cursor: 'pointer',
color: Holddata ? '#52c41a' : 'default', color: Holddata ? '#52c41a' : 'default',
pointerEvents: pointerEvents:
OrderType === 'Failed' ? 'none' : 'auto', OrderType === 'Failed' ? 'none' : 'auto',
}} }}
/> />
</Badge> </Badge>
</TooltipWrapper> </TooltipWrapper>
) )
: ''} : ''}
</> </>
))} ))}
@ -3659,16 +3662,16 @@ const BST6Payment = () => {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
width: '2rem', width: '2rem',
@ -3688,14 +3691,14 @@ const BST6Payment = () => {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -3761,31 +3764,31 @@ const BST6Payment = () => {
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 'none' ? 'none'
: 'auto', : 'auto',
opacity: opacity:
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
CheckOrderType?.length > 0) && CheckOrderType?.length > 0) &&
!unpaidFlow && !unpaidFlow &&
OrderStatus OrderStatus
? 0.5 ? 0.5
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && {paybtns?.length > 0 &&
currentOrderNetAmount >= previousNetAmount ? ( currentOrderNetAmount >= previousNetAmount ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table6-cash"> <div className="Table6-cash">
<button <button
className={ className={
paybtnselected === payment.ModeId && paybtnselected === payment.ModeId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: paybtnselected === payment.ModeId && : paybtnselected === payment.ModeId &&
(!UpinotSelected || !CardoptionnotSelected) (!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -3799,13 +3802,13 @@ const BST6Payment = () => {
onClick={() => onClick={() =>
payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
? handleUPIButtonClick( ? handleUPIButtonClick(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
: handlePaymentMode( : handlePaymentMode(
payment.ModeId, payment.ModeId,
payment.ModeName payment.ModeName
) )
} }
> >
{/* {UpiOption === "" && payment?.Name?.toLowerCase() === "upi" && <p> UPI</p>} */} {/* {UpiOption === "" && payment?.Name?.toLowerCase() === "upi" && <p> UPI</p>} */}
@ -3864,10 +3867,10 @@ const BST6Payment = () => {
<button <button
className={ className={
refundPaySelected === payment.ConfigId && refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected) (UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel' ? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId && : refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected) (!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode' ? 'Btn-payment-mode'
: 'Btn-payment-mode-sel' : 'Btn-payment-mode-sel'
} }
@ -3918,9 +3921,9 @@ const BST6Payment = () => {
addnewAccess addnewAccess
? 'BST6Payment-Button-pay-disabled' ? 'BST6Payment-Button-pay-disabled'
: FirstPaymentclick === false && : FirstPaymentclick === false &&
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? !OrderStatus
? salesBillEdit && ? salesBillEdit &&
currentOrderNetAmount < previousNetAmount currentOrderNetAmount < previousNetAmount
@ -3942,7 +3945,7 @@ const BST6Payment = () => {
> >
{!OrderStatus ? ( {!OrderStatus ? (
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount ? ( currentOrderNetAmount < previousNetAmount ? (
<div> <div>
Refund: ₹ Refund: ₹
{(previousNetAmount || 0) - {(previousNetAmount || 0) -
@ -4094,9 +4097,9 @@ const BST6Payment = () => {
> >
<div className="BST6Payment-buttons"> <div className="BST6Payment-buttons">
{paybtnselected == {paybtnselected ==
paybtns?.filter( paybtns?.filter(
(item) => item?.ModeName?.toLowerCase() === 'cash' (item) => item?.ModeName?.toLowerCase() === 'cash'
)?.[0]?.ModeId ? ( )?.[0]?.ModeId ? (
<PaymentInput <PaymentInput
totalAmount={TotalAmount} totalAmount={TotalAmount}
BillingTableName="BillingTable6" BillingTableName="BillingTable6"
@ -4135,9 +4138,9 @@ const BST6Payment = () => {
OrderCardDetail?.length > 0 && 'not-allowed', OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(selOption?.value === undefined && (selOption?.value === undefined &&
GlobalAddCustomerDetails1?.length === 0 && GlobalAddCustomerDetails1?.length === 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '28px', fontSize: '28px',
@ -4154,38 +4157,38 @@ const BST6Payment = () => {
{/* Customer Orders */} {/* Customer Orders */}
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch') {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
.length === 1) && ( .length === 1) && (
<Tooltip title="Customer Orders" isMobile={isMobile}> <Tooltip title="Customer Orders" isMobile={isMobile}>
{' '} {' '}
<div <div
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => { onClick={() => {
if ( if (
CheckBookingStatus !== 'Close' && CheckBookingStatus !== 'Close' &&
!addnewAccess && !addnewAccess &&
!(OrderCardDetail?.length > 0) !(OrderCardDetail?.length > 0)
) { ) {
setCustomerPreviesOrders(true); setCustomerPreviesOrders(true);
} }
}} }}
style={{ style={{
cursor: OrderCardDetail?.length > 0 && 'not-allowed', cursor: OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(OrderCardDetail?.length > 0 && (OrderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '25px', fontSize: '25px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
height: '2.46rem', height: '2.46rem',
width: '1.5rem', width: '1.5rem',
}} }}
> >
<FaCartPlus /> <FaCartPlus />
</div> </div>
</Tooltip> </Tooltip>
)} )}
{tabledata?.length > 0 && dinePreference && ( {tabledata?.length > 0 && dinePreference && (
<div style={{ width: '2rem' }}> <div style={{ width: '2rem' }}>
{tableOptions {tableOptions
@ -4229,14 +4232,14 @@ const BST6Payment = () => {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
OrderCardDetail?.length === 0 || OrderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -4474,14 +4477,14 @@ const BST6Payment = () => {
OrderType === 'Failed' OrderType === 'Failed'
? FailedTotalAmt ? FailedTotalAmt
: Math.round( : Math.round(
OrderCardDetail?.reduce( OrderCardDetail?.reduce(
(acc, data) => data?.TotalAmt + acc, (acc, data) => data?.TotalAmt + acc,
0 0
) - ) -
((OverAllSales > 0 ? OverAllSales : 0) + ((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) + (OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)) (Discount > 0 ? Discount : 0))
) )
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />
@ -4588,9 +4591,9 @@ const BST6Payment = () => {
const qty = isGroup const qty = isGroup
? OrderCardDetail.filter((o) => o.id === groupKey).reduce( ? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
(sum, o) => sum + (o.OrderQty || 1), (sum, o) => sum + (o.OrderQty || 1),
0 0
) )
: item.OrderQty || 1; : item.OrderQty || 1;
return ( return (
@ -4781,9 +4784,9 @@ const BST6Payment = () => {
const qty = isGroup const qty = isGroup
? OrderCardDetail.filter((o) => o.id === groupKey).reduce( ? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
(sum, o) => sum + (o.OrderQty || 1), (sum, o) => sum + (o.OrderQty || 1),
0 0
) )
: item.OrderQty || 1; : item.OrderQty || 1;
return ( return (

103
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx
View File

@ -240,7 +240,7 @@ const BSBilling7Payment = () => {
const screenwidth = useSelector(GlobalScreenSize); const screenwidth = useSelector(GlobalScreenSize);
const defaultBookingType = useSelector(GlobalDefaultBookingType); const defaultBookingType = useSelector(GlobalDefaultBookingType);
const printerTemplateStyle = useSelector(SelectedPrintTemplate); const printerTemplateStyle = useSelector(SelectedPrintTemplate);
const AllBookingType=useSelector(GlobalAllBookingType) const AllBookingType = useSelector(GlobalAllBookingType)
const FontFamily = useSelector(GlobalSelectedFont); const FontFamily = useSelector(GlobalSelectedFont);
const OrderCardDetail = useSelector(GlobalOrderCardDetails); const OrderCardDetail = useSelector(GlobalOrderCardDetails);
const GetCustId = useSelector(GlobalCustId); const GetCustId = useSelector(GlobalCustId);
@ -471,7 +471,7 @@ const BSBilling7Payment = () => {
// for customised invoice number // for customised invoice number
const { invoiceDate, clearInvoiceDate } = useDateStore(); const { invoiceDate, clearInvoiceDate } = useDateStore();
const CurrentOrderId = useSelector(GlobalCurrentOrderId); const CurrentOrderId = useSelector(GlobalCurrentOrderId);
const holdCheckedSalesSetup = tableOptions?.some( const holdCheckedSalesSetup = tableOptions?.some(
(item) => item?.OptionName === 'Hold' (item) => item?.OptionName === 'Hold'
); );
@ -570,7 +570,7 @@ const BSBilling7Payment = () => {
if (!preOrder) { if (!preOrder) {
const totalSum = OrderCardDetail?.reduce( const totalSum = OrderCardDetail?.reduce(
// (acc, card) => acc + parseFloat(card.OrderRate * card.OrderQty || 0), // (acc, card) => acc + parseFloat(card.OrderRate * card.OrderQty || 0),
(acc, card) => acc + parseFloat(card.TotalAmt || 0), (acc, card) => acc + parseFloat(card.TotalAmt || 0),
0 0
); );
@ -696,9 +696,8 @@ const BSBilling7Payment = () => {
}, []); }, []);
useEffect(() => { useEffect(() => {
if (CompId && BranchId && AppId) { if (CompId && BranchId && AppId) {
if(holdCheckedSalesSetup) if (holdCheckedSalesSetup) {
{ getHolddata();
getHolddata();
} }
// getUnpaiddatas(); // getUnpaiddatas();
getCustomerData(); getCustomerData();
@ -1627,14 +1626,14 @@ const BSBilling7Payment = () => {
}; };
const getBookingTypeId = async () => { const getBookingTypeId = async () => {
setConfigDataList(AllBookingType); setConfigDataList(AllBookingType);
let configdata = AllBookingType; let configdata = AllBookingType;
let checkName = BookingTypeBoth ? 'DineIn,TakeAway' : BookingType; let checkName = BookingTypeBoth ? 'DineIn,TakeAway' : BookingType;
let filterconfigdata = configdata?.find( let filterconfigdata = configdata?.find(
(a) => a?.ConfigName === checkName (a) => a?.ConfigName === checkName
); );
setSelectedBookingType(filterconfigdata?.ConfigId); setSelectedBookingType(filterconfigdata?.ConfigId);
}; };
const gettodaydate = () => { const gettodaydate = () => {
const currentDate = new Date(); const currentDate = new Date();
@ -1926,9 +1925,8 @@ const BSBilling7Payment = () => {
setCurrentOrderNetAmount(0); setCurrentOrderNetAmount(0);
setPreviousNetAmount(0); setPreviousNetAmount(0);
setUpinotSelected(false); setUpinotSelected(false);
if(holdCheckedSalesSetup) if (holdCheckedSalesSetup) {
{ getHolddata();
getHolddata();
} }
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
await dispatch(changeBookingType('TakeAway')); await dispatch(changeBookingType('TakeAway'));
@ -2122,6 +2120,9 @@ const BSBilling7Payment = () => {
BatchRef: a.BatchRef, BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl, PackageDtl: a.PackageDtl,
SetCount: a.SetCount, SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
})); }));
const NotSlectedTypeFind = temporderdetail?.find( const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType (a) => a?.BookingType != SelectedBookingType
@ -3328,10 +3329,10 @@ const BSBilling7Payment = () => {
setDefaultPaymentMode([]); setDefaultPaymentMode([]);
} }
}; };
if(salesBillEdit){ if (salesBillEdit) {
setDefaultPaymentOption(); setDefaultPaymentOption();
} }
}, [defaultPaymentTrigger,salesBillEdit]); }, [defaultPaymentTrigger, salesBillEdit]);
const Otherserviceprint = async () => { const Otherserviceprint = async () => {
if (OtherServicesPrintDetails?.length > 0) { if (OtherServicesPrintDetails?.length > 0) {
@ -3652,39 +3653,39 @@ const BSBilling7Payment = () => {
{/* Customer Orders */} {/* Customer Orders */}
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch') {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
.length === 1) && ( .length === 1) && (
<Tooltip title="Customer Orders" isMobile={isMobile}> <Tooltip title="Customer Orders" isMobile={isMobile}>
{' '} {' '}
<div <div
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => { onClick={() => {
if ( if (
CheckBookingStatus !== 'Close' && CheckBookingStatus !== 'Close' &&
!addnewAccess && !addnewAccess &&
!(OrderCardDetail?.length > 0) !(OrderCardDetail?.length > 0)
) { ) {
setCustomerPreviesOrders(true); setCustomerPreviesOrders(true);
} }
}} }}
style={{ style={{
cursor: OrderCardDetail?.length > 0 && 'not-allowed', cursor: OrderCardDetail?.length > 0 && 'not-allowed',
color: color:
OrderCardDetail?.length > 0 || OrderCardDetail?.length > 0 ||
(OrderCardDetail?.length > 0 && (OrderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '25px', fontSize: '25px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
height: '2.46rem', height: '2.46rem',
width: '1.5rem', width: '1.5rem',
}} }}
> >
<FaCartPlus /> <FaCartPlus />
</div> </div>
</Tooltip> </Tooltip>
)} )}
{tabledata?.length > 0 && dinePreference && ( {tabledata?.length > 0 && dinePreference && (
<div style={{ width: '2rem' }}> <div style={{ width: '2rem' }}>
{tableOptions {tableOptions

62
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBillingTable7.jsx
View File

@ -2312,15 +2312,15 @@ const BSBillingTable7 = () => {
fontFamily: 'Poppins', fontFamily: 'Poppins',
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
? item.Offer : item.DiscountAmt ? item.DiscountAmt : '-'
: '-' : item?.OfferPrice && item?.OfferPrice > 0
: item?.OfferPrice && item?.OfferPrice > 0 ? item?.OfferType === 'F'
? item?.OfferType === 'F' ? `₹${safeRound(item.OfferPrice)}`
? `₹${safeRound(item.OfferPrice)}` : `${item.OfferPrice}%`
: `${item.OfferPrice}%` : item.DiscountAmt ? item.DiscountAmt : '-'}
: '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -2539,14 +2539,14 @@ const BSBillingTable7 = () => {
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
? item.Offer : item.DiscountAmt ? item.DiscountAmt : '-'
: '-' : item?.OfferPrice && item?.OfferPrice > 0
: item?.OfferPrice && item?.OfferPrice > 0 ? item?.OfferType === 'F'
? item?.OfferType === 'F' ? `₹${safeRound(item.OfferPrice)}`
? `₹${safeRound(item.OfferPrice)}` : `${item.OfferPrice}%`
: `${item.OfferPrice}%` : item.DiscountAmt ? item.DiscountAmt : '-'}
: '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -2822,15 +2822,15 @@ const BSBillingTable7 = () => {
fontFamily: 'Poppins', fontFamily: 'Poppins',
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
? item.Offer : item.DiscountAmt ? item.DiscountAmt : '-'
: '-' : item?.OfferPrice && item?.OfferPrice > 0
: item?.OfferPrice && item?.OfferPrice > 0 ? item?.OfferType === 'F'
? item?.OfferType === 'F' ? `₹${safeRound(item.OfferPrice)}`
? `₹${safeRound(item.OfferPrice)}` : `${item.OfferPrice}%`
: `${item.OfferPrice}%` : item.DiscountAmt ? item.DiscountAmt : '-'}
: '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -3079,15 +3079,15 @@ const BSBillingTable7 = () => {
fontFamily: 'Poppins', fontFamily: 'Poppins',
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
? item.Offer : item.DiscountAmt ? item.DiscountAmt : '-'
: '-' : item?.OfferPrice && item?.OfferPrice > 0
: item?.OfferPrice && item?.OfferPrice > 0 ? item?.OfferType === 'F'
? item?.OfferType === 'F' ? `₹${safeRound(item.OfferPrice)}`
? `₹${safeRound(item.OfferPrice)}` : `${item.OfferPrice}%`
: `${item.OfferPrice}%` : item.DiscountAmt ? item.DiscountAmt : '-'}
: '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (

70
src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTable.jsx
View File

@ -2616,15 +2616,15 @@ const StandardTable = () => {
} }
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -2940,15 +2940,15 @@ const StandardTable = () => {
} }
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (
@ -3317,14 +3317,14 @@ const StandardTable = () => {
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
@ -3673,15 +3673,15 @@ const StandardTable = () => {
} }
}} }}
> >
{item?.Type != 'C' {item?.Type != 'C'
? item.Offer && item.Offer > 0 ? item.Offer && item.Offer > 0
? item.Offer ? item.Offer
: '-' : item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0 : item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F' ? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}` ? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%` : `${item.OfferPrice}%`
: '-'} : item.DiscountAmt ? item.DiscountAmt : '-'}
</td> </td>
)} )}
{tableitem.OptionName == 'Quantity' && ( {tableitem.OptionName == 'Quantity' && (

271
src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
View File

@ -190,7 +190,7 @@ import {
getExpireProductsList, getExpireProductsList,
getLowStockAlertProductsList, getLowStockAlertProductsList,
} from '../../../../../Features/ProductPage/ProductPage.js'; } from '../../../../../Features/ProductPage/ProductPage.js';
// Jsx Files // Jsx Files
const CustomerOrders = lazy( const CustomerOrders = lazy(
() => import('../../BookingFunctionality/CustomerOrders.jsx') () => import('../../BookingFunctionality/CustomerOrders.jsx')
@ -1420,15 +1420,15 @@ const StandardTablePayment = () => {
OrderStatus: 'O', OrderStatus: 'O',
OrderType: OrderType:
BookingType === 'Dine In' || BookingType === 'Dine In' ||
BookingTypeBoth || BookingTypeBoth ||
Estimation?.SettingValue == 'N' Estimation?.SettingValue == 'N'
? 'S' ? 'S'
: GlobEstBooking === 'OvrAllEst' : GlobEstBooking === 'OvrAllEst'
? 'E' ? 'E'
: GlobEstBooking === 'ParEst' : GlobEstBooking === 'ParEst'
? GlobProdwisedata?.includes( ? GlobProdwisedata?.includes(
a.InwardDtlId + ' ' + a?.BookingTypeName a.InwardDtlId + ' ' + a?.BookingTypeName
) )
? 'E' ? 'E'
: 'S' : 'S'
: 'S', : 'S',
@ -1445,6 +1445,9 @@ const StandardTablePayment = () => {
BatchRef: a.BatchRef, BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl, PackageDtl: a.PackageDtl,
SetCount: a.SetCount, SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt }),
BookingDate: AvailableDate BookingDate: AvailableDate
? Object.keys(ReportholdData)?.length > 0 ? Object.keys(ReportholdData)?.length > 0
? a?.BookingDate ? a?.BookingDate
@ -1524,7 +1527,7 @@ const StandardTablePayment = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
OrderDtlDetails: OrderDtlDetails:
@ -1541,9 +1544,9 @@ const StandardTablePayment = () => {
? globalTipAmount === 0 ? globalTipAmount === 0
? SelectedTableDetails ? SelectedTableDetails
: SelectedTableDetails?.map((item) => ({ : SelectedTableDetails?.map((item) => ({
...item, ...item,
TipsAmount: globalTipAmount, TipsAmount: globalTipAmount,
})) }))
: null, : null,
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
@ -1559,8 +1562,8 @@ const StandardTablePayment = () => {
? PaymentgatewayUPI?.[0]?.ModeId ? PaymentgatewayUPI?.[0]?.ModeId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.ModeId )?.ModeId
: paybtnselected : paybtnselected
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
@ -1573,15 +1576,15 @@ const StandardTablePayment = () => {
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? null ? null
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'business' SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantId ?.MerchantId
: null, : null,
PaymentOptionType: PaymentOptionType:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
(refundPaySelectedName?.toLowerCase() === 'cash' || (refundPaySelectedName?.toLowerCase() === 'cash' ||
refundPaySelectedName?.toLowerCase() === 'credit') refundPaySelectedName?.toLowerCase() === 'credit')
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'cash' : Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
@ -1601,29 +1604,29 @@ const StandardTablePayment = () => {
? null ? null
: SelectedUPIPayOption?.toLowerCase() === 'default' : SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
: SelectedUPIPayOption?.toLowerCase() === 'business' : SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find( ? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId (busupi) => busupi?.ModeId === UpiId
)?.MerchantUPIId )?.MerchantUPIId
: null, : null,
AccountDtl: AccountDtl:
salesBillEdit && currentOrderNetAmount < previousNetAmount salesBillEdit && currentOrderNetAmount < previousNetAmount
? [] ? []
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
(upipay) => upipay?.UPIId === UpiId (upipay) => upipay?.UPIId === UpiId
) )
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pd') || SelectedUPIPayOption?.toLowerCase() === 'pd') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pd') SelectedCardOption?.toLowerCase() === 'pd')
? useOptions?.[0]?.PaymentDetails?.PaymentDevice ? useOptions?.[0]?.PaymentDetails?.PaymentDevice
: (Paybtnnameselected?.toLowerCase() === 'upi' && : (Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'pg') || SelectedUPIPayOption?.toLowerCase() === 'pg') ||
(Paybtnnameselected?.toLowerCase() === 'card' && (Paybtnnameselected?.toLowerCase() === 'card' &&
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: PaymentStatus:
@ -1634,13 +1637,13 @@ const StandardTablePayment = () => {
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'upi' && : Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: Debit:
salesBillEdit && salesBillEdit &&
currentOrderNetAmount < previousNetAmount && currentOrderNetAmount < previousNetAmount &&
refundPaySelectedName?.toLowerCase() === 'credit' refundPaySelectedName?.toLowerCase() === 'credit'
? Math.round(previousNetAmount - currentOrderNetAmount) ? Math.round(previousNetAmount - currentOrderNetAmount)
: 0, : 0,
Credit: salesBillEdit Credit: salesBillEdit
@ -1742,14 +1745,14 @@ const StandardTablePayment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -1908,14 +1911,14 @@ const StandardTablePayment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
response?.data?.OrderDetails?.length > 0 && response?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2020,14 +2023,14 @@ const StandardTablePayment = () => {
} }
setMessageData( setMessageData(
response?.data?.response + response?.data?.response +
' ' + ' ' +
(response?.data?.OrderDetails?.length > 0 (response?.data?.OrderDetails?.length > 0
? response?.data?.OrderId && ? response?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
response?.data?.OrderId, response?.data?.OrderId,
response?.data?.OrderDetails?.[0]?.FYStatus response?.data?.OrderDetails?.[0]?.FYStatus
) )
: '') : '')
); );
if (response?.data?.OrderDetails?.length > 0) { if (response?.data?.OrderDetails?.length > 0) {
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
@ -2101,9 +2104,9 @@ const StandardTablePayment = () => {
AppId: AppId, AppId: AppId,
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
@ -2116,9 +2119,9 @@ const StandardTablePayment = () => {
ProdSubCat: ProdSubCat, ProdSubCat: ProdSubCat,
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
@ -2129,9 +2132,9 @@ const StandardTablePayment = () => {
prodCat: prodCat, prodCat: prodCat,
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
@ -2311,14 +2314,14 @@ const StandardTablePayment = () => {
setMessageType('success'); setMessageType('success');
setMessageData( setMessageData(
bookingpaymentupdate?.data?.response + bookingpaymentupdate?.data?.response +
' ' + ' ' +
(bookingpaymentupdate?.data?.OrderDetails?.length > 0 (bookingpaymentupdate?.data?.OrderDetails?.length > 0
? bookingpaymentupdate?.data?.OrderId && ? bookingpaymentupdate?.data?.OrderId &&
extractLastNumberOrderId( extractLastNumberOrderId(
bookingpaymentupdate?.data?.OrderId, bookingpaymentupdate?.data?.OrderId,
bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
) )
: '') : '')
); );
bookingpaymentupdate?.data?.OrderDetails?.length > 0 && bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
setPrintOrderDetails([bookingpaymentupdate?.data]); setPrintOrderDetails([bookingpaymentupdate?.data]);
@ -2336,7 +2339,7 @@ const StandardTablePayment = () => {
if ( if (
Date.now() - startTime > Date.now() - startTime >
useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes * useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
60000 60000
) { ) {
// 60,000 ms = 1 minute // 60,000 ms = 1 minute
@ -2975,7 +2978,7 @@ const StandardTablePayment = () => {
const selectedStyle = const selectedStyle =
stylesMap[ stylesMap[
printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
]; ];
if (selectedStyle) { if (selectedStyle) {
@ -3479,9 +3482,9 @@ const StandardTablePayment = () => {
cursor: orderCardDetail?.length > 0 && 'not-allowed', cursor: orderCardDetail?.length > 0 && 'not-allowed',
color: color:
orderCardDetail?.length > 0 || orderCardDetail?.length > 0 ||
(selOption?.value === undefined && (selOption?.value === undefined &&
GlobalAddCustomerDetails1?.length === 0 && GlobalAddCustomerDetails1?.length === 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '28px', fontSize: '28px',
@ -3504,14 +3507,14 @@ const StandardTablePayment = () => {
width: '1.5rem', width: '1.5rem',
cursor: cursor:
orderCardDetail?.length === 0 || orderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'not-allowed' ? 'not-allowed'
: 'pointer', : 'pointer',
color: color:
orderCardDetail?.length === 0 || orderCardDetail?.length === 0 ||
CheckBookingStatus == 'Close' || CheckBookingStatus == 'Close' ||
addnewAccess addnewAccess
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
display: 'flex', display: 'flex',
@ -3526,39 +3529,39 @@ const StandardTablePayment = () => {
{/* Customer Orders */} {/* Customer Orders */}
{(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch') {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
.length === 1) && ( .length === 1) && (
<Tooltip title="Customer Orders" isMobile={isMobile}> <Tooltip title="Customer Orders" isMobile={isMobile}>
{' '} {' '}
<div <div
className="BSBillingNav-icon-table-icon" className="BSBillingNav-icon-table-icon"
onClick={() => { onClick={() => {
if ( if (
CheckBookingStatus !== 'Close' && CheckBookingStatus !== 'Close' &&
!addnewAccess && !addnewAccess &&
!(orderCardDetail?.length > 0) !(orderCardDetail?.length > 0)
) { ) {
setCustomerPreviesOrders(true); setCustomerPreviesOrders(true);
} }
}} }}
style={{ style={{
cursor: orderCardDetail?.length > 0 && 'not-allowed', cursor: orderCardDetail?.length > 0 && 'not-allowed',
color: color:
orderCardDetail?.length > 0 || orderCardDetail?.length > 0 ||
(orderCardDetail?.length > 0 && (orderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined) GetCustId?.CustMobile === undefined)
? 'gray' ? 'gray'
: 'rgb(18, 146, 238)', : 'rgb(18, 146, 238)',
fontSize: '25px', fontSize: '25px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
height: '2.46rem', height: '2.46rem',
width: '1.5rem', width: '1.5rem',
}} }}
> >
<FaCartPlus /> <FaCartPlus />
</div> </div>
</Tooltip> </Tooltip>
)} )}
{tabledata?.length > 0 && dinePreference && ( {tabledata?.length > 0 && dinePreference && (
<div style={{ width: '2rem' }}> <div style={{ width: '2rem' }}>
@ -3612,14 +3615,14 @@ const StandardTablePayment = () => {
{(filteredSettingNames?.includes('Print') || {(filteredSettingNames?.includes('Print') ||
!MobileNoWhatsApp || !MobileNoWhatsApp ||
!MobileNoWhatsApp.value) && ( !MobileNoWhatsApp.value) && (
<FaPrint <FaPrint
size={32} size={32}
color="#1292EE" color="#1292EE"
style={{ cursor: 'pointer' }} style={{ cursor: 'pointer' }}
onClick={handlePrintOrToken} onClick={handlePrintOrToken}
title="Print" title="Print"
/> />
)} )}
{filteredSettingNames?.includes('SMS') && isMobile && ( {filteredSettingNames?.includes('SMS') && isMobile && (
<MdSms <MdSms
@ -3702,7 +3705,7 @@ const StandardTablePayment = () => {
}} }}
> >
{payBtns?.length > 0 && {payBtns?.length > 0 &&
currentOrderNetAmount >= previousNetAmount ? ( currentOrderNetAmount >= previousNetAmount ? (
payBtns.map((payment) => { payBtns.map((payment) => {
const mode = payment?.ModeName?.toLowerCase(); const mode = payment?.ModeName?.toLowerCase();
const isSelected = paybtnselected === payment?.ModeId; const isSelected = paybtnselected === payment?.ModeId;
@ -3713,9 +3716,9 @@ const StandardTablePayment = () => {
const handleClick = const handleClick =
mode === 'upi' mode === 'upi'
? () => ? () =>
handleUPIButtonClick(payment?.ModeId, payment?.ModeName) handleUPIButtonClick(payment?.ModeId, payment?.ModeName)
: () => : () =>
handlePaymentMode(payment?.ModeId, payment?.ModeName); handlePaymentMode(payment?.ModeId, payment?.ModeName);
return ( return (
<div className="standard-pay-btns" key={payment?.ModeId}> <div className="standard-pay-btns" key={payment?.ModeId}>
@ -3867,9 +3870,9 @@ const StandardTablePayment = () => {
addnewAccess addnewAccess
? 'standard-pay-btn-disabled' ? 'standard-pay-btn-disabled'
: FirstPaymentclick === false && : FirstPaymentclick === false &&
orderCardDetail?.length > 0 && orderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus !== 'Close' CheckBookingStatus !== 'Close'
? !OrderStatus ? !OrderStatus
? salesBillEdit && currentOrderNetAmount < previousNetAmount ? salesBillEdit && currentOrderNetAmount < previousNetAmount
? 'standard-pay-btn-refund' ? 'standard-pay-btn-refund'
@ -3942,8 +3945,8 @@ const StandardTablePayment = () => {
columns={columns} columns={columns}
data={TableData} data={TableData}
dataSource={TableData} dataSource={TableData}
// pagination={handlePageChange} // pagination={handlePageChange}
// onChange={handleChange} // onChange={handleChange}
/> />
</div> </div>
} }
@ -4109,11 +4112,11 @@ const StandardTablePayment = () => {
handlesplitpaymentclose={handlesplitpaymentclose} handlesplitpaymentclose={handlesplitpaymentclose}
TotalNetAmount={Math.round( TotalNetAmount={Math.round(
orderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) - orderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) -
((OverAllSales > 0 ? OverAllSales : 0) + ((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) + (OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)) (Discount > 0 ? Discount : 0))
)} )}
// failedOrderData={failedOrderData} // failedOrderData={failedOrderData}
/> />
)} )}