Merge pull request #2797 from myxmaster/pos_placeholders

POS: Use placeholders instead of "real" 0 value for Tax percentage and Product Price
ZeusLN · Feb 6, 2025 · 55a326b · 55a326b
2 parents 1bbcce8 + 1de2145
commit 55a326b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/stores/PosStore.ts b/stores/PosStore.ts
@@ -200,14 +200,19 @@ export default class PosStore {
             this.currentOrder.total_money.sats = totalSats.toNumber();
 
             // calculate taxes
-            if (this.settingsStore?.settings?.pos?.taxPercentage !== '0') {
+            const { settings } = this.settingsStore;
+            const { taxPercentage } = settings.pos;
+
+            if (
+                taxPercentage &&
+                taxPercentage !== '0' &&
+                taxPercentage !== ''
+            ) {
                 this.currentOrder.total_tax_money.amount = new BigNumber(
                     totalFiat
                 )
                     .div(100)
-                    .multipliedBy(
-                        this.settingsStore?.settings?.pos?.taxPercentage || 0
-                    )
+                    .multipliedBy(taxPercentage)
                     .toNumber();
                 if (this.fiatStore.fiatRates) {
                     const fiatEntry = this.fiatStore.fiatRates.filter(

diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts
@@ -1129,7 +1129,7 @@ export default class SettingsStore {
             disableTips: false,
             squareDevMode: false,
             showKeypad: true,
-            taxPercentage: '0',
+            taxPercentage: '',
             enablePrinter: false,
             defaultView: 'Products'
         },

diff --git a/views/POS/ProductDetails.tsx b/views/POS/ProductDetails.tsx
@@ -157,13 +157,8 @@ export default class ProductDetails extends React.Component<
                     break;
 
                 case 'price':
-                    if (
-                        value === '' ||
-                        value === '0' ||
-                        value === null ||
-                        isNaN(parseFloat(value))
-                    ) {
-                        value = '0';
+                    if (value === null || isNaN(parseFloat(value))) {
+                        value = '';
                     } else {
                         value = value.replace(/^0+(?=\d)/, '');
                     }

diff --git a/views/Settings/PointOfSale.tsx b/views/Settings/PointOfSale.tsx
@@ -59,7 +59,7 @@ export default class PointOfSale extends React.Component<
         disableTips: false,
         squareDevMode: false,
         showKeypad: true,
-        taxPercentage: '0',
+        taxPercentage: '',
         enablePrinter: false,
         defaultView: 'Products'
     };
@@ -79,7 +79,7 @@ export default class PointOfSale extends React.Component<
             disableTips: settings?.pos?.disableTips || false,
             squareDevMode: settings?.pos?.squareDevMode || false,
             showKeypad: settings?.pos?.showKeypad || false,
-            taxPercentage: settings?.pos?.taxPercentage || '0',
+            taxPercentage: settings?.pos?.taxPercentage || '',
             enablePrinter: settings?.pos?.enablePrinter || false,
             defaultView:
                 (settings?.pos && settings?.pos?.defaultView) || 'Products'
@@ -592,6 +592,7 @@ export default class PointOfSale extends React.Component<
                                     )}
                                 </Text>
                                 <TextInput
+                                    placeholder={'0'}
                                     value={taxPercentage}
                                     keyboardType="numeric"
                                     onChangeText={async (text: string) => {