Changeset 2556443

Timestamp:

06/30/2021 02:10:48 PM (5 years ago)

Author:

kees-brandenburg

Message:

Added: support for BOG projects

Location:

yes-co-ores-wordpress-plugin/trunk

Files:

• includes/classes/yog_3mcp.php (modified) (3 diffs)
• includes/classes/yog_3mcp_xml.php (modified) (3 diffs)
• includes/classes/yog_checks.php (modified) (1 diff)
• includes/classes/yog_fields_settings.php (modified) (2 diffs)
• includes/classes/yog_object_search_manager.php (modified) (7 diffs)
• includes/classes/yog_plugin.php (modified) (20 diffs)
• includes/classes/yog_project_bbpr_translation.php (modified) (1 diff)
• includes/classes/yog_project_bbty_translation.php (modified) (1 diff)
• includes/classes/yog_project_bog_translation.php (modified) (2 diffs)
• includes/classes/yog_project_bopr_translation.php (copied) (copied from yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_nbpr_translation.php) (9 diffs)
• includes/classes/yog_project_nbbn_translation.php (modified) (1 diff)
• includes/classes/yog_project_nbpr_translation.php (modified) (1 diff)
• includes/classes/yog_project_nbty_translation.php (modified) (1 diff)
• includes/classes/yog_project_translation.php (modified) (2 diffs)
• includes/classes/yog_project_wonen_translation.php (modified) (1 diff)
• includes/classes/yog_rest_api_key.php (added)
• includes/classes/yog_rest_api_key_manager.php (added)
• includes/classes/yog_synchronization_manager.php (modified) (5 diffs)
• includes/classes/yog_system_link_manager.php (modified) (3 diffs)
• includes/classes/yog_wp_admin_object_ui.php (modified) (4 diffs)
• includes/classes/yog_wp_admin_object_ui_bog.php (modified) (2 diffs)
• includes/classes/yog_wp_admin_object_ui_bopr.php (copied) (copied from yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_wp_admin_object_ui_nbpr.php) (8 diffs)
• includes/config/config.php (modified) (1 diff)
• includes/pages/api.php (added)
• includes/pages/shortcode_map.php (modified) (2 diffs)
• includes/pages/synchronisation.php (modified) (3 diffs)
• includes/widgets/yog_map_widget.php (modified) (4 diffs)
• includes/widgets/yog_recent_objects_widget.php (modified) (2 diffs)
• includes/yog_public_functions.php (modified) (7 diffs)
• includes/yog_rest_api.php (added)
• package.json (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• yesco-og.php (modified) (2 diffs)

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_3mcp.php

@@ -53 +53 @@
     public function read($collectionUuid, \YogSystemLinkCredentials $credentials)
     {
-        delete_option('yog-' . $collectionUuid  . '-last-sync-read-main-collection');
+      delete_option('yog-' . $collectionUuid  . '-last-sync-read-main-collection');
 
       $mcp3Versions           = explode(';', YOG_MCP3_VERSIONS);
@@ -111 +111 @@
       $entityLinks  = array('BBpr' => array(), 'BBty' => array(),
                             'BBvk' => array(), 'BBvh' => array(), 'LIvk' => array(),
-                            'BOvk' => array(), 'BOvh' => array(),
+                            'BOpr' => array(), 'BOvk' => array(), 'BOvh' => array(),
                             'NBpr' => array(), 'NBty' => array(), 'NBbn' => array(),
                             'NBvk' => array(), 'NBvh' => array());
@@ -133 +133 @@
                     }
 
-          if (in_array($scenario, array('BBvk', 'BBvh', 'NBvk', 'NBvh', 'LIvk', 'BOvk', 'BOvh', 'NBpr', 'NBty', 'NBbn', 'BBpr', 'BBty')))
+          if (in_array($scenario, array('BBvk', 'BBvh', 'NBvk', 'NBvh', 'LIvk', 'BOpr', 'BOvk', 'BOvh', 'NBpr', 'NBty', 'NBbn', 'BBpr', 'BBty')))
             $entityLinks[$scenario][$uuid] = new Yog3McpProjectLink($uuid, $url, $doc->format('c'), $dlm->format('c'), $scenario);
         }

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_3mcp_xml.php

@@ -203 +203 @@
           return new Yog3McpXmlProjectBBty($xml, $namespace);
           break;
+        case 'BOpr':
+          return new Yog3McpXmlProjectBOpr($xml, $namespace);
+          break;
         default:
           throw new YogException(__METHOD__ . '; Unsupported scenario', YogException::GLOBAL_ERROR);
@@ -516 +519 @@
             else
                 return 1;
+    }
+  }
+
+  /**
+  * @desc Yog3McpXmlProjectBOpr
+  * @author Kees Brandenburg - Yes-co Nederland
+  */
+  class Yog3McpXmlProjectBOpr extends Yog3McpXmlProjectAbstract
+  {
+    /**
+    * @desc Get the address
+    *
+    * @param void
+    * @return Yog3McpXmlAddress
+    */
+    public function getAddress()
+    {
+      $nodes = $this->xml->xpath('//project:General/project:Address');
+      if ($nodes === false || count($nodes) == 0)
+        throw new YogException(__METHOD__ . '; No address found', YogException::GLOBAL_ERROR);
+
+      $node = array_shift($nodes);
+      $node->registerXPathNamespace('project', $this->ns);
+
+      return new Yog3McpXmlAddress($node, $this->ns);
+    }
+
+    /**
+    * @desc Check if address is set
+    *
+    * @param void
+    * @return bool
+    */
+    public function hasAddress()
+    {
+      $nodes = $this->xml->xpath('//project:General/project:Address');
+      return ($nodes !== false && count($nodes) > 0);
     }
   }
@@ -578 +618 @@
       return ($nodes !== false && count($nodes) > 0);
         }
+
+    /**
+    * @desc Check if project has a link to a parent object (NBty or BBty)
+    *
+    * @param void
+    * @return bool
+    */
+    public function hasParentUuid()
+    {
+      $nodes = $this->xml->xpath("//project:Project[project:Scenario = 'BOpr']/@uuid");
+      return !($nodes === false || count($nodes) == 0);
+    }
+
+    /**
+    * @desc Get the parent object uuid (NBty or BBty)
+    *
+    * @param void
+    * @return string
+    */
+    public function getParentUuid()
+    {
+      $nodes = $this->xml->xpath("//project:Project[project:Scenario = 'BOpr']/@uuid");
+      if ($nodes === false || count($nodes) == 0)
+        throw new YogException(__METHOD__ . '; No parent link found', YogException::GLOBAL_ERROR);
+
+      $node = array_shift($nodes);
+      return (string) $node;
+    }
   }
 

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_checks.php

@@ -58 +58 @@
         if (defined('TEMPLATEPATH'))
         {
-            // Single huis template check
-            if (locate_template('single-huis.php') == '')
-                $warnings[] = 'Het ingestelde thema heeft op dit moment geen \'single-huis.php\' template. Er zal een alternatieve methode gebruikt worden voor het tonen van de Wonen object details.';
+      $neededTemplates = [
+        'single-huis.php'     => 'Wonen object details',
+        'single-bedrijf.php'  => 'BOG object details',
+        'single-yog-nbpr.php' => 'Nieuwbouw Project details',
+        'single-yog-nbty.php' => 'Nieuwbouw type details',
+        'single-yog-bbpr.php' => 'Bestaande bouw complexen',
+        'single-yog-bbty.php' => 'Bestaande bouw complex types',
+        'single-yog-bopr.php' => 'BOG project details'
+      ];
 
-            // Single bedrijf template check
-            if (locate_template('single-bedrijf.php') == '')
-                $warnings[] = 'Het ingestelde thema heeft op dit moment geen \'single-bedrijf.php\' template. Er zal een alternatieve methode gebruikt worden voor het tonen van de BOG object details.';
+      $missingTemplates = [];
 
-            // Single NBpr template check
-            if (locate_template('single-yog-nbpr.php') == '')
-                $warnings[] = 'Het ingestelde thema heeft op dit moment geen \'single-yog-nbpr.php\' template. Er zal een alternatieve methode gebruikt worden voor het tonen van de Nieuwbouw Project details.';
+      foreach ($neededTemplates as $template => $title)
+      {
+        if (locate_template($template) == '')
+          $missingTemplates[$template] = $title;
+      }
 
-            // Single NBpr template check
-            if (locate_template('single-yog-nbty.php') == '')
-                $warnings[] = 'Het ingestelde thema heeft op dit moment geen \'single-yog-nbty.php\' template. Er zal een alternatieve methode gebruikt worden voor het tonen van de Nieuwbouw type details.';
-
-            // Single BBpr template check
-            if (locate_template('single-yog-bbpr.php') == '')
-                $warnings[] = 'Het ingestelde thema heeft op dit moment geen \'single-yog-bbpr.php\' template. Er zal een alternatieve methode gebruikt worden voor het tonen van de Bestaande bouw complexen.';
-
-            // Single BBpr template check
-            if (locate_template('single-yog-bbty.php') == '')
-                $warnings[] = 'Het ingestelde thema heeft op dit moment geen \'single-yog-bbty.php\' template. Er zal een alternatieve methode gebruikt worden voor het tonen van de Bestaande bouw complex types.';
+      if (count($missingTemplates) > 0)
+      {
+        $warning  = 'Het ingestelde thema heeft op dit moment geen \'' . implode('\', \'', array_keys($missingTemplates)) . '\' template' . (count($missingTemplates) > 1 ? 's' : '') . '.';
+        $warning .= 'Er zal een alternatieve methode gebruikt worden voor het tonen van de \'' . implode('\', \'', $missingTemplates) . '\'.';
+        
+        $warnings[] = $warning;
+      }
         }
 
         // PHP version check
-        if (version_compare(PHP_VERSION, '5.2.1', '>=') && !version_compare(PHP_VERSION, '5.5', '>='))
+        if (version_compare(PHP_VERSION, '5.2.1', '>=') && !version_compare(PHP_VERSION, '7.3', '>='))
             $warnings[] = 'PHP versie ' . PHP_VERSION . ' is gedetecteerd, voor deze php versie worden geen (beveiligings) updates meer uitgebracht. We raden je aan om contact op te nemen met je hosting provider om de PHP versie te laten upgraden. Er is ook geen garantie dat deze plugin blijft functioneren met deze php versie.';
 

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_fields_settings.php

@@ -25 +25 @@
         case YOG_POST_TYPE_BOG:
           return new YogBogFieldsSettings();
+          break;
+        case YOG_POST_TYPE_BOPR:
+          return new YogBOprFieldsSettings();
           break;
         case YOG_POST_TYPE_NBPR:
