[FEATURE] Added AddressLine Support to the Registration and AddressEd…

…it form
experius · May 2, 2017 · 1eb3a1d · 1eb3a1d
1 parent 45fd282
commit 1eb3a1d
Show file tree

Hide file tree

Showing 9 changed files with 532 additions and 8 deletions.
diff --git a/Block/Checkout/LayoutProcessor.php b/Block/Checkout/LayoutProcessor.php
@@ -106,11 +106,7 @@ public function modifyStreetUiComponents($addressResult)
             $lineNumber = $lineCount+1;
 
             if(isset($addressResult['street']['children'][$lineCount])){
-                $group = "experius_address_lines/experius_address_line{$lineNumber}";
-                //var_dump($group); die();
-                $label = ($this->addressLineHelper->getModuleConfig("line_label", $group)) 
-                         ? $this->addressLineHelper->getModuleConfig("line_label", $group) 
-                         : __('Address Line');
+                $label = $this->addressLineHelper->getLineLabel($lineNumber);
 
                 if ( $this->addressLineHelper->getModuleConfig("line_enabled", $group)) {
                     $addressResult['street']['children'][$lineCount]['label'] = $label;

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -16,10 +16,58 @@ public function getModuleConfig($field = false, $group = false, $section = false
         //var_dump("{$section}/{$group}/{$field}"); exit();die();
         return $this->scopeConfig->getValue("{$section}/{$group}/{$field}", \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
+
+    public function getLineLabel($lineNumber)
+    {
+        $group = "experius_address_lines/experius_address_line{$lineNumber}";
+        $label = ($this->getModuleConfig("line_label", $group))
+            ? $this->getModuleConfig("line_label", $group)
+            : __('Address Line');
+        return $label;
+    }
+
+    public function getValidationMaxLength($lineNumber)
+    {
+        $group = "experius_address_lines/experius_address_line{$lineNumber}";
+        $maxLength = ($this->getModuleConfig("line_max_length", $group))
+            ? $this->getModuleConfig("line_max_length", $group)
+            : false;
+        return $maxLength;
+    }
+
+    public function getValidationMinLength($lineNumber)
+    {
+        $group = "experius_address_lines/experius_address_line{$lineNumber}";
+        $maxLength = ($this->getModuleConfig("line_min_length", $group))
+            ? $this->getModuleConfig("line_min_length", $group)
+            : false;
+        return $maxLength;
+    }
+
+    public function isLineRequired($lineNumber)
+    {
+        $group = "experius_address_lines/experius_address_line{$lineNumber}";
+        return $this->getModuleConfig("line_required", $group);
+    }
+
+    public function getValidationClassesForLine($lineNumber)
+    {
+        if (!$this->getValidationClassesAsArrayForLine($lineNumber)) {
+            return;
+        }
+        $validationArray = $this->getValidationClassesAsArrayForLine($lineNumber);
+        if (key_exists('validate-number',$validationArray)) {
+            $validationArray['validate-digits'] = 1;
+            unset($validationArray['validate-number']);
+        }
+        $validationClassesString = ' ' . implode(' ', array_keys($validationArray));
+        return $validationClassesString;
+    }
+
     public function getValidationClassesAsArrayForLine($lineNumber) 
     {
         $group = "experius_address_lines/experius_address_line{$lineNumber}";
-        
+
         $validationClassesString = $this->getModuleConfig("line_validation_classes", $group);
         //var_dump($validationClassesString);
         $validationParts = explode(',', $validationClassesString);
@@ -28,11 +76,11 @@ public function getValidationClassesAsArrayForLine($lineNumber)
         foreach($validationParts as $validationPart) {
 
             $validationPartArray = explode(':', $validationPart);
-            if (empty($validationPartArray)) {
+            if (!empty($validationPartArray)) {
                 $validationClassesArray[$validationPartArray[0]] = (int) $validationPartArray[1];
             }
         }
-        if($this->getModuleConfig("line_required", $group)){
+        if($this->isLineRequired($lineNumber)){
             $validationClassesArray['required-entry'] = 1;
         }
         return $validationClassesArray;

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -21,6 +21,14 @@
                     <field id="line_validation_classes" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label" type="text">
                         <label>Line 1 Validation</label>
                     </field>
+                    <field id="line_min_length" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label" type="text">
+                        <label>Line 1 Min Length</label>
+                        <comment>Necessary for registrion page and address edit.</comment>
+                    </field>
+                    <field id="line_max_length" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label" type="text">
+                        <label>Line 1 Max Length</label>
+                        <comment>Necessary for registrion page and address edit.</comment>
+                    </field>
                 </group>
                 <group id="experius_address_line2" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="900" translate="label">
                     <label>Line 2</label>
@@ -38,6 +46,14 @@
                     <field id="line_validation_classes" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
                         <label>Line 2 Validation</label>
                     </field>
+                    <field id="line_min_length" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label" type="text">
+                        <label>Line 2 Min Length</label>
+                        <comment>Necessary for registrion page and address edit.</comment>
+                    </field>
+                    <field id="line_max_length" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label" type="text">
+                        <label>Line 2 Max Length</label>
+                        <comment>Necessary for registrion page and address edit.</comment>
+                    </field>
                 </group>
                 <group id="experius_address_line3" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="900" translate="label">
                     <label>Line 3</label>
@@ -55,6 +71,14 @@
                     <field id="line_validation_classes" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
                         <label>Line 3 Validation</label>
                     </field>
+                    <field id="line_min_length" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label" type="text">
+                        <label>Line 3 Min Length</label>
+                        <comment>Necessary for registrion page and address edit.</comment>
+                    </field>
+                    <field id="line_max_length" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label" type="text">
+                        <label>Line 3 Max Length</label>
+                        <comment>Necessary for registrion page and address edit.</comment>
+                    </field>
                 </group>
                 <group id="experius_address_line4" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="900" translate="label">
                     <label>Line 4</label>
@@ -72,6 +96,14 @@
                     <field id="line_validation_classes" showInDefault="1" showInStore="1" showInWebsite="120" sortOrder="20" translate="label" type="text">
                         <label>Line 4 Validation</label>
                     </field>
+                    <field id="line_min_length" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label" type="text">
+                        <label>Line 4 Min Length</label>
+                        <comment>Necessary for registrion page and address edit.</comment>
+                    </field>
+                    <field id="line_max_length" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label" type="text">
+                        <label>Line 4 Max Length</label>
+                        <comment>Necessary for registrion page and address edit.</comment>
+                    </field>
                 </group>
             </group>
         </section>

diff --git a/etc/config.xml b/etc/config.xml
@@ -9,6 +9,8 @@
                     <line_label>Street</line_label>
                     <line_required>1</line_required>
                     <line_validation_classes>max_text_length:255,min_text_length:1</line_validation_classes>
+                    <line_min_length>1</line_min_length>
+                    <line_max_length>255</line_max_length>
                 </experius_address_line1>
                 <experius_address_line2>
                     <line_enabled>0</line_enabled>
@@ -21,6 +23,7 @@
                     <line_label>Addition</line_label>
                     <line_required>0</line_required>
                     <line_validation_classes>max_text_length:255,min_text_length:1</line_validation_classes>
+                    <line_max_length>255</line_max_length>
                 </experius_address_line3>
                 <experius_address_line4>
                     <line_enabled>0</line_enabled>

diff --git a/etc/module.xml b/etc/module.xml
@@ -3,6 +3,8 @@
     <module name="Experius_AddressLines" setup_version="1.0.0">
         <sequence>
             <module name="Magento_Checkout"/>
+            <module name="Magento_Customer"/>
+            <module name="Magento_CustomerCustomAttributes"/>
         </sequence>
     </module>
 </config>
diff --git a/view/frontend/layout/customer_account_create.xml b/view/frontend/layout/customer_account_create.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="customer_form_template_handle"/>
+    <body>
+        <referenceBlock name="customer_form_register">
+            <action method="setTemplate" ifconfig="customer/experius_address_lines/enabled">
+                <argument name="template" xsi:type="string">Experius_AddressLines::/experius/customer/form/register.phtml</argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/layout/customer_address_form.xml b/view/frontend/layout/customer_address_form.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="customer_form_template_handle"/>
+    <body>
+        <referenceBlock name="customer_address_edit">
+            <action method="setTemplate"  ifconfig="customer/experius_address_lines/enabled">
+                <argument name="template" xsi:type="string">Experius_AddressLines::/experius/customer/address/edit.phtml</argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>