Changeset 2243950

Timestamp:

02/13/2020 03:02:02 PM (6 years ago)

Author:

kees-brandenburg

Message:

• Added: synchronisation for extra BOG fields (Praktijkruimte/Leisure/Maatschappelijk vastgoed/Garagebox/Verhard buitenterrein)
• Changed: removed support for 3mcp versions 1.5 and 1.4 (only supporting 3mcp 1.6)

Location:

yes-co-ores-wordpress-plugin/trunk

Files:

• inc/js/admin_object.js (modified) (1 diff)
• inc/js/admin_object.min.js (modified) (1 diff)
• includes/classes/yog_fields_settings.php (modified) (2 diffs)
• includes/classes/yog_project_bog_translation.php (modified) (19 diffs)
• includes/config/config.php (modified) (2 diffs)
• package.json (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• yesco-og.php (modified) (1 diff)

yes-co-ores-wordpress-plugin/trunk/inc/js/admin_object.js

@@ -284 +284 @@
       horecaVisible         = true;
       break;
+        case 'Garagebox':
+            gebouwVisible         = true;
+            break;
+        case 'Leisure':
+            gebouwVisible         = true;
+            break;
+        case 'Maatschappelijk vastgoed':
+            gebouwVisible         = true;
+            break;
+        case 'Praktijkruimte':
+            gebouwVisible         = true;
+            break;
   }
 

yes-co-ores-wordpress-plugin/trunk/inc/js/admin_object.min.js