@@ -490 +493 @@
 
   /**
+  * @desc YogBOprFieldsSettings
+  * @author Kees Brandenburg - Yes-co Nederland
+  */
+  class YogBOprFieldsSettings extends YogFieldsSettingsAbstract
+  {
+    public function __construct()
+    {
+      $this->fieldsSettings = array(
+        'yog-bopr_Updated'                  => array( 'title' => 'Laatste update via sync'),
+        'yog-bopr_uuid'                     => array( 'title' => 'UUID'),
+        'yog-bopr_scenario'                 => array( 'title' => 'Scenario'),
+        'yog-bopr_Naam'                     => array( 'title' => 'Titel van object',
+                                                      'width' => 450),
+        'yog-bopr_Straat'                   => array(),
+        'yog-bopr_Huisnummer'               => array( 'width' => 100),
+        'yog-bopr_NummerreeksStart'         => array( 'title' => 'Nummerreeks start',
+                                                      'width' => 50),
+        'yog-bopr_NummerreeksEind'          => array( 'title' => 'Nummerreeks eind',
+                                                      'width' => 50),
+        'yog-bopr_Postcode'                 => array( 'width' => 100),
+        'yog-nbpr_Wijk'                     => array( 'search'                  => 'exact',
+                                                                                                            'replacementMeta' => 'yog-bopr_WijkCustom'),
+        'yog-bopr_Buurt'                    => array( 'search'                  => 'exact',
+                                                                                                            'replacementMeta' => 'yog-bopr_BuurtCustom'),
+        'yog-bopr_Plaats'                   => array( 'search' => 'exact'),
+        'yog-bopr_Gemeente'                 => array(),
+        'yog-bopr_Provincie'                => array(),
+        'yog-bopr_Land'                     => array(),
+        'yog-bopr_Longitude'                => array(),
+        'yog-bopr_Latitude'                 => array(),
+        'yog-bopr_KoopPrijsMin'             => array( 'title' => 'Min.',
+                                                      'type'  => 'price'),
+        'yog-bopr_KoopPrijsMax'             => array( 'title' => 'Max.',
+                                                      'type'  => 'price'),
+        'yog-bopr_HuurPrijsMin'             => array( 'title' => 'Min.',
+                                                      'type'  => 'price'),
+        'yog-bopr_HuurPrijsMax'             => array( 'title' => 'Max.',
+                                                      'type'  => 'price'),
+        'yog-bopr_DatumStartBouw'           => array( 'title' => 'Datum start bouw'),
+        'yog-bopr_DatumOplevering'          => array( 'title' => 'Datum oplevering'),
+        'yog-bopr_DatumStartVerkoop'        => array( 'title' => 'Datum start verkoop'),
+        'yog-bopr_GebouwNaam'               => array( 'title' => 'Gebouw naam'),
+        'yog-bopr_AantalVerdiepingen'       => array( 'title' => 'Aantal verdiepingen')
+      );
+    }
+  }
+
+  /**
   * @desc YogNBprFieldsSettings
   * @author Kees Brandenburg - Yes-co Nederland

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_object_search_manager.php

@@ -50 +50 @@
     if ($this->searchExtended === false)
     {
+      add_filter('pre_get_posts',         array($this, 'limitDefaultSearchPostTypes'));
       add_action('posts_where_request',     array($this, 'extendSearchWhere'));
       add_action('posts_orderby_request', array($this, 'changePostSortOrder'));
 
       $this->searchExtended = true;
+    }
+  }
+
+  public function limitDefaultSearchPostTypes($query)
+  {
+    if (is_search() && !empty($_REQUEST['object']) && in_array($_REQUEST['object'], yog_getAllObjectPostTypes()) && isset($query->query) && isset($query->query['s']))
+    {
+      $query->set('post_type',  [sanitize_text_field($_REQUEST['object'])]);
     }
   }
@@ -117 +126 @@
     if (is_search())
     {
-      if (!empty($_REQUEST['object_type']) && in_array($_REQUEST['object_type'], array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY)))
+      if (!empty($_REQUEST['object_type']) && in_array($_REQUEST['object_type'], array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_BOPR)))
         $where = $this->extendSearchWhereSearchWidget($where);
       else
@@ -156 +165 @@
     global $wp;
 
-    $objectType                     = empty($_REQUEST['object']) ? 'all' : sanitize_text_field($_REQUEST['object']);
-        $objectTypeSpecified    = !empty($_REQUEST['object']);
-    $searchTerm                     = $wp->query_vars['s'];
-    $postTbl                            = $this->db->posts;
-        $addressMode                    = false;
+    $objectType   = empty($_REQUEST['object']) ? 'all' : sanitize_text_field($_REQUEST['object']);
+    $searchTerm     = $wp->query_vars['s'];
+    $postTbl            = $this->db->posts;
+        $addressMode  = false;
 
         // Use address as search term if set and search term not
@@ -172 +180 @@
         if (empty($searchTerm) || $searchTerm == '%25' || $searchTerm == '%')
     {
-      // Only search specific post type
-      if ($objectType != 'all')
-        $where .= " AND " . $postTbl . ".post_type = '" . $this->escape($objectType) . "'";
-      else if ($objectTypeSpecified === true)
-        $where .= " AND " . $postTbl . ".post_type IN ('" . YOG_POST_TYPE_WONEN . "', '" . YOG_POST_TYPE_BOG . "', '" . YOG_POST_TYPE_NBPR . "', '" . YOG_POST_TYPE_NBTY . "', '" . YOG_POST_TYPE_BBPR . "', '" . YOG_POST_TYPE_BBTY . "')";
-
             if (!empty($_REQUEST['collection']))
             {
@@ -205 +207 @@
     $supportedMetaFields = array();
     if (in_array($objectType, array(YOG_POST_TYPE_WONEN, 'all')))
-      $supportedMetaFields = array_merge($supportedMetaFields, array('huis_Wijk','huis_WijkCustom', 'huis_Buurt', 'huis_BuurtCustom', 'huis_Land','huis_Provincie','huis_Gemeente','huis_Plaats', 'huis_PlaatsCustom', 'huis_Straat','huis_Huisnummer','huis_Postcode','huis_SoortWoning','huis_TypeWoning','huis_KenmerkWoning'));
+      $supportedMetaFields = array_merge($supportedMetaFields, array('huis_Wijk','huis_WijkCustom', 'huis_Buurt', 'huis_BuurtCustom', 'huis_Land','huis_Provincie','huis_Gemeente','huis_Plaats', 'huis_PlaatsCustom', 'huis_Straat','huis_Huisnummer','huis_Postcode','huis_SoortWoning','huis_TypeWoning','huis_KenmerkWoning', 'huis_tags'));
     if (in_array($objectType, array(YOG_POST_TYPE_BOG, 'all')))
-      $supportedMetaFields = array_merge($supportedMetaFields, array('bedrijf_Wijk', 'bedrijf_WijkCustom', 'bedrijf_Buurt', 'bedrijf_BuurtCustom', 'bedrijf_Land', 'bedrijf_Provincie', 'bedrijf_Gemeente', 'bedrijf_Plaats', 'bedrijf_PlaatsCustom', 'bedrijf_Straat', 'bedrijf_Huisnummer', 'bedrijf_Postcode', 'bedrijf_Type'));
+      $supportedMetaFields = array_merge($supportedMetaFields, array('bedrijf_Wijk', 'bedrijf_WijkCustom', 'bedrijf_Buurt', 'bedrijf_BuurtCustom', 'bedrijf_Land', 'bedrijf_Provincie', 'bedrijf_Gemeente', 'bedrijf_Plaats', 'bedrijf_PlaatsCustom', 'bedrijf_Straat', 'bedrijf_Huisnummer', 'bedrijf_Postcode', 'bedrijf_Type', 'bedrijf_tags'));
     if (in_array($objectType, array(YOG_POST_TYPE_NBPR, 'all')))
-      $supportedMetaFields = array_merge($supportedMetaFields, array('yog-nbpr_Wijk', 'yog-nbpr_WijkCustom', 'yog-nbpr_Buurt', 'yog-nbpr_BuurtCustom', 'yog-nbpr_Land', 'yog-nbpr_Provincie', 'yog-nbpr_Gemeente', 'yog-nbpr_Plaats', 'yog-nbpr_PlaatsCustom', 'yog-nbpr_Straat', 'yog-nbpr_Huisnummer', 'yog-nbpr_Postcode', 'yog-nbpr_ProjectSoort'));
+      $supportedMetaFields = array_merge($supportedMetaFields, array('yog-nbpr_Wijk', 'yog-nbpr_WijkCustom', 'yog-nbpr_Buurt', 'yog-nbpr_BuurtCustom', 'yog-nbpr_Land', 'yog-nbpr_Provincie', 'yog-nbpr_Gemeente', 'yog-nbpr_Plaats', 'yog-nbpr_PlaatsCustom', 'yog-nbpr_Straat', 'yog-nbpr_Huisnummer', 'yog-nbpr_Postcode', 'yog-nbpr_ProjectSoort', 'yog-nbpr_tags'));
     if (in_array($objectType, array(YOG_POST_TYPE_BBPR, 'all')))
-      $supportedMetaFields = array_merge($supportedMetaFields, array('yog-bbpr_Wijk', 'yog-bbpr_WijkCustom', 'yog-bbpr_Buurt', 'yog-bbpr_BuurtCustom', 'yog-bbpr_Land', 'yog-bbpr_Provincie', 'yog-bbpr_Gemeente', 'yog-bbpr_Plaats', 'yog-bbpr_PlaatsCustom', 'yog-bbpr_Postcode'));
+      $supportedMetaFields = array_merge($supportedMetaFields, array('yog-bbpr_Wijk', 'yog-bbpr_WijkCustom', 'yog-bbpr_Buurt', 'yog-bbpr_BuurtCustom', 'yog-bbpr_Land', 'yog-bbpr_Provincie', 'yog-bbpr_Gemeente', 'yog-bbpr_Plaats', 'yog-bbpr_PlaatsCustom', 'yog-bbpr_Postcode', 'yog-bbpr_tags'));
 
     $metaTbl              = $this->db->postmeta;
@@ -221 +223 @@
             $whereQuery[] = "meta_key = '" . $metaField . "' AND meta_value LIKE '%" . $searchTerm . "%'";
     }
+
+    // Extent with tags
+    $tagsQuery = '';
 
         $query = "SELECT DISTINCT post_id FROM " . $metaTbl . " WHERE (" . implode(') OR (', $whereQuery) . ')';
@@ -245 +250 @@
                 }
             }
-
-      // Only search specific post type
-      if ($objectType != 'all')
-        $where .= " AND " . $postTbl . ".post_type = '" . $objectType . "'";
-      else if ($objectTypeSpecified === true)
-        $where .= " AND " . $postTbl . ".post_type IN ('" . YOG_POST_TYPE_WONEN . "', '" . YOG_POST_TYPE_BOG . "', '" . YOG_POST_TYPE_NBPR . "', '" . YOG_POST_TYPE_NBTY . "', '" . YOG_POST_TYPE_BBPR . "', '" . YOG_POST_TYPE_BBTY . "')";
-        }
-    // No objects found and post type specific, so make sure query returns no posts
-    else if ($objectTypeSpecified === true)
-    {
-      $where .= ' AND true = false';
     }
 

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_plugin.php

@@ -225 +225 @@
         register_taxonomy('yog_category',
                           array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY,
-                                YOG_POST_TYPE_NBBN, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY),
+                                YOG_POST_TYPE_NBBN, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_BOPR),
                           array('hierarchical'      => true,
                                 'show_ui'           => true,
@@ -257 +257 @@
                           'show_in_menu'      => 'yog_posts_menu',
                             'show_in_nav_menus' => true,
+                          'has_archive'       => true,
                             'capability_type'   => 'post',
                           'menu_icon'         => YOG_PLUGIN_URL . '/img/icon_yes-co.gif',
@@ -281 +282 @@
                           'show_in_menu'      => 'yog_posts_menu',
                             'show_in_nav_menus' => true,
+                          'has_archive'       => true,
                             'capability_type'   => 'post',
                           'menu_icon'         => YOG_PLUGIN_URL . '/img/icon_yes-co.gif',
                             'hierarchical'      => false,
                             'rewrite'           => array('slug' => YOG_POST_TYPE_BOG), // Permalinks format
+                            'supports'          => array('title','editor', 'thumbnail'),
+                            'taxonomies'        => $taxonomies
+                            )
+        );
+
+        register_post_type(YOG_POST_TYPE_BOPR,
+                      array('labels'    => array('name'               => 'BOG projecten',
+                                                'singular_name'       => 'BOG project',
+                                              'add_new'             => 'BOG project toevoegen',
+                                              'add_new_item'        => 'Project toevoegen',
+                                              'search_items'        => 'Projecten zoeken',
+                                              'not_found'           => 'Geen BOG projecten gevonden',
+                                              'not_found_in_trash'  => 'Geen BOG projecten gevonden in de prullenbak',
+                                              'edit_item'           => 'Project bewerken',
+                                              'view_item'           => __('View')
+                                              ),
+                          'public'            => true,
+                            'show_ui'           => true, // UI in admin panel
+                          'show_in_menu'      => 'yog_posts_menu',
+                            'show_in_nav_menus' => true,
+                          'has_archive'       => true,
+                            'capability_type'   => 'post',
+                          'menu_icon'         => YOG_PLUGIN_URL . '/img/icon_yes-co.gif',
+                            'hierarchical'      => false,
+                            'rewrite'           => array('slug' => 'bog-project'), // Permalinks format
                             'supports'          => array('title','editor', 'thumbnail'),
                             'taxonomies'        => $taxonomies
@@ -756 +783 @@
             }
             break;
+
+          case YOG_POST_TYPE_BOPR:
+
+            // Add location
+            $suffix .= yog_retrieveDynamicMap();
+
+            // Add types
+            $childs = yog_retrieveChildObjects();
+            if (is_array($childs) && count($childs) > 0)
+            {
+              $suffix .= '<h2>Objecten</h2>';
+
+              foreach ($childs as $child)
+              {
+                $name   = $child->post_title;
+                $image  = get_the_post_thumbnail($child->ID, 'thumbnail', array('alt' => $name, 'title' => $name));
+                $url    = get_permalink($child->ID);
+
+                $suffix .= '<div class="yog-post-child">';
+                if (!empty($image))
+                  $suffix .= '<a href="' . esc_url($url) . '" title="' . esc_attr($name) . '">' . $image . '</a> ';
+
+                  $suffix .= '<a href="' . esc_url($url) . '" title="' . esc_attr($name) . '">' . esc_html($name) . '</a>';
+                $suffix .= '</div>';
+              }
+            }
+
+            break;
         }
       }
@@ -800 +855 @@
           if (!in_array(YOG_POST_TYPE_BOG, $postTypes))
             $postTypes[] = YOG_POST_TYPE_BOG;
+
+          if (!in_array(YOG_POST_TYPE_BOPR, $postTypes))
+            $postTypes[] = YOG_POST_TYPE_BOPR;
 
           if (!in_array(YOG_POST_TYPE_NBPR, $postTypes))
@@ -961 +1019 @@
     public function handleObjectsShortcode($attr)
     {
+      $output = '';
       // Determine provided params
-      $type           = !empty($attr['type']) ? explode(',', $attr['type']) : array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY);
+      $type           = !empty($attr['type']) ? explode(',', $attr['type']) : array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_BOPR, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY);
+      $showPagination = (!empty($attr['pagination']));
+      $currentPage    = (int) get_query_var('page', 1);
 
       // Determine query attributes
@@ -968 +1029 @@
         'post_type'       => $type,
         'posts_per_page'  => (!empty($attr['num']) ? (int) $attr['num'] : 5000),
-        'nopaging'        => (!empty($attr['num']) ? true : false)
+        'nopaging'        => (!empty($attr['num']) ? false : true),
+        'paged'           => $currentPage
       );
 
@@ -1002 +1064 @@
 
       // Retrieve posts
-      $posts  = new WP_Query($query);
-
-      if ($posts->have_posts())
+      $wpQuery  = new WP_Query($query);
+
+      if ($wpQuery->have_posts())
       {
-        while ($posts->have_posts())
+        while ($wpQuery->have_posts())
         {
-          $posts->the_post();
+          $wpQuery->the_post();
 
           // Use template to show object
@@ -1033 +1095 @@
           }
         }
+      }
+
+      if ($showPagination === true && $wpQuery->max_num_pages > 1)
+      {
+        $paginationType     = !empty($attr['pagination']) ? $attr['pagination'] : '';
+        $paginationClass    = !empty($attr['pagination_class']) ? ' ' . esc_attr($attr['pagination_class']) . '' : '';
+        $paginationUlClass  = !empty($attr['pagination_ul_class']) ? ' class="' . esc_attr($attr['pagination_ul_class']) . '"' : '';
+        $supportedPrevNext  = ['glyphicon', 'fa', 'text'];
+        $paginationPrevNext = (!empty($attr['pagination_prev_next']) && in_array($attr['pagination_prev_next'], $supportedPrevNext)) ? $attr['pagination_prev_next'] : '';
+
+        // Determine link options
+        $linkOptions        = ['type' => 'array', 'prev_next' => (!empty($paginationPrevNext)), 'total' => $wpQuery->max_num_pages, 'current' => $currentPage];
+
+        // Add prev / next text to link options
+        switch ($paginationPrevNext)
+        {
+          case 'glyphicon':
+            $linkOptions['prev_text'] = '<span aria-hidden="true" class="glyphicon glyphicon-triangle-left"></span>';
+            $linkOptions['next_text'] = '<span aria-hidden="true" class="glyphicon glyphicon-triangle-right"></span>';
+            break;
+          case 'fa':
+            $linkOptions['prev_text'] = '<i class="fas fa-caret-left"></i>';
+            $linkOptions['next_text'] = '<i class="fas fa-caret-right"></i>';
+            break;
+        }
+
+        // Generate links
+        $pageLinks          = paginate_links($linkOptions);
+
+        // Generate navigation output
+        $output .= '<nav class="yog-objects-shortcode-navigation' . $paginationClass . '">';
+
+        switch ($paginationType)
+        {
+          case 'ul':
+            $output .= '<ul' . $paginationUlClass . '><li>' . implode('</li><li>', $pageLinks) . '</li></ul>';
+            break;
+          default:
+            $output .= implode('', $pageLinks);
+            break;
+        }
+
+        $output .= '</nav>';
       }
 
@@ -1228 +1333 @@
     {
       $objects = get_posts(array( 'numberposts' => 5,
-                                  'post_type'   => array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY),
+                                  'post_type'   => array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_BOPR),
                                   'orderby'     => 'modified'));
 
@@ -1321 +1426 @@
       add_options_page('Yes-co ORES Synchronisatie', 'Synchronisatie', 'manage_options', 'yesco_OG_synchronisation', array($this, 'renderSynchronisationPage'));
       add_options_page('Yes-co ORES HTML', 'HTML', 'manage_options', 'yesco_OG_html', array($this, 'renderHtmlPage'));
-      add_options_page('Yes-co ORES Wijken / buurten', 'Wijken / buurten', 'manage_options', 'yesco_OG_areas', array($this, 'renderAreasPage'));
-      add_options_page('Yes-co ORES Response formulieren', 'Response formulieren', 'manage_options', 'yesco_OG_responseforms', array($this, 'renderResponseFormsPage'));
-      add_options_page('Yes-co ORES MijnHuiszaken', 'MijnHuiszaken', 'manage_options', 'yesco_OG_mijnhuiszaken', array($this, 'renderMijnHuiszakenPage'));
+      add_options_page('Yes-co ORES Wijken / buurten', 'Wijken / buurten', 'manage_options', 'yesco_OG_areas', array($this, 'renderAreasPage'));
+      add_options_page('Yes-co ORES Response formulieren', 'Response formulieren', 'manage_options', 'yesco_OG_responseforms', array($this, 'renderResponseFormsPage'));
+      add_options_page('Yes-co ORES MijnHuiszaken', 'MijnHuiszaken', 'manage_options', 'yesco_OG_mijnhuiszaken', array($this, 'renderMijnHuiszakenPage'));
       add_options_page('Yes-co ORES Google Maps', 'Google Maps', 'manage_options', 'yesco_OG_googlemaps', array($this, 'renderGoogleMapsPage'));
       add_options_page('Map shortcode generator', 'Map shortcode generator', 'manage_options', 'yesco_OG_shortcode_map', array($this, 'renderShortcodeMapPage'));
       add_options_page('Objecten shortcode generator', 'Objecten shortcode generator', 'manage_options', 'yesco_OG_shortcode_objects', array($this, 'renderShortcodeObjectsPage'));
-      add_options_page('Yes-co ORES Geavanceerd', 'Geavanceerd', 'manage_options', 'yesco_OG_advanced', array($this, 'renderAdvancedPage'));
-
-            remove_submenu_page('options-general.php', 'yesco_OG_synchronisation');
+      add_options_page('Yes-co ORES Geavanceerd', 'Geavanceerd', 'manage_options', 'yesco_OG_advanced', array($this, 'renderAdvancedPage'));
+      add_options_page('Yes-co ORES Rest API', 'Rest API', 'manage_options', 'yesco_OG_api', array($this, 'renderApiSettingsPage'));
+
+        remove_submenu_page('options-general.php', 'yesco_OG_synchronisation');
             remove_submenu_page('options-general.php', 'yesco_OG_areas');
             remove_submenu_page('options-general.php', 'yesco_OG_html');
@@ -1338 +1444 @@
       remove_submenu_page('options-general.php', 'yesco_OG_shortcode_objects');
             remove_submenu_page('options-general.php', 'yesco_OG_advanced');
+      remove_submenu_page('options-general.php', 'yesco_OG_api');
     }
 
@@ -1430 +1537 @@
             $systemObjectCounts = array();
 
-            // Retrieve number of objects per system
-            foreach ($systemLinks as $systemLink)
+            // Retrieve number of objects per system (not if a lot of systems are linked)
+            if (!empty($systemLinks) && count($systemLinks) < 10)
             {
+              foreach ($systemLinks as $systemLink)
+              {
                 if ($systemLink->getState() === YogSystemLink::STATE_ACTIVE)
                 {
-                    $metaKeys = array();
-                    foreach (yog_getAllObjectPostTypes() as $postType)
-                    {
-                        $metaKeys[] = $postType . '_' . $systemLink->getCollectionUuid() . '_uuid';
-                    }
-
-                    $sql  = 'SELECT COUNT(ID) AS count FROM ' . $wpdb->posts;
-                    $sql .= ' WHERE post_type IN (\'' . implode('\',\'', yog_getAllObjectPostTypes()) . '\')';
-                    $sql .= ' AND EXISTS (';
-                    $sql .= 'SELECT true FROM ' . $wpdb->postmeta;
-                    $sql .= ' WHERE ' . $wpdb->postmeta . '.post_id=' . $wpdb->posts . '.ID';
-                    $sql .= ' AND meta_key IN (\'' . implode('\',\'', $metaKeys) . '\')';
-                    $sql .= ')';
-
-                    $results  = $wpdb->get_results($sql);
-
-                    $systemObjectCounts[$systemLink->getCollectionUuid()] = (int) $results[0]->count;
+                  $metaKeys = array();
+                  foreach (yog_getAllObjectPostTypes() as $postType)
+                  {
+                      $metaKeys[] = $postType . '_' . $systemLink->getCollectionUuid() . '_uuid';
+                  }
+
+                  $sql  = 'SELECT COUNT(ID) AS count FROM ' . $wpdb->posts;
+                  $sql .= ' WHERE post_type IN (\'' . implode('\',\'', yog_getAllObjectPostTypes()) . '\')';
+                  $sql .= ' AND EXISTS (';
+                  $sql .= 'SELECT true FROM ' . $wpdb->postmeta;
+                  $sql .= ' WHERE ' . $wpdb->postmeta . '.post_id=' . $wpdb->posts . '.ID';
+                  $sql .= ' AND meta_key IN (\'' . implode('\',\'', $metaKeys) . '\')';
+                  $sql .= ')';
+
+                  $results  = $wpdb->get_results($sql);
+
+                  $systemObjectCounts[$systemLink->getCollectionUuid()] = (int) $results[0]->count;
                 }
+              }
             }
 
@@ -1571 +1681 @@
       wp_enqueue_script('yog-admin-objects-shortcode-js',   YOG_PLUGIN_URL .'/inc/js/admin_objects_shortcode' . $minifyExtension . '.js', array('jquery'), YOG_PLUGIN_VERSION);
 
-      $postTypes      = array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY);
+      $postTypes      = array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_BOPR);
       $sortOptions    = array('date_asc' => 'datum oplopend', '' => 'datum aflopend',
                               'title_asc' => 'titel oplopend', 'title_desc' => 'titel aflopend',
@@ -1750 +1860 @@
 
             $sql  = 'SELECT DISTINCT ';
-            $sql .= ' (SELECT UPPER(meta_value) FROM ' . $wpdb->postmeta . ' WHERE post_id=' . $wpdb->posts . '.ID AND meta_key IN (\'' . YOG_POST_TYPE_WONEN . '_Plaats\',\'' . YOG_POST_TYPE_BOG . '_Plaats\',\'' . YOG_POST_TYPE_NBPR . '_Plaats\',\'' . YOG_POST_TYPE_BBPR . '_Plaats\')) AS city, ';
-            $sql .= ' (SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE post_id=' . $wpdb->posts . '.ID AND meta_key IN (\'' . YOG_POST_TYPE_WONEN . '_Wijk\',\'' . YOG_POST_TYPE_BOG . '_Wijk\',\'' . YOG_POST_TYPE_NBPR . '_Wijk\',\'' . YOG_POST_TYPE_BBPR . '_Wijk\')) AS area, ';
-            $sql .= ' (SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE post_id=' . $wpdb->posts . '.ID AND meta_key IN (\'' . YOG_POST_TYPE_WONEN . '_Buurt\',\'' . YOG_POST_TYPE_BOG . '_Buurt\',\'' . YOG_POST_TYPE_NBPR . '_Buurt\',\'' . YOG_POST_TYPE_BBPR . '_Buurt\')) AS neighbourhood ';
+            $sql .= ' (SELECT UPPER(meta_value) FROM ' . $wpdb->postmeta . ' WHERE post_id=' . $wpdb->posts . '.ID AND meta_key IN (\'' . YOG_POST_TYPE_WONEN . '_Plaats\',\'' . YOG_POST_TYPE_BOG . '_Plaats\',\'' . YOG_POST_TYPE_NBPR . '_Plaats\',\'' . YOG_POST_TYPE_BBPR . '_Plaats\',\'' . YOG_POST_TYPE_BOPR . '_Plaats\')) AS city, ';
+            $sql .= ' (SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE post_id=' . $wpdb->posts . '.ID AND meta_key IN (\'' . YOG_POST_TYPE_WONEN . '_Wijk\',\'' . YOG_POST_TYPE_BOG . '_Wijk\',\'' . YOG_POST_TYPE_NBPR . '_Wijk\',\'' . YOG_POST_TYPE_BBPR . '_Wijk\',\'' . YOG_POST_TYPE_BOPR . '_Wijk\')) AS area, ';
+            $sql .= ' (SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE post_id=' . $wpdb->posts . '.ID AND meta_key IN (\'' . YOG_POST_TYPE_WONEN . '_Buurt\',\'' . YOG_POST_TYPE_BOG . '_Buurt\',\'' . YOG_POST_TYPE_NBPR . '_Buurt\',\'' . YOG_POST_TYPE_BBPR . '_Buurt\',\'' . YOG_POST_TYPE_BOPR . '_Buurt\')) AS neighbourhood ';
             $sql .= ' FROM ' . $wpdb->posts;
-            $sql .= ' WHERE post_type IN (\'' . YOG_POST_TYPE_WONEN . '\',\'' . YOG_POST_TYPE_BOG . '\',\'' . YOG_POST_TYPE_NBPR . '\',\'' . YOG_POST_TYPE_BBPR . '\') AND post_status = \'publish\'';
+            $sql .= ' WHERE post_type IN (\'' . YOG_POST_TYPE_WONEN . '\',\'' . YOG_POST_TYPE_BOG . '\',\'' . YOG_POST_TYPE_NBPR . '\',\'' . YOG_POST_TYPE_BBPR . '\',\'' . YOG_POST_TYPE_BOPR . '\') AND post_status = \'publish\'';
 
             $results        = $wpdb->get_results($sql);
@@ -1877 +1987 @@
       // Render html
       include(YOG_PLUGIN_DIR . '/includes/pages/advanced.php');
+        }
+
+        /**
+         * Render API settings page
+         */
+        public function renderAPISettingsPage()
+        {
+      require_once(__DIR__ . '/yog_rest_api_key.php');
+      require_once(__DIR__ . '/yog_rest_api_key_manager.php');
+      
+      $apiKeyManager  = new YogRestApiKeyManager();
+      $errors         = [];
+
+            // Handle post
+            if (!empty($_POST) && isset($_POST['mode']) && in_array($_POST['mode'], ['create', 'delete']))
+            {
+        try
+        {
+          // Check if current user has enough rights to edit plugin settings (should already be done by wordpress, but just to be sure)
+          if (!current_user_can('manage_options'))
+            throw new \InvalidArgumentException('Je hebt niet de juiste rechten om deze pagina te mogen zien');
+
+          // Determine nonce name (based on mode / key)
+          $mode         = sanitize_text_field($_POST['mode']);
+          $key          = (empty($_POST['key']) ? null : sanitize_text_field($_POST['key']));
+          $nonceName    = '_wpnonce-api-' . $mode . (empty($key) ? '' : '-' . $key);
+          $nonceAction  = 'yog-api-' . $mode . (empty($key) ? '' : '-' . $key);
+
+          // Check nonce
+          if (empty($_POST[$nonceName]) || !wp_verify_nonce($_POST[$nonceName], $nonceAction))
+            throw new \InvalidArgumentException('Je hebt de pagina te lang open staan, herlaad de pagina en probeer opnieuw.');
+
+          switch ($mode)
+          {
+            // Handle creattion of API key
+            case 'create':
+
+              if (!empty($_POST['name']))
+              {
+                // Create new API key
+                $apiKey = new YogRestApiKey(wp_generate_uuid4(), sanitize_text_field($_POST['name']));
+
+                // Store the API key
+                $apiKeyManager->store($apiKey);
+              }
+
+              break;
+
+            // Handle deltion of API key
+            case 'delete':
+
+              if (!empty($key))
+              {
+                // Retrieve API key
+                $apiKey = $apiKeyManager->retrieveByKey($key);
+
+                // Delete API key
+                $apiKeyManager->delete($apiKey);
+              }
+
+              break;
+          }
+        }
+        catch (\InvalidArgumentException $e)
+        {
+          $errors[] = $e->getMessage();
+        }
+        catch (\Exception $e)
+        {
+          $errors[] = 'Er is een fout opgetreden';
+        }
+            }
+
+      // Retrieve all API keys
+      $apiKeys  = $apiKeyManager->retrieveAll();
+
+      // Render html
+      include(YOG_PLUGIN_DIR . '/includes/pages/api.php');
         }
 
