Merge pull request #22 from wpopal/develop

Fix order & package template. Tag 1.2.3
This commit is contained in:
wpopal 2019-12-09 15:05:21 +07:00 committed by GitHub
commit d83406b85b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 9 deletions

View File

@ -242,7 +242,7 @@ class OpalEstate_Search {
if ( ! empty( $ksearchs ) && count( $ksearchs ) == 2 ) { if ( ! empty( $ksearchs ) && count( $ksearchs ) == 2 ) {
$args['meta_key'] = OPALESTATE_PROPERTY_PREFIX . $ksearchs[0]; $args['meta_key'] = OPALESTATE_PROPERTY_PREFIX . $ksearchs[0];
$args['orderby'] = 'meta_value'; $args['orderby'] = ( 'featured' !== $ksearchs[0] ) ? 'meta_value_num' : 'meta_value';
$args['order'] = $ksearchs[1]; $args['order'] = $ksearchs[1];
} elseif ( 'on' == opalestate_options( 'show_featured_first', 'off' ) ) { } elseif ( 'on' == opalestate_options( 'show_featured_first', 'off' ) ) {
$args['meta_key'] = OPALESTATE_PROPERTY_PREFIX . 'featured'; $args['meta_key'] = OPALESTATE_PROPERTY_PREFIX . 'featured';

View File

@ -3,7 +3,7 @@
* Plugin Name: Opal Estate Pro * Plugin Name: Opal Estate Pro
* Plugin URI: https://wpdocs.gitbook.io/opal-estate/ * Plugin URI: https://wpdocs.gitbook.io/opal-estate/
* Description: Opal Real Estate Plugin is an ideal solution and brilliant choice for you to set up a professional estate website. * Description: Opal Real Estate Plugin is an ideal solution and brilliant choice for you to set up a professional estate website.
* Version: 1.2.2 * Version: 1.2.3
* Author: WPOPAL * Author: WPOPAL
* Author URI: http://www.wpopal.com * Author URI: http://www.wpopal.com
* Requires at least: 4.6 * Requires at least: 4.6
@ -151,7 +151,7 @@ if ( ! class_exists( 'OpalEstate' ) ) {
*/ */
public function __clone() { public function __clone() {
// Cloning instances of the class is forbidden // Cloning instances of the class is forbidden
_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'opalestate-pro' ), '1.2.2' ); _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'opalestate-pro' ), '1.2.3' );
} }
/** /**
@ -160,7 +160,7 @@ if ( ! class_exists( 'OpalEstate' ) ) {
public function setup_constants() { public function setup_constants() {
// Plugin version // Plugin version
if ( ! defined( 'OPALESTATE_VERSION' ) ) { if ( ! defined( 'OPALESTATE_VERSION' ) ) {
define( 'OPALESTATE_VERSION', '1.2.2' ); define( 'OPALESTATE_VERSION', '1.2.3' );
} }
// Plugin Folder Path // Plugin Folder Path

View File

@ -156,6 +156,10 @@ This section describes how to install the plugin and get it working.
* System tickets support 24/7 available : [free support](https://wpopal.ticksy.com/ "Visit the Plugin support Page") * System tickets support 24/7 available : [free support](https://wpopal.ticksy.com/ "Visit the Plugin support Page")
== Changelog == == Changelog ==
= 1.2.3 - 2019-12-09 =
* Fixes - Order properties
* Fixes - Package template.
= 1.2.2 - 2019-12-06 = = 1.2.2 - 2019-12-06 =
* Added - Add Accumulated listings setting for packages. * Added - Add Accumulated listings setting for packages.

View File

@ -8,7 +8,7 @@
<div class="pricing-more-info"> <div class="pricing-more-info">
<div class="item-info"> <div class="item-info">
<span> <span>
<?php if( !empty($pack_listings) && $unlimited_listings == 0 ): ?> <?php if ( ( ( $pack_listings && ( -1 != $pack_listings ) ) || ( 0 == $pack_listings ) ) && ( $unlimited_listings == 0 ) ) : ?>
<?php echo trim( $pack_listings); ?><?php esc_html_e( ' Listings' , 'opalestate-pro' );?> <?php echo trim( $pack_listings); ?><?php esc_html_e( ' Listings' , 'opalestate-pro' );?>
<?php else: ?> <?php else: ?>
<?php esc_html_e('Unlimited', 'opalestate-pro');?><?php esc_html_e( ' Listings' , 'opalestate-pro' );?> <?php esc_html_e('Unlimited', 'opalestate-pro');?><?php esc_html_e( ' Listings' , 'opalestate-pro' );?>
@ -17,10 +17,10 @@
</div> </div>
<div class="item-info"> <div class="item-info">
<span> <span>
<?php if( !empty($pack_featured_listings) && $unlimited_listings == 0 ): ?> <?php if ( ( ( $pack_featured_listings && ( -1 != $pack_featured_listings ) ) || ( 0 == $pack_featured_listings ) ) && ( $unlimited_listings == 0 ) ) : ?>
<?php echo trim( $pack_featured_listings); ?><?php esc_html_e( ' Featured' , 'opalestate-pro' );?> <?php echo trim( $pack_featured_listings ); ?><?php esc_html_e( ' Featured', 'opalestate-pro' ); ?>
<?php else: ?> <?php else: ?>
<?php esc_html_e('Unlimited', 'opalestate-pro');?><?php esc_html_e( ' Featured' , 'opalestate-pro' );?> <?php esc_html_e( 'Unlimited', 'opalestate-pro' ); ?><?php esc_html_e( ' Featured', 'opalestate-pro' ); ?>
<?php endif; ?> <?php endif; ?>
</span> </span>
</div> </div>