MAGETWO-85291: 8601: Can bypass Minimum Order Amount Logic #963

 - Merge Pull Request magento-engcom/magento2ce#963 from RomaKis/magento2:8601
 - Merged commits:
   1. afafc3c
   2. f5bdc45

README.md

@@ -38,8 +38,10 @@ To suggest documentation improvements, click [here][4].
 | ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
 | ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
 | ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
-| ![acknowledged](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
-| ![acknowledged](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
+| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
+| ![needs update](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
+
+To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
 
 <h2>Reporting security issues</h2>
 

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -394,7 +394,7 @@ protected function saveAndReplaceAdvancedPrices()
  ? $rowData[self::COL_TIER_PRICE] : 0,
  'percentage_value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_PERCENT
  ? $rowData[self::COL_TIER_PRICE] : null,
- 'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
+ 'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
  ];
  }
  }

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

@@ -27,7 +27,7 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase
 
  protected function setUp()
  {
- $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\WebSite::class)
+ $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\Website::class)
  ->setMethods(['getBaseCurrency'])
  ->disableOriginalConstructor()
  ->getMock();

app/code/Magento/Analytics/etc/di.xml

@@ -254,4 +254,22 @@
  <argument name="responseResolver" xsi:type="object">NotifyDataChangedResponseResolver</argument>
  </arguments>
  </type>
+ <type name="Magento\Config\Model\Config\TypePool">
+ <arguments>
+ <argument name="sensitive" xsi:type="array">
+ <item name="analytics/url/signup" xsi:type="string">1</item>
+ <item name="analytics/url/update" xsi:type="string">1</item>
+ <item name="analytics/url/bi_essentials" xsi:type="string">1</item>
+ <item name="analytics/url/otp" xsi:type="string">1</item>
+ <item name="analytics/url/report" xsi:type="string">1</item>
+ <item name="analytics/url/notify_data_changed" xsi:type="string">1</item>
+ <item name="analytics/general/token" xsi:type="string">1</item>
+ </argument>
+ <argument name="environment" xsi:type="array">
+ <item name="crontab/default/jobs/analytics_collect_data/schedule/cron_expr" xsi:type="string">1</item>
+ <item name="crontab/default/jobs/analytics_update/schedule/cron_expr" xsi:type="string">1</item>
+ <item name="crontab/default/jobs/analytics_subscribe/schedule/cron_expr" xsi:type="string">1</item>
+ </argument>
+ </arguments>
+ </type>
 </config>

app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php

@@ -92,7 +92,7 @@ protected function _prepareCollection()
  protected function _afterLoadCollection()
  {
  foreach ($this->getCollection() as $item) {
- $item->getCustomer() ?: $item->setCustomer('Guest');
+ $item->getCustomer() ?: $item->setCustomer($item->getBillingAddress()->getName());
  }
  return $this;
  }

app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php

@@ -37,7 +37,7 @@ protected function _prepareForm()
  ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
  );
 
- $this->_prepareStoreFieldSet($form);
+ $this->_prepareStoreFieldset($form);
 
  $form->addField(
  'store_type',

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -54,9 +54,9 @@ public function execute()
  $user = $this->_objectManager->create(\Magento\User\Model\User::class)->load($userId);
 
  $user->setId($userId)
- ->setUsername($this->getRequest()->getParam('username', false))
- ->setFirstname($this->getRequest()->getParam('firstname', false))
- ->setLastname($this->getRequest()->getParam('lastname', false))
+ ->setUserName($this->getRequest()->getParam('username', false))
+ ->setFirstName($this->getRequest()->getParam('firstname', false))
+ ->setLastName($this->getRequest()->getParam('lastname', false))
  ->setEmail(strtolower($this->getRequest()->getParam('email', false)));
 
  if ($this->_objectManager->get(\Magento\Framework\Validator\Locale::class)->isValid($interfaceLocale)) {

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php

@@ -117,7 +117,7 @@ public function testSetFilterTypePropagatesFilterTypeToColumns()
 
  public function testGetRowUrlIfUrlPathNotSet()
  {
- $this->assertEquals('#', $this->_block->getRowUrl(new \StdClass()));
+ $this->assertEquals('#', $this->_block->getRowUrl(new \stdClass()));
  }
 
  public function testGetRowUrl()

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php

@@ -351,7 +351,7 @@ public function testSetGetGrid()
 
  $this->_block->setFilter('StdClass');
 
- $grid = new \StdClass();
+ $grid = new \stdClass();
  $this->_block->setGrid($grid);
  $this->assertEquals($grid, $this->_block->getGrid());
  }

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -145,6 +145,9 @@
  <item name="dev" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::HIDDEN</item>
  <item name="general/locale/code" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::DISABLED</item>
  </argument>
+ <argument name="exemptions" xsi:type="array">
+ <item name="dev/debug/debug_logging" xsi:type="string"/>
+ </argument>
  </arguments>
  </type>
  <type name="Magento\Framework\View\Layout\Generator\Block">

app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

@@ -29,7 +29,7 @@
  data-mage-init='{"dropdown":{}}'
  data-toggle="dropdown">
  <span class="admin__action-dropdown-text">
- <span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>
+ <span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>
  </span>
  </a>
  <ul class="admin__action-dropdown-menu">
@@ -39,7 +39,7 @@
  href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
  <?= /* @escapeNotVerified */ $block->getUiId('user', 'account', 'settings') ?>
  title="<?= $block->escapeHtml(__('Account Setting')) ?>">
- <?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>)
+ <?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
  </a>
  </li>
  <?php endif; ?>

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -28,16 +28,16 @@
  <script data-template="search-suggest" type="text/x-magento-template">
  <ul class="search-global-menu">
  <li class="item">
