WebDev/Opal-Estate-Pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20 from wpopal/develop

Browse Source 
Develop
This commit is contained in:
wpopal 2019-12-06 14:30:17 +07:00 committed by GitHub
commit f338d29783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/js/frontend/submission.js
View File

@ -42,9 +42,12 @@ jQuery( document ).ready( function ( $ ) {
});
*/
var submitFormFiles = function ( name, files ) {
if( typeof(tinyMCE) != "undefined" ) {
tinyMCE.triggerSave();
}
var formData = new FormData();
formData.append( 'section', 'general' );
// formData.append('action', 'opalestate_submitted_property');
$( '.cmb2-uploader-files' ).each( function () {
var file_btn = $( 'input.select-file', this );
@ -72,6 +75,7 @@ jQuery( document ).ready( function ( $ ) {
} );
formData.append( 'action', 'opalestate_save_agency_data' );
toggleSubmit( $submit_btn );
$.ajax( {
url: opalesateJS.ajaxurl,
@ -109,7 +113,7 @@ jQuery( document ).ready( function ( $ ) {
} );
};
$submit_btn.parents( 'form' ).on( 'submit', function () {
$submit_btn.parents( 'form' ).on( 'submit', function (e) {
submitFormFiles();
return false;
} );

6
inc/submission/class-metabox-property-submission.php
View File

@ -110,6 +110,12 @@ class Opalestate_Property_MetaBox_Submission {
'type' => 'wysiwyg',
'default' => ! empty( $post ) ? $post->post_content : '',
'before_row' => '<hr>',
'options' => [
'media_buttons' => false,
'dfw' => true,
'tinymce' => true,
'quicktags' => true,
],
],
[
'id' => $prefix . 'price',

6
inc/submission/class-opalestate-submission.php
View File

@ -499,9 +499,11 @@ class OpalEstate_Submission {
$featured_image = get_post_meta( $post_id, $prefix . 'featured_image', true );
if ( ! empty( $_POST[ $prefix . 'featured_image' ] ) && isset( $_POST[ $prefix . 'featured_image' ] ) ) {
if ( $_POST[ $prefix . 'featured_image' ] && is_array( $_POST[ $prefix . 'featured_image' ] ) ) {
foreach ( $_POST[ $prefix . 'featured_image' ] as $key => $value ) {
set_post_thumbnail( $post_id, $key );
}
}
unset( $_POST[ $prefix . 'featured_image' ] );
} else {
delete_post_thumbnail( $post_id );
@ -547,14 +549,14 @@ class OpalEstate_Submission {
] );
}
} else {
return opalestate_output_msg_json( fales,
return opalestate_output_msg_json( false,
__( 'Currently, your account was blocked, please keep contact admin to resolve this!.', 'opalestate-pro' ),
[ 'heading' => esc_html__( 'Submission Information', 'opalestate-pro' ) ]
);
}
}
return opalestate_output_msg_json( fales,
return opalestate_output_msg_json( false,
__( 'Sorry! Your submitted datcould not save a at this time', 'opalestate-pro' ),
[ 'heading' => esc_html__( 'Submission Information', 'opalestate-pro' ) ]
);

6
inc/vendors/opalmembership/functions.php vendored
View File

@ -80,7 +80,11 @@ function opalesate_check_package_downgrade_status( $user_id, $package_id ) {
return true;
}
return ( $user_current_listings > $pack_listings ) || ( $user_current_featured_listings > $pack_featured_listings );
if ( $user_current_listings > $pack_listings ) {
return true;
}
return false;
}
/**

15
inc/vendors/opalmembership/membership.php vendored
View File

@ -246,6 +246,13 @@ class OpalEstate_Membership {
'description' => esc_html__( 'Number of properties can make featured with this package.', 'opalestate-pro' ),
];
$fields[] = [
'name' => esc_html__( 'Accumulated listings?', 'opalestate-pro' ),
'id' => $prefix . 'accumulated_listings',
'type' => 'checkbox',
'description' => esc_html__( 'Increase Number Of Properties and Number Of Featured Properties from current remaining values when upgrading this package.', 'opalestate-pro' ),
];
$fields[] = [
'name' => esc_html__( 'Enable Expired for properties ', 'opalestate-pro' ),
'id' => $prefix . 'enable_property_expired',
@ -386,6 +393,7 @@ class OpalEstate_Membership {
$pack_listings = get_post_meta( $package_id, OPALMEMBERSHIP_PACKAGES_PREFIX . 'package_listings', true );
$pack_featured_listings = get_post_meta( $package_id, OPALMEMBERSHIP_PACKAGES_PREFIX . 'package_featured_listings', true );
$is_unlimited_listings = get_post_meta( $package_id, OPALMEMBERSHIP_PACKAGES_PREFIX . 'unlimited_listings', true );
$accumulated_listings = get_post_meta( $package_id, OPALMEMBERSHIP_PACKAGES_PREFIX . 'accumulated_listings', true );
$pack_unlimited_listings = $is_unlimited_listings == 'on' ? 0 : 1;
@ -399,13 +407,18 @@ class OpalEstate_Membership {
$user_current_listings = opalesate_get_user_current_listings( $user_id ); // get user current listings ( no expired )
$user_current_featured_listings = opalesate_get_user_current_featured_listings( $user_id ); // get user current featured listings ( no expired )
if ( opalesate_check_package_downgrade_status( $user_id, $package_id ) ) {
if ( $accumulated_listings == 'on') {
$new_listings = ( $current_listings != -1 ) ? ( $pack_listings + $current_listings ) : $pack_listings;
$new_featured_listings = ( $curent_featured_listings != -1 ) ? ( $pack_featured_listings + $curent_featured_listings ) : $pack_featured_listings;
} else {
if ( ! opalesate_check_package_downgrade_status( $user_id, $package_id ) ) {
$new_listings = $pack_listings;
$new_featured_listings = $pack_featured_listings;
} else {
$new_listings = $pack_listings - $user_current_listings;
$new_featured_listings = $pack_featured_listings - $user_current_featured_listings;
}
}
// in case of downgrade
if ( $new_listings < 0 ) {

6
opal-estate-pro.php
View File

@ -3,7 +3,7 @@
* Plugin Name: Opal Estate Pro
* 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.
* Version: 1.2
* Version: 1.2.2
* Author: WPOPAL
* Author URI: http://www.wpopal.com
* Requires at least: 4.6
@ -151,7 +151,7 @@ if ( ! class_exists( 'OpalEstate' ) ) {
*/
public function __clone() {
// Cloning instances of the class is forbidden
_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'opalestate-pro' ), '1.2' );
_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'opalestate-pro' ), '1.2.2' );
}
/**
@ -160,7 +160,7 @@ if ( ! class_exists( 'OpalEstate' ) ) {
public function setup_constants() {
// Plugin version
if ( ! defined( 'OPALESTATE_VERSION' ) ) {
define( 'OPALESTATE_VERSION', '1.2' );
define( 'OPALESTATE_VERSION', '1.2.2' );
}
// Plugin Folder Path

6
readme.txt
View File

@ -156,6 +156,12 @@ 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")
== Changelog ==
= 1.2.2 - 2019-12-06 =
* Added - Add Accumulated listings setting for packages.
= 1.2.1 - 2019-12-06 =
* Fixes - Submission property not saved.
= 1.2 - 2019-12-04 =
* Fixes - Login ajax.
* Added - Enable email settings.