Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable by avstudnitz · Pull Request #8519 · magento/magento2

avstudnitz · 2017-02-11T16:42:37Z

Fixes #1691.
We added configuration for telephone, fax and company fields in configuration:

You can set them to be optional, required, or not shown at all. All necessary forms have been adjusted.

…ation

…phone" not being a required field

…elds

…ing a required field

…onfiguration

…rting blocks

…/magento2 into telephone-not-required

magento-cicd2 · 2017-02-11T16:42:38Z

All committers have signed the CLA.

Igloczek · 2017-02-11T17:55:06Z

app/code/Magento/Customer/view/frontend/templates/widget/company.phtml

+    <div class="control">
+        <input type="text" name="company" id="company" value="<?php echo $block->escapeHtmlAttr($block->getCompany()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Company')) ?>" class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company')) ?>">
+    </div>
+</div>


Will be nice to improve code formatting in templates 😉 Copy-paste code bellow.

<div class="field company <?php echo $block->isRequired() ? 'required' : '' ?>"> <label for="company" class="label"> <span> <?php echo $block->escapeHtml(__('Company')) ?> </span> </label> <div class="control"> <?php $_validationClass = $block->escapeHtmlAttr( $this->helper('Magento\Customer\Helper\Address') ->getAttributeValidationClass('company') ); ?> <input type="text" name="company" id="company" value="<?php echo $block->escapeHtmlAttr($block->getCompany()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Company')) ?>" class="input-text <?php echo $_validationClass ?? '' ?>" > </div> </div>

PS. Remember about new line at the end of file.

Igloczek · 2017-02-11T17:58:53Z

app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml

+    <div class="control">
+        <input type="text" name="fax" id="fax" value="<?php echo $block->escapeHtmlAttr($block->getFax()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Fax')) ?>" class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax')) ?>">
+    </div>
+</div>


<div class="field fax <?php echo $block->isRequired() ? 'required' : '' ?>"> <label for="fax" class="label"> <span> <?php echo $block->escapeHtml(__('Fax')) ?> </span> </label> <div class="control"> <?php $_validationClass = $block->escapeHtmlAttr( $this->helper('Magento\Customer\Helper\Address') ->getAttributeValidationClass('fax') ); ?> <input type="text" name="fax" id="fax" value="<?php echo $block->escapeHtmlAttr($block->getFax()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Fax')) ?>" class="input-text <?php echo $_validationClass ?? '' ?>" > </div> </div>

Igloczek · 2017-02-11T18:01:38Z

app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml

+    <div class="control">
+        <input type="text" name="telephone" id="telephone" value="<?php echo $block->escapeHtmlAttr($block->getTelephone()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Phone Number')) ?>" class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone')) ?>">
+    </div>
+</div>


<div class="field telephone <?php echo $block->isRequired() ? 'required' : '' ?>"> <label for="telephone" class="label"> <span> <?php echo $block->escapeHtml(__('Phone Number')) ?> </span> </label> <div class="control"> <?php $_validationClass = $block->escapeHtmlAttr( $this->helper('Magento\Customer\Helper\Address') ->getAttributeValidationClass('fax') ); ?> <input type="text" name="telephone" id="telephone" value="<?php echo $block->escapeHtmlAttr($block->getTelephone()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Phone Number')) ?>" class="input-text <?php echo $_validationClass ?? '' ?>" > </div> </div>

hostep · 2017-02-11T18:38:11Z

Nice work @avstudnitz!

Just something I have to think about, take a look at this code:

magento2/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

Lines 323 to 339 in 7c81c1d

    
           'company' => [ 
        
               'validation' => [ 
        
                   'min_text_length' => 0, 
        
               ], 
        
           ], 
        
           'fax' => [ 
        
               'validation' => [ 
        
                   'min_text_length' => 0, 
        
               ], 
        
           ], 
        
           'telephone' => [ 
        
               'config' => [ 
        
                   'tooltip' => [ 
        
                       'description' => __('For delivery questions.'), 
        
                   ], 
        
               ], 
        
           ],

I think you'll need to figure something out, to add the required-entry validation of those 3 billing address fields in there, based on the chosen configuration?

(not 100% sure about this though)

avstudnitz · 2017-02-11T19:13:34Z

@hostep In our tests it set the correct validation on the checkout without modifying anything, based on the attribute settings. so I think this is not necessary.

fooman · 2017-02-11T22:22:16Z

Nice work - I believe if you want to increase your chances of a quick merge I suggest taking a look at making the constructor changes here https://github.com/magento/magento2/pull/8519/files#diff-abecee6a6fc7dfb7ec46099d0ffec980R55 use an optional parameter similar to how @dmanners has been doing here https://github.com/magento/magento2/pull/8481/files#diff-ab7a66b8a18582a01b9661fe9270486aR51

…/magento2 into telephone-not-required

vrann · 2017-02-23T04:12:50Z