- <a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getURL('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
+ <a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getUrl('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
  </li>
  <li class="item">
- <a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getURL('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
+ <a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
  </li>
  <li class="item">
- <a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getURL('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
+ <a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
  </li>
  <li class="item">
- <a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getURL('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
+ <a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getUrl('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
  </li>
  <% if (data.items.length) { %>
  <% _.each(data.items, function(value){ %>

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -72,7 +72,7 @@ $numColumns = sizeof($block->getColumns());
  <?php if ($block->getPagerVisibility()): ?>
  <div class="admin__data-grid-pager-wrap">
  <select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
- id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
+ id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
  onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)"
  class="admin__control-select">
  <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
@@ -91,7 +91,7 @@ $numColumns = sizeof($block->getColumns());
  selected="selected"<?php endif; ?>>200
  </option>
  </select>
- <label for="<?= $block->escapeHTML($block->getHtmlId()) ?><?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
+ <label for="<?= $block->escapeHtml($block->getHtmlId()) ?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
  class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>
 
  <div class="admin__data-grid-pager">
@@ -107,12 +107,12 @@ $numColumns = sizeof($block->getColumns());
  <button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
  <?php endif; ?>
  <input type="text"
- id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current"
+ id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
  name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
  value="<?= /* @escapeNotVerified */ $_curPage ?>"
  class="admin__control-text"
  onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
- <label class="admin__control-support-text" for="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current">
+ <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current">
  <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
  </label>
  <?php if ($_curPage < $_lastPage): ?>

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php

@@ -142,7 +142,6 @@ public function getExtendedElement($switchAttributeCode)
  [
  'name' => "product[{$switchAttributeCode}]",
  'values' => $this->getOptions(),
- 'value' => $switchAttributeCode,
  'class' => 'required-entry next-toinput',
  'no_span' => true,
  'disabled' => $this->isDisabledField(),

app/code/Magento/Captcha/i18n/en_US.csv

@@ -4,10 +4,10 @@ Always,Always
 "Incorrect CAPTCHA","Incorrect CAPTCHA"
 "Incorrect CAPTCHA.","Incorrect CAPTCHA."
 "The account is locked. Please wait and try again or contact %1.","The account is locked. Please wait and try again or contact %1."
-"Please enter the letters from the image","Please enter the letters from the image"
+"Please enter the letters and numbers from the image","Please enter the letters and numbers from the image"
 "<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>: Captcha is case sensitive."
 "Reload captcha","Reload captcha"
-"Please type the letters below","Please type the letters below"
+"Please type the letters and numbers below","Please type the letters and numbers below"
 "Attention: Captcha is case sensitive.","Attention: Captcha is case sensitive."
 CAPTCHA,CAPTCHA
 "Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"

app/code/Magento/Captcha/view/adminhtml/templates/default.phtml

@@ -13,7 +13,7 @@ $captcha = $block->getCaptchaModel();
 ?>
 <div class="admin__field _required">
  <label for="captcha" class="admin__field-label">
- <span><?= $block->escapeHtml(__('Please enter the letters from the image')) ?></span>
+ <span><?= $block->escapeHtml(__('Please enter the letters and numbers from the image')) ?></span>
  </label>
  <div class="admin__field-control">
  <input

app/code/Magento/Captcha/view/frontend/templates/default.phtml

@@ -12,7 +12,7 @@
 $captcha = $block->getCaptchaModel();
 ?>
 <div class="field captcha required" role="<?= $block->escapeHtmlAttr($block->getFormId()) ?>">
- <label for="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" class="label"><span><?= $block->escapeHtml(__('Please type the letters below')) ?></span></label>
+ <label for="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" class="label"><span><?= $block->escapeHtml(__('Please type the letters and numbers below')) ?></span></label>
  <div class="control captcha">
  <input name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?= $block->escapeHtmlAttr($block->getFormId()) ?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" />
  <div class="nested">
@@ -23,7 +23,7 @@ $captcha = $block->getCaptchaModel();
  "imageLoader": "<?= $block->escapeUrl($block->getViewFileUrl('images/loader-2.gif')) ?>",
  "type": "<?= $block->escapeHtmlAttr($block->getFormId()) ?>"}}'>
  <div class="control captcha-image">
- <img alt="<?= $block->escapeHtmlAttr(__('Please type the letters below')) ?>" class="captcha-img" height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>" src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>"/>
+ <img alt="<?= $block->escapeHtmlAttr(__('Please type the letters and numbers below')) ?>" class="captcha-img" height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>" src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>"/>
  <button type="button" class="action reload captcha-reload" title="<?= $block->escapeHtmlAttr(__('Reload captcha')) ?>"><span><?= $block->escapeHtml(__('Reload captcha')) ?></span></button>
  </div>
  </div>

app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html

@@ -6,15 +6,15 @@
 -->
 <!-- ko if: (isRequired() && getIsVisible())-->
 <div class="field captcha required" data-bind="blockLoader: getIsLoading()">
- <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters below'"></span></label>
+ <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters and numbers below'"></span></label>
  <div class="control captcha">
  <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" />
  <input name="captcha_form_id" type="hidden" data-bind="value: formId, attr: {'data-scope': dataScope}" />
  <div class="nested">
  <div class="field captcha no-label">
  <div class="control captcha-image">
  <img data-bind="attr: {
- alt: $t('Please type the letters below'),
+ alt: $t('Please type the letters and numbers below'),
  height: imageHeight(),
  src: getImageSource(),
  }"