|
@@ -133,7 +133,7 @@ discard block |
|
|
block discarded – undo |
|
133
|
133
|
// User is or has been subscriber earlier, update status |
|
134
|
134
|
$member = $members[0]; |
|
135
|
135
|
|
|
136
|
|
- if ( $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED |
|
|
136
|
+ if ($member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED |
|
137
|
137
|
|| $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::NORMAL) { |
|
138
|
138
|
$this->_import_status['already_subscribed']++; |
|
139
|
139
|
return; |
|
@@ -173,7 +173,7 @@ discard block |
|
|
block discarded – undo |
|
173
|
173
|
|
|
174
|
174
|
$qb = org_openpsa_contacts_group_dba::new_query_builder(); |
|
175
|
175
|
$schema = $this->_schemadbs['organization']->get('default'); |
|
176
|
|
- if ( $schema->has_field('company_id') |
|
|
176
|
+ if ($schema->has_field('company_id') |
|
177
|
177
|
&& !empty($subscriber['organization']['company_id'])) { |
|
178
|
178
|
// Imported data has a company id, we use that instead of name |
|
179
|
179
|
$qb->add_constraint($schema->get_field('company_id')['storage']['location'], '=', $subscriber['organization']['company_id']); |
|
@@ -181,7 +181,7 @@ discard block |
|
|
block discarded – undo |
|
181
|
181
|
// Seek by official name |
|
182
|
182
|
$qb->add_constraint('official', '=', $subscriber['organization']['official']); |
|
183
|
183
|
|
|
184
|
|
- if ( $schema->has_field('city') |
|
|
184
|
+ if ($schema->has_field('city') |
|
185
|
185
|
&& !empty($subscriber['organization']['city'])) { |
|
186
|
186
|
// Imported data has a city, we use also that for matching |
|
187
|
187
|
$qb->add_constraint($schema->get_field('city')['storage']['location'], '=', $subscriber['organization']['city']); |
flack /
openpsa
