Skip to content

Commit 0b3c0f0

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #14440: Removed extra backslash from comment block (by @yogeshks) - #14403: test command inside if/then clause broke before install script (by @edie-pasek) - #14309: Disable "Back" button on the first step of the setup (by @ArjenMiedema) - #14350: precision for price overriding by js (by @cdiacon) Fixed GitHub Issues: - #14307: Possible to press the "Previous" button while in the first step of the installation (reported by @ArjenMiedema) has been fixed in #14309 by @ArjenMiedema in 2.2-develop branch Related commits: 1. 9668ae7 2. 1bf7685 - #14249: Priduct page price is using the hardcoded digits in js (reported by @cdiacon) has been fixed in #14350 by @cdiacon in 2.2-develop branch Related commits: 1. 9ea2ccf
2 parents 1562a01 + df3c9f9 commit 0b3c0f0

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

app/code/Magento/Catalog/view/base/web/js/price-utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ define([
7979
am = Number(Math.round(Math.abs(amount - i) + 'e+' + precision) + ('e-' + precision));
8080
r = (j ? i.substr(0, j) + groupSymbol : '') +
8181
i.substr(j).replace(re, '$1' + groupSymbol) +
82-
(precision ? decimalSymbol + am.toFixed(2).replace(/-/, 0).slice(2) : '');
82+
(precision ? decimalSymbol + am.toFixed(precision).replace(/-/, 0).slice(2) : '');
8383

8484
return pattern.replace('%s', r).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
8585
}

app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class InstantPurchase implements SectionSourceInterface
3030
private $customerSession;
3131

3232
/**
33-
* @var StoreManagerInterface\
33+
* @var StoreManagerInterface
3434
*/
3535
private $storeManager;
3636

dev/travis/before_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ phpenv rehash;
2121
test -n "$GITHUB_TOKEN" && composer config github-oauth.github.com "$GITHUB_TOKEN" || true
2222

2323
# Node.js setup via NVM
24-
if [ test $TEST_SUITE == "js" ]; then
24+
if [ $TEST_SUITE == "js" ]; then
2525
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
2626
export NVM_DIR="$HOME/.nvm"
2727
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm

setup/pub/magento/setup/main.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ main.controller('navigationController',
9393
return str.indexOf(suffix, str.length - suffix.length) !== -1;
9494
};
9595

96-
$scope.goToStart = function() {
97-
$scope.goToAction($state.current.type);
98-
};
99-
10096
$scope.goToBackup = function() {
10197
$state.go('root.create-backup-uninstall');
10298
};

setup/view/magento/setup/readiness-check.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<button
1919
type="button"
2020
class="btn"
21-
ng-click="goToStart()"
21+
disabled="disabled"
2222
>Back</button>
2323
</div>
2424
<div class="btn-wrap btn-wrap-try-again"

0 commit comments

Comments
 (0)