浏览代码

Fix Agent Update

master
Brian Conway 2 年前
父节点
当前提交
ffff50d875

+ 3
- 3
UnivateProperties_API/Containers/Timeshare/Detailed/DetailedOwner.cs 查看文件

20
             MaritalStatus = individual.HowMarried.ToString();
20
             MaritalStatus = individual.HowMarried.ToString();
21
             EmailAddress = individual.Email;
21
             EmailAddress = individual.Email;
22
             CellNumber = individual.CellNumber;
22
             CellNumber = individual.CellNumber;
23
-            LandlineNumber = individual.Telephone;
23
+            Telephone = individual.Telephone;
24
             SpouseCellnumber = individual.SpouseCellnumber;
24
             SpouseCellnumber = individual.SpouseCellnumber;
25
             SpouseEmail = individual.SpouseEmail;
25
             SpouseEmail = individual.SpouseEmail;
26
             SpouseName = individual.SpouseName;
26
             SpouseName = individual.SpouseName;
80
             Surname = agent.Surname;
80
             Surname = agent.Surname;
81
             EmailAddress = agent.Email;
81
             EmailAddress = agent.Email;
82
             CellNumber = agent.CellNumber;
82
             CellNumber = agent.CellNumber;
83
-            LandlineNumber = agent.Telephone;
83
+            Telephone = agent.Telephone;
84
             Address = new DetailedAddress();
84
             Address = new DetailedAddress();
85
             BankingDetails = new DetailedBankDetails();
85
             BankingDetails = new DetailedBankDetails();
86
         }
86
         }
93
         public string MaritalStatus { get; set; }
93
         public string MaritalStatus { get; set; }
94
         public string EmailAddress { get; set; }
94
         public string EmailAddress { get; set; }
95
         public string CellNumber { get; set; }
95
         public string CellNumber { get; set; }
96
-        public string LandlineNumber { get; set; }  
96
+        public string Telephone { get; set; }  
97
         public int HowMarried { get; set; }
97
         public int HowMarried { get; set; }
98
         public string SpouseName { get; set; }
98
         public string SpouseName { get; set; }
99
         public string SpouseSurname { get; set; }        
99
         public string SpouseSurname { get; set; }        

+ 1
- 1
UnivateProperties_API/Model/Users/Individual.cs 查看文件

52
                 CompanyRegNumber = owner.CompanyRegNumber;                
52
                 CompanyRegNumber = owner.CompanyRegNumber;                
53
                 Email = owner.EmailAddress;
53
                 Email = owner.EmailAddress;
54
                 CellNumber = owner.CellNumber;
54
                 CellNumber = owner.CellNumber;
55
-                Telephone = owner.LandlineNumber;
55
+                Telephone = owner.Telephone;
56
 
56
 
57
                 if (owner.Address != null)
57
                 if (owner.Address != null)
58
                 {
58
                 {

+ 1
- 1
UnivateProperties_API/Model/Users/Person.cs 查看文件

31
         [DataType(DataType.EmailAddress)]
31
         [DataType(DataType.EmailAddress)]
32
         public string Email { get; set; }
32
         public string Email { get; set; }
33
         [VisibleInListView(false)]
33
         [VisibleInListView(false)]
34
-        [Phone]
34
+        //[Phone]
35
         public string Telephone { get; set; }
35
         public string Telephone { get; set; }
36
         [Phone]
36
         [Phone]
37
         public string CellNumber { get; set; }
37
         public string CellNumber { get; set; }

+ 37
- 8
UnivateProperties_API/Repository/Users/AgentRepository.cs 查看文件

18
 
18
 
19
         public List<Agent> Get(Func<Agent, bool> where)
19
         public List<Agent> Get(Func<Agent, bool> where)
20
         {
20
         {
21
-            return _dbContext.Agents.Where(where).ToList();
21
+            return _dbContext.Agents.Include("User").Where(where).ToList();
22
         }
22
         }
23
 
23
 
24
         public List<Agent> GetAll()
24
         public List<Agent> GetAll()
51
             if (item.User.Role == "Agent" || item.User.Role == "Agency" || item.User.Role == "Managing Agent")
51
             if (item.User.Role == "Agent" || item.User.Role == "Agency" || item.User.Role == "Managing Agent")
52
             {
52
             {
53
                 if (agent == null)
53
                 if (agent == null)
54
-                {                    
54
+                {
55
                     if (individual != null)
55
                     if (individual != null)
56
                     {
56
                     {
57
                         individual.IsDeleted = true;
57
                         individual.IsDeleted = true;
58
-                        _dbContext.Individuals.Update(individual);                        
58
+                        _dbContext.Individuals.Update(individual);
59
                     }
59
                     }
60
                     item.Id = 0;
60
                     item.Id = 0;
61
                     _dbContext.Agents.Add(item);
61
                     _dbContext.Agents.Add(item);
95
                     if (individual != null)
95
                     if (individual != null)
96
                     {
96
                     {
97
                         individual.IsDeleted = true;
97
                         individual.IsDeleted = true;
98
-                        _dbContext.Individuals.Update(individual);                        
98
+                        _dbContext.Individuals.Update(individual);
99
                     }
99
                     }
100
                     _dbContext.Agents.Update(agent);
100
                     _dbContext.Agents.Update(agent);
101
                     if (item.User.Role != user.Role)
101
                     if (item.User.Role != user.Role)
180
 
180
 
181
         public void Update(Agent item)
181
         public void Update(Agent item)
182
         {
182
         {
183
-            //var savedAgent = _dbContext.Agents.Where(x => x.Id == item.Id).FirstOrDefault();
183
+            var individual = _dbContext.Individuals.Include("User").Include("Address").Include("BankAccount").FirstOrDefault(x => x.UserId == item.UserId);
184
+            var user = _dbContext.Users.Where(x => x.Id == item.User.Id).FirstOrDefault();
184
 
185
 
185
-            
186
-            _dbContext.Entry(item).State = EntityState.Modified;
187
-            _dbContext.Entry(item.User).State = EntityState.Modified;
186
+            if (item.User.Role == "Agent" || item.User.Role == "Agency" || item.User.Role == "Managing Agent")
187
+            {
188
+                item.IsDeleted = false;
189
+                if (individual != null)
190
+                {
191
+                    individual.IsDeleted = true;
192
+                }
193
+            }
194
+            else
195
+            {
196
+                item.IsDeleted = true;
197
+                if (individual != null)
198
+                {
199
+                    individual.IsDeleted = false;
200
+                }
201
+
202
+            }
203
+            if (individual != null)
204
+            {
205
+                _dbContext.Individuals.Update(individual);
206
+                //_dbContext.Entry(individual).State = EntityState.Modified;
207
+            }
208
+            if (item.User.Role != user.Role)
209
+            {
210
+                user.Role = item.User.Role;
211
+                _dbContext.Users.Update(user);
212
+                //_dbContext.Entry(user).State = EntityState.Modified;
213
+            }
214
+            _dbContext.Agents.Update(item);
215
+            //_dbContext.Entry(item).State = EntityState.Modified;
216
+            //_dbContext.Entry(item.User).State = EntityState.Modified;
188
             Save();
217
             Save();
189
         }
218
         }
190
 
219
 

正在加载...
取消
保存