Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.2-develop
Browse files Browse the repository at this point in the history
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
  • Loading branch information
magento-engcom-team authored Mar 29, 2018
2 parents 1562a01 + df3c9f9 commit 0b3c0f0
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/view/base/web/js/price-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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*$/, '');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class InstantPurchase implements SectionSourceInterface
private $customerSession;

/**
* @var StoreManagerInterface\
* @var StoreManagerInterface
*/
private $storeManager;

Expand Down
2 changes: 1 addition & 1 deletion dev/travis/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions setup/pub/magento/setup/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
};
Expand Down
2 changes: 1 addition & 1 deletion setup/view/magento/setup/readiness-check.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<button
type="button"
class="btn"
ng-click="goToStart()"
disabled="disabled"
>Back</button>
</div>
<div class="btn-wrap btn-wrap-try-again"
Expand Down

0 comments on commit 0b3c0f0

Please sign in to comment.