Merge remote-tracking branch 'main-ce/develop' into MAGETWO-39986

Author: Yuri Kovsher

.travis.yml

@@ -28,7 +28,7 @@ before_install:
            $HOME/.cache/bin/composer self-update; echo '';
          else
            mkdir -p $HOME/.cache/bin;
-           curl --connect-timeout 30 -sS https://getcomposer.org/installer \
+           curl --connect-timeout 30 -sS https://getcomposer.org/installer
            | php -- --install-dir $HOME/.cache/bin/ --filename composer;
          fi
        fi'

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

@@ -54,14 +54,14 @@
                     <button data-role="review-save"
                             type="submit"
                             data-bind="
-                            attr: {title: $t('Place order')},
+                            attr: {title: $t('Place Order')},
                             enable: (getCode() == isChecked()),
                             click: placeOrder,
                             css: {disabled: !isPlaceOrderActionAllowed()}
                             "
                             class="action primary checkout"
                             disabled>
-                        <span data-bind="text: $t('Place order')"></span>
+                        <span data-bind="text: $t('Place Order')"></span>
                     </button>
                 </div>
             </div>

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

@@ -352,8 +352,9 @@
             <resource>Magento_Config::config_admin</resource>
             <group id="emails" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Admin User Emails</label>
-                <field id="forgot_email_template" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="forgot_email_template" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Forgot Password Email Template</label>
+                    <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
                 </field>
                 <field id="forgot_email_identity" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">

app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html

@@ -34,14 +34,14 @@
                 <button data-role="review-save"
                         type="submit"
                         data-bind="
-                        attr: {title: $t('Place order')},
+                        attr: {title: $t('Place Order')},
                         enable: (getCode() == isChecked()),
                         click: placeOrder,
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         "
                         class="action primary checkout"
                         disabled>
-                    <span data-bind="text: $t('Place order')"></span>
+                    <span data-bind="text: $t('Place Order')"></span>
                 </button>
             </div>
         </div>

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

@@ -151,12 +151,26 @@
                     <span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
                 </label>
                 <div class="control">
-                    <input type="number" class="input-text cvv" name="payment[cc_cid]" value=""
-                            data-bind="attr: {id: getCode() + '_cc_cid', title: $t('Card Verification Number'), 'data-container': getCode() + '-cc-cvv', 'data-validate': JSON.stringify({'required-number':true, 'validate-cc-cvn':'#' + getCode() + '_cc_type'})},
-                            enable: true,
-                            value: creditCardVerificationNumber"/>
-                    <div class="note">
-                        <a href="#" class="action cvv" data-bind="attr: {title: $t('What is this?')}, mageInit:{'tooltip': {'content': getCvvImageHtml()}}"><span><!-- ko text: $t('What is this?')--><!-- /ko --></span></a>
+                    <input type="number"
+                           class="input-text cvv"
+                           name="payment[cc_cid]"
+                           value=""
+                           data-bind="attr: {id: getCode() + '_cc_cid',
+                           title: $t('Card Verification Number'),
+                           'data-container': getCode() + '-cc-cvv',
+                           'data-validate': JSON.stringify({'required-number':true, 'validate-cc-cvn':'#' + getCode() + '_cc_type'})},
+                           enable: true,
+                           value: creditCardVerificationNumber" />
+                    <div class="field-tooltip toggle">
+                        <span class="field-tooltip-action action-cvv"
+                              tabindex="0"
+                              data-toggle="dropdown"
+                              data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
+                            <span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
+                        </span>
+                        <div class="field-tooltip-content"
+                             data-target="dropdown"
+                             data-bind="html: getCvvImageHtml()"></div>
                     </div>
                 </div>
             </div>

app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html

@@ -36,7 +36,7 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
      * @param \Magento\Framework\Object $item
      * @return array|null
      */
-    public function getChilds($item)
+    public function getChildren($item)
     {
         $itemsArray = [];
 

app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html

@@ -125,7 +125,7 @@ public function getValueHtml($item)
      * @param \Magento\Framework\Object $item
      * @return array
      */
-    public function getChilds($item)
+    public function getChildren($item)
     {
         $itemsArray = [];
 

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php

@@ -18,7 +18,7 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
      * @param \Magento\Framework\Object $item
      * @return array
      */
-    public function getChilds($item)
+    public function getChildren($item)
     {
         $itemsArray = [];