@@ -1 @@
-function yogRemoveVideo(uuid){var nonceField=jQuery("input[name=yog-video-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#video-"+uuid+" td:last-child").addClass("loading"),jQuery("#video-"+uuid+" td .button-primary").remove();var postId=jQuery("#post_ID").val();jQuery.post(ajaxurl,{action:"removevideo",uuid:uuid,post:postId,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(uuid){""!==uuid&&(jQuery("#video-"+uuid).fadeOut(),jQuery("#video-"+uuid).remove(),0==jQuery("#yog-video-tabel tbody tr").length&&jQuery("#yog-videos-overview").addClass("hide"))})}}function yogRemoveDocument(uuid){var nonceField=jQuery("input[name=yog-document-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#document-"+uuid+" td:last-child").addClass("loading"),jQuery("#document-"+uuid+" td .button-primary").remove();var postId=jQuery("#post_ID").val();jQuery.post(ajaxurl,{action:"removedocument",uuid:uuid,post:postId,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(uuid){""!==uuid&&(jQuery("#document-"+uuid).fadeOut(),jQuery("#document-"+uuid).remove(),0==jQuery("#yog-documents-table tbody tr").length&&jQuery("#yog-documents-overview").addClass("hide"))})}}function yogRemoveLink(uuid){var nonceField=jQuery("input[name=yog-link-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#link-"+uuid+" td:last-child").addClass("loading"),jQuery("#link-"+uuid+" td .button-primary").remove();var postId=jQuery("#post_ID").val();jQuery.post(ajaxurl,{action:"removelink",uuid:uuid,post:postId,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(uuid){""!==uuid&&(jQuery("#link-"+uuid).fadeOut(),jQuery("#link-"+uuid).remove(),0==jQuery("#yog-links-table tbody tr").length&&jQuery("#yog-links-overview").addClass("hide"))})}}function yogToggleMetaContainers(objectType){var bouwgrondVisible=!1,gebouwVisible=!1,bedrijfsruimteVisible=!1,kantoorruimteVisible=!1,winkelruimteVisible=!1,horecaVisible=!1;switch(objectType){case"Bouwgrond":bouwgrondVisible=!0;break;case"Bedrijfsruimte":bedrijfsruimteVisible=gebouwVisible=!0;break;case"Kantoorruimte":kantoorruimteVisible=gebouwVisible=!0;break;case"Winkelruimte":winkelruimteVisible=gebouwVisible=!0;break;case"Horeca":horecaVisible=gebouwVisible=!0}bouwgrondVisible?jQuery("#yog-bouwgrond-meta").show():jQuery("#yog-bouwgrond-meta").hide(),gebouwVisible?jQuery("#yog-gebouw-meta").show():jQuery("#yog-gebouw-meta").hide(),bedrijfsruimteVisible?jQuery("#yog-bedrijfsruimte-meta").show():jQuery("#yog-bedrijfsruimte-meta").hide(),kantoorruimteVisible?jQuery("#yog-kantoorruimte-meta").show():jQuery("#yog-kantoorruimte-meta").hide(),winkelruimteVisible?jQuery("#yog-winkelruimte-meta").show():jQuery("#yog-winkelruimte-meta").hide(),horecaVisible?jQuery("#yog-horeca-meta").show():jQuery("#yog-horeca-meta").hide()}jQuery(document).ready(function($){jQuery("#yog-add-video").click(function(){var nonceField=jQuery("input[name=yog-video-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#yog-video-form").addClass("loading");var postId=jQuery("#post_ID").val(),videoType=jQuery("#video_type").val(),videoTitle=jQuery("#video_titel").val(),videoUrl=jQuery("#video_url").val();jQuery.post(ajaxurl,{action:"addvideo",post:postId,titel:videoTitle,type:videoType,url:videoUrl,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(videoUuid){""!==videoUuid&&(videoUrl=videoUrl.replace("http://",""),jQuery("#yog-video-tabel tbody").append('<tr id="video-'+videoUuid+'"><td><a href="http://'+videoUrl+'" target="_blank">'+videoTitle+'</a></td><td class="actions"><input type="button" class="button-primary" onclick="yogRemoveVideo(\''+videoUuid+'\');" value="Verwijderen" /></td></tr>'),jQuery("#video_titel").val(""),jQuery("#video_url").val(""),jQuery("#yog-videos-overview").removeClass("hide"),jQuery("#yog-video-form").removeClass("loading"))})}}),jQuery("#yog-add-document").click(function(){var nonceField=jQuery("input[name=yog-document-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#yog-document-form").addClass("loading");var postId=jQuery("#post_ID").val(),documentType=jQuery("#document_type").val(),documentTitel=jQuery("#document_titel").val(),documentUrl=jQuery("#document_url").val();jQuery.post(ajaxurl,{action:"adddocument",post:postId,titel:documentTitel,type:documentType,url:documentUrl,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(documentUuid){""!==documentUuid&&(jQuery("#yog-documents-table tbody").append('<tr id="document-'+documentUuid+'"><td><a href="http://'+documentUrl+'" class="'+documentType+'">'+documentTitel+'</a></td><td class="actions"><input type="button" class="button-primary" onclick="yogRemoveDocument(\''+documentUuid+'\');" value="Verwijderen" /></td></tr>'),jQuery("#document_titel").val(""),jQuery("#document_type").val(""),jQuery("#document_url").val(""),jQuery("#yog-documents-overview").removeClass("hide"),jQuery("#yog-document-form").removeClass("loading"))})}}),jQuery("#yog-add-link").click(function(){var nonceField=jQuery("input[name=yog-link-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#yog-link-form").addClass("loading");var postId=jQuery("#post_ID").val(),linkType=jQuery("#link_type").val(),linkTitle=jQuery("#link_titel").val(),linkUrl=jQuery("#link_url").val();jQuery.post(ajaxurl,{action:"addlink",post:postId,titel:linkTitle,type:linkType,url:linkUrl,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(linkUuid){""!==linkUuid&&(jQuery("#yog-links-table tbody").append('<tr id="link-'+linkUuid+'"><td><a href="http://'+linkUrl+'" class="'+linkType+'">'+linkTitle+'</a></td><td class="actions"><input type="button" class="button-primary" onclick="yogRemoveLink(\''+linkUuid+'\');" value="Verwijderen" /></td></tr>'),jQuery("#link_type").val(""),jQuery("#link_titel").val(""),jQuery("#link_url").val(""),jQuery("#yog-links-overview").removeClass("hide"),jQuery("#yog-link-form").removeClass("loading"))})}}),jQuery("select#yog-bedrijf_Type").change(function(event){yogToggleMetaContainers(event.currentTarget.value)}),jQuery("select#yog-bedrijf_Type").ready(function(event){yogToggleMetaContainers(jQuery("select#yog-bedrijf_Type").val())}),jQuery("input[type=date].yog-date").each(function(){if("date"!=this.type){var elem=jQuery(this);elem.datepicker({dateFormat:"dd-mm-yy"}),this.min&&elem.datepicker("option","minDate",this.min),this.max&&elem.datepicker("option","maxDate",this.max);var value=elem.val();if(-1!==value.indexOf("-")){var parts=value.split("-");3===parts.length&&4===parts[0].length&&elem.val(parts[2]+"-"+parts[1]+"-"+parts[0])}}}),jQuery("input[type=time].yog-time").each(function(){"time"!=this.type&&jQuery(this).change(function(event){var elem=event.currentTarget;elem.value.match(/^(?:0?\d|1[0-9]|2[0123]):([0-5]{0,1}[0-9]{1})$/)?jQuery(elem).removeClass("error"):jQuery(elem).addClass("error")})})});
+function yogRemoveVideo(uuid){var nonceField=jQuery("input[name=yog-video-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#video-"+uuid+" td:last-child").addClass("loading"),jQuery("#video-"+uuid+" td .button-primary").remove();var postId=jQuery("#post_ID").val();jQuery.post(ajaxurl,{action:"removevideo",uuid:uuid,post:postId,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(uuid){""!==uuid&&(jQuery("#video-"+uuid).fadeOut(),jQuery("#video-"+uuid).remove(),0==jQuery("#yog-video-tabel tbody tr").length&&jQuery("#yog-videos-overview").addClass("hide"))})}}function yogRemoveDocument(uuid){var nonceField=jQuery("input[name=yog-document-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#document-"+uuid+" td:last-child").addClass("loading"),jQuery("#document-"+uuid+" td .button-primary").remove();var postId=jQuery("#post_ID").val();jQuery.post(ajaxurl,{action:"removedocument",uuid:uuid,post:postId,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(uuid){""!==uuid&&(jQuery("#document-"+uuid).fadeOut(),jQuery("#document-"+uuid).remove(),0==jQuery("#yog-documents-table tbody tr").length&&jQuery("#yog-documents-overview").addClass("hide"))})}}function yogRemoveLink(uuid){var nonceField=jQuery("input[name=yog-link-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#link-"+uuid+" td:last-child").addClass("loading"),jQuery("#link-"+uuid+" td .button-primary").remove();var postId=jQuery("#post_ID").val();jQuery.post(ajaxurl,{action:"removelink",uuid:uuid,post:postId,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(uuid){""!==uuid&&(jQuery("#link-"+uuid).fadeOut(),jQuery("#link-"+uuid).remove(),0==jQuery("#yog-links-table tbody tr").length&&jQuery("#yog-links-overview").addClass("hide"))})}}function yogToggleMetaContainers(objectType){var bouwgrondVisible=!1,gebouwVisible=!1,bedrijfsruimteVisible=!1,kantoorruimteVisible=!1,winkelruimteVisible=!1,horecaVisible=!1;switch(objectType){case"Bouwgrond":bouwgrondVisible=!0;break;case"Bedrijfsruimte":bedrijfsruimteVisible=gebouwVisible=!0;break;case"Kantoorruimte":kantoorruimteVisible=gebouwVisible=!0;break;case"Winkelruimte":winkelruimteVisible=gebouwVisible=!0;break;case"Horeca":horecaVisible=gebouwVisible=!0;break;case"Garagebox":case"Leisure":case"Maatschappelijk vastgoed":case"Praktijkruimte":gebouwVisible=!0}bouwgrondVisible?jQuery("#yog-bouwgrond-meta").show():jQuery("#yog-bouwgrond-meta").hide(),gebouwVisible?jQuery("#yog-gebouw-meta").show():jQuery("#yog-gebouw-meta").hide(),bedrijfsruimteVisible?jQuery("#yog-bedrijfsruimte-meta").show():jQuery("#yog-bedrijfsruimte-meta").hide(),kantoorruimteVisible?jQuery("#yog-kantoorruimte-meta").show():jQuery("#yog-kantoorruimte-meta").hide(),winkelruimteVisible?jQuery("#yog-winkelruimte-meta").show():jQuery("#yog-winkelruimte-meta").hide(),horecaVisible?jQuery("#yog-horeca-meta").show():jQuery("#yog-horeca-meta").hide()}jQuery(document).ready(function($){jQuery("#yog-add-video").click(function(){var nonceField=jQuery("input[name=yog-video-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#yog-video-form").addClass("loading");var postId=jQuery("#post_ID").val(),videoType=jQuery("#video_type").val(),videoTitle=jQuery("#video_titel").val(),videoUrl=jQuery("#video_url").val();jQuery.post(ajaxurl,{action:"addvideo",post:postId,titel:videoTitle,type:videoType,url:videoUrl,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(videoUuid){""!==videoUuid&&(videoUrl=videoUrl.replace("http://",""),jQuery("#yog-video-tabel tbody").append('<tr id="video-'+videoUuid+'"><td><a href="http://'+videoUrl+'" target="_blank">'+videoTitle+'</a></td><td class="actions"><input type="button" class="button-primary" onclick="yogRemoveVideo(\''+videoUuid+'\');" value="Verwijderen" /></td></tr>'),jQuery("#video_titel").val(""),jQuery("#video_url").val(""),jQuery("#yog-videos-overview").removeClass("hide"),jQuery("#yog-video-form").removeClass("loading"))})}}),jQuery("#yog-add-document").click(function(){var nonceField=jQuery("input[name=yog-document-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#yog-document-form").addClass("loading");var postId=jQuery("#post_ID").val(),documentType=jQuery("#document_type").val(),documentTitel=jQuery("#document_titel").val(),documentUrl=jQuery("#document_url").val();jQuery.post(ajaxurl,{action:"adddocument",post:postId,titel:documentTitel,type:documentType,url:documentUrl,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(documentUuid){""!==documentUuid&&(jQuery("#yog-documents-table tbody").append('<tr id="document-'+documentUuid+'"><td><a href="http://'+documentUrl+'" class="'+documentType+'">'+documentTitel+'</a></td><td class="actions"><input type="button" class="button-primary" onclick="yogRemoveDocument(\''+documentUuid+'\');" value="Verwijderen" /></td></tr>'),jQuery("#document_titel").val(""),jQuery("#document_type").val(""),jQuery("#document_url").val(""),jQuery("#yog-documents-overview").removeClass("hide"),jQuery("#yog-document-form").removeClass("loading"))})}}),jQuery("#yog-add-link").click(function(){var nonceField=jQuery("input[name=yog-link-nonce]");if(nonceField&&1===nonceField.length&&""!==nonceField.val()){jQuery("#yog-link-form").addClass("loading");var postId=jQuery("#post_ID").val(),linkType=jQuery("#link_type").val(),linkTitle=jQuery("#link_titel").val(),linkUrl=jQuery("#link_url").val();jQuery.post(ajaxurl,{action:"addlink",post:postId,titel:linkTitle,type:linkType,url:linkUrl,cookie:encodeURIComponent(document.cookie),_wpnonce:nonceField.val()},function(linkUuid){""!==linkUuid&&(jQuery("#yog-links-table tbody").append('<tr id="link-'+linkUuid+'"><td><a href="http://'+linkUrl+'" class="'+linkType+'">'+linkTitle+'</a></td><td class="actions"><input type="button" class="button-primary" onclick="yogRemoveLink(\''+linkUuid+'\');" value="Verwijderen" /></td></tr>'),jQuery("#link_type").val(""),jQuery("#link_titel").val(""),jQuery("#link_url").val(""),jQuery("#yog-links-overview").removeClass("hide"),jQuery("#yog-link-form").removeClass("loading"))})}}),jQuery("select#yog-bedrijf_Type").change(function(event){yogToggleMetaContainers(event.currentTarget.value)}),jQuery("select#yog-bedrijf_Type").ready(function(event){yogToggleMetaContainers(jQuery("select#yog-bedrijf_Type").val())}),jQuery("input[type=date].yog-date").each(function(){if("date"!=this.type){var elem=jQuery(this);elem.datepicker({dateFormat:"dd-mm-yy"}),this.min&&elem.datepicker("option","minDate",this.min),this.max&&elem.datepicker("option","maxDate",this.max);var value=elem.val();if(-1!==value.indexOf("-")){var parts=value.split("-");3===parts.length&&4===parts[0].length&&elem.val(parts[2]+"-"+parts[1]+"-"+parts[0])}}}),jQuery("input[type=time].yog-time").each(function(){"time"!=this.type&&jQuery(this).change(function(event){var elem=event.currentTarget;elem.value.match(/^(?:0?\d|1[0-9]|2[0123]):([0-5]{0,1}[0-9]{1})$/)?jQuery(elem).removeClass("error"):jQuery(elem).addClass("error")})})});

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

