Merge pull request #72 in WP/wp-listings from release/2.3.1 to master

* commit '28c7ea08ac23e46a57ea1fcbe2f4adca0832242a':
  update version and readme add acres as available field
  Updated to font awesome to latest version and added a version suffix to the css handle
  Prefixed font-awesome css handle to avoid name collisions
  use propStatus for sold listings instead of archiveStatus
  change append param to false
  add delay to masonry layout

Author: Dave Bonds

README.md

@@ -7,11 +7,13 @@
 
 **Tags:** real estate, listings, property, properties, listing search, idx, idx broker, mls, agentpress
 
-**Requires at least:** 3.7
+**Requires at least:** 4.0
 
-**Tested up to:** 4.7.5
+**Tested up to:** 4.9.4
 
-**Stable tag:** 2.3.0
+**Stable tag:** 2.3.1
+
+**Requires PHP:** 5.4
 
 **License:** GPLv2 or later
 
@@ -192,6 +194,14 @@ function custom_default_property_type_terms() {
 
 ## Changelog ##
 
+### 2.3.1 ###
+*Released 03-25-17*
+* Fix: Change font awesome handle to prevent collision with other loaded versions
+* Fix: Change sold listings to use propStatus instead of archiveStatus
+* Fix: Change listing importer to not append to status taxonomy when updating, only replace
+* Fix: Added delay to masonry script on listing importer page to allow everything to load before initializing
+* Fix: Added acres field in lieu of lot sq ft. Listing importer now respects this field.
+
 ### 2.3.0 ### 
 *Released 05-25-17*
 * Feature: Added option to set title/permalink for imported listings

includes/class-listing-import.php

@@ -295,25 +295,22 @@ public static function wp_listings_idx_insert_post_meta($id, $idx_featured_listi
 			update_post_meta($id, '_listing_gallery', apply_filters('wp_listings_imported_gallery', $imgs));
 		}
 
-		if($sold == true) {
-			$propstatus = ucfirst($idx_featured_listing_data['archiveStatus']);
+		if ( $idx_featured_listing_data['propStatus'] == 'A' ) {
+			$propstatus = 'Active';
+		} elseif( $idx_featured_listing_data['propStatus'] == 'S' ) {
+			$propstatus = 'Sold';
 		} else {
-			if ($idx_featured_listing_data['propStatus'] == 'A'){
-				$propstatus = 'Active';
-			} elseif($idx_featured_listing_data['propStatus'] == 'S') {
-				$propstatus = 'Sold';
-			} else {
-				$propstatus = ucfirst($idx_featured_listing_data['propStatus']);
-			}
+			$propstatus = ucfirst( $idx_featured_listing_data['propStatus'] );
 		}
 
 		// Add or reset taxonomies for property-types, locations, and status
 		wp_set_object_terms($id, $idx_featured_listing_data['idxPropType'], 'property-types', true);
 		wp_set_object_terms($id, $idx_featured_listing_data['cityName'], 'locations', true);
-		wp_set_object_terms($id, $propstatus, 'status', true);
+		wp_set_object_terms($id, $propstatus, 'status', false);
 
 		// Add post meta for existing WPL fields
-		update_post_meta($id, '_listing_lot_sqft', $idx_featured_listing_data['acres'].' acres');
+		update_post_meta($id, '_listing_lot_sqft', isset($idx_featured_listing_data['lotSqFt']) ? $idx_featured_listing_data['lotSqFt'] : $idx_featured_listing_data['acres'].' acres');
+		update_post_meta($id, '_listing_acres', $idx_featured_listing_data['acres']);
 		update_post_meta($id, '_listing_price', $idx_featured_listing_data['listingPrice']);
 		update_post_meta($id, '_listing_address', $idx_featured_listing_data['address']);
 		update_post_meta($id, '_listing_city', $idx_featured_listing_data['cityName']);

includes/class-listings.php

@@ -44,6 +44,7 @@ function __construct() {
 			    __( 'Year Built:', 'wp-listings' ) 				=> '_listing_year_built',
 			    __( 'Floors:', 'wp-listings' ) 					=> '_listing_floors',
 			    __( 'Square Feet:', 'wp-listings' )				=> '_listing_sqft',
+			    __( 'Acres:', 'wp-listings' )					=> '_listing_acres',
 				__( 'Lot Square Feet:', 'wp-listings' )			=> '_listing_lot_sqft',
 			    __( 'Bedrooms:', 'wp-listings' )				=> '_listing_bedrooms',
 			    __( 'Bathrooms:', 'wp-listings' )				=> '_listing_bathrooms',

includes/js/admin-listing-import.js

@@ -7,10 +7,13 @@ jQuery(document).ready(function($) {
 		});
 	});
 
-	jQuery('.grid').masonry({
-		columnWidth: '.grid-sizer',
-		itemSelector: '.grid-item'
-	});
+	setTimeout(function() {
+		var grid = $('.grid').masonry({
+			columnWidth: '.grid-sizer',
+			itemSelector: '.grid-item'
+		});
+		grid.masonry('layout');
+	}, 1000);
 
 	$(document).on( 'click', '.delete-post', function() {
 		var id = $(this).data('id');

includes/views/single-listing.php

@@ -9,7 +9,7 @@
 add_action('wp_enqueue_scripts', 'enqueue_single_listing_scripts');
 function enqueue_single_listing_scripts() {
 	wp_enqueue_style( 'wp-listings-single' );
-	wp_enqueue_style( 'font-awesome' );
+	wp_enqueue_style( 'font-awesome-4.7.0' );
 	wp_enqueue_script( 'jquery-validate', array('jquery'), true, true );
 	wp_enqueue_script( 'fitvids', array('jquery'), true, true );
 	wp_enqueue_script( 'wp-listings-single', array('jquery, jquery-ui-tabs', 'jquery-validate'), true, true );
@@ -67,6 +67,10 @@ function single_listing_post_content() {
 			$listing_meta .= sprintf( '<li class="listing-lot-sqft"><span class="label">Lot Sq Ft: </span>%s</li>', get_post_meta( $post->ID, '_listing_lot_sqft', true ) );
 		}
 
+		if ( '' != get_post_meta( $post->ID, '_listing_acres', true ) ) {
+			$listing_meta .= sprintf( '<li class="listing-acres"><span class="label">Acres: </span>%s</li>', get_post_meta( $post->ID, '_listing_acres', true ) );
+		}
+
 		$listing_meta .= sprintf( '</ul>');
 
 		echo $listing_meta;

plugin.php

@@ -7,7 +7,7 @@
 	Author URI: http://agentevolution.com
 	Text Domain: wp-listings
 
-	Version: 2.3.0
+	Version: 2.3.1
 
 	License: GNU General Public License v2.0 (or later)
 	License URI: http://www.opensource.org/licenses/gpl-license.php
@@ -66,7 +66,7 @@ function wp_listings_init() {
 
 	define( 'WP_LISTINGS_URL', plugin_dir_url( __FILE__ ) );
 	define( 'WP_LISTINGS_DIR', plugin_dir_path( __FILE__ ) );
-	define( 'WP_LISTINGS_VERSION', '2.3.0' );
+	define( 'WP_LISTINGS_VERSION', '2.3.1' );
 
 	/** Load textdomain for translation */
 	load_plugin_textdomain( 'wp-listings', false, basename( dirname( __FILE__ ) ) . '/languages/' );
@@ -109,7 +109,7 @@ function add_wp_listings_main_styles() {
 		wp_register_style('wp-listings-single', WP_LISTINGS_URL . 'includes/css/wp-listings-single.css', '', null, 'all');
 
 		/** Register Font Awesome icons but don't enqueue them */
-		wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', '', null, 'all');
+		wp_register_style( 'font-awesome-4.7.0', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css', array(), '4.7.0', 'all' );
 
 
 		/** Register Properticons but don't enqueue them */
@@ -161,8 +161,7 @@ function wp_listings_admin_scripts_styles() {
 
         /** Enqueue Font Awesome in the Admin if IDX Broker is not installed */
 		if (!class_exists( 'Idx_Broker_Plugin' )) {
-			wp_register_style('font-awesome-admin', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', '', null, 'all');
-			wp_enqueue_style('font-awesome-admin');
+			wp_enqueue_style( 'font-awesome-4.7.0', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css', array(), '4.7.0' );
 			wp_enqueue_style('upgrade-icon', WP_LISTINGS_URL . 'includes/css/wp-listings-upgrade.css');
 		}
 

readme.txt

@@ -4,8 +4,9 @@ Author URL: http://www.agentevolution.com/
 Contributors: agentevolution, davebonds, chadajohnson
 Tags: real estate, listings, property, properties, listing search, idx, idx broker, mls, agentpress
 Requires at least: 4.0
-Tested up to: 4.7.5
-Stable tag: 2.3.0
+Tested up to: 4.9.4
+Stable tag: 2.3.1
+Requires PHP: 5.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -206,6 +207,14 @@ function custom_default_property_type_terms() {
 
 == Changelog ==
 
+= 2.3.1 =
+*Released 03-25-17*
+* Fix: Change font awesome handle to prevent collision with other loaded versions
+* Fix: Change sold listings to use propStatus instead of archiveStatus
+* Fix: Change listing importer to not append to status taxonomy when updating, only replace
+* Fix: Added delay to masonry script on listing importer page to allow everything to load before initializing
+* Fix: Added acres field in lieu of lot sq ft. Listing importer now respects this field.
+
 = 2.3.0 = 
 *Released 05-25-17*
 * Feature: Added option to set title/permalink for imported listings