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

Merge pull request 'sales bill edit fix' (#158) from temp/camera-feature-for-upload into main 

Reviewed-on: Pozomind/pozo-retail-app#158
This commit is contained in:
karthikalakshmi 2026-02-20 11:28:37 +05:30
parent 578ca67441 a69849d301
commit 5bcd631700
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Pages/BookingScreen/Components/BookingFunctionality/FeaturesFunctionalities.jsx
View File

@ -141,6 +141,7 @@ const FeaturesFunctionalities = (props) => {
const formRefExtraCharges = useRef(); const formRefExtraCharges = useRef();
const ExtraChargesType = useSelector(globalExtraChargesType); const ExtraChargesType = useSelector(globalExtraChargesType);
const GlobalExtraCharge = useSelector(globalExtraTotalAmount); const GlobalExtraCharge = useSelector(globalExtraTotalAmount);
console.log(GlobalExtraCharge, "GlobalExtraCharge")
const ReorderHoldDetails = useSelector(GlobalReorderHoldDetails); const ReorderHoldDetails = useSelector(GlobalReorderHoldDetails);
const BookingType = useSelector(GlobalBookingType); const BookingType = useSelector(GlobalBookingType);
const BookingTypeBoth = useSelector(GlobalBookingTypeBoth); const BookingTypeBoth = useSelector(GlobalBookingTypeBoth);
@ -641,8 +642,8 @@ const FeaturesFunctionalities = (props) => {
let globalexdata = GlobalExtraCharge?.map((item) => { let globalexdata = GlobalExtraCharge?.map((item) => {
let mappedItem = { let mappedItem = {
UniqueId: item?.ExtraChargeId, UniqueId: item?.ExtraChargeId,
QTY: item?.OrderQty, QTY: item?.OrderQty || item?.SalesQty,
Price: item?.OrderRate, Price: item?.OrderRate || item?.Rate,
ProdId: null, ProdId: null,
InwardDtlId: null, InwardDtlId: null,
ExtraChargeType: item?.ExtraChargeType, ExtraChargeType: item?.ExtraChargeType,

10
src/Pages/BookingScreen/Components/UtillComponents/BSNavBarEst.jsx
View File

@ -9,6 +9,7 @@ import {
changeSelProdWiseEst, changeSelProdWiseEst,
ChangeOverAllDiscSales, ChangeOverAllDiscSales,
ChangeOverAllDiscEstimate, ChangeOverAllDiscEstimate,
GlobalSalesBillEdit,
} from '../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../Features/BookingScreen/BookingData/BookingData';
import BSEstimateModal from '../BookingFunctionality/BSEstModal'; import BSEstimateModal from '../BookingFunctionality/BSEstModal';
import { GlobalpreOrderOpen } from '../../../../Features/BookingScreen/PreOrder/PreOrder.js'; import { GlobalpreOrderOpen } from '../../../../Features/BookingScreen/PreOrder/PreOrder.js';
@ -25,6 +26,7 @@ const BSNavBarEstimate = () => {
const preOrderOpen = useSelector(GlobalpreOrderOpen); const preOrderOpen = useSelector(GlobalpreOrderOpen);
const EstBooking = useSelector(GlobalEstimateBooking); const EstBooking = useSelector(GlobalEstimateBooking);
const [EstModalOpen, setEstModalOpen] = useState(false); const [EstModalOpen, setEstModalOpen] = useState(false);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const [PopOpen, setPopOpen] = useState(false); const [PopOpen, setPopOpen] = useState(false);
const ChangeEstMethod = () => { const ChangeEstMethod = () => {
if (!preOrderOpen) { if (!preOrderOpen) {
@ -37,7 +39,9 @@ const BSNavBarEstimate = () => {
setEstModalOpen(false); setEstModalOpen(false);
}; };
const EnableOptions = () => { const EnableOptions = () => {
setPopOpen(!PopOpen); if (!salesBillEdit) {
setPopOpen(!PopOpen);
}
}; };
const ChangeEstimateOption = (data) => { const ChangeEstimateOption = (data) => {
dispatch(changeEstimateBooking(data)); dispatch(changeEstimateBooking(data));
@ -47,7 +51,9 @@ const BSNavBarEstimate = () => {
setPopOpen(false); setPopOpen(false);
}; };
const handlePopoverVisible = (visible) => { const handlePopoverVisible = (visible) => {
setPopOpen(visible); if (!salesBillEdit) {
setPopOpen(visible);
}
}; };
return ( return (
<div className="BSBilling7-icon-flex"> <div className="BSBilling7-icon-flex">