merge conflict

wp-content/plugins/jobs-importer/JobsImporter.php

@@ -70,6 +70,8 @@ class JobsImporter
      */
     public function import()
     {
+        global $permalink_manager_uris;
+
         foreach ($this->data as $ad) {
 
             // Set language code
@@ -125,6 +127,11 @@ class JobsImporter
                 // Set post language
                 $this->setPostLang($podId, $ad['lang']);
 
+//                if (isset($custom_uri)) {
+//                    $permalink_manager_uris[$podId] = $custom_uri;
+//                    update_option('permalink-manager-uris', $permalink_manager_uris);
+//                }
+
             }
         }
     }

wp-content/plugins/jobs-importer/JsonDataCollector.php

@@ -11,25 +11,26 @@ class JsonDataCollector
         'post_modified' => 'atnaujinta',
         'title'         => 'pareigos',
         'post_content'  => 'aprasymas',
+        'slug'          => 'seo_url',
+        'contact'       => 'kontaktai',
 //        'email'         => 'email',
 //        'work_time'     => 'darbo_laikas',
-//        'contact'       => 'kontaktai',
     ];
 
     // Taxonomies data map
     protected $terms = [
-        'city' => [
+        'city'    => [
             'slug' => 'miestas_id',
             'name' => 'regionas'
         ],
-        'field' => [
+        'field'   => [
             'slug' => 'kategorija',
             'name' => 'sritis'
         ],
         'company' => [
             'name' => 'imone'
         ],
-        'type' => [
+        'type'    => [
             'slug' => 'type',
             'name' => 'type'
         ]
@@ -41,7 +42,7 @@ class JsonDataCollector
     protected $posts = [
         'division' => [
             'title' => 'padalinys_name',
-            'slug' => 'padalinys'
+            'slug'  => 'padalinys'
         ]
     ];
 
@@ -149,8 +150,9 @@ class JsonDataCollector
         $result = [];
 
         foreach ($this->properties as $propertyKey => $propertyValue) {
-            if (isset($ad->{$propertyValue}))
-            $dataValue = $ad->{$propertyValue};
+            if (isset($ad->{$propertyValue})) {
+                $dataValue = $ad->{$propertyValue};
+            }
             $result[$propertyKey] = $this->getValue($dataValue);
         }