Merge pull request 'qty-shortcut-key' (#108) from qty-shortcut-key into main
Reviewed-on: Pozomind/pozo-retail-app#108
This commit is contained in:
commit
fa70173fc1
|
|
@ -274,21 +274,44 @@ const BSBillingTable1 = () => {
|
|||
setshortKeyMethod(method);
|
||||
};
|
||||
|
||||
// const handleKeyDown = (event) => {
|
||||
// if (!event.ctrlKey) return;
|
||||
|
||||
// const key = event.key.toLowerCase();
|
||||
|
||||
// if (key === 'q') {
|
||||
// event.preventDefault();
|
||||
// handleShortcut('qty');
|
||||
// }
|
||||
|
||||
// if (key === 'e') {
|
||||
// event.preventDefault();
|
||||
// handleShortcut('price');
|
||||
// }
|
||||
// };
|
||||
const handleKeyDown = (event) => {
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
const key = event.key.toLowerCase();
|
||||
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
const key = event.key.toLowerCase();
|
||||
// 👉 ALT + P → Open Edit Total Amount
|
||||
if (event.altKey && key === 'p') {
|
||||
event.preventDefault();
|
||||
if (tableData?.length > 0) {
|
||||
OpenEditTotalAmount();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// 👉 CTRL shortcuts
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
}
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
return () => {
|
||||
|
|
|
|||
|
|
@ -228,22 +228,29 @@ const BSBillingTable3 = () => {
|
|||
handleEditQuantity(item);
|
||||
setshortKeyMethod(method);
|
||||
};
|
||||
|
||||
const handleKeyDown = (event) => {
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
const key = event.key.toLowerCase();
|
||||
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
const handleKeyDown = (event) => {
|
||||
const key = event.key.toLowerCase();
|
||||
// 👉 ALT + P → Open Edit Total Amount
|
||||
if (event.altKey && key === 'p') {
|
||||
event.preventDefault();
|
||||
if (tableData?.length > 0) {
|
||||
OpenEditTotalAmount();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// 👉 CTRL shortcuts
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
}
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
return () => {
|
||||
|
|
|
|||
|
|
@ -281,22 +281,29 @@ const BSBillingTable4 = () => {
|
|||
setshortKeyMethod(method);
|
||||
};
|
||||
|
||||
const handleKeyDown = (event) => {
|
||||
if (!preferenceshortcutkey) return;
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
const key = event.key.toLowerCase();
|
||||
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
const handleKeyDown = (event) => {
|
||||
const key = event.key.toLowerCase();
|
||||
// 👉 ALT + P → Open Edit Total Amount
|
||||
if (event.altKey && key === 'p') {
|
||||
event.preventDefault();
|
||||
if (tableData?.length > 0) {
|
||||
OpenEditTotalAmount();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// 👉 CTRL shortcuts
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
}
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
|
|
|
|||
|
|
@ -1927,22 +1927,29 @@ const BsBill = () => {
|
|||
setshortKeyMethod(method);
|
||||
};
|
||||
|
||||
const handleKeyDown = (event) => {
|
||||
if (!preferenceshortcutkey) return;
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
const key = event.key.toLowerCase();
|
||||
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
const handleKeyDown = (event) => {
|
||||
const key = event.key.toLowerCase();
|
||||
// 👉 ALT + P → Open Edit Total Amount
|
||||
if (event.altKey && key === 'p') {
|
||||
event.preventDefault();
|
||||
if (TableData?.length > 0) {
|
||||
OpenEditTotalAmount();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// 👉 CTRL shortcuts
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
}
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
return () => {
|
||||
|
|
|
|||
|
|
@ -255,24 +255,29 @@ const BSBillingTable6 = () => {
|
|||
setshortKeyMethod(method);
|
||||
};
|
||||
|
||||
const handleKeyDown = (event) => {
|
||||
|
||||
if (!preferenceshortcutkey) return
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
const key = event.key.toLowerCase();
|
||||
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
const handleKeyDown = (event) => {
|
||||
const key = event.key.toLowerCase();
|
||||
// 👉 ALT + P → Open Edit Total Amount
|
||||
if (event.altKey && key === 'p') {
|
||||
event.preventDefault();
|
||||
if (tableData?.length > 0) {
|
||||
OpenEditTotalAmount();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// 👉 CTRL shortcuts
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
}
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
return () => {
|
||||
|
|
|
|||
|
|
@ -225,35 +225,6 @@ const BSBillingTable7 = () => {
|
|||
setPreviousdataLength(PreviousOrderLength);
|
||||
}, [PreviousOrderLength]);
|
||||
|
||||
// useEffect(() => {
|
||||
// const handleKeyDown = (event) => {
|
||||
// // Ctrl + Q
|
||||
// if (event.ctrlKey && event.key.toLowerCase() === 'q') {
|
||||
// event.preventDefault();
|
||||
|
||||
// const getItem = (data = []) => {
|
||||
// if (!data.length) return null;
|
||||
// return BillOrderPre === 'Y' ? data[0] : data[data.length - 1];
|
||||
// };
|
||||
|
||||
// let item = null;
|
||||
// if (tableDataTakeAway?.length > 0) {
|
||||
// item = getItem(tableDataTakeAway);
|
||||
// } else if (tableDataDinein?.length > 0) {
|
||||
// item = getItem(tableDataDinein);
|
||||
// }
|
||||
// if (item) {
|
||||
// handleEditQuantity(item);
|
||||
// }
|
||||
// }
|
||||
// };
|
||||
// window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
// return () => {
|
||||
// window.removeEventListener('keydown', handleKeyDown);
|
||||
// };
|
||||
// }, [tableDataTakeAway, tableDataDinein, BillOrderPre]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!preferenceshortcutkey) return;
|
||||
const getSelectedItem = () => {
|
||||
|
|
@ -279,21 +250,25 @@ const BSBillingTable7 = () => {
|
|||
};
|
||||
|
||||
const handleKeyDown = (event) => {
|
||||
if (!preferenceshortcutkey) return;
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
const key = event.key.toLowerCase();
|
||||
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
const key = event.key.toLowerCase();
|
||||
// 👉 ALT + P → Open Edit Total Amount
|
||||
if (event.altKey && key === 'p') {
|
||||
event.preventDefault();
|
||||
if (tableData?.length > 0) {
|
||||
OpenEditTotalAmount();
|
||||
}
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
return;
|
||||
}
|
||||
if (!event.ctrlKey) return;
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
}
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
return () => {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,10 @@ const BSEditTotalAmt = (props) => {
|
|||
console.log(OverAllSales, 'OverAllEstimateOverAllEstimate');
|
||||
const formRef = useRef(null);
|
||||
const formEstRef = useRef(null);
|
||||
const salesDiscInputRef = useRef(null);
|
||||
const salesMoreOptInputRef = useRef(null);
|
||||
const estDiscInputRef = useRef(null);
|
||||
const estMoreOptInputRef = useRef(null);
|
||||
const dispatch = useDispatch();
|
||||
const [messageType, setMessageType] = useState(null);
|
||||
const [messageData, setMessageData] = useState(null);
|
||||
|
|
@ -87,6 +91,29 @@ const BSEditTotalAmt = (props) => {
|
|||
return () => clearInterval(timer);
|
||||
}, [timeLeft]);
|
||||
|
||||
useEffect(() => {
|
||||
const focusInput = (ref) => {
|
||||
setTimeout(() => {
|
||||
const inputElement = ref.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
};
|
||||
|
||||
if (SalesData?.length > 0) {
|
||||
if (MoreOpt) {
|
||||
focusInput(salesMoreOptInputRef);
|
||||
} else if (EditTotalAmt) {
|
||||
focusInput(salesDiscInputRef);
|
||||
}
|
||||
} else if (EstimateData?.length > 0 && EditTotalAmt) {
|
||||
if (ESTMoreOpt) {
|
||||
focusInput(estMoreOptInputRef);
|
||||
} else {
|
||||
focusInput(estDiscInputRef);
|
||||
}
|
||||
}
|
||||
}, [EditTotalAmt, MoreOpt, ESTMoreOpt, SalesData, EstimateData]);
|
||||
|
||||
const handleOtpChange = (index, value) => {
|
||||
// Allow empty value for clearing
|
||||
if (value === '' || value.match(/^[0-9]$/)) {
|
||||
|
|
@ -201,6 +228,10 @@ const BSEditTotalAmt = (props) => {
|
|||
setMessageData('Please Give less than value for sell price');
|
||||
setESTSellingPrice(0);
|
||||
formEstRef?.current?.resetFields();
|
||||
setTimeout(() => {
|
||||
const inputElement = estDiscInputRef.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
} else {
|
||||
setESTSellingPrice(inputValue);
|
||||
// Check if entered amount is 0 or equals total amount
|
||||
|
|
@ -214,6 +245,13 @@ const BSEditTotalAmt = (props) => {
|
|||
handleOk();
|
||||
}
|
||||
};
|
||||
|
||||
const handleEstKeyDown = (e) => {
|
||||
if (e.key === 'Enter') {
|
||||
e.preventDefault();
|
||||
SetTotalDiscount();
|
||||
}
|
||||
};
|
||||
const SalesChangefun = (e) => {
|
||||
const inputValue = e.target.value.trim();
|
||||
console.log(e, e.target.value, 'SalesChangefun');
|
||||
|
|
@ -223,6 +261,10 @@ const BSEditTotalAmt = (props) => {
|
|||
setMessageData('Please Give less than value for sell price');
|
||||
setSellingPrice(0);
|
||||
formRef?.current?.resetFields();
|
||||
setTimeout(() => {
|
||||
const inputElement = salesDiscInputRef.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
} else {
|
||||
setSellingPrice(inputValue);
|
||||
// SalesTotalAmount()
|
||||
|
|
@ -232,6 +274,13 @@ const BSEditTotalAmt = (props) => {
|
|||
// setSalesDiscAmount(0)
|
||||
}
|
||||
};
|
||||
|
||||
const handleSalesKeyDown = (e) => {
|
||||
if (e.key === 'Enter') {
|
||||
e.preventDefault();
|
||||
SetTotalDiscount();
|
||||
}
|
||||
};
|
||||
const orderscolumns = [
|
||||
{
|
||||
title: 'Sl.No',
|
||||
|
|
@ -347,6 +396,10 @@ const BSEditTotalAmt = (props) => {
|
|||
setSalesDiscAmount(0);
|
||||
// setFinalTotalAmt()
|
||||
formRef.current?.resetFields();
|
||||
setTimeout(() => {
|
||||
const inputElement = salesMoreOptInputRef.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
};
|
||||
const onEstPercentageSelectionChange = (data) => {
|
||||
setESTPercentageSelection(data);
|
||||
|
|
@ -354,6 +407,10 @@ const BSEditTotalAmt = (props) => {
|
|||
setEstDiscAmount(0);
|
||||
// setFinalTotalAmt()
|
||||
formEstRef.current?.resetFields();
|
||||
setTimeout(() => {
|
||||
const inputElement = estMoreOptInputRef.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
};
|
||||
|
||||
const PriceChangefun = (data) => {
|
||||
|
|
@ -375,6 +432,10 @@ const BSEditTotalAmt = (props) => {
|
|||
setSalesDiscAmount(0);
|
||||
// setNewPrice1(0)
|
||||
formRef.current?.resetFields();
|
||||
setTimeout(() => {
|
||||
const inputElement = salesMoreOptInputRef.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
}
|
||||
} else {
|
||||
// Percentage mode
|
||||
|
|
@ -391,6 +452,10 @@ const BSEditTotalAmt = (props) => {
|
|||
setMessageData('Please Give less than or equal to 100');
|
||||
setSalesDiscAmount(0);
|
||||
formRef.current?.resetFields();
|
||||
setTimeout(() => {
|
||||
const inputElement = salesMoreOptInputRef.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
@ -400,6 +465,13 @@ const BSEditTotalAmt = (props) => {
|
|||
}
|
||||
};
|
||||
|
||||
const handlePriceKeyDown = (e) => {
|
||||
if (e.key === 'Enter') {
|
||||
e.preventDefault();
|
||||
SetTotalDiscount();
|
||||
}
|
||||
};
|
||||
|
||||
const PriceChangefunEst = (data) => {
|
||||
console.log(data?.target.value, PercentageSelection, 'datadata');
|
||||
if (data?.target.value) {
|
||||
|
|
@ -418,6 +490,10 @@ const BSEditTotalAmt = (props) => {
|
|||
setMessageData('Please Give less than value for sell price');
|
||||
setEstDiscAmount(0);
|
||||
formEstRef.current?.resetFields();
|
||||
setTimeout(() => {
|
||||
const inputElement = estMoreOptInputRef.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
}
|
||||
} else {
|
||||
// Percentage mode
|
||||
|
|
@ -434,6 +510,10 @@ const BSEditTotalAmt = (props) => {
|
|||
setMessageData('Please Give less than or equal to 100');
|
||||
setEstDiscAmount(0);
|
||||
formEstRef.current?.resetFields();
|
||||
setTimeout(() => {
|
||||
const inputElement = estMoreOptInputRef.current?.querySelector('input');
|
||||
inputElement?.focus();
|
||||
}, 100);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
@ -444,6 +524,13 @@ const BSEditTotalAmt = (props) => {
|
|||
}
|
||||
};
|
||||
|
||||
const handlePriceEstKeyDown = (e) => {
|
||||
if (e.key === 'Enter') {
|
||||
e.preventDefault();
|
||||
SetTotalDiscount();
|
||||
}
|
||||
};
|
||||
|
||||
const moreOptions = () => {
|
||||
setMoreOpt((prev) => !prev);
|
||||
setSalesDiscAmount(0);
|
||||
|
|
@ -535,15 +622,18 @@ const BSEditTotalAmt = (props) => {
|
|||
},
|
||||
]}
|
||||
>
|
||||
<InputField
|
||||
field="SalesDisc"
|
||||
name="SalesDisc"
|
||||
fieldState={true}
|
||||
fieldApi={true}
|
||||
autocomplete="off"
|
||||
onChange={(e) => SalesChangefun(e)}
|
||||
maxLength={8}
|
||||
/>
|
||||
<div ref={salesDiscInputRef}>
|
||||
<InputField
|
||||
field="SalesDisc"
|
||||
name="SalesDisc"
|
||||
fieldState={true}
|
||||
fieldApi={true}
|
||||
autocomplete="off"
|
||||
onChange={(e) => SalesChangefun(e)}
|
||||
onKeyDown={(e) => handleSalesKeyDown(e)}
|
||||
maxLength={8}
|
||||
/>
|
||||
</div>
|
||||
</Form.Item>
|
||||
</Form>{' '}
|
||||
</td>
|
||||
|
|
@ -593,18 +683,21 @@ const BSEditTotalAmt = (props) => {
|
|||
},
|
||||
]}
|
||||
>
|
||||
<InputField
|
||||
field="SellPrice"
|
||||
name="SellPrice"
|
||||
// value={NewPrice1}
|
||||
label="Reduction"
|
||||
fieldState={true}
|
||||
fieldApi={true}
|
||||
// id="error2"
|
||||
autocomplete="off"
|
||||
onChange={(e) => PriceChangefun(e)}
|
||||
// isOnChange={formType == "edit" || formRef.current?.getFieldsValue()?.CustName ? true : false}
|
||||
/>
|
||||
<div ref={salesMoreOptInputRef}>
|
||||
<InputField
|
||||
field="SellPrice"
|
||||
name="SellPrice"
|
||||
// value={NewPrice1}
|
||||
label="Reduction"
|
||||
fieldState={true}
|
||||
fieldApi={true}
|
||||
// id="error2"
|
||||
autocomplete="off"
|
||||
onChange={(e) => PriceChangefun(e)}
|
||||
onKeyDown={(e) => handlePriceKeyDown(e)}
|
||||
// isOnChange={formType == "edit" || formRef.current?.getFieldsValue()?.CustName ? true : false}
|
||||
/>
|
||||
</div>
|
||||
</Form.Item>
|
||||
{/* <input type="text"
|
||||
onChange={(e)=>PriceChangefun(e)}
|
||||
|
|
@ -684,16 +777,19 @@ const BSEditTotalAmt = (props) => {
|
|||
},
|
||||
]}
|
||||
>
|
||||
<InputField
|
||||
field="ESTSalesDisc"
|
||||
name="ESTSalesDisc"
|
||||
fieldState={true}
|
||||
fieldApi={true}
|
||||
// id="error2"
|
||||
autocomplete="off"
|
||||
onChange={(e) => EstChangefun(e)}
|
||||
maxLength={8}
|
||||
/>
|
||||
<div ref={estDiscInputRef}>
|
||||
<InputField
|
||||
field="ESTSalesDisc"
|
||||
name="ESTSalesDisc"
|
||||
fieldState={true}
|
||||
fieldApi={true}
|
||||
// id="error2"
|
||||
autocomplete="off"
|
||||
onChange={(e) => EstChangefun(e)}
|
||||
onKeyDown={(e) => handleEstKeyDown(e)}
|
||||
maxLength={8}
|
||||
/>
|
||||
</div>
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</td>
|
||||
|
|
@ -742,18 +838,21 @@ const BSEditTotalAmt = (props) => {
|
|||
},
|
||||
]}
|
||||
>
|
||||
<InputField
|
||||
field="SellPrice"
|
||||
name="ESTSellingPrice"
|
||||
// value={NewPrice1}
|
||||
label="Reduction"
|
||||
fieldState={true}
|
||||
fieldApi={true}
|
||||
// id="error2"
|
||||
autocomplete="off"
|
||||
onChange={(e) => PriceChangefunEst(e)}
|
||||
// isOnChange={formType == "edit" || formRef.current?.getFieldsValue()?.CustName ? true : false}
|
||||
/>
|
||||
<div ref={estMoreOptInputRef}>
|
||||
<InputField
|
||||
field="SellPrice"
|
||||
name="ESTSellingPrice"
|
||||
// value={NewPrice1}
|
||||
label="Reduction"
|
||||
fieldState={true}
|
||||
fieldApi={true}
|
||||
// id="error2"
|
||||
autocomplete="off"
|
||||
onChange={(e) => PriceChangefunEst(e)}
|
||||
onKeyDown={(e) => handlePriceEstKeyDown(e)}
|
||||
// isOnChange={formType == "edit" || formRef.current?.getFieldsValue()?.CustName ? true : false}
|
||||
/>
|
||||
</div>
|
||||
</Form.Item>
|
||||
{/* <input type="text"
|
||||
onChange={(e)=>PriceChangefun(e)}
|
||||
|
|
|
|||
|
|
@ -148,13 +148,13 @@ const ComboSalesBillTable = () => {
|
|||
OrderType === 'Hold'
|
||||
? tableData?.filter((a, b) => a.BookingTypeName === 'TakeAway')
|
||||
: tableData?.filter(
|
||||
(a, b) => a.BookingTypeName === 'TakeAway' && !a?.SalesId
|
||||
);
|
||||
(a, b) => a.BookingTypeName === 'TakeAway' && !a?.SalesId
|
||||
);
|
||||
const OldtableDataTakeAway =
|
||||
OrderType != 'Hold'
|
||||
? tableData?.filter(
|
||||
(a, b) => a.BookingTypeName === 'TakeAway' && a?.SalesId
|
||||
)
|
||||
(a, b) => a.BookingTypeName === 'TakeAway' && a?.SalesId
|
||||
)
|
||||
: [];
|
||||
|
||||
const [EditQuantity, setEditQuantity] = useState(false);
|
||||
|
|
@ -249,27 +249,54 @@ const ComboSalesBillTable = () => {
|
|||
// );
|
||||
// setBillOrderPre(BillOrder?.SettingValue);
|
||||
// }, [preferenceDatas]);
|
||||
|
||||
useEffect(() => {
|
||||
const getSelectedItem = () => {
|
||||
const getItem = (data = []) => {
|
||||
if (!data.length) return null;
|
||||
return BillOrderPre === 'Y' ? data[0] : data[data.length - 1];
|
||||
};
|
||||
|
||||
if (tableDataTakeAway?.length > 0) {
|
||||
return getItem(tableDataTakeAway);
|
||||
} else if (tableDataDinein?.length > 0) {
|
||||
return getItem(tableDataDinein);
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
const handleShortcut = (method) => {
|
||||
const item = getSelectedItem();
|
||||
if (!item) return;
|
||||
|
||||
handleEditQuantity(item);
|
||||
setshortKeyMethod(method);
|
||||
};
|
||||
|
||||
const handleKeyDown = (event) => {
|
||||
if (event.ctrlKey && event.key.toLowerCase() === 'q') {
|
||||
const key = event.key.toLowerCase();
|
||||
// 👉 ALT + P → Open Edit Total Amount
|
||||
if (event.altKey && key === 'p') {
|
||||
event.preventDefault();
|
||||
const getItem = (data = []) => {
|
||||
if (!data.length) return null;
|
||||
return BillOrderPre === 'Y' ? data[0] : data[data.length - 1];
|
||||
};
|
||||
let item = null;
|
||||
if (tableDataTakeAway?.length > 0) {
|
||||
item = getItem(tableDataTakeAway);
|
||||
} else if (tableDataDinein?.length > 0) {
|
||||
item = getItem(tableDataDinein);
|
||||
}
|
||||
if (item) {
|
||||
handleEditQuantity(item);
|
||||
if (tableData?.length > 0) {
|
||||
OpenEditTotalAmount();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// 👉 CTRL shortcuts
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
}
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
return () => {
|
||||
window.removeEventListener('keydown', handleKeyDown);
|
||||
};
|
||||
|
|
@ -1122,9 +1149,9 @@ const ComboSalesBillTable = () => {
|
|||
)?.map((item, idx) =>
|
||||
idx === 0
|
||||
? {
|
||||
...item,
|
||||
FreeQty,
|
||||
}
|
||||
...item,
|
||||
FreeQty,
|
||||
}
|
||||
: item
|
||||
),
|
||||
};
|
||||
|
|
@ -2246,20 +2273,20 @@ const ComboSalesBillTable = () => {
|
|||
tableDataDinein?.length >= PreviousdataLength
|
||||
? 'wheat'
|
||||
: BookingType !== 'Dine In' &&
|
||||
triggerAnimation &&
|
||||
OldtableDataTakeAway?.length + index === 0 &&
|
||||
tableDataDinein?.length >= PreviousdataLength &&
|
||||
!HoldOrderDtl &&
|
||||
!UnpaidData
|
||||
triggerAnimation &&
|
||||
OldtableDataTakeAway?.length + index === 0 &&
|
||||
tableDataDinein?.length >= PreviousdataLength &&
|
||||
!HoldOrderDtl &&
|
||||
!UnpaidData
|
||||
? 'wheat'
|
||||
: 'inherit'
|
||||
: 'none',
|
||||
background: row?.SalesId
|
||||
? 'rgb(243, 248, 213)'
|
||||
: GlobEstBooking === 'ParEst' &&
|
||||
GlobProdwisedata?.includes(
|
||||
row?.InwardDtlId + ' ' + row?.BookingTypeName
|
||||
)
|
||||
GlobProdwisedata?.includes(
|
||||
row?.InwardDtlId + ' ' + row?.BookingTypeName
|
||||
)
|
||||
? '#b2d1f7'
|
||||
: (OldtableDataTakeAway?.length + index) % 2 === 0
|
||||
? 'white'
|
||||
|
|
@ -2294,37 +2321,37 @@ const ComboSalesBillTable = () => {
|
|||
{/* Product Name / Item */}
|
||||
{(item.OptionName === 'Item' ||
|
||||
item.OptionName === 'Product Name') && (
|
||||
<td
|
||||
key={`prod-${index}`}
|
||||
className="productNameTd"
|
||||
onClick={() =>
|
||||
row.FullProductIdentifierDtls?.length > 0 ||
|
||||
row.ProductIdentifierDtls?.length > 0
|
||||
? handleImeiDetails(row)
|
||||
: editField && handleEditQuantity(row)
|
||||
}
|
||||
>
|
||||
{row?.Type !== 'OS' ? row.ProdName : row.ServiceName}
|
||||
{row?.BrandName ? ` ${row.BrandName}` : ''}
|
||||
{row?.Type !== 'C' && (
|
||||
<p className="Tbl3-Variant">
|
||||
{/* {row?.ProdVariantName} {row?.Size} {row?.UomName} */}
|
||||
(
|
||||
{!row?.ProdVariantName?.toLowerCase()?.includes(
|
||||
'variant'
|
||||
) && <span>{row?.ProdVariantName} </span>}
|
||||
{row?.Size}
|
||||
{row?.SinglePc == 'Y' ? 'PCS' : row?.UomName})
|
||||
</p>
|
||||
)}
|
||||
{row?.Type === 'C' &&
|
||||
row.ProdDetail?.map((prod, idx) => (
|
||||
<p key={idx}>
|
||||
{prod.ProdName} - {prod.Size} {prod.UomName}
|
||||
<td
|
||||
key={`prod-${index}`}
|
||||
className="productNameTd"
|
||||
onClick={() =>
|
||||
row.FullProductIdentifierDtls?.length > 0 ||
|
||||
row.ProductIdentifierDtls?.length > 0
|
||||
? handleImeiDetails(row)
|
||||
: editField && handleEditQuantity(row)
|
||||
}
|
||||
>
|
||||
{row?.Type !== 'OS' ? row.ProdName : row.ServiceName}
|
||||
{row?.BrandName ? ` ${row.BrandName}` : ''}
|
||||
{row?.Type !== 'C' && (
|
||||
<p className="Tbl3-Variant">
|
||||
{/* {row?.ProdVariantName} {row?.Size} {row?.UomName} */}
|
||||
(
|
||||
{!row?.ProdVariantName?.toLowerCase()?.includes(
|
||||
'variant'
|
||||
) && <span>{row?.ProdVariantName} </span>}
|
||||
{row?.Size}
|
||||
{row?.SinglePc == 'Y' ? 'PCS' : row?.UomName})
|
||||
</p>
|
||||
))}
|
||||
</td>
|
||||
)}
|
||||
)}
|
||||
{row?.Type === 'C' &&
|
||||
row.ProdDetail?.map((prod, idx) => (
|
||||
<p key={idx}>
|
||||
{prod.ProdName} - {prod.Size} {prod.UomName}
|
||||
</p>
|
||||
))}
|
||||
</td>
|
||||
)}
|
||||
|
||||
{/* Barcode */}
|
||||
{item.OptionName === 'Barcode' && (
|
||||
|
|
@ -2351,7 +2378,7 @@ const ComboSalesBillTable = () => {
|
|||
onClick={() =>
|
||||
editField && handleEditQuantityCombo(row)
|
||||
}
|
||||
// onClick={() => handleEditQTYcombo()}
|
||||
// onClick={() => handleEditQTYcombo()}
|
||||
>
|
||||
{(!EditQtyCombo || row?.localId !== Index) && (
|
||||
<>{row.OrderQty}</>
|
||||
|
|
@ -2367,7 +2394,7 @@ const ComboSalesBillTable = () => {
|
|||
Index={Index}
|
||||
setIndex={setIndex}
|
||||
setEditQtyCombo={setEditQtyCombo}
|
||||
// id={`qty-${index}`}
|
||||
// id={`qty-${index}`}
|
||||
/>
|
||||
)}
|
||||
</td>
|
||||
|
|
@ -2414,9 +2441,9 @@ const ComboSalesBillTable = () => {
|
|||
>
|
||||
{row?.Offer > 0
|
||||
? `${(
|
||||
(row.Offer / (row?.OrderQty * row?.OrderRate)) *
|
||||
100
|
||||
).toFixed(2)}%`
|
||||
(row.Offer / (row?.OrderQty * row?.OrderRate)) *
|
||||
100
|
||||
).toFixed(2)}%`
|
||||
: '-'}
|
||||
</td>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -262,22 +262,29 @@ const StandardTable = () => {
|
|||
handleEditQuantity(item);
|
||||
setshortKeyMethod(method);
|
||||
};
|
||||
|
||||
const handleKeyDown = (event) => {
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
const key = event.key.toLowerCase();
|
||||
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
const handleKeyDown = (event) => {
|
||||
const key = event.key.toLowerCase();
|
||||
// 👉 ALT + P → Open Edit Total Amount
|
||||
if (event.altKey && key === 'p') {
|
||||
event.preventDefault();
|
||||
if (OrderCardDetail?.length > 0) {
|
||||
OpenEditTotalAmount();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// 👉 CTRL shortcuts
|
||||
if (!event.ctrlKey) return;
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
if (key === 'q') {
|
||||
event.preventDefault();
|
||||
handleShortcut('qty');
|
||||
}
|
||||
|
||||
if (key === 'e') {
|
||||
event.preventDefault();
|
||||
handleShortcut('price');
|
||||
}
|
||||
};
|
||||
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ const ShortcutKeyHelper = ({ }) => {
|
|||
{ key: 'F4', description: 'Quick Pay' },
|
||||
{ key: 'Alt + W', description: 'Hold and Recall' },
|
||||
{ key: 'Ctrl + Q', description: 'Qty Change' },
|
||||
{ key: 'Alt + P', description: 'Change Total Amount' },
|
||||
{ key: 'Ctrl + E', description: 'Price Change' },
|
||||
{ key: 'Ctrl + I', description: 'Customer Rate History' },
|
||||
];
|
||||
|
|
|
|||
|
|
@ -543,10 +543,10 @@ export default function BSCombo1() {
|
|||
</div>
|
||||
)}
|
||||
</div>
|
||||
{preferenceshortcutkey && (
|
||||
{/* {preferenceshortcutkey && (
|
||||
<div className="keyboardShortcut">
|
||||
<ShortcutKeyHelper />
|
||||
</div>)}
|
||||
</div>)} */}
|
||||
</div>
|
||||
</div>
|
||||
{/* </div> */}
|
||||
|
|
|
|||
|
|
@ -85,6 +85,13 @@ const SalesCountComponent = React.memo(
|
|||
type?.PreferredSubCatName?.toLowerCase() === 'take away' &&
|
||||
type?.PreferredStatus === 'Y'
|
||||
);
|
||||
const preferenceshortcutkey = preferencedata?.[0]?.[
|
||||
'SettingDtlDetails'
|
||||
]?.some(
|
||||
(item) =>
|
||||
item.SettingIdName.toLowerCase() === 'shortcutkeys' &&
|
||||
item.SettingValue === 'Y'
|
||||
);
|
||||
|
||||
|
||||
const [messageType, setMessageType] = useState(null);
|
||||
|
|
@ -1085,6 +1092,11 @@ const SalesCountComponent = React.memo(
|
|||
)}
|
||||
</Tooltip>
|
||||
</div>
|
||||
{/* {preferenceshortcutkey && <ShortcutKeyHelper />} */}
|
||||
{preferenceshortcutkey && (
|
||||
<div className="keyboardShortcut">
|
||||
<ShortcutKeyHelper />
|
||||
</div>)}
|
||||
<AllSalesPageSettings />
|
||||
<ProductPriceChange />
|
||||
<ReceivedStocksModal
|
||||
|
|
|
|||
Loading…
Reference in New Issue