diff --git a/app/code/Magento/Catalog/view/base/web/js/price-utils.js b/app/code/Magento/Catalog/view/base/web/js/price-utils.js index 7c4280e64930f..e2ea42f7d5fe3 100644 --- a/app/code/Magento/Catalog/view/base/web/js/price-utils.js +++ b/app/code/Magento/Catalog/view/base/web/js/price-utils.js @@ -79,7 +79,7 @@ define([ am = Number(Math.round(Math.abs(amount - i) + 'e+' + precision) + ('e-' + precision)); r = (j ? i.substr(0, j) + groupSymbol : '') + i.substr(j).replace(re, '$1' + groupSymbol) + - (precision ? decimalSymbol + am.toFixed(2).replace(/-/, 0).slice(2) : ''); + (precision ? decimalSymbol + am.toFixed(precision).replace(/-/, 0).slice(2) : ''); return pattern.replace('%s', r).replace(/^\s\s*/, '').replace(/\s\s*$/, ''); } diff --git a/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php b/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php index 3d9c06e76ea08..7ded5373dc735 100644 --- a/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php +++ b/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php @@ -30,7 +30,7 @@ class InstantPurchase implements SectionSourceInterface private $customerSession; /** - * @var StoreManagerInterface\ + * @var StoreManagerInterface */ private $storeManager; diff --git a/dev/travis/before_install.sh b/dev/travis/before_install.sh index 63e1059f18abf..c9302f3b6672c 100755 --- a/dev/travis/before_install.sh +++ b/dev/travis/before_install.sh @@ -21,7 +21,7 @@ phpenv rehash; test -n "$GITHUB_TOKEN" && composer config github-oauth.github.com "$GITHUB_TOKEN" || true # Node.js setup via NVM -if [ test $TEST_SUITE == "js" ]; then +if [ $TEST_SUITE == "js" ]; then curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js index f92011f39522a..d9d8b5145665a 100644 --- a/setup/pub/magento/setup/main.js +++ b/setup/pub/magento/setup/main.js @@ -93,10 +93,6 @@ main.controller('navigationController', return str.indexOf(suffix, str.length - suffix.length) !== -1; }; - $scope.goToStart = function() { - $scope.goToAction($state.current.type); - }; - $scope.goToBackup = function() { $state.go('root.create-backup-uninstall'); }; diff --git a/setup/view/magento/setup/readiness-check.phtml b/setup/view/magento/setup/readiness-check.phtml index 6c6c2fbc39fc7..71044ab371888 100644 --- a/setup/view/magento/setup/readiness-check.phtml +++ b/setup/view/magento/setup/readiness-check.phtml @@ -18,7 +18,7 @@