dredgy/DredgePos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from dredgy/make_order_screen_reactive

Browse Source 
Fixed slight bug in void system
This commit is contained in:
dredgy
2022-09-14 11:51:11 +10:00
committed by GitHub
parent 2e213d95ad c146a7209d
commit 3f4d6b650e
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Program.fs
View File

@@ -17,11 +17,14 @@ module Program =
forward "/install" DredgePos.Installer.Router.router forward "/install" DredgePos.Installer.Router.router
} }
let app = application { let app =
use_mime_types [(".woff", "application/font-woff")] let ipAddress = System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList[2];
use_static "wwwroot" printf $"DredgePOS is now running at http://{ipAddress}:5001\n"
use_router router application {
url "http://0.0.0.0:5001" use_mime_types [(".woff", "application/font-woff")]
} use_static "wwwroot"
use_router router
url "http://0.0.0.0:5001"
}
run app run app

14
typescript/dredgepos.orderScreen.ts
View File

@@ -123,7 +123,9 @@ const setItemQty = (orderItem: orderItem, qty: number) => {
const instructionIds = getInstructionItems(orderItem.id).map(orderItem => orderItem.id) const instructionIds = getInstructionItems(orderItem.id).map(orderItem => orderItem.id)
if(qty < 1){ if(qty < 1){
const newItems = OrderScreen.order_items.filter(existingOrderItem => existingOrderItem.id != orderItem.id) const newItems = OrderScreen.order_items.filter(existingOrderItem =>
(existingOrderItem.id != orderItem.id) && !instructionIds.includes(existingOrderItem.id)
)
OrderScreen.selected_item_ids = array_remove(OrderScreen.selected_item_ids, orderItem.id) OrderScreen.selected_item_ids = array_remove(OrderScreen.selected_item_ids, orderItem.id)
if(orderItem.item.item_type == "item") { if(orderItem.item.item_type == "item") {
@@ -434,7 +436,7 @@ const voidLastItem = () => {
decrementItemQty(OrderScreen.order_items.last()) decrementItemQty(OrderScreen.order_items.last())
} }
const getSelectedTotals = () => const getSelectedTotals = () =>
OrderScreen.selected_item_ids OrderScreen.selected_item_ids
.map(selectedId => OrderScreen.order_items.find(orderItem => orderItem.id == selectedId)) .map(selectedId => OrderScreen.order_items.find(orderItem => orderItem.id == selectedId))
.reduce((resultSoFar, currentOrderItem) => { .reduce((resultSoFar, currentOrderItem) => {
@@ -459,13 +461,13 @@ const scrollToElement = (JQueryElement: JQuery) => {
const element = JQueryElement.get()[0] const element = JQueryElement.get()[0]
const container = JQueryElement.closest('.orderBox').get()[0] const container = JQueryElement.closest('.orderBox').get()[0]
const containerTop = $(container).scrollTop() const containerTop = $(container).scrollTop()
const containerBottom = containerTop + $(container).height(); const containerBottom = containerTop + $(container).height()
const elemTop = element.offsetTop const elemTop = element.offsetTop
const elemBottom = elemTop + $(element).height(); const elemBottom = elemTop + $(element).height()
if (elemTop < containerTop) { if (elemTop < containerTop) {
$(container).scrollTop(elemTop); $(container).scrollTop(elemTop)
} else if (elemBottom > containerBottom) { } else if (elemBottom > containerBottom) {
$(container).scrollTop(elemBottom - $(container).height()); $(container).scrollTop(elemBottom - $(container).height())
} }
} }