Merge branch 'v4.6.x' of https://github.com/blair2004/NexoPOS-4x into…

… v4.6.x
Blair2004 · Jan 14, 2022 · 1b40daf · 1b40daf
2 parents c066ca3 + b132da6
commit 1b40daf
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 286,767 deletions.
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.min.js b/public/js/app.min.js
diff --git a/public/js/auth.min.js b/public/js/auth.min.js
diff --git a/public/js/bootstrap.min.js b/public/js/bootstrap.min.js
diff --git a/public/js/cashier.min.js b/public/js/cashier.min.js
diff --git a/public/js/dashboard.min.js b/public/js/dashboard.min.js
diff --git a/public/js/lang-loader.min.js b/public/js/lang-loader.min.js
diff --git a/public/js/manifest.js b/public/js/manifest.js
diff --git a/public/js/popups.min.js b/public/js/popups.min.js
diff --git a/public/js/pos-init.min.js b/public/js/pos-init.min.js
diff --git a/public/js/pos.min.js b/public/js/pos.min.js
diff --git a/public/js/setup.min.js b/public/js/setup.min.js
diff --git a/public/js/update.min.js b/public/js/update.min.js
diff --git a/public/js/vendor.js b/public/js/vendor.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,16 +1,16 @@
 {
-    "/js/bootstrap.js": "/js/bootstrap.js",
-    "/js/lang-loader.js": "/js/lang-loader.js",
-    "/js/app.js": "/js/app.js",
-    "/js/dashboard.js": "/js/dashboard.js",
-    "/js/cashier.js": "/js/cashier.js",
-    "/js/update.js": "/js/update.js",
-    "/js/pos-init.js": "/js/pos-init.js",
-    "/js/pos.js": "/js/pos.js",
-    "/js/auth.js": "/js/auth.js",
-    "/js/setup.js": "/js/setup.js",
-    "/js/popups.js": "/js/popups.js",
-    "/js/manifest.js": "/js/manifest.js",
-    "/css/app.css": "/css/app.css",
-    "/js/vendor.js": "/js/vendor.js"
+    "/js/bootstrap.min.js": "/js/bootstrap.min.js?id=847e44134c0270737773",
+    "/js/lang-loader.min.js": "/js/lang-loader.min.js?id=01a3593f6f646f6cef13",
+    "/js/app.min.js": "/js/app.min.js?id=4ebd310e9b90c7d41a4d",
+    "/js/dashboard.min.js": "/js/dashboard.min.js?id=9d2ae660f8e42f8d3dc5",
+    "/js/cashier.min.js": "/js/cashier.min.js?id=1e98ee3378945f43291b",
+    "/js/update.min.js": "/js/update.min.js?id=d50b50494c0791c3b269",
+    "/js/pos-init.min.js": "/js/pos-init.min.js?id=18ef203c92a405643ea4",
+    "/js/pos.min.js": "/js/pos.min.js?id=5382acc794241fa67588",
+    "/js/auth.min.js": "/js/auth.min.js?id=5d7976ff407e10af943c",
+    "/js/setup.min.js": "/js/setup.min.js?id=b46472ce111cff738d64",
+    "/js/popups.min.js": "/js/popups.min.js?id=1af01505bd89047616a7",
+    "/js/manifest.js": "/js/manifest.js?id=50c02444dfd29510e1f8",
+    "/css/app.css": "/css/app.css?id=979e97f914d54ef1c14b",
+    "/js/vendor.js": "/js/vendor.js?id=3582ff3fbb8a7a186add"
 }
diff --git a/resources/ts/components/ns-numpad.vue b/resources/ts/components/ns-numpad.vue
@@ -38,15 +38,20 @@ export default {
         }
     },
     mounted() {
-        // ...
+        if( this.floating && this.value > 0 ) {
+            this.screenValue    =   parseFloat( this.value / this.number );
+        } else {
+            this.screenValue    =   0;
+        }
     },
     watch: {
-        value() {
-            console.log( this.value );
-            if( this.floating && this.value > 0 ) {
-                this.screenValue    =   parseFloat( this.value / this.number );
-            } else {
-                this.screenValue    =   0;
+        value() {        
+            if ( this.value.toString().length > 0 ) {
+                if ( this.floating ) {
+                    this.screenValue    =   Math.round( this.value * this.number ).toString();
+                } else {
+                    this.screenValue    =   this.value;
+                }
             }
         }
     },