Merge pull request 'price-weight-calculate' (#113) from price-weight-calculate into main

Reviewed-on: Pozomind/pozo-retail-app#113
This commit is contained in:
karthikalakshmi 2026-02-09 17:13:53 +05:30
commit c3ea71d8d8
3 changed files with 50 additions and 35 deletions

View File

@ -9,7 +9,7 @@ const WeightCalculatePrice = ({ itemData, CartOrderDetails, onSubmit }) => {
const [enteredPrice, setEnteredPrice] = useState(''); const [enteredPrice, setEnteredPrice] = useState('');
const [enteredQty, setEnteredQty] = useState(''); const [enteredQty, setEnteredQty] = useState('');
const [calculatedQty, setCalculatedQty] = useState(0); const [calculatedQty, setCalculatedQty] = useState(0);
const [calcMode, setCalcMode] = useState('amt'); const [calcMode, setCalcMode] = useState('kgs');
const priceInputRef = useRef(null); const priceInputRef = useRef(null);
const [form] = Form.useForm(); const [form] = Form.useForm();
@ -82,8 +82,8 @@ const WeightCalculatePrice = ({ itemData, CartOrderDetails, onSubmit }) => {
form.resetFields(); form.resetFields();
}} }}
> >
<Radio.Button value="amt">AMT</Radio.Button>
<Radio.Button value="kgs">KGS</Radio.Button> <Radio.Button value="kgs">KGS</Radio.Button>
<Radio.Button value="amt">AMT</Radio.Button>
</Radio.Group> </Radio.Group>
<p> <p>

View File

@ -241,15 +241,20 @@ const BSBillingTable3 = () => {
// 👉 CTRL shortcuts // 👉 CTRL shortcuts
if (!event.ctrlKey) return; if (!event.ctrlKey) return;
if (key === 'q') { if (key === 'q') {
event.preventDefault(); event.preventDefault();
handleShortcut('qty'); handleShortcut('qty');
} } else if (key === 'e') {
event.preventDefault();
if (key === 'e') { handleShortcut('price');
event.preventDefault(); } else if (key === 'y') {
handleShortcut('price'); event.preventDefault();
} handleShortcut('Parcel');
} else if (key === 'b') {
event.preventDefault();
handleShortcut('weightAmount');
}
}; };
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);

View File

@ -237,7 +237,7 @@ const StandardTable = () => {
window.removeEventListener('keydown', handleKeyDown); window.removeEventListener('keydown', handleKeyDown);
}; };
}, [GetCustId, OrderCardDetail]); }, [GetCustId, OrderCardDetail]);
useEffect(() => { useEffect(() => {
if (!preferenceshortcutkey) return; if (!preferenceshortcutkey) return;
@ -262,30 +262,40 @@ const StandardTable = () => {
handleEditQuantity(item); handleEditQuantity(item);
setshortKeyMethod(method); setshortKeyMethod(method);
}; };
const handleKeyDown = (event) => { const handleKeyDown = (event) => {
const key = event.key.toLowerCase(); const key = event.key.toLowerCase();
// 👉 ALT + P Open Edit Total Amount // 👉 ALT + P Open Edit Total Amount
if (event.altKey && key === 'p') { if (event.altKey && key === 'p') {
event.preventDefault(); event.preventDefault();
if (OrderCardDetail?.length > 0) { if (OrderCardDetail?.length > 0) {
OpenEditTotalAmount(); OpenEditTotalAmount();
}
return;
} }
return; // 👉 CTRL shortcuts
} if (!event.ctrlKey) return;
// 👉 CTRL shortcuts // if (key === 'q') {
if (!event.ctrlKey) return; // event.preventDefault();
// handleShortcut('qty');
if (key === 'q') { // }
event.preventDefault(); // if (key === 'e') {
handleShortcut('qty'); // event.preventDefault();
} // handleShortcut('price');
// }
if (key === 'e') { if (key === 'q') {
event.preventDefault(); event.preventDefault();
handleShortcut('price'); handleShortcut('qty');
} } else if (key === 'e') {
}; event.preventDefault();
handleShortcut('price');
} else if (key === 'y') {
event.preventDefault();
handleShortcut('Parcel');
} else if (key === 'b') {
event.preventDefault();
handleShortcut('weightAmount');
}
};
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);
return () => { return () => {