diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php index 85ee1ab3715d..2901507c4087 100644 --- a/app/Import/Providers/BaseImport.php +++ b/app/Import/Providers/BaseImport.php @@ -213,6 +213,9 @@ class BaseImport } foreach ($data as $key => $record) { + + unset($record['']); + try { $entity = $this->transformer->transform($record); diff --git a/app/Import/Providers/Csv.php b/app/Import/Providers/Csv.php index 8d072be3e19e..8615328203a3 100644 --- a/app/Import/Providers/Csv.php +++ b/app/Import/Providers/Csv.php @@ -121,7 +121,6 @@ class Csv extends BaseImport implements ImportInterface if (empty($data)) { $this->entity_count['clients'] = 0; - return; } diff --git a/app/Import/Transformer/BaseTransformer.php b/app/Import/Transformer/BaseTransformer.php index 7add8b5fd70d..954f668d3b18 100644 --- a/app/Import/Transformer/BaseTransformer.php +++ b/app/Import/Transformer/BaseTransformer.php @@ -371,7 +371,8 @@ class BaseTransformer */ public function getCountryId($name) { - if (strlen($name) == 2) { + + if (strlen(trim($name)) == 2) { return $this->getCountryIdBy2($name); } diff --git a/app/Import/Transformer/Csv/ClientTransformer.php b/app/Import/Transformer/Csv/ClientTransformer.php index 252b912c6911..4d41e35f0010 100644 --- a/app/Import/Transformer/Csv/ClientTransformer.php +++ b/app/Import/Transformer/Csv/ClientTransformer.php @@ -110,8 +110,8 @@ class ClientTransformer extends BaseTransformer ), ], ], - 'country_id' => isset($data['client.country']) - ? $this->getCountryId($data['client.country']) + 'country_id' => isset($data['client.country_id']) + ? $this->getCountryId($data['client.country_id']) : null, 'shipping_country_id' => isset($data['client.shipping_country']) ? $this->getCountryId($data['client.shipping_country'])