Updates to scaling on phones

wwwroot/languages/english/main.json

@@ -39,7 +39,8 @@
    "void":"Void",
    "pay_function":"Pay",
    "print_function":"Save & Print",
-   "freetext_button":"Keyboard",
+   "freetext_button":"Custom Instruction",
+   "custom_item_button":"Custom Item",
    "numpad_button":"Numpad",
    "select_covers":"Cover #",
    "how_many_covers":"How many people are on this table?",

wwwroot/scripts/ts/dredgepos.orderScreen.ts

@@ -61,7 +61,7 @@ const setupOrderScreen = (data: OrderScreenData) => {
     doc.on('click', '.loadPageGroup', loadPageGroup)
     doc.on('click', '[data-primary-action=item]', itemButtonClicked)
     doc.on('click', '.freetextButton', freetext)
-    doc.on('click', '.openItemButton', openItem)
+    doc.on('click', '.openItemButton', customItem)
     doc.on('click', '.orderBoxTable tbody tr', itemRowClicked)
     doc.on('click', '.voidButton', voidButtonClicked)
     doc.on('dblclick', '.voidButton', voidLastItem)
@@ -405,7 +405,7 @@ const freetextSubmitted = (text: string) => {
         posAlert(lang('freetext_no_order'))
     }
 
-    const item = OrderScreen.custom_item
+    const item = Object.assign({}, OrderScreen.custom_item)
     item.item_type = 'instruction'
     item.item_name = text
 
@@ -413,15 +413,16 @@ const freetextSubmitted = (text: string) => {
 
 }
 
-const openItem = () => showVirtualKeyboard(lang('enter_item_name'), 32,false, openItemTextSubmitted)
+const customItem = () => showVirtualKeyboard(lang('enter_item_name'), 32,false, customItemTextSubmitted)
 
-const openItemTextSubmitted = (text: string) => {
+const customItemTextSubmitted = (text: string) => {
     const submitFunction = (priceString: string) => {
-        const price = currency(priceString)
-        const item = OrderScreen.custom_item
+        const price = currency(priceString, {fromCents: false})
+
+        const item = Object.assign({}, OrderScreen.custom_item)
         item.item_type = 'item'
         item.item_name = text
-        item.price1 = price.value
+        item.price1 = price.intValue
 
         addNewItem(item)
     }

wwwroot/styles/sass/dredgepos.core.sass

@@ -19,7 +19,8 @@
     box-sizing: border-box
     font-family: 'manrope', sans-serif
     scroll-behavior: smooth
-    cursor: pointer
+
+*:not(input, textarea)
     -webkit-touch-callout: none
     -webkit-user-select: none
     -khtml-user-select: none

wwwroot/styles/sass/dredgepos.orderScreen.sass

@@ -75,13 +75,23 @@
             @include flex
             flex-basis: 100%
 
-            > *
+            > .functionColumn
                 @include flex-item
                 @include flex-column
-
+                flex-basis: 25%
                 > *
                     @include flex-column-item
 
+            > .printGroupButtons
+                flex-basis: 25%
+                height: 100%
+                display: grid
+                grid-template-columns: repeat(2, 1fr)
+                grid-auto-rows: auto
+
+                > *
+                    padding: 0.5em
+
 
     #pageList
         @include flex

wwwroot/themes/restaurant/orderScreen.tpl.htm

@@ -41,19 +41,19 @@
     <div id="rightColumn">
         <div id="topHalf">
             <div class="functionButtons">
-                <div class="functionColumn toggleGroup">
+                <div class="printGroupButtons toggleGroup">
                         <input type="hidden" name="print_override" class="value" />
                         <!--[var:salesCategoryOverrideButtons]-->
                 </div>
                 <div class="functionColumn">
                     <a class="posButton accumulateButton" data-active-in-mode="accumulate"><!--[lang:accumulate_function]--></a>
                     <a class="selectCoversButton posButton"><!--[lang:select_covers]--></a>
-                    <a class="freetextButton posButton"><!--[lang:freetext_button]--></a>
-                    <a class="numpadButton posButton"><!--[lang:numpad_button]--></a>
                 </div>
                 <div class="functionColumn">
                     <a class="posButton voidButton" data-active-in-mode="void"><!--[lang:void]--></a>
-                    <a class="posButton openItemButton"></a>
+                    <a class="posButton openItemButton"><!--[lang:custom_item_button]--></a>
+                    <a class="freetextButton posButton"><!--[lang:freetext_button]--></a>
+                    <a class="numpadButton posButton"><!--[lang:numpad_button]--></a>
                 </div>
                 <div class="functionColumn">
                     <a class="posButton"><!--[lang:pay_function]--></a>