@@ -2253 +2441 @@
         // Retrieve existing YOG posts
         $posts = get_posts(array(
-                                                        'post_type'             => array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY),
+                                                        'post_type'             => array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_BOPR),
                                                         'post_status'           => 'any',
                                                         'posts_per_page'    => -1
@@ -2280 +2468 @@
             case YOG_POST_TYPE_BBPR:
             case YOG_POST_TYPE_BBTY:
+            case YOG_POST_TYPE_BOPR:
               $priceMetaKeys = array($postType . '_KoopPrijsMin', $postType . '_HuurPrijsMin', $postType . '_KoopPrijsMax', $postType . '_HuurPrijsMax');
               break;
@@ -2311 +2500 @@
         // Retrieve existing YOG posts
         $posts = get_posts(array(
-                                                        'post_type'             => array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY),
+                                                        'post_type'             => array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_BOPR),
                                                         'post_status'           => 'any',
                                                         'posts_per_page'    => -1
@@ -2330 +2519 @@
             case YOG_POST_TYPE_WONEN:
             case YOG_POST_TYPE_BOG:
+            case YOG_POST_TYPE_BOPR:
               $metaKeys = array($postType . '_Plaats', $postType . '_Straat', $postType . '_Huisnummer');
               break;

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_bbpr_translation.php

