From 9668ae7022f007eb987b0e92105582655645f3e0 Mon Sep 17 00:00:00 2001 From: Arjen Miedema Date: Sat, 24 Mar 2018 13:01:48 +0100 Subject: [PATCH 1/5] Disable "Back" button on the first step of the setup When you enter the setup of Magento, the "Back" button is enabled on the first step. When you click this, you go straight to the final step of the installation, without entering any data in the steps, so you can't install Magento at all. With this commit the back button on the first step of the setup is always disabled, since there's no previous step, except for the page where you agree with the terms and conditions, which is not part of the wizard. --- setup/view/magento/setup/readiness-check.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@
Date: Sat, 24 Mar 2018 13:17:52 +0100 Subject: [PATCH 2/5] Remove "goToStart" method because it's no longer used The "goToStart" method was used for the "Back" button on the first step, but since that button is disabled now, the method is no longer used within Magento. Therefore it is removed from the codebase now. --- setup/pub/magento/setup/main.js | 4 ---- 1 file changed, 4 deletions(-) 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'); }; From 9ea2ccf62757be51a11595cf6abf5b57310ae72a Mon Sep 17 00:00:00 2001 From: Calin Diacon Date: Sat, 24 Mar 2018 18:43:43 +0000 Subject: [PATCH 3/5] precision for price overriding by js --- app/code/Magento/Catalog/view/base/web/js/price-utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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*$/, ''); } From f18df7b067d0c9f0f38e2173e8bec0ad02e4a17a Mon Sep 17 00:00:00 2001 From: Edie Pasek Date: Tue, 27 Mar 2018 13:46:55 -0500 Subject: [PATCH 4/5] test command inside if/then clause broke before install script --- dev/travis/before_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 73c310c2da57acda18451a59dac7f8e02ae9b64d Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Thu, 29 Mar 2018 15:35:52 +0530 Subject: [PATCH 5/5] Removed extra slash from comment block --- .../Magento/InstantPurchase/CustomerData/InstantPurchase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;