@@ -265 +265 @@
         'bedrijf_Huuropbrengst'                             => array( 'type'      => 'priceBtw'),
         'bedrijf_Type'                                      => array( 'type'      => 'select',
-                                                                      'options'   => array('Bedrijfsruimte', 'Bouwgrond', 'Horeca', 'Kantoorruimte', 'Winkelruimte'),
+                                                                      'options'   => array('Bedrijfsruimte', 'Bouwgrond', 'Horeca', 'Kantoorruimte', 'Winkelruimte', 'Garagebox', 'Leisure', 'Maatschappelijk vastgoed', 'Praktijkruimte', 'Verhard buitenterrein'),
                                                                       'search'    => 'exact'),
         'bedrijf_Oppervlakte'                               => array( 'type'    => 'oppervlakte',
@@ -465 +465 @@
         'bedrijf_HorecaPrijsInventarisGoodwill'             => array( 'title'     => 'Prijs inventaris & goodwill',
                                                                       'type'      => 'priceBtw',
-                                                                      'object'    => array('Horeca'))
+                                                                      'object'    => array('Horeca')),
+                'bedrijf_PraktijkruimteOppervlakte'                                 => array( 'title'           => 'Oppervlakte',
+                                                                                                                                            'type'          => 'oppervlakte',
+                                                                                                                                            'object'        => array('Praktijkruimte')),
+                'bedrijf_PraktijkruimteInUnitsVanaf'                                => array( 'title'           => 'In units vanaf',
+                                                                                                                                            'type'          => 'oppervlakte',
+                                                                                                                                            'object'        => array('Praktijkruimte')),
+                'bedrijf_GarageboxOppervlakte'                                          => array( 'title'           => 'Oppervlakte',
+                                                                                                                                            'type'          => 'oppervlakte',
+                                                                                                                                            'object'        => array('Garagebox')),
+                'bedrijf_GarageboxInUnitsVanaf'                                         => array( 'title'           => 'In units vanaf',
+                                                                                                                                            'type'          => 'oppervlakte',
+                                                                                                                                            'object'        => array('Garagebox')),
+                'bedrijf_LeisureOppervlakte'                                                => array( 'title'           => 'Oppervlakte',
+                                                                                                                                            'type'          => 'oppervlakte',
+                                                                                                                                            'object'        => array('Leisure'))
       );
     }

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

@@ -89 +89 @@
                     break;
       }
-            
+
             // Determine a rental price to do calculations with (rental price calculated to a price per year)
             if (!empty($data['HuurPrijs']))
@@ -110 +110 @@
                 }
             }
-            
+
             // Determine a rental min/max price to do calculations with (rental price calculated to a price per year)
             if (!empty($data['HuurPrijsMin']) || !empty($data['HuurPrijsMax']))
@@ -119 +119 @@
                         if (!empty($data['HuurPrijsMin']))
                             $data['HuurPrijsMinPerJaar'] = $data['HuurPrijsMin'] * 12;
-                        
+
                         if (!empty($data['HuurPrijsMax']))
                             $data['HuurPrijsMaxPerJaar'] = $data['HuurPrijsMax'] * 12;
@@ -137 +137 @@
                             if (!empty($data['HuurPrijsMin']))
                                 $data['HuurPrijsMinPerJaar'] = $data['HuurPrijsMin'];
-                            
+
                             if (!empty($data['HuurPrijsMax']))
                                 $data['HuurPrijsMaxPerJaar'] = $data['HuurPrijsMax'];
@@ -170 +170 @@
       if (!empty($price))
         return $price;
-            
+
             $price = $this->mcp3Project->getStringByPath('//project:Details/project:Huur/project:PrijsVan');
       if (!empty($price))
         return $price;
-            
+
             $price = $this->mcp3Project->getStringByPath('//project:Details/project:Huur/project:PrijsTot');
       if (!empty($price))
         return $price;
-            
+
       return 0;
     }
@@ -347 +347 @@
         $address                                        = $this->mcp3Project->getAddress();
                 $addition                                       = $address->getHouseNumberAddition();
-                
+
         $data['Huisnummer']                 = $address->getHouseNumber() . $addition;
                 $data['HuisnummerNumeriek'] = $address->getHouseNumber();
-                
+
                 if (!empty($addition))
                     $data['HuisnummerToevoeging'] = $addition;
@@ -422 +422 @@
         {
       $data = array(
-        'GarageboxOppervlakte'              => $this->mcp3Project->getIntByPath('//project:Details/project:Garagebox/project:Oppervlakte'),
-        'Oppervlakte'                                   => $this->mcp3Project->getIntByPath('//project:Details/project:Garagebox/project:Oppervlakte'),
-        'GarageboxInUnitsVanaf'             => $this->mcp3Project->getIntByPath('//project:Details/project:Garagebox/project:InUnitsVanaf'),
-                'GarageboxVerdiepingenAantal'   => $this->mcp3Project->getIntByPath('//project:Details/project:Garagebox/project:Verdiepingen/project:Aantal')
+        'GarageboxOppervlakte'              => $this->mcp3Project->getIntByPath('//project:Details/project:Gebouw/project:Garagebox/project:Oppervlakte'),
+        'Oppervlakte'                                   => $this->mcp3Project->getIntByPath('//project:Details/project:Gebouw/project:Garagebox/project:Oppervlakte'),
+        'GarageboxInUnitsVanaf'             => $this->mcp3Project->getIntByPath('//project:Details/project:Gebouw/project:Garagebox/project:InUnitsVanaf'),
+                'GarageboxVerdiepingenAantal'   => $this->mcp3Project->getIntByPath('//project:Details/project:Gebouw/project:Garagebox/project:Verdiepingen/project:Aantal')
       );
 
@@ -445 +445 @@
 
             // Camping
-            if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Leisure/project:Camping'))
+            if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:Leisure/project:Camping'))
             {
                 $data['LeisureType']                                = 'Camping';
@@ -453 +453 @@
             }
             // Bungalowpark
-            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Leisure/project:Bungalowpark'))
+            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:Leisure/project:Bungalowpark'))
             {
                 $data['LeisureType']                                = 'Bungalowpark';
@@ -460 +460 @@
             }
             // Dagrecreatie
-            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Leisure/project:Dagrecreatie'))
+            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:Leisure/project:Dagrecreatie'))
             {
                 $data['LeisureType']                                    = 'Dagrecreatie';
@@ -467 +467 @@
             }
             // Wellness
-            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Leisure/project:Wellness'))
+            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:Leisure/project:Wellness'))
             {
                 $data['LeisureType']                                    = 'Wellness';
@@ -476 +476 @@
             }
             // Overige
-            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Leisure/project:Overige'))
+            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:Leisure/project:Overige'))
             {
                 $data['LeisureType']                                    = 'Overige';
@@ -501 +501 @@
 
             // Zorg instelling
-            if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:MaatschappelijkVastgoed/project:ZorgInstelling'))
+            if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:MaatschappelijkVastgoed/project:ZorgInstelling'))
             {
                 $data['MaatschappelijkVastgoedType']                                        = 'Zorg instelling';
@@ -512 +512 @@
             }
             // Sport instelling
-            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:MaatschappelijkVastgoed/project:SportInstelling'))
+            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:MaatschappelijkVastgoed/project:SportInstelling'))
             {
                 $data['MaatschappelijkVastgoedType']                                        = 'Sport instelling';
@@ -518 +518 @@
             }
             // Culturele instelling
-            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:MaatschappelijkVastgoed/project:CultureleInstelling'))
+            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:MaatschappelijkVastgoed/project:CultureleInstelling'))
             {
                 $data['MaatschappelijkVastgoedType']                                        = 'Culturele instelling';
@@ -524 +524 @@
             }
             // Religieuze instelling
-            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:MaatschappelijkVastgoed/project:ReligieuzeInstelling'))
+            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:MaatschappelijkVastgoed/project:ReligieuzeInstelling'))
             {
                 $data['MaatschappelijkVastgoedType']                                        = 'Religieuze instelling';
@@ -530 +530 @@
             }
             // Onderwijs instelling
-            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:MaatschappelijkVastgoed/project:OnderwijsInstelling'))
+            else if ($this->mcp3Project->hasNodeByXpath('//project:Details/project:Gebouw/project:MaatschappelijkVastgoed/project:OnderwijsInstelling'))
             {
                 $data['MaatschappelijkVastgoedType']                                        = 'Onderwijs instelling';
@@ -551 +551 @@
         {
       $data = array(
-        'PraktijkruimteOppervlakte'                 => $this->mcp3Project->getIntByPath('//project:Details/project:Praktijkruimte/project:Oppervlakte'),
-        'Oppervlakte'                                               => $this->mcp3Project->getIntByPath('//project:Details/project:Praktijkruimte/project:Oppervlakte'),
-        'PraktijkruimteInUnitsVanaf'                => $this->mcp3Project->getIntByPath('//project:Details/project:Praktijkruimte/project:InUnitsVanaf'),
-                'PraktijkruimteVerdiepingenAantal'  => $this->mcp3Project->getIntByPath('//project:Details/project:Praktijkruimte/project:Verdiepingen/project:Aantal')
+        'PraktijkruimteOppervlakte'                 => $this->mcp3Project->getIntByPath('//project:Details/project:Gebouw/project:Praktijkruimte/project:Oppervlakte'),
+        'Oppervlakte'                                               => $this->mcp3Project->getIntByPath('//project:Details/project:Gebouw/project:Praktijkruimte/project:Oppervlakte'),
+        'PraktijkruimteInUnitsVanaf'                => $this->mcp3Project->getIntByPath('//project:Details/project:Gebouw/project:Praktijkruimte/project:InUnitsVanaf'),
+                'PraktijkruimteVerdiepingenAantal'  => $this->mcp3Project->getIntByPath('//project:Details/project:Gebouw/project:Praktijkruimte/project:Verdiepingen/project:Aantal')
       );
 
@@ -589 +589 @@
             $bedrijfshalOppervlakte = $this->mcp3Project->getIntByPath('//project:Gebouw/project:Bedrijfsruimte/project:Bedrijfshal/project:Oppervlakte');
             $kantoorOppervlakte         = $this->mcp3Project->getIntByPath('//project:Gebouw/project:Bedrijfsruimte/project:Kantoorruimte/project:Oppervlakte');
-            
+
             $totaleOppervlakte          = 0;
-            
+
             if (!empty($bedrijfshalOppervlakte))
                 $totaleOppervlakte += (int) $bedrijfshalOppervlakte;
-            
+
             if (!empty($kantoorOppervlakte))
                 $totaleOppervlakte += (int) $kantoorOppervlakte;
-            
+
       $data = array(
         'BedrijfshalOppervlakte'          => $bedrijfshalOppervlakte,

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

@@ -1 +1 @@
 <?php
-  define('YOG_MCP3_VERSIONS',       '1.6;1.5;1.4');
+  define('YOG_MCP3_VERSIONS',       '1.6');
   define('YOG_MCP3_FEED_URL',       'https://webservice.yes-co.com/3mcp/collection/%s/%s/feed/%s.xml');
 
@@ -21 +21 @@
   define('YOG_POST_TYPE_ATTACHMENT',    'attachment');
 
-  define('YOG_PLUGIN_VERSION',      '1.3.62');
+  define('YOG_PLUGIN_VERSION',      '1.3.63');
   define('YOG_PLUGIN_DOJO_VERSION', '1.12.2'); // Old 1.9.3
 ?>

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

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

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

@@ -4 +4 @@
 Requires at least: 3.1
 Tested up to: 5.2.4
-Stable tag: 1.3.62
+Stable tag: 1.3.63
 
 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.
@@ -88 +88 @@
 
 == Changelog ==
+= 1.3.63 =
+* Added: synchronisation for extra BOG fields (Praktijkruimte/Leisure/Maatschappelijk vastgoed/Garagebox/Verhard buitenterrein)
+* Changed: removed support for 3mcp versions 1.5 and 1.4 (only supporting 3mcp 1.6)
 = 1.3.62 =
 * Added: option to set sortorder to relations

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.62
+  Version: 1.3.63
   Author: Yes-co
   Author URI: https://www.yes-co.nl