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

priceoveride

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

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

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

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

@ -260,7 +260,7 @@ export default function BST1Payment() {
const RetailWSSalesType = useSelector(GlobalRetailWSSalesType);
const SelCustId = useSelector(GlobalSelCustId);
const selOption = useSelector(GlobalSelOption);
console.log(selOption, 'selOptionbst234343',GetCustId);
console.log(selOption, 'selOptionbst234343', GetCustId);
const SelectedTableDetails = useSelector(GlobalSelectedTableDetails);
const GlobalAddCustomerDetails1 = useSelector(GlobalAddCustomerDetails);
@ -2051,6 +2051,9 @@ export default function BST1Payment() {
BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl,
SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
}));
const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType

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

@ -2130,7 +2130,9 @@ const BSBillingTable2 = () => {
ModelNumber: a.ModelNumber,
BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl,
SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
}));
const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType

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

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

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

@ -2154,6 +2154,9 @@ const BSBilling4Payment = () => {
PackageDtl: a.PackageDtl,
SetCount: a.SetCount,
BookingDate: AvailableDate ? a.BookedDate : null,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
}));
const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType

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

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

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

@ -2147,6 +2147,9 @@ const BSBillingTable5 = () => {
BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl,
SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
}));
const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType

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

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

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

@ -1,4 +1,4 @@
import React, { useEffect, useState, useRef, lazy ,Suspense } from 'react';
import React, { useEffect, useState, useRef, lazy, Suspense } from 'react';
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom';
import moment from 'moment';
@ -2137,6 +2137,9 @@ const BST6Payment = () => {
BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl,
SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
}));
const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType

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

@ -240,7 +240,7 @@ const BSBilling7Payment = () => {
const screenwidth = useSelector(GlobalScreenSize);
const defaultBookingType = useSelector(GlobalDefaultBookingType);
const printerTemplateStyle = useSelector(SelectedPrintTemplate);
const AllBookingType=useSelector(GlobalAllBookingType)
const AllBookingType = useSelector(GlobalAllBookingType)
const FontFamily = useSelector(GlobalSelectedFont);
const OrderCardDetail = useSelector(GlobalOrderCardDetails);
const GetCustId = useSelector(GlobalCustId);
@ -696,8 +696,7 @@ const BSBilling7Payment = () => {
}, []);
useEffect(() => {
if (CompId && BranchId && AppId) {
if(holdCheckedSalesSetup)
{
if (holdCheckedSalesSetup) {
getHolddata();
}
// getUnpaiddatas();
@ -1926,8 +1925,7 @@ const BSBilling7Payment = () => {
setCurrentOrderNetAmount(0);
setPreviousNetAmount(0);
setUpinotSelected(false);
if(holdCheckedSalesSetup)
{
if (holdCheckedSalesSetup) {
getHolddata();
}
if (defaultBookingType === 'Both') {
@ -2122,6 +2120,9 @@ const BSBilling7Payment = () => {
BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl,
SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
}));
const NotSlectedTypeFind = temporderdetail?.find(
(a) => a?.BookingType != SelectedBookingType
@ -3328,10 +3329,10 @@ const BSBilling7Payment = () => {
setDefaultPaymentMode([]);
}
};
if(salesBillEdit){
if (salesBillEdit) {
setDefaultPaymentOption();
}
}, [defaultPaymentTrigger,salesBillEdit]);
}, [defaultPaymentTrigger, salesBillEdit]);
const Otherserviceprint = async () => {
if (OtherServicesPrintDetails?.length > 0) {

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

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

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

@ -2619,12 +2619,12 @@ const StandardTable = () => {
{item?.Type != 'C'
? item.Offer && item.Offer > 0
? item.Offer
: '-'
: item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%`
: '-'}
: item.DiscountAmt ? item.DiscountAmt : '-'}
</td>
)}
{tableitem.OptionName == 'Quantity' && (
@ -2943,12 +2943,12 @@ const StandardTable = () => {
{item?.Type != 'C'
? item.Offer && item.Offer > 0
? item.Offer
: '-'
: item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%`
: '-'}
: item.DiscountAmt ? item.DiscountAmt : '-'}
</td>
)}
{tableitem.OptionName == 'Quantity' && (
@ -3319,12 +3319,12 @@ const StandardTable = () => {
{item?.Type != 'C'
? item.Offer && item.Offer > 0
? item.Offer
: '-'
: item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%`
: '-'}
: item.DiscountAmt ? item.DiscountAmt : '-'}
</td>
)}
@ -3676,12 +3676,12 @@ const StandardTable = () => {
{item?.Type != 'C'
? item.Offer && item.Offer > 0
? item.Offer
: '-'
: item.DiscountAmt ? item.DiscountAmt : '-'
: item?.OfferPrice && item?.OfferPrice > 0
? item?.OfferType === 'F'
? `₹${safeRound(item.OfferPrice)}`
: `${item.OfferPrice}%`
: '-'}
: item.DiscountAmt ? item.DiscountAmt : '-'}
</td>
)}
{tableitem.OptionName == 'Quantity' && (

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

@ -1445,6 +1445,9 @@ const StandardTablePayment = () => {
BatchRef: a.BatchRef,
PackageDtl: a.PackageDtl,
SetCount: a.SetCount,
...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
...(a?.DiscountType && { DiscountType: a.DiscountType }),
...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt }),
BookingDate: AvailableDate
? Object.keys(ReportholdData)?.length > 0
? a?.BookingDate