Merge pull request #13 from plentymarkets/cms/release_version_1.0.15

allow floats as quantity with comma
plentymarkets · Dec 14, 2016 · df17783 · df17783
2 parents a24188e + 7a072bd
commit df17783
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 17 deletions.
diff --git a/dist/plentymarketsCMStools-1.0.14.min.js b/dist/plentymarketsCMStools-1.0.14.min.js
diff --git a/dist/plentymarketsCMStools-1.0.14.min.js.map b/dist/plentymarketsCMStools-1.0.14.min.js.map
diff --git a/dist/plentymarketsCMStools-1.0.14.js → dist/plentymarketsCMStools-1.0.15.js b/dist/plentymarketsCMStools-1.0.14.js → dist/plentymarketsCMStools-1.0.15.js
@@ -106,7 +106,7 @@ TemplateCache["waitscreen/waitscreen.html"] = "<div id=\"PlentyWaitScreen\" clas
 (function( $ )
 {
     // will be overridden by grunt
-    var version = "1.0.14";
+    var version = "1.0.15";
 
     /**
      * Collection of uncompiled registered factories & services.
@@ -903,7 +903,7 @@ TemplateCache["waitscreen/waitscreen.html"] = "<div id=\"PlentyWaitScreen\" clas
             var $elem = $( elem );
             var $quantityInput = $elem;
             var maxLength      = parseInt( $quantityInput.attr( 'maxlength' ) ) || 5;
-            var value          = parseInt( $quantityInput.val() );
+            var value          = convertToFloat( $quantityInput.val() );
 
             setItemQuantityToNewValue($elem, $quantityInput, maxLength, value);
         }
@@ -956,6 +956,16 @@ TemplateCache["waitscreen/waitscreen.html"] = "<div id=\"PlentyWaitScreen\" clas
             }
         }
 
+
+        function convertToFloat(n) {
+            n = n.replace(',', '.');
+            if(!isNaN(parseFloat(n)) && isFinite(n))
+            {
+              return parseFloat(n);
+            }
+            return 1;
+        }
+
     }, ['BasketService'] );
 }( jQuery, PlentyFramework ));
 

diff --git a/dist/plentymarketsCMStools-1.0.15.min.js b/dist/plentymarketsCMStools-1.0.15.min.js
diff --git a/dist/plentymarketsCMStools-1.0.15.min.js.map b/dist/plentymarketsCMStools-1.0.15.min.js.map
diff --git a/.../plentymarketsCMStools-libs-1.0.14.min.js → .../plentymarketsCMStools-libs-1.0.15.min.js b/.../plentymarketsCMStools-libs-1.0.14.min.js → .../plentymarketsCMStools-libs-1.0.15.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "plentymarketsCMStools",
   "license": "AGPL-3.0",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "repository": "https://github.com/plentymarkets/plenty-cms-library.git",
   "devDependencies": {
     "grunt": "^0.4.5",

diff --git a/src/directives/Basket.js b/src/directives/Basket.js
@@ -72,7 +72,7 @@
             var $elem = $( elem );
             var $quantityInput = $elem;
             var maxLength      = parseInt( $quantityInput.attr( 'maxlength' ) ) || 5;
-            var value          = parseInt( $quantityInput.val() );
+            var value          = convertToFloat( $quantityInput.val() );
 
             setItemQuantityToNewValue($elem, $quantityInput, maxLength, value);
         }
@@ -125,5 +125,15 @@
             }
         }
 
+
+        function convertToFloat(n) {
+            n = n.replace(',', '.');
+            if(!isNaN(parseFloat(n)) && isFinite(n))
+            {
+              return parseFloat(n);
+            }
+            return 1;
+        }
+
     }, ['BasketService'] );
 }( jQuery, PlentyFramework ));