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

Merge pull request #14 from wpopal/develop

Browse Source 
Develop
This commit is contained in:
wpopal 2019-10-31 16:26:25 +07:00 committed by GitHub
commit d7782283f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 397 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
inc/admin/settings/property.php
View File

@ -168,10 +168,10 @@ class Opalestate_Settings_Property_Tab extends Opalestate_Settings_Base_Tab {
'desc' => esc_html__( 'Show featured first in page result, as default Newest is showed', 'opalestate-pro' ),
'type' => 'switch',
'options' => [
0 => esc_html__( 'Disable', 'opalestate-pro' ),
1 => esc_html__( 'Enable', 'opalestate-pro' ),
'on' => esc_html__( 'Enable', 'opalestate-pro' ),
'off' => esc_html__( 'Disable', 'opalestate-pro' ),
],
'default' => 0,
'default' => 'off',
];
$fields[] = [
'name' => esc_html__( 'Minimum of Search Price', 'opalestate-pro' ),
@ -334,6 +334,18 @@ class Opalestate_Settings_Property_Tab extends Opalestate_Settings_Base_Tab {
private function get_subtab_detail_fields() {
$fields = [];
$fields[] = [
'name' => esc_html__( 'Enable Request Viewing', 'opalestate-pro' ),
'desc' => esc_html__( 'Enable Request Viewing feature in the single property page.', 'opalestate-pro' ),
'id' => 'enable_single_request_viewing',
'type' => 'switch',
'options' => [
'on' => esc_html__( 'Enable', 'opalestate-pro' ),
'off' => esc_html__( 'Disable', 'opalestate-pro' ),
],
'default' => 'on',
];
$fields[] = [
'name' => esc_html__( 'Show Amenities tab', 'opalestate-pro' ),
'desc' => esc_html__( 'Show Amenities tab in the single property page.', 'opalestate-pro' ),

4
inc/class-opalestate-install.php
View File

@ -93,8 +93,6 @@ class Opalestate_Install {
$options['currency_position'] = 'before';
$options['measurement_unit'] = 'sqft';
$options['google_map_api_keys'] = 'AIzaSyCfMVNIa7khIqYHCw6VBn8ShUWWm4tjbG8';
$options['admin_approve'] = 'on';
$options['require_input_price'] = 'on';
$options['from_name'] = get_bloginfo( 'name' );
$options['from_email'] = get_bloginfo( 'admin_email' );
$options['message_log'] = 1;
@ -110,6 +108,7 @@ class Opalestate_Install {
$options[ OPALESTATE_PROPERTY_PREFIX . 'areasize_opt_v' ] = 'on';
$options[ OPALESTATE_PROPERTY_PREFIX . 'price_opt_v' ] = 'on';
$options['enable_single_request_viewing'] = 'on';
$options['enable_single_amenities'] = 'on';
$options['enable_single_facilities'] = 'on';
$options['enable_single_attachments'] = 'on';
@ -129,6 +128,7 @@ class Opalestate_Install {
$options['enable_agency_reviews'] = 'on';
$options['enable_agent_reviews'] = 'on';
$options['admin_approve'] = 'on';
$options['enable_submission_tab_media'] = 'on';
$options['enable_submission_tab_location'] = 'on';
$options['enable_submission_tab_amenities'] = 'on';

21
inc/property/class-metabox-property-admin.php
View File

@ -177,10 +177,10 @@ class Opalestate_Property_MetaBox {
'id' => $prefix . 'featured',
'type' => 'switch',
'options' => [
0 => esc_html__( 'No', 'opalestate-pro' ),
1 => esc_html__( 'Yes', 'opalestate-pro' ),
'on' => esc_html__( 'Yes', 'opalestate-pro' ),
'off' => esc_html__( 'No', 'opalestate-pro' ),
],
'default' => 0,
'default' => 'off',
],
[
'name' => esc_html__( 'Property SKU', 'opalestate-pro' ),
@ -206,17 +206,14 @@ class Opalestate_Property_MetaBox {
'id' => $prefix . 'enablemapview',
'type' => 'switch',
'options' => [
1 => esc_html__( 'Yes', 'opalestate-pro' ),
0 => esc_html__( 'No', 'opalestate-pro' ),
'on' => esc_html__( 'Yes', 'opalestate-pro' ),
'off' => esc_html__( 'No', 'opalestate-pro' ),
],
],
[
'name' => esc_html__( 'Address', 'opalestate-pro' ),
'id' => $prefix . 'address',
'type' => 'textarea_small',
'attributes' => [
'required' => 'required',
],
],
[
'id' => "{$prefix}video",
@ -243,7 +240,7 @@ class Opalestate_Property_MetaBox {
'name' => esc_html__( 'Regular Price', 'opalestate-pro' ) . $currency,
'type' => 'text',
'description' => esc_html__( 'Enter amount without currency', 'opalestate-pro' ),
'attributes' => opalestate_get_option( 'require_input_price' ) ? [ 'required' => 'required' ] : '',
'attributes' => [ 'required' => 'required' ],
'before_row' => '<div class="row-group-features group-has-three group-price clearfix"><h3>' . ( is_admin() ? "" : esc_html__( 'Price', 'opalestate-pro' ) ) . '</h3>', // callback
],
[
@ -270,10 +267,10 @@ class Opalestate_Property_MetaBox {
'id' => $prefix . 'price_oncall',
'type' => 'switch',
'options' => [
0 => esc_html__( 'No', 'opalestate-pro' ),
1 => esc_html__( 'Yes', 'opalestate-pro' ),
'on' => esc_html__( 'Yes', 'opalestate-pro' ),
'off' => esc_html__( 'No', 'opalestate-pro' ),
],
'default' => 0,
'default' => 'off',
],
];

11
inc/property/class-opalestate-property.php
View File

@ -207,10 +207,10 @@ class Opalestate_Property {
}
/**
*
* Is featured?
*/
public function is_featured() {
return 'on' === $this->featured;
return ( 'on' === $this->featured ) || ( 1 == $this->featured );
}
/**
@ -315,7 +315,7 @@ class Opalestate_Property {
}
/**
*
* Get location.
*/
public function get_locations() {
$terms = wp_get_post_terms( $this->post_id, 'opalestate_location' );
@ -515,7 +515,7 @@ class Opalestate_Property {
* @access public
* @param $key
* @param $single
* @return string
* @return string|array
*/
public function get_metabox_value( $key, $single = true ) {
return get_post_meta( $this->post_id, OPALESTATE_PROPERTY_PREFIX . $key, $single );
@ -579,7 +579,7 @@ class Opalestate_Property {
* @return array
*/
public function get_gallery() {
return $this->get_metabox_value( 'gallery', true );
return $this->get_metabox_value( 'gallery' );
}
/**
@ -677,7 +677,6 @@ class Opalestate_Property {
return $this->get_metabox_value( 'attachments' );
}
public function get_content_single_layout() {
return $this->get_metabox_value( 'layout' );
}

6
inc/property/class-opalestate-search.php
View File

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

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

@ -25,12 +25,12 @@ class Opalestate_Property_MetaBox_Submission {
* @return array
*/
public function register_form( array $metaboxes ) {
$prefix = OPALESTATE_PROPERTY_PREFIX;
$fields = array_merge(
$this->metaboxes_general_fields_front(),
$this->is_enabled_tab( 'media' ) ? $this->metaboxes_media_fields() : [],
$this->is_enabled_tab( 'location' ) ? $this->metaboxes_location_fields() : [],
$this->is_enabled_tab( 'information' ) ? $this->metaboxes_info_fields() : [],
@ -59,14 +59,13 @@ class Opalestate_Property_MetaBox_Submission {
public function get_fields_groups() {
return [
'general' => [ 'status' => true, 'title' => esc_html__( 'General', 'opalestate-pro' ) ],
'media' => [ 'status' => $this->is_enabled_tab( 'media' ), 'title' => esc_html__( 'Media', 'opalestate-pro' ) ],
'location' => [ 'status' => $this->is_enabled_tab( 'location' ), 'title' => esc_html__( 'Location', 'opalestate-pro' ) ],
'information' => [ 'status' => $this->is_enabled_tab( 'information' ), 'title' => esc_html__( 'Information', 'opalestate-pro' ) ],
'amenities' => [ 'status' => $this->is_enabled_tab( 'amenities' ), 'title' => esc_html__( 'Amenities', 'opalestate-pro' ) ],
'facilities' => [ 'status' => $this->is_enabled_tab( 'facilities' ), 'title' => esc_html__( 'Facilities', 'opalestate-pro' ) ],
'apartments' => [ 'status' => $this->is_enabled_tab( 'apartments' ), 'title' => esc_html__( 'Apartments', 'opalestate-pro' ) ],
'floor_plans' => [ 'status' => $this->is_enabled_tab( 'floor_plans' ), 'title' => esc_html__( 'Floor plans', 'opalestate-pro' ) ]
'floor_plans' => [ 'status' => $this->is_enabled_tab( 'floor_plans' ), 'title' => esc_html__( 'Floor plans', 'opalestate-pro' ) ],
];
}
@ -77,7 +76,7 @@ class Opalestate_Property_MetaBox_Submission {
if ( ! empty( $_GET['id'] ) ) {
$post = get_post( intval( $_GET['id'] ) );
$featured_image = wp_get_attachment_image_src( get_post_thumbnail_id( absint( $_GET['id'] ) ) );
$post_id = $post->ID;
$post_id = $post->ID;
}
$currency = opalestate_currency_symbol() ? ' (' . opalestate_currency_symbol() . ')' : ' ($)';
@ -95,7 +94,6 @@ class Opalestate_Property_MetaBox_Submission {
'default' => $post_id,
],
[
'name' => esc_html__( 'Title', 'opalestate-pro' ) . '<span class="required"> *</span>',
'id' => $prefix . 'title',
@ -107,20 +105,19 @@ class Opalestate_Property_MetaBox_Submission {
],
],
[
'name' => esc_html__( 'Description', 'opalestate-pro' ),
'id' => $prefix . 'text',
'type' => 'wysiwyg',
'default' => ! empty( $post ) ? $post->post_content : '',
'name' => esc_html__( 'Description', 'opalestate-pro' ),
'id' => $prefix . 'text',
'type' => 'wysiwyg',
'default' => ! empty( $post ) ? $post->post_content : '',
'before_row' => '<hr>',
],
[
'id' => $prefix . 'price',
'name' => esc_html__( 'Regular Price', 'opalestate-pro' ) . $currency . '<span class="required"> *</span>',
'type' => 'text',
'description' => esc_html__( 'Enter amount without currency', 'opalestate-pro' ),
'attributes' => opalestate_get_option( 'require_input_price' ) ? [ 'required' => 'required' ] : '',
'before_row' => '<hr><div class="field-row-2">', // callback
'attributes' => [ 'required' => 'required' ],
'before_row' => '<hr><div class="field-row-2">',
],
[
'id' => $prefix . 'saleprice',
@ -141,26 +138,26 @@ class Opalestate_Property_MetaBox_Submission {
'description' => esc_html__( 'After Price Label (e.g. "per month")', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Statuses', 'opalestate-pro' ),
'id' => $prefix . 'status',
'type' => 'taxonomy_select',
'taxonomy' => 'opalestate_status',
'class' => 'form-control',
'name' => esc_html__( 'Statuses', 'opalestate-pro' ),
'id' => $prefix . 'status',
'type' => 'taxonomy_select',
'taxonomy' => 'opalestate_status',
'class' => 'form-control',
'attributes' => [
'required' => 'required',
],
'before_row' => '</div><hr><div class="field-row-2">', // callback
'before_row' => '</div><hr><div class="field-row-2">', // callback
],
[
'name' => esc_html__( 'Types', 'opalestate-pro' ),
'id' => $prefix . 'type',
'type' => 'taxonomy_select',
'taxonomy' => 'opalestate_types',
'class' => 'form-control',
'name' => esc_html__( 'Types', 'opalestate-pro' ),
'id' => $prefix . 'type',
'type' => 'taxonomy_select',
'taxonomy' => 'opalestate_types',
'class' => 'form-control',
'attributes' => [
'required' => 'required',
],
'after_row' => '</div><hr><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>', // callback
'after_row' => '</div><hr><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>', // callback
],
];
@ -168,12 +165,11 @@ class Opalestate_Property_MetaBox_Submission {
}
public function metaboxes_media_fields() {
$id = 0;
$id = 0;
if( isset($_GET['id']) ){
$post_id = intval( $_GET['id'] );
$id = get_post_thumbnail_id( $post_id );
if ( isset( $_GET['id'] ) ) {
$post_id = intval( $_GET['id'] );
$id = get_post_thumbnail_id( $post_id );
}
$prefix = OPALESTATE_PROPERTY_PREFIX;
@ -183,11 +179,11 @@ class Opalestate_Property_MetaBox_Submission {
'id' => "{$prefix}featured_image",
'name' => esc_html__( 'Featured Image', 'opalestate-pro' ),
'type' => 'uploader',
'single' => true,
'value' => $id,
'single' => true,
'value' => $id,
'description' => esc_html__( 'Select one or more images to show as gallery', 'opalestate-pro' ),
'before_row' => '<div id="opalestate-submission-media" class="opalestate-tab-content">',
],
[
@ -195,14 +191,14 @@ class Opalestate_Property_MetaBox_Submission {
'name' => esc_html__( 'Images Gallery', 'opalestate-pro' ),
'type' => 'uploader',
'description' => esc_html__( 'Select one or more images to show as gallery', 'opalestate-pro' ),
],
[
'id' => "{$prefix}video",
'name' => esc_html__( 'Video', 'opalestate-pro' ),
'type' => 'text_url',
'before_row' => '<hr>',
'before_row' => '<hr>',
'description' => esc_html__( 'Input for videos, audios from Youtube, Vimeo and all supported sites by WordPress. It has preview feature.', 'opalestate-pro' ),
],
[
@ -210,15 +206,15 @@ class Opalestate_Property_MetaBox_Submission {
'name' => esc_html__( '360° Virtual Tour', 'opalestate-pro' ),
'type' => 'textarea_small',
'description' => esc_html__( 'Input iframe to show 360° Virtual Tour.', 'opalestate-pro' ),
'before_row' => '<hr>'
'before_row' => '<hr>',
],
[
'id' => "{$prefix}attachments",
'name' => esc_html__( 'Attachments', 'opalestate-pro' ),
'type' => 'uploader',
'before_row' => '<hr>',
'show_icon' => true,
'accept' => 'application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'before_row' => '<hr>',
'show_icon' => true,
'accept' => 'application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'options' => [
'url' => true, // Hide the text input for the url
],
@ -244,40 +240,40 @@ class Opalestate_Property_MetaBox_Submission {
'before_row' => '<div id="opalestate-submission-information" class="opalestate-tab-content"><div class="field-row-2">',
],
[
'name' => esc_html__( 'Parking', 'opalestate-pro' ),
'id' => $prefix . 'parking',
'type' => 'text',
'attributes' => array(
'type' => 'number',
'name' => esc_html__( 'Parking', 'opalestate-pro' ),
'id' => $prefix . 'parking',
'type' => 'text',
'attributes' => [
'type' => 'number',
'pattern' => '\d*',
),
],
'sanitization_cb' => 'absint',
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter number of Parking', 'opalestate-pro' ),
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter number of Parking', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Bedrooms', 'opalestate-pro' ),
'id' => $prefix . 'bedrooms',
'type' => 'text',
'attributes' => array(
'type' => 'number',
'name' => esc_html__( 'Bedrooms', 'opalestate-pro' ),
'id' => $prefix . 'bedrooms',
'type' => 'text',
'attributes' => [
'type' => 'number',
'pattern' => '\d*',
),
],
'sanitization_cb' => 'absint',
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter number of bedrooms', 'opalestate-pro' ),
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter number of bedrooms', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Bathrooms', 'opalestate-pro' ),
'id' => $prefix . 'bathrooms',
'type' => 'text',
'attributes' => array(
'type' => 'number',
'name' => esc_html__( 'Bathrooms', 'opalestate-pro' ),
'id' => $prefix . 'bathrooms',
'type' => 'text',
'attributes' => [
'type' => 'number',
'pattern' => '\d*',
),
],
'sanitization_cb' => 'absint',
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter number of bathrooms', 'opalestate-pro' ),
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter number of bathrooms', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Plot Size', 'opalestate-pro' ),
@ -286,16 +282,16 @@ class Opalestate_Property_MetaBox_Submission {
'description' => esc_html__( 'Enter size of Plot as 20x30, 20x30x40, 20x30x40x50', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Area Size', 'opalestate-pro' ),
'id' => $prefix . 'areasize',
'type' => 'text',
'attributes' => array(
'type' => 'number',
'name' => esc_html__( 'Area Size', 'opalestate-pro' ),
'id' => $prefix . 'areasize',
'type' => 'text',
'attributes' => [
'type' => 'number',
'pattern' => '\d*',
),
],
'sanitization_cb' => 'absint',
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter size of area in sqft', 'opalestate-pro' ),
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter size of area in sqft', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Orientation', 'opalestate-pro' ),
@ -304,43 +300,43 @@ class Opalestate_Property_MetaBox_Submission {
'description' => esc_html__( 'Enter Orientation of property', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Living Rooms', 'opalestate-pro' ),
'id' => "{$prefix}livingrooms",
'type' => 'text',
'attributes' => array(
'type' => 'number',
'name' => esc_html__( 'Living Rooms', 'opalestate-pro' ),
'id' => "{$prefix}livingrooms",
'type' => 'text',
'attributes' => [
'type' => 'number',
'pattern' => '\d*',
),
],
'sanitization_cb' => 'absint',
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter Number of Living Rooms', 'opalestate-pro' ),
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter Number of Living Rooms', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Kitchens', 'opalestate-pro' ),
'id' => "{$prefix}kitchens",
'type' => 'text',
'attributes' => array(
'type' => 'number',
'name' => esc_html__( 'Kitchens', 'opalestate-pro' ),
'id' => "{$prefix}kitchens",
'type' => 'text',
'attributes' => [
'type' => 'number',
'pattern' => '\d*',
),
],
'sanitization_cb' => 'absint',
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter Number of Kitchens', 'opalestate-pro' ),
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter Number of Kitchens', 'opalestate-pro' ),
],
[
'name' => esc_html__( 'Rooms', 'opalestate-pro' ),
'id' => "{$prefix}amountrooms",
'type' => 'text',
'attributes' => array(
'type' => 'number',
'name' => esc_html__( 'Rooms', 'opalestate-pro' ),
'id' => "{$prefix}amountrooms",
'type' => 'text',
'attributes' => [
'type' => 'number',
'pattern' => '\d*',
),
],
'sanitization_cb' => 'absint',
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter Number of Amount Rooms', 'opalestate-pro' ),
'after_row' => '</div><hr><button type="button" class="submission-back-btn btn btn-primary">' . esc_html__( 'Previous Step',
'escape_cb' => 'absint',
'description' => esc_html__( 'Enter Number of Amount Rooms', 'opalestate-pro' ),
'after_row' => '</div><hr><button type="button" class="submission-back-btn btn btn-primary">' . esc_html__( 'Previous Step',
'opalestate-pro' ) . '</button><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>',
],
@ -372,10 +368,10 @@ class Opalestate_Property_MetaBox_Submission {
'taxonomy' => 'opalestate_city',
],
[
'name' => esc_html__( 'Postal Code / Zip', 'opalestate-pro' ),
'id' => $prefix . 'zipcode',
'type' => 'text',
'after_row'=> '</div><hr>'
'name' => esc_html__( 'Postal Code / Zip', 'opalestate-pro' ),
'id' => $prefix . 'zipcode',
'type' => 'text',
'after_row' => '</div><hr>',
],
[
@ -387,10 +383,10 @@ class Opalestate_Property_MetaBox_Submission {
],
],
[
'name' => esc_html__( 'Google Map View', 'opalestate-pro' ),
'id' => $prefix . 'enablemapview',
'type' => 'switch',
'options' => [
'name' => esc_html__( 'Google Map View', 'opalestate-pro' ),
'id' => $prefix . 'enablemapview',
'type' => 'switch',
'options' => [
0 => esc_html__( 'No', 'opalestate-pro' ),
1 => esc_html__( 'Yes', 'opalestate-pro' ),
],
@ -414,13 +410,13 @@ class Opalestate_Property_MetaBox_Submission {
$prefix = OPALESTATE_PROPERTY_PREFIX;
$fields = [
[
'name' => esc_html__( 'Amenities', 'opalestate-pro' ),
'id' => $prefix . 'amenity',
'type' => 'taxonomy_multicheck',
'before_row' => '<div id="opalestate-submission-amenities" class="opalestate-tab-content">',
'after_row' => '<button type="button" class="submission-back-btn btn btn-primary">' . esc_html__( 'Previous Step',
'opalestate-pro' ) . '</button><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>',
'taxonomy' => 'opalestate_amenities',
'name' => esc_html__( 'Amenities', 'opalestate-pro' ),
'id' => $prefix . 'amenity',
'type' => 'taxonomy_multicheck',
'before_row' => '<div id="opalestate-submission-amenities" class="opalestate-tab-content">',
'after_row' => '<button type="button" class="submission-back-btn btn btn-primary">' . esc_html__( 'Previous Step',
'opalestate-pro' ) . '</button><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>',
'taxonomy' => 'opalestate_amenities',
'render_row_cb' => [ $this, 'amenities_html_callback' ],
],
];
@ -437,7 +433,7 @@ class Opalestate_Property_MetaBox_Submission {
'type' => 'group',
'before_group' => '<div id="opalestate-submission-facilities" class="opalestate-tab-content">',
'after_group' => '<button type="button" class="submission-back-btn btn btn-primary">' . esc_html__( 'Previous Step',
'opalestate-pro' ) . '</button><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>',
'opalestate-pro' ) . '</button><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>',
'fields' => [
[
'id' => $prefix . 'public_facilities_key',
@ -480,7 +476,7 @@ class Opalestate_Property_MetaBox_Submission {
'id' => $prefix . 'apartments',
'type' => 'group',
'after_group' => '<button type="button" class="submission-back-btn btn btn-primary">' . esc_html__( 'Previous Step',
'opalestate-pro' ) . '</button><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>',
'opalestate-pro' ) . '</button><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>',
'fields' => [
[
'id' => $prefix . 'apartment_plot',
@ -489,7 +485,7 @@ class Opalestate_Property_MetaBox_Submission {
'type' => 'text',
],
[
'id' => $prefix . 'apartment_beds',
'name' => esc_html__( 'Beds', 'opalestate-pro' ),
@ -590,11 +586,11 @@ class Opalestate_Property_MetaBox_Submission {
'type' => 'textarea_small',
],
[
'id' => "{$prefix}floor_image_id",
'name' => esc_html__( 'Image Preview', 'opalestate-pro' ),
'type' => 'uploader',
'single' => 1,
'id' => "{$prefix}floor_image_id",
'name' => esc_html__( 'Image Preview', 'opalestate-pro' ),
'type' => 'uploader',
'single' => 1,
'query_args' => [
'type' => [
'image/gif',
@ -625,8 +621,8 @@ class Opalestate_Property_MetaBox_Submission {
/**
* Manually render a field column display.
*
* @param array $field_args Array of field arguments.
* @param CMB2_Field $field The field object
* @param array $field_args Array of field arguments.
* @param CMB2_Field $field The field object
*/
public function amenities_html_callback( $field_args, $field ) {
$id = $field->args( 'id' );
@ -646,34 +642,34 @@ class Opalestate_Property_MetaBox_Submission {
return;
}
?>
<div id="opalestate-submission-amenities" class="opalestate-tab-content">
<div class="cmb-row cmb-type-taxonomy-multicheck cmb2-id-opalestate-ppt-amenity" data-fieldtype="taxonomy_multicheck">
<div class="cmb-th">
<label for="<?php echo esc_attr( $name ); ?>"><?php echo esc_html( $label ); ?></label>
</div>
<div id="opalestate-submission-amenities" class="opalestate-tab-content">
<div class="cmb-row cmb-type-taxonomy-multicheck cmb2-id-opalestate-ppt-amenity" data-fieldtype="taxonomy_multicheck">
<div class="cmb-th">
<label for="<?php echo esc_attr( $name ); ?>"><?php echo esc_html( $label ); ?></label>
</div>
<div class="cmb-td">
<ul class="cmb2-checkbox-list list-inline cmb2-list">
<div class="cmb-td">
<ul class="cmb2-checkbox-list list-inline cmb2-list">
<?php foreach ( $amenites as $key => $amenity ) : ?>
<li>
<input type="checkbox" class="cmb2-option" name="<?php echo esc_attr( $name ); ?>[]" id="opalestate_ppt_amenity<?php echo esc_attr( $key + 1 ); ?>"
value="<?php echo esc_attr( $amenity->slug ); ?>">
<label for="opalestate_ppt_amenity<?php echo esc_attr( $key + 1 ); ?>">
<li>
<input type="checkbox" class="cmb2-option" name="<?php echo esc_attr( $name ); ?>[]" id="opalestate_ppt_amenity<?php echo esc_attr( $key + 1 ); ?>"
value="<?php echo esc_attr( $amenity->slug ); ?>">
<label for="opalestate_ppt_amenity<?php echo esc_attr( $key + 1 ); ?>">
<?php
if ( $image_id = get_term_meta( $amenity->term_id, 'opalestate_amt_image_id', true )) {
if ( $image_id = get_term_meta( $amenity->term_id, 'opalestate_amt_image_id', true ) ) {
echo opalestate_get_image_by_id( $image_id );
}
?>
<?php echo esc_html( $amenity->name ); ?>
</label>
</li>
</label>
</li>
<?php endforeach; ?>
</ul>
</div>
</div>
<button type="button" class="submission-back-btn btn btn-primary"><?php esc_html_e( 'Previous Step', 'opalestate-pro' ); ?></button>
<button type="button" class="submission-next-btn btn btn-primary"><?php esc_html_e( 'Next Step', 'opalestate-pro' ); ?></button>
</div>
</ul>
</div>
</div>
<button type="button" class="submission-back-btn btn btn-primary"><?php esc_html_e( 'Previous Step', 'opalestate-pro' ); ?></button>
<button type="button" class="submission-next-btn btn btn-primary"><?php esc_html_e( 'Next Step', 'opalestate-pro' ); ?></button>
</div>
<?php
}
}

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

@ -36,7 +36,7 @@ class OpalEstate_Submission {
*
*
*/
public $new_attachmenet_ids = array();
public $new_attachmenet_ids = [];
/**
* Constructor
@ -48,7 +48,7 @@ class OpalEstate_Submission {
* because inside this hook global $post == null
*/
add_action( 'wp_head', [ $this, 'head_check_page' ] );
add_action( 'cmb2_after_init', [ $this, 'process_submission' ], 10000 );
add_action( 'opalestate_single_property_before', [ $this, 'render_button_edit' ] );
@ -88,14 +88,14 @@ class OpalEstate_Submission {
*/
public function register_shortcodes() {
$shortcodes = [
'submission' => [
'submission' => [
'code' => 'submission',
'label' => esc_html__( 'Submission Form', 'opalestate-pro' ),
],
'submission_list' => [
'submission_list' => [
'code' => 'submission_list',
'label' => esc_html__( 'My Properties', 'opalestate-pro' ),
]
],
];
foreach ( $shortcodes as $shortcode ) {
@ -107,7 +107,7 @@ class OpalEstate_Submission {
* Is submission page. 'submission_page' option in General Setting
*/
public function setting_content_tab( $tabs ) {
$tabs['submission_page'] = esc_html__( 'Submission Page', 'opalestate-pro' );
$tabs['submission_page'] = esc_html__( 'Submission', 'opalestate-pro' );
return $tabs;
}
@ -129,7 +129,7 @@ class OpalEstate_Submission {
],
[
'name' => esc_html__( 'Property Submission Page', 'opalestate-pro' ),
'desc' => esc_html__( 'This is the submission page. The <code>[opalestate_submission]</code> shortcode should be on this page.', 'opalestate-pro' ),
'desc' => __( 'This is the submission page. The <code>[opalestate_submission]</code> shortcode should be on this page.', 'opalestate-pro' ),
'id' => 'submission_page',
'type' => 'select',
'options' => opalestate_cmb2_get_post_options( [
@ -137,31 +137,27 @@ class OpalEstate_Submission {
'numberposts' => -1,
] ),
],
[
'name' => esc_html__( 'Show Content Use Not Login', 'opalestate-pro' ),
'desc' => esc_html__( 'Show Login/Register form and submission form if user not logined', 'opalestate-pro' ),
'desc' => esc_html__( 'Show Login/Register form and submission form if the user is not logged in.', 'opalestate-pro' ),
'id' => 'submission_show_content',
'type' => 'select',
'default' => '',
'options' => [
'' => esc_html__( 'Show Login Form', 'opalestate-pro' ),
'' => esc_html__( 'Show Login Form', 'opalestate-pro' ),
'login_submission' => esc_html__( 'Show Login Form and Submission Form', 'opalestate-pro' ),
],
],
[
'name' => esc_html__( 'Enable Admin Approve', 'opalestate-pro' ),
'desc' => esc_html__( 'the Property will be auto approve when user submit, if you do not enable it.', 'opalestate-pro' ),
'id' => 'admin_approve',
'type' => 'checkbox',
],
[
'name' => esc_html__( 'Enable Require Price', 'opalestate-pro' ),
'desc' => esc_html__( 'Enable or Disable require user enter price and price label.', 'opalestate-pro' ),
'id' => 'require_input_price',
'type' => 'checkbox',
'name' => esc_html__( 'Enable Admin Approve', 'opalestate-pro' ),
'desc' => esc_html__( 'Admin must review and approve before properties are published.', 'opalestate-pro' ),
'id' => 'admin_approve',
'type' => 'switch',
'options' => [
'on' => esc_html__( 'Enable', 'opalestate-pro' ),
'off' => esc_html__( 'Disable', 'opalestate-pro' ),
],
'default' => 'on',
],
[
'name' => esc_html__( 'Submission Tab Settings', 'opalestate-pro' ),
@ -240,6 +236,30 @@ class OpalEstate_Submission {
'off' => esc_html__( 'Disable', 'opalestate-pro' ),
],
],
[
'name' => esc_html__( 'Submission Settings', 'opalestate-pro' ),
'id' => 'opalestate_title_submission_settings',
'type' => 'title',
'before_row' => '<hr>',
'after_row' => '<hr>',
],
[
'name' => esc_html__( 'Generate property SKU', 'opalestate-pro' ),
'desc' => esc_html__( 'Enable automatic generate property SKU.', 'opalestate-pro' ),
'id' => 'enable_submission_generate_sku',
'type' => 'switch',
'options' => [
'on' => esc_html__( 'Enable', 'opalestate-pro' ),
'off' => esc_html__( 'Disable', 'opalestate-pro' ),
],
],
[
'name' => esc_html__( 'Property SKU format', 'opalestate-pro' ),
'desc' => __( 'Use <code>{property_id}</code> to generate the property ID.', 'opalestate-pro' ),
'id' => 'submission_sku_format',
'type' => 'text',
'default' => 'SKU-{property_id}',
],
]
),
];
@ -258,8 +278,8 @@ class OpalEstate_Submission {
* Is submission page. 'submission_page' option in General Setting
*/
public function render_button_edit() {
global $post, $current_user;
wp_get_current_user();
if ( $current_user->ID == $post->post_author ) {
@ -281,13 +301,12 @@ class OpalEstate_Submission {
return opalestate_get_option( 'submission_page' ) == $post->ID;
}
/**
* Register metabox.
*
*
* @return \Opalestate_Property_MetaBox_Submission
*/
public function register_metabox() {
$metabox = new Opalestate_Property_MetaBox_Submission();
add_filter( 'cmb2_meta_boxes', [ $metabox, 'register_form' ], 9999 );
@ -299,32 +318,30 @@ class OpalEstate_Submission {
* FrontEnd Submission
*/
public function submission() {
global $current_user;
if ( ! is_user_logged_in() ) {
echo opalestate_load_template_path( 'submission/require-login' );
if( empty(opalestate_get_option("submission_show_content")) ){
return "";
if ( empty( opalestate_get_option( "submission_show_content" ) ) ) {
return "";
}
}
if( isset($_GET['do']) && $_GET['do'] == 'completed' ){
if ( isset( $_GET['do'] ) && $_GET['do'] == 'completed' ) {
OpalEstate()->session->set( 'submission', 'addnew' );
echo opalestate_load_template_path( 'submission/completed' );
return ;
return;
}
// remove all dirty images before edit/create new a property
$this->cleanup();
$this->cleanup();
wp_enqueue_script( 'opalestate-submission' );
wp_enqueue_style( 'opalesate-submission' );
wp_enqueue_style( 'opalesate-cmb2-front' );
$metabox = $this->register_metabox();
$metaboxes = apply_filters( 'cmb2_meta_boxes', [] );
@ -333,8 +350,8 @@ class OpalEstate_Submission {
return esc_html__( 'A metabox with the specified \'metabox_id\' doesn\'t exist.', 'opalestate-pro' );
}
$post_id = 0;
if( is_user_logged_in() ) {
if ( is_user_logged_in() ) {
// CMB2 is getting fields values from current post what means it will fetch data from submission page
// We need to remove all data before.
$post_id = ! empty( $_GET['id'] ) ? absint( $_GET['id'] ) : false;
@ -352,9 +369,11 @@ class OpalEstate_Submission {
if ( $post_id && ! opalestate_is_own_property( $post_id, $current_user->ID ) ) {
echo opalestate_load_template_path( 'parts/has-warning' );
return ;
return;
}
}
return opalestate_load_template_path( 'submission/submission-form',
[
'post_id' => $post_id,
@ -369,6 +388,7 @@ class OpalEstate_Submission {
*/
public function cmb2_get_metabox() {
$object_id = 'fake-oject-id';
return cmb2_get_metabox( OPALESTATE_PROPERTY_PREFIX . 'front', $object_id );
}
@ -380,35 +400,28 @@ class OpalEstate_Submission {
if ( isset( $_POST['submission_action'] ) && ! empty( $_POST['submission_action'] ) ) {
if ( wp_verify_nonce( $_POST['submission_action'], 'submitted-property' ) ) {
$user_id = get_current_user_id();
$edit = false;
$prefix = OPALESTATE_PROPERTY_PREFIX;
$prefix = OPALESTATE_PROPERTY_PREFIX;
$blocked = OpalEstate_User::is_blocked();
// Setup and sanitize data
if ( isset( $_POST[ $prefix . 'title' ] ) && ! $blocked && $user_id ) {
$metabox = $this->register_metabox();
$metaboxes = apply_filters( 'cmb2_meta_boxes', [] );
$post_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : false;
if( $post_id ){
if ( $post_id ) {
do_action( 'opalestate_process_edit_submission_before' );
} else {
do_action( 'opalestate_process_submission_before' );
}
$review_before = opalestate_get_option( 'admin_approve' );
$post_status = 'pending';
if ( ! $review_before ) {
if ( 'on' != opalestate_get_option( 'admin_approve', 'on' ) ) {
$post_status = 'publish';
}
@ -424,8 +437,7 @@ class OpalEstate_Submission {
$post_content = isset( $_POST[ $prefix . 'text' ] ) ? wp_kses( $_POST[ $prefix . 'text' ],
'<b><strong><i><em><h1><h2><h3><h4><h5><h6><pre><code><span><p>' ) : '';
$data = [
$data = [
'post_title' => sanitize_text_field( $_POST[ $prefix . 'title' ] ),
'post_author' => $user_id,
'post_status' => $post_status,
@ -457,14 +469,14 @@ class OpalEstate_Submission {
if ( empty( $data['post_title'] ) || empty( $data['post_author'] ) ) {
return opalestate_output_msg_json( false,
__( 'Please enter data for all require fields before submitting', 'opalestate-pro' ),
array(
'heading' => esc_html__('Submission Information' ,'opalestate-pro')
)) ;
__( 'Please enter data for all require fields before submitting', 'opalestate-pro' ),
[
'heading' => esc_html__( 'Submission Information', 'opalestate-pro' ),
] );
}
$post_id = wp_insert_post( $data, true );
if ( ! empty( $post_id ) && ! empty( $_POST['object_id'] ) ) {
$_POST['object_id'] = (int) $post_id;
@ -478,68 +490,74 @@ class OpalEstate_Submission {
/**
* Fetch sanitized values
*/
cmb2_get_metabox_form( $metaboxes[ $prefix. 'front' ], $post_id );
cmb2_get_metabox_form( $metaboxes[ $prefix . 'front' ], $post_id );
$cmb = $this->cmb2_get_metabox();
$sanitized_values = $cmb->get_sanitized_values( $_POST );
$cmb->save_fields( $post_id, 'post', $sanitized_values );
// Create featured image
$featured_image = get_post_meta( $post_id, $prefix . 'featured_image', true );
if ( ! empty( $_POST[ $prefix . 'featured_image' ] ) && isset( $_POST[ $prefix . 'featured_image' ] ) ) {
foreach( $_POST[ $prefix . 'featured_image' ] as $key => $value ) {
set_post_thumbnail( $post_id, $key );
}
unset( $_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 );
}
// remove meta field;
// Remove meta field.
update_post_meta( $post_id, $prefix . 'featured_image', null );
// Update SKU.
if ( 'on' == opalestate_get_option( 'enable_submission_generate_sku', 'off' ) ) {
$_sku = str_replace( '{property_id}', $post_id, opalestate_options( 'submission_sku_format', 'SKU-{property_id}' ) );
$sku_generated = apply_filters( 'opalestate_submission_sku_generated', sanitize_text_field( $_sku ) );
update_post_meta( $post_id, $prefix . 'sku', $sku_generated );
}
//redirect
$_SESSION['messages'][] = [ 'success', esc_html__( 'Property has been successfully updated.', 'opalestate-pro' ) ];
do_action( "opalestate_process_submission_after", $user_id, $post_id, $edit );
if ( $edit ) {
$type = OpalEstate()->session->set( 'submission' , 'edit' );
$message = esc_html__('The property has updated completed with new information', 'opalestate-pro' );
$type = OpalEstate()->session->set( 'submission', 'edit' );
$message = esc_html__( 'The property has updated completed with new information', 'opalestate-pro' );
do_action( "opalestate_processed_edit_submission", $user_id, $post_id );
} else {
$type = OpalEstate()->session->get( 'submission' , 'addnew' );
$message = esc_html__('You have submitted the property successful', 'opalestate-pro' );
$type = OpalEstate()->session->get( 'submission', 'addnew' );
$message = esc_html__( 'You have submitted the property successful', 'opalestate-pro' );
do_action( "opalestate_processed_new_submission", $user_id, $post_id );
}
// set ready of attachment for use.
if( $this->new_attachmenet_ids ){
if ( $this->new_attachmenet_ids ) {
foreach ( $this->new_attachmenet_ids as $_id ) {
delete_post_meta( $_id, '_pending_to_use_', 1 );
}
}
//
return opalestate_output_msg_json( true,
$message,
array(
'heading' => esc_html__('Submission Information' ,'opalestate-pro'),
'redirect' => opalestate_submssion_page( $post_id, array('do' => 'completed') )
)) ;
[
'heading' => esc_html__( 'Submission Information', 'opalestate-pro' ),
'redirect' => opalestate_submssion_page( $post_id, [ 'do' => 'completed' ] ),
] );
}
} else {
return opalestate_output_msg_json( fales,
__('Currently, your account was blocked, please keep contact admin to resolve this!.', 'opalestate-pro' ),
array('heading' => esc_html__('Submission Information' ,'opalestate-pro') )
) ;
__( '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,
__('Sorry! Your submitted datcould not save a at this time', 'opalestate-pro' ),
array('heading' => esc_html__('Submission Information', 'opalestate-pro') )
) ;
__( 'Sorry! Your submitted datcould not save a at this time', 'opalestate-pro' ),
[ 'heading' => esc_html__( 'Submission Information', 'opalestate-pro' ) ]
);
}
}
@ -547,57 +565,57 @@ class OpalEstate_Submission {
*
*
*/
private function get_field_name( $field ){
return OPALESTATE_PROPERTY_PREFIX.$field;
private function get_field_name( $field ) {
return OPALESTATE_PROPERTY_PREFIX . $field;
}
/**
* Process upload files.
*
*
* @param int $post_id Post ID.
*/
private function process_upload_files ( $post_id ) {
private function process_upload_files( $post_id ) {
//upload images for featured and gallery images
if( isset($_FILES) && !empty($_FILES) ){
if ( isset( $_FILES ) && ! empty( $_FILES ) ) {
///
$fields = array(
$this->get_field_name('gallery'),
$this->get_field_name('featured_image'),
);
$fields = [
$this->get_field_name( 'gallery' ),
$this->get_field_name( 'featured_image' ),
];
foreach( $_FILES as $key => $value ) {
foreach ( $_FILES as $key => $value ) {
// allow processing in fixed collection
if( in_array($key, $fields) ){
$ufile = $_FILES[$key];
if ( in_array( $key, $fields ) ) {
$ufile = $_FILES[ $key ];
/// /////
if( isset( $ufile['name'] ) && is_array( $ufile['name'] ) ){
$output = array();
if ( isset( $ufile['name'] ) && is_array( $ufile['name'] ) ) {
$output = [];
foreach ( $ufile['name'] as $f_key => $f_value ) {
$loop_file = array(
'name' => $ufile['name'][$f_key],
'type' => $ufile['type'][$f_key],
'tmp_name' => $ufile['tmp_name'][$f_key],
'error' => $ufile['error'][$f_key],
'size' => $ufile['size'][$f_key]
);
$new_atm = $this->upload_image( $loop_file, $post_id );
if( $new_atm ){
$_POST[$key] = isset($_POST[$key]) ? $_POST[$key] : array();
$_POST[$key][$new_atm['attachment_id']] = $new_atm['url'];
$this->new_attachmenet_ids[$new_atm['attachment_id']] = $new_atm['attachment_id'];
foreach ( $ufile['name'] as $f_key => $f_value ) {
$loop_file = [
'name' => $ufile['name'][ $f_key ],
'type' => $ufile['type'][ $f_key ],
'tmp_name' => $ufile['tmp_name'][ $f_key ],
'error' => $ufile['error'][ $f_key ],
'size' => $ufile['size'][ $f_key ],
];
$new_atm = $this->upload_image( $loop_file, $post_id );
if ( $new_atm ) {
$_POST[ $key ] = isset( $_POST[ $key ] ) ? $_POST[ $key ] : [];
$_POST[ $key ][ $new_atm['attachment_id'] ] = $new_atm['url'];
$this->new_attachmenet_ids[ $new_atm['attachment_id'] ] = $new_atm['attachment_id'];
}
}
}
///
elseif( isset($ufile['name']) ) {
$new_atm = $this->upload_image( $ufile, $post_id );
if( $new_atm ){
$_POST[$key][$new_atm['attachment_id']] = $new_atm['url'];
$this->new_attachmenet_ids[$new_atm['attachment_id']] = $new_atm['attachment_id'];
} ///
elseif ( isset( $ufile['name'] ) ) {
$new_atm = $this->upload_image( $ufile, $post_id );
if ( $new_atm ) {
$_POST[ $key ][ $new_atm['attachment_id'] ] = $new_atm['url'];
$this->new_attachmenet_ids[ $new_atm['attachment_id'] ] = $new_atm['attachment_id'];
}
}
//// / //
@ -605,56 +623,53 @@ class OpalEstate_Submission {
}
// for group files
$fields = array(
$this->get_field_name('public_floor_group')
);
$fields = [
$this->get_field_name( 'public_floor_group' ),
];
foreach ( $_FILES as $key => $value ) {
if ( in_array( $key, $fields ) ) {
$ufile = $_FILES[ $key ];
foreach( $_FILES as $key => $value ) {
if ( isset( $ufile['name'] ) && is_array( $ufile['name'] ) ) {
$output = [];
foreach ( $ufile['name'] as $f_key => $f_value ) {
if( in_array($key, $fields) ){
$ufile = $_FILES[$key];
foreach ( $f_value as $u_key => $u_v ) {
$loop_file = [
'name' => $ufile['name'][ $f_key ][ $u_key ],
'type' => $ufile['type'][ $f_key ][ $u_key ],
'tmp_name' => $ufile['tmp_name'][ $f_key ][ $u_key ],
'error' => $ufile['error'][ $f_key ][ $u_key ],
'size' => $ufile['size'][ $f_key ][ $u_key ],
];
if( isset( $ufile['name'] ) && is_array( $ufile['name'] ) ){
$output = array();
foreach ( $ufile['name'] as $f_key => $f_value ) {
$new_atm = $this->upload_image( $loop_file, $post_id );
if ( $new_atm ) {
foreach( $f_value as $u_key => $u_v ) {
$loop_file = array(
'name' => $ufile['name'][$f_key][$u_key],
'type' => $ufile['type'][$f_key][$u_key],
'tmp_name' => $ufile['tmp_name'][$f_key][$u_key],
'error' => $ufile['error'][$f_key][$u_key],
'size' => $ufile['size'][$f_key][$u_key]
);
$new_atm = $this->upload_image( $loop_file, $post_id );
if( $new_atm ){
$_POST[$key][$f_key][$u_key] = $new_atm['attachment_id'];
$this->new_attachmenet_ids[$new_atm['attachment_id']] = $new_atm['attachment_id'];
$_POST[ $key ][ $f_key ][ $u_key ] = $new_atm['attachment_id'];
$this->new_attachmenet_ids[ $new_atm['attachment_id'] ] = $new_atm['attachment_id'];
}
}
}
}
}
}
}
}
}
/**
* Process upload images for properties
*/
public function upload_image( $submitted_file, $parent_id=0 ){
public function upload_image( $submitted_file, $parent_id = 0 ) {
return opalesate_upload_image( $submitted_file, $parent_id );
}
/**
* FrontEnd Submission
*/
private function cleanup() {
$user_id = get_current_user_id();
private function cleanup() {
$user_id = get_current_user_id();
opalestate_clean_attachments( $user_id );
}

8
inc/template-hook-functions.php
View File

@ -218,6 +218,10 @@ add_action( 'opalestate_single_property_preview', 'opalestate_property_preview',
function opalestate_property_request_viewing_button( $islink = false ) {
if ( 'on' != opalestate_get_option( 'enable_single_request_viewing', 'on' ) ) {
return;
}
$class = $islink ? 'btn-link' : 'btn btn-primary';
if ( ! is_user_logged_in() ) {
$class .= ' opalestate-need-login';
@ -260,6 +264,10 @@ add_action( 'opalestate_single_property_layout', 'opalestate_single_property_lay
* Forms
*/
function opalestate_property_request_view_form() {
if ( 'on' != opalestate_get_option( 'enable_single_request_viewing', 'on' ) ) {
return;
}
if ( ! is_user_logged_in() ) {
return;
}

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.1.7
* Version: 1.1.8
* 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.1.7' );
_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'opalestate-pro' ), '1.1.8' );
}
/**
@ -160,7 +160,7 @@ if ( ! class_exists( 'OpalEstate' ) ) {
public function setup_constants() {
// Plugin version
if ( ! defined( 'OPALESTATE_VERSION' ) ) {
define( 'OPALESTATE_VERSION', '1.1.7' );
define( 'OPALESTATE_VERSION', '1.1.8' );
}
// Plugin Folder Path

13
readme.txt
View File

@ -1,10 +1,10 @@
=== Opal Estate Pro - Property Management and Submission ===
Contributors: wpopal, ndoublehwp
Contributors: wpopal
Donate link: https://wpdocs.gitbook.io/opal-estate/
Tags: estate, property, opalestate, house for rent, agency for lease, estate submission, agents estate property, property marketplace
Requires at least: 4.6
Tested up to: 5.2.3
Stable tag: 1.1.7
Stable tag: 1.1.8
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html
@ -120,6 +120,7 @@ The plugin will not make you disappointed with ease of use, friendly & flexible
= WHAT IS NEW IN PRO VERSION =
* Suport API use to develop great web app and mobile app .
* Agency Agency and allow edit profile with user having Opal Estate Agency Role. Display Properties and members of agency
* Implement Google Map with custom styles.
* Implement Google Capcha for all Email Form
* Implement Saved Search Form allowing user save theirs result as loved collection. They are managed with Saved Search Menu of user dashboard
* Supported Widgets working with Elementor page builder
@ -155,6 +156,14 @@ 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.1.8 - 2019-10-31 =
* Fixes - Submission settings.
* Fixes - Order settings in the search page.
* Fixes - Single property image size.
* Added - Automatic generate property SKU.
* Added - Enable/Disable Request Viewing.
= 1.1.7 - 2019-10-30 =
* Added - Google Map styles.

20
templates/single-property/preview.php
View File

@ -1,8 +1,10 @@
<div class="property-preview">
<?php
global $property;
$galleries = $property->get_gallery();
$image_size = opalestate_get_option( 'opalestate_thumbnail_size', 'medium' );
$galleries = $property->get_gallery();
$thumb_image_size = opalestate_get_option( 'opalestate_thumbnail_size', 'medium' );
$single_image_size = opalestate_get_option( 'featured_image_size', 'full' );
if ( isset( $galleries ) && $galleries ):
?>
<?php
@ -45,13 +47,13 @@
<div class="swiper-wrapper opalestate-gallery">
<?php if ( has_post_thumbnail() ): ?>
<div class="swiper-slide">
<?php the_post_thumbnail( opalestate_get_option( 'featured_image_size', 'full' ) ); ?>
<?php the_post_thumbnail( $single_image_size ); ?>
</div>
<?php endif; ?>
<?php if ( isset( $galleries ) && is_array( $galleries ) && $galleries ): ?>
<?php foreach ( $galleries as $src ): ?>
<?php foreach ( $galleries as $key => $src ): ?>
<div class="swiper-slide">
<img src="<?php echo esc_url( $src ); ?>" alt="gallery">
<img src="<?php echo esc_url( wp_get_attachment_image_url( $key, $single_image_size ) ); ?>" alt="gallery">
</div>
<?php endforeach; ?>
<?php endif; ?>
@ -68,22 +70,22 @@
$count_galleries = $count_galleries + count( $galleries );
?>
<?php if ( $count_galleries > $columns ) : ?>
<div class="swiper-button-prev"> <i class="fas fa-angle-left"></i></div>
<div class="swiper-button-next"> <i class="fas fa-angle-right"></i></div>
<div class="swiper-button-prev"><i class="fas fa-angle-left"></i></div>
<div class="swiper-button-next"><i class="fas fa-angle-right"></i></div>
<?php endif; ?>
<div class="swiper-wrapper">
<?php if ( has_post_thumbnail() ):
?>
<div class="swiper-slide">
<div style="background-image:url('<?php echo wp_get_attachment_thumb_url( get_post_thumbnail_id(), $image_size ); ?>');" class="thumb-nav"></div>
<div style="background-image:url('<?php echo wp_get_attachment_thumb_url( get_post_thumbnail_id(), $thumb_image_size ); ?>');" class="thumb-nav"></div>
</div>
<?php endif; ?>
<?php if ( isset( $galleries ) && is_array( $galleries ) && $galleries ): ?>
<?php foreach ( $galleries as $key => $src ): ?>
<div class="swiper-slide">
<div style="background-image:url('<?php echo wp_get_attachment_image_url( $key, $image_size ); ?>');" class="thumb-nav"></div>
<div style="background-image:url('<?php echo wp_get_attachment_image_url( $key, $thumb_image_size ); ?>');" class="thumb-nav"></div>
</div>
<?php endforeach; ?>
<?php endif; ?>

10
templates/single-property/preview/gallery-slider.php
View File

@ -4,8 +4,8 @@
global $property;
$galleries = $property->get_gallery();
$single_image_size = opalestate_get_option( 'featured_image_size', 'full' );
$image_size = opalestate_get_option( 'opalestate_thumbnail_size' );
if ( ! empty( $galleries ) && isset( $galleries ) ):
?>
<?php
@ -32,12 +32,12 @@
<div class="swiper-wrapper">
<?php if ( has_post_thumbnail() ): ?>
<div class="swiper-slide"><?php the_post_thumbnail( opalestate_get_option( 'featured_image_size', 'full' ) ); ?></div>
<div class="swiper-slide"><?php the_post_thumbnail( $single_image_size ); ?></div>
<?php endif; ?>
<?php if ( isset( $galleries ) && is_array( $galleries ) ): ?>
<?php foreach ( $galleries as $src ): ?>
<div class="swiper-slide"><img src="<?php echo esc_url( $src ); ?>" alt="gallery"></div>
<?php foreach ( $galleries as $key => $src ): ?>
<div class="swiper-slide"><img src="<?php echo esc_url( wp_get_attachment_image_url( $key, $single_image_size ) ); ?>" alt="gallery"></div>
<?php endforeach; ?>
<?php endif; ?>
@ -48,7 +48,7 @@
<?php if ( has_post_thumbnail() ): ?>
<div class="property-thumbnail">
<?php the_post_thumbnail( 'full' ); ?>
<?php the_post_thumbnail( $single_image_size ); ?>
</div>
<?php endif; ?>
<?php endif; ?>

50
templates/submission/completed.php
View File

@ -1,27 +1,33 @@
<?php
<?php
$post_id = intval( $_GET['id'] );
$post = get_post( $post_id );
$type = OpalEstate()->session->get( 'submission' );
$post = get_post( $post_id );
$type = OpalEstate()->session->get( 'submission' );
?>
<div class="opalestate-box-completed alert alert-success">
<div class="inner">
<?php if( $type == 'addnew' ): ?>
<div class="addnew-msg">
<h5><?php echo esc_html__('Thanks for your submission, it takes some time to review the property.'); ?></h5>
<?php echo sprintf( esc_html__( 'Click to %s here %s to back to your listing or %s edit %s this.', 'opalestate-pro'),
'<a href="'.opalestate_submssion_list_page().'">', '</a>',
'<a href="'.opalestate_submssion_page( $post_id ).'">', '</a>'
); ?>
</div>
<div class="inner">
<?php if ( $type == 'addnew' ): ?>
<div class="addnew-msg">
<?php if ( 'on' != opalestate_get_option( 'admin_approve', 'on' ) ) : ?>
<h5><?php esc_html_e( 'Thanks for your submission, your property is published.', 'opalestate-pro' ); ?></h5>
<?php else : ?>
<h5><?php esc_html_e( 'Thanks for your submission, it takes some time to review the property.', 'opalestate-pro' ); ?></h5>
<?php endif; ?>
<?php echo sprintf( esc_html__( 'Click to %s here %s to back to your listing or %s edit %s this.', 'opalestate-pro' ),
'<a href="' . opalestate_submssion_list_page() . '">', '</a>',
'<a href="' . opalestate_submssion_page( $post_id ) . '">', '</a>'
); ?>
</div>
<?php else : ?>
<div class="edit-msg">
<?php echo esc_html__('Your property is completed success.'); ?>
<?php echo sprintf( esc_html__( 'Click to %s here %s to back to your listing or %s edit %s this.', 'opalestate-pro'),
'<a href="'.opalestate_submssion_list_page().'">', '</a>',
'<a href="'.opalestate_submssion_page( $post_id ).'">', '</a>'
); ?>
</div>
<?php endif; ?>
</div>
<div class="edit-msg">
<?php esc_html_e( 'Your property is completed success.', 'opalestate-pro' ); ?>
<?php echo sprintf( esc_html__( 'Click to %s here %s to back to your listing or %s edit %s this.', 'opalestate-pro' ),
'<a href="' . opalestate_submssion_list_page() . '">', '</a>',
'<a href="' . opalestate_submssion_page( $post_id ) . '">', '</a>'
); ?>
</div>
<?php endif; ?>
</div>
</div>
<?php OpalEstate()->session->set( 'submission', null ); ?>
<?php OpalEstate()->session->set( 'submission', null ); ?>