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

resolved conflicting files

This commit is contained in:
unknown 2026-02-04 19:16:18 +05:30
parent 139789f085
commit 2f4f8d3e5e
41 changed files with 15567 additions and 31049 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Components/Menu/SideMenuPozo.jsx
View File

@ -56,9 +56,6 @@ import {
changeBtoBQuickProductTransfer, changeBtoBQuickProductTransfer,
changeTipAmount, changeTipAmount,
GlobalDineinDefault, GlobalDineinDefault,
changePreviousOrderOfferDetail,
changePreviousOrderPayment,
changeBillEditingMode,
} from '../../Features/BookingScreen/BookingData/BookingData'; } from '../../Features/BookingScreen/BookingData/BookingData';
import { import {
changeWholeSaleAuctionSelectedData, changeWholeSaleAuctionSelectedData,
@ -265,9 +262,6 @@ const SideMenuPozo = ({ items = [] }) => {
dispatch(ChangeTotalAmount([])); dispatch(ChangeTotalAmount([]));
dispatch(ChangeFullFreeProductList([])); dispatch(ChangeFullFreeProductList([]));
dispatch(changeFullOfferAppliedProducts([])); dispatch(changeFullOfferAppliedProducts([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeLoyaltyConsumedQuantities({})); dispatch(changeLoyaltyConsumedQuantities({}));
} }
if (e == `${subDirectory}sales`) { if (e == `${subDirectory}sales`) {
@ -291,9 +285,6 @@ const SideMenuPozo = ({ items = [] }) => {
dispatch(Offer.changeCoupenCodeAmount(0)); dispatch(Offer.changeCoupenCodeAmount(0));
dispatch(ChangeFullFreeProductList([])); dispatch(ChangeFullFreeProductList([]));
dispatch(changeFullOfferAppliedProducts([])); dispatch(changeFullOfferAppliedProducts([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(ChangeTotalAmount([])); dispatch(ChangeTotalAmount([]));
dispatch(changeLoyaltyConsumedQuantities({})); dispatch(changeLoyaltyConsumedQuantities({}));
} }

29
src/Features/BookingScreen/BookingData/BookingData.js
View File

@ -168,14 +168,6 @@ export const PutBookingData = createAsyncThunk(
return await axiosRetailInstanceData.put(`/Booking`, putData); return await axiosRetailInstanceData.put(`/Booking`, putData);
} }
); );
export const putSalesBillEdit = createAsyncThunk(
'BookingData/putSalesBillEdit',
async (putData) => {
return await axiosRetailInstanceData.put(`/SalesBillEdit`, putData);
}
);
export const getEstimateDatewiseReport = createAsyncThunk( export const getEstimateDatewiseReport = createAsyncThunk(
'BookingData/getEstimateDatewiseReport', 'BookingData/getEstimateDatewiseReport',
async (data) => { async (data) => {
@ -1612,9 +1604,6 @@ const initialState = {
AddBookingDetailsTrigger: false, AddBookingDetailsTrigger: false,
CurrentOrderId: null, CurrentOrderId: null,
productCardTrigger: 0, productCardTrigger: 0,
salesBillEdit: false,
previousOrderPayment: [],
previousOrderOfferDetails: [],
}; };
const BookingData = createSlice({ const BookingData = createSlice({
@ -1940,15 +1929,6 @@ const BookingData = createSlice({
triggerProductCard: (state) => { triggerProductCard: (state) => {
state.productCardTrigger += 1; state.productCardTrigger += 1;
}, },
changeBillEditingMode: (state, action) => {
state.salesBillEdit = action?.payload;
},
changePreviousOrderPayment: (state, action) => {
state.previousOrderPayment = action?.payload;
},
changePreviousOrderOfferDetail: (state, action) => {
state.previousOrderOfferDetails = action?.payload;
},
}, },
extraReducers: (builder) => { extraReducers: (builder) => {
@ -2217,9 +2197,6 @@ export const {
changeAddBookingDetailsTrigger, changeAddBookingDetailsTrigger,
changeCurrentOrderId, changeCurrentOrderId,
triggerProductCard, triggerProductCard,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail
} = BookingData.actions; } = BookingData.actions;
export const GlobalComboRedirectionToDefaultLayoutForParking = (state) => export const GlobalComboRedirectionToDefaultLayoutForParking = (state) =>
@ -2388,11 +2365,5 @@ export const GlobalAddBookingDetailsTrigger = (state) =>
state?.BookingData?.AddBookingDetailsTrigger; state?.BookingData?.AddBookingDetailsTrigger;
export const GlobalCurrentOrderId = (state) => export const GlobalCurrentOrderId = (state) =>
state?.BookingData?.CurrentOrderId; state?.BookingData?.CurrentOrderId;
export const GlobalSalesBillEdit = (state) =>
state?.BookingData?.salesBillEdit;
export const GlobalPreviousOrderPayment = (state) =>
state?.BookingData?.previousOrderPayment;
export const GlobalPreviousOrderOfferDetails = (state) =>
state?.BookingData?.previousOrderOfferDetails;
export default BookingData.reducer; export default BookingData.reducer;

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

@ -117,15 +117,6 @@ import {
changeCurrentOrderId, changeCurrentOrderId,
GlobalCombocarddata, GlobalCombocarddata,
getCreditCustomer, getCreditCustomer,
GlobalSalesBillEdit,
GlobalPreviousOrderPayment,
GlobalPreviousOrderOfferDetails,
GlobalpaymentOptionData,
getPaymentOptions,
putSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import FeaturesFunctionalities from '../../BookingFunctionality/FeaturesFunctionalities'; import FeaturesFunctionalities from '../../BookingFunctionality/FeaturesFunctionalities';
import { import {
@ -244,10 +235,6 @@ export default function BST1Payment() {
); );
const dispatch = useDispatch(); const dispatch = useDispatch();
const navigate = useNavigate(); const navigate = useNavigate();
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const Discount = useSelector(GlobalOverAllOfferAmt); const Discount = useSelector(GlobalOverAllOfferAmt);
const defaultBookingType = useSelector(GlobalDefaultBookingType); const defaultBookingType = useSelector(GlobalDefaultBookingType);
const globalTipAmount = useSelector(GlobaltipAmount); const globalTipAmount = useSelector(GlobaltipAmount);
@ -336,12 +323,6 @@ export default function BST1Payment() {
const [defaultEnabled, setDefaultEnabled] = useState(false); const [defaultEnabled, setDefaultEnabled] = useState(false);
const [SelectedUpiOption, setSelectedUpiOption] = useState(); const [SelectedUpiOption, setSelectedUpiOption] = useState();
const [hold, setHold] = useState(false); const [hold, setHold] = useState(false);
const [refundPayBtns, setRefundPayBtns] = useState([]);
const [refundPaySelected, setRefundPaySelected] = useState();
const [refundPaySelectedName, setRefundPaySelectedName] = useState(null);
const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0);
const [previousNetAmount, setPreviousNetAmount] = useState(0);
console.log(currentOrderNetAmount, 'currentOrderNetAmount', previousNetAmount, salesBillEdit);
const [addcustomer, setAddCustomer] = useState(false); const [addcustomer, setAddCustomer] = useState(false);
const [PrintOrderDetails, setPrintOrderDetails] = useState([]); const [PrintOrderDetails, setPrintOrderDetails] = useState([]);
//Total calculation //Total calculation
@ -559,27 +540,6 @@ export default function BST1Payment() {
); );
} }
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const previousNetAmount =
(totalPreviouspayment) || 0;
// let withdiscTotal = Total - ((OverAllSales || 0) + (OverAllEstimate || 0)); // let withdiscTotal = Total - ((OverAllSales || 0) + (OverAllEstimate || 0));
let withdiscTotal = let withdiscTotal =
Total - Total -
@ -587,17 +547,19 @@ export default function BST1Payment() {
(OverAllEstimate || 0) + (OverAllEstimate || 0) +
(Discount > 0 ? Discount : 0)); (Discount > 0 ? Discount : 0));
const currentOrderNetAmount = formatAmount( setTotalAmount(
formatAmount(
withdiscTotal >= 0 withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2) ? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2) : (Number(Total) + Number(globalTipAmount)).toFixed(2)
) )
);
setTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount); dispatch(
setCurrentOrderNetAmount(currentOrderNetAmount); changeSummeryTotalAmount(
setPreviousNetAmount(previousNetAmount); formatAmount(withdiscTotal > 0 ? withdiscTotal : Number(Total))
dispatch(changeSummeryTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount)); )
);
dispatch(changeSummeryComboOfferAmount(withComboSum)); dispatch(changeSummeryComboOfferAmount(withComboSum));
@ -659,31 +621,6 @@ export default function BST1Payment() {
fetchApi(); fetchApi();
} }
}, [UserType]); }, [UserType]);
useEffect(() => {
if (salesBillEdit) {
dispatch(getPaymentOptions()).unwrap();
}
}, [salesBillEdit]);
useEffect(() => {
if (salesBillEdit) {
if (SelCustId) {
setRefundPayBtns(AllPaymentOptions);
setRefundPaySelected(AllPaymentOptions?.[0]?.ConfigId);
setRefundPaySelectedName(AllPaymentOptions?.[0]?.ConfigName);
} else {
const withoutCustomer = AllPaymentOptions?.filter?.(
(item) => item?.ConfigName?.toLowerCase() !== 'credit'
);
setRefundPaySelected(withoutCustomer?.[0]?.ConfigId);
setRefundPaySelectedName(withoutCustomer?.[0]?.ConfigName);
setRefundPayBtns(withoutCustomer);
}
}
}, [AllPaymentOptions, SelCustId, salesBillEdit])
useEffect(() => { useEffect(() => {
let hasAccess = false; let hasAccess = false;
@ -1245,7 +1182,7 @@ export default function BST1Payment() {
await Promise.all( await Promise.all(
PrintOrderDetails?.[0]?.OrderDetails?.map( PrintOrderDetails?.[0]?.OrderDetails?.map(
async (orderDetail, index) => { async (orderDetail, index) => {
const groupedTokens = orderDetail?.productDetails?.filter(data => data?.EditTokenAvailable !== 'N')?.reduce( const groupedTokens = orderDetail?.productDetails?.reduce(
(acc, item, idx) => { (acc, item, idx) => {
if (item.TokenAvailable === 'Y') { if (item.TokenAvailable === 'Y') {
if (!item.CounterName) { if (!item.CounterName) {
@ -1326,10 +1263,6 @@ export default function BST1Payment() {
const handleButtonClick = () => { const handleButtonClick = () => {
if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) { if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) {
UpiPayment(); UpiPayment();
} else if (salesBillEdit && currentOrderNetAmount < previousNetAmount && !refundPaySelected) {
setMessageType('warning');
setMessageData('Please Select Refund Payment Method');
return;
} else { } else {
OrderStatus OrderStatus
? AddBookingDetails('Dine-In', false) ? AddBookingDetails('Dine-In', false)
@ -1602,12 +1535,6 @@ export default function BST1Payment() {
setCardoptionnotSelected(false); setCardoptionnotSelected(false);
} }
}; };
const handleRefundPaymentMode = (id, name) => {
setRefundPaySelected(id);
setRefundPaySelectedName(name);
}
const addUpiOption = async (id, name, UPIId) => { const addUpiOption = async (id, name, UPIId) => {
await dispatch(changeUpiIDprint(UPIId)); await dispatch(changeUpiIDprint(UPIId));
await dispatch(changeUpiIDName(name)); await dispatch(changeUpiIDName(name));
@ -1809,9 +1736,6 @@ export default function BST1Payment() {
ParkingClaimed: false, ParkingClaimed: false,
}) })
); );
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeTipAmount(0)); dispatch(changeTipAmount(0));
dispatch(changeLoyaltyConsumedQuantities({})); dispatch(changeLoyaltyConsumedQuantities({}));
dispatch(changeFullOfferAppliedProducts([])); dispatch(changeFullOfferAppliedProducts([]));
@ -1828,8 +1752,6 @@ export default function BST1Payment() {
setPaybtnselected(PaymentOptionsModeId); setPaybtnselected(PaymentOptionsModeId);
setQrCode(false); setQrCode(false);
setUpinotSelected(false); setUpinotSelected(false);
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
getHolddata(); getHolddata();
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
await dispatch(changeBookingType('TakeAway')); await dispatch(changeBookingType('TakeAway'));
@ -2129,7 +2051,7 @@ export default function BST1Payment() {
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
{ {
PaymentType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? refundPaySelected : PaymentType:
Paybtnnameselected?.toLowerCase() === 'upi' Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'pd' ? SelectedUPIPayOption?.toLowerCase() === 'pd'
? PaymentDeviceUPI?.[0]?.ModeId ? PaymentDeviceUPI?.[0]?.ModeId
@ -2143,14 +2065,14 @@ export default function BST1Payment() {
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
: null, : null,
Amount: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? previousNetAmount - currentOrderNetAmount : Math.round(TotalAmount), Amount: Math.round(TotalAmount),
MerchantId: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : MerchantId:
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: (salesBillEdit && currentOrderNetAmount < previousNetAmount) && (refundPaySelectedName?.toLowerCase() === 'cash' || refundPaySelectedName?.toLowerCase() === 'credit') ? 'PC' : PaymentOptionType:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2164,7 +2086,7 @@ export default function BST1Payment() {
? 'BU' ? 'BU'
: SelectedUPIPayOption : SelectedUPIPayOption
: null, : null,
ModeOfPayment: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : ModeOfPayment:
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
@ -2172,7 +2094,7 @@ export default function BST1Payment() {
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantUPIId ?.MerchantUPIId
: null, : null,
AccountDtl: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? [] : AccountDtl:
Paybtnnameselected?.toLowerCase() === 'upi' && Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
@ -2189,7 +2111,7 @@ export default function BST1Payment() {
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? 'S' : PaymentStatus:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2198,8 +2120,8 @@ export default function BST1Payment() {
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: (salesBillEdit && currentOrderNetAmount < previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(previousNetAmount - currentOrderNetAmount) : 0, Debit: 0,
Credit: salesBillEdit ? (currentOrderNetAmount > previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(TotalAmount) : 0 : Credit:
Paybtnnameselected?.toLowerCase() === 'credit' Paybtnnameselected?.toLowerCase() === 'credit'
? Math.round(TotalAmount) ? Math.round(TotalAmount)
: 0, : 0,
@ -2404,12 +2326,7 @@ export default function BST1Payment() {
putdata['PaymentType'] = !pay && ''; putdata['PaymentType'] = !pay && '';
putdata['PrintType'] = 'Y'; putdata['PrintType'] = 'Y';
} }
let response = null; let response = await dispatch(PutBookingData(putdata)).unwrap();
if (salesBillEdit) {
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
if (value !== 'Unpaid') { if (value !== 'Unpaid') {
if (response?.data?.statusCode == 1) { if (response?.data?.statusCode == 1) {
let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter( let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter(
@ -3181,7 +3098,7 @@ export default function BST1Payment() {
}; };
const SplitPaymentOpen = () => { const SplitPaymentOpen = () => {
if (OrderCardDetail?.length > 0 && TotalAmount > 0) { if (OrderCardDetail?.length > 0) {
const updatedData = { const updatedData = {
userData: OrderCardDetail, userData: OrderCardDetail,
ExtraCharges: GlobalExtraCharge, ExtraCharges: GlobalExtraCharge,
@ -3191,11 +3108,6 @@ export default function BST1Payment() {
setFailedOrderData(updatedData); setFailedOrderData(updatedData);
setSplitpayment(true); setSplitpayment(true);
} else { } else {
if (TotalAmount <= 0) {
setMessageType('warning');
setMessageData('Cannot split when total amount is zero or less');
return;
}
setMessageType('warning'); setMessageType('warning');
setMessageData('Please Select the Product'); setMessageData('Please Select the Product');
} }
@ -3539,7 +3451,7 @@ export default function BST1Payment() {
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && (currentOrderNetAmount >= previousNetAmount) ? ( {paybtns?.length > 0 ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
@ -3619,42 +3531,6 @@ export default function BST1Payment() {
</button> </button>
</div> </div>
)) ))
) : (currentOrderNetAmount < previousNetAmount && salesBillEdit && refundPayBtns.length > 0) ? (
refundPayBtns.map((payment) => (
<div className="Table3-cash">
<button
className={
refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode'
: 'Btn-payment-mode-sel'
}
style={{
fontFamily: FontFamily['para'],
position: 'relative',
animation: blink
? 'blink-animation 0.5s infinite alternate'
: 'none',
}}
onClick={() => handleRefundPaymentMode(payment?.ConfigId, payment?.ConfigName)}
>
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
<div
style={{
display: 'flex',
flexDirection: 'row',
columnGap: '0.5rem',
}}
>
{payment.ConfigName}
</div>
</button>
</div>
))
) : ( ) : (
<div <div
onClick={handlepaymentoptions} onClick={handlepaymentoptions}
@ -4020,11 +3896,6 @@ export default function BST1Payment() {
} }
BillingTableName="BillingTable1" BillingTableName="BillingTable1"
CheckBookingStatus={CheckBookingStatus} CheckBookingStatus={CheckBookingStatus}
salesBillEdit={salesBillEdit}
currentOrderNetAmount={currentOrderNetAmount}
previousNetAmount={previousNetAmount}
credit={credit}
overAllBal={overAllBal}
/> />
) : ( ) : (
<TooltipWrapper title="Create Bill (F4)" isMobile={isMobile}> <TooltipWrapper title="Create Bill (F4)" isMobile={isMobile}>
@ -4037,9 +3908,8 @@ export default function BST1Payment() {
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? ? !OrderStatus
'price-button' ? 'price-button'
: 'price-button'
: 'price-button Order' : 'price-button Order'
: 'price-button-disabled' : 'price-button-disabled'
} }
@ -4054,7 +3924,7 @@ export default function BST1Payment() {
> >
{' '} {' '}
{isMobile ? ( {isMobile ? (
!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <div>Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</div> : ( !OrderStatus ? (
`₹ ${Math.round( `₹ ${Math.round(
OrderType === 'Failed' OrderType === 'Failed'
? FailedTotalAmt ? FailedTotalAmt
@ -4065,7 +3935,7 @@ export default function BST1Payment() {
) : ( ) : (
'ORDER' 'ORDER'
) )
) : !OrderStatus ? (salesBillEdit && (currentOrderNetAmount < previousNetAmount)) ? (<div>Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</div>) : ( ) : !OrderStatus ? (
<div> <div>
₹{' '} ₹{' '}
<CountUp <CountUp
@ -4263,10 +4133,7 @@ export default function BST1Payment() {
SplitPaymentModal={Splitpayment} SplitPaymentModal={Splitpayment}
handlesplitpaymentclose={handlesplitpaymentclose} handlesplitpaymentclose={handlesplitpaymentclose}
TotalNetAmount={ TotalNetAmount={
OrderType === 'Failed' ? FailedTotalAmt : Math.round(OrderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) - OrderType === 'Failed' ? FailedTotalAmt : Math.round(TotalAmount)
((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)))
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />

21
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BalanceAndReceived.jsx
View File

@ -32,11 +32,6 @@ const PaymentInput = ({
handleButtonClick, handleButtonClick,
BillingTableName, BillingTableName,
CheckBookingStatus, CheckBookingStatus,
salesBillEdit = false,
currentOrderNetAmount = 0,
previousNetAmount = 0,
credit = false,
overAllBal = 0,
}) => { }) => {
const { SadminuserAccess } = useAuth(); const { SadminuserAccess } = useAuth();
let SAAccessCommonMaster = SadminuserAccess?.find( let SAAccessCommonMaster = SadminuserAccess?.find(
@ -157,15 +152,13 @@ const PaymentInput = ({
style={{ fontFamily: FontFamily['head'] }} style={{ fontFamily: FontFamily['head'] }}
> >
{isMobile && {isMobile &&
(!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <div>Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</div> : (!OrderStatus
`₹ ${Math.round( ? `₹ ${Math.round(
OrderType === 'Failed' ? failedTotalAmt : credit && overAllBal >= 0 OrderType === 'Failed' ? failedTotalAmt : totalAmount
? Math.max(0, totalAmount - overAllBal)
: totalAmount
)}` )}`
: 'ORDER')} : 'ORDER')}
{!isMobile && !OrderStatus && ((salesBillEdit && (currentOrderNetAmount < previousNetAmount)) ? <div>Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</div> : ( {!isMobile && !OrderStatus && (
<> <>
₹{' '} ₹{' '}
{/* <CountUp {/* <CountUp
@ -177,11 +170,9 @@ const PaymentInput = ({
/> */} /> */}
{OrderType === 'Failed' {OrderType === 'Failed'
? failedTotalAmt ? failedTotalAmt
: safeRound((credit && overAllBal >= 0) : safeRound(totalAmount)}
? Math.max(0, totalAmount - overAllBal)
: totalAmount)}
</> </>
))} )}
{!isMobile && OrderStatus && 'ORDER'} {!isMobile && OrderStatus && 'ORDER'}
</button> </button>

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

@ -124,15 +124,6 @@ import {
changeCurrentOrderId, changeCurrentOrderId,
GlobalCombocarddata, GlobalCombocarddata,
getCreditCustomer, getCreditCustomer,
GlobalSalesBillEdit,
GlobalPreviousOrderPayment,
GlobalPreviousOrderOfferDetails,
GlobalpaymentOptionData,
getPaymentOptions,
putSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
gettinghold, gettinghold,
@ -251,10 +242,6 @@ const BSBillingTable2 = () => {
const SessionMobileNo = SessionData?.SessionMobileNo; const SessionMobileNo = SessionData?.SessionMobileNo;
const dispatch = useDispatch(); const dispatch = useDispatch();
const navigate = useNavigate(); const navigate = useNavigate();
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const defaultBookingType = useSelector(GlobalDefaultBookingType); const defaultBookingType = useSelector(GlobalDefaultBookingType);
const globalTipAmount = useSelector(GlobaltipAmount); const globalTipAmount = useSelector(GlobaltipAmount);
const OtherServiceTicketClaim = useSelector(GlobalOtherServiceTicketClaim); const OtherServiceTicketClaim = useSelector(GlobalOtherServiceTicketClaim);
@ -332,11 +319,6 @@ const BSBillingTable2 = () => {
const [overAllBal, setOverAllBal] = useState(0); const [overAllBal, setOverAllBal] = useState(0);
const [creditCustomerOpen, setcreditCustomerOpen] = useState(false); const [creditCustomerOpen, setcreditCustomerOpen] = useState(false);
const [hold, setHold] = useState(false); const [hold, setHold] = useState(false);
const [refundPayBtns, setRefundPayBtns] = useState([]);
const [refundPaySelected, setRefundPaySelected] = useState();
const [refundPaySelectedName, setRefundPaySelectedName] = useState(null);
const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0);
const [previousNetAmount, setPreviousNetAmount] = useState(0);
const [addcustomer, setAddCustomer] = useState(false); const [addcustomer, setAddCustomer] = useState(false);
const [paybtns, setpaybtns] = useState([]); const [paybtns, setpaybtns] = useState([]);
const tableOptions = templateData?.BookingBilling?.[1]; const tableOptions = templateData?.BookingBilling?.[1];
@ -470,7 +452,6 @@ const BSBillingTable2 = () => {
item.SettingIdName.toLowerCase() === 'shortcutkeys' && item.SettingIdName.toLowerCase() === 'shortcutkeys' &&
item.SettingValue === 'Y' item.SettingValue === 'Y'
); );
useEffect(() => { useEffect(() => {
const fetchCreditCustomer = async () => { const fetchCreditCustomer = async () => {
const selectedMode = paybtns?.find( const selectedMode = paybtns?.find(
@ -510,31 +491,6 @@ const BSBillingTable2 = () => {
fetchCreditCustomer(); fetchCreditCustomer();
}, [paybtnselected, selOption, paybtns]); }, [paybtnselected, selOption, paybtns]);
useEffect(() => {
if (salesBillEdit) {
dispatch(getPaymentOptions()).unwrap();
}
}, [salesBillEdit]);
useEffect(() => {
if (salesBillEdit) {
if (SelCustId) {
setRefundPayBtns(AllPaymentOptions);
setRefundPaySelected(AllPaymentOptions?.[0]?.ConfigId);
setRefundPaySelectedName(AllPaymentOptions?.[0]?.ConfigName);
} else {
const withoutCustomer = AllPaymentOptions?.filter?.(
(item) => item?.ConfigName?.toLowerCase() !== 'credit'
);
setRefundPaySelected(withoutCustomer?.[0]?.ConfigId);
setRefundPaySelectedName(withoutCustomer?.[0]?.ConfigName);
setRefundPayBtns(withoutCustomer);
}
}
}, [AllPaymentOptions, SelCustId, salesBillEdit])
useEffect(() => { useEffect(() => {
if (!preOrder) { if (!preOrder) {
const totalSum = OrderCardDetail?.reduce( const totalSum = OrderCardDetail?.reduce(
@ -590,43 +546,23 @@ const BSBillingTable2 = () => {
); );
} }
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const previousNetAmount =
(totalPreviouspayment) || 0;
let withdiscTotal = let withdiscTotal =
Total - Total -
((OverAllSales || 0) + ((OverAllSales || 0) +
(OverAllEstimate || 0) + (OverAllEstimate || 0) +
(Discount > 0 ? Discount : 0)); (Discount > 0 ? Discount : 0));
const currentOrderNetAmount = formatAmount( setTotalAmount(
withdiscTotal >= 0 withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2) ? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2) : (Number(Total) + Number(globalTipAmount)).toFixed(2)
) );
setTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount); dispatch(
setCurrentOrderNetAmount(currentOrderNetAmount); changeSummeryTotalAmount(
setPreviousNetAmount(previousNetAmount); withdiscTotal > 0 ? withdiscTotal : Number(Total)
dispatch(changeSummeryTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount)); )
);
dispatch(changeSummeryComboOfferAmount(withComboSum)); dispatch(changeSummeryComboOfferAmount(withComboSum));
@ -831,10 +767,6 @@ const BSBillingTable2 = () => {
const handleButtonClick = () => { const handleButtonClick = () => {
if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) { if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) {
UpiPayment(); UpiPayment();
} else if (salesBillEdit && currentOrderNetAmount < previousNetAmount && !refundPaySelected) {
setMessageType('warning');
setMessageData('Please Select Refund Payment Method');
return;
} else { } else {
OrderStatus OrderStatus
? AddBookingDetails('Dine-In', false) ? AddBookingDetails('Dine-In', false)
@ -1308,11 +1240,6 @@ const BSBillingTable2 = () => {
} }
}; };
const handleRefundPaymentMode = (id, name) => {
setRefundPaySelected(id);
setRefundPaySelectedName(name);
}
const addUpiOption = async (id, name, UPIId) => { const addUpiOption = async (id, name, UPIId) => {
await dispatch(changeUpiIDprint(UPIId)); await dispatch(changeUpiIDprint(UPIId));
await dispatch(changeUpiIDName(name)); await dispatch(changeUpiIDName(name));
@ -1849,9 +1776,6 @@ const BSBillingTable2 = () => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeTipAmount(0)); dispatch(changeTipAmount(0));
dispatch(changeFullOfferAppliedProducts([])); dispatch(changeFullOfferAppliedProducts([]));
dispatch(ChangeFullFreeProductList([])); dispatch(ChangeFullFreeProductList([]));
@ -1868,8 +1792,6 @@ const BSBillingTable2 = () => {
setPaybtnnameselected(PaymentOptionsModeName); setPaybtnnameselected(PaymentOptionsModeName);
setQrCode(false); setQrCode(false);
setUpinotSelected(false); setUpinotSelected(false);
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
getHolddata(); getHolddata();
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
await dispatch(changeBookingType('TakeAway')); await dispatch(changeBookingType('TakeAway'));
@ -2171,7 +2093,7 @@ const BSBillingTable2 = () => {
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
{ {
PaymentType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? refundPaySelected : PaymentType:
Paybtnnameselected?.toLowerCase() === 'upi' Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'pd' ? SelectedUPIPayOption?.toLowerCase() === 'pd'
? PaymentDeviceUPI?.[0]?.ModeId ? PaymentDeviceUPI?.[0]?.ModeId
@ -2185,14 +2107,15 @@ const BSBillingTable2 = () => {
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
: null, : null,
Amount: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? previousNetAmount - currentOrderNetAmount : Math.round(TotalAmount), // SelectedUPIPayOption?.toLowerCase() === "pg" ?
MerchantId: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : Amount: Math.round(TotalAmount),
MerchantId:
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: (salesBillEdit && currentOrderNetAmount < previousNetAmount) && (refundPaySelectedName?.toLowerCase() === 'cash' || refundPaySelectedName?.toLowerCase() === 'credit') ? 'PC' : PaymentOptionType:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2206,7 +2129,7 @@ const BSBillingTable2 = () => {
? 'BU' ? 'BU'
: SelectedUPIPayOption : SelectedUPIPayOption
: null, : null,
ModeOfPayment: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : ModeOfPayment:
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
@ -2214,7 +2137,7 @@ const BSBillingTable2 = () => {
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantUPIId ?.MerchantUPIId
: null, : null,
AccountDtl: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? [] : AccountDtl:
Paybtnnameselected?.toLowerCase() === 'upi' && Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
@ -2231,7 +2154,7 @@ const BSBillingTable2 = () => {
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? 'S' : PaymentStatus:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2240,8 +2163,8 @@ const BSBillingTable2 = () => {
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: (salesBillEdit && currentOrderNetAmount < previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(previousNetAmount - currentOrderNetAmount) : 0, Debit: 0,
Credit: salesBillEdit ? (currentOrderNetAmount > previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(TotalAmount) : 0 : Credit:
Paybtnnameselected?.toLowerCase() === 'credit' Paybtnnameselected?.toLowerCase() === 'credit'
? Math.round(TotalAmount) ? Math.round(TotalAmount)
: 0, : 0,
@ -2449,12 +2372,7 @@ const BSBillingTable2 = () => {
putdata['PaymentType'] = !pay && ''; putdata['PaymentType'] = !pay && '';
putdata['PrintType'] = 'Y'; putdata['PrintType'] = 'Y';
} }
let response = null; let response = await dispatch(PutBookingData(putdata)).unwrap();
if (salesBillEdit) {
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
if (value !== 'Unpaid') { if (value !== 'Unpaid') {
if (response?.data?.statusCode == 1) { if (response?.data?.statusCode == 1) {
let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter( let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter(
@ -3283,7 +3201,7 @@ const BSBillingTable2 = () => {
// split payments // split payments
const SplitPaymentOpen = () => { const SplitPaymentOpen = () => {
if (OrderCardDetail?.length > 0 && TotalAmount > 0) { if (OrderCardDetail?.length > 0) {
const updatedData = { const updatedData = {
userData: OrderCardDetail, userData: OrderCardDetail,
ExtraCharges: GlobalExtraCharge, ExtraCharges: GlobalExtraCharge,
@ -3293,11 +3211,6 @@ const BSBillingTable2 = () => {
setFailedOrderData(updatedData); setFailedOrderData(updatedData);
setSplitpayment(true); setSplitpayment(true);
} else { } else {
if (TotalAmount <= 0) {
setMessageType('warning');
setMessageData('Cannot split when total amount is zero or less');
return;
}
setMessageType('warning'); setMessageType('warning');
setMessageData('Please Select the Product'); setMessageData('Please Select the Product');
} }
@ -3907,7 +3820,7 @@ const BSBillingTable2 = () => {
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && (currentOrderNetAmount >= previousNetAmount) ? ( {paybtns?.length > 0 ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
@ -3982,42 +3895,6 @@ const BSBillingTable2 = () => {
</button> </button>
</div> </div>
)) ))
) : (currentOrderNetAmount < previousNetAmount && salesBillEdit && refundPayBtns.length > 0) ? (
refundPayBtns.map((payment) => (
<div className="Table3-cash">
<button
className={
refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode'
: 'Btn-payment-mode-sel'
}
style={{
fontFamily: FontFamily['para'],
position: 'relative',
animation: blink
? 'blink-animation 0.5s infinite alternate'
: 'none',
}}
onClick={() => handleRefundPaymentMode(payment?.ConfigId, payment?.ConfigName)}
>
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
<div
style={{
display: 'flex',
flexDirection: 'row',
columnGap: '0.5rem',
}}
>
{payment.ConfigName}
</div>
</button>
</div>
))
) : ( ) : (
<div <div
onClick={handlepaymentoptions} onClick={handlepaymentoptions}
@ -4254,9 +4131,7 @@ const BSBillingTable2 = () => {
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? ? 'billing-btn'
'billing-btn'
: 'billing-btn'
: 'billing-btn-deactive' : 'billing-btn-deactive'
} }
// onClick={() => { // onClick={() => {
@ -4267,9 +4142,7 @@ const BSBillingTable2 = () => {
handleButtonClick handleButtonClick
} }
> >
{!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <div {!OrderStatus ? (
className="billing-in-style-Order"
style={{ fontFamily: FontFamily['head'] }}>Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</div> : (
<> <>
<div className="billing-in-style"> <div className="billing-in-style">
<h1 style={{ fontFamily: FontFamily['head'] }}>Total</h1> <h1 style={{ fontFamily: FontFamily['head'] }}>Total</h1>
@ -4490,10 +4363,7 @@ const BSBillingTable2 = () => {
SplitPaymentModal={Splitpayment} SplitPaymentModal={Splitpayment}
handlesplitpaymentclose={handlesplitpaymentclose} handlesplitpaymentclose={handlesplitpaymentclose}
TotalNetAmount={ TotalNetAmount={
OrderType === 'Failed' ? FailedTotalAmt : Math.round(OrderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) - OrderType === 'Failed' ? FailedTotalAmt : Math.round(TotalAmount)
((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)))
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />

173
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
View File

@ -131,15 +131,6 @@ import {
GlobalCombocarddata, GlobalCombocarddata,
getCreditCustomer, getCreditCustomer,
GlobalSummeryTotalItems, GlobalSummeryTotalItems,
GlobalSalesBillEdit,
GlobalPreviousOrderPayment,
GlobalPreviousOrderOfferDetails,
GlobalpaymentOptionData,
getPaymentOptions,
putSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { PrintStyleFunction } from '../../../../paymentpdfPage/PrintStyleFunction.js'; import { PrintStyleFunction } from '../../../../paymentpdfPage/PrintStyleFunction.js';
import FeaturesFunctionalities from '../../BookingFunctionality/FeaturesFunctionalities'; import FeaturesFunctionalities from '../../BookingFunctionality/FeaturesFunctionalities';
@ -234,10 +225,6 @@ const BSBillingTable3Pay = () => {
); );
const dispatch = useDispatch(); const dispatch = useDispatch();
const navigate = useNavigate(); const navigate = useNavigate();
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const FreeProdList = useSelector(GlobalFreeProdList); const FreeProdList = useSelector(GlobalFreeProdList);
const offerAppliedProducts = useSelector( const offerAppliedProducts = useSelector(
GlobalOfferAppliedProducts, GlobalOfferAppliedProducts,
@ -345,11 +332,6 @@ const BSBillingTable3Pay = () => {
const [SelectedUPIPayOption, setSelectedUPIPayOption] = useState('Default'); const [SelectedUPIPayOption, setSelectedUPIPayOption] = useState('Default');
const [SelectedUpiOption, setSelectedUpiOption] = useState(''); const [SelectedUpiOption, setSelectedUpiOption] = useState('');
const [hold, setHold] = useState(false); const [hold, setHold] = useState(false);
const [refundPayBtns, setRefundPayBtns] = useState([]);
const [refundPaySelected, setRefundPaySelected] = useState();
const [refundPaySelectedName, setRefundPaySelectedName] = useState(null);
const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0);
const [previousNetAmount, setPreviousNetAmount] = useState(0);
const [addcustomer, setAddCustomer] = useState(false); const [addcustomer, setAddCustomer] = useState(false);
const [PrintOrderDetails, setPrintOrderDetails] = useState([]); const [PrintOrderDetails, setPrintOrderDetails] = useState([]);
const OrderCardDetail = useSelector(GlobalOrderCardDetails); const OrderCardDetail = useSelector(GlobalOrderCardDetails);
@ -586,43 +568,23 @@ const BSBillingTable3Pay = () => {
); );
} }
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const previousNetAmount =
(totalPreviouspayment) || 0;
let withdiscTotal = let withdiscTotal =
Total - Total -
((OverAllSales || 0) + ((OverAllSales || 0) +
(OverAllEstimate || 0) + (OverAllEstimate || 0) +
(Discount > 0 ? Discount : 0)); (Discount > 0 ? Discount : 0));
const currentOrderNetAmount = formatAmount( setTotalAmount(
withdiscTotal >= 0 withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2) ? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2) : (Number(Total) + Number(globalTipAmount)).toFixed(2)
) );
setTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount); dispatch(
setCurrentOrderNetAmount(currentOrderNetAmount); changeSummeryTotalAmount(
setPreviousNetAmount(previousNetAmount); formatAmount(withdiscTotal > 0 ? withdiscTotal : Number(Total))
dispatch(changeSummeryTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount)); )
);
dispatch(changeSummeryComboOfferAmount(withComboSum)); dispatch(changeSummeryComboOfferAmount(withComboSum));
@ -731,31 +693,6 @@ const BSBillingTable3Pay = () => {
// } // }
}, []); }, []);
useEffect(() => {
if (salesBillEdit) {
dispatch(getPaymentOptions()).unwrap();
}
}, [salesBillEdit]);
useEffect(() => {
if (salesBillEdit) {
if (SelCustId) {
setRefundPayBtns(AllPaymentOptions);
setRefundPaySelected(AllPaymentOptions?.[0]?.ConfigId);
setRefundPaySelectedName(AllPaymentOptions?.[0]?.ConfigName);
} else {
const withoutCustomer = AllPaymentOptions?.filter?.(
(item) => item?.ConfigName?.toLowerCase() !== 'credit'
);
setRefundPaySelected(withoutCustomer?.[0]?.ConfigId);
setRefundPaySelectedName(withoutCustomer?.[0]?.ConfigName);
setRefundPayBtns(withoutCustomer);
}
}
}, [AllPaymentOptions, SelCustId, salesBillEdit])
useEffect(() => { useEffect(() => {
if (UserType === 'Employee') { if (UserType === 'Employee') {
fetchApi(); fetchApi();
@ -1487,10 +1424,6 @@ const BSBillingTable3Pay = () => {
const handleButtonClick = () => { const handleButtonClick = () => {
if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) { if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) {
UpiPayment(); UpiPayment();
} else if (salesBillEdit && currentOrderNetAmount < previousNetAmount && !refundPaySelected) {
setMessageType('warning');
setMessageData('Please Select Refund Payment Method');
return;
} else { } else {
OrderStatus OrderStatus
? AddBookingDetails('Dine-In', false) ? AddBookingDetails('Dine-In', false)
@ -1772,11 +1705,6 @@ const BSBillingTable3Pay = () => {
} }
}; };
const handleRefundPaymentMode = (id, name) => {
setRefundPaySelected(id);
setRefundPaySelectedName(name);
}
const addUpiOption = async (id, name, UPIId) => { const addUpiOption = async (id, name, UPIId) => {
await dispatch(changeUpiIDprint(UPIId)); await dispatch(changeUpiIDprint(UPIId));
await dispatch(changeUpiIDName(name)); await dispatch(changeUpiIDName(name));
@ -1984,9 +1912,6 @@ const BSBillingTable3Pay = () => {
// } else { // } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
// } // }
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeLoyaltyConsumedQuantities({})); dispatch(changeLoyaltyConsumedQuantities({}));
dispatch(changeFullOfferAppliedProducts([])); dispatch(changeFullOfferAppliedProducts([]));
dispatch(ChangeFullFreeProductList([])); dispatch(ChangeFullFreeProductList([]));
@ -2002,8 +1927,6 @@ const BSBillingTable3Pay = () => {
setPaybtnnameselected(PaymentOptionsModeName); setPaybtnnameselected(PaymentOptionsModeName);
setPaybtnselected(PaymentOptionsModeId); setPaybtnselected(PaymentOptionsModeId);
setQrCode(false); setQrCode(false);
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
setUpinotSelected(false); setUpinotSelected(false);
getHolddata(); getHolddata();
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
@ -2316,7 +2239,7 @@ const BSBillingTable3Pay = () => {
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
{ {
PaymentType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? refundPaySelected : PaymentType:
Paybtnnameselected?.toLowerCase() === 'upi' Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'pd' ? SelectedUPIPayOption?.toLowerCase() === 'pd'
? PaymentDeviceUPI?.[0]?.ModeId ? PaymentDeviceUPI?.[0]?.ModeId
@ -2330,14 +2253,14 @@ const BSBillingTable3Pay = () => {
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
: null, : null,
Amount: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? previousNetAmount - currentOrderNetAmount : Math.round(TotalAmount), Amount: Math.round(TotalAmount),
MerchantId: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : MerchantId:
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: (salesBillEdit && currentOrderNetAmount < previousNetAmount) && (refundPaySelectedName?.toLowerCase() === 'cash' || refundPaySelectedName?.toLowerCase() === 'credit') ? 'PC' : PaymentOptionType:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2351,7 +2274,7 @@ const BSBillingTable3Pay = () => {
? 'BU' ? 'BU'
: SelectedUPIPayOption : SelectedUPIPayOption
: null, : null,
ModeOfPayment: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : ModeOfPayment:
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
@ -2359,7 +2282,7 @@ const BSBillingTable3Pay = () => {
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantUPIId ?.MerchantUPIId
: null, : null,
AccountDtl: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? [] : AccountDtl:
Paybtnnameselected?.toLowerCase() === 'upi' && Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
@ -2376,7 +2299,7 @@ const BSBillingTable3Pay = () => {
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? 'S' : PaymentStatus:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2385,8 +2308,8 @@ const BSBillingTable3Pay = () => {
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: (salesBillEdit && currentOrderNetAmount < previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(previousNetAmount - currentOrderNetAmount) : 0, Debit: 0,
Credit: salesBillEdit ? (currentOrderNetAmount > previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(TotalAmount) : 0 : Credit:
Paybtnnameselected?.toLowerCase() === 'credit' Paybtnnameselected?.toLowerCase() === 'credit'
? Math.round(TotalAmount) ? Math.round(TotalAmount)
: 0, : 0,
@ -2596,12 +2519,7 @@ const BSBillingTable3Pay = () => {
putdata['PaymentType'] = !pay && ''; putdata['PaymentType'] = !pay && '';
putdata['PrintType'] = 'Y'; putdata['PrintType'] = 'Y';
} }
let response = null; let response = await dispatch(PutBookingData(putdata)).unwrap();
if (salesBillEdit) {
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
if (value !== 'Unpaid') { if (value !== 'Unpaid') {
if (response?.data?.statusCode == 1) { if (response?.data?.statusCode == 1) {
let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter( let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter(
@ -3300,7 +3218,7 @@ const BSBillingTable3Pay = () => {
}; };
// split payments // split payments
const SplitPaymentOpen = () => { const SplitPaymentOpen = () => {
if (OrderCardDetail?.length > 0 && TotalAmount > 0) { if (OrderCardDetail?.length > 0) {
const updatedData = { const updatedData = {
userData: OrderCardDetail, userData: OrderCardDetail,
ExtraCharges: GlobalExtraCharge, ExtraCharges: GlobalExtraCharge,
@ -3310,11 +3228,6 @@ const BSBillingTable3Pay = () => {
setFailedOrderData(updatedData); setFailedOrderData(updatedData);
setSplitpayment(true); setSplitpayment(true);
} else { } else {
if (TotalAmount <= 0) {
setMessageType('warning');
setMessageData('Cannot split when total amount is zero or less');
return;
}
setMessageType('warning'); setMessageType('warning');
setMessageData('Please Select the Product'); setMessageData('Please Select the Product');
} }
@ -4041,7 +3954,7 @@ const BSBillingTable3Pay = () => {
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && (currentOrderNetAmount >= previousNetAmount) ? ( {paybtns?.length > 0 ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
@ -4122,42 +4035,6 @@ const BSBillingTable3Pay = () => {
</button> </button>
</div> </div>
)) ))
) : (currentOrderNetAmount < previousNetAmount && salesBillEdit && refundPayBtns.length > 0) ? (
refundPayBtns.map((payment) => (
<div className="Table3-cash">
<button
className={
refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode'
: 'Btn-payment-mode-sel'
}
style={{
fontFamily: FontFamily['para'],
position: 'relative',
animation: blink
? 'blink-animation 0.5s infinite alternate'
: 'none',
}}
onClick={() => handleRefundPaymentMode(payment?.ConfigId, payment?.ConfigName)}
>
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
<div
style={{
display: 'flex',
flexDirection: 'row',
columnGap: '0.5rem',
}}
>
{payment.ConfigName}
</div>
</button>
</div>
))
) : ( ) : (
<div <div
onClick={handlepaymentoptions} onClick={handlepaymentoptions}
@ -4399,9 +4276,8 @@ const BSBillingTable3Pay = () => {
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? ? !OrderStatus
'BSBillingTable3-paybtn' ? 'BSBillingTable3-paybtn'
: 'BSBillingTable3-paybtn'
: 'BSBillingTable3-paybtn Order' : 'BSBillingTable3-paybtn Order'
: 'BSBillingTable3-paybtn-deactive' : 'BSBillingTable3-paybtn-deactive'
} }
@ -4416,7 +4292,7 @@ const BSBillingTable3Pay = () => {
} }
//dhana //dhana
> >
{!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <p className="Table4-Order">Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</p> : ( {!OrderStatus ? (
<> <>
<p style={{ fontFamily: FontFamily['head'] }}> <p style={{ fontFamily: FontFamily['head'] }}>
{' '} {' '}
@ -4628,10 +4504,7 @@ const BSBillingTable3Pay = () => {
SplitPaymentModal={Splitpayment} SplitPaymentModal={Splitpayment}
handlesplitpaymentclose={handlesplitpaymentclose} handlesplitpaymentclose={handlesplitpaymentclose}
TotalNetAmount={ TotalNetAmount={
OrderType === 'Failed' ? FailedTotalAmt : Math.round(OrderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) - OrderType === 'Failed' ? FailedTotalAmt : Math.round(TotalAmount)
((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)))
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />

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

@ -3789,7 +3789,40 @@ const BSBilling4Payment = () => {
</div> </div>
</TooltipWrapper> </TooltipWrapper>
)} )}
{/* Customer Orders */}
{GetCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div
className="BSBillingNav-icon-table-icon"
onClick={() => {
if (
CheckBookingStatus !== 'Close' &&
!addnewAccess &&
!(OrderCardDetail?.length > 0)
) {
setCustomerPreviesOrders(true);
}
}}
style={{
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
color:
OrderCardDetail?.length > 0 ||
(OrderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined)
? 'gray'
: 'rgb(18, 146, 238)',
fontSize: '25px',
display: 'flex',
alignItems: 'center',
height: '2.46rem',
width: '1.5rem',
}}
>
<FaCartPlus />
</div>
</Tooltip>
)}
{OtherServicesglobal && OrderCardDetail.length >= 1 && ( {OtherServicesglobal && OrderCardDetail.length >= 1 && (
<TooltipWrapper title="Vehicle Number" isMobile={isMobile}> <TooltipWrapper title="Vehicle Number" isMobile={isMobile}>
{' '} {' '}
@ -3826,41 +3859,6 @@ const BSBilling4Payment = () => {
{/* </React.Fragment> */} {/* </React.Fragment> */}
</div> </div>
)} )}
{/* Customer Orders */}
{GetCustId && (
<Tooltip title="Customer Orders" isMobile={isMobile}>
{' '}
<div
className="BSBillingNav-icon-table-icon"
onClick={() => {
if (
CheckBookingStatus !== 'Close' &&
!addnewAccess &&
!(OrderCardDetail?.length > 0)
) {
setCustomerPreviesOrders(true);
}
}}
style={{
cursor: OrderCardDetail?.length > 0 && 'not-allowed',
color:
OrderCardDetail?.length > 0 ||
(OrderCardDetail?.length > 0 &&
GetCustId?.CustMobile === undefined)
? 'gray'
: 'rgb(18, 146, 238)',
fontSize: '25px',
display: 'flex',
alignItems: 'center',
height: '2.46rem',
width: '1.5rem',
}}
>
<FaCartPlus />
</div>
</Tooltip>
)}
{tabledata?.length > 0 && ( {tabledata?.length > 0 && (
<div style={{ width: '2rem' }}> <div style={{ width: '2rem' }}>
{tableOptions {tableOptions

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

@ -121,15 +121,6 @@ import {
changeCurrentOrderId, changeCurrentOrderId,
GlobalCombocarddata, GlobalCombocarddata,
getCreditCustomer, getCreditCustomer,
GlobalSalesBillEdit,
GlobalPreviousOrderPayment,
GlobalPreviousOrderOfferDetails,
GlobalpaymentOptionData,
getPaymentOptions,
putSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { ChangeTotalAmount } from '../../../../../Features/ExteraCharges/ExtraCharges.js'; //Shifayth Date:27/12/2023 import { ChangeTotalAmount } from '../../../../../Features/ExteraCharges/ExtraCharges.js'; //Shifayth Date:27/12/2023
import { import {
@ -245,10 +236,6 @@ const BSBillingTable5 = () => {
const UserType = SessionData?.UserType; const UserType = SessionData?.UserType;
const AuthToken = SessionData?.AuthToken; const AuthToken = SessionData?.AuthToken;
const SessionMobileNo = SessionData?.SessionMobileNo; const SessionMobileNo = SessionData?.SessionMobileNo;
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const Discount = useSelector(GlobalOverAllOfferAmt); const Discount = useSelector(GlobalOverAllOfferAmt);
const FreeProdList = useSelector(GlobalFreeProdList); const FreeProdList = useSelector(GlobalFreeProdList);
const offerAppliedProducts = useSelector(GlobalOfferAppliedProducts); const offerAppliedProducts = useSelector(GlobalOfferAppliedProducts);
@ -329,11 +316,6 @@ const BSBillingTable5 = () => {
const printDatas = useSelector(GlobalprintDatas); const printDatas = useSelector(GlobalprintDatas);
const PrinterDetails = useSelector(GlobalPrinterMappingDtls); const PrinterDetails = useSelector(GlobalPrinterMappingDtls);
const [refundPayBtns, setRefundPayBtns] = useState([]);
const [refundPaySelected, setRefundPaySelected] = useState();
const [refundPaySelectedName, setRefundPaySelectedName] = useState(null);
const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0);
const [previousNetAmount, setPreviousNetAmount] = useState(0);
const [paybtnselected, setPaybtnselected] = useState(); const [paybtnselected, setPaybtnselected] = useState();
const [Paybtnnameselected, setPaybtnnameselected] = useState(); const [Paybtnnameselected, setPaybtnnameselected] = useState();
const [SelectedBookingType, setSelectedBookingType] = useState(null); const [SelectedBookingType, setSelectedBookingType] = useState(null);
@ -484,31 +466,6 @@ const BSBillingTable5 = () => {
// for customised invoice number // for customised invoice number
const { invoiceDate, clearInvoiceDate } = useDateStore(); const { invoiceDate, clearInvoiceDate } = useDateStore();
const CurrentOrderId = useSelector(GlobalCurrentOrderId); const CurrentOrderId = useSelector(GlobalCurrentOrderId);
useEffect(() => {
if (salesBillEdit) {
dispatch(getPaymentOptions()).unwrap();
}
}, [salesBillEdit]);
useEffect(() => {
if (salesBillEdit) {
if (SelCustId) {
setRefundPayBtns(AllPaymentOptions);
setRefundPaySelected(AllPaymentOptions?.[0]?.ConfigId);
setRefundPaySelectedName(AllPaymentOptions?.[0]?.ConfigName);
} else {
const withoutCustomer = AllPaymentOptions?.filter?.(
(item) => item?.ConfigName?.toLowerCase() !== 'credit'
);
setRefundPaySelected(withoutCustomer?.[0]?.ConfigId);
setRefundPaySelectedName(withoutCustomer?.[0]?.ConfigName);
setRefundPayBtns(withoutCustomer);
}
}
}, [AllPaymentOptions, SelCustId, salesBillEdit])
useEffect(() => { useEffect(() => {
if ( if (
OrderCardDetail?.length === 1 && OrderCardDetail?.length === 1 &&
@ -632,44 +589,25 @@ const BSBillingTable5 = () => {
); );
} }
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const previousNetAmount =
(totalPreviouspayment) || 0;
let withdiscTotal = let withdiscTotal =
Total - Total -
((OverAllSales || 0) + ((OverAllSales || 0) +
(OverAllEstimate || 0) + (OverAllEstimate || 0) +
(Discount > 0 ? Discount : 0)); (Discount > 0 ? Discount : 0));
const currentOrderNetAmount = formatAmount( setTotalAmount(
formatAmount(
withdiscTotal >= 0 withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2) ? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2) : (Number(Total) + Number(globalTipAmount)).toFixed(2)
) )
);
setTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount); dispatch(
setCurrentOrderNetAmount(currentOrderNetAmount); changeSummeryTotalAmount(
setPreviousNetAmount(previousNetAmount); formatAmount(withdiscTotal > 0 ? withdiscTotal : Number(Total))
dispatch(changeSummeryTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount)); )
);
dispatch(changeSummeryComboOfferAmount(withComboSum)); dispatch(changeSummeryComboOfferAmount(withComboSum));
@ -906,10 +844,6 @@ const BSBillingTable5 = () => {
const handleButtonClick = () => { const handleButtonClick = () => {
if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) { if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) {
UpiPayment(); UpiPayment();
} else if (salesBillEdit && currentOrderNetAmount < previousNetAmount && !refundPaySelected) {
setMessageType('warning');
setMessageData('Please Select Refund Payment Method');
return;
} else { } else {
OrderStatus OrderStatus
? AddBookingDetails('Dine-In', false) ? AddBookingDetails('Dine-In', false)
@ -1745,12 +1679,6 @@ const BSBillingTable5 = () => {
setCardoptionnotSelected(false); setCardoptionnotSelected(false);
} }
}; };
const handleRefundPaymentMode = (id, name) => {
setRefundPaySelected(id);
setRefundPaySelectedName(name);
}
const addUpiOption = async (id, name, UPIId) => { const addUpiOption = async (id, name, UPIId) => {
await dispatch(changeUpiIDprint(UPIId)); await dispatch(changeUpiIDprint(UPIId));
await dispatch(changeUpiIDName(name)); await dispatch(changeUpiIDName(name));
@ -1892,9 +1820,6 @@ const BSBillingTable5 = () => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeTipAmount(0)); dispatch(changeTipAmount(0));
dispatch(changeLoyaltyConsumedQuantities({})); dispatch(changeLoyaltyConsumedQuantities({}));
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
@ -1911,8 +1836,6 @@ const BSBillingTable5 = () => {
setPaybtnselected(PaymentOptionsModeId); setPaybtnselected(PaymentOptionsModeId);
setQrCode(false); setQrCode(false);
setUpinotSelected(false); setUpinotSelected(false);
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
getHolddata(); getHolddata();
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
await dispatch(changeBookingType('TakeAway')); await dispatch(changeBookingType('TakeAway'));
@ -2211,7 +2134,7 @@ const BSBillingTable5 = () => {
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
{ {
PaymentType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? refundPaySelected : PaymentType:
Paybtnnameselected?.toLowerCase() === 'upi' Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'pd' ? SelectedUPIPayOption?.toLowerCase() === 'pd'
? PaymentDeviceUPI?.[0]?.ModeId ? PaymentDeviceUPI?.[0]?.ModeId
@ -2225,14 +2148,14 @@ const BSBillingTable5 = () => {
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
: null, : null,
Amount: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? previousNetAmount - currentOrderNetAmount : Math.round(TotalAmount), Amount: Math.round(TotalAmount),
MerchantId: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : MerchantId:
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: (salesBillEdit && currentOrderNetAmount < previousNetAmount) && (refundPaySelectedName?.toLowerCase() === 'cash' || refundPaySelectedName?.toLowerCase() === 'credit') ? 'PC' : PaymentOptionType:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2246,7 +2169,7 @@ const BSBillingTable5 = () => {
? 'BU' ? 'BU'
: SelectedUPIPayOption : SelectedUPIPayOption
: null, : null,
ModeOfPayment: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : ModeOfPayment:
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
@ -2254,7 +2177,7 @@ const BSBillingTable5 = () => {
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantUPIId ?.MerchantUPIId
: null, : null,
AccountDtl: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? [] : AccountDtl:
Paybtnnameselected?.toLowerCase() === 'upi' && Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
@ -2271,7 +2194,7 @@ const BSBillingTable5 = () => {
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? 'S' : PaymentStatus:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2280,8 +2203,8 @@ const BSBillingTable5 = () => {
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: (salesBillEdit && currentOrderNetAmount < previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(previousNetAmount - currentOrderNetAmount) : 0, Debit: 0,
Credit: salesBillEdit ? (currentOrderNetAmount > previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(TotalAmount) : 0 : Credit:
Paybtnnameselected?.toLowerCase() === 'credit' Paybtnnameselected?.toLowerCase() === 'credit'
? Math.round(TotalAmount) ? Math.round(TotalAmount)
: 0, : 0,
@ -2487,12 +2410,7 @@ const BSBillingTable5 = () => {
putdata['PaymentType'] = !pay && ''; putdata['PaymentType'] = !pay && '';
putdata['PrintType'] = 'Y'; putdata['PrintType'] = 'Y';
} }
let response = null; let response = await dispatch(PutBookingData(putdata)).unwrap();
if (salesBillEdit) {
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
if (value !== 'Unpaid') { if (value !== 'Unpaid') {
if (response?.data?.statusCode == 1) { if (response?.data?.statusCode == 1) {
let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter( let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter(
@ -3264,7 +3182,7 @@ const BSBillingTable5 = () => {
// split payments // split payments
const SplitPaymentOpen = () => { const SplitPaymentOpen = () => {
if (OrderCardDetail?.length > 0 && TotalAmount > 0) { if (OrderCardDetail?.length > 0) {
const updatedData = { const updatedData = {
userData: OrderCardDetail, userData: OrderCardDetail,
ExtraCharges: GlobalExtraCharge, ExtraCharges: GlobalExtraCharge,
@ -3274,11 +3192,6 @@ const BSBillingTable5 = () => {
setFailedOrderData(updatedData); setFailedOrderData(updatedData);
setSplitpayment(true); setSplitpayment(true);
} else { } else {
if (TotalAmount <= 0) {
setMessageType('warning');
setMessageData('Cannot split when total amount is zero or less');
return;
}
setMessageType('warning'); setMessageType('warning');
setMessageData('Please Select the Product'); setMessageData('Please Select the Product');
} }
@ -3692,7 +3605,7 @@ const BSBillingTable5 = () => {
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && (currentOrderNetAmount >= previousNetAmount) ? ( {paybtns?.length > 0 ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
@ -3770,42 +3683,6 @@ const BSBillingTable5 = () => {
</button> </button>
</div> </div>
)) ))
) : (currentOrderNetAmount < previousNetAmount && salesBillEdit && refundPayBtns.length > 0) ? (
refundPayBtns.map((payment) => (
<div className="Table3-cash">
<button
className={
refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode'
: 'Btn-payment-mode-sel'
}
style={{
fontFamily: FontFamily['para'],
position: 'relative',
animation: blink
? 'blink-animation 0.5s infinite alternate'
: 'none',
}}
onClick={() => handleRefundPaymentMode(payment?.ConfigId, payment?.ConfigName)}
>
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
<div
style={{
display: 'flex',
flexDirection: 'row',
columnGap: '0.5rem',
}}
>
{payment.ConfigName}
</div>
</button>
</div>
))
) : ( ) : (
<div <div
onClick={handlepaymentoptions} onClick={handlepaymentoptions}
@ -4277,9 +4154,8 @@ const BSBillingTable5 = () => {
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? ? !OrderStatus
'BSBIllingTable5-paybtn-noitems' ? 'BSBIllingTable5-paybtn-noitems'
: 'BSBIllingTable5-paybtn-noitems'
: 'BSBIllingTable5-paybtn-noitems Order' : 'BSBIllingTable5-paybtn-noitems Order'
: 'BSBIllingTable5-paybtn-noitems-disable' : 'BSBIllingTable5-paybtn-noitems-disable'
} }
@ -4291,7 +4167,7 @@ const BSBillingTable5 = () => {
handleButtonClick handleButtonClick
} }
> >
{!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <div>Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</div> : ( {!OrderStatus ? (
<> <>
{/* ₹ {Math.round(TotalAmount)} */} {/* ₹ {Math.round(TotalAmount)} */}
{isMobile ? ( {isMobile ? (
@ -4500,10 +4376,7 @@ const BSBillingTable5 = () => {
SplitPaymentModal={Splitpayment} SplitPaymentModal={Splitpayment}
handlesplitpaymentclose={handlesplitpaymentclose} handlesplitpaymentclose={handlesplitpaymentclose}
TotalNetAmount={ TotalNetAmount={
OrderType === 'Failed' ? FailedTotalAmt : Math.round(OrderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) - OrderType === 'Failed' ? FailedTotalAmt : Math.round(TotalAmount)
((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)))
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />

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

@ -120,15 +120,6 @@ import {
changeCurrentOrderId, changeCurrentOrderId,
GlobalCombocarddata, GlobalCombocarddata,
getCreditCustomer, getCreditCustomer,
GlobalSalesBillEdit,
GlobalPreviousOrderPayment,
GlobalPreviousOrderOfferDetails,
GlobalpaymentOptionData,
getPaymentOptions,
putSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import FeaturesFunctionalities from '../../BookingFunctionality/FeaturesFunctionalities'; import FeaturesFunctionalities from '../../BookingFunctionality/FeaturesFunctionalities';
import { import {
@ -249,10 +240,6 @@ const BST6Payment = () => {
type?.PreferredSubCatName?.toLowerCase() === 'dine in' && type?.PreferredSubCatName?.toLowerCase() === 'dine in' &&
type?.PreferredStatus === 'Y' type?.PreferredStatus === 'Y'
); );
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const screenwidth = useSelector(GlobalScreenSize); const screenwidth = useSelector(GlobalScreenSize);
const printerTemplateStyle = useSelector(SelectedPrintTemplate); const printerTemplateStyle = useSelector(SelectedPrintTemplate);
const RetailWSSalesType = useSelector(GlobalRetailWSSalesType); const RetailWSSalesType = useSelector(GlobalRetailWSSalesType);
@ -349,11 +336,6 @@ const BST6Payment = () => {
const UserType = SessionData?.UserType; const UserType = SessionData?.UserType;
const AuthToken = SessionData?.AuthToken; const AuthToken = SessionData?.AuthToken;
const SessionMobileNo = SessionData?.SessionMobileNo; const SessionMobileNo = SessionData?.SessionMobileNo;
const [refundPayBtns, setRefundPayBtns] = useState([]);
const [refundPaySelected, setRefundPaySelected] = useState();
const [refundPaySelectedName, setRefundPaySelectedName] = useState(null);
const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0);
const [previousNetAmount, setPreviousNetAmount] = useState(0);
const [FirstPaymentclick, setFirstPaymentclick] = useState(false); const [FirstPaymentclick, setFirstPaymentclick] = useState(false);
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [unpaidopen, setUnpaidOpen] = useState(false); const [unpaidopen, setUnpaidOpen] = useState(false);
@ -477,30 +459,6 @@ const BST6Payment = () => {
setPrintOrderDetails([]); setPrintOrderDetails([]);
} }
}, [OrderCardDetail]); }, [OrderCardDetail]);
useEffect(() => {
if (salesBillEdit) {
dispatch(getPaymentOptions()).unwrap();
}
}, [salesBillEdit]);
useEffect(() => {
if (salesBillEdit) {
if (SelCustId) {
setRefundPayBtns(AllPaymentOptions);
setRefundPaySelected(AllPaymentOptions?.[0]?.ConfigId);
setRefundPaySelectedName(AllPaymentOptions?.[0]?.ConfigName);
} else {
const withoutCustomer = AllPaymentOptions?.filter?.(
(item) => item?.ConfigName?.toLowerCase() !== 'credit'
);
setRefundPaySelected(withoutCustomer?.[0]?.ConfigId);
setRefundPaySelectedName(withoutCustomer?.[0]?.ConfigName);
setRefundPayBtns(withoutCustomer);
}
}
}, [AllPaymentOptions, SelCustId, salesBillEdit])
console.log(PrintOrderDetails, 'PrintOrderDetails'); console.log(PrintOrderDetails, 'PrintOrderDetails');
useEffect(() => { useEffect(() => {
if (selOption) { if (selOption) {
@ -605,43 +563,25 @@ const BST6Payment = () => {
); );
} }
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const previousNetAmount =
(totalPreviouspayment) || 0;
let withdiscTotal = let withdiscTotal =
Total - Total -
((OverAllSales || 0) + ((OverAllSales || 0) +
(OverAllEstimate || 0) + (OverAllEstimate || 0) +
(Discount > 0 ? Discount : 0)); (Discount > 0 ? Discount : 0));
const currentOrderNetAmount = formatAmount( setTotalAmount(
formatAmount(
withdiscTotal >= 0 withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2) ? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2) : (Number(Total) + Number(globalTipAmount)).toFixed(2)
) )
);
setTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount); dispatch(
setCurrentOrderNetAmount(currentOrderNetAmount); changeSummeryTotalAmount(
setPreviousNetAmount(previousNetAmount); formatAmount(withdiscTotal > 0 ? withdiscTotal : Number(Total))
dispatch(changeSummeryTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount)); )
);
dispatch(changeSummeryComboOfferAmount(withComboSum)); dispatch(changeSummeryComboOfferAmount(withComboSum));
@ -1234,10 +1174,6 @@ const BST6Payment = () => {
const handleButtonClick = () => { const handleButtonClick = () => {
if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) { if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) {
UpiPayment(); UpiPayment();
} else if (salesBillEdit && currentOrderNetAmount < previousNetAmount && !refundPaySelected) {
setMessageType('warning');
setMessageData('Please Select Refund Payment Method');
return;
} else { } else {
OrderStatus OrderStatus
? AddBookingDetails('Dine-In', false) ? AddBookingDetails('Dine-In', false)
@ -1698,11 +1634,6 @@ const BST6Payment = () => {
} }
}; };
const handleRefundPaymentMode = (id, name) => {
setRefundPaySelected(id);
setRefundPaySelectedName(name);
}
const addUpiOption = async (id, name, UPIId) => { const addUpiOption = async (id, name, UPIId) => {
await dispatch(changeUpiIDprint(UPIId)); await dispatch(changeUpiIDprint(UPIId));
await dispatch(changeUpiIDName(name)); await dispatch(changeUpiIDName(name));
@ -1787,7 +1718,7 @@ const BST6Payment = () => {
setCardOptionOpen(visible); setCardOptionOpen(visible);
}; };
const SplitPaymentOpen = () => { const SplitPaymentOpen = () => {
if (OrderCardDetail?.length > 0 && TotalAmount > 0) { if (OrderCardDetail?.length > 0) {
const updatedData = { const updatedData = {
userData: OrderCardDetail, userData: OrderCardDetail,
ExtraCharges: GlobalExtraCharge, ExtraCharges: GlobalExtraCharge,
@ -1797,11 +1728,6 @@ const BST6Payment = () => {
setFailedOrderData(updatedData); setFailedOrderData(updatedData);
setSplitpayment(true); setSplitpayment(true);
} else { } else {
if (TotalAmount <= 0) {
setMessageType('warning');
setMessageData('Cannot split when total amount is zero or less');
return;
}
setMessageType('warning'); setMessageType('warning');
setMessageData('Please Select the Product'); setMessageData('Please Select the Product');
} }
@ -1935,9 +1861,6 @@ const BST6Payment = () => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeTipAmount(0)); dispatch(changeTipAmount(0));
dispatch(changeLoyaltyConsumedQuantities({})); dispatch(changeLoyaltyConsumedQuantities({}));
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
@ -1954,8 +1877,6 @@ const BST6Payment = () => {
setPaybtnselected(PaymentOptionsModeId); setPaybtnselected(PaymentOptionsModeId);
setQrCode(false); setQrCode(false);
setUpinotSelected(false); setUpinotSelected(false);
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
getHolddata(); getHolddata();
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
await dispatch(changeBookingType('TakeAway')); await dispatch(changeBookingType('TakeAway'));
@ -2252,7 +2173,7 @@ const BST6Payment = () => {
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
{ {
PaymentType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? refundPaySelected : PaymentType:
Paybtnnameselected?.toLowerCase() === 'upi' Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'pd' ? SelectedUPIPayOption?.toLowerCase() === 'pd'
? PaymentDeviceUPI?.[0]?.ModeId ? PaymentDeviceUPI?.[0]?.ModeId
@ -2266,14 +2187,14 @@ const BST6Payment = () => {
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
: null, : null,
Amount: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? previousNetAmount - currentOrderNetAmount : Math.round(TotalAmount), Amount: Math.round(TotalAmount),
MerchantId: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : MerchantId:
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: (salesBillEdit && currentOrderNetAmount < previousNetAmount) && (refundPaySelectedName?.toLowerCase() === 'cash' || refundPaySelectedName?.toLowerCase() === 'credit') ? 'PC' : PaymentOptionType:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2287,7 +2208,7 @@ const BST6Payment = () => {
? 'BU' ? 'BU'
: SelectedUPIPayOption : SelectedUPIPayOption
: null, : null,
ModeOfPayment: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : ModeOfPayment:
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
@ -2295,7 +2216,7 @@ const BST6Payment = () => {
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantUPIId ?.MerchantUPIId
: null, : null,
AccountDtl: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? [] : AccountDtl:
Paybtnnameselected?.toLowerCase() === 'upi' && Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
@ -2312,7 +2233,7 @@ const BST6Payment = () => {
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? 'S' : PaymentStatus:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2321,8 +2242,8 @@ const BST6Payment = () => {
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: (salesBillEdit && currentOrderNetAmount < previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(previousNetAmount - currentOrderNetAmount) : 0, Debit: 0,
Credit: salesBillEdit ? (currentOrderNetAmount > previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(TotalAmount) : 0 : Credit:
Paybtnnameselected?.toLowerCase() === 'credit' Paybtnnameselected?.toLowerCase() === 'credit'
? Math.round(TotalAmount) ? Math.round(TotalAmount)
: 0, : 0,
@ -2530,12 +2451,7 @@ const BST6Payment = () => {
putdata['PaymentType'] = !pay && ''; putdata['PaymentType'] = !pay && '';
putdata['PrintType'] = 'Y'; putdata['PrintType'] = 'Y';
} }
let response = null; let response = await dispatch(PutBookingData(putdata)).unwrap();
if (salesBillEdit) {
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
let PayatCounterfilter = response?.data?.PaymentOrderDtl?.filter( let PayatCounterfilter = response?.data?.PaymentOrderDtl?.filter(
(item) => item?.PaymentOptionType?.toLowerCase() === 'pc' (item) => item?.PaymentOptionType?.toLowerCase() === 'pc'
); );
@ -3762,7 +3678,7 @@ const BST6Payment = () => {
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && (currentOrderNetAmount >= previousNetAmount) ? ( {paybtns?.length > 0 ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table6-cash"> <div className="Table6-cash">
<button <button
@ -3842,40 +3758,6 @@ const BST6Payment = () => {
</button> </button>
</div> </div>
)) ))
) : (currentOrderNetAmount < previousNetAmount && salesBillEdit && refundPayBtns.length > 0) ? (
refundPayBtns.map((payment) => (
<div className="Table6-cash">
<button
className={
refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode'
: 'Btn-payment-mode-sel'
}
style={{
fontFamily: FontFamily['para'],
position: 'relative',
animation: blink
? 'blink-animation 0.5s infinite alternate'
: 'none',
}}
onClick={() => handleRefundPaymentMode(payment?.ConfigId, payment?.ConfigName)}
>
<div
style={{
display: 'flex',
flexDirection: 'row',
columnGap: '0.5rem',
}}
>
{payment.ConfigName}
</div>
</button>
</div>
))
) : ( ) : (
<div <div
onClick={handlepaymentoptions} onClick={handlepaymentoptions}
@ -3900,9 +3782,8 @@ const BST6Payment = () => {
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? ? !OrderStatus
'BST6Payment-Button-pay' ? 'BST6Payment-Button-pay'
: 'BST6Payment-Button-pay'
: 'BST6Payment-Button-pay Order' : 'BST6Payment-Button-pay Order'
: 'BST6Payment-Button-pay-disabled' : 'BST6Payment-Button-pay-disabled'
} }
@ -3917,7 +3798,7 @@ const BST6Payment = () => {
handleButtonClick handleButtonClick
} }
> >
{!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <div>Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</div> : ( {!OrderStatus ? (
<> <>
<p style={{ fontFamily: FontFamily['head'] }}> <p style={{ fontFamily: FontFamily['head'] }}>
{isMobile ? ( {isMobile ? (
@ -4436,10 +4317,7 @@ const BST6Payment = () => {
SplitPaymentModal={Splitpayment} SplitPaymentModal={Splitpayment}
handlesplitpaymentclose={handlesplitpaymentclose} handlesplitpaymentclose={handlesplitpaymentclose}
TotalNetAmount={ TotalNetAmount={
OrderType === 'Failed' ? FailedTotalAmt : Math.round(OrderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) - OrderType === 'Failed' ? FailedTotalAmt : Math.round(TotalAmount)
((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)))
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />

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

@ -110,15 +110,6 @@ import {
changeCurrentOrderId, changeCurrentOrderId,
GlobalCombocarddata, GlobalCombocarddata,
getCreditCustomer, getCreditCustomer,
GlobalSalesBillEdit,
GlobalPreviousOrderPayment,
GlobalPreviousOrderOfferDetails,
GlobalpaymentOptionData,
getPaymentOptions,
putSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData.js'; } from '../../../../../Features/BookingScreen/BookingData/BookingData.js';
import { import {
globalExtraTotalAmount, globalExtraTotalAmount,
@ -234,10 +225,6 @@ const BSBilling7Payment = () => {
); );
const dispatch = useDispatch(); const dispatch = useDispatch();
const navigate = useNavigate(); const navigate = useNavigate();
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const Discount = useSelector(GlobalOverAllOfferAmt); const Discount = useSelector(GlobalOverAllOfferAmt);
const screenwidth = useSelector(GlobalScreenSize); const screenwidth = useSelector(GlobalScreenSize);
const defaultBookingType = useSelector(GlobalDefaultBookingType); const defaultBookingType = useSelector(GlobalDefaultBookingType);
@ -340,11 +327,6 @@ const BSBilling7Payment = () => {
const [SelectedUPIPayOption, setSelectedUPIPayOption] = useState('Default'); const [SelectedUPIPayOption, setSelectedUPIPayOption] = useState('Default');
const [SelectedUpiOption, setSelectedUpiOption] = useState(); const [SelectedUpiOption, setSelectedUpiOption] = useState();
const [hold, setHold] = useState(false); const [hold, setHold] = useState(false);
const [refundPayBtns, setRefundPayBtns] = useState([]);
const [refundPaySelected, setRefundPaySelected] = useState();
const [refundPaySelectedName, setRefundPaySelectedName] = useState(null);
const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0);
const [previousNetAmount, setPreviousNetAmount] = useState(0);
const [addcustomer, setAddCustomer] = useState(false); const [addcustomer, setAddCustomer] = useState(false);
const [PrintOrderDetails, setPrintOrderDetails] = useState([]); const [PrintOrderDetails, setPrintOrderDetails] = useState([]);
const [customerPreviesOrders, setCustomerPreviesOrders] = useState(false); const OverAllSales = useSelector(GlobalOverAllDiscSales); const [customerPreviesOrders, setCustomerPreviesOrders] = useState(false); const OverAllSales = useSelector(GlobalOverAllDiscSales);
@ -366,7 +348,7 @@ const BSBilling7Payment = () => {
return acc + Math.round(Number(item?.OrderQty || 0)); return acc + Math.round(Number(item?.OrderQty || 0));
}, 0); }, 0);
console.log(salesBillEdit, currentOrderNetAmount, previousNetAmount, "previousNetAmount")
const [UpiOption, setUpiOption] = useState(''); const [UpiOption, setUpiOption] = useState('');
const [BusinessPayOption, setBusinessPayoption] = useState([]); const [BusinessPayOption, setBusinessPayoption] = useState([]);
const [paymentSucess, setPaymentSuccess] = useState(false); const [paymentSucess, setPaymentSuccess] = useState(false);
@ -500,33 +482,6 @@ const BSBilling7Payment = () => {
setMobileNoWhatsApp(selOption); setMobileNoWhatsApp(selOption);
} }
}, [selOption]); }, [selOption]);
useEffect(() => {
if (salesBillEdit) {
dispatch(getPaymentOptions()).unwrap();
}
}, [salesBillEdit]);
useEffect(() => {
if (salesBillEdit) {
if (SelCustId) {
setRefundPayBtns(AllPaymentOptions);
setRefundPaySelected(AllPaymentOptions?.[0]?.ConfigId);
setRefundPaySelectedName(AllPaymentOptions?.[0]?.ConfigName);
} else {
const withoutCustomer = AllPaymentOptions?.filter?.(
(item) => item?.ConfigName?.toLowerCase() !== 'credit'
);
setRefundPaySelected(withoutCustomer?.[0]?.ConfigId);
setRefundPaySelectedName(withoutCustomer?.[0]?.ConfigName);
setRefundPayBtns(withoutCustomer);
}
}
}, [AllPaymentOptions, SelCustId, salesBillEdit])
// Usage // Usage
useEffect(() => { useEffect(() => {
const fetchCreditCustomer = async () => { const fetchCreditCustomer = async () => {
@ -624,44 +579,23 @@ const BSBilling7Payment = () => {
); );
} }
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const previousNetAmount =
(totalPreviouspayment) || 0;
let withdiscTotal = let withdiscTotal =
Total - Total -
((OverAllSales || 0) + ((OverAllSales || 0) +
(OverAllEstimate || 0) + (OverAllEstimate || 0) +
(Discount > 0 ? Discount : 0)); (Discount > 0 ? Discount : 0));
const currentOrderNetAmount = formatAmount( setTotalAmount(
withdiscTotal >= 0 withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2) ? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2) : (Number(Total) + Number(globalTipAmount)).toFixed(2)
) );
console.log(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount, "totalPreviouspayment")
setTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount); dispatch(
setCurrentOrderNetAmount(currentOrderNetAmount); changeSummeryTotalAmount(
setPreviousNetAmount(previousNetAmount); withdiscTotal > 0 ? withdiscTotal : Number(Total)
dispatch(changeSummeryTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount)); )
);
dispatch(changeSummeryComboOfferAmount(withComboSum)); dispatch(changeSummeryComboOfferAmount(withComboSum));
@ -885,7 +819,7 @@ const BSBilling7Payment = () => {
async (orderDetail, index) => { async (orderDetail, index) => {
await printDiv(`${selectedStyle}-${index}`, style); // Use unique IDs for each print await printDiv(`${selectedStyle}-${index}`, style); // Use unique IDs for each print
if (orderDetail?.BookingTypeName !== 'Dine In') { if (orderDetail?.BookingTypeName !== 'Dine In') {
const groupedTokens = orderDetail?.productDetails?.filter(data => data?.EditTokenAvailable !== 'N')?.reduce( const groupedTokens = orderDetail?.productDetails?.reduce(
(acc, item, idx) => { (acc, item, idx) => {
if (item.TokenAvailable === 'Y') { if (item.TokenAvailable === 'Y') {
if (!item.CounterName) { if (!item.CounterName) {
@ -965,17 +899,12 @@ const BSBilling7Payment = () => {
const handleButtonClick = () => { const handleButtonClick = () => {
if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) { if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) {
UpiPayment(); UpiPayment();
} else if (salesBillEdit && currentOrderNetAmount < previousNetAmount && !refundPaySelected) {
setMessageType('warning');
setMessageData('Please Select Refund Payment Method');
return;
} else { } else {
OrderStatus OrderStatus
? AddBookingDetails('Dine-In', false) ? AddBookingDetails('Dine-In', false)
: AddBookingDetails(BookingType, true); : AddBookingDetails(BookingType, true);
} }
}; };
const financialYearError = async () => { const financialYearError = async () => {
setMessageType('error'); setMessageType('error');
setMessageData('Financial Year-Based Sales Not Yet Started'); setMessageData('Financial Year-Based Sales Not Yet Started');
@ -1708,12 +1637,6 @@ const BSBilling7Payment = () => {
setCardoptionnotSelected(false); setCardoptionnotSelected(false);
} }
}; };
const handleRefundPaymentMode = (id, name) => {
setRefundPaySelected(id);
setRefundPaySelectedName(name);
}
const addUpiOption = async (id, name, UPIId) => { const addUpiOption = async (id, name, UPIId) => {
await dispatch(changeUpiIDprint(UPIId)); await dispatch(changeUpiIDprint(UPIId));
await dispatch(changeUpiIDName(name)); await dispatch(changeUpiIDName(name));
@ -1910,9 +1833,6 @@ const BSBilling7Payment = () => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeTipAmount(0)); dispatch(changeTipAmount(0));
dispatch(changeFullOfferAppliedProducts([])); dispatch(changeFullOfferAppliedProducts([]));
dispatch(changeLoyaltyConsumedQuantities({})); dispatch(changeLoyaltyConsumedQuantities({}));
@ -1928,8 +1848,6 @@ const BSBilling7Payment = () => {
setPaybtnnameselected(PaymentOptionsModeName); setPaybtnnameselected(PaymentOptionsModeName);
setPaybtnselected(PaymentOptionsModeId); setPaybtnselected(PaymentOptionsModeId);
setQrCode(false); setQrCode(false);
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
setUpinotSelected(false); setUpinotSelected(false);
getHolddata(); getHolddata();
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
@ -2221,7 +2139,7 @@ const BSBilling7Payment = () => {
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
{ {
PaymentType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? refundPaySelected : PaymentType:
Paybtnnameselected?.toLowerCase() === 'upi' Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'pd' ? SelectedUPIPayOption?.toLowerCase() === 'pd'
? PaymentDeviceUPI?.[0]?.ModeId ? PaymentDeviceUPI?.[0]?.ModeId
@ -2235,14 +2153,14 @@ const BSBilling7Payment = () => {
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
: null, : null,
Amount: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? previousNetAmount - currentOrderNetAmount : Math.round(TotalAmount), Amount: Math.round(TotalAmount),
MerchantId: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : MerchantId:
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: (salesBillEdit && currentOrderNetAmount < previousNetAmount) && (refundPaySelectedName?.toLowerCase() === 'cash' || refundPaySelectedName?.toLowerCase() === 'credit') ? 'PC' : PaymentOptionType:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2256,7 +2174,7 @@ const BSBilling7Payment = () => {
? 'BU' ? 'BU'
: SelectedUPIPayOption : SelectedUPIPayOption
: null, : null,
ModeOfPayment: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : ModeOfPayment:
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
@ -2264,7 +2182,7 @@ const BSBilling7Payment = () => {
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantUPIId ?.MerchantUPIId
: null, : null,
AccountDtl: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? [] : AccountDtl:
Paybtnnameselected?.toLowerCase() === 'upi' && Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
@ -2281,7 +2199,7 @@ const BSBilling7Payment = () => {
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? 'S' : PaymentStatus:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2290,8 +2208,8 @@ const BSBilling7Payment = () => {
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: (salesBillEdit && currentOrderNetAmount < previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(previousNetAmount - currentOrderNetAmount) : 0, Debit: 0,
Credit: salesBillEdit ? (currentOrderNetAmount > previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(TotalAmount) : 0 : Credit:
Paybtnnameselected?.toLowerCase() === 'credit' Paybtnnameselected?.toLowerCase() === 'credit'
? Math.round(TotalAmount) ? Math.round(TotalAmount)
: 0, : 0,
@ -2498,12 +2416,7 @@ const BSBilling7Payment = () => {
putdata['PaymentType'] = !pay && ''; putdata['PaymentType'] = !pay && '';
putdata['PrintType'] = 'Y'; putdata['PrintType'] = 'Y';
} }
let response = null; let response = await dispatch(PutBookingData(putdata)).unwrap();
if (salesBillEdit) {
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
if (value !== 'Unpaid') { if (value !== 'Unpaid') {
if (response?.data?.statusCode == 1) { if (response?.data?.statusCode == 1) {
let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter( let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter(
@ -3213,7 +3126,7 @@ const BSBilling7Payment = () => {
}; };
// split payments // split payments
const SplitPaymentOpen = () => { const SplitPaymentOpen = () => {
if (OrderCardDetail?.length > 0 && TotalAmount > 0) { if (OrderCardDetail?.length > 0) {
const updatedData = { const updatedData = {
userData: OrderCardDetail, userData: OrderCardDetail,
ExtraCharges: GlobalExtraCharge, ExtraCharges: GlobalExtraCharge,
@ -3223,11 +3136,6 @@ const BSBilling7Payment = () => {
setFailedOrderData(updatedData); setFailedOrderData(updatedData);
setSplitpayment(true); setSplitpayment(true);
} else { } else {
if (TotalAmount <= 0) {
setMessageType('warning');
setMessageData('Cannot split when total amount is zero or less');
return;
}
setMessageType('warning'); setMessageType('warning');
setMessageData('Please Select the Product'); setMessageData('Please Select the Product');
} }
@ -3932,7 +3840,7 @@ const BSBilling7Payment = () => {
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && (currentOrderNetAmount >= previousNetAmount) ? ( {paybtns?.length > 0 ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
@ -4009,42 +3917,6 @@ const BSBilling7Payment = () => {
</button> </button>
</div> </div>
)) ))
) : (currentOrderNetAmount < previousNetAmount && salesBillEdit && refundPayBtns.length > 0) ? (
refundPayBtns.map((payment) => (
<div className="Table3-cash">
<button
className={
refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode'
: 'Btn-payment-mode-sel'
}
style={{
fontFamily: FontFamily['para'],
position: 'relative',
animation: blink
? 'blink-animation 0.5s infinite alternate'
: 'none',
}}
onClick={() => handleRefundPaymentMode(payment?.ConfigId, payment?.ConfigName)}
>
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
<div
style={{
display: 'flex',
flexDirection: 'row',
columnGap: '0.5rem',
}}
>
{payment.ConfigName}
</div>
</button>
</div>
))
) : ( ) : (
<div <div
onClick={handlepaymentoptions} onClick={handlepaymentoptions}
@ -4282,9 +4154,8 @@ const BSBilling7Payment = () => {
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? ? !OrderStatus
'Table4-Btn-final-price' ? 'Table4-Btn-final-price'
: 'Table4-Btn-final-price'
: 'Table4-Btn-final-price Order' : 'Table4-Btn-final-price Order'
: 'Table4-Btn-final-price-disabled' : 'Table4-Btn-final-price-disabled'
} }
@ -4297,7 +4168,7 @@ const BSBilling7Payment = () => {
handleButtonClick handleButtonClick
} }
> >
{!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <p className="Table4-Order">Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</p> : ( {!OrderStatus ? (
<> <>
<div className="Table4-fullrate"> <div className="Table4-fullrate">
<div <div
@ -4630,10 +4501,7 @@ const BSBilling7Payment = () => {
SplitPaymentModal={Splitpayment} SplitPaymentModal={Splitpayment}
handlesplitpaymentclose={handlesplitpaymentclose} handlesplitpaymentclose={handlesplitpaymentclose}
TotalNetAmount={ TotalNetAmount={
OrderType === 'Failed' ? FailedTotalAmt : Math.round(OrderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) - OrderType === 'Failed' ? FailedTotalAmt : Math.round(TotalAmount)
((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)))
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />

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

@ -63,9 +63,6 @@ import {
PostBlockSlots, PostBlockSlots,
changeCustomerID, changeCustomerID,
changeSelectedCustId, changeSelectedCustId,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import './StandardTable.scss'; import './StandardTable.scss';
import { IoClose } from 'react-icons/io5'; import { IoClose } from 'react-icons/io5';
@ -416,9 +413,6 @@ const StandardTable = () => {
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null)); await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({})); await dispatch(changeReorderHoldDetails({}));
await dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else if (OrderType === 'Reorder') { } else if (OrderType === 'Reorder') {
const UpdatedData = OrderCardDetail?.filter( const UpdatedData = OrderCardDetail?.filter(
(cartItem) => cartItem?.SalesId (cartItem) => cartItem?.SalesId
@ -444,9 +438,6 @@ const StandardTable = () => {
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
await dispatch(changeUnpaidData(false)); await dispatch(changeUnpaidData(false));
await dispatch(changeReorderHoldDetails({})); await dispatch(changeReorderHoldDetails({}));
await dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
await dispatch(changeReorderProductDetails([])); await dispatch(changeReorderProductDetails([]));
await dispatch(ChangeSelectedCustDisable(false)); await dispatch(ChangeSelectedCustDisable(false));
@ -2519,7 +2510,8 @@ const StandardTable = () => {
{OldtableDataTakeAway?.map((item, index) => ( {OldtableDataTakeAway?.map((item, index) => (
<tr <tr
key={index} key={index}
className={`${item?.SalesId && OrderType !== 'Hold' className={`${
item?.SalesId && OrderType !== 'Hold'
? 'booking-billing-table-row-disabled' ? 'booking-billing-table-row-disabled'
: 'booking-billing-table-row' : 'booking-billing-table-row'
}`} }`}
@ -2792,7 +2784,7 @@ const StandardTable = () => {
} }
}} }}
> >
{safeRound(item?.TotalAmt - (item?.Offer || 0) || 0)} {safeRound(item?.TotalAmt)}
</td> </td>
)} )}
{tableitem.OptionName == 'Delete' && ( {tableitem.OptionName == 'Delete' && (
@ -2836,7 +2828,8 @@ const StandardTable = () => {
{OldtableDataDinein?.map((item, index) => ( {OldtableDataDinein?.map((item, index) => (
<tr <tr
key={OldtableDataTakeAway?.length + index} key={OldtableDataTakeAway?.length + index}
className={`${item?.SalesId className={`${
item?.SalesId
? 'booking-billing-table-row-disabled' ? 'booking-billing-table-row-disabled'
: 'booking-billing-table-row' : 'booking-billing-table-row'
} }
@ -3106,7 +3099,7 @@ const StandardTable = () => {
} }
}} }}
> >
{safeRound(item?.TotalAmt - (item?.Offer || 0) || 0)} {safeRound(item?.TotalAmt)}
</td> </td>
)} )}
@ -3155,7 +3148,8 @@ const StandardTable = () => {
OldtableDataTakeAway?.length + OldtableDataTakeAway?.length +
index index
} }
className={`${BookingType === 'Dine In' && item?.SalesId className={`${
BookingType === 'Dine In' && item?.SalesId
? 'booking-billing-table-row-disabled' ? 'booking-billing-table-row-disabled'
: 'booking-billing-table-row' : 'booking-billing-table-row'
} }
@ -3468,7 +3462,7 @@ const StandardTable = () => {
} }
}} }}
> >
{safeRound(item?.TotalAmt - (item?.Offer || 0) || 0)} {safeRound(item?.TotalAmt)}
</td> </td>
)} )}
@ -3517,7 +3511,8 @@ const StandardTable = () => {
tableDataTakeAway?.length + tableDataTakeAway?.length +
index index
} }
className={`${BookingType === 'Dine In' && item?.SalesId className={`${
BookingType === 'Dine In' && item?.SalesId
? 'booking-billing-table-row-disabled' ? 'booking-billing-table-row-disabled'
: 'booking-billing-table-row' : 'booking-billing-table-row'
} }
@ -3811,7 +3806,7 @@ const StandardTable = () => {
} }
}} }}
> >
{safeRound(item?.TotalAmt - (item?.Offer || 0) || 0)} {safeRound(item?.TotalAmt)}
</td> </td>
)} )}

32
src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTable.scss
View File

@ -1116,7 +1116,6 @@
@media (max-width: 500px) { @media (max-width: 500px) {
padding: 5px 10px; padding: 5px 10px;
} }
.ShoppingCartMain-left { .ShoppingCartMain-left {
display: flex; display: flex;
align-items: center; align-items: center;
@ -1154,9 +1153,11 @@
z-index: 10; z-index: 10;
@media (max-width: 768px) { @media (max-width: 768px) {
background-color: linear-gradient(to bottom right, background-color: linear-gradient(
to bottom right,
#1e2536, #1e2536,
#2a3447) !important; #2a3447
) !important;
background: linear-gradient(to bottom right, #1e2536, #2a3447) !important; background: linear-gradient(to bottom right, #1e2536, #2a3447) !important;
display: flex !important; display: flex !important;
} }
@ -1268,27 +1269,6 @@
} }
} }
.standard-pay-btn-refund {
padding: 0.9rem 0.75rem;
font-size: 1.125rem;
font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important;
border: none;
border-radius: 4px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
// justify-content: space-around;
gap: 0.5rem;
opacity: 1;
background-color: #0d9488;
color: #fff;
@media (max-width: 500px) {
padding: 0.75rem;
}
}
.standard-pay-btn { .standard-pay-btn {
padding: 0.9rem 0.75rem; padding: 0.9rem 0.75rem;
font-size: 1.125rem; font-size: 1.125rem;
@ -1577,7 +1557,9 @@
display: flex !important; display: flex !important;
} }
.booking-billing-table-container .shoppingCartLeft .payment-buttons-container { .booking-billing-table-container
.shoppingCartLeft
.payment-buttons-container {
display: flex !important; display: flex !important;
padding: 0 10px; padding: 0 10px;
align-items: flex-start; align-items: flex-start;

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

@ -12,7 +12,6 @@ import Credit from '../../UtillComponents/Pozo retail icons/credit.svg';
import { FaCreditCard } from 'react-icons/fa6'; import { FaCreditCard } from 'react-icons/fa6';
import { import {
changeAddBookingDetailsTrigger, changeAddBookingDetailsTrigger,
changeBillEditingMode,
changeBookingType, changeBookingType,
ChangeComboCarddata, ChangeComboCarddata,
changeCurrentOrderId, changeCurrentOrderId,
@ -26,8 +25,6 @@ import {
ChangeOverAllDiscSales, ChangeOverAllDiscSales,
changePaymentloader, changePaymentloader,
changePaymentTransactionNumber, changePaymentTransactionNumber,
changePreviousOrderOfferDetail,
changePreviousOrderPayment,
changeReorderHoldDetails, changeReorderHoldDetails,
changeReorderProductDetails, changeReorderProductDetails,
changeSelectChair, changeSelectChair,
@ -53,7 +50,6 @@ import {
getCurrentOrderid, getCurrentOrderid,
getLayoutproductCard, getLayoutproductCard,
GetPaymentdeviceResponse, GetPaymentdeviceResponse,
getPaymentOptions,
getSalesDetailData, getSalesDetailData,
getSelectedFavItems, getSelectedFavItems,
getUnpaidData, getUnpaidData,
@ -76,15 +72,11 @@ import {
GlobalOverAllDiscEstimate, GlobalOverAllDiscEstimate,
GlobalOverAllDiscSales, GlobalOverAllDiscSales,
GlobalPayementloader, GlobalPayementloader,
GlobalpaymentOptionData,
GlobalPaymentTrigger, GlobalPaymentTrigger,
GlobalPreviousOrderOfferDetails,
GlobalPreviousOrderPayment,
GlobalProductCategorie, GlobalProductCategorie,
GlobalProductSubCategorie, GlobalProductSubCategorie,
GlobalReorderHoldDetails, GlobalReorderHoldDetails,
GlobalRetailWSSalesType, GlobalRetailWSSalesType,
GlobalSalesBillEdit,
GlobalSelCustId, GlobalSelCustId,
GlobalSelectedTableDetails, GlobalSelectedTableDetails,
GlobalSelOption, GlobalSelOption,
@ -101,7 +93,6 @@ import {
PutBookingData, PutBookingData,
PutBookingPaymentStatusChange, PutBookingPaymentStatusChange,
PutPendingPaymentList, PutPendingPaymentList,
putSalesBillEdit,
putSplitpaymentStatus, putSplitpaymentStatus,
SendPaymentLink, SendPaymentLink,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
@ -276,10 +267,6 @@ const StandardTablePayment = () => {
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst); const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const GlobEstBooking = useSelector(GlobalEstimateBooking); const GlobEstBooking = useSelector(GlobalEstimateBooking);
const OtherServicesglobal = useSelector(GlobalOtherSevices); const OtherServicesglobal = useSelector(GlobalOtherSevices);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const OrderType = useSelector(GlobalOrderType); const OrderType = useSelector(GlobalOrderType);
const unpaidFlow = useSelector(Globalunpaidflow); const unpaidFlow = useSelector(Globalunpaidflow);
const selOption = useSelector(GlobalSelOption); const selOption = useSelector(GlobalSelOption);
@ -367,11 +354,6 @@ const StandardTablePayment = () => {
const [PaymentDeviceUPI, setPaymentDeviceUPI] = useState([]); const [PaymentDeviceUPI, setPaymentDeviceUPI] = useState([]);
const [ConfigDataList, setConfigDataList] = useState([]); const [ConfigDataList, setConfigDataList] = useState([]);
const [TotalAmount, setTotalAmount] = useState(0); const [TotalAmount, setTotalAmount] = useState(0);
const [refundPayBtns, setRefundPayBtns] = useState([]);
const [refundPaySelected, setRefundPaySelected] = useState();
const [refundPaySelectedName, setRefundPaySelectedName] = useState(null);
const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0);
const [previousNetAmount, setPreviousNetAmount] = useState(0);
const [FirstPaymentclick, setFirstPaymentclick] = useState(false); const [FirstPaymentclick, setFirstPaymentclick] = useState(false);
const [UpinotSelected, setUpinotSelected] = useState(false); const [UpinotSelected, setUpinotSelected] = useState(false);
const [brachName, setbrachName] = useState(''); const [brachName, setbrachName] = useState('');
@ -504,12 +486,6 @@ const StandardTablePayment = () => {
); );
}, [GlobalExtraCharge]); }, [GlobalExtraCharge]);
useEffect(() => {
if (salesBillEdit) {
dispatch(getPaymentOptions()).unwrap();
}
}, [salesBillEdit]);
const customerNameOrMobile = MobileNoWhatsApp?.CustName?.trim() const customerNameOrMobile = MobileNoWhatsApp?.CustName?.trim()
? `Dear ${MobileNoWhatsApp?.CustName}` ? `Dear ${MobileNoWhatsApp?.CustName}`
: `Dear ${MobileNoWhatsApp?.value}`; : `Dear ${MobileNoWhatsApp?.value}`;
@ -730,6 +706,7 @@ const StandardTablePayment = () => {
CheckBookingStatus, CheckBookingStatus,
addnewAccess, addnewAccess,
preferenceshortcutkey, preferenceshortcutkey,
unpaidFlow, unpaidFlow,
]); ]);
@ -832,13 +809,7 @@ const StandardTablePayment = () => {
}, [paybtnselected, selOption, payBtns]); }, [paybtnselected, selOption, payBtns]);
useEffect(() => { useEffect(() => {
if (orderCardDetail?.length == 0) { orderCardDetail?.length == 0 ? dispatch(changeunpaidflow(false)) : '';
dispatch(changeunpaidflow(false));
// dispatch(changePreviousOrderPayment([]));
// dispatch(changePreviousOrderOfferDetail([]));
// dispatch(changeBillEditingMode(false));
}
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),
@ -895,45 +866,29 @@ const StandardTablePayment = () => {
); );
} }
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const previousNetAmount =
(totalPreviouspayment) || 0;
let withdiscTotal = let withdiscTotal =
Total - Total -
((OverAllSales || 0) + ((OverAllSales || 0) +
(OverAllEstimate || 0) + (OverAllEstimate || 0) +
(Discount > 0 ? Discount : 0)); (Discount > 0 ? Discount : 0));
const currentOrderNetAmount = formatAmount( setTotalAmount(
formatAmount(
withdiscTotal >= 0 withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2) ? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2) : (Number(Total) + Number(globalTipAmount)).toFixed(2)
) )
console.log(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount, "totalPreviouspayment") );
setTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount); dispatch(
setCurrentOrderNetAmount(currentOrderNetAmount); changeSummeryTotalAmount(
setPreviousNetAmount(previousNetAmount); formatAmount(
dispatch(changeSummeryTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount)); withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2)
)
)
);
// dispatch( // dispatch(
// changeSummeryTotalAmount(withdiscTotal > 0 ? withdiscTotal : Number(Total)) // changeSummeryTotalAmount(withdiscTotal > 0 ? withdiscTotal : Number(Total))
// ); // );
@ -1061,25 +1016,6 @@ const StandardTablePayment = () => {
} }
}, [PaymentUpiOptions, PaymentOptions, SelCustId]); }, [PaymentUpiOptions, PaymentOptions, SelCustId]);
useEffect(() => {
if (salesBillEdit) {
if (SelCustId) {
setRefundPayBtns(AllPaymentOptions);
setRefundPaySelected(AllPaymentOptions?.[0]?.ConfigId);
setRefundPaySelectedName(AllPaymentOptions?.[0]?.ConfigName);
} else {
const withoutCustomer = AllPaymentOptions?.filter?.(
(item) => item?.ConfigName?.toLowerCase() !== 'credit'
);
setRefundPaySelected(withoutCustomer?.[0]?.ConfigId);
setRefundPaySelectedName(withoutCustomer?.[0]?.ConfigName);
setRefundPayBtns(withoutCustomer);
}
}
}, [AllPaymentOptions, SelCustId, salesBillEdit])
useEffect(() => { useEffect(() => {
if ( if (
(BookingType === 'Dine In' || (BookingType === 'Dine In' ||
@ -1176,10 +1112,6 @@ const StandardTablePayment = () => {
const handleButtonClick = () => { const handleButtonClick = () => {
if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) { if (qrCode && SelectedUPIPayOption === 'Default' && UpiQRPreference) {
UpiPayment(); UpiPayment();
} else if (salesBillEdit && currentOrderNetAmount < previousNetAmount && !refundPaySelected) {
setMessageType('warning');
setMessageData('Please Select Refund Payment Method');
return;
} else { } else {
OrderStatus OrderStatus
? AddBookingDetails('Dine-In', false) ? AddBookingDetails('Dine-In', false)
@ -1558,7 +1490,7 @@ const StandardTablePayment = () => {
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
{ {
PaymentType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? refundPaySelected : PaymentType:
Paybtnnameselected?.toLowerCase() === 'upi' Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'pd' ? SelectedUPIPayOption?.toLowerCase() === 'pd'
? PaymentDeviceUPI?.[0]?.ModeId ? PaymentDeviceUPI?.[0]?.ModeId
@ -1572,14 +1504,14 @@ const StandardTablePayment = () => {
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
: null, : null,
Amount: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? previousNetAmount - currentOrderNetAmount : Math.round(TotalAmount), Amount: Math.round(TotalAmount),
MerchantId: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : MerchantId:
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: (salesBillEdit && currentOrderNetAmount < previousNetAmount) && (refundPaySelectedName?.toLowerCase() === 'cash' || refundPaySelectedName?.toLowerCase() === 'credit') ? 'PC' : PaymentOptionType:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -1593,7 +1525,7 @@ const StandardTablePayment = () => {
? 'BU' ? 'BU'
: SelectedUPIPayOption : SelectedUPIPayOption
: null, : null,
ModeOfPayment: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : ModeOfPayment:
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
@ -1601,7 +1533,7 @@ const StandardTablePayment = () => {
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId) ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantUPIId ?.MerchantUPIId
: null, : null,
AccountDtl: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? [] : AccountDtl:
Paybtnnameselected?.toLowerCase() === 'upi' && Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
@ -1618,7 +1550,7 @@ const StandardTablePayment = () => {
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? 'S' : PaymentStatus:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -1627,8 +1559,8 @@ const StandardTablePayment = () => {
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: (salesBillEdit && currentOrderNetAmount < previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(previousNetAmount - currentOrderNetAmount) : 0, Debit: 0,
Credit: salesBillEdit ? (currentOrderNetAmount > previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(TotalAmount) : 0 : Credit:
Paybtnnameselected?.toLowerCase() === 'credit' Paybtnnameselected?.toLowerCase() === 'credit'
? Math.round(TotalAmount) ? Math.round(TotalAmount)
: 0, : 0,
@ -1861,12 +1793,7 @@ const StandardTablePayment = () => {
putdata['PaymentType'] = !pay && ''; putdata['PaymentType'] = !pay && '';
putdata['PrintType'] = 'Y'; putdata['PrintType'] = 'Y';
} }
let response = null; let response = await dispatch(PutBookingData(putdata)).unwrap();
if (salesBillEdit) {
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
if (value !== 'Unpaid') { if (value !== 'Unpaid') {
if (response?.data?.statusCode == 1) { if (response?.data?.statusCode == 1) {
let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter( let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter(
@ -1918,7 +1845,6 @@ const StandardTablePayment = () => {
if (response?.data?.OrderDetails?.length > 0) { if (response?.data?.OrderDetails?.length > 0) {
setPrintOrderDetails([response?.data]); setPrintOrderDetails([response?.data]);
} }
ClearAllGlobalStateDatas(); ClearAllGlobalStateDatas();
console.log('more pg data'); console.log('more pg data');
} }
@ -1932,7 +1858,6 @@ const StandardTablePayment = () => {
await dispatch(changeOrderCardDetails([])); await dispatch(changeOrderCardDetails([]));
await dispatch(changeReorderHoldDetails({})); await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([])); await dispatch(changeReorderProductDetails([]));
setFirstPaymentclick(false); setFirstPaymentclick(false);
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
await dispatch(changeBookingType('TakeAway')); await dispatch(changeBookingType('TakeAway'));
@ -2034,10 +1959,6 @@ const StandardTablePayment = () => {
} }
}; };
const handleSalesBillEdit = async (putdatas, value, pay) => {
console.log(putdatas, value, pay, "handleSalesBillEdit")
}
const OtherServicePostBooking = async (PostData, value) => { const OtherServicePostBooking = async (PostData, value) => {
console.log(PostData, value, 'PostData, value'); console.log(PostData, value, 'PostData, value');
@ -2782,11 +2703,6 @@ const StandardTablePayment = () => {
} }
}; };
const handleRefundPaymentMode = (id, name) => {
setRefundPaySelected(id);
setRefundPaySelectedName(name);
}
const addUpiOption = async (id, name, UPIId) => { const addUpiOption = async (id, name, UPIId) => {
await dispatch(changeUpiIDprint(UPIId)); await dispatch(changeUpiIDprint(UPIId));
await dispatch(changeUpiIDName(name)); await dispatch(changeUpiIDName(name));
@ -2817,9 +2733,6 @@ const StandardTablePayment = () => {
ParkingClaimed: false, ParkingClaimed: false,
}) })
); );
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeTipAmount(0)); dispatch(changeTipAmount(0));
dispatch(changeFullOfferAppliedProducts([])); dispatch(changeFullOfferAppliedProducts([]));
dispatch(ChangeFullFreeProductList([])); dispatch(ChangeFullFreeProductList([]));
@ -2839,8 +2752,6 @@ const StandardTablePayment = () => {
setQrCode(false); setQrCode(false);
setUpinotSelected(false); setUpinotSelected(false);
getHolddata(); getHolddata();
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
if (defaultBookingType === 'Both') { if (defaultBookingType === 'Both') {
await dispatch(changeBookingType('TakeAway')); await dispatch(changeBookingType('TakeAway'));
} }
@ -2982,7 +2893,7 @@ const StandardTablePayment = () => {
async (orderDetail, index) => { async (orderDetail, index) => {
await printDiv(`${selectedStyle}-${index}`, style); // Use unique IDs for each print await printDiv(`${selectedStyle}-${index}`, style); // Use unique IDs for each print
if (orderDetail?.BookingTypeName !== 'Dine In') { if (orderDetail?.BookingTypeName !== 'Dine In') {
const groupedTokens = orderDetail?.productDetails?.filter(data => data?.EditTokenAvailable !== 'N')?.reduce( const groupedTokens = orderDetail?.productDetails?.reduce(
(acc, item, idx) => { (acc, item, idx) => {
if (item.TokenAvailable === 'Y') { if (item.TokenAvailable === 'Y') {
if (!item.CounterName) { if (!item.CounterName) {
@ -3027,7 +2938,7 @@ const StandardTablePayment = () => {
await Promise.all( await Promise.all(
PrintOrderDetails?.[0]?.OrderDetails?.map( PrintOrderDetails?.[0]?.OrderDetails?.map(
async (orderDetail, index) => { async (orderDetail, index) => {
const groupedTokens = orderDetail?.productDetails?.filter(data => data?.EditTokenAvailable !== 'N')?.reduce( const groupedTokens = orderDetail?.productDetails?.reduce(
(acc, item, idx) => { (acc, item, idx) => {
if (item.TokenAvailable === 'Y') { if (item.TokenAvailable === 'Y') {
if (!item.CounterName) { if (!item.CounterName) {
@ -3063,7 +2974,7 @@ const StandardTablePayment = () => {
); );
} else { } else {
await Promise.all( await Promise.all(
PrintOrderDetails?.[0]?.OrderDetails?.filter(data => data?.EditTokenAvailable !== 'N')?.map( PrintOrderDetails?.[0]?.OrderDetails?.map(
async (orderDetail, index) => { async (orderDetail, index) => {
await TokenPrint(`${index}-${orderDetail?.OrderId}`); await TokenPrint(`${index}-${orderDetail?.OrderId}`);
} }
@ -3277,7 +3188,7 @@ const StandardTablePayment = () => {
}; };
const SplitPaymentOpen = () => { const SplitPaymentOpen = () => {
if (orderCardDetail?.length > 0 && TotalAmount > 0) { if (orderCardDetail?.length > 0) {
// const updatedData = { // const updatedData = {
// userData: OrderCardDetail, // userData: OrderCardDetail,
// ExtraCharges: GlobalExtraCharge, // ExtraCharges: GlobalExtraCharge,
@ -3287,11 +3198,6 @@ const StandardTablePayment = () => {
// setFailedOrderData(updatedData); // setFailedOrderData(updatedData);
setSplitpayment(true); setSplitpayment(true);
} else { } else {
if (TotalAmount <= 0) {
setMessageType('warning');
setMessageData('Cannot split when total amount is zero or less');
return;
}
setMessageType('warning'); setMessageType('warning');
setMessageData('Please Select the Product'); setMessageData('Please Select the Product');
} }
@ -3704,7 +3610,7 @@ const StandardTablePayment = () => {
opacity: isDisabled ? 0.5 : 1, opacity: isDisabled ? 0.5 : 1,
}} }}
> >
{payBtns?.length > 0 && (currentOrderNetAmount >= previousNetAmount) ? ( {payBtns?.length > 0 ? (
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;
@ -3794,55 +3700,6 @@ const StandardTablePayment = () => {
</div> </div>
); );
}) })
) : (currentOrderNetAmount < previousNetAmount && salesBillEdit && refundPayBtns.length > 0) ? (
refundPayBtns.map((payment) => {
const mode = payment?.ConfigName?.toLowerCase();
const isSelected = refundPaySelected === payment?.ConfigId;
const buttonClass = isSelected
? 'paybutton-selected'
: 'paybutton';
return (
<div className="standard-pay-btns" key={payment?.ConfigId}>
<button
className={buttonClass}
style={{
// fontFamily: FontFamily['para'],
backgroundColor:
mode === 'upi'
? '#2563eb'
: mode === 'card'
? '#9333ea'
: mode === 'credit'
? '#9333ea'
: '#16a34a',
animation: blink
? 'blink-animation 0.5s infinite alternate'
: 'none',
}}
onClick={() => handleRefundPaymentMode(payment?.ConfigId, payment?.ConfigName)}
>
<div
style={{
display: 'flex',
alignItems: 'center',
gap: '0.5rem',
}}
>
{mode === 'cash' && <FaMoneyBillWave />}
{mode === 'upi' && <FaMobileScreenButton />}
{mode === 'credit' && (
<>
<img src={Credit} alt="" width={20} />
</>
)}
{payment?.ConfigName}
</div>
</button>
</div>
);
})
) : ( ) : (
<div <div
onClick={handlePaymentOptions} onClick={handlePaymentOptions}
@ -3864,15 +3721,14 @@ const StandardTablePayment = () => {
orderCardDetail?.length > 0 && orderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus !== 'Close' CheckBookingStatus !== 'Close'
? !OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? ? !OrderStatus
'standard-pay-btn-refund' ? 'standard-pay-btn'
: 'standard-pay-btn'
: 'standard-pay-btn order-complete' : 'standard-pay-btn order-complete'
: 'standard-pay-btn-disabled' : 'standard-pay-btn-disabled'
} }
onClick={handleButtonClick} onClick={handleButtonClick}
> >
{!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <p>Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</p> : ( {!OrderStatus ? (
<> <>
<p <p
className="standard-pay-amount" className="standard-pay-amount"

368
src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx
View File

@ -124,16 +124,6 @@ import {
changeCurrentOrderId, changeCurrentOrderId,
getCreditCustomer, getCreditCustomer,
ChangeSelectedCustDisable, ChangeSelectedCustDisable,
GlobalSalesBillEdit,
GlobalPreviousOrderPayment,
GlobalPreviousOrderOfferDetails,
GlobalpaymentOptionData,
getPaymentOptions,
putSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
GlobalPaymentTrigger,
} from '../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../Features/BookingScreen/BookingData/BookingData';
import { PrintStyleFunction } from '../../../paymentpdfPage/PrintStyleFunction.js'; import { PrintStyleFunction } from '../../../paymentpdfPage/PrintStyleFunction.js';
import { import {
@ -158,9 +148,7 @@ import {
} from '../../../../Features/ExteraCharges/ExtraCharges'; } from '../../../../Features/ExteraCharges/ExtraCharges';
import { import {
getAddCustomerDetails, getAddCustomerDetails,
getDefaultPaymentOptions,
GlobalAddCustomerDetails, GlobalAddCustomerDetails,
ReprintDetails,
triggerCustomerRefresh, triggerCustomerRefresh,
} from '../../../../Features/BookingScreen/Customer/addCustomer'; } from '../../../../Features/BookingScreen/Customer/addCustomer';
import BSCustomerSelect from '../UtillComponents/BSSelectCustomer.jsx'; import BSCustomerSelect from '../UtillComponents/BSSelectCustomer.jsx';
@ -245,8 +233,6 @@ import { useDateStore } from '../../../../Features/BookingScreen/BookingData/Dat
import { getPaymentOptionsData } from '../../../../Features/BookingScreen/BookingData/KioskBookingData.js'; import { getPaymentOptionsData } from '../../../../Features/BookingScreen/BookingData/KioskBookingData.js';
import { GlobalFreeProdList, GlobalOfferAppliedProducts, GlobalOverAllOfferAmt } from '../../../../Features/Offer/Offernew/BookingOffernew.js'; import { GlobalFreeProdList, GlobalOfferAppliedProducts, GlobalOverAllOfferAmt } from '../../../../Features/Offer/Offernew/BookingOffernew.js';
import BSNavBarTable from '../UtillComponents/BSNavBarTable.jsx'; import BSNavBarTable from '../UtillComponents/BSNavBarTable.jsx';
import pozologoimg from '../../../../Images/pozologoimg.png';
import PaymentGatewayEmbedded from '../UtillComponents/PaymentGatewayEmbedded.jsx';
const subDirectory = import.meta.env.ENV_BASE_URL; const subDirectory = import.meta.env.ENV_BASE_URL;
const MainHomeUrl = import.meta.env.ENV_MAIN_BASE_URL; const MainHomeUrl = import.meta.env.ENV_MAIN_BASE_URL;
@ -264,10 +250,6 @@ const BSC1Payment = (props) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const navigate = useNavigate(); const navigate = useNavigate();
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const AllPaymentOptions = useSelector(GlobalpaymentOptionData);
const SessionData = useSelector(StoredSessionData); const SessionData = useSelector(StoredSessionData);
const BranchFinancialStatus = useSelector(GlobalBranchFinancialStatus); const BranchFinancialStatus = useSelector(GlobalBranchFinancialStatus);
const globalTipAmount = useSelector(GlobaltipAmount); const globalTipAmount = useSelector(GlobaltipAmount);
@ -339,11 +321,6 @@ const BSC1Payment = (props) => {
const [UpiOption, setUpiOption] = useState(''); const [UpiOption, setUpiOption] = useState('');
const [UpiId, setUpiId] = useState(); const [UpiId, setUpiId] = useState();
const [hold, setHold] = useState(false); const [hold, setHold] = useState(false);
const [refundPayBtns, setRefundPayBtns] = useState([]);
const [refundPaySelected, setRefundPaySelected] = useState();
const [refundPaySelectedName, setRefundPaySelectedName] = useState(null);
const [currentOrderNetAmount, setCurrentOrderNetAmount] = useState(0);
const [previousNetAmount, setPreviousNetAmount] = useState(0);
const appPreferences = useSelector(ApplicationPreferences); const appPreferences = useSelector(ApplicationPreferences);
const commonModulePreference = appPreferences?.find( const commonModulePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Common Module' (preference) => preference?.PreferredCatName === 'Common Module'
@ -452,14 +429,6 @@ const BSC1Payment = (props) => {
const [PaymentgatewayUPI, setPaymentgatewayUPI] = useState([]); const [PaymentgatewayUPI, setPaymentgatewayUPI] = useState([]);
const [PaymentDeviceUPI, setPaymentDeviceUPI] = useState([]); const [PaymentDeviceUPI, setPaymentDeviceUPI] = useState([]);
const [UpiPayOption, setUpiPayOption] = useState([]); const [UpiPayOption, setUpiPayOption] = useState([]);
const [BusinessPayOption, setBusinessPayoption] = useState([]);
const [paymentSucess, setPaymentSuccess] = useState(false);
const [businessUPI, setBusinessUPI] = useState(false);
const [businessUPIOrderId, setBusinessUPIOrderId] = useState(null);
const [businessUPILink, setBusinessUPILink] = useState(null);
const defaultPaymentTrigger = useSelector(GlobalPaymentTrigger);
const [defaultPaymentMode, setDefaultPaymentMode] = useState([]);
const [defaultEnabled, setDefaultEnabled] = useState(false);
const [CardPayOption, setCardPayOption] = useState([]); const [CardPayOption, setCardPayOption] = useState([]);
const [PaymentUpiOptions, setPaymentUpiOptions] = useState([]); const [PaymentUpiOptions, setPaymentUpiOptions] = useState([]);
const GlobaluseOptions = useSelector(GlobalCommonPaymentOptions); const GlobaluseOptions = useSelector(GlobalCommonPaymentOptions);
@ -492,7 +461,6 @@ const BSC1Payment = (props) => {
const printDatas = useSelector(GlobalprintDatas); const printDatas = useSelector(GlobalprintDatas);
const PrinterDetails = useSelector(GlobalPrinterMappingDtls); const PrinterDetails = useSelector(GlobalPrinterMappingDtls);
const [addnewAccess, setaddnewAccess] = useState(true); const [addnewAccess, setaddnewAccess] = useState(true);
const [showCancelConfirm, setShowCancelConfirm] = useState(false);
const BookingStatus = useSelector(GlobalBookingStatus); const BookingStatus = useSelector(GlobalBookingStatus);
const PaymentOptionsModeName = const PaymentOptionsModeName =
@ -561,79 +529,6 @@ const BSC1Payment = (props) => {
'11111111111111' '11111111111111'
); );
// Usage // Usage
useEffect(() => {
const setDefaultPaymentOption = async () => {
const res = await dispatch(
getDefaultPaymentOptions({ AppId, CompId, BranchId })
)?.unwrap();
const defaultDetail = res?.data?.data?.[0]?.DefaultDetails?.[0];
if (res?.data?.data?.length > 0 && defaultDetail) {
setDefaultEnabled(true);
setDefaultPaymentMode(defaultDetail);
const { option, card } = defaultDetail;
if (option?.value) setSelectedUPIPayOption(option.value);
if (card) {
const isDefault =
String(option?.value ?? '').toLowerCase() === 'default';
const idToUse = isDefault ? card?.UPIId : card?.ModeId;
if (idToUse) {
addUpiOption(card?.Mode, card?.ModeName, idToUse);
}
}
} else {
setDefaultEnabled(false);
setDefaultPaymentMode([]);
}
};
setDefaultPaymentOption();
}, [defaultPaymentTrigger]);
useEffect(() => {
const getPrintData = async () => {
try {
const data = {
AppId,
CompId,
BranchId,
OrderId: businessUPIOrderId,
};
const res = await dispatch(ReprintDetails(data)).unwrap();
if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) {
const orderData = [{ OrderDetails: res.data.data }];
// Reset states first
setBusinessUPIOrderId(null);
setBusinessUPI(false);
setPaymentSuccess(false);
// Then set new data and trigger side effects
setPrintOrderDetails(orderData);
CustomerDisplay();
ClearAllGlobalStateDatas();
filteredSettingNames?.includes('whatsapp') &&
MobileNoWhatsApp?.value &&
handleURL(orderData);
}
} catch (error) {
console.error('Failed to fetch print data:', error);
// Reset states even on error
setBusinessUPI(false);
setPaymentSuccess(false);
}
};
if (paymentSucess && businessUPIOrderId) {
const timer = setTimeout(() => {
getPrintData();
}, 3000);
return () => clearTimeout(timer);
}
}, [paymentSucess, businessUPIOrderId, AppId, CompId, BranchId, dispatch]);
useEffect(() => { useEffect(() => {
const fetchCreditCustomer = async () => { const fetchCreditCustomer = async () => {
const selectedMode = paybtns?.find( const selectedMode = paybtns?.find(
@ -672,32 +567,6 @@ const BSC1Payment = (props) => {
fetchCreditCustomer(); fetchCreditCustomer();
}, [paybtnselected, selOption, paybtns]); }, [paybtnselected, selOption, paybtns]);
useEffect(() => {
if (salesBillEdit) {
dispatch(getPaymentOptions()).unwrap();
}
}, [salesBillEdit]);
useEffect(() => {
if (salesBillEdit) {
if (SelCustId) {
setRefundPayBtns(AllPaymentOptions);
setRefundPaySelected(AllPaymentOptions?.[0]?.ConfigId);
setRefundPaySelectedName(AllPaymentOptions?.[0]?.ConfigName);
} else {
const withoutCustomer = AllPaymentOptions?.filter?.(
(item) => item?.ConfigName?.toLowerCase() !== 'credit'
);
setRefundPaySelected(withoutCustomer?.[0]?.ConfigId);
setRefundPaySelectedName(withoutCustomer?.[0]?.ConfigName);
setRefundPayBtns(withoutCustomer);
}
}
}, [AllPaymentOptions, SelCustId, salesBillEdit])
useEffect(() => { useEffect(() => {
if (!preOrder) { if (!preOrder) {
const totalSum = OrderCardDetail?.reduce( const totalSum = OrderCardDetail?.reduce(
@ -755,41 +624,22 @@ const BSC1Payment = (props) => {
); );
} }
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const previousNetAmount =
(totalPreviouspayment) || 0;
let withdiscTotal = let withdiscTotal =
Total - ((OverAllSales || 0) + (OverAllEstimate || 0) + Total - ((OverAllSales || 0) + (OverAllEstimate || 0) +
(Discount > 0 ? Discount : 0)); (Discount > 0 ? Discount : 0));
const currentOrderNetAmount = formatAmount(
setTotalAmount(
withdiscTotal >= 0 withdiscTotal >= 0
? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2) ? (Number(withdiscTotal) + Number(globalTipAmount)).toFixed(2)
: (Number(Total) + Number(globalTipAmount)).toFixed(2) : (Number(Total) + Number(globalTipAmount)).toFixed(2)
) );
setTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount); dispatch(
setCurrentOrderNetAmount(currentOrderNetAmount); changeSummeryTotalAmount(
setPreviousNetAmount(previousNetAmount); withdiscTotal > 0 ? withdiscTotal : Number(Total)
dispatch(changeSummeryTotalAmount(salesBillEdit ? (currentOrderNetAmount > previousNetAmount) ? (currentOrderNetAmount - previousNetAmount) : 0 : currentOrderNetAmount)); )
);
dispatch(changeSummeryComboOfferAmount(withComboSum)); dispatch(changeSummeryComboOfferAmount(withComboSum));
@ -1230,10 +1080,6 @@ const BSC1Payment = (props) => {
const handleButtonClick = () => { const handleButtonClick = () => {
if (qrCode && SelectedUPIPayOption === 'Default') { if (qrCode && SelectedUPIPayOption === 'Default') {
UpiPayment(); UpiPayment();
} else if (salesBillEdit && currentOrderNetAmount < previousNetAmount && !refundPaySelected) {
setMessageType('warning');
setMessageData('Please Select Refund Payment Method');
return;
} else { } else {
OrderStatus OrderStatus
? AddBookingDetails('Dine-In', false) ? AddBookingDetails('Dine-In', false)
@ -1309,9 +1155,6 @@ const BSC1Payment = (props) => {
const filterpaymentdevice = FiltersalesPayment?.[0]?.OptionDetails?.filter( const filterpaymentdevice = FiltersalesPayment?.[0]?.OptionDetails?.filter(
(item) => item?.OptionName?.toLowerCase() === 'payment device' (item) => item?.OptionName?.toLowerCase() === 'payment device'
); );
const filterBusinessUpi = FiltersalesPayment?.[0]?.OptionDetails?.filter(
(item) => item?.OptionName?.toLowerCase() === 'business upi'
);
const cardinpaymentgateway = const cardinpaymentgateway =
filterpaymentgateway?.[0]?.ModeDetails?.filter((item) => filterpaymentgateway?.[0]?.ModeDetails?.filter((item) =>
item?.ModeName?.toLowerCase()?.includes('card') item?.ModeName?.toLowerCase()?.includes('card')
@ -1354,6 +1197,7 @@ const BSC1Payment = (props) => {
} }
setCardPayOption(cardoptions); setCardPayOption(cardoptions);
const options = []; const options = [];
if (FiltersalesPayment?.[0]?.PaymentDetails?.Payatthecounter?.length > 0) { if (FiltersalesPayment?.[0]?.PaymentDetails?.Payatthecounter?.length > 0) {
options.push({ options.push({
label: 'Personal UPI', label: 'Personal UPI',
@ -1361,16 +1205,6 @@ const BSC1Payment = (props) => {
imgSrc: defaultupi, imgSrc: defaultupi,
}); });
} }
if (filterBusinessUpi?.[0]?.ModeDetails?.length > 0) {
options.push({
label: 'Business UPI',
value: 'Business',
imgSrc: pozologoimg,
PaymentOptionId: filterBusinessUpi?.[0]?.PaymentOptionId,
PaymentFlowId: filterBusinessUpi?.[0]?.PaymentFlowId,
OptionId: filterBusinessUpi?.[0]?.OptionId,
});
}
if (upiinpaymentgateway?.length > 0) { if (upiinpaymentgateway?.length > 0) {
options.push({ label: 'Payment Gateway', value: 'PG', imgSrc: paygate }); options.push({ label: 'Payment Gateway', value: 'PG', imgSrc: paygate });
@ -1380,7 +1214,6 @@ const BSC1Payment = (props) => {
options.push({ label: 'Payment Device', value: 'PD', imgSrc: paydevice }); options.push({ label: 'Payment Device', value: 'PD', imgSrc: paydevice });
} }
setUpiPayOption(options); setUpiPayOption(options);
setBusinessPayoption(filterBusinessUpi?.[0]?.ModeDetails || []);
// } // }
}; };
@ -1419,17 +1252,12 @@ const BSC1Payment = (props) => {
} }
}; };
const handleRefundPaymentMode = (id, name) => {
setRefundPaySelected(id);
setRefundPaySelectedName(name);
}
const AddCardOption = (data) => { const AddCardOption = (data) => {
setSelectedCardOption(data); setSelectedCardOption(data);
setCardOptionOpen(false); setCardOptionOpen(false);
setCardoptionnotSelected(false); setCardoptionnotSelected(false);
}; };
const AddUPIPaymentOption = async (data, mode = false) => { const AddUPIPaymentOption = async (data) => {
setSelectedUpiOption(''); setSelectedUpiOption('');
setUpiOption(''); setUpiOption('');
setUpiId(''); setUpiId('');
@ -1439,7 +1267,7 @@ const BSC1Payment = (props) => {
setSelectedUPIPayOption(data); setSelectedUPIPayOption(data);
setUpinotSelected(false); setUpinotSelected(false);
setCardoptionnotSelected(false); setCardoptionnotSelected(false);
if (data !== 'Default' && data !== 'Business' && !mode) { if (data !== 'Default') {
setUpiOptionOpen(false); setUpiOptionOpen(false);
} }
}; };
@ -1819,18 +1647,6 @@ const BSC1Payment = (props) => {
} }
}; };
const businessUPIFlow = async (
businessUPIfilter,
OrderId,
PaymentStatusLink
) => {
// Implement your business UPI flow here
// You can add similar logic as PaymentDeviceFlow or PaymentGatewayFlow based on your requirements
setBusinessUPILink(PaymentStatusLink);
setBusinessUPI(true);
setBusinessUPIOrderId(OrderId);
};
function safeRound(amountStr) { function safeRound(amountStr) {
if (amountStr == null) return '0.00'; if (amountStr == null) return '0.00';
@ -1978,9 +1794,6 @@ const BSC1Payment = (props) => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
dispatch(changeTipAmount(0)); dispatch(changeTipAmount(0));
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
await dispatch(changeReorderHoldDetails({})); await dispatch(changeReorderHoldDetails({}));
@ -1994,8 +1807,6 @@ const BSC1Payment = (props) => {
setPaybtnselected(PaymentOptionsModeId); setPaybtnselected(PaymentOptionsModeId);
setQrCode(false); setQrCode(false);
setUpinotSelected(false); setUpinotSelected(false);
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
getHolddata(); getHolddata();
getUnpaiddatas(); getUnpaiddatas();
await dispatch(changeBookingType('TakeAway')); await dispatch(changeBookingType('TakeAway'));
@ -2032,8 +1843,7 @@ const BSC1Payment = (props) => {
); );
if ( if (
OnUpiSelected?.ModeName?.toLowerCase() === 'upi' && OnUpiSelected?.ModeName?.toLowerCase() === 'upi' &&
(SelectedUPIPayOption?.toLowerCase() === 'default' || SelectedUPIPayOption?.toLowerCase() === 'default'
SelectedUPIPayOption?.toLowerCase() === 'business')
) { ) {
SetSuccess(false); SetSuccess(false);
setTimeout(function () { setTimeout(function () {
@ -2286,28 +2096,19 @@ const BSC1Payment = (props) => {
SalesPaymentType: 'normal', SalesPaymentType: 'normal',
PaymentDetail: [ PaymentDetail: [
{ {
PaymentType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? refundPaySelected : PaymentType:
Paybtnnameselected?.toLowerCase() === 'upi' Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'pd' ? SelectedUPIPayOption?.toLowerCase() === 'pd'
? PaymentDeviceUPI?.[0]?.ModeId ? PaymentDeviceUPI?.[0]?.ModeId
: SelectedUPIPayOption?.toLowerCase() === 'pg' : SelectedUPIPayOption?.toLowerCase() === 'pg'
? PaymentgatewayUPI?.[0]?.ModeId ? PaymentgatewayUPI?.[0]?.ModeId
: SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find(
(busupi) => busupi?.ModeId === UpiId
)?.ModeId
: paybtnselected : paybtnselected
: paybtnselected : paybtnselected
? paybtnselected ? paybtnselected
: null, : null,
Amount: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? previousNetAmount - currentOrderNetAmount : Math.round(TotalAmount), // SelectedUPIPayOption?.toLowerCase() === "pg" ?
MerchantId: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : Amount: Math.round(TotalAmount),
Paybtnnameselected?.toLowerCase() === 'upi' && PaymentOptionType:
SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantId
: null,
PaymentOptionType: (salesBillEdit && currentOrderNetAmount < previousNetAmount) && (refundPaySelectedName?.toLowerCase() === 'cash' || refundPaySelectedName?.toLowerCase() === 'credit') ? 'PC' :
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'PC' ? 'PC'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2317,19 +2118,14 @@ const BSC1Payment = (props) => {
: Paybtnnameselected?.toLowerCase() === 'upi' : Paybtnnameselected?.toLowerCase() === 'upi'
? SelectedUPIPayOption?.toLowerCase() === 'default' ? SelectedUPIPayOption?.toLowerCase() === 'default'
? 'PC' ? 'PC'
: SelectedUPIPayOption?.toLowerCase() === 'business'
? 'BU'
: SelectedUPIPayOption : SelectedUPIPayOption
: null, : null,
ModeOfPayment: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? null : ModeOfPayment:
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId) ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
?.UPIDetailId ?.UPIDetailId
: SelectedUPIPayOption?.toLowerCase() === 'business'
? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
?.MerchantUPIId
: null, : null,
AccountDtl: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? [] : AccountDtl:
Paybtnnameselected?.toLowerCase() === 'upi' && Paybtnnameselected?.toLowerCase() === 'upi' &&
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find( ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
@ -2346,7 +2142,7 @@ const BSC1Payment = (props) => {
SelectedCardOption?.toLowerCase() === 'pg') SelectedCardOption?.toLowerCase() === 'pg')
? useOptions?.[0]?.PaymentDetails?.PaymentGateway ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
: [], : [],
PaymentStatus: (salesBillEdit && currentOrderNetAmount < previousNetAmount) ? 'S' : PaymentStatus:
Paybtnnameselected?.toLowerCase() === 'cash' Paybtnnameselected?.toLowerCase() === 'cash'
? 'S' ? 'S'
: Paybtnnameselected?.toLowerCase() === 'credit' : Paybtnnameselected?.toLowerCase() === 'credit'
@ -2355,8 +2151,8 @@ const BSC1Payment = (props) => {
SelectedUPIPayOption?.toLowerCase() === 'default' SelectedUPIPayOption?.toLowerCase() === 'default'
? 'S' ? 'S'
: 'P', : 'P',
Debit: (salesBillEdit && currentOrderNetAmount < previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(previousNetAmount - currentOrderNetAmount) : 0, Debit: 0,
Credit: salesBillEdit ? (currentOrderNetAmount > previousNetAmount && refundPaySelectedName?.toLowerCase() === 'credit') ? Math.round(TotalAmount) : 0 : Credit:
Paybtnnameselected?.toLowerCase() === 'credit' Paybtnnameselected?.toLowerCase() === 'credit'
? Math.round(TotalAmount) ? Math.round(TotalAmount)
: 0, : 0,
@ -2410,11 +2206,6 @@ const BSC1Payment = (props) => {
let PayatCounterfilter = response?.data?.PaymentOrderDtl?.filter( let PayatCounterfilter = response?.data?.PaymentOrderDtl?.filter(
(item) => item?.PaymentOptionType?.toLowerCase() === 'pc' (item) => item?.PaymentOptionType?.toLowerCase() === 'pc'
); );
let businessUPIfilter = response?.data?.PaymentOrderDtl?.filter(
(item) =>
item?.PaymentOptionType?.toLowerCase() === 'bu' &&
item?.PaymentStatus === 'P'
);
if ( if (
PayatCounterfilter?.length === 1 || PayatCounterfilter?.length === 1 ||
response?.data?.PaymentOrderDtl?.length === 0 response?.data?.PaymentOrderDtl?.length === 0
@ -2519,13 +2310,6 @@ const BSC1Payment = (props) => {
} else { } else {
console.log('more pg data'); console.log('more pg data');
} }
if (businessUPIfilter?.length === 1) {
businessUPIFlow(
businessUPIfilter,
response?.data?.OrderId,
response?.data?.PaymentPageLink
);
}
dispatch(triggerCustomerRefresh()); dispatch(triggerCustomerRefresh());
} else { } else {
setMessageType('error'); setMessageType('error');
@ -2557,16 +2341,10 @@ const BSC1Payment = (props) => {
putdata['PaymentType'] = !pay && ''; putdata['PaymentType'] = !pay && '';
putdata['PrintType'] = 'Y'; putdata['PrintType'] = 'Y';
} }
let response = null; let response = await dispatch(PutBookingData(putdata)).unwrap();
if (salesBillEdit) {
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
let PayatCounterfilter = response?.data?.PaymentOrderDtl?.filter( let PayatCounterfilter = response?.data?.PaymentOrderDtl?.filter(
(item) => item?.PaymentOptionType?.toLowerCase() === 'pc' (item) => item?.PaymentOptionType?.toLowerCase() === 'pc'
); );
if (value !== 'Unpaid') { if (value !== 'Unpaid') {
if (response?.data?.statusCode == 1) { if (response?.data?.statusCode == 1) {
let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter( let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter(
@ -2580,7 +2358,8 @@ const BSC1Payment = (props) => {
item?.PaymentStatus === 'P' item?.PaymentStatus === 'P'
); );
if (PayatCounterfilter?.length === 1 || if (
PayatCounterfilter?.length === 1 ||
response?.data?.PaymentOrderDtl?.length === 0 response?.data?.PaymentOrderDtl?.length === 0
) { ) {
setMessageType('success'); setMessageType('success');
@ -2612,8 +2391,6 @@ const BSC1Payment = (props) => {
if (PaymentGatewayfilter?.length === 1) { if (PaymentGatewayfilter?.length === 1) {
await PaymentGatewayFlow(PaymentGatewayfilter); await PaymentGatewayFlow(PaymentGatewayfilter);
} else { } else {
setPrintOrderDetails([response?.data]);
ClearAllGlobalStateDatas();
console.log('more pg data'); console.log('more pg data');
} }
} else { } else {
@ -3307,7 +3084,7 @@ const BSC1Payment = (props) => {
}; };
// split payments // split payments
const SplitPaymentOpen = () => { const SplitPaymentOpen = () => {
if (OrderCardDetail?.length > 0 && TotalAmount > 0) { if (OrderCardDetail?.length > 0) {
const updatedData = { const updatedData = {
userData: OrderCardDetail, userData: OrderCardDetail,
ExtraCharges: GlobalExtraCharge, ExtraCharges: GlobalExtraCharge,
@ -3317,11 +3094,6 @@ const BSC1Payment = (props) => {
setFailedOrderData(updatedData); setFailedOrderData(updatedData);
setSplitpayment(true); setSplitpayment(true);
} else { } else {
if (TotalAmount <= 0) {
setMessageType('warning');
setMessageData('Cannot split when total amount is zero or less');
return;
}
setMessageType('warning'); setMessageType('warning');
setMessageData('Please Select the Product'); setMessageData('Please Select the Product');
} }
@ -3859,7 +3631,7 @@ const BSC1Payment = (props) => {
: 1, : 1,
}} }}
> >
{paybtns?.length > 0 && (currentOrderNetAmount >= previousNetAmount) ? ( {paybtns?.length > 0 ? (
paybtns?.map((payment) => ( paybtns?.map((payment) => (
<div className="Table3-cash"> <div className="Table3-cash">
<button <button
@ -3908,9 +3680,6 @@ const BSC1Payment = (props) => {
)} )}
{payment?.ModeName?.toLowerCase() === 'upi' && ( {payment?.ModeName?.toLowerCase() === 'upi' && (
<UpiPopover <UpiPopover
defaultPaymentMode={defaultPaymentMode}
defaultEnabled={defaultEnabled}
setDefaultEnabled={setDefaultEnabled}
UpiOptionOpen={UpiOptionOpen} UpiOptionOpen={UpiOptionOpen}
UpiPayOption={UpiPayOption} UpiPayOption={UpiPayOption}
SelectedUPIPayOption={SelectedUPIPayOption} SelectedUPIPayOption={SelectedUPIPayOption}
@ -3918,7 +3687,6 @@ const BSC1Payment = (props) => {
PaymentUpiOptions={PaymentUpiOptions} PaymentUpiOptions={PaymentUpiOptions}
UpiOption={UpiOption} UpiOption={UpiOption}
UpiId={UpiId} UpiId={UpiId}
BusinessPayOption={BusinessPayOption}
paygate={paygate} paygate={paygate}
paydevice={paydevice} paydevice={paydevice}
EnableUpiOptions={EnableUpiOptions} EnableUpiOptions={EnableUpiOptions}
@ -3933,41 +3701,6 @@ const BSC1Payment = (props) => {
</button> </button>
</div> </div>
)) ))
) : (currentOrderNetAmount < previousNetAmount && salesBillEdit && refundPayBtns.length > 0) ? (
refundPayBtns.map((payment) => (
<div className="Table3-cash">
<button
className={
refundPaySelected === payment.ConfigId &&
(UpinotSelected || CardoptionnotSelected)
? 'Btn-payment-mode-notupisel'
: refundPaySelected === payment.ConfigId &&
(!UpinotSelected || !CardoptionnotSelected)
? 'Btn-payment-mode'
: 'Btn-payment-mode-sel'
}
style={{
position: 'relative',
animation: blink
? 'blink-animation 0.5s infinite alternate'
: 'none',
}}
onClick={() => handleRefundPaymentMode(payment?.ConfigId, payment?.ConfigName)}
>
{/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
<div
style={{
display: 'flex',
flexDirection: 'row',
columnGap: '0.5rem',
}}
>
{payment.ConfigName}
</div>
</button>
</div>
))
) : ( ) : (
<div <div
onClick={handlepaymentoptions} onClick={handlepaymentoptions}
@ -4498,9 +4231,8 @@ const BSC1Payment = (props) => {
OrderCardDetail?.length > 0 && OrderCardDetail?.length > 0 &&
paybtnselected && paybtnselected &&
CheckBookingStatus != 'Close' CheckBookingStatus != 'Close'
? !OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? ? !OrderStatus
'BSC1Payment-div4-button' ? 'BSC1Payment-div4-button'
: 'BSC1Payment-div4-button'
: 'BSC1Payment-div4-button Order' : 'BSC1Payment-div4-button Order'
: 'BSC1Payment-div4-button-disable' : 'BSC1Payment-div4-button-disable'
} }
@ -4510,7 +4242,7 @@ const BSC1Payment = (props) => {
onClick={handleButtonClick} onClick={handleButtonClick}
style={{ borderRadius: '6px 0 0 6px' }} style={{ borderRadius: '6px 0 0 6px' }}
> >
{!OrderStatus ? salesBillEdit && (currentOrderNetAmount < previousNetAmount) ? <div className="Table4-Order">Refund: ₹{(previousNetAmount || 0) - (currentOrderNetAmount || 0)}</div> : ( {!OrderStatus ? (
<> <>
{isMobile ? ( {isMobile ? (
`₹ ${safeRound( `₹ ${safeRound(
@ -4759,10 +4491,7 @@ const BSC1Payment = (props) => {
SplitPaymentModal={Splitpayment} SplitPaymentModal={Splitpayment}
handlesplitpaymentclose={handlesplitpaymentclose} handlesplitpaymentclose={handlesplitpaymentclose}
TotalNetAmount={ TotalNetAmount={
OrderType === 'Failed' ? FailedTotalAmt : Math.round(OrderCardDetail?.reduce((acc, data) => data?.TotalAmt + acc, 0) - OrderType === 'Failed' ? FailedTotalAmt : Math.round(TotalAmount)
((OverAllSales > 0 ? OverAllSales : 0) +
(OverAllEstimate > 0 ? OverAllEstimate : 0) +
(Discount > 0 ? Discount : 0)))
} }
failedOrderData={failedOrderData} failedOrderData={failedOrderData}
/> />
@ -4840,43 +4569,6 @@ const BSC1Payment = (props) => {
</div> </div>
} }
/> />
<DefaultModal
open={businessUPI}
handleCancel={() => setShowCancelConfirm(true)}
footer={false}
width={500}
children={
<>
<PaymentGatewayEmbedded
orderId={businessUPIOrderId}
setBusinessUPIOrderId={setBusinessUPIOrderId}
businessUPILink={businessUPILink}
setBusinessUPI={setBusinessUPI}
setPaymentSuccess={setPaymentSuccess}
paymentSucess={paymentSucess}
ClearAllGlobalStateDatas={ClearAllGlobalStateDatas}
CustomerDisplay={CustomerDisplay}
/>
</>
}
/>
{showCancelConfirm && (
<Modal
open={showCancelConfirm}
title="Cancel Payment"
onOk={() => {
setBusinessUPI(false);
setShowCancelConfirm(false);
ClearAllGlobalStateDatas();
CustomerDisplay();
}}
onCancel={() => setShowCancelConfirm(false)}
okText="Yes"
cancelText="No"
>
Do you want to cancel the payment?
</Modal>
)}
</> </>
); );
}; };

11
src/Pages/BookingScreen/Components/BSItemCards/BSItemCard.jsx
View File

@ -2432,9 +2432,7 @@ const BSItemCard = (props) => {
const isItemInCartHold = CartOrderDetails?.find( const isItemInCartHold = CartOrderDetails?.find(
(cartItem) => (cartItem) =>
itemMatchCondition(cartItem) && itemMatchCondition(cartItem) &&
((cartItem?.OfferModeType && cartItem?.OfferMode === 'B' (cartItem?.OfferMode !== 'B' &&
? true
: cartItem?.OfferMode !== 'B') &&
cartItem?.OfferMode !== 'P' && cartItem?.OfferMode !== 'C' && cartItem?.OfferMode !== 'P' && cartItem?.OfferMode !== 'C' &&
cartItem?.OfferMode !== 'O' && cartItem?.OfferMode !== 'O' &&
cartItem?.OfferMode !== 'L' cartItem?.OfferMode !== 'L'
@ -2463,9 +2461,7 @@ const BSItemCard = (props) => {
(cartItem) => (cartItem) =>
!( !(
itemMatchCondition(cartItem) && itemMatchCondition(cartItem) &&
((cartItem?.OfferModeType && cartItem?.OfferMode === 'B' (cartItem?.OfferMode !== 'B' &&
? true
: cartItem?.OfferMode !== 'B') &&
cartItem?.OfferMode !== 'P' && cartItem?.OfferMode !== 'C' && cartItem?.OfferMode !== 'P' && cartItem?.OfferMode !== 'C' &&
cartItem?.OfferMode !== 'O' && cartItem?.OfferMode !== 'O' &&
cartItem?.OfferMode !== 'L' cartItem?.OfferMode !== 'L'
@ -2869,6 +2865,7 @@ const BSItemCard = (props) => {
OfferId: offer?.OfferId || '', OfferId: offer?.OfferId || '',
OfferAmount: change?.discount || 0, OfferAmount: change?.discount || 0,
OfferType: offer?.OfferType || '', // I / Q / B OfferType: offer?.OfferType || '', // I / Q / B
OfferCode: PromoCodeOffersDatas?.OfferCode,
ActualOfferAmount: offer?.OfferAmt || 0, ActualOfferAmount: offer?.OfferAmt || 0,
OfferValue: offer?.OfferAmt || 0, OfferValue: offer?.OfferAmt || 0,
TableName: change?.TableName || '', TableName: change?.TableName || '',
@ -2876,7 +2873,7 @@ const BSItemCard = (props) => {
TableUniqueId: change?.TableUniqueId || '', TableUniqueId: change?.TableUniqueId || '',
// OfferType: offer?.ValueType || "", // F / P // OfferType: offer?.ValueType || "", // F / P
Detail: offer?.Detail || [], Detail: offer?.Detail || [],
OfferCode: offer?.OfferCode || PromoCodeOffersDatas?.OfferCode || '', OfferCode: offer?.OfferCode || '',
CustId: offer?.CustId || '', CustId: offer?.CustId || '',
UsedCount: offer?.UsedCount || 0, UsedCount: offer?.UsedCount || 0,
AppliesTo: offer?.AppliesTo || '', AppliesTo: offer?.AppliesTo || '',

97
src/Pages/BookingScreen/Components/BookingFunctionality/SplitPayment.jsx
View File

@ -51,14 +51,7 @@ import {
GlobalOverAllDiscSales, GlobalOverAllDiscSales,
GlobalOverAllDiscEstimate, GlobalOverAllDiscEstimate,
GlobaltipAmount, GlobaltipAmount,
GlobalRetailWSSalesType, GlobalRetailWSSalesType
GlobalPreviousOrderPayment,
GlobalPreviousOrderOfferDetails,
GlobalSalesBillEdit,
putSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail
} from '../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../Features/BookingScreen/BookingData/BookingData';
import { Form, Radio } from 'antd'; import { Form, Radio } from 'antd';
import { import {
@ -105,7 +98,6 @@ import { gettinghold } from '../../../../Features/BookingScreen/HoldOption/HoldO
import { Global_OrderOfferDetail } from '../../../../Features/Offer/Offer.js'; import { Global_OrderOfferDetail } from '../../../../Features/Offer/Offer.js';
import { useApplyOfferto_CardDetail } from '../UtillComponents/BSNavBarOffer/BSNavBarOffer_CustomHooks.jsx'; import { useApplyOfferto_CardDetail } from '../UtillComponents/BSNavBarOffer/BSNavBarOffer_CustomHooks.jsx';
import { ApplicationPreferences } from '../../../../Features/BrachLogin/BranchLogin.js'; import { ApplicationPreferences } from '../../../../Features/BrachLogin/BranchLogin.js';
import { ChangeFullFreeProductList, changeFullOfferAppliedProducts, GlobalOfferAppliedProducts } from '../../../../Features/Offer/Offernew/BookingOffernew.js';
const subDirectory = import.meta.env.BASE_URL; const subDirectory = import.meta.env.BASE_URL;
const MainHomeUrl = import.meta.env.ENV_MAIN_BASE_URL; const MainHomeUrl = import.meta.env.ENV_MAIN_BASE_URL;
@ -122,7 +114,7 @@ const SplitPayment = (props) => {
const applyOffer = useApplyOfferto_CardDetail(); const applyOffer = useApplyOfferto_CardDetail();
const globalTipAmount = useSelector(GlobaltipAmount); const globalTipAmount = useSelector(GlobaltipAmount);
const TotalNetAmount = (props.hasOwnProperty('TotalNetAmount') const TotalAmount = (props.hasOwnProperty('TotalNetAmount')
? props['TotalNetAmount'] ? props['TotalNetAmount']
: null); : null);
const TableOrderId = props.hasOwnProperty('TableBookingOrderId') const TableOrderId = props.hasOwnProperty('TableBookingOrderId')
@ -136,23 +128,7 @@ const SplitPayment = (props) => {
: null; : null;
const OrderCardDetail = useSelector(GlobalOrderCardDetails); const OrderCardDetail = useSelector(GlobalOrderCardDetails);
const SelCustId = useSelector(GlobalSelCustId); const SelCustId = useSelector(GlobalSelCustId);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const previousOrderPayment = useSelector(GlobalPreviousOrderPayment);
const previousOrderOfferDetails = useSelector(GlobalPreviousOrderOfferDetails);
const filteredPayments =
previousOrderPayment?.filter(
p => p?.LastOrderTran === 'Y' && p?.AfterAdjustment != null && p?.AfterAdjustment !== '' && p?.AfterAdjustment
) || [];
const paymentsToUse =
filteredPayments.length > 0 ? filteredPayments : previousOrderPayment || [];
const totalPreviousOfferAmount = previousOrderOfferDetails?.reduce(
(acc, offer) => acc + parseFloat(offer.OfferAmount || 0),
0
);
const totalPreviouspayment = paymentsToUse?.reduce(
(acc, payment) => acc + parseFloat(payment.AfterAdjustment || payment.Amount || 0),
0
);
const [paybtns, setpaybtns] = useState([]); const [paybtns, setpaybtns] = useState([]);
const [PaymentOptions, setPaymentOptions] = useState([]); const [PaymentOptions, setPaymentOptions] = useState([]);
const [PaymentUpiOptions, setPaymentUpiOptions] = useState([]); const [PaymentUpiOptions, setPaymentUpiOptions] = useState([]);
@ -164,9 +140,6 @@ const SplitPayment = (props) => {
const [SplitSelPayMode, setSplitSelPayMode] = useState({}); const [SplitSelPayMode, setSplitSelPayMode] = useState({});
const [TotalSplitAmount, setTotalSplitAmount] = useState(0); const [TotalSplitAmount, setTotalSplitAmount] = useState(0);
const [SalesOrderId, setSalesOrderId] = useState(); const [SalesOrderId, setSalesOrderId] = useState();
const [beforeAdjAmount, setBeforeAdjAmount] = useState(null);
const [afterAdjAmount, setAfterAdjAmount] = useState(null);
const [adjustmentType, setAdjustmentType] = useState(null);
const [PaymentgatewayCard, setPaymentgatewayCard] = useState([]); const [PaymentgatewayCard, setPaymentgatewayCard] = useState([]);
const [PaymentDeviceCard, setPaymentDeviceCard] = useState([]); const [PaymentDeviceCard, setPaymentDeviceCard] = useState([]);
const [PaymentgatewayUPI, setPaymentgatewayUPI] = useState([]); const [PaymentgatewayUPI, setPaymentgatewayUPI] = useState([]);
@ -204,7 +177,6 @@ const SplitPayment = (props) => {
(i) => i.SettingIdName === 'AllProductindividualToken' (i) => i.SettingIdName === 'AllProductindividualToken'
)?.[0]; )?.[0];
const OrderOfferDetail = useSelector(Global_OrderOfferDetail, shallowEqual); const OrderOfferDetail = useSelector(Global_OrderOfferDetail, shallowEqual);
const offerAppliedProducts = useSelector(GlobalOfferAppliedProducts);
const [SelectedBookingType, setSelectedBookingType] = useState(null); const [SelectedBookingType, setSelectedBookingType] = useState(null);
const [ConfigDataList, setConfigDataList] = useState([]); const [ConfigDataList, setConfigDataList] = useState([]);
const [formattedDate, setFormattedDate] = useState(''); const [formattedDate, setFormattedDate] = useState('');
@ -222,8 +194,6 @@ const SplitPayment = (props) => {
const OfferCheckedInSetup = templateData?.BookingNavbar?.[1].some( const OfferCheckedInSetup = templateData?.BookingNavbar?.[1].some(
(item) => item?.OptionName == 'Offer' (item) => item?.OptionName == 'Offer'
); );
const [TotalAmount, setTotalAmount] = useState(0);
console.log(TotalAmount, "TotalSplitAmount", TotalSplitAmount)
const preferenceOffer = const preferenceOffer =
SettingDataSelector?.[0]?.['SettingDtlDetails']?.find( SettingDataSelector?.[0]?.['SettingDtlDetails']?.find(
(item) => item.SettingIdName === 'Offer' (item) => item.SettingIdName === 'Offer'
@ -236,21 +206,6 @@ const SplitPayment = (props) => {
getPaymentOptionFeature(); getPaymentOptionFeature();
}, []); }, []);
useEffect(() => {
if (salesBillEdit) {
const previousNetAmount = (totalPreviouspayment || 0);
if (TotalNetAmount > previousNetAmount) {
setTotalAmount(TotalNetAmount - previousNetAmount);
} else {
setTotalAmount(0);
}
} else {
setTotalAmount(TotalNetAmount);
}
}, [totalPreviousOfferAmount, totalPreviouspayment, TotalNetAmount])
useEffect(() => { useEffect(() => {
if (SelCustId) { if (SelCustId) {
setpaybtns(PaymentOptions); setpaybtns(PaymentOptions);
@ -272,11 +227,8 @@ const SplitPayment = (props) => {
}, [Splitpayment]); }, [Splitpayment]);
useEffect(() => { useEffect(() => {
const totalPayAmount = Object.keys(SplitSelPayMode) const totalPayAmount = Object.keys(SplitSelPayMode)
.filter(key => key.startsWith('PayAmount-')) .filter((key) => key.startsWith('PayAmount-')) // Filter keys that start with "PayAmount-"
.reduce((sum, key) => { .reduce((sum, key) => sum + parseInt(SplitSelPayMode[key]), 0);
const value = parseInt(SplitSelPayMode[key], 10);
return sum + (isNaN(value) ? 0 : value);
}, 0);
setTotalSplitAmount(totalPayAmount); setTotalSplitAmount(totalPayAmount);
}, [SplitSelPayMode]); }, [SplitSelPayMode]);
useEffect(() => { useEffect(() => {
@ -570,7 +522,7 @@ const SplitPayment = (props) => {
await Promise.all( await Promise.all(
PrintOrderDetails?.[0]?.OrderDetails?.map( PrintOrderDetails?.[0]?.OrderDetails?.map(
async (orderDetail, index) => { async (orderDetail, index) => {
const groupedTokens = orderDetail?.productDetails?.filter(data => data?.EditTokenAvailable !== 'N')?.reduce( const groupedTokens = orderDetail?.productDetails?.reduce(
(acc, item, idx) => { (acc, item, idx) => {
if (item.TokenAvailable === 'Y') { if (item.TokenAvailable === 'Y') {
if (!item.CounterName) { if (!item.CounterName) {
@ -605,7 +557,7 @@ const SplitPayment = (props) => {
); );
} else { } else {
await Promise.all( await Promise.all(
PrintOrderDetails?.[0]?.OrderDetails?.filter(data => data?.EditTokenAvailable !== 'N')?.map( PrintOrderDetails?.[0]?.OrderDetails?.map(
async (orderDetail, index) => { async (orderDetail, index) => {
await TokenPrint(`${index}-${orderDetail?.OrderId}`); await TokenPrint(`${index}-${orderDetail?.OrderId}`);
} }
@ -633,10 +585,6 @@ const SplitPayment = (props) => {
'Style 11': 'PrintStyle11', 'Style 11': 'PrintStyle11',
'Style 12': 'PrintStyle12', 'Style 12': 'PrintStyle12',
'Style 13': 'RePrint', 'Style 13': 'RePrint',
A4: 'PrintStyleA4',
A5: 'PrintStyleA5',
A4Standard: 'A4Standard',
TaxInvoice: 'TaxInvoice',
}; };
const selectedStyle = const selectedStyle =
@ -650,7 +598,7 @@ const SplitPayment = (props) => {
async (orderDetail, index) => { async (orderDetail, index) => {
await printDiv(`${selectedStyle}-${index}`, style); // Use unique IDs for each print await printDiv(`${selectedStyle}-${index}`, style); // Use unique IDs for each print
if (orderDetail?.BookingTypeName !== 'Dine In') { if (orderDetail?.BookingTypeName !== 'Dine In') {
const groupedTokens = orderDetail?.productDetails?.filter(data => data?.EditTokenAvailable !== 'N')?.reduce( const groupedTokens = orderDetail?.productDetails?.reduce(
(acc, item, idx) => { (acc, item, idx) => {
if (item.TokenAvailable === 'Y') { if (item.TokenAvailable === 'Y') {
if (!item.CounterName) { if (!item.CounterName) {
@ -1292,12 +1240,7 @@ const SplitPayment = (props) => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
dispatch(changeFullOfferAppliedProducts([]));
dispatch(ChangeFullFreeProductList([]));
await dispatch(changeReorderHoldDetails({})); await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([])); await dispatch(changeReorderProductDetails([]));
await dispatch(ChangeNavHoldData(false)); await dispatch(ChangeNavHoldData(false));
@ -1375,8 +1318,6 @@ const SplitPayment = (props) => {
OfferValue: a?.Type === 'C' ? a?.OfferValue : a.Offer, OfferValue: a?.Type === 'C' ? a?.OfferValue : a.Offer,
OfferAmt: a?.Type === 'C' ? a?.TotalAmt : a.Offer, OfferAmt: a?.Type === 'C' ? a?.TotalAmt : a.Offer,
OfferType: a?.Type === 'C' ? a?.OfferType : '', OfferType: a?.Type === 'C' ? a?.OfferType : '',
OfferMode: a?.OfferMode,
OfferMessage: a?.OfferMessage,
CounterName: a?.TokenAvailable === 'Y' ? a?.CounterName : null, CounterName: a?.TokenAvailable === 'Y' ? a?.CounterName : null,
ProductIdentifierDtls: a.ProductIdentifierDtls, ProductIdentifierDtls: a.ProductIdentifierDtls,
ModelNumber: a.ModelNumber, ModelNumber: a.ModelNumber,
@ -1385,9 +1326,9 @@ const SplitPayment = (props) => {
const NotSlectedTypeFind = temporderdetail?.find( const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType (a) => a?.BookingType != SelectedBookingType
); );
let updatedOfferDetails = offerAppliedProducts; let updatedOfferDetails = OrderOfferDetail;
if (GlobEstBooking !== 'Sales') { if (GlobEstBooking !== 'Sales') {
updatedOfferDetails = offerAppliedProducts?.filter( updatedOfferDetails = OrderOfferDetail?.filter(
(item) => (item) =>
!( !(
item.TableName === 'LoyaltyPoints' && item.TableName === 'LoyaltyPoints' &&
@ -1625,23 +1566,11 @@ const SplitPayment = (props) => {
: ReportholdData?.OrderId; : ReportholdData?.OrderId;
putdata['SalesId'] = ReportholdData?.SalesId; putdata['SalesId'] = ReportholdData?.SalesId;
putdata['UpdatedBy'] = UserId; putdata['UpdatedBy'] = UserId;
let response = null;
if (salesBillEdit) { let response = await dispatch(PutBookingData(putdata)).unwrap();
response = await dispatch(putSalesBillEdit(putdata)).unwrap();
} else {
response = await dispatch(PutBookingData(putdata)).unwrap();
}
if (response?.data?.statusCode == 1) { if (response?.data?.statusCode == 1) {
setSalesOrderId(response?.data?.OrderId); setSalesOrderId(response?.data?.OrderId);
const salesEditAmount = response?.data?.PaymentOrderDtl?.find(payment =>
payment?.LastOrderTran === 'Y' && payment?.AdjustmentType &&
payment?.AdjustmentType != null && payment?.AfterAdjustment && payment?.BeforeAdjustment && payment?.AfterAdjustment != null && payment?.BeforeAdjustment != null
)
setBeforeAdjAmount(salesEditAmount?.BeforeAdjustment || null);
setAfterAdjAmount(salesEditAmount?.AfterAdjustment || null);
setAdjustmentType(salesEditAmount?.AdjustmentType || null);
let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter( let Paymentdevicefilter = response?.data?.PaymentOrderDtl?.filter(
(item) => (item) =>
item?.PaymentOptionType?.toLowerCase() === 'pd' && item?.PaymentOptionType?.toLowerCase() === 'pd' &&
@ -1786,10 +1715,6 @@ const SplitPayment = (props) => {
SplitSelPayMode[`PaymentMode-${i}`]?.toLowerCase() === 'credit' SplitSelPayMode[`PaymentMode-${i}`]?.toLowerCase() === 'credit'
? SplitSelPayMode[`PayAmount-${i}`] ? SplitSelPayMode[`PayAmount-${i}`]
: 0, : 0,
BeforeAdjAmount: beforeAdjAmount || null,
AfterAdjAmount: afterAdjAmount || null,
AdjustmentType: adjustmentType || null,
}; };
let response = await dispatch( let response = await dispatch(

188
src/Pages/BookingScreen/Components/OtherConponents/Reprint/BSReprint.jsx
View File

@ -41,26 +41,7 @@ import MobilePrint from '../../BookingFunctionality/MobilePrint.jsx';
import '../../../../../Styles/BookingScreen/Components/OtherConponents/Reprint/BSReprint.scss'; import '../../../../../Styles/BookingScreen/Components/OtherConponents/Reprint/BSReprint.scss';
import PaymentPdfBooking from '../../../../paymentpdfPage/PaymentPdfBooking.jsx'; import PaymentPdfBooking from '../../../../paymentpdfPage/PaymentPdfBooking.jsx';
import { import {
changeBillEditingMode,
changeEstimateBooking,
changeHoldOrderDtl,
changeOrderCardDetails,
changeOrderType,
ChangeOverAllDiscEstimate,
ChangeOverAllDiscSales,
changePreviousOrderOfferDetail,
changePreviousOrderPayment,
changeReorderHoldDetails,
changeReorderProductDetails,
ChangeSelectedCustDisable,
changeSelectedCustId,
changeSelectedOption,
changeSelProdWiseEst,
getAllCustomer,
getConfigType, getConfigType,
getCustomerForHold,
GlobalSalesBillEdit,
GlobalSelectedCustDisable,
PreferenceData, PreferenceData,
} from '../../../../../Features/BookingScreen/BookingData/BookingData.js'; } from '../../../../../Features/BookingScreen/BookingData/BookingData.js';
import { DatePicker, Form } from 'antd'; import { DatePicker, Form } from 'antd';
@ -82,15 +63,10 @@ import {
import { TbSettingsCog } from 'react-icons/tb'; import { TbSettingsCog } from 'react-icons/tb';
import { useQuery, useQueryClient } from '@tanstack/react-query'; import { useQuery, useQueryClient } from '@tanstack/react-query';
import { axiosRetailInstanceData } from '../../../../../Features/AuthenicationToken/AuthenticationToken.js'; import { axiosRetailInstanceData } from '../../../../../Features/AuthenicationToken/AuthenticationToken.js';
import { MdEdit } from "react-icons/md";
import { v4 as uuidv4 } from 'uuid';
import { changeOrderOfferDetail } from '../../../../../Features/Offer/Offer.js';
import { ChangeFullFreeProductList, changeFullOfferAppliedProducts, changeLoyaltyConsumedQuantities } from '../../../../../Features/Offer/Offernew/BookingOffernew.js';
import { ChangeTotalAmount } from '../../../../../Features/ExteraCharges/ExtraCharges.js';
const RetailApiurl = import.meta.env.ENV_API_URL; const RetailApiurl = import.meta.env.ENV_API_URL;
function BSReprint({ setOpenModel = () => { } }) { function BSReprint() {
const dispatch = useDispatch(); const dispatch = useDispatch();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const appPreferences = useSelector(ApplicationPreferences); const appPreferences = useSelector(ApplicationPreferences);
@ -124,20 +100,13 @@ function BSReprint({ setOpenModel = () => { } }) {
const [page, setpage] = useState(1); const [page, setpage] = useState(1);
const [itemsPerPage] = useState(10); const [itemsPerPage] = useState(10);
const [DefReason, setDefReason] = useState({}); const [DefReason, setDefReason] = useState({});
console.log(DefReason, 'DefReason');
const SettingDataSelector = useSelector(PreferenceData); const SettingDataSelector = useSelector(PreferenceData);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const custDisable = useSelector(GlobalSelectedCustDisable);
console.log(SettingDataSelector, 'SettingDataSelector');
const MobileA4Print = SettingDataSelector?.[0]?.SettingDtlDetails?.find( const MobileA4Print = SettingDataSelector?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'mobilea4' && setting?.SettingIdName?.toLowerCase() === 'mobilea4' &&
setting?.SettingValue === 'Y' setting?.SettingValue === 'Y'
); );
const editBill = SettingDataSelector?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'editbill' &&
setting?.SettingValue === 'Y'
);
const TokenOnly = SettingDataSelector?.[0]?.SettingDtlDetails?.filter( const TokenOnly = SettingDataSelector?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'TokenOnly' (i) => i.SettingIdName === 'TokenOnly'
)?.[0]; )?.[0];
@ -926,21 +895,6 @@ function BSReprint({ setOpenModel = () => { } }) {
/> />
), ),
}, },
// ...(editBill ? [
{
title: 'Edit Bill',
key: 'EditBill',
dataIndex: 'EditBill',
align: 'center',
render: (text, row) => (
<MdEdit
style={{ color: '#1292EE', fontSize: '25px', cursor: 'pointer' }}
onClick={async (e) => await handleEditBill(e, row)}
/>
),
}
// ] : [])
,
{ {
title: () => ( title: () => (
<div <div
@ -1256,144 +1210,6 @@ function BSReprint({ setOpenModel = () => { } }) {
0 0
); );
const handleEditBill = async (e, orderDtls) => {
setOpenModel(e);
dispatch(changeBillEditingMode(true));
const {
productDetails,
ExtraChargeDetails,
CustSuppId,
OrderOfferDetails,
RefDetails,
OrderId,
OrderType,
OverallDisc,
OrderPaymentDtl,
} = orderDtls;
const updated = productDetails?.map((item) => ({
...item,
Offer: item?.OfferAmt,
localId: uuidv4(),
OfferMode: item?.OfferMode ? item?.OfferMode?.trim() : null,
VariantAvailableFrom: item?.AvailableFrom || null,
VariantAvailableTo: item?.AvailableTo || null,
OrderQty: item?.SalesQty,
OrderRate: item?.Rate,
// TotalAmt: formatAmount((item.TotalAmt - item.OfferValue)),
}));
if (RefDetails?.[0]?.FreeProdList) {
dispatch(ChangeFullFreeProductList(RefDetails[0]?.FreeProdList));
}
if (RefDetails?.[0]?.OfferAppliedProductList) {
dispatch(
changeFullOfferAppliedProducts(
RefDetails[0]?.OfferAppliedProductList
)
);
}
if (CustSuppId) {
let res = await dispatch(
getCustomerForHold({
CompId: CompId,
AppId: AppId,
branchId: BranchId,
OrderId: OrderId,
})
).unwrap();
if (res?.data?.statusCode !== 1) {
res = await dispatch(
getAllCustomer({
CompId: CompId,
AppId: AppId,
branchId: BranchId,
})
).unwrap();
}
if (res?.data?.statusCode === 1) {
const loyaltyFreeProductOfferApplied = (RefDetails?.[0]?.OfferAppliedProductList || [])?.filter(
(off) =>
off?.FreeProductsList?.OfferMode === 'L' &&
off?.TableUniqueName === 'FreeProduct'
);
const customerDetails = res?.data?.data?.find(
(item) => item.CustId === CustSuppId
);
if (customerDetails) {
const { CustId, CustName, CustMobile, LoyaltyPointsDetail, TotalLoyaltyPoints } = customerDetails;
const data = {
CustId: CustId,
CustName: CustName,
label: CustName ? CustName : CustMobile,
value: CustMobile,
LoyaltyPointsDetail: LoyaltyPointsDetail,
TotalLoyaltyPoints: TotalLoyaltyPoints
};
dispatch(changeOrderOfferDetail([...OrderOfferDetails]));
dispatch(changeSelectedOption(data));
await dispatch(ChangeSelectedCustDisable(true));
if (loyaltyFreeProductOfferApplied?.length > 0) {
const loyaltyProdQuantities = {};
loyaltyFreeProductOfferApplied.forEach((off) => {
const freeProdDtls = off?.FreeProductsList;
const freeProdOfferId =
freeProdDtls?.ProdVariantDetails?.[0]?.StockDetails?.[0]
?.ProdOfferId;
const key = [
freeProdDtls?.OfferId,
freeProdDtls?.FreeProdId,
freeProdDtls?.FreeProdVariantName,
freeProdOfferId,
].join('|');
loyaltyProdQuantities[key] = freeProdDtls?.FreeQty || 0;
});
if (Object.keys(loyaltyProdQuantities).length > 0) {
dispatch(changeLoyaltyConsumedQuantities(loyaltyProdQuantities));
}
console.log(loyaltyProdQuantities, 'loyaltyProdQuantities');
}
}
}
}
await dispatch(changeOrderType('Hold'));
await dispatch(changeHoldOrderDtl(true));
await dispatch(changeReorderHoldDetails(orderDtls));
await dispatch(changeReorderProductDetails(updated));
await dispatch(changeSelectedCustId(CustSuppId));
await dispatch(ChangeTotalAmount(ExtraChargeDetails));
await dispatch(changePreviousOrderPayment(OrderPaymentDtl));
await dispatch(changePreviousOrderOfferDetail(OrderOfferDetails));
dispatch(changeOrderCardDetails(updated));
let temp = updated?.filter((item) => item.OrderType === 'E')
.map((item) => item.InwardDtlId + ' ' + item.BookingTypeName);
await dispatch(changeSelProdWiseEst(temp));
if (OrderType === 'E') {
await dispatch(changeEstimateBooking('OvrAllEst'));
await dispatch(ChangeOverAllDiscEstimate(parseFloat(OverallDisc)));
} else {
await dispatch(changeEstimateBooking('Sales'));
await dispatch(ChangeOverAllDiscSales(parseFloat(OverallDisc)));
}
}
return ( return (
<> <>
<div> <div>

2
src/Pages/BookingScreen/Components/PrintMainPage/PrintPreviewpage.jsx
View File

@ -385,6 +385,7 @@ const PrintPreviewPage = (props) => {
// (item) => item.StyleName === selectedStyleName // (item) => item.StyleName === selectedStyleName
// ); // );
// debugger
// // Only one "Sales" style should have SetasDefault: "Y" // // Only one "Sales" style should have SetasDefault: "Y"
// const updatedTemplates = SizeOptionData.map((item) => { // const updatedTemplates = SizeOptionData.map((item) => {
// if ( // if (
@ -522,7 +523,6 @@ const PrintPreviewPage = (props) => {
if (onClose) onClose(); // Call the onClose callback after success if (onClose) onClose(); // Call the onClose callback after success
} }
}; };
return ( return (
<div style={{ display: 'flex', flexDirection: 'column', width: '100%' }}> <div style={{ display: 'flex', flexDirection: 'column', width: '100%' }}>
<Messages <Messages

1
src/Pages/BookingScreen/Components/UtillComponents/BSCreditCustomer.jsx
View File

@ -1752,6 +1752,7 @@ const BSCreditCustomer = (props) => {
</label> </label>
} }
onChange={(e) => { onChange={(e) => {
// debugger
const value = parseFloat(e?.target?.value) || 0; const value = parseFloat(e?.target?.value) || 0;
if (value <= SelectedBillData?.OrderPendingAmount) { if (value <= SelectedBillData?.OrderPendingAmount) {
HandleAmount(e?.target?.value); HandleAmount(e?.target?.value);

2
src/Pages/BookingScreen/Components/UtillComponents/BSNavbarSearchStandard.jsx
View File

@ -35,7 +35,7 @@ const BSNavbarSearchStandard = ({ inputRef }) => {
const ProdName = useSelector(GlobalSearchData); const ProdName = useSelector(GlobalSearchData);
const templateData = useSelector(getTemplateData); const templateData = useSelector(getTemplateData);
const appPreferences = useSelector(ApplicationPreferences); const appPreferences = useSelector(ApplicationPreferences);
console.log(ProdName, "ProdName")
const [preFocus, setPreFocus] = useState(false); const [preFocus, setPreFocus] = useState(false);
const [screenWidth, setScreenWidth] = useState(window.innerWidth); const [screenWidth, setScreenWidth] = useState(window.innerWidth);
const [check, setCheck] = useState(false); const [check, setCheck] = useState(false);

4
src/Pages/BookingScreen/Components/UtillComponents/BSPrinterSetting.jsx
View File

@ -57,7 +57,7 @@ const BSPrinterSetting = ({
const [receiptReprintShow, setReceiptReprintShow] = useState(false); const [receiptReprintShow, setReceiptReprintShow] = useState(false);
const SettingDataSelector = useSelector(PreferenceData); const SettingDataSelector = useSelector(PreferenceData);
const [KioskPrintersetupShow, setKioskPrintersetupShow] = useState(false); const [KioskPrintersetupShow, setKioskPrintersetupShow] = useState(false);
console.log(OpenModel, "OpenModel")
const dispatch = useDispatch(); const dispatch = useDispatch();
const printmodelOpen = () => { const printmodelOpen = () => {
setOpenModel(true); setOpenModel(true);
@ -266,7 +266,7 @@ const BSPrinterSetting = ({
className="printer-settings-tabs" className="printer-settings-tabs"
> >
<TabPane tab="Sales Reprint" key="reprint"> <TabPane tab="Sales Reprint" key="reprint">
{reprintShow && <BSReprint setOpenModel={closeModel} />} {reprintShow && <BSReprint />}
</TabPane> </TabPane>
<TabPane tab="Receipt Reprint" key="receiptReprint"> <TabPane tab="Receipt Reprint" key="receiptReprint">
{receiptReprintShow && <CreditCustomerReprint />} {receiptReprintShow && <CreditCustomerReprint />}

174
src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
View File

@ -137,18 +137,6 @@ const PrintA4Style11 = ({
let PaymentStatusSuccess = PaymentStatus?.filter( let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S' (ps) => ps.PaymentStatus === 'S'
); );
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
const TakeawayTotal = TakeawayData?.reduce( const TakeawayTotal = TakeawayData?.reduce(
(accumulator, currentValue) => accumulator + currentValue.TotalAmt, (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
0 0
@ -944,46 +932,6 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -1924,46 +1872,6 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -2419,7 +2327,7 @@ const PrintA4Style11 = ({
)} )}
</div> </div>
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -2516,46 +2424,6 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -3063,46 +2931,6 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div

253
src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
View File

@ -137,17 +137,6 @@ const PrintA5Style11 = ({
let PaymentStatusSuccess = PaymentStatus?.filter( let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S' (ps) => ps.PaymentStatus === 'S'
); );
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
const PackageDetails = table2Data?.PackageDtl; const PackageDetails = table2Data?.PackageDtl;
const TakeawayTotal = TakeawayData?.reduce( const TakeawayTotal = TakeawayData?.reduce(
(accumulator, currentValue) => accumulator + currentValue.TotalAmt, (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
@ -947,46 +936,6 @@ const PrintA5Style11 = ({
</div> </div>
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -1927,46 +1876,6 @@ const PrintA5Style11 = ({
</div> </div>
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -2422,7 +2331,7 @@ const PrintA5Style11 = ({
)} )}
</div> </div>
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -2519,86 +2428,6 @@ const PrintA5Style11 = ({
</div> </div>
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -3106,86 +2935,6 @@ const PrintA5Style11 = ({
</div> </div>
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div

199
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
View File

@ -136,17 +136,6 @@ const PrintStyle1 = ({
let PageSize = printDatas?.PageSize; let PageSize = printDatas?.PageSize;
const Signature = FieldDetails?.['signature']; const Signature = FieldDetails?.['signature'];
const TermsnAdCondition = FieldDetails?.['terms&conditions']; const TermsnAdCondition = FieldDetails?.['terms&conditions'];
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
if (keysLength > 0) { if (keysLength > 0) {
dispatch(changeReprintDataFound(true)); dispatch(changeReprintDataFound(true));
@ -469,11 +458,11 @@ const PrintStyle1 = ({
: '') + table2Data?.AddressDetails?.[0]?.Zip : '') + table2Data?.AddressDetails?.[0]?.Zip
: '')} : '')}
</div> </div>
{(GlobaldummyData || table2Data?.BrMobile) && <div style={{ fontWeight: '600' }}> <div style={{ fontWeight: '600' }}>
{' '} {' '}
Mobile : +91{' '} Mobile : +91{' '}
{GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile} {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}
</div>} </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && (
<div <div
style={{ style={{
@ -772,7 +761,8 @@ const PrintStyle1 = ({
</div> </div>
)} )}
{sportsAppPreference && {sportsAppPreference &&
`${item?.BookingDate?.trim() `${
item?.BookingDate?.trim()
? `(${dateFormatChange(item.BookingDate)})` ? `(${dateFormatChange(item.BookingDate)})`
: '' : ''
} (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`} } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
@ -1031,7 +1021,8 @@ const PrintStyle1 = ({
) )
</div> </div>
{sportsAppPreference && {sportsAppPreference &&
`${item?.BookingDate?.trim() `${
item?.BookingDate?.trim()
? `(${dateFormatChange(item.BookingDate)})` ? `(${dateFormatChange(item.BookingDate)})`
: '' : ''
} (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`} } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
@ -1217,7 +1208,7 @@ const PrintStyle1 = ({
)} )}
</> </>
)} )}
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -1231,46 +1222,6 @@ const PrintStyle1 = ({
))} ))}
</> </>
)} )}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '90%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{table2Data?.OrderType === 'E' ? ( {table2Data?.OrderType === 'E' ? (
'' ''
) : ( ) : (
@ -2080,7 +2031,7 @@ const PrintStyle1 = ({
)} )}
</> </>
)} )}
{(PaymentStatusSuccess?.length > 1 && !isEditedBill)( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -2094,46 +2045,6 @@ const PrintStyle1 = ({
))} ))}
</> </>
)} )}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '90%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{table2Data?.OrderType === 'E' ? ( {table2Data?.OrderType === 'E' ? (
'' ''
) : ( ) : (
@ -2908,7 +2819,7 @@ const PrintStyle1 = ({
)} )}
</> </>
)} )}
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -2922,46 +2833,6 @@ const PrintStyle1 = ({
))} ))}
</> </>
)} )}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '90%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{table2Data?.OrderType === 'E' ? ( {table2Data?.OrderType === 'E' ? (
'' ''
) : ( ) : (
@ -3713,11 +3584,11 @@ const PrintStyle1 = ({
: '') + table2Data?.AddressDetails?.[0]?.Zip : '') + table2Data?.AddressDetails?.[0]?.Zip
: '')} : '')}
</div> </div>
{(GlobaldummyData || table2Data?.BrMobile) && <div style={{ fontWeight: '600' }}> <div style={{ fontWeight: '600' }}>
{' '} {' '}
Mobile : +91{' '} Mobile : +91{' '}
{GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile} {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}
</div>} </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && (
<div <div
style={{ style={{
@ -3978,7 +3849,8 @@ const PrintStyle1 = ({
</div> </div>
)} )}
{sportsAppPreference && {sportsAppPreference &&
`${item?.BookingDate?.trim() `${
item?.BookingDate?.trim()
? `(${dateFormatChange(item.BookingDate)})` ? `(${dateFormatChange(item.BookingDate)})`
: '' : ''
} (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`} } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
@ -4218,7 +4090,8 @@ const PrintStyle1 = ({
) )
</div> </div>
{sportsAppPreference && {sportsAppPreference &&
`${item?.BookingDate?.trim() `${
item?.BookingDate?.trim()
? `(${dateFormatChange(item.BookingDate)})` ? `(${dateFormatChange(item.BookingDate)})`
: '' : ''
} (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`} } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
@ -4393,7 +4266,7 @@ const PrintStyle1 = ({
)} )}
</> </>
)} )}
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -4406,46 +4279,6 @@ const PrintStyle1 = ({
))} ))}
</> </>
)} )}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '90%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px', }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{table2Data?.OrderType === 'E' ? ( {table2Data?.OrderType === 'E' ? (
'' ''
) : ( ) : (

223
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
View File

@ -122,18 +122,6 @@ const PrintStyle10 = ({
(ps) => ps.PaymentTypeName === 'UPI' (ps) => ps.PaymentTypeName === 'UPI'
); );
const isEditedBill = PaymentStatus?.some((payment) => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
);
let TermsAndConditions = printDatas?.TermsandConditions; let TermsAndConditions = printDatas?.TermsandConditions;
let SignatureImg = printDatas?.Signature; let SignatureImg = printDatas?.Signature;
let Notestext = printDatas?.Notes; let Notestext = printDatas?.Notes;
@ -1658,7 +1646,7 @@ const PrintStyle10 = ({
table2Data?.FYStatus table2Data?.FYStatus
)}{' '} )}{' '}
</div> </div>
{PaymentStatusSuccess?.length > 1 && !isEditedBill && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map( {Object.keys(aggregatedPayments).map(
@ -1805,77 +1793,6 @@ const PrintStyle10 = ({
)} )}
</div> </div>
{isEditedBill && lastTransaction && (
<div
style={{
width: '100%',
margin: '2px 0',
padding: '2px 0',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'column',
borderTop: '1px dashed #000',
borderBottom: '1px dashed #000',
}}
>
<div
style={{
fontSize: '12px',
width: '90%',
}}
>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Bill Gross Amount
</span>
<strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed(
2
)}
</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: '800',
color: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Net Bill Amount
</span>
<strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed(
2
)}
</strong>
</div>
</div>
</div>
)}
<div <div
style={{ style={{
display: 'flex', display: 'flex',
@ -2620,7 +2537,7 @@ const PrintStyle10 = ({
table2Data?.FYStatus table2Data?.FYStatus
)}{' '} )}{' '}
</div> </div>
{PaymentStatusSuccess?.length > 1 && !isEditedBill && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map( {Object.keys(aggregatedPayments).map(
@ -2754,75 +2671,6 @@ const PrintStyle10 = ({
)} )}
</div> </div>
{isEditedBill && lastTransaction && (
<div
style={{
width: '100%',
margin: '2px 0',
padding: '2px 0',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'column',
borderTop: '1px dashed #000',
borderBottom: '1px dashed #000',
}}
>
<div
style={{
fontSize: '12px',
width: '90%',
}}
>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Bill Gross Amount
</span>
<strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed(
2
)}
</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: '800',
color: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Net Bill Amount
</span>
<strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}
</strong>
</div>
</div>
</div>
)}
<div <div
style={{ style={{
display: 'flex', display: 'flex',
@ -4187,7 +4035,7 @@ const PrintStyle10 = ({
table2Data?.FYStatus table2Data?.FYStatus
)}{' '} )}{' '}
</div> </div>
{PaymentStatusSuccess?.length > 1 && !isEditedBill && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -4305,71 +4153,6 @@ const PrintStyle10 = ({
)} )}
</div> </div>
{isEditedBill && lastTransaction && (
<div
style={{
width: '100%',
margin: '2px 0',
padding: '2px 0',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'column',
borderTop: '1px dashed #000',
borderBottom: '1px dashed #000',
}}
>
<div
style={{
fontSize: '12px',
width: '90%',
}}
>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Bill Gross Amount
</span>
<strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}
</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: '800',
color: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Net Bill Amount
</span>
<strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}
</strong>
</div>
</div>
</div>
)}
<div <div
style={{ style={{
display: 'flex', display: 'flex',

4739
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
View File

File diff suppressed because it is too large Load Diff

5115
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
View File

File diff suppressed because it is too large Load Diff

138
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
View File

@ -137,18 +137,6 @@ const Printstyle2 = ({
let PaymentStatusSuccess = PaymentStatus?.filter( let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S' (ps) => ps.PaymentStatus === 'S'
); );
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
const keysLength = Object.keys(table2Data ?? {}).length; const keysLength = Object.keys(table2Data ?? {}).length;
if (keysLength > 0) { if (keysLength > 0) {
dispatch(changeReprintDataFound(true)); dispatch(changeReprintDataFound(true));
@ -1658,7 +1646,7 @@ const Printstyle2 = ({
<div> <div>
<div className="PrintStyle2-FourthDivMaster"> <div className="PrintStyle2-FourthDivMaster">
<div className="PrintStyle2-FourthP"> <div className="PrintStyle2-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map( {Object.keys(aggregatedPayments).map(
@ -1678,46 +1666,6 @@ const Printstyle2 = ({
)} )}
</> </>
)} )}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData && GlobalCashierName && ( {GlobaldummyData && GlobalCashierName && (
<div> Cashier : Cashier Name</div> <div> Cashier : Cashier Name</div>
)} )}
@ -2529,7 +2477,7 @@ const Printstyle2 = ({
<div> <div>
<div className="PrintStyle2-FourthDivMaster"> <div className="PrintStyle2-FourthDivMaster">
<div className="PrintStyle2-FourthP"> <div className="PrintStyle2-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map( {Object.keys(aggregatedPayments).map(
@ -2549,46 +2497,6 @@ const Printstyle2 = ({
)} )}
</> </>
)} )}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData && GlobalCashierName && ( {GlobaldummyData && GlobalCashierName && (
<div> Cashier : Cashier Name</div> <div> Cashier : Cashier Name</div>
)} )}
@ -4086,7 +3994,7 @@ const Printstyle2 = ({
<div> <div>
<div className="PrintStyle2-FourthDivMaster"> <div className="PrintStyle2-FourthDivMaster">
<div className="PrintStyle2-FourthP"> <div className="PrintStyle2-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -4100,46 +4008,6 @@ const Printstyle2 = ({
))} ))}
</> </>
)} )}
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData && GlobalCashierName && ( {GlobaldummyData && GlobalCashierName && (
<div> Cashier : Cashier Name</div> <div> Cashier : Cashier Name</div>
)} )}

147
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
View File

@ -105,18 +105,6 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
if (keysLength > 0) { if (keysLength > 0) {
dispatch(changeReprintDataFound(true)); dispatch(changeReprintDataFound(true));
} }
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
const currentDate = new Date(); const currentDate = new Date();
const day = currentDate.getDate().toString().padStart(2, '0'); const day = currentDate.getDate().toString().padStart(2, '0');
const monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; const monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
@ -506,51 +494,11 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
<div style={{ marginTop: '5px', padding: 0, fontSize: "17px", fontWeight: "600" }}>{GlobaldummyData ? 'Cash' : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""}Payment : &nbsp;{GlobaldummyData ? '1,066' : Number(table2Data?.NetAmount).toFixed(2)}/- </div> <div style={{ marginTop: '5px', padding: 0, fontSize: "17px", fontWeight: "600" }}>{GlobaldummyData ? 'Cash' : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""}Payment : &nbsp;{GlobaldummyData ? '1,066' : Number(table2Data?.NetAmount).toFixed(2)}/- </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
<div className="PrintStyle3-print-stradrs" style={{ display: 'flex', justifyContent: 'space-between' }}> <div className="PrintStyle3-print-stradrs" style={{ display: 'flex', justifyContent: 'space-between' }}>
<div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', width: "100%" }}> <div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', width: "100%" }}>
<div style={{ fontSize: "14px", fontWeight: 600 }}>Your Order No :{GlobaldummyData ? '01' : table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)}</div> <div style={{ fontSize: "14px", fontWeight: 600 }}>Your Order No :{GlobaldummyData ? '01' : table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)}</div>
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 &&
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -559,8 +507,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
</div> </div>
))} ))}
</> </>
)} }
{GlobaldummyData && GlobalCashierName && {GlobaldummyData && GlobalCashierName &&
<div style={{ fontSize: "14px", fontWeight: 600 }}>Cashier : Cashier Name <div style={{ fontSize: "14px", fontWeight: 600 }}>Cashier : Cashier Name
</div> </div>
@ -904,52 +851,11 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
<div style={{ marginTop: '5px', padding: 0, fontSize: "17px", fontWeight: "600" }}>{GlobaldummyData ? 'Cash' : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""}Payment : &nbsp;{GlobaldummyData ? '1,066' : Number(table2Data?.NetAmount).toFixed(2)}/- </div> <div style={{ marginTop: '5px', padding: 0, fontSize: "17px", fontWeight: "600" }}>{GlobaldummyData ? 'Cash' : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""}Payment : &nbsp;{GlobaldummyData ? '1,066' : Number(table2Data?.NetAmount).toFixed(2)}/- </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
<div className="PrintStyle3-print-stradrs" style={{ display: 'flex', justifyContent: 'space-between' }}> <div className="PrintStyle3-print-stradrs" style={{ display: 'flex', justifyContent: 'space-between' }}>
<div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', width: "100%" }}> <div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', width: "100%" }}>
<div style={{ fontSize: "14px", fontWeight: 600 }}>Your Order No :{GlobaldummyData ? '01' : table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)}</div> <div style={{ fontSize: "14px", fontWeight: 600 }}>Your Order No :{GlobaldummyData ? '01' : table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)}</div>
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 &&
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -958,7 +864,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
</div> </div>
))} ))}
</> </>
)} }
{GlobaldummyData && GlobalCashierName && {GlobaldummyData && GlobalCashierName &&
<div style={{ fontSize: "14px", fontWeight: 600 }}>Cashier : Cashier Name <div style={{ fontSize: "14px", fontWeight: 600 }}>Cashier : Cashier Name
</div> </div>
@ -1421,46 +1327,6 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
<div style={{ marginTop: '5px', padding: 0, fontSize: "17px", fontWeight: "600" }}>{GlobaldummyData ? 'Cash' : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""}Payment : &nbsp;{GlobaldummyData ? '1,066' : Number(table2Data?.NetAmount).toFixed(2)}/- </div> <div style={{ marginTop: '5px', padding: 0, fontSize: "17px", fontWeight: "600" }}>{GlobaldummyData ? 'Cash' : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""}Payment : &nbsp;{GlobaldummyData ? '1,066' : Number(table2Data?.NetAmount).toFixed(2)}/- </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData ? ( {GlobaldummyData ? (
GlobalCredit && ( GlobalCredit && (
@ -1519,7 +1385,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
<div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', width: "100%" }}> <div style={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', width: "100%" }}>
<div style={{ fontSize: "14px", fontWeight: 600 }}>Your Order No :{GlobaldummyData ? '01' : table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)}</div> <div style={{ fontSize: "14px", fontWeight: 600 }}>Your Order No :{GlobaldummyData ? '01' : table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)}</div>
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 &&
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -1528,8 +1394,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
</div> </div>
))} ))}
</> </>
)} }
{GlobaldummyData && GlobalCashierName && {GlobaldummyData && GlobalCashierName &&
<div style={{ fontSize: "14px", fontWeight: 600 }}>Cashier : Cashier Name <div style={{ fontSize: "14px", fontWeight: 600 }}>Cashier : Cashier Name
</div> </div>

140
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
View File

@ -146,17 +146,6 @@ const Printstyle4 = ({
let PaymentStatusSuccess = PaymentStatus?.filter( let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S' (ps) => ps.PaymentStatus === 'S'
); );
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
const keysLength = Object.keys(table2Data ?? {}).length; const keysLength = Object.keys(table2Data ?? {}).length;
if (keysLength > 0) { if (keysLength > 0) {
@ -1643,46 +1632,6 @@ const Printstyle4 = ({
/-{' '} /-{' '}
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '90%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
@ -1835,7 +1784,7 @@ const Printstyle4 = ({
extractLastNumber(table2Data?.SalesId)} extractLastNumber(table2Data?.SalesId)}
</div> </div>
<div className="PrintStyle4-FourthP"> <div className="PrintStyle4-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map( {Object.keys(aggregatedPayments).map(
@ -1855,7 +1804,6 @@ const Printstyle4 = ({
)} )}
</> </>
)} )}
{GlobaldummyData && GlobalCashierName && ( {GlobaldummyData && GlobalCashierName && (
<div className="PrintStyle4-FourthSmallwordings"> <div className="PrintStyle4-FourthSmallwordings">
{' '} {' '}
@ -2604,46 +2552,6 @@ const Printstyle4 = ({
/-{' '} /-{' '}
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '90%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
@ -2789,7 +2697,7 @@ const Printstyle4 = ({
extractLastNumber(table2Data?.SalesId)} extractLastNumber(table2Data?.SalesId)}
</div> </div>
<div className="PrintStyle4-FourthP"> <div className="PrintStyle4-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map( {Object.keys(aggregatedPayments).map(
@ -4355,46 +4263,6 @@ const Printstyle4 = ({
/-{' '} /-{' '}
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '10px',
width: '90%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -4526,14 +4394,13 @@ const Printstyle4 = ({
</div> </div>
)} )}
<div style={{}}> <div style={{}}>
{/* <div className='PrintStyle4-FourthSmallwordings'>Scan to Pay</div> */} {/* <div className='PrintStyle4-FourthSmallwordings'>Scan to Pay</div> */}
<div style={{ fontSize: '12px', fontWeight: '600' }}> <div style={{ fontSize: '12px', fontWeight: '600' }}>
YOUR ORDER NO: YOUR ORDER NO:
{table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)} {table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)}
</div> </div>
<div className="PrintStyle4-FourthP"> <div className="PrintStyle4-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -4547,7 +4414,6 @@ const Printstyle4 = ({
))} ))}
</> </>
)} )}
{GlobaldummyData && GlobalCashierName && ( {GlobaldummyData && GlobalCashierName && (
<div className="PrintStyle4-FourthSmallwordings"> <div className="PrintStyle4-FourthSmallwordings">
{' '} {' '}

137
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
View File

@ -138,17 +138,6 @@ const PrintStyle5 = ({
let PaymentStatusSuccess = PaymentStatus?.filter( let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S' (ps) => ps.PaymentStatus === 'S'
); );
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
const keysLength = Object.keys(table2Data ?? {}).length; const keysLength = Object.keys(table2Data ?? {}).length;
if (keysLength > 0) { if (keysLength > 0) {
dispatch(changeReprintDataFound(true)); dispatch(changeReprintDataFound(true));
@ -1464,46 +1453,6 @@ const PrintStyle5 = ({
/-{' '} /-{' '}
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -1649,7 +1598,7 @@ const PrintStyle5 = ({
extractLastNumber(table2Data?.SalesId)} extractLastNumber(table2Data?.SalesId)}
</div> </div>
<div className="PrintStyle4-FourthP"> <div className="PrintStyle4-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map( {Object.keys(aggregatedPayments).map(
@ -2204,46 +2153,6 @@ const PrintStyle5 = ({
/-{' '} /-{' '}
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -2382,7 +2291,7 @@ const PrintStyle5 = ({
extractLastNumber(table2Data?.SalesId)} extractLastNumber(table2Data?.SalesId)}
</div> </div>
<div className="PrintStyle4-FourthP"> <div className="PrintStyle4-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -3658,46 +3567,6 @@ const PrintStyle5 = ({
/-{' '} /-{' '}
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -3825,7 +3694,7 @@ const PrintStyle5 = ({
{table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)} {table2Data?.SalesId && extractLastNumber(table2Data?.SalesId)}
</div> </div>
<div className="PrintStyle4-FourthP"> <div className="PrintStyle4-FourthP">
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (

163
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
View File

@ -102,7 +102,6 @@ const Printstyle6 = ({
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
console.log(CashierNameField, "GlobaldummyData")
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -124,17 +123,6 @@ const Printstyle6 = ({
const paymentTypeUPI = PaymentStatus?.find( const paymentTypeUPI = PaymentStatus?.find(
(ps) => ps.PaymentTypeName === 'UPI' (ps) => ps.PaymentTypeName === 'UPI'
); );
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
console.log(GlobalDiscount, Discount, 'Discount'); console.log(GlobalDiscount, Discount, 'Discount');
@ -433,9 +421,9 @@ const Printstyle6 = ({
: '')} : '')}
</div> </div>
{table2Data?.BrMobile && <div style={{ fontSize: 'clamp(0.65rem, 2.5vw, 1rem)' }}> <div style={{ fontSize: 'clamp(0.65rem, 2.5vw, 1rem)' }}>
Mobile : {table2Data?.BrMobile} Mobile : {table2Data?.BrMobile}
</div>} </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && (
<div <div
@ -1661,46 +1649,7 @@ const Printstyle6 = ({
: Number(table2Data?.NetAmount).toFixed(2)} : Number(table2Data?.NetAmount).toFixed(2)}
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -1773,7 +1722,7 @@ const Printstyle6 = ({
</div> </div>
)} )}
{(PaymentStatus?.length > 1 && !isEditedBill) && ( {PaymentStatus?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -1861,7 +1810,7 @@ const Printstyle6 = ({
</div> </div>
{/* <div style={{ fontWeight: 'bolder', fontSize: '12px' }}>Card No</div> */} {/* <div style={{ fontWeight: 'bolder', fontSize: '12px' }}>Card No</div> */}
{GlobaldummyData && GlobalCashierName && ( {GlobaldummyData && (
<div <div
style={{ style={{
fontSize: 'clamp(0.65rem, 2.5vw, 1rem)', fontSize: 'clamp(0.65rem, 2.5vw, 1rem)',
@ -1875,8 +1824,7 @@ const Printstyle6 = ({
{CashierName && {CashierName &&
CashierName !== undefined && CashierName !== undefined &&
CashierName !== null && CashierName !== null &&
!GlobaldummyData && !GlobaldummyData && (
CashierNameField && (
<div <div
style={{ style={{
fontSize: 'clamp(0.65rem, 2.5vw, 1rem)', fontSize: 'clamp(0.65rem, 2.5vw, 1rem)',
@ -2662,47 +2610,6 @@ const Printstyle6 = ({
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
<div <div
@ -2774,7 +2681,7 @@ const Printstyle6 = ({
) : null} ) : null}
</div> </div>
)} )}
{(PaymentStatus?.length > 1 && !isEditedBill) && ( {PaymentStatus?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -2858,7 +2765,7 @@ const Printstyle6 = ({
</div> </div>
{/* <div style={{ fontWeight: 'bolder', fontSize: '12px' }}>Card No</div> */} {/* <div style={{ fontWeight: 'bolder', fontSize: '12px' }}>Card No</div> */}
{GlobaldummyData && GlobalCashierName && ( {GlobaldummyData && (
<div <div
style={{ style={{
fontSize: 'clamp(0.65rem, 2.5vw, 1rem)', fontSize: 'clamp(0.65rem, 2.5vw, 1rem)',
@ -2872,8 +2779,7 @@ const Printstyle6 = ({
{CashierName && {CashierName &&
CashierName !== undefined && CashierName !== undefined &&
CashierName !== null && CashierName !== null &&
!GlobaldummyData && !GlobaldummyData && (
CashierNameField && (
<div <div
style={{ style={{
fontSize: 'clamp(0.65rem, 2.5vw, 1rem)', fontSize: 'clamp(0.65rem, 2.5vw, 1rem)',
@ -3285,9 +3191,9 @@ const Printstyle6 = ({
: '')} : '')}
</div> </div>
{table2Data?.BrMobile && <div style={{ fontSize: 'clamp(0.65rem, 2.5vw, 1rem)' }}> <div style={{ fontSize: 'clamp(0.65rem, 2.5vw, 1rem)' }}>
Mobile : {table2Data?.BrMobile} Mobile : {table2Data?.BrMobile}
</div>} </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && (
<div <div
@ -4336,46 +4242,6 @@ const Printstyle6 = ({
: Number(table2Data?.NetAmount).toFixed(2)} : Number(table2Data?.NetAmount).toFixed(2)}
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && (
<div style={{
width: '100%', marginTop: '2px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start',
flexDirection: 'column', borderTop: '1px dashed #000'
}}>
<div
style={{
fontSize: '12px',
width: '100%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#000'
: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}>
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{GlobaldummyData {GlobaldummyData
? GlobalCredit && ( ? GlobalCredit && (
@ -4439,7 +4305,7 @@ const Printstyle6 = ({
) : null} ) : null}
</div> </div>
)} )}
{(PaymentStatus?.length > 1 && !isEditedBill) && ( {PaymentStatus?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -4522,7 +4388,7 @@ const Printstyle6 = ({
</div> </div>
{/* <div style={{ fontWeight: 'bolder', fontSize: '12px' }}>Card No</div> */} {/* <div style={{ fontWeight: 'bolder', fontSize: '12px' }}>Card No</div> */}
{GlobaldummyData && GlobalCashierName && ( {GlobaldummyData && (
<div <div
style={{ style={{
fontSize: 'clamp(0.65rem, 2.5vw, 1rem)', fontSize: 'clamp(0.65rem, 2.5vw, 1rem)',
@ -4536,8 +4402,7 @@ const Printstyle6 = ({
{CashierName && {CashierName &&
CashierName !== undefined && CashierName !== undefined &&
CashierName !== null && CashierName !== null &&
!GlobaldummyData && !GlobaldummyData && (
CashierNameField && (
<div <div
style={{ style={{
fontSize: 'clamp(0.65rem, 2.5vw, 1rem)', fontSize: 'clamp(0.65rem, 2.5vw, 1rem)',

5105
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
View File

File diff suppressed because it is too large Load Diff

5602
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
View File

File diff suppressed because it is too large Load Diff

425
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
View File

@ -30,10 +30,7 @@ import {
GlobalprintTax, GlobalprintTax,
} from '../../../../Features/ThemeChange/ThemeChange'; } from '../../../../Features/ThemeChange/ThemeChange';
import Logo from '../../../../Images/Logo.jpg'; import Logo from '../../../../Images/Logo.jpg';
import { import { GlobalUpiIDprint, PreferenceData } from '../../../../Features/BookingScreen/BookingData/BookingData';
GlobalUpiIDprint,
PreferenceData,
} from '../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.scss'; import '../../../../Styles/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.scss';
import QRCode from 'react-qr-code'; import QRCode from 'react-qr-code';
import signature from '../../../../Images/signatureimage.jpg'; import signature from '../../../../Images/signatureimage.jpg';
@ -122,19 +119,6 @@ const PrintStyle9 = ({
const paymentTypeUPI = PaymentStatus?.find( const paymentTypeUPI = PaymentStatus?.find(
(ps) => ps.PaymentTypeName === 'UPI' (ps) => ps.PaymentTypeName === 'UPI'
); );
const isEditedBill = PaymentStatus?.some((payment) => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
);
let TermsAndConditions = printDatas?.TermsandConditions; let TermsAndConditions = printDatas?.TermsandConditions;
let SignatureImg = printDatas?.Signature; let SignatureImg = printDatas?.Signature;
let Notestext = printDatas?.Notes; let Notestext = printDatas?.Notes;
@ -246,7 +230,7 @@ const PrintStyle9 = ({
HSN: '01', HSN: '01',
Size: 250, Size: 250,
UomName: 'g', UomName: 'g',
ProdTaxPercentage: 5, ProdTaxPercentage: 5
}, },
{ {
ProdName: 'ITEM 2', ProdName: 'ITEM 2',
@ -258,7 +242,7 @@ const PrintStyle9 = ({
HSN: '02', HSN: '02',
Size: 250, Size: 250,
UomName: 'g', UomName: 'g',
ProdTaxPercentage: 5, ProdTaxPercentage: 5
}, },
{ {
ProdName: 'ITEM 3', ProdName: 'ITEM 3',
@ -270,7 +254,7 @@ const PrintStyle9 = ({
HSN: '03', HSN: '03',
Size: 250, Size: 250,
UomName: 'g', UomName: 'g',
ProdTaxPercentage: 0, ProdTaxPercentage: 0
}, },
{ {
ProdName: 'ITEM 4', ProdName: 'ITEM 4',
@ -282,7 +266,7 @@ const PrintStyle9 = ({
HSN: '04', HSN: '04',
Size: 250, Size: 250,
UomName: 'g', UomName: 'g',
ProdTaxPercentage: 18, ProdTaxPercentage: 18
}, },
{ {
ProdName: 'ITEM 5', ProdName: 'ITEM 5',
@ -294,7 +278,7 @@ const PrintStyle9 = ({
HSN: '05', HSN: '05',
Size: 250, Size: 250,
UomName: 'g', UomName: 'g',
ProdTaxPercentage: 40, ProdTaxPercentage: 40
}, },
{ {
ProdName: 'ITEM 6', ProdName: 'ITEM 6',
@ -306,7 +290,7 @@ const PrintStyle9 = ({
HSN: '06', HSN: '06',
Size: 250, Size: 250,
UomName: 'g', UomName: 'g',
ProdTaxPercentage: 0, ProdTaxPercentage: 0
}, },
{ {
ProdName: 'ITEM 7', ProdName: 'ITEM 7',
@ -318,7 +302,7 @@ const PrintStyle9 = ({
HSN: '08', HSN: '08',
Size: 250, Size: 250,
UomName: 'g', UomName: 'g',
ProdTaxPercentage: 5, ProdTaxPercentage: 5
}, },
]; ];
@ -635,22 +619,16 @@ const PrintStyle9 = ({
Dis{' '} Dis{' '}
</th> </th>
)} )}
{GlobaldummyData {GlobaldummyData ?
? GlobalTax && ( GlobalTax &&
<th <th style={{ width: "10px", textAlign: "right" }}>
style={{ width: '10px', textAlign: 'right' }} Tax %
> </th> :
(Tax && table2Data?.OrderType !== 'E') &&
<th style={{ width: "10px", textAlign: "right" }}>
Tax % Tax %
</th> </th>
) }
: Tax &&
table2Data?.OrderType !== 'E' && (
<th
style={{ width: '10px', textAlign: 'right' }}
>
Tax %
</th>
)}
{GlobaldummyData {GlobaldummyData
? GlobalRate && ( ? GlobalRate && (
<th <th
@ -855,17 +833,15 @@ const PrintStyle9 = ({
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
? GlobalTax && ( ? GlobalTax &&
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage} {item?.ProdTaxPercentage}
</td> </td> :
) (Tax && table2Data?.OrderType !== 'E') &&
: Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0} {item?.ProdTaxPercentage || 0}
</td> </td>
)} }
{GlobaldummyData {GlobaldummyData
? GlobalRate && ( ? GlobalRate && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
@ -985,22 +961,16 @@ const PrintStyle9 = ({
Dis{' '} Dis{' '}
</th> </th>
)} )}
{GlobaldummyData {GlobaldummyData ?
? GlobalTax && ( GlobalTax &&
<th <th style={{ width: "10px", textAlign: "right" }}>
style={{ width: '10px', textAlign: 'right' }} Tax %
> </th> :
(Tax && table2Data?.OrderType !== 'E') &&
<th style={{ width: "10px", textAlign: "right" }}>
Tax % Tax %
</th> </th>
) }
: Tax &&
table2Data?.OrderType !== 'E' && (
<th
style={{ width: '10px', textAlign: 'right' }}
>
Tax %
</th>
)}
{GlobaldummyData {GlobaldummyData
? GlobalRate && ( ? GlobalRate && (
<th <th
@ -1114,17 +1084,15 @@ const PrintStyle9 = ({
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
? GlobalTax && ( ? GlobalTax &&
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage} {item?.ProdTaxPercentage}
</td> </td> :
) (Tax && table2Data?.OrderType !== 'E') &&
: Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0} {item?.ProdTaxPercentage || 0}
</td> </td>
)} }
{GlobaldummyData {GlobaldummyData
? GlobalRate && ( ? GlobalRate && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
@ -1354,9 +1322,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -1449,9 +1415,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -1539,9 +1503,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -1680,7 +1642,7 @@ const PrintStyle9 = ({
</div> </div>
)} )}
<div> <div>
{PaymentStatusSuccess?.length > 1 && !isEditedBill && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map( {Object.keys(aggregatedPayments).map(
@ -1837,85 +1799,7 @@ const PrintStyle9 = ({
)} )}
</div> </div>
{isEditedBill && lastTransaction && ( <div style={{ fontSize: '13px' }}>
<div
style={{
width: '100%',
marginTop: '2px',
paddingTop: '2px',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'column',
borderTop: '1px dashed #000',
}}
>
<div
style={{
fontSize: '13px',
width: '90%',
}}
>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Bill Gross Amount
</span>
<strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed(
2
)}
</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: '800',
color: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Net Bill Amount
</span>
<strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed(
2
)}
</strong>
</div>
</div>
</div>
)}
<div
style={{
fontSize: '13px',
width: '100%',
textAlign: 'center',
marginTop: '5px',
fontWeight: '600',
}}
>
Your Order No : Your Order No :
{GlobaldummyData {GlobaldummyData
? '01' ? '01'
@ -2353,9 +2237,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -2446,9 +2328,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -2534,9 +2414,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -2673,7 +2551,7 @@ const PrintStyle9 = ({
</div> </div>
)} )}
<div> <div>
{PaymentStatusSuccess?.length > 1 && !isEditedBill && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -2819,83 +2697,8 @@ const PrintStyle9 = ({
</div> </div>
)} )}
</div> </div>
{isEditedBill && lastTransaction && (
<div
style={{
width: '100%',
marginTop: '2px',
paddingTop: '2px',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'column',
borderTop: '1px dashed #000',
}}
>
<div
style={{
fontSize: '13px',
width: '90%',
}}
>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Bill Gross Amount
</span>
<strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed(
2
)}
</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: '800',
color: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND'
? '-'
: '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Net Bill Amount
</span>
<strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}
</strong>
</div>
</div>
</div>
)}
<div <div style={{ fontSize: '13px' }}>
style={{
fontSize: '13px',
width: '100%',
textAlign: 'center',
marginTop: '5px',
fontWeight: '600',
}}
>
Your Order No : Your Order No :
{GlobaldummyData {GlobaldummyData
? '01' ? '01'
@ -3361,18 +3164,16 @@ const PrintStyle9 = ({
Dis{' '} Dis{' '}
</th> </th>
)} )}
{GlobaldummyData {GlobaldummyData ?
? GlobalTax && ( GlobalTax &&
<th style={{ width: '10px', textAlign: 'right' }}> <th style={{ width: "10px", textAlign: "right" }}>
Tax %
</th> :
(Tax && table2Data?.OrderType !== 'E') &&
<th style={{ width: "10px", textAlign: "right" }}>
Tax % Tax %
</th> </th>
) }
: Tax &&
table2Data?.OrderType !== 'E' && (
<th style={{ width: '10px', textAlign: 'right' }}>
Tax %
</th>
)}
{GlobaldummyData {GlobaldummyData
? GlobalRate && ( ? GlobalRate && (
<th style={{ width: '10px', textAlign: 'right' }}> <th style={{ width: '10px', textAlign: 'right' }}>
@ -3507,17 +3308,15 @@ const PrintStyle9 = ({
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
? GlobalTax && ( ? GlobalTax &&
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage} {item?.ProdTaxPercentage}
</td> </td> :
) (Tax && table2Data?.OrderType !== 'E') &&
: Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0} {item?.ProdTaxPercentage || 0}
</td> </td>
)} }
{GlobaldummyData {GlobaldummyData
? GlobalRate && ( ? GlobalRate && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
@ -3617,18 +3416,16 @@ const PrintStyle9 = ({
Dis{' '} Dis{' '}
</th> </th>
)} )}
{GlobaldummyData {GlobaldummyData ?
? GlobalTax && ( GlobalTax &&
<th style={{ width: '10px', textAlign: 'right' }}> <th style={{ width: "10px", textAlign: "right" }}>
Tax %
</th> :
(Tax && table2Data?.OrderType !== 'E') &&
<th style={{ width: "10px", textAlign: "right" }}>
Tax % Tax %
</th> </th>
) }
: Tax &&
table2Data?.OrderType !== 'E' && (
<th style={{ width: '10px', textAlign: 'right' }}>
Tax %
</th>
)}
{GlobaldummyData {GlobaldummyData
? GlobalRate && ( ? GlobalRate && (
<th style={{ width: '10px', textAlign: 'right' }}> <th style={{ width: '10px', textAlign: 'right' }}>
@ -3731,17 +3528,15 @@ const PrintStyle9 = ({
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
? GlobalTax && ( ? GlobalTax &&
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage} {item?.ProdTaxPercentage}
</td> </td> :
) (Tax && table2Data?.OrderType !== 'E') &&
: Tax &&
table2Data?.OrderType !== 'E' && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.ProdTaxPercentage || 0} {item?.ProdTaxPercentage || 0}
</td> </td>
)} }
{GlobaldummyData {GlobaldummyData
? GlobalRate && ( ? GlobalRate && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
@ -3959,9 +3754,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -4052,9 +3845,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -4138,9 +3929,7 @@ const PrintStyle9 = ({
fontSize: '11px', fontSize: '11px',
textAlign: 'right', textAlign: 'right',
}} }}
> >{item?.TaxPercentage || 0}%</td>
{item?.TaxPercentage || 0}%
</td>
<td <td
style={{ style={{
fontSize: '11px', fontSize: '11px',
@ -4270,7 +4059,7 @@ const PrintStyle9 = ({
</div> </div>
)} )}
<div> <div>
{PaymentStatusSuccess?.length > 1 && !isEditedBill && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -4401,79 +4190,7 @@ const PrintStyle9 = ({
)} )}
</div> </div>
{isEditedBill && lastTransaction && ( <div style={{ fontSize: '13px' }}>
<div
style={{
width: '100%',
marginTop: '2px',
paddingTop: '2px',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'column',
borderTop: '1px dashed #000',
}}
>
<div
style={{
fontSize: '13px',
width: '90%',
}}
>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Bill Gross Amount
</span>
<strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}
</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
fontWeight: '800',
color: '#000',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span style={{ color: '#000', fontWeight: '600' }}>
Net Bill Amount
</span>
<strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}
</strong>
</div>
</div>
</div>
)}
<div
style={{
fontSize: '13px',
width: '100%',
textAlign: 'center',
marginTop: '5px',
fontWeight: '600',
}}
>
Your Order No : Your Order No :
{GlobaldummyData {GlobaldummyData
? '01' ? '01'

1
src/Pages/DashBoard/RetailDashboard.jsx
View File

@ -264,6 +264,7 @@ const RetailDashboard = () => {
useEffect(() => { useEffect(() => {
if (isInitialLoad && CompId && AppId && selection === 'dashboard') { if (isInitialLoad && CompId && AppId && selection === 'dashboard') {
// debugger
if (dates && dates?.[0] && dates?.[1] && !initialDate) { if (dates && dates?.[0] && dates?.[1] && !initialDate) {
onRangeChange(dates, [ onRangeChange(dates, [
dates?.[0]?.format('DD-MM-YYYY'), dates?.[0]?.format('DD-MM-YYYY'),

1
src/Pages/Kiosk/CardPage/SelfCardPage1.jsx
View File

@ -603,6 +603,7 @@ const CardPage1 = (props) => {
}; };
// add Product in cart state // add Product in cart state
const AddOrderDetails = async (item) => { const AddOrderDetails = async (item) => {
// debugger
message.success(`${item?.ProdName} Added in the Cart`); message.success(`${item?.ProdName} Added in the Cart`);
const isItemInCart = KioskOrderDetails?.find( const isItemInCart = KioskOrderDetails?.find(
(cartItem) => (cartItem) =>

3
src/Pages/Preference/PreferenceList.jsx
View File

@ -108,7 +108,6 @@ const PreferenceList = () => {
weeklysalesreport: allSettingsMap['weeklysalesreport'] === 'Y', weeklysalesreport: allSettingsMap['weeklysalesreport'] === 'Y',
notificationblink: allSettingsMap['notificationblink'] === 'Y', notificationblink: allSettingsMap['notificationblink'] === 'Y',
onlineindivdualslots: allSettingsMap['onlineindivdualslots'] === 'Y', onlineindivdualslots: allSettingsMap['onlineindivdualslots'] === 'Y',
editbill: allSettingsMap['editbill'] === 'Y',
notification: [ notification: [
...(allSettingsMap['onbilltime'] === 'Y' ? ['onbilltime'] : []), ...(allSettingsMap['onbilltime'] === 'Y' ? ['onbilltime'] : []),
...(allSettingsMap['1daybefore'] === 'Y' ? ['1daybefore'] : []), ...(allSettingsMap['1daybefore'] === 'Y' ? ['1daybefore'] : []),
@ -309,7 +308,6 @@ const PreferenceList = () => {
lowstockreport: values.lowstockreport, lowstockreport: values.lowstockreport,
weeklysalesreport: values.weeklysalesreport, weeklysalesreport: values.weeklysalesreport,
notificationblink: values.notificationblink, notificationblink: values.notificationblink,
editbill: values.editbill,
}; };
const arrayValues = { const arrayValues = {
@ -629,7 +627,6 @@ const PreferenceList = () => {
'Do you Want Customised Bill Number?' 'Do you Want Customised Bill Number?'
)} )}
{renderCheckbox('upiqr', 'Do you want to show the UPI QR code?')} {renderCheckbox('upiqr', 'Do you want to show the UPI QR code?')}
{/* {renderCheckbox('editbill', 'Do you want to edit the previously created bill?')} */}
</div> </div>
<Divider /> <Divider />

1
src/Pages/Tablebooking/TableBooking.jsx
View File

@ -1034,6 +1034,7 @@ const TableBooking = ({ PaymentStatus }) => {
); );
const navigatetoBooking = async (data) => { const navigatetoBooking = async (data) => {
const OrderDetails = data?.OrderDetails?.[0]; const OrderDetails = data?.OrderDetails?.[0];
const { const {
OrderDtlDetails, OrderDtlDetails,

82
src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
View File

@ -49,18 +49,6 @@ const PaymentPdfBooking = ({
let PaymentStatusSuccess = PaymentStatus?.filter( let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S' (ps) => ps.PaymentStatus === 'S'
); );
const isEditedBill = PaymentStatus?.some(payment => {
const type = payment?.AdjustmentType?.toLowerCase();
return (
(type === 'extra' || type === 'refund') &&
payment?.BeforeAdjustment != null &&
payment?.AfterAdjustment != null
);
});
const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
)
console.log(singleData2?.filter(data => data?.EditTokenAvailable !== 'N'), "singleData2")
const ExtraChargeTotal = table2Data?.ExtraChargeDetails?.reduce( const ExtraChargeTotal = table2Data?.ExtraChargeDetails?.reduce(
(accumulator, currentObject) => { (accumulator, currentObject) => {
return accumulator + currentObject.TotalAmt; return accumulator + currentObject.TotalAmt;
@ -92,7 +80,6 @@ const PaymentPdfBooking = ({
const [BranchZip, setBranchZip] = useState(); const [BranchZip, setBranchZip] = useState();
const CashierName = getSession('userName'); const CashierName = getSession('userName');
const printerTemplateStyle = useSelector(SelectedPrintTemplate); const printerTemplateStyle = useSelector(SelectedPrintTemplate);
console.log(printerTemplateStyle, "printerTemplateStyle")
const appPreferences = useSelector(ApplicationPreferences); const appPreferences = useSelector(ApplicationPreferences);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const estimatePrintHeader = const estimatePrintHeader =
@ -310,21 +297,6 @@ const PaymentPdfBooking = ({
return `${h}:${m}${suffix}`; return `${h}:${m}${suffix}`;
}; };
const getAdjustmentLabel = (type) => {
switch (type?.toUpperCase()) {
case 'REFUND':
return 'Returned Item Amount';
case 'EXTRA':
return 'Additional Amount';
case 'DISCOUNT':
return 'Discount Applied';
case 'ROUND_OFF':
return 'Round Off';
default:
return 'Adjustment Amount';
}
};
return ( return (
<> <>
<div className="Reprint-body" id={`RePrint-${index}`}> <div className="Reprint-body" id={`RePrint-${index}`}>
@ -386,9 +358,9 @@ const PaymentPdfBooking = ({
GSTIN: {table2Data?.BrGSTIN} GSTIN: {table2Data?.BrGSTIN}
</p> </p>
)} )}
{table2Data?.BrMobile && <p style={{ fontSize: '9px', margin: '7px 0 0 0', padding: 0 }}> <p style={{ fontSize: '9px', margin: '7px 0 0 0', padding: 0 }}>
Mobile:+91 {table2Data?.BrMobile} Mobile:+91 {table2Data?.BrMobile}
</p>} </p>
</div> </div>
</div> </div>
</div> </div>
@ -1137,7 +1109,7 @@ const PaymentPdfBooking = ({
></div> ></div>
)} )}
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments)?.map((paymentType) => ( {Object.keys(aggregatedPayments)?.map((paymentType) => (
@ -1150,48 +1122,6 @@ const PaymentPdfBooking = ({
))} ))}
</> </>
)} )}
{isEditedBill && lastTransaction && (
<div style={{
width: '90%', marginTop: '2px',
marginLeft: '10px',
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'center',
flexDirection: 'column', borderTop: '1px dashed #ccc'
}}>
<div
style={{
fontSize: '12px',
width: '70%'
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#333' }}>Bill Gross Amount</span>
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
fontWeight: 600,
color:
lastTransaction?.AdjustmentType === 'REFUND'
? '#d32f2f'
: '#2e7d32',
}}
>
<span>{'Adjustment Amount'}</span>
<span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{(lastTransaction?.Amount || 0).toFixed(2)}
</span>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ color: '#333' }}>Net Bill Amount</span>
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong>
</div>
</div>
</div>
)}
{table2Data?.CustSuppName && ( {table2Data?.CustSuppName && (
<div> <div>
<p <p
@ -1652,7 +1582,7 @@ const PaymentPdfBooking = ({
{/* Token print */} {/* Token print */}
{Object.entries( {Object.entries(
singleData2?.filter(data => data?.EditTokenAvailable !== 'N')?.reduce((acc, item, idx) => { singleData2?.reduce((acc, item, idx) => {
if (item.TokenAvailable === 'Y') { if (item.TokenAvailable === 'Y') {
if (!item.CounterName) { if (!item.CounterName) {
// For null or empty CounterName, print each item individually // For null or empty CounterName, print each item individually
@ -1695,9 +1625,9 @@ const PaymentPdfBooking = ({
<tr className="Re-print-body-Tr" key={idx}> <tr className="Re-print-body-Tr" key={idx}>
<td className="Re-print-td">{idx + 1}</td> <td className="Re-print-td">{idx + 1}</td>
<td className="Re-print-body-Product">{item.ProdName}</td> <td className="Re-print-body-Product">{item.ProdName}</td>
<td className="Re-print-body-Rate">{item?.EditTokenAvailable === 'Y' ? item?.EditTokenQty : item.SalesQty}</td> <td className="Re-print-body-Rate">{item.SalesQty}</td>
<td className="Re-print-body-Rate">{item.Rate}</td> <td className="Re-print-body-Rate">{item.Rate}</td>
<td className="Re-print-body-Rate">{((item?.EditTokenAvailable === 'Y' ? item?.EditTokenQty : item.SalesQty) * item.Rate) - ((item?.EditTokenAvailable === 'Y' ? (item?.OfferAmt / item?.EditTokenQty) : item?.OfferAmt))}</td> <td className="Re-print-body-Rate">{item.TotalAmt}</td>
</tr> </tr>
))} ))}
</tbody> </tbody>