ACP2E-2622: Unable to save changes to phone number in existing order details

Author: lakshmana49

app/code/Magento/Sales/Model/ResourceModel/Order/Address.php

@@ -122,4 +122,27 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
         }
         return $this;
     }
+
+    /**
+     * Check is current order address entity has changes, by comparing current object state with stored snapshot
+     *
+     * @param \Magento\Framework\DataObject $entity
+     * @return bool
+     */
+    protected function isModified(\Magento\Framework\Model\AbstractModel $entity)
+    {
+        if (!$entity->getId()) {
+            return true;
+        }
+        $snapChatData = $this->entitySnapshot->getSnapshotData($entity);
+        foreach ($snapChatData as $field => $value) {
+            $fieldValue = $entity->getDataByKey($field);
+            if (is_numeric($fieldValue) && is_numeric($value)) {
+                if ($fieldValue !== $value) {
+                    return true;
+                }
+            }
+        }
+        return parent::isModified($entity);
+    }
 }

lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Model\ResourceModel\Db\VersionControl;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
@@ -50,6 +51,17 @@ public function registerSnapshot(\Magento\Framework\DataObject $entity)
         $this->snapshotData[get_class($entity)][$entity->getId()] = $data;
     }
 
+    /**
+     * Get snapshot data
+     *
+     * @param DataObject $entity
+     * @return array
+     */
+    public function getSnapshotData(\Magento\Framework\DataObject $entity)
+    {
+        return $this->snapshotData[get_class($entity)][$entity->getId()];
+    }
+
     /**
      * Check is current entity has changes, by comparing current object state with stored snapshot
      *
@@ -67,15 +79,8 @@ public function isModified(\Magento\Framework\DataObject $entity)
             return true;
         }
         foreach ($this->snapshotData[$entityClass][$entity->getId()] as $field => $value) {
-            $fieldValue = $entity->getDataByKey($field);
-            if (is_numeric($fieldValue) && is_numeric($value)) {
-                if ($fieldValue !== $value) {
-                    return true;
-                }
-            } else {
-                if ($fieldValue != $value) {
-                    return true;
-                }
+            if ($entity->getDataByKey($field) != $value) {
+                return true;
             }
         }