|
@@ -102,7 +102,7 @@ discard block |
|
|
block discarded – undo |
|
102
|
102
|
$customer = $this->loadCustomerByEmailAndWebsiteId($this->getValue(ColumnKeys::EMAIL), $websiteId); |
|
103
|
103
|
|
|
104
|
104
|
if (!$customer) { |
|
105
|
|
- $message = sprintf( |
|
|
105
|
+ $message = sprintf( |
|
106
|
106
|
'the imported address has no customer with email %s', |
|
107
|
107
|
$this->getValue(ColumnKeys::EMAIL) |
|
108
|
108
|
); |
|
@@ -298,7 +298,7 @@ discard block |
|
|
block discarded – undo |
|
298
|
298
|
$emptyValueDefinition = $this->getEmptyAttributeValueConstant(); |
|
299
|
299
|
|
|
300
|
300
|
$telConfig = $this->getSubject()->getCoreConfigData(self::CUSTOMER_ADDRESS_TELEPHONE_SHOW, $value); |
|
301
|
|
- if ($telConfig !== 'req' && $value === $emptyValueDefinition) { |
|
|
301
|
+ if ($telConfig !== 'req' && $value === $emptyValueDefinition) { |
|
302
|
302
|
return ''; |
|
303
|
303
|
} |
|
304
|
304
|
return $value; |
Please login to merge, or discard this patch.