Merge branch 'MAGETWO-34253' into PR

Author: guz-anton

app/code/Magento/Customer/etc/data_source/customer_address.xml

@@ -48,11 +48,13 @@
                 </constraints>
             </field>
             <field name="region" source="eav" formElement="input" visible="false"/>
-            <field name="postcode" source="eav">
+
+            <field name="postcode" source="eav" formElement="post_code_fix" >
                 <constraints>
                     <validate name="required-entry"/>
                 </constraints>
             </field>
+
             <field name="telephone" source="eav" label="Phone Number">
                 <constraints>
                     <validate name="required-entry"/>

app/code/Magento/Directory/Model/Resource/Country/Collection.php

@@ -44,6 +44,11 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      */
     protected $_localeResolver;
 
+    /**
+     * @var \Magento\Directory\Helper\Data
+     */
+    protected $helperData;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -68,6 +73,7 @@ public function __construct(
         \Magento\Directory\Model\Resource\CountryFactory $countryFactory,
         \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Framework\App\Helper\AbstractHelper $helperData,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
@@ -77,6 +83,7 @@ public function __construct(
         $this->_localeResolver = $localeResolver;
         $this->_countryFactory = $countryFactory;
         $this->_arrayUtils = $arrayUtils;
+        $this->helperData = $helperData;
     }
 
     /**
@@ -208,7 +215,11 @@ public function toOptionArray($emptyLabel = ' ')
         }
         $options = [];
         foreach ($sort as $label => $value) {
-            $options[] = ['value' => $value, 'label' => $label];
+            $option = ['value' => $value, 'label' => $label];
+            if ($this->helperData->isRegionRequired($value)) {
+                $option['is_region_required'] = 'true';
+            }
+            $options[] = $option;
         }
 
         if (count($options) > 0 && $emptyLabel !== false) {

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

@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <type name="Magento\Directory\Model\Resource\Country\Collection" shared="false" />
     <type name="Magento\Directory\Model\Currency\Import\Config">
         <arguments>
             <argument name="servicesConfig" xsi:type="array">
@@ -17,4 +16,15 @@
             </argument>
         </arguments>
     </type>
+
+    <virtualType name="DirectoryHelperDataProxy" type="Magento\Directory\Helper\Data\Proxy">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">Magento\Directory\Helper\Data</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Directory\Model\Resource\Country\Collection" shared="false">
+        <arguments>
+            <argument name="helperData" xsi:type="object">DirectoryHelperDataProxy</argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Ui/Component/Form/Element/DataType/PostCodeFix.php

@@ -0,0 +1,14 @@
+<?php
+/**
+* Copyright © 2015 Magento. All rights reserved.
+* See COPYING.txt for license details.
+*/
+namespace Magento\Ui\Component\Form\Element\DataType;
+
+/**
+* Class Number
+*/
+class PostCodeFix extends AbstractDataType
+{
+//
+}

app/code/Magento/Ui/view/base/layout/ui_components.xml

@@ -233,4 +233,13 @@
             </argument>
         </arguments>
     </block>
+
+    <block class="Magento\Ui\Component\Form\Element\DataType\PostCodeFix" name="post_code_fix">
+        <arguments>
+            <argument name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/element/post-code-fix</item>
+                <item name="dependentFiled" xsi:type="string">country_id</item>
+            </argument>
+        </arguments>
+    </block>
 </layout>

app/code/Magento/Ui/view/base/web/js/form/element/post-code-fix.js

@@ -0,0 +1,64 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'Magento_Ui/js/lib/registry/registry',
+    './abstract'
+], function (_, registry, Abstract) {
+    'use strict';
+
+    return Abstract.extend({
+        /**
+         * Extended list of Listeners
+         *
+         * @return {this}
+         */
+        initListeners: function(){
+            this._super()
+                .update()
+                .provider.data.on('update:'+this.parentScope+'.country_id', this.update.bind(this));
+
+            return this;
+        },
+
+        /**
+         * Fix _postcode_ depend on _country_id_ change:
+         *  - If country in list "Zip/Postal Code is Optional countries" then
+         *    - field "postcode" should not be required
+         *
+         * @returns {this}
+         */
+        update: function(){
+            var parentScope  = this.getPart(this.getPart(this.name, -2), -2),
+                option,
+                postcode = this;
+
+            registry.get(parentScope + '.country_id.0', function (countryComponent) {
+                var value = countryComponent.value();
+
+                if (!value) { // empty value discard logic
+                    return;
+                }
+
+                countryComponent
+                    .options()
+                    .some(function (el) {
+                        option = el;
+                        return el.value === value;
+                    });
+
+                if(!option.is_region_required) {
+                    postcode.error(false);
+                    postcode.validation = _.omit(postcode.validation, 'required-entry');
+                } else {
+                    postcode.validation['required-entry'] = true;
+                }
+                postcode.required(!!option.is_region_required);
+            });
+
+            return this;
+        }
+    });
+});