Save manual only if shown

Author: wilr

src/AddressFinderField.php

@@ -321,11 +321,13 @@ public function setValue($value, $record = null)
                 $this->addressField->setValue($value['Address']);
             }
 
-            foreach ($this->getManualFields() as $field) {
-                $nested = $this->getNestedFieldName($field);
+            if ($this->getShowManualFields()) {
+                foreach ($this->getManualFields() as $field) {
+                    $nested = $this->getNestedFieldName($field);
 
-                if (isset($value[$nested])) {
-                    $field->setValue($value[$nested]);
+                    if (isset($value[$nested])) {
+                        $field->setValue($value[$nested]);
+                    }
                 }
             }
         } elseif (is_string($value)) {
@@ -340,10 +342,11 @@ public function saveInto(DataObjectInterface $record)
     {
         $record->{$this->getName()} = $this->addressField->Value();
 
-        foreach ($this->getManualFields() as $field) {
-            $fieldName = $this->getNestedFieldName($field);
-
-            $record->{$fieldName} = $field->Value();
+        if ($this->getShowManualFields()) {
+            foreach ($this->getManualFields() as $field) {
+                $fieldName = $this->getNestedFieldName($field);
+                $record->{$fieldName} = $field->Value();
+            }
         }
     }
 

templates/Includes/AddressFinderField_holder.ss

@@ -16,7 +16,7 @@
 
             <% if ShowManualFields %>
                 <div class="toggle_manual_address" style="display: none">
-                    <p><a href="#"><% _t('AddressFinderField.ENTERMANUAL', 'Enter your address manually') %></a></p>
+                    <p><a href="#"><% _t('AddressFinderField.ENTERMANUAL', 'Or, enter your address manually') %></a></p>
                 </div>
             <% end_if %>
         </div>