@avstudnitz Thank you for the contribution! I'm verifying it at the moment.
Can you please take a look at the failing Travis tests?

vrann · 2017-02-23T04:21:30Z

app/code/Magento/Customer/Model/Address/AbstractAddress.php

 * @method string getCity()
 * @method string getTelephone()
+ * @method string getCompany()
+ * @method string getFax()


avstudnitz · 2017-02-23T06:48:19Z

@vrann Yes, will do that over the weekend. It's the unit tests, right?

vrann · 2017-02-23T13:01:15Z

@avstudnitz actually nevermind issues in the unit tests (Travis), it was fast fix and I just did it.
Verifying the functionality and will let you know is there anything need to be changed.

vrann · 2017-02-23T13:37:32Z

@avstudnitz from the review perspective all the changes looks good and the functionality works perfectly.

avstudnitz · 2017-02-23T13:39:19Z

Great to hear @vrann!

okorshenko · 2017-02-25T01:30:45Z

@avstudnitz thank you for your contribution. PR is merged

@kassner

* MAGETWO-64607: Implement custom provider to collect store and system configuration * MAGETWO-64608: Configure store and website reports for data collection * MAGETWO-64612: Implement config for Analytics cron setting * Create wishlist.js * Delete wishlist.js * Update requirejs-config.js * MAGETWO-64607: Implement custom provider to collect store and system configuration * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64629: Add plugin for base url change small refactoring * MAGETWO-64630: Create cronjob that executes update command * MAGETWO-64629: Add plugin for base url change review fixes * MTO-142: [Test] Captcha on front login - Defects fixed. * MTO-142: [Test] Captcha on front login - Defects fixed. * MAGETWO-64630: Create cronjob that executes update command * MAGETWO-63406: [Github] Paypal Payment Order Transaction ID Link will result to 404 not found - Fixed returned link - Fixed unit tests * Update Save.php If quantity is changed using mass action for attribute changes, but no stock item exists for the product, saving the newly created stockItem in StockItemRepository->save($stockItem) returns without saving the stockItem, since $stockItem->getProductId() is null, due to it being added to the array with key '0' (see line 165). To fix this, the array key has been changed to "product_id", such that StockItemRepository successfully creates the stockItem. Also, in my opinion, StockItemRepository->save() should not just return without notice, especially as it already encapsulates the functionality in a try/catch block. Throwing an exception would actually tell the user that something went wrong. * MAGETWO-64630: Create cronjob that executes update command * MAGETWO-64224: Remove usages of AttributeCache from customer module - fixing annotation * MAGETWO-64224: Remove usages of AttributeCache from customer module - making inheritdoc lowercase * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64612: Implement config for Analytics cron setting * MAGETWO-64629: Add plugin for base url change add secure url check * MAGETWO-64629: Add plugin for base url change add secure url check test * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter * MAGETWO-64505: [Integration] Advanced Analytics subscription create API request add data provider * MAGETWO-64505: [Integration] Advanced Analytics subscription create API request * MTO-111: [Test] Update Category if Use Category Flat (Cron is ON, "Update on Save" Mode) - Defects fixed. * MTO-113: [Test] Captcha on admin login - Defects fixed * MAGETWO-64625: Implement API for file downloading by MA allow only secure connections for analytics * MAGETWO-53457: [COMMUNITY] [FEEDBACK] Improve error reporting for failed order placement (checkout) magento#4682 updated unit tests * MTO-142: [Test] Captcha on front login - Defects fixed. * MTO-113: [Test] Captcha on admin login - Defects fixed * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64630: Create cronjob that executes update command * MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420 - fix code style issues * MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420 - fix integrity tests issues * MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420 - fix integration tests * MAGETWO-64902: [GitHub][PR] bug magento#8277 fixing bug with https downloading. magento#8278 * MAGETWO-64775: [GitHub] [PR] Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable magento#8519 - fix unit and integration tests * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter * MAGETWO-64625: Implement API for file downloading by MA add base64 encoding for transferring binary vector * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64613: Implement service to enrypt collected data * MAGETWO-64775: [GitHub] [PR] Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable magento#8519 - fix unit tests * MAGETWO-64613: Implement service to enrypt collected data * MAGETWO-64609: Extend modules report for data colection * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter - covered skipping already converted data with integration test * MAGETWO-64608: Configure store and website reports for data collection * MAGETWO-64613: Implement service to enrypt collected data * MAGETWO-64505: [Integration] Advanced Analytics subscription create API request -- fix test * MAGETWO-62322: Performance Profile Generator * MAGETWO-62322: Performance Profile Generator * Add correct return type in order service The method return $this. I corrected the doc-block. * MAGETWO-64625: Implement API for file downloading by MA fix tests * MAGETWO-62549: Collect Data by cron and encrypt file -- fix code style * MAGETWO-64625: Implement API for file downloading by MA allow only secure connections for analytics * MAGETWO-62549: Collect Data by cron and encrypt file -- fix code style * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Issue added to variation * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64626: Web API test for file export edit test for run on http * MAGETWO-65006: [GitHub][PR] Keep transparency when resizing images magento#7307 - fix is created based on public pull request magento#7307 by @kassner - closing magento#7307 * MAGETWO-51176: ST compiler supplies ObjectManagerInterface to direct third party dependencies * Fixed Doc Block for the dispatch method of the Rest Controller - provided more information on how dispatch method handles the Request * remove unused ComponentRegistrar instance from being passed to Populator::populateMappings * Fixed return type of OrderRepository::getList * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter - custom converters coverage * MAGETWO-64626: Web API test for file export edit test for run on http * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64626: Web API test for file export edit test for run on http * MAGETWO-64626: Web API test for file export allow only secure connections for analytics * MTO-111: [Test] Update Category if Use Category Flat (Cron is ON, "Update on Save" Mode) - Duplicated new line removed. * MAGETWO-64626: Web API test for file export edit test for run on http * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter - custom converters - fixed integration test and removed dependency * MTO-142: [Test] Captcha on front login - Defects fixed. * MAGETWO-64796: Added fixture for Customer module with assigned website * MAGETWO-64601: [Integration] report page API request for Advanced analytics * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-64515: change comment in file due to PR risk * MAGETWO-64515: change comment in file due to PR risk * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting

[Spartans] Bugfix Delivery

avstudnitz and others added 13 commits February 11, 2017 10:48

Add {{depend}} to telephone line in default address text template

a9df245

Add new configuration field for the telephone field

bad7819

Fix backend model for config field "show telephone"

5b32a01

display the telephone field conditionally dependant upon the configur…

93d23f2

…ation

Update validation of customer and quote address for the case of "tele…

1b66bb0

…phone" not being a required field

display the telephone field in the address edit form conditionally

d4bd82b

Added system configuration for toggling display of company and fax fi…

6540ef8

…elds

Update validation of order address for the case of "telephone" not be…

94f0265

…ing a required field

Add server side validation for fax and company fields, depending on c…

4c4990e

…onfiguration

removed unused method

92f8298

Enabled toggling of frontend fields for company and fax - added suppo…

7b1df36

…rting blocks

Merge branch 'telephone-not-required' of github.com:magento-hackathon…

74facff

…/magento2 into telephone-not-required

Add Integration Tests about register form and widgets

724a552

Igloczek suggested changes Feb 11, 2017

View reviewed changes

pixelhed added 4 commits February 12, 2017 08:41

updated formatting of templates

5814ef4

added missing EavConfig docblock param

665867c

made EavConfig an optional param

e68f72c

Merge branch 'telephone-not-required' of github.com:magento-hackathon…

ed3ffe6

…/magento2 into telephone-not-required

vrann self-assigned this Feb 16, 2017

vrann added this to the February 2017 milestone Feb 16, 2017

vrann reviewed Feb 23, 2017

View reviewed changes

mmansoor-magento merged commit ed3ffe6 into magento:develop Feb 25, 2017

vrann added Progress: accept improvement labels Feb 25, 2017

markpol mentioned this pull request Mar 5, 2017

merge upstream (#2) #8794

Closed

vrann mentioned this pull request Mar 6, 2017

Improve address save flow to allow to use custom validators #7882

Closed

vrann added the Award: complex label Mar 10, 2017

avstudnitz deleted the telephone-not-required branch November 8, 2017 08:03

magento-devops-reposync-svc pushed a commit that referenced this pull request Sep 7, 2023

Merge pull request #8519 from magento-gl/spartans_pr_06092023

3d11501

[Spartans] Bugfix Delivery

Conversation

avstudnitz commented Feb 11, 2017 • edited by vrann Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

magento-cicd2 commented Feb 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Igloczek Feb 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Igloczek Feb 11, 2017

Choose a reason for hiding this comment

Uh oh!

Igloczek Feb 11, 2017

Choose a reason for hiding this comment

Uh oh!

hostep commented Feb 11, 2017

Uh oh!

avstudnitz commented Feb 11, 2017

Uh oh!

fooman commented Feb 11, 2017

Uh oh!

vrann commented Feb 23, 2017

Uh oh!

vrann Feb 23, 2017

Choose a reason for hiding this comment

Uh oh!

avstudnitz commented Feb 23, 2017

Uh oh!

vrann commented Feb 23, 2017

Uh oh!

vrann commented Feb 23, 2017

Uh oh!

avstudnitz commented Feb 23, 2017

Uh oh!

okorshenko commented Feb 25, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

avstudnitz commented Feb 11, 2017 •

edited by vrann

Loading

magento-cicd2 commented Feb 11, 2017 •

edited

Loading

Igloczek Feb 11, 2017 •

edited

Loading