From b8b832c6b9326f6f60d8dde4e79c4c5477a4e904 Mon Sep 17 00:00:00 2001
From: Zdeno Kuzmany <zdeno@kuzmany.biz>
Date: Tue, 19 Feb 2019 20:55:21 +0100
Subject: [PATCH 1/2] overwrite empty values

---
 .../Integration/Pipedrive/Import/CompanyImport.php              | 2 +-
 .../MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/MauticCrmBundle/Integration/Pipedrive/Import/CompanyImport.php b/plugins/MauticCrmBundle/Integration/Pipedrive/Import/CompanyImport.php
index b5ad6463115..5ab5ad7b17a 100644
--- a/plugins/MauticCrmBundle/Integration/Pipedrive/Import/CompanyImport.php
+++ b/plugins/MauticCrmBundle/Integration/Pipedrive/Import/CompanyImport.php
@@ -113,7 +113,7 @@ public function update(array $data = [])
 
         $mappedData = $this->getMappedCompanyData($data);
 
-        $this->companyModel->setFieldValues($company, $mappedData);
+        $this->companyModel->setFieldValues($company, $mappedData, true);
         $this->companyModel->saveEntity($company);
 
         $integrationEntity->setLastSyncDate(new \DateTime());
diff --git a/plugins/MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php b/plugins/MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php
index ee485475dc5..9eb1f6a9ed2 100644
--- a/plugins/MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php
+++ b/plugins/MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php
@@ -118,7 +118,7 @@ public function update(array $data = [])
         } //Do not push lead if contact was modified in Mautic, and we don't wanna mofify it
 
         $lead->setDateModified(new \DateTime());
-        $this->leadModel->setFieldValues($lead, $dataToUpdate);
+        $this->leadModel->setFieldValues($lead, $dataToUpdate, true);
 
         if (!isset($data['owner_id']) && $lead->getOwner()) {
             $lead->setOwner(null);

From 2729a8b6fd7d9592278c935ad11d530c14550ab7 Mon Sep 17 00:00:00 2001
From: Zdeno Kuzmany <zdeno@kuzmany.biz>
Date: Fri, 1 Mar 2019 17:56:47 +0100
Subject: [PATCH 2/2] Fix fo custom fields

---
 .../Integration/Pipedrive/Import/CompanyImport.php              | 2 +-
 .../MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/MauticCrmBundle/Integration/Pipedrive/Import/CompanyImport.php b/plugins/MauticCrmBundle/Integration/Pipedrive/Import/CompanyImport.php
index 5ab5ad7b17a..905034f4e69 100644
--- a/plugins/MauticCrmBundle/Integration/Pipedrive/Import/CompanyImport.php
+++ b/plugins/MauticCrmBundle/Integration/Pipedrive/Import/CompanyImport.php
@@ -101,7 +101,7 @@ public function update(array $data = [])
         }
 
         /** @var Company $company */
-        $company = $this->em->getRepository(Company::class)->findOneById($integrationEntity->getInternalEntityId());
+        $company = $this->companyModel->getEntity($integrationEntity->getInternalEntityId());
 
         // prevent listeners from exporting
         $company->setEventData('pipedrive.webhook', 1);
diff --git a/plugins/MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php b/plugins/MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php
index 9eb1f6a9ed2..43f75d66b22 100644
--- a/plugins/MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php
+++ b/plugins/MauticCrmBundle/Integration/Pipedrive/Import/LeadImport.php
@@ -102,7 +102,7 @@ public function update(array $data = [])
         }
 
         /** @var Lead $lead * */
-        $lead         = $this->em->getRepository(Lead::class)->findOneById($integrationEntity->getInternalEntityId());
+        $lead = $this->leadModel->getEntity($integrationEntity->getInternalEntityId());
 
         // prevent listeners from exporting
         $lead->setEventData('pipedrive.webhook', 1);