Merge pull request #7042 from Webmecanik/fix-fetchlead-datetime

Fix invalid datetime format with fetchlead command
mautic · Jan 15, 2019 · 52acca3 · 52acca3
2 parents 2d5a95d + d33e5b2
commit 52acca3
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php b/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php
@@ -314,13 +314,6 @@ public function getMauticCompany($data, $object = null)
         $config        = $this->mergeConfigToFeatureSettings([]);
         $matchedFields = $this->populateMauticLeadData($data, $config, 'company');
 
-        // Default to new company
-        $company         = new Company();
-        $existingCompany = IdentifyCompanyHelper::identifyLeadsCompany($matchedFields, null, $this->companyModel);
-        if (!empty($existingCompany[2])) {
-            $company = $existingCompany[2];
-        }
-
         $companyFieldTypes = $this->fieldModel->getFieldListWithProperties('company');
         foreach ($matchedFields as $companyField => $value) {
             if (isset($companyFieldTypes[$companyField]['type'])) {
@@ -340,6 +333,13 @@ public function getMauticCompany($data, $object = null)
             }
         }
 
+        // Default to new company
+        $company         = new Company();
+        $existingCompany = IdentifyCompanyHelper::identifyLeadsCompany($matchedFields, null, $this->companyModel);
+        if (!empty($existingCompany[2])) {
+            $company = $existingCompany[2];
+        }
+
         if (!empty($existingCompany[2])) {
             $fieldsToUpdate = $this->getPriorityFieldsForMautic($config, $object, 'mautic_company');
             $fieldsToUpdate = array_intersect_key($config['companyFields'], $fieldsToUpdate);