@@ -59,53 +59,17 @@ public function syncCustomer($customer){
59
59
)
60
60
);
61
61
62
- if ( $ previousEmail && $ previousEmail !== $ currentEmail ) {
63
- $ user = Mage:: getModel ( ' zendesk/api_users ' )-> find ( $ previousEmail );
64
- $ this -> createIdentity ( $ user , $ currentEmail , $ previousEmail );
65
- }
66
- if (! $ user) {
67
- $ user = Mage:: getModel ( ' zendesk/api_users ' )-> find ( $ currentEmail );
62
+ $ user = Mage:: getModel ( ' zendesk/api_users ' )-> find ( $ currentEmail );
63
+ if ( $ previousEmail !== $ currentEmail ) {
64
+ // email change
65
+ if (! isset ( $ user [ ' id ' ])) {
66
+ $ user = $ this -> createAccount ( $ info );
67
+ }
68
68
}
69
69
70
- if (isset ($ user ['id ' ])) {
71
- $ this ->syncData ($ user , $ info );
72
- } else {
73
- $ user = $ this ->createAccount ($ info );
74
- }
75
70
return $ user ;
76
71
}
77
72
78
- private function createIdentity ($ user , $ currentEmail , $ previousEmail )
79
- {
80
- if (!isset ($ user ['id ' ]))
81
- return ;
82
-
83
- if ($ user ['role ' ] !== 'end-user ' )
84
- return ;
85
-
86
- $ data ['identity ' ] = array (
87
- 'type ' => 'email ' ,
88
- 'value ' => $ currentEmail ,
89
- 'verified ' => false
90
- );
91
-
92
- if ($ user ['email ' ] === $ previousEmail ) {
93
- $ data ['identity ' ]['verified ' ] = true ;
94
- $ identity = Mage::getModel ('zendesk/api_users ' )->addIdentity ($ user ['id ' ], $ data );
95
- Mage::getModel ('zendesk/api_users ' )->setPrimaryIdentity ($ user ['id ' ], $ identity ['id ' ]);
96
- } else {
97
- Mage::getModel ('zendesk/api_users ' )->addIdentity ($ user ['id ' ], $ data );
98
- }
99
- }
100
-
101
- private function syncData ($ user , $ data )
102
- {
103
- if ($ user ['role ' ] !== 'end-user ' )
104
- return ;
105
-
106
- Mage::getModel ('zendesk/api_users ' )->update ($ user ['id ' ], $ data );
107
- }
108
-
109
73
private function createAccount ($ data )
110
74
{
111
75
$ data ['user ' ]['verified ' ] = false ;
0 commit comments