@@ -89 +89 @@
             if (!empty($textData))
                 $data = array_merge($data, $textData);
+
+      // Also add generic meta data
+      $genericMetaData = $this->getGenericMetaData();
+      if (!empty($genericMetaData))
+        $data = array_merge($data, $genericMetaData);
 
       return $data;

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_bbty_translation.php

@@ -166 +166 @@
                 $data = array_merge($data, $textData);
 
+      // Also add generic meta data
+      $genericMetaData = $this->getGenericMetaData();
+      if (!empty($genericMetaData))
+        $data = array_merge($data, $genericMetaData);
+
       return $data;
     }

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_bog_translation.php

@@ -47 +47 @@
     {
       // General meta data
-      $data = $this->getGeneralMetaData();
+      $data = array_merge($this->getGenericMetaData(), $this->getGeneralMetaData());
       $type = ($this->mcp3Project->hasSubType()) ? $this->mcp3Project->getSubType() : $this->mcp3Project->getType();
 
@@ -284 +284 @@
 
       return $categories;
+    }
+
+    /**
+    * @desc Check if a parent uuid is set
+    *
+    * @param void
+    * @return bool
+    */
+    public function hasParentUuid()
+    {
+      return $this->mcp3Project->hasParentUuid();
+    }
+
+    /**
+    * @desc Get the parent uuid
+    *
+    * @param void
+    * @return string
+    * @throws Exception
+    */
+    public function getParentUuid()
+    {
+      if (!$this->hasParentUuid())
+        throw new Exception(__METHOD__ . '; Object does not have a parent object');
+
+      return $this->mcp3Project->getParentUuid();
     }
 

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_bopr_translation.php

@@ -1 +1 @@
 <?php
   /**
-  * @desc YogProjectNBprTranslation
+  * @desc YogProjectBOprTranslation
   * @author Kees Brandenburg - Yes-co Nederland
   */
-  class YogProjectNBprTranslation extends YogProjectTranslationAbstract
+  class YogProjectBOprTranslation extends YogProjectTranslationAbstract
   {
     /**
@@ -14 +14 @@
     public function getPostType()
     {
-      return YOG_POST_TYPE_NBPR;
+      return YOG_POST_TYPE_BOPR;
     }
 
@@ -49 +49 @@
         'Status'                      => $this->determineState(),
         'Naam'                        => $this->mcp3Project->getStringByPath('//project:General/project:Name'),
-        'Land'                        => $this->mcp3Project->getStringByPath('//project:General/project:Location/project:Country'),
-        'Provincie'                   => $this->mcp3Project->getStringByPath('//project:General/project:Location/project:State'),
-        'Gemeente'                    => $this->mcp3Project->getStringByPath('//project:General/project:Location/project:Municipality'),
-        'Plaats'                      => $this->mcp3Project->getStringByPath('//project:General/project:Location/project:City'),
-        'Wijk'                        => $this->mcp3Project->getStringByPath('//project:General/project:Location/project:Area'),
-        'Buurt'                       => $this->mcp3Project->getStringByPath('//project:General/project:Location/project:Neighbourhood'),
-        'Straat'                      => $this->mcp3Project->getStringByPath('//project:General/project:Location/project:Street'),
-        'Postcode'                    => $this->mcp3Project->getStringByPath('//project:General/project:Location/project:Zipcode'),
+        'BouwType'                    => $this->mcp3Project->getStringByPath('//project:General/project:BouwType'),
+        'Land'                        => $this->mcp3Project->getStringByPath('//project:General/project:Address/project:Country'),
+        'Provincie'                   => $this->mcp3Project->getStringByPath('//project:General/project:Address/project:State'),
+        'Gemeente'                    => $this->mcp3Project->getStringByPath('//project:General/project:Address/project:Municipality'),
+        'Plaats'                      => $this->mcp3Project->getStringByPath('//project:General/project:Address/project:City'),
+        'Wijk'                        => $this->mcp3Project->getStringByPath('//project:General/project:Address/project:Area'),
+        'Buurt'                       => $this->mcp3Project->getStringByPath('//project:General/project:Address/project:Neighbourhood'),
+        'Straat'                      => $this->mcp3Project->getStringByPath('//project:General/project:Address/project:Street'),
+        'Postcode'                    => $this->mcp3Project->getStringByPath('//project:General/project:Address/project:Zipcode'),
         'Longitude'                   => $this->mcp3Project->getStringByPath('//project:General/project:GeoCode/project:Longitude'),
         'Latitude'                    => $this->mcp3Project->getStringByPath('//project:General/project:GeoCode/project:Latitude'),
-        'KoopAanneemSomMin'           => $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:KoopAanneemSom/project:Min'),
-        'KoopAanneemSomMax'           => $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:KoopAanneemSom/project:Max'),
+        'NummerreeksStart'            => $this->mcp3Project->getStringByPath('//project:General/project:Nummerreeks/project:Start'),
+        'NummerreeksEind'             => $this->mcp3Project->getStringByPath('//project:General/project:Nummerreeks/project:End'),
+        'KoopPrijsMin'                => $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:Prijs/project:Min'),
+        'KoopPrijsMax'                => $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:Prijs/project:Max'),
         'HuurPrijsMin'                => $this->mcp3Project->getIntByPath('//project:Details/project:Huur/project:Prijs/project:Min'),
         'HuurPrijsMax'                => $this->mcp3Project->getIntByPath('//project:Details/project:Huur/project:Prijs/project:Max'),
-        'HuurPrijsConditie'           => $this->translatePriceCondition($this->mcp3Project->getStringByPath('//project:Details/project:Huur/project:PrijsConditie')),
-        'PerceelOppervlakteMin'       => $this->mcp3Project->getIntByPath('//project:Details/project:PerceelOppervlakte/project:Min'),
-        'PerceelOppervlakteMax'       => $this->mcp3Project->getIntByPath('//project:Details/project:PerceelOppervlakte/project:Max'),
-        'WoonOppervlakteMin'          => $this->mcp3Project->getIntByPath('//project:Details/project:Woonruimte/project:WoonOppervlakte/project:Min'),
-        'WoonOppervlakteMax'          => $this->mcp3Project->getIntByPath('//project:Details/project:Woonruimte/project:WoonOppervlakte/project:Max'),
-        'InhoudMin'                   => $this->mcp3Project->getIntByPath('//project:Details/project:Woonruimte/project:Inhoud/project:Min'),
-        'InhoudMax'                   => $this->mcp3Project->getIntByPath('//project:Details/project:Woonruimte/project:Inhoud/project:Max'),
-        'Fase'                        => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:Fase'),
-        'Status'                      => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:Status'),
-        'ProjectSoort'                => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:Projectsoort'),
-        'AantalEenheden'              => $this->mcp3Project->getIntByPath('//project:Details/project:Ontwikkeling/project:AantalEenheden'),
-        'StartBouw'                   => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:StartBouw'),
         'DatumStartBouw'              => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:DatumStartBouw'),
-        'Oplevering'                  => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:Oplevering'),
         'DatumOplevering'             => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:DatumOplevering'),
-                'DatumStartVerkoop'           => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:DatumStartVerkoop')
+                'DatumStartVerkoop'           => $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:DatumStartVerkoop'),
+        'GebouwNaam'                  => $this->mcp3Project->getStringByPath('//project:Gebouw/project:Naam'),
+        'AantalVerdiepingen'          => $this->mcp3Project->getIntByPath('//project:Gebouw/project:Verdiepingen/project:Aantal')
       );
 
             // ApiKey
             if ($this->mcp3Project->hasNodeByXpath('/project:Project/@apiId'))
-                $data['ApiKey']           = $this->mcp3Project->getStringByPath('/project:Project/@apiId'); // 3mcp 1.6
-            else
-                $data['ApiKey']           = $this->mcp3Project->getStringByPath('/project:Project/project:YProjectNumber'); // 3mcp 1.4
+                $data['ApiKey']           = $this->mcp3Project->getStringByPath('/project:Project/@apiId');
 
       // Housenumber
-      if ($this->mcp3Project->hasLocation())
+      if ($this->mcp3Project->hasAddress())
       {
-        $address                  = $this->mcp3Project->getLocation();
-        $data['Huisnummer']       = $address->getHouseNumber() . $address->getHouseNumberAddition();
+        $address                                        = $this->mcp3Project->getAddress();
+                $addition                                       = $address->getHouseNumberAddition();
+
+        $data['Huisnummer']                 = $address->getHouseNumber() . $addition;
+                $data['HuisnummerNumeriek'] = $address->getHouseNumber();
+
+                if (!empty($addition))
+                    $data['HuisnummerToevoeging'] = $addition;
       }
 
@@ -98 +94 @@
             if (!empty($textData))
                 $data = array_merge($data, $textData);
+
+      // Also add generic meta data
+      $genericMetaData = $this->getGenericMetaData();
+      if (!empty($genericMetaData))
+        $data = array_merge($data, $genericMetaData);
 
       return $data;
@@ -110 +111 @@
     public function determineSortPrice()
     {
-      $price = $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:KoopAanneemSom/project:Min');
+      $price = $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:Prijs/project:Min');
       if (!empty($price))
         return $price;
@@ -118 +119 @@
         return $price;
 
-      $price = $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:KoopAanneemSom/project:Max');
+      $price = $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:Prijs/project:Max');
       if (!empty($price))
         return $price;
@@ -139 +140 @@
             $sort = '';
 
-      if ($this->mcp3Project->hasLocation())
+      if ($this->mcp3Project->hasAddress())
       {
-        $location   = $this->mcp3Project->getLocation();
-                $city           = $location->getCity();
-                $sort           = $city . ' ' . str_replace($city, '', $this->determineTitle());
+        $address    = $this->mcp3Project->getAddress();
+                $sort           = $address->getCity() . ' ' . $address->getStreet() . ' ' . $address->getHouseNumber() . $address->getHouseNumberAddition();
       }
 
@@ -157 +157 @@
     public function getCategories()
     {
-        $categories = array('nieuwbouw-projecten', 'nieuwbouw-project');
+      $categories = ['bog-project'];
 
       // Verkoop
-      $min = $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:KoopAanneemSom/project:Min');
-      $max = $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:KoopAanneemSom/project:Max');
-      if (!empty($min) || !empty($max))
-        $categories[] = 'nieuwbouw-project-verkoop';
+      $koopMin = $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:Prijs/project:Min');
+      $koopMax = $this->mcp3Project->getIntByPath('//project:Details/project:Koop/project:Prijs/project:Max');
+      if (!empty($koopMin) || !empty($koopMax))
+        $categories[] = 'bog-project-verkoop';
 
       // Verhuur
-      $min = $this->mcp3Project->getIntByPath('//project:Details/project:Huur/project:Prijs/project:Min');
-      $max = $this->mcp3Project->getIntByPath('//project:Details/project:Huur/project:Prijs/project:Max');
-      if (!empty($min) || !empty($max))
-        $categories[] = 'nieuwbouw-project-verhuur';
+      $huurMin = $this->mcp3Project->getIntByPath('//project:Details/project:Huur/project:Prijs/project:Min');
+      $huurMax = $this->mcp3Project->getIntByPath('//project:Details/project:Huur/project:Prijs/project:Max');
+      if (!empty($huurMin) || !empty($huurMax))
+        $categories[] = 'bog-project-verhuur';
 
-          // State
-      if (in_array($this->determineState(), array('verkocht', 'verhuurd', 'verkocht/verhuurd')))
-              $categories[] = 'nieuwbouw-project-verkochtverhuurd';
-
-      // Allow the theme to add custom categories
-      $this->getThemeCategories($this->mcp3Project, $categories);
+      // Sold?
+      $state = strtolower($this->determineState());
+      if (in_array($state, ['verkocht onder voorbehoud', 'verhuurd onder voorbehoud']))
+        $categories[] = 'bog-project-verkochtverhuurd';
 
       return $categories;
@@ -189 +187 @@
     private function determineState()
     {
-        $state = $this->mcp3Project->getStringByPath('//project:Details/project:Ontwikkeling/project:Status');
+        $state = $this->mcp3Project->getStringByPath('//project:General/project:ObjectStatus');
+      if (!empty($state))
+        return ucfirst($state);
 
-      return $state;
+      return 'Beschikbaar';
     }
   }

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_nbbn_translation.php

@@ -110 +110 @@
                 $data = array_merge($data, $textData);
 
+      // Also add generic meta data
+      $genericMetaData = $this->getGenericMetaData();
+      if (!empty($genericMetaData))
+        $data = array_merge($data, $genericMetaData);
+
       return $data;
     }

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_nbpr_translation.php

@@ -99 +99 @@
                 $data = array_merge($data, $textData);
 
+      // Also add generic meta data
+      $genericMetaData = $this->getGenericMetaData();
+      if (!empty($genericMetaData))
+        $data = array_merge($data, $genericMetaData);
+
       return $data;
     }

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_nbty_translation.php

@@ -193 +193 @@
             }
 
-
-
             // Also add text meta data?
             $textData   = $this->getTextMetaData();
             if (!empty($textData))
                 $data = array_merge($data, $textData);
+
+      // Also add generic meta data
+      $genericMetaData = $this->getGenericMetaData();
+      if (!empty($genericMetaData))
+        $data = array_merge($data, $genericMetaData);
 
       return $data;

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_translation.php

@@ -79 +79 @@
 
         return new YogProjectBBtyTranslation($mcp3Project, $mcp3Link);
+      }
+      else if ($mcp3Project instanceOf Yog3McpXmlProjectBOpr)
+      {
+        require_once(YOG_PLUGIN_DIR . '/includes/classes/yog_project_bopr_translation.php');
+
+        return new YogProjectBOprTranslation($mcp3Project, $mcp3Link);
       }
       else
@@ -139 +145 @@
     {
       throw new YogException(__METHOD__ . '; No parent uuid', YogException::GLOBAL_ERROR);
+    }
+
+    /**
+     * Get the generic meta data
+     * @return array
+     */
+    public function getGenericMetaData()
+    {
+      $metaData = [];
+      $tags     = $this->getTags();
+
+      if (!empty($tags))
+        $metaData['tags'] = '|' . implode('|', $tags) . '|';
+
+      return $metaData;
     }
 

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_project_wonen_translation.php

@@ -86 +86 @@
     {
       // General meta data
-      $data = $this->getGeneralMetaData();
+      $data = array_merge($this->getGenericMetaData(), $this->getGeneralMetaData());
 
             // Also add text meta data?

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_synchronization_manager.php

@@ -681 +681 @@
           $postType = YOG_POST_TYPE_BBTY;
           break;
+        case 'BOpr':
+          $postType = YOG_POST_TYPE_BOPR;
+          break;
       }
 
@@ -1169 +1172 @@
       $metaKeyBBpr    = $this->db->_real_escape(YOG_POST_TYPE_BBPR . '_' . $collectionUuid . '_uuid');
       $metaKeyBBty    = $this->db->_real_escape(YOG_POST_TYPE_BBTY . '_' . $collectionUuid . '_uuid');
+      $metaKeyBOpr    = $this->db->_real_escape(YOG_POST_TYPE_BOPR . '_' . $collectionUuid . '_uuid');
 
       $tableName    = $this->db->prefix .'postmeta';
-      $results      = $this->db->get_results("SELECT post_id, meta_key, meta_value AS uuid FROM " . $tableName . " WHERE meta_key IN ('" . $metaKeyWonen . "', '" . $metaKeyBog . "', '" . $metaKeyNBpr . "', '" . $metaKeyNBty . "', '" . $metaKeyNBbn . "', '" . $metaKeyBBpr . "', '" . $metaKeyBBty . "') ORDER BY post_id DESC");
+      $results      = $this->db->get_results("SELECT post_id, meta_key, meta_value AS uuid FROM " . $tableName . " WHERE meta_key IN ('" . $metaKeyWonen . "', '" . $metaKeyBog . "', '" . $metaKeyNBpr . "', '" . $metaKeyNBty . "', '" . $metaKeyNBbn . "', '" . $metaKeyBBpr . "', '" . $metaKeyBBty . "', '" . $metaKeyBOpr . "') ORDER BY post_id DESC");
       $uuids        = array();
 
@@ -1327 +1331 @@
       $woonruimteId = $this->createCategory('Woonruimte',           'woonruimte',           $consumentId);
       $bogId        = $this->createCategory('Bedrijf',              'bedrijf');
+      $boprId       = $this->createCategory('BOG project',          'bog-project');
       $nbId         = $this->createCategory('Nieuwbouw projecten',  'nieuwbouw-projecten');
       $nbprId       = $this->createCategory('Nieuwbouw project',    'nieuwbouw-project',    $nbId);
@@ -1339 +1344 @@
         'woonruimte'            => $woonruimteId,
         'bedrijf'               => $bogId,
+        'bog-project'           => $boprId,
         'nieuwbouw-projecten'   => $nbprId,
         'nieuwbouw-type'        => $nbtyId,
@@ -1389 +1395 @@
                                                                                                             'verhard-buitenterrein' => 'Verhard buitenterrein',
                                                                                                             'bog-belegging'                 => 'Belegging'),
+                              $boprId       => array( 'bog-project-verkoop'                   => 'Verkoop',
+                                                      'bog-project-verhuur'                   => 'Verhuur',
+                                                      'bog-project-verkochtverhuurd'          => 'Verkocht/verhuurd'),
                               $nbprId       => array( 'nieuwbouw-project-verkoop'             => 'Verkoop',
                                                       'nieuwbouw-project-verhuur'             => 'Verhuur',

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_system_link_manager.php

@@ -75 +75 @@
 
     /**
+    * @desc Retrieve system link by collection uuid
+    *
+    * @param string $collectionUuid
+    * @return YogSystemLink
+    */
+    public function retrieveByCollectionUuid($collectionUuid)
+    {
+      $systemLinks  = $this->retrieveAll();
+      $systemLink   = null;
+
+            foreach ($systemLinks as $curSystemLink)
+      {
+        if ($curSystemLink->getCollectionUuid() === $collectionUuid)
+                    $systemLink = $curSystemLink;
+            }
+
+      if (is_null($systemLink))
+        YogException(__METHOD__ . '; No system link found', YogException::GLOBAL_ERROR);
+
+      return $systemLink;
+    }
+
+    /**
     * @desc Retrieve all system links
     *
@@ -91 +114 @@
       foreach ($storedSystemLinks as $storedSystemLink)
       {
+        if (empty($storedSystemLink['naam']))
+          $storedSystemLink['naam'] = 'Nader te bepalen';
+        
         $systemLinks[] = YogSystemLink::create($storedSystemLink);
       }
@@ -172 +198 @@
   class YogSystemLink
   {
-    const STATE_ACTIVE  = 'Actief';
-    const EMPTY_NAME    = 'Nog niet bekend, wacht op synchronisatie';
-    const EMPTY_UUID    = '-';
+    const STATE_ACTIVE        = 'Actief';
+    const STATE_NOT_ACTIVATED = 'Nog niet geactiveerd';
+    const EMPTY_NAME          = 'Nog niet bekend, wacht op synchronisatie';
+    const EMPTY_UUID          = '-';
 
     private $name;

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_wp_admin_object_ui.php

@@ -28 +28 @@
         case YOG_POST_TYPE_NBPR:
           require_once(YOG_PLUGIN_DIR . '/includes/classes/yog_wp_admin_object_ui_nbpr.php');
-          return new YogWpAdminObjectUiNbpr();
+          return new YogWpAdminObjectUiNBpr();
           break;
         case YOG_POST_TYPE_NBTY:
@@ -45 +45 @@
           require_once(YOG_PLUGIN_DIR . '/includes/classes/yog_wp_admin_object_ui_bbty.php');
           return new YogWpAdminObjectUiBbty();
+          break;
+        case YOG_POST_TYPE_BOPR:
+          require_once(YOG_PLUGIN_DIR . '/includes/classes/yog_wp_admin_object_ui_bopr.php');
+          return new YogWpAdminObjectUiBOpr();
           break;
         case YOG_POST_TYPE_RELATION:
@@ -95 +99 @@
       {
         case 'thumbnail':
-          $thumbnail = get_the_post_thumbnail(null, 'thumbnail');
+          $thumbnail = get_the_post_thumbnail(null, [200, 150]);
           if (!empty($thumbnail))
             echo $thumbnail;
           else
-            echo '<div class="no-image" style="width:' . get_option('thumbnail_size_w', 0) . 'px;"></div>';
+            echo '<div class="no-image" style="width: 200px;"></div>';
 
           break;
@@ -632 +636 @@
                                 'order'           => 'ASC',
                                 'post_parent'     => $post->ID,
-                                'post_type'       => array(YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_WONEN),
+                                'post_type'       => array(YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG),
                                 'post_status'     => array('publish', 'pending', 'trash', 'draft', 'auto-draft', 'future', 'private')));
 

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_wp_admin_object_ui_bog.php

@@ -62 +62 @@
       add_meta_box('yog-gebouw-meta',         'Gebouw',               array($this, 'renderGebouwMetaBox'),          YOG_POST_TYPE_BOG, 'normal', 'low');
       add_meta_box('yog-bedrijfsruimte-meta', 'Bedrijfsruimte',       array($this, 'renderBedrijfsruimteMetaBox'),  YOG_POST_TYPE_BOG, 'normal', 'low');
-      add_meta_box('yog-kantoorruimte-meta',   'Kantoorruimte',         array($this, 'renderKantoorruimteMetaBox'),    YOG_POST_TYPE_BOG, 'normal', 'low');
+      add_meta_box('yog-kantoorruimte-meta',   'Kantoorruimte',       array($this, 'renderKantoorruimteMetaBox'),   YOG_POST_TYPE_BOG, 'normal', 'low');
       add_meta_box('yog-winkelruimte-meta',   'Winkelruimte',         array($this, 'renderWinkelruimteMetaBox'),    YOG_POST_TYPE_BOG, 'normal', 'low');
       add_meta_box('yog-horeca-meta',         'Horeca',               array($this, 'renderHorecaMetaBox'),          YOG_POST_TYPE_BOG, 'normal', 'low');
@@ -69 +69 @@
         add_meta_box('yog-documents',           'Documenten',           array($this, 'renderDocumentsMetaBox'),       YOG_POST_TYPE_BOG, 'normal', 'low');
         add_meta_box('yog-links',               'Externe koppelingen',  array($this, 'renderLinksMetaBox'),           YOG_POST_TYPE_BOG, 'normal', 'low');
+
+      // Only show parent object container when there is a parent object
+      if (!empty($_REQUEST['post']) && yog_hasParentObject((int) $_REQUEST['post']))
+        add_meta_box('yog-parent-meta',       'Project',              array($this, 'renderParentMetaBox') ,       $this->getPostType(), 'side', 'high');
 
       add_meta_box('yog-meta-sync',           'Synchronisatie',       array($this, 'renderSyncMetaBox') ,         YOG_POST_TYPE_BOG, 'side', 'low');

yes-co-ores-wordpress-plugin/trunk/includes/classes/yog_wp_admin_object_ui_bopr.php

@@ -1 +1 @@
 <?php
   /**
-  * @desc YogWpAdminObjectUiNBpr
+  * @desc YogWpAdminObjectUiBOpr
   * @author Kees Brandenburg - Yes-co Nederland
   */
-  class YogWpAdminObjectUiNBpr extends YogWpAdminObjectUiAbstract
+  class YogWpAdminObjectUiBOpr extends YogWpAdminObjectUiAbstract
   {
     /**
@@ -14 +14 @@
     public function getPostType()
     {
-      return YOG_POST_TYPE_NBPR;
+      return YOG_POST_TYPE_BOPR;
     }
 
@@ -41 +41 @@
           'title'         => 'Object',
           'description'   => 'Omschrijving',
-          'location'      => 'Locatie',
+          'address'       => 'Adres',
         'dlm'           => 'Laatste wijziging'
         );
@@ -54 +54 @@
     public function addMetaBoxes()
     {
-      add_meta_box('yog-childprojects-meta','Types',                array($this, 'renderChildProjectsMetaBox'), $this->getPostType(), 'normal', 'high');
+      add_meta_box('yog-childprojects-meta','Objecten',             array($this, 'renderChildProjectsMetaBox'), $this->getPostType(), 'normal', 'high');
         add_meta_box('yog-standard-meta',     'Basis gegevens',       array($this, 'renderBasicMetaBox'),         $this->getPostType(), 'normal', 'low');
         add_meta_box('yog-price-meta',        'Prijs',                array($this, 'renderPriceMetaBox'),         $this->getPostType(), 'normal', 'low');
-        add_meta_box('yog-measurements-meta', 'Maten',                array($this, 'renderMeasurementsMetaBox'),  $this->getPostType(), 'normal', 'low');
       add_meta_box('yog-development-meta',  'Ontwikkeling',         array($this, 'renderDevelopmentMetaBox'),   $this->getPostType(), 'normal', 'low');
+      add_meta_box('yog-building-meta',     'Gebouw',               array($this, 'renderBuildingMetaBox'),      $this->getPostType(), 'normal', 'low');
+
         add_meta_box('yog-movies',            'Video',                array($this, 'renderMoviesMetaBox'),        $this->getPostType(), 'normal', 'low');
         add_meta_box('yog-documents',         'Documenten',           array($this, 'renderDocumentsMetaBox'),     $this->getPostType(), 'normal', 'low');
@@ -79 +80 @@
     {
         echo '<table class="form-table">';
-        echo $this->retrieveInputs($post->ID, array('Naam', 'Postcode', 'Wijk', 'Buurt', 'Plaats', 'Gemeente', 'Provincie', 'Land', 'Status'));
+        echo $this->retrieveInputs($post->ID, array('Naam', 'Straat', 'Huisnummer', 'NummerreeksStart', 'NummerreeksEind', 'Postcode', 'Wijk', 'Buurt', 'Plaats', 'Gemeente', 'Provincie', 'Land', 'Status'));
         echo '</table>';
     }
@@ -95 +96 @@
         // Koop
         echo '<tr>';
-        echo '<th colspan="2"><b>Koopaanneemsom</b></th>';
+        echo '<th colspan="2"><b>Koopprijs</b></th>';
         echo '</tr>';
-        echo $this->retrieveInputs($post->ID, array('KoopAanneemSomMin', 'KoopAanneemSomMax'));
+        echo $this->retrieveInputs($post->ID, array('KoopPrijsMin', 'KoopPrijsMax'));
 
         // Huur
@@ -103 +104 @@
         echo '<th colspan="2"><b>Huurprijs</b></th>';
         echo '</tr>';
-        echo $this->retrieveInputs($post->ID, array('HuurPrijsMin', 'HuurPrijsMax', 'HuurPrijsConditie'));
-
-        echo '</table>';
-    }
-
-    /**
-    * @desc Render object measurements meta box
-    *
-    * @param object $post
-    * @return void
-    */
-    public function renderMeasurementsMetaBox($post)
-    {
-        echo '<table class="form-table">';
-
-      // Perceel oppervlakte
-        echo '<tr>';
-        echo '<th colspan="2"><b>Perceel oppervlakte</b></th>';
-        echo '</tr>';
-        echo $this->retrieveInputs($post->ID, array('PerceelOppervlakteMin', 'PerceelOppervlakteMax'));
-
-      // Woon oppervlakte
-        echo '<tr>';
-        echo '<th colspan="2"><b>Woon oppervlakte</b></th>';
-        echo '</tr>';
-        echo $this->retrieveInputs($post->ID, array('WoonOppervlakteMin', 'WoonOppervlakteMax'));
-
-      // Inhoud
-        echo '<tr>';
-        echo '<th colspan="2"><b>Inhoud</b></th>';
-        echo '</tr>';
-        echo $this->retrieveInputs($post->ID, array('InhoudMin', 'InhoudMax'));
+        echo $this->retrieveInputs($post->ID, array('HuurPrijsMin', 'HuurPrijsMax'));
 
         echo '</table>';
@@ -148 +118 @@
     {
       echo '<table class="form-table">';
-      echo $this->retrieveInputs($post->ID, array('Fase', 'Status', 'ProjectSoort', 'AantalEenheden', 'StartBouw', 'DatumStartBouw', 'Oplevering', 'DatumOplevering'));
+      echo $this->retrieveInputs($post->ID, array('DatumStartBouw', 'DatumOplevering', 'DatumStartVerkoop'));
       echo '</table>';
     }
+
+    /**
+    * @desc Render building meta box
+    *
+    * @param object $post
+    * @return void
+    */
+    public function renderBuildingMetaBox($post)
+    {
+      echo '<table class="form-table">';
+      echo $this->retrieveInputs($post->ID, array('GebouwNaam', 'AantalVerdiepingen'));
+      echo '</table>';
+    }
+
 
     /**

yes-co-ores-wordpress-plugin/trunk/includes/config/config.php

@@ -18 +18 @@
   define('YOG_POST_TYPE_BBPR',        'yog-bbpr');
   define('YOG_POST_TYPE_BBTY',        'yog-bbty');
+  define('YOG_POST_TYPE_BOPR',        'yog-bopr');
   define('YOG_POST_TYPE_RELATION',    'relatie');
   define('YOG_POST_TYPE_ATTACHMENT',    'attachment');
 
-  define('YOG_PLUGIN_VERSION',      '1.3.74');
+  define('YOG_PLUGIN_VERSION',      '1.3.75');
   define('YOG_PLUGIN_DOJO_VERSION', '1.12.2'); // Old 1.9.3
 ?>

yes-co-ores-wordpress-plugin/trunk/includes/pages/shortcode_map.php

@@ +1 @@
+<?php
+$mapType = get_option('yog_map_type', 'google-maps');
+?>
 <div class="wrap">
   <div class="icon32 icon32-config-yog"><br /></div>
@@ -4 +7 @@
   <?php require_once(__DIR__ . '/parts/menu.php'); ?>
   <p>Hiermee kun je snel een shortcode voor een map genereren die je kan plaatsen in een Page of Post.</p>
-  <p>Shortcode: <br /><b id="yogShortcode" class="bold">[yog-map]</b></p>
-<?php
-  $html = '<table class="form-table"><tbody>';
+  <?php
+  if ($mapType !== 'google-maps')
+  {
+    echo '<div id="message" class="error below-h2" style="padding: 5px 10px;background-color:#feffd1;border-color:#d5d738;">';
+      echo '<p>De Map shortcode is enkel bruikbaar als er gebruik gemaakt wordt van kaarten via Google Maps.<br />Welk soort kaarten er gebruikt worden kan je <a href="options-general.php?page=yesco_OG_googlemaps">hier</a> instellen.</p>';
+    echo '</div>';
+  }
+  else
+  {
+    ?>
+    <p>Shortcode: <br /><b id="yogShortcode" class="bold">[yog-map]</b></p>
+    <?php
+    $html = '<table class="form-table"><tbody>';
 
-  // Types
-  $checkboxesHtml = '';
+    // Types
+    $checkboxesHtml = '';
 
-  foreach ($postTypes as $postTypeTmp)
-  {
-    $checked        = '';
+    foreach ($postTypes as $postTypeTmp)
+    {
+      $checked        = '';
 
-    if (in_array($postTypeTmp, $settings['postTypes']))
-      $checked = ' checked="checked"';
+      if (in_array($postTypeTmp, $settings['postTypes']))
+        $checked = ' checked="checked"';
 
-    $id             = 'shortcode_PostTypes_' . $postTypeTmp;
-    $label          = '';
+      $id             = 'shortcode_PostTypes_' . $postTypeTmp;
+      $label          = '';
 
-    $postTypeObject = get_post_type_object($postTypeTmp);
+      $postTypeObject = get_post_type_object($postTypeTmp);
 
-    $label          = $postTypeObject->labels->singular_name;
+      $label          = $postTypeObject->labels->singular_name;
 
-    $checkboxesHtml .= '<input type="checkbox" id="' . $id . '" name="shortcode_PostTypes[]" value="' . esc_attr($postTypeTmp) . '"' . $checked . ' />&nbsp;<label for="' . $id . '">' . esc_html($label) . '</label><br />';
-  }
+      $checkboxesHtml .= '<input type="checkbox" id="' . $id . '" name="shortcode_PostTypes[]" value="' . esc_attr($postTypeTmp) . '"' . $checked . ' />&nbsp;<label for="' . $id . '">' . esc_html($label) . '</label><br />';
+    }
 
-  $html .= $this->renderRow('<label for="shortcode_PostTypes">Post types: </label>', $checkboxesHtml);
+    $html .= $this->renderRow('<label for="shortcode_PostTypes">Post types: </label>', $checkboxesHtml);
 
-  // Latitude
-  $html .= $this->renderRow('<label for="shortcode_Latitude">Latitude: </label>', '<input id="shortcode_Latitude" name="shortcode_Latitude" type="text" value="' . esc_attr($settings['latitude']) . '" />');
+    // Latitude
+    $html .= $this->renderRow('<label for="shortcode_Latitude">Latitude: </label>', '<input id="shortcode_Latitude" name="shortcode_Latitude" type="text" value="' . esc_attr($settings['latitude']) . '" />');
 
-  // Longitude
-  $html .= $this->renderRow('<label for="shortcode_Longitude">Longitude: </label>', '<input id="shortcode_Longitude" name="shortcode_Longitude" type="text" value="' . esc_attr($settings['longitude']) . '" />');
+    // Longitude
+    $html .= $this->renderRow('<label for="shortcode_Longitude">Longitude: </label>', '<input id="shortcode_Longitude" name="shortcode_Longitude" type="text" value="' . esc_attr($settings['longitude']) . '" />');
 
-  // Width
-  $html .= $this->renderRow('<label for="shortcode_Width">Breedte (Geheel getal): </label>', '<input id="shortcode_Width" name="shortcode_Width" type="text" value="' . esc_attr($settings['width']) . '" />');
+    // Width
+    $html .= $this->renderRow('<label for="shortcode_Width">Breedte (Geheel getal): </label>', '<input id="shortcode_Width" name="shortcode_Width" type="text" value="' . esc_attr($settings['width']) . '" />');
 
-  // Width Unit
-  $selectHtml = '';
-  $selectHtml .= '<select id="shortcode_WidthUnit" name="shortcode_WidthUnit">';
-  $selectHtml .= '<option value="px"' . ($settings['widthUnit'] == 'px' ? ' selected="selected"' : '')  . '>px</option>';
-  $selectHtml .= '<option value="%"' . ($settings['widthUnit'] == '%' ? ' selected="selected"' : '')  . '>%</option>';
-  $selectHtml .= '<option value="vw"' . ($settings['widthUnit'] == 'vw' ? ' selected="selected"' : '')  . '>vw</option>';
-  $selectHtml .= '</select>';
+    // Width Unit
+    $selectHtml = '';
+    $selectHtml .= '<select id="shortcode_WidthUnit" name="shortcode_WidthUnit">';
+    $selectHtml .= '<option value="px"' . ($settings['widthUnit'] == 'px' ? ' selected="selected"' : '')  . '>px</option>';
+    $selectHtml .= '<option value="%"' . ($settings['widthUnit'] == '%' ? ' selected="selected"' : '')  . '>%</option>';
+    $selectHtml .= '<option value="vw"' . ($settings['widthUnit'] == 'vw' ? ' selected="selected"' : '')  . '>vw</option>';
+    $selectHtml .= '</select>';
 
-  $html .= $this->renderRow('<label for="shortcode_WidthUnit">Breedte in ...: </label>', $selectHtml);
+    $html .= $this->renderRow('<label for="shortcode_WidthUnit">Breedte in ...: </label>', $selectHtml);
 
-  // Width
-  $html .= $this->renderRow('<label for="shortcode_Width">Hoogte (Geheel getal): </label>', '<input id="shortcode_Height" name="shortcode_Height" type="text" value="' . esc_attr($settings['height']) . '" />');
+    // Width
+    $html .= $this->renderRow('<label for="shortcode_Width">Hoogte (Geheel getal): </label>', '<input id="shortcode_Height" name="shortcode_Height" type="text" value="' . esc_attr($settings['height']) . '" />');
 
-  // Height Unit
-  $selectHtml = '';
-  $selectHtml .= '<select id="shortcode_HeightUnit" name="shortcode_HeightUnit">';
-  $selectHtml .= '<option value="px"' . ($settings['heightUnit'] == 'px' ? ' selected="selected"' : '')  . '>px</option>';
-  $selectHtml .= '<option value="%"' . ($settings['heightUnit'] == '%' ? ' selected="selected"' : '')  . '>%</option>';
-  $selectHtml .= '<option value="vh"' . ($settings['heightUnit'] == 'vh' ? ' selected="selected"' : '')  . '>vh</option>';
-  $selectHtml .= '</select>';
+    // Height Unit
+    $selectHtml = '';
+    $selectHtml .= '<select id="shortcode_HeightUnit" name="shortcode_HeightUnit">';
+    $selectHtml .= '<option value="px"' . ($settings['heightUnit'] == 'px' ? ' selected="selected"' : '')  . '>px</option>';
+    $selectHtml .= '<option value="%"' . ($settings['heightUnit'] == '%' ? ' selected="selected"' : '')  . '>%</option>';
+    $selectHtml .= '<option value="vh"' . ($settings['heightUnit'] == 'vh' ? ' selected="selected"' : '')  . '>vh</option>';
+    $selectHtml .= '</select>';
 
-  $html .= $this->renderRow('<label for="shortcode_HeightUnit">Hoogte in ...: </label>', $selectHtml);
+    $html .= $this->renderRow('<label for="shortcode_HeightUnit">Hoogte in ...: </label>', $selectHtml);
 
-  $html .= '</tbody></table>';
+    $html .= '</tbody></table>';
 
-  echo $html;
+    echo $html;
 
-  echo '<br /><br />';
+    echo '<br /><br />';
 
-  // @todo: Rewrite shortcode js so no dojo is needed
-  $extraOnLoad = '
-              require(["dojo/ready", "yog/admin/Shortcode" ], function(ready) {
+    // @todo: Rewrite shortcode js so no dojo is needed
+    $extraOnLoad = '
+                require(["dojo/ready", "yog/admin/Shortcode" ], function(ready) {
 
-                  ready(function() {
+                    ready(function() {
 
-                    var yogAdminShortcode = new yog.admin.Shortcode(mapDynamic, marker);
+                      var yogAdminShortcode = new yog.admin.Shortcode(mapDynamic, marker);
 
-                  });
-              });';
+                    });
+                });';
 
-  $settings['width']      = 800;
-  $settings['widthUnit']  = 'px';
-  $settings['height']     = 480;
-  $settings['heightUnit'] = 'px';
+    $settings['width']      = 800;
+    $settings['widthUnit']  = 'px';
+    $settings['height']     = 480;
+    $settings['heightUnit'] = 'px';
 
-  if (!YogPlugin::isDojoLoaded())
-  {
-    YogPlugin::loadDojo(false);
-  }
+    if (!YogPlugin::isDojoLoaded())
+    {
+      YogPlugin::loadDojo(false);
+    }
 
-  echo $yogMapWidget->generate($settings, $extraOnLoad, true);
-?>
-</div>
+    echo $yogMapWidget->generate($settings, $extraOnLoad, true);
+  ?>
+  </div>
+  <?php
+}

yes-co-ores-wordpress-plugin/trunk/includes/pages/synchronisation.php

@@ -115 +115 @@
             </table>
 
-            <h3>Gekoppelde yes-co open accounts</h3>
+            <h3>Gekoppelde yes-co open accounts<?php echo (!empty($systemLinks) ? ' (' . count($systemLinks) . ')' : '');?></h3>
             <span id="yog-add-system-link-holder">
                 <b>Een koppeling toevoegen:</b><br>
@@ -126 +126 @@
                 if (!empty($systemLinks))
                 {
+          $numberOfSystemLinks = count($systemLinks);
+          
                     foreach ($systemLinks as $systemLink)
                     {
@@ -141 +143 @@
                                 if (isset($systemObjectCounts[$systemLink->getCollectionUuid()]))
                                   echo '<b>Aantal objecten:</b> <a href="' . esc_url(get_site_url()) . '?s=&object=all&amp;collection=' . esc_attr($systemLink->getCollectionUuid()) . '" target="_blank">' . esc_html($systemObjectCounts[$systemLink->getCollectionUuid()]) . '</a><br />';
+                else if ($numberOfSystemLinks >= 10)
+                  echo '<a href="' . esc_url(get_site_url()) . '?s=&object=all&amp;collection=' . esc_attr($systemLink->getCollectionUuid()) . '" target="_blank">Bekijk objecten</a><br />';
 
                                 echo '<a href="#TB_inline?width=600&height=250&inlineId=' . $systemLinkId . '-delete-screen" class="thickbox" title="Koppeling verwijderen">Koppeling verwijderen</a>';

yes-co-ores-wordpress-plugin/trunk/includes/widgets/yog_map_widget.php

@@ -307 +307 @@
     if (!empty($settings['latitude']) && !empty($settings['longitude']) && !empty($settings['postTypes']))
     {
+      $yogMapType       = get_option('yog_map_type', 'google-maps');
       $googleMapsApiKey = get_option('yog_google_maps_api_key');
       $postTypes        = $settings['postTypes'];
-      $mapType          = esc_attr($settings['mapType']);
+      $googleMapsType   = esc_attr($settings['mapType']);
       $latitude         = esc_attr($settings['latitude']);
       $longitude        = esc_attr($settings['longitude']);
@@ -320 +321 @@
       $initFunctionName = 'yogInitMapDynamic';
 
-      if (!empty($googleMapsApiKey) && in_array($mapType, array('roadmap', 'satellite', 'hybrid', 'terrain')))
+      if (!empty($googleMapsApiKey) && $yogMapType === 'google-maps' && in_array($googleMapsType, array('roadmap', 'satellite', 'hybrid', 'terrain')))
       {
         if ($adminMode === false)
@@ -338 +339 @@
 
         // Create Inline script
-        $inlineScript .= 'var mapDynamic;';
+        $inlineScript = 'var mapDynamic;';
         $inlineScript .= 'function ' . $initFunctionName . '() {';
           $inlineScript .= 'var positionDynamic = { lat: ' . $latitude . ', lng: ' . $longitude . '};';
@@ -344 +345 @@
             $inlineScript .= 'center: positionDynamic,';
             $inlineScript .= 'zoom: ' . $zoomLevel . ',';
-            $inlineScript .= 'mapTypeId: \'' . $mapType . '\',';
+            $inlineScript .= 'mapTypeId: \'' . $googleMapsType . '\',';
             // Hide POI's
             $inlineScript .= 'styles: [';

yes-co-ores-wordpress-plugin/trunk/includes/widgets/yog_recent_objects_widget.php

@@ -344 +344 @@
             if (!empty($new_instance['post_type_' . YOG_POST_TYPE_NBTY]))
                 $postTypes[]          = YOG_POST_TYPE_NBTY;
+            if (!empty($new_instance['post_type_' . YOG_POST_TYPE_BOPR]))
+                $postTypes[]          = YOG_POST_TYPE_BOPR;
 
             // Set limit
@@ -380 +382 @@
         $groupByCategoryOptions = empty($instance['group_by_category_options']) ? array() : $instance['group_by_category_options'];
 
-    $supportedPostTypes = array(YOG_POST_TYPE_WONEN => 'Wonen', YOG_POST_TYPE_BOG => 'BOG', YOG_POST_TYPE_NBPR => 'Nieuwbouw projecten', YOG_POST_TYPE_NBTY => 'Nieuwbouw types');
+    $supportedPostTypes = array(YOG_POST_TYPE_WONEN => 'Wonen', YOG_POST_TYPE_BOG => 'BOG', YOG_POST_TYPE_NBPR => 'Nieuwbouw projecten', YOG_POST_TYPE_NBTY => 'Nieuwbouw types', YOG_POST_TYPE_BOPR => 'BOG projecten');
 
         echo '<div class="yog-recent-objects-widget-admin">';

yes-co-ores-wordpress-plugin/trunk/includes/yog_public_functions.php

@@ -16 +16 @@
     $postType = get_post_type((int) $postId);
 
-    return in_array($postType, array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY));
+    return in_array($postType, array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_BOPR));
   }
 
@@ -53 +53 @@
     $values         = array();
 
-    if (!empty($postType) && in_array($postType, array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_RELATION)))
+    if (!empty($postType) && in_array($postType, array(YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG, YOG_POST_TYPE_BOPR, YOG_POST_TYPE_NBPR, YOG_POST_TYPE_NBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_BBPR, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_RELATION)))
     {
       $fieldsSettings = YogFieldsSettingsAbstract::create($postType);
@@ -309 +309 @@
       case YOG_POST_TYPE_BBPR:
       case YOG_POST_TYPE_BBTY:
+      case YOG_POST_TYPE_BOPR:
         $priceMinMaxTypes = array('KoopPrijs' => 'Koopprijs', 'HuurPrijs' => 'Huurprijs');
         break;
@@ -472 +473 @@
                               'offset'          => 0,
                               'post_parent'     => (int) $postId,
-                              'post_type'       => array(YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_WONEN),
+                              'post_type'       => array(YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG),
                               'post_status'     => array('publish')));
 
@@ -494 +495 @@
                             'order'           => 'ASC',
                             'post_parent'     => (int) $postId,
-                            'post_type'       => array(YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_WONEN),
+                            'post_type'       => array(YOG_POST_TYPE_NBTY, YOG_POST_TYPE_BBTY, YOG_POST_TYPE_NBBN, YOG_POST_TYPE_WONEN, YOG_POST_TYPE_BOG),
                             'post_status'     => array('publish')));
   }
@@ -1339 +1340 @@
       YOG_POST_TYPE_BBPR,
       YOG_POST_TYPE_BBTY,
+      YOG_POST_TYPE_BOPR,
       YOG_POST_TYPE_RELATION
     );
@@ -1360 +1362 @@
       YOG_POST_TYPE_NBBN,
       YOG_POST_TYPE_BBPR,
-      YOG_POST_TYPE_BBTY
+      YOG_POST_TYPE_BBTY,
+      YOG_POST_TYPE_BOPR
     );
 

yes-co-ores-wordpress-plugin/trunk/package.json

@@ -1 +1 @@
 {
     "name": "yesco-ores",
-    "version": "1.3.74",
+    "version": "1.3.75",
     "devDependencies": {
         "grunt": "~1.0.3",

yes-co-ores-wordpress-plugin/trunk/readme.txt

@@ -3 +3 @@
 Tags: yes-co, yesco, projecten, project, projects, huizen, huis, house, onroerend goed, real estate, makelaar, realtor, broker
 Requires at least: 3.1
-Tested up to: 5.6.2
-Stable tag: 1.3.74
+Tested up to: 5.7.2
+Stable tag: 1.3.75
 
 Directly post real estate objects from your Yes-co system to your wordpress blog with the Yes-co Open Real Estate System (Yes-co ORES) Plugin.
@@ -90 +90 @@
 
 == Changelog ==
+= 1.3.75 =
+* Added: support for BOG projects
 = 1.3.74 =
 * Added: support for BOG energy label

yes-co-ores-wordpress-plugin/trunk/yesco-og.php

@@ -5 +5 @@
   Text Domain: yes-co-ores-wordpress-plugin
   Description: Publiceert uw onroerend goed op uw Wordpress Blog
-  Version: 1.3.74
+  Version: 1.3.75
   Author: Yes-co
   Author URI: https://www.yes-co.nl
@@ -24 +24 @@
   // Include files
   require_once(YOG_PLUGIN_DIR . '/includes/config/config.php');
+  require_once(YOG_PLUGIN_DIR . '/includes/yog_rest_api.php');
 
   // Determine action