Merge pull request #123 from contao-estatemanager/develop

Develop
contao-estatemanager · Jul 16, 2020 · 28a94e4 · 28a94e4
2 parents 57a7aba + 24ef449
commit 28a94e4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Resources/contao/classes/RealEstateImporter.php b/src/Resources/contao/classes/RealEstateImporter.php
@@ -691,6 +691,22 @@ protected function updateCatalog($contactPersonRecords, $realEstateRecords)
 
                 if ($realEstateRecords[$i]['AKTIONART'] === 'DELETE')
                 {
+                    $preventDelete = false;
+
+                    // HOOK: before real estate import
+                    if (isset($GLOBALS['TL_HOOKS']['realEstateImportDeleteRecord']) && is_array($GLOBALS['TL_HOOKS']['realEstateImportDeleteRecord']))
+                    {
+                        foreach ($GLOBALS['TL_HOOKS']['realEstateImportDeleteRecord'] as $callback)
+                        {
+                            $this->import($callback[0]);
+                            $this->{$callback[0]}->{$callback[1]}($objRealEstate, $objProvider, $preventDelete, $this);
+                        }
+                    }
+
+                    if ($preventDelete)
+                    {
+                        continue;
+                    }
 
                     // Delete real estate
                     $this->deleteRealEstateImages($objRealEstate, $objProvider);

diff --git a/src/Resources/contao/controllers/EstateManagerRead.php b/src/Resources/contao/controllers/EstateManagerRead.php
@@ -92,7 +92,7 @@ public function run($module, $id)
                     $arrValues[]  = $id;
                 }
 
-                $objRealEstates = RealEstateModel::findBy($arrColumns, $arrValues, $arrOptions);
+                $objRealEstates = RealEstateModel::findPublishedBy($arrColumns, $arrValues, $arrOptions);
 
                 if($objRealEstates === null){
                     return new JsonResponse($this->error(