Fixes. Tag 1.4.9.2

This commit is contained in:
Hoang Huu
2020-05-21 17:08:16 +07:00
parent 4ddb72638e
commit 05d30614ed
15 changed files with 102 additions and 63 deletions

BIN
templates/.DS_Store vendored

Binary file not shown.

View File

@@ -1,46 +1,53 @@
<?php
$args = array(
'cpage' => isset( $_GET['cpage'] ) ? abs( (int) $_GET['cpage'] ) : 1,
'items_per_page' => 10
);
$messages = opalestate_get_message_by_user( $args );
<?php
$args = [
'cpage' => isset( $_GET['cpage'] ) ? abs( (int) $_GET['cpage'] ) : 1,
'items_per_page' => 10,
];
$messages = opalestate_get_message_by_user( $args );
?>
<div class="opalestate-admin-box">
<h3 class="page-title"><?php echo sprintf( esc_html__( 'Messages for you', 'opalestate-pro'), '' ); ?></h3>
<div class="opalestate-messages-list">
<div class="message-item">
<table>
<?php foreach( $messages['items'] as $message ): ?>
<tr>
<td width="220">
<img src="<?php echo OpalEstate_User::get_author_picture( $message->sender_id ); ?>" width="60" alt="<?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?>"/>
<span><?php echo opalestate_user_fullname( $message->sender_id ); ?></span>
</td>
<td>
<a href="<?php echo opalestate_get_read_message_uri( $message->id ); ?>">
<h6><?php echo esc_html( $message->subject ); ?></h6>
<p><?php echo esc_html( $message->message ); ?></p>
</a>
</td>
<td width="200"><?php echo esc_html( $message->created ); ?></td>
</tr>
<h3 class="page-title"><?php echo sprintf( esc_html__( 'Messages for you', 'opalestate-pro' ), '' ); ?></h3>
<div class="opalestate-messages-list">
<div class="message-item">
<table>
<?php foreach ( $messages['items'] as $message ): ?>
<tr>
<td width="220">
<img src="<?php echo OpalEstate_User::get_author_picture( $message->sender_id ); ?>" width="60" alt="<?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?>"/>
<?php if ( $message->sender_id ) : ?>
<span><?php echo opalestate_user_fullname( $message->sender_id ); ?></span>
<?php endif; ?>
<?php if ( isset( $message->name ) && $message->name ) : ?>
<span><?php echo esc_html( $message->name ); ?></span>
<?php endif; ?>
<div><?php echo esc_html( $message->sender_email ); ?></div>
<div><?php echo esc_html( $message->phone ); ?></div>
</td>
<td>
<a href="<?php echo opalestate_get_read_message_uri( $message->id ); ?>">
<h6><?php echo esc_html( $message->subject ); ?></h6>
<p><?php echo esc_html( $message->message ); ?></p>
</a>
</td>
<td width="200"><code><?php echo esc_html( $message->created ); ?></code></td>
</tr>
<?php endforeach; ?>
</table>
</div>
<div class="opalestate-pagination pagination-main">
<?php
echo paginate_links( array(
'base' => add_query_arg( 'cpage', '%#%' ),
'format' => '',
'prev_text' => esc_html__('&laquo;'),
'next_text' => esc_html__('&raquo;'),
'total' => ceil( $messages['total'] / $args['items_per_page'] ),
'current' => $args['cpage']
));
</table>
</div>
<div class="opalestate-pagination pagination-main">
<?php
echo paginate_links( [
'base' => add_query_arg( 'cpage', '%#%' ),
'format' => '',
'prev_text' => esc_html__( '&laquo;' ),
'next_text' => esc_html__( '&raquo;' ),
'total' => ceil( $messages['total'] / $args['items_per_page'] ),
'current' => $args['cpage'],
] );
?>
</div>
</div>
</div>
</div>
</div>

View File

@@ -14,22 +14,30 @@ $id = 'message-reply';
<div class="message-meta">
<div class="message-avatar">
<img src="<?php echo esc_url( OpalEstate_User::get_author_picture( $message->sender_id ) ); ?>" width="60" alt="<?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?>"/>
<?php if ( isset( $message->name ) && $message->name ) : ?>
<span class="message-name"><?php echo esc_html( $message->name ); ?></span>
<?php endif; ?>
<span class="message-email"><?php echo esc_html( $message->sender_email ); ?></span> /
<span class="message-phone"><?php echo esc_html( $message->phone ); ?></span>
</div>
<span class="message-date"><?php echo esc_html( $message->created ); ?></span>
<code class="message-date"><?php echo esc_html( $message->created ); ?></code>
</div>
<div class="message-content">
<p><?php echo esc_html( $message->message ); ?></p>
<p><?php echo esc_html( $message->message ); ?></p>
</div>
</div>
</div>
<?php if ( $replies ): ?>
<?php foreach ( $replies as $reply ): ?>
<?php foreach ( $replies as $reply ) : ?>
<div class="message-body">
<div class="message-avatar">
<img src="<?php echo OpalEstate_User::get_author_picture( $reply->sender_id ); ?>" width="60" alt="<?php esc_attr_e( 'User Avatar', 'opalestate-pro' ); ?>"/>
<?php if ( $reply->sender_id ) : ?>
<span class="message-name"><?php echo opalestate_user_fullname( $reply->sender_id ); ?></span>
<?php endif; ?>
</div>
<code class="message-date"><?php echo esc_html( $reply->created ); ?></code>
<div class="message-content">
<div><?php echo $reply->created; ?></div>
<?php echo $reply->message; ?>
</div>
</div>