Corrected double stacking of instruction items
This commit is contained in:
@@ -226,7 +226,14 @@ const addInstructionToOrderBox = (instruction: orderItem) => {
|
|||||||
if(!OrderScreen.order_items.length) return
|
if(!OrderScreen.order_items.length) return
|
||||||
|
|
||||||
const addAfter = OrderScreen.selected_item_ids.length
|
const addAfter = OrderScreen.selected_item_ids.length
|
||||||
? OrderScreen.selected_item_ids.map(selectedItemId => getLastInstructionItem(selectedItemId).id).unique()
|
? OrderScreen.selected_item_ids
|
||||||
|
.filter(selectedItemId => {
|
||||||
|
const orderItem = OrderScreen.order_items.find(orderItem => orderItem.id == selectedItemId)
|
||||||
|
const parentItem = getParentItem(selectedItemId, OrderScreen.order_items)
|
||||||
|
return !(orderItem.item.item_type == "instruction" && OrderScreen.selected_item_ids.includes(parentItem.id))
|
||||||
|
})
|
||||||
|
.map(selectedItemId => getLastInstructionItem(selectedItemId).id)
|
||||||
|
.unique()
|
||||||
: OrderScreen.last_added_item_ids.map(itemId => getLastInstructionItem(itemId).id)
|
: OrderScreen.last_added_item_ids.map(itemId => getLastInstructionItem(itemId).id)
|
||||||
|
|
||||||
const newItems = OrderScreen.order_items.collect(existingItem => {
|
const newItems = OrderScreen.order_items.collect(existingItem => {
|
||||||
|
|||||||
Reference in New Issue
Block a user