From 05d30614ed7ea8d50f198cbbb58cd05fd3e7a06f Mon Sep 17 00:00:00 2001 From: Hoang Huu Date: Thu, 21 May 2020 17:08:16 +0700 Subject: [PATCH] Fixes. Tag 1.4.9.2 --- assets/opalestate.css | 5 + assets/scss/opalestate/_dashboard.scss | 7 +- changelog.txt | 4 + inc/.DS_Store | Bin 10244 -> 10244 bytes inc/admin/.DS_Store | Bin 0 -> 6148 bytes inc/admin/settings/pages.php | 1 + inc/ajax-functions.php | 2 +- inc/message/class-opalestate-message.php | 19 ++-- .../class-opalestate-request-reviewing.php | 14 +-- inc/vendors/.DS_Store | Bin 8196 -> 8196 bytes opal-estate-pro.php | 6 +- readme.txt | 4 + templates/.DS_Store | Bin 6148 -> 10244 bytes templates/user/messages.php | 87 ++++++++++-------- templates/user/read-messages.php | 16 +++- 15 files changed, 102 insertions(+), 63 deletions(-) create mode 100644 inc/admin/.DS_Store diff --git a/assets/opalestate.css b/assets/opalestate.css index 1e685417..baa4a80a 100755 --- a/assets/opalestate.css +++ b/assets/opalestate.css @@ -4036,3 +4036,8 @@ header#masthead { top: 50%; transform: translateY(-50%); } + +.opalestate-read-message .message-container { + border-bottom: 1px solid #ebebeb; + margin-bottom: 15px; +} diff --git a/assets/scss/opalestate/_dashboard.scss b/assets/scss/opalestate/_dashboard.scss index a22899b2..78ede976 100755 --- a/assets/scss/opalestate/_dashboard.scss +++ b/assets/scss/opalestate/_dashboard.scss @@ -476,4 +476,9 @@ top:0; } } -} \ No newline at end of file +} + +.opalestate-read-message .message-container { + border-bottom: 1px solid #ebebeb; + margin-bottom: 15px; +} diff --git a/changelog.txt b/changelog.txt index c18311b2..433af0bf 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ += 1.4.9.2 - 2020-05-21 = +* Added - Message additional information. +* Fixes - Set feature property for customers. + = 1.4.9.1 - 2020-05-14 = * Fixes - Responsive slider. diff --git a/inc/.DS_Store b/inc/.DS_Store index c3ad825f25938e3db0703d7a0160f107a50c45de..c2b05e73778dcc54d0e4d0f47dfac89d74a5e515 100755 GIT binary patch delta 210 zcmZn(XbG6$&&aniU^hP_-)0_x0(Lz%h9ZVUh7yKMhCGJ!r1Ii|q@4UD1_p+&Nd-BX z#U%y?HyD|iSy+X>pS)6{0|4iL3>^Rf diff --git a/inc/admin/.DS_Store b/inc/admin/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c64b7b2ff4ea6e21374a14c2b4815c91e612ddf7 GIT binary patch literal 6148 zcmeHK&1%~~5Z<-jREnV}kV67FEcDQe4-R(i9EBVAR7j{yeP~)oLc$gmDV(S@y=yqwGBf_tG?h0B!rh zyEvK;oc&j+%>7tKnX0F2T=ZiZrt?lZmElCio8rno_wy0dv7Wo1gyPe-?16KzSiEeW z)I_t@Sk}a%-L8Y(Xf2nvWgWhF{r2PZ^Ovtz->z@I|G3q&z~P5gvS)AwKfzcdWaecu zN#zjytDIFVAu&J<5CdDvfLYG0>XyDgy*4pG4E#F=aD5PP9tC69O8JU|K3Rk0pU#M`#U5(Td z1H`~O17-c_;QrtJ`~81CiJpi7V&G9Rz$>TTX$L;Z?5!IghkLC6y#z(UxI*La6fo3Q g46(QsAAl+Wzd!@fHCSi_4+tFu6b;l61OJtQUsYscC;$Ke literal 0 HcmV?d00001 diff --git a/inc/admin/settings/pages.php b/inc/admin/settings/pages.php index a3e33ea4..84a14b68 100644 --- a/inc/admin/settings/pages.php +++ b/inc/admin/settings/pages.php @@ -158,6 +158,7 @@ class Opalestate_Settings_Pages_Tab extends Opalestate_Settings_Base_Tab { 'on' => esc_html__( 'Enable', 'opalestate-pro' ), 'off' => esc_html__( 'Disable', 'opalestate-pro' ), ], + 'default' => 'off', ], [ 'name' => esc_html__( 'Show Submission', 'opalestate-pro' ), diff --git a/inc/ajax-functions.php b/inc/ajax-functions.php index b4a151d6..40161601 100755 --- a/inc/ajax-functions.php +++ b/inc/ajax-functions.php @@ -211,7 +211,7 @@ function opalestate_toggle_featured_property() { $check = apply_filters( 'opalestate_set_feature_property_checked', false ); if ( $check ) { do_action( 'opalestate_toggle_featured_property_before', $user_id, $property_id ); - update_post_meta( $property_id, OPALESTATE_PROPERTY_PREFIX . 'featured', 1 ); + update_post_meta( $property_id, OPALESTATE_PROPERTY_PREFIX . 'featured', 'on' ); echo json_encode( [ 'status' => true, 'msg' => esc_html__( 'Could not set this as featured', 'opalestate-pro' ) ] ); wp_die(); } diff --git a/inc/message/class-opalestate-message.php b/inc/message/class-opalestate-message.php index a2aee541..9cee00d5 100755 --- a/inc/message/class-opalestate-message.php +++ b/inc/message/class-opalestate-message.php @@ -370,29 +370,32 @@ class OpalEstate_User_Message { $charset_collate = $wpdb->get_charset_collate(); $sql = 'CREATE TABLE IF NOT EXISTS ' . $wpdb->prefix . 'opalestate_message' . ' ( - `id` int(11) UNSIGNED NOT NULL, - `subject` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `subject` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `message` text COLLATE utf8mb4_unicode_ci NOT NULL, - `phone` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `sender_email` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, + `phone` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, + `sender_email` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `sender_id` int(11) DEFAULT NULL, `created` datetime NOT NULL, `receiver_id` int(11) NOT NULL, `post_id` int(11) NOT NULL, - `type` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL, - `isread` tinyint(1) NOT NULL + `type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, + `isread` tinyint(1) NOT NULL, + PRIMARY KEY (id) ) ' . $charset_collate; dbDelta( $sql ); /// $sql = 'CREATE TABLE IF NOT EXISTS ' . $wpdb->prefix . 'opalestate_message_reply' . ' ( - `id` int(11) NOT NULL, + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `message_id` int(11) NOT NULL, `sender_id` int(11) NOT NULL, `message` text NOT NULL, `created` datetime NOT NULL, - `receiver_id` int(11) NOT NULL + `receiver_id` int(11) NOT NULL, + PRIMARY KEY (id) ) ' . $charset_collate; dbDelta( $sql ); diff --git a/inc/message/class-opalestate-request-reviewing.php b/inc/message/class-opalestate-request-reviewing.php index 6de5fafa..521ca631 100755 --- a/inc/message/class-opalestate-request-reviewing.php +++ b/inc/message/class-opalestate-request-reviewing.php @@ -119,17 +119,19 @@ class OpalEstate_User_Request_Viewing { $charset_collate = $wpdb->get_charset_collate(); $sql = 'CREATE TABLE IF NOT EXISTS ' . $wpdb->prefix . 'opalestate_message' . ' ( - `id` int(11) UNSIGNED NOT NULL, - `subject` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `subject` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `message` text COLLATE utf8mb4_unicode_ci NOT NULL, - `phone` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `sender_email` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, + `phone` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, + `sender_email` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `sender_id` int(11) DEFAULT NULL, `created` datetime NOT NULL, `receiver_id` int(11) NOT NULL, `post_id` int(11) NOT NULL, - `type` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL, - `isread` tinyint(1) NOT NULL + `type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, + `isread` tinyint(1) NOT NULL, + PRIMARY KEY (id) ) ' . $charset_collate; dbDelta( $sql ); diff --git a/inc/vendors/.DS_Store b/inc/vendors/.DS_Store index 077103fc4048244ee4b181dd632018ac3f8df22f..c36aafcf0dca67cffde954344bd43b1c84ed8925 100755 GIT binary patch delta 566 zcmZp1XmOa}&&akhU^hP_+vL9jGMhC7_}S`t7>XJ48IlUWBsI@9C$%g!&%ekgu_U!98l*TRKR*Yk0K!g8np`PhQV-??B$i|V zB{-BFvK4@KGB9v*aK;NrR9BlCS?DO3SQyvpC{&x98vxnHX0^4P92}DBZb5OSO?|Uw xFIl>5`JuyLT?~wj5Sl>{O2eolKn7OdvVgohSwn2rW_AgK(GUT~KP*J10{{vFknjKi delta 44 vcmZp1XmOa}&&aYdU^hP_%jCZTGMhC7_}M1ch<9&naAn-gE@1%WI57eMMYs-5 diff --git a/opal-estate-pro.php b/opal-estate-pro.php index 025c5675..9225720e 100755 --- a/opal-estate-pro.php +++ b/opal-estate-pro.php @@ -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.4.9.1 + * Version: 1.4.9.2 * Author: WPOPAL * Author URI: http://www.wpopal.com * Requires at least: 4.9 @@ -150,7 +150,7 @@ if ( ! class_exists( 'OpalEstate' ) ) { */ public function __clone() { // Cloning instances of the class is forbidden - _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'opalestate-pro' ), '1.4.9.1' ); + _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'opalestate-pro' ), '1.4.9.2' ); } /** @@ -159,7 +159,7 @@ if ( ! class_exists( 'OpalEstate' ) ) { public function setup_constants() { // Plugin version if ( ! defined( 'OPALESTATE_VERSION' ) ) { - define( 'OPALESTATE_VERSION', '1.4.9.1' ); + define( 'OPALESTATE_VERSION', '1.4.9.2' ); } // Plugin Folder Path diff --git a/readme.txt b/readme.txt index 9f5265f6..c4016b13 100755 --- a/readme.txt +++ b/readme.txt @@ -152,6 +152,10 @@ This section describes how to install the plugin and get it working. * System tickets support 24/7 available : [free support](https://themelexus.ticksy.com/ "Visit the Plugin support Page") == Changelog == += 1.4.9.2 - 2020-05-21 = +* Added - Message additional information. +* Fixes - Set feature property for customers. + = 1.4.9.1 - 2020-05-14 = * Fixes - Responsive slider. diff --git a/templates/.DS_Store b/templates/.DS_Store index 25bc42132969a23d1faef4c82069ef4791230513..3a07432b888da2fa90c0f998ebde9daf89a0644d 100755 GIT binary patch literal 10244 zcmeHMTWl3Y7@q&MlwG^hZK<%O2V5)^!4ghsDdGhVZ9$P@YfnqdMcO@QN4jCVTX*-I zf=5i_i$=vaZ(zJ6f*M{CyuApT7&Y5QKKf1%p^1a?0?(c zuiwn}pF;?N*1X+Fh)D=hursM^I9#DIJL@xABGxb?U_2p|cqAe|3CPMB-clhEkO)Ww zBmxoviNLjh0DiMsQ_6*uqeMU=AQ8BX0NWo->`bO(IVL3EI&k160LoHS^M-S*19*%X z%XBQqgyf-^Q&bNSheBLpfCxvs$=p$u?I2qz%I3B-4XxIzJbcZ@T+JAt&2a+C;2 z1ZE<@md#wO+gmsAvaX-Sh>O_~*9oIk>N`l3l+G%ft*AGY ztL1ab)dw>}{%9t$qI}qD1p|6AQK>kK-qhz7fubC2)4=pg1+ zcDqAI2lVPT--|5AqXEw+a_sJNJlh{__4A$`a{o9vpLbc&5avDg*~;)dgkk95>B!zmDE@X$qqxt+M<;}%XcUWUQnxplYf?>r0pn=~ z6Sk|u_%Rx%05T1%Qj#Yj(k+lcvCnD@h8q^z#M(=ooM6qlNo!BL(YWW{E%$BJ2K1@| zuAt75$nm{!I}JjV1A0Y>D{V{8_qqbg?0q@k%@2FwfL@ui++5zp<+#yxGtMIvbroSQ z@Ljjd4;_|fM}I{3N6a?E)W0+IgQ$%s>vu4}@Y3@k?WUO2DbRLI9qOPSpEEzXc`elaJ z6XGlBmZEaaZ4H{%vk!L|JyeAz)uo*w29(L0XD~vivs7G!6Q$-|cTVxnJm~EqNQ(IAR%WC3_hSa4S;)xK1@E5O3 zr^L02|0OLXt4TZQAcMH86v-j-B6*#hAScNwa)x|C#>qKyf&4^%Ccl!4B30>rg{=;K_Bi*xCAmaFmg&lPZOsCsygsSnl2G}@iuza9DpJ`3Xj1PF<}qE^Y8+^ z1c%{eI10z$EhO%7H~}Z&6cYG7I1Qh}IGly^(eq7ptL>H-ilEZ#oP1*2~?Qa2eGrp{Kkaj zAviD>rsv1;c)`vUZ;f?v@yhM#ST`ml563tjj#8ZF|L;Er$ogN_|NrhZ>$;U`Li`&` yYFHMtb8rYU162Wm05_0u1!>q=_?>w&zltNsL4l@8-c@bOy diff --git a/templates/user/messages.php b/templates/user/messages.php index 23d1f045..29d113d2 100755 --- a/templates/user/messages.php +++ b/templates/user/messages.php @@ -1,46 +1,53 @@ - isset( $_GET['cpage'] ) ? abs( (int) $_GET['cpage'] ) : 1, - 'items_per_page' => 10 -); -$messages = opalestate_get_message_by_user( $args ); + isset( $_GET['cpage'] ) ? abs( (int) $_GET['cpage'] ) : 1, + 'items_per_page' => 10, +]; +$messages = opalestate_get_message_by_user( $args ); ?>
-

-
-
- - - - - - - +

+
+
+
- <?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?> - sender_id ); ?> - - -
subject ); ?>
-

message ); ?>

-
-
created ); ?>
+ + + + + + - -
+ <?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?> + sender_id ) : ?> + sender_id ); ?> + + name ) && $message->name ) : ?> + name ); ?> + +
sender_email ); ?>
+
phone ); ?>
+
+ +
subject ); ?>
+

message ); ?>

+
+
created ); ?>
-
-
- add_query_arg( 'cpage', '%#%' ), - 'format' => '', - 'prev_text' => esc_html__('«'), - 'next_text' => esc_html__('»'), - 'total' => ceil( $messages['total'] / $args['items_per_page'] ), - 'current' => $args['cpage'] - )); + +
+ +
+ add_query_arg( 'cpage', '%#%' ), + 'format' => '', + 'prev_text' => esc_html__( '«' ), + 'next_text' => esc_html__( '»' ), + 'total' => ceil( $messages['total'] / $args['items_per_page'] ), + 'current' => $args['cpage'], + ] ); ?> -
-
+
+ diff --git a/templates/user/read-messages.php b/templates/user/read-messages.php index 462a9a30..640f0761 100755 --- a/templates/user/read-messages.php +++ b/templates/user/read-messages.php @@ -14,22 +14,30 @@ $id = 'message-reply';
<?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?> + name ) && $message->name ) : ?> + name ); ?> + + sender_email ); ?> / + phone ); ?>
- created ); ?> + created ); ?>
-

message ); ?>

+

message ); ?>

- +
<?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?> + sender_id ) : ?> + sender_id ); ?> +
+ created ); ?>
-
created; ?>
message; ?>