From a9f19583cc936fe490a65a47101f6afe76626013 Mon Sep 17 00:00:00 2001
From: diashalabi <diahshalabi@hotmail.com>
Date: Wed, 27 Oct 2021 18:08:31 +0300
Subject: [PATCH] #4800 muzayede needs

---
 .../Profile/Profile/ProfileFormHandler.php    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
index 733395d99..13878a2fd 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
@@ -35,6 +35,11 @@ class ProfileFormHandler
             'google_address' => $builder->getPostValue('google_address') ?: null,
         ];
 
+        $assignments = $userModel->getAssignments();
+        foreach ($assignments->notLocked()->fieldSlugs() as $field) {
+            $parameters[$field] = $builder->getPostValue($field) ?: null;
+        }
+
         if (($valid = $this->validate($parameters)) !== true) {
             $messages->error($valid['msg']);
             return;
@@ -50,13 +55,16 @@ class ProfileFormHandler
 
         $user = $userModel->newQuery()->find(\auth()->id());
 
-        // Prevent removing already filled fields
-        foreach ($parameters as $field => $value) {
-            if ($user->$field && !$value) {
-                $messages->error('visiosoft.module.profile::message.can_not_remove_filled_fields');
-                return;
-            }
-        }
+        /**
+         * Deprecated will bre removed after this issue is done #4804
+         */
+//        // Prevent removing already filled fields
+//        foreach ($parameters as $field => $value) {
+//            if ($user->$field && !$value) {
+//                $messages->error('visiosoft.module.profile::message.can_not_remove_filled_fields');
+//                return;
+//            }
+//        }
 
         $oldCustomerInfo = $user->toArray();