243. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:03 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

243.1 Files compared

#LocationFileLast Modified
12021-05-13 09:09:03 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formregister.phtml2021-02-04 04:44:06 +0000

243.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted1231
Removed00

243.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

243.4 Active regular expressions

No regular expressions were active.

243.5 Comparison detail

    1 <?php
    2 /**
    3  * Copyright © Magento, Inc. All rights reserved.
    4  * See COPYING.txt for license details.
    5  */
    6 
    7 /** @var \Magento\Customer\Block\Form\Register $block */
    8 ?>
    9 <?= $block->getChildHtml('form_fields_before') ?>
    10 <?php /* Extensions placeholder */ ?>
    11 <?= $block->getChildHtml('customer.form.register.extra') ?>
    12 <form class="form create account form-create-account" action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
    13     <?= /* @noEscape */ $block->getBlockHtml('formkey'); ?>
    14     <fieldset class="fieldset create info">
    15         <legend class="legend"><span><?= $block->escapeHtml(__('Personal Information')) ?></span></legend><br>
    16         <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
    17         <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
    18         <?= $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Name::class)->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
    19         <?php if ($block->isNewsletterEnabled()) : ?>
    20             <div class="field choice newsletter">
    21                 <input type="checkbox" name="is_subscribed" title="<?= $block->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()) : ?> checked="checked"<?php endif; ?> class="checkbox">
    22                 <label for="is_subscribed" class="label"><span><?= $block->escapeHtml(__('Sign Up for Newsletter')) ?></span></label>
    23             </div>
    24             <?php /* Extensions placeholder */ ?>
    25             <?= $block->getChildHtml('customer.form.register.newsletter') ?>
    26         <?php endif ?>
    27 
    28         <?php $_dob = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Dob::class) ?>
    29         <?php if ($_dob->isEnabled()) : ?>
    30             <?= $_dob->setDate($block->getFormData()->getDob())->toHtml() ?>
    31         <?php endif ?>
    32 
    33         <?php $_taxvat = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Taxvat::class) ?>
    34         <?php if ($_taxvat->isEnabled()) : ?>
    35             <?= $_taxvat->setTaxvat($block->getFormData()->getTaxvat())->toHtml() ?>
    36         <?php endif ?>
    37 
    38         <?php $_gender = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Gender::class) ?>
    39         <?php if ($_gender->isEnabled()) : ?>
    40             <?= $_gender->setGender($block->getFormData()->getGender())->toHtml() ?>
    41         <?php endif ?>
    42     </fieldset>
    43     <?php if ($block->getShowAddressFields()) : ?>
    44         <fieldset class="fieldset address">
    45             <legend class="legend"><span><?= $block->escapeHtml(__('Address Information')) ?></span></legend><br>
    46             <input type="hidden" name="create_address" value="1" />
    47 
    48             <?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
    49             <?php if ($_company->isEnabled()) : ?>
    50                 <?= $_company->setCompany($block->getFormData()->getCompany())->toHtml() ?>
    51             <?php endif ?>
    52 
    53             <?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
    54             <?php if ($_telephone->isEnabled()) : ?>
    55                 <?= $_telephone->setTelephone($block->getFormData()->getTelephone())->toHtml() ?>
    56             <?php endif ?>
    57 
    58             <?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
    59             <?php if ($_fax->isEnabled()) : ?>
    60                 <?= $_fax->setFax($block->getFormData()->getFax())->toHtml() ?>
    61             <?php endif ?>
    62 
    63             <?php $_streetValidationClass = $this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('street'); ?>
    64 
    65             <div class="field street required">
    66                 <label for="street_1" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span></label>
    67                 <div class="control">
    68                     <input type="text" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
    69                     <div class="nested">
    70                         <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
    71                         <?php for ($_i = 2, $_n = $this->helper(\Magento\Customer\Helper\Address::class)->getStreetLines(); $_i <= $_n; $_i++) : ?>
    72                             <div class="field additional">
    73                                 <label class="label" for="street_<?= /* @noEscape */ $_i ?>">
    74                                     <span><?= $block->escapeHtml(__('Address')) ?></span>
    75                                 </label>
    76                                 <div class="control">
    77                                     <input type="text" name="street[]" value="<?= $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?= $block->escapeHtmlAttr(__('Street Address %1', $_i)) ?>" id="street_<?= /* @noEscape */ $_i ?>" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
    78                                 </div>
    79                             </div>
    80                         <?php endfor; ?>
    81                     </div>
    82                 </div>
    83             </div>
    84 
    85             <div class="field required">
    86                 <label for="city" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
    87                 <div class="control">
    88                     <input type="text" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('city')) ?>" id="city">
    89                 </div>
    90             </div>
    91 
    92             <div class="field region required">
    93                 <label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
    94                 <div class="control">
    95                     <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select region_id" style="display:none;">
    96                         <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
    97                     </select>
    98                     <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('region')) ?>" style="display:none;">
    99                 </div>
    100             </div>
    101 
    102             <div class="field zip required">
    103                 <label for="zip" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span></label>
    104                 <div class="control">
    105                     <input type="text" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('postcode')) ?>">
    106                 </div>
    107             </div>
    108 
    109             <div class="field country required">
    110                 <label for="country" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
    111                 <div class="control">
    112                     <?= $block->getCountryHtmlSelect() ?>
    113                 </div>
    114             </div>
    115             <?php $addressAttributes = $block->getChildBlock('customer_form_address_user_attributes');?>
    116             <?php if ($addressAttributes) : ?>
    117                 <?php $addressAttributes->setEntityType('customer_address'); ?>
    118                 <?php $addressAttributes->setFieldIdFormat('address:%1$s')->setFieldNameFormat('address[%1$s]');?>
    119                 <?php $block->restoreSessionData($addressAttributes->getMetadataForm(), 'address');?>
    120                 <?= $addressAttributes->setShowContainer(false)->toHtml() ?>
    121             <?php endif;?>
    122             <input type="hidden" name="default_billing" value="1">
    123             <input type="hidden" name="default_shipping" value="1">
    124         </fieldset>
    125 
    126     <?php endif; ?>
    127     <fieldset class="fieldset create account" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
    128         <legend class="legend"><span><?= $block->escapeHtml(__('Sign-in Information')) ?></span></legend><br>
    129         <div class="field required">
    130             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
    131             <div class="control">
    132                 <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
    133             </div>
    134         </div>
    135         <div class="field password required">
    136             <label for="password" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
    137             <div class="control">
    138                 <input type="password" name="password" id="password"
    139                        title="<?= $block->escapeHtmlAttr(__('Password')) ?>"
    140                        class="input-text"
    141                        data-password-min-length="<?= $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
    142                        data-password-min-character-sets="<?= $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
    143                        data-validate="{required:true, 'validate-customer-password':true}"
    144                        autocomplete="off">
    145                 <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
    146                     <div id="password-strength-meter" class="password-strength-meter">
    147                         <?= $block->escapeHtml(__('Password Strength')) ?>:
    148                         <span id="password-strength-meter-label" data-role="password-strength-meter-label">
    149                             <?= $block->escapeHtml(__('No Password')) ?>
    150                         </span>
    151                     </div>
    152                 </div>
    153             </div>
    154 
    155         </div>
    156         <div class="field confirmation required">
    157             <label for="password-confirmation" class="label"><span><?= $block->escapeHtml(__('Confirm Password')) ?></span></label>
    158             <div class="control">
    159                 <input type="password" name="password_confirmation" title="<?= $block->escapeHtmlAttr(__('Confirm Password')) ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" autocomplete="off">
    160             </div>
    161         </div>
    162         <?= $block->getChildHtml('form_additional_info') ?>
    163     </fieldset>
    164     <div class="actions-toolbar">
    165         <div class="primary">
    166             <button type="submit" class="action submit primary" title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></button>
    167         </div>
    168         <div class="secondary">
    169             <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
    170         </div>
    171     </div>
    172 </form>
    173 <script>
    174 require([
    175     'jquery',
    176     'mage/mage'
    177 ], function($){
    178 
    179     var dataForm = $('#form-validate');
    180     var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
    181 
    182     dataForm.mage('validation', {
    183     <?php if ($_dob->isEnabled()) : ?>
    184         errorPlacement: function(error, element) {
    185             if (element.prop('id').search('full') !== -1) {
    186                 var dobElement = $(element).parents('.customer-dob'),
    187                     errorClass = error.prop('class');
    188                 error.insertAfter(element.parent());
    189                 dobElement.find('.validate-custom').addClass(errorClass)
    190                     .after('<div class="' + errorClass + '"></div>');
    191             }
    192             else {
    193                 error.insertAfter(element);
    194             }
    195         },
    196         ignore: ':hidden:not(' + ignore + ')'
    197     <?php else : ?>
    198         ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
    199     <?php endif ?>
    200     }).find('input:text').attr('autocomplete', 'off');
    201 
    202 });
    203 </script>
    204 <?php if ($block->getShowAddressFields()) : ?>
    205 <script type="text/x-magento-init">
    206     {
    207         "#country": {
    208             "regionUpdater": {
    209                 "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
    210                 "regionListId": "#region_id",
    211                 "regionInputId": "#region",
    212                 "postcodeId": "#zip",
    213                 "form": "#form-validate",
    214                 "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
    215                 "defaultRegion": "<?= (int) $block->getFormData()->getRegionId() ?>",
    216                 "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
    217             }
    218         }
    219     }
    220 </script>
    221 <?php endif; ?>
    222 
    223 <script type="text/x-magento-init">
    224     {
    225         ".field.password": {
    226             "passwordStrengthIndicator": {
    227                 "formSelector": "form.form-create-account"
    228             }
    229         }
    230     }
    231 </script>