Merge pull request #4 from khoa-le/remove-address-field-in-sales-order-edit-page

Fixed Issue: The unwanted form fields do not remove on Sales Order Edit Page

Author: srenon

Helper/Data.php

@@ -43,10 +43,12 @@ public function isCustomerEditAdminPage()
      * Check page type
      * @return bool
      */
-    public function isOrderCreationAdminPage()
+    public function isSalesOrderFormAdminPage()
     {
         return $this->_request->getFullActionName() === 'sales_order_create_index'
-            || $this->_request->getFullActionName() === 'sales_order_create_loadBlock';
+            || $this->_request->getFullActionName() === 'sales_order_create_loadBlock'
+            || $this->_request->getFullActionName() === 'sales_order_edit_index'
+            || $this->_request->getFullActionName() === 'sales_order_edit_loadBlock';
     }
 
     /**

Plugin/Model/Metadata/FormPlugin.php

@@ -35,7 +35,7 @@ public function __construct(
      */
     public function afterGetAttributes(Form $subject, $result)
     {
-        if ($this->_dataHelper->isOrderCreationAdminPage() && $this->_dataHelper->isEnabled() && is_array($result)) {
+        if ($this->_dataHelper->isSalesOrderFormAdminPage() && $this->_dataHelper->isEnabled() && is_array($result)) {
             foreach ($this->_dataHelper->getCustomerAddressAttributeArray() as $field) {
                 if (array_key_exists($field, $result)) {
                     unset($result[$field]);