[bug-OpenMage#193] Fix switching between customer addresses in the ad…

…min panel * make sure address data is reset for each loop iteration * stop setting empty region field to '0' when switching between saved addresses
edannenberg · Sep 19, 2018 · f5e74e9 · f5e74e9
1 parent 9e583a1
commit f5e74e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
@@ -106,7 +106,7 @@
             <?php foreach ($addressCollection as $_address): ?>
             <div id="form_address_item_<?php echo $_address->getId() ?>" style="display:none">
             <?php
-                    $this->getForm()->addValues($_address->getData())
+                    $this->getForm()->setValues($_address->getData())
                             ->setHtmlIdPrefix("_item{$_address->getId()}")
                             ->setFieldNameSuffix('address['.$_address->getId().']');
                     $this->addValuesToNamePrefixElement($_address->getPrefix())

diff --git a/js/mage/adminhtml/sales.js b/js/mage/adminhtml/sales.js
@@ -281,7 +281,7 @@ AdminOrder.prototype = {
             }
 
             if (fields[i].changeUpdater) fields[i].changeUpdater();
-            if (name == 'region' && data['region_id'] && !data['region']){
+            if (name == 'region' && data['region_id'] > 0 && !data['region']){
                 fields[i].value = data['region_id'];
             }
         }