Skip to content

Commit

Permalink
v1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@navneet-cedcoss
navneet-cedcoss committed May 31, 2023
1 parent bc3ddb4 commit b155c3a
Show file tree
Hide file tree
Showing 11 changed files with 543 additions and 421 deletions.
2 changes: 1 addition & 1 deletion admin/partials/points-rewards-for-woocommerce-admin-display.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
wp_nonce_field( 'wps-wpr-nonce', 'wps-wpr-nonce' );
if ( class_exists( 'Points_Rewards_For_WooCommerce_Admin' ) ) {

$wps_par_get_count = new Points_Rewards_For_WooCommerce_Admin( 'points-and-rewards-for-woocommerce', '1.6.0' );
$wps_par_get_count = new Points_Rewards_For_WooCommerce_Admin( 'points-and-rewards-for-woocommerce', '1.6.1' );
$wps_pending_par = $wps_par_get_count->wps_par_get_count( 'wc-pending' );
$wps_pending_par = ! empty( $wps_pending_par ) && is_array( $wps_pending_par ) ? count( $wps_pending_par ) : 0;
$wps_count_users = $wps_par_get_count->wps_par_get_count_users( 'users' );
Expand Down
117 changes: 103 additions & 14 deletions admin/partials/templates/class-points-log-list-table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
if ( ! defined( 'ABSPATH' ) ) {
exit;
}

if ( ! class_exists( 'WP_List_Table' ) ) {
require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
}
Expand All @@ -24,6 +25,7 @@
* @link https://www.wpswings.com/
*/
class Points_Log_List_Table extends WP_List_Table {

/**
* This is variable which is used for the store all the data.
*
Expand All @@ -38,7 +40,6 @@ class Points_Log_List_Table extends WP_List_Table {
*/
public $wps_total_count;


/**
* This construct colomns in point table.
*
Expand Down Expand Up @@ -120,7 +121,6 @@ public function column_default( $item, $column_name ) {
public function view_html( $user_id ) {

echo '<a href="javascript:void(0)" class="wps_points_update button button-primary wps_wpr_save_changes" data-id="' . esc_html( $user_id ) . '">' . esc_html__( 'Update', 'points-and-rewards-for-woocommerce' ) . '</a>';

}

/**
Expand All @@ -134,20 +134,56 @@ public function process_bulk_action() {

if ( 'bulk-delete' === $this->current_action() ) {
if ( isset( $_POST['points-log'] ) ) {

$wps_membership_nonce = sanitize_text_field( wp_unslash( $_POST['points-log'] ) );
if ( wp_verify_nonce( $wps_membership_nonce, 'points-log' ) ) {
if ( isset( $_POST['mpr_points_ids'] ) && ! empty( $_POST['mpr_points_ids'] ) ) {

$all_id = map_deep( wp_unslash( $_POST['mpr_points_ids'] ), 'sanitize_text_field' );
foreach ( $all_id as $key => $value ) {
delete_user_meta( $value, 'wps_wpr_points' );

$this->wps_wpr_create_points_reset_log( $value );
update_user_meta( $value, 'wps_wpr_points', 0 );
}
}
}
}
}
do_action( 'wps_wpr_process_bulk_reset_option', $this->current_action(), $_POST );
}

/**
* This function is used to create log for resets points.
*
* @param String $user_id user_id.
* @return void
*/
public function wps_wpr_create_points_reset_log( $user_id ) {

$get_points = get_user_meta( $user_id, 'wps_wpr_points', true );
$wps_reset_points_log = get_user_meta( $user_id, 'points_details', true );
$wps_reset_points_log = ! empty( $wps_reset_points_log ) && is_array( $wps_reset_points_log ) ? $wps_reset_points_log : array();

if ( $get_points > 0 ) {
if ( isset( $wps_reset_points_log['points_reset_by_admin'] ) && ! empty( $wps_reset_points_log['points_reset_by_admin'] ) ) {

$wps_reset_log = array(
'points_reset_by_admin' => $get_points,
'date' => date_i18n( 'Y-m-d h:i:sa' ),
);
$wps_reset_points_log['points_reset_by_admin'][] = $wps_reset_log;
} else {

$wps_reset_log = array(
'points_reset_by_admin' => $get_points,
'date' => date_i18n( 'Y-m-d h:i:sa' ),
);
$wps_reset_points_log['points_reset_by_admin'][] = $wps_reset_log;
}
update_user_meta( $user_id, 'points_details', $wps_reset_points_log );
}
}

/**
* Returns an associative array containing the bulk action
*
Expand All @@ -158,6 +194,7 @@ public function process_bulk_action() {
* @link https://www.wpswings.com/
*/
public function get_bulk_actions() {

$actions = array(
'bulk-delete' => __( 'Reset Points', 'points-and-rewards-for-woocommerce' ),
);
Expand All @@ -174,6 +211,7 @@ public function get_bulk_actions() {
* @link https://www.wpswings.com/
*/
public function get_sortable_columns() {

$sortable_columns = array(
'user_name' => array( 'user_name', false ),
'user_email' => array( 'user_email', false ),
Expand All @@ -189,9 +227,11 @@ public function get_sortable_columns() {
* @return array
*/
public function wps_wpr_sort_user_table( $data ) {

$points_data = array();
if ( ! empty( $data ) ) {
foreach ( $data as $sort_id ) {

$user = get_userdata( $sort_id['id'] );
$points = get_user_meta( $sort_id['id'], 'wps_wpr_points', true );
$points_data[] = array(
Expand All @@ -214,6 +254,7 @@ public function wps_wpr_sort_user_table( $data ) {
* @link https://www.wpswings.com/
*/
public function prepare_items() {

$per_page = ! empty( get_option( 'wps_wpr_number_items_per_page' ) ) ? get_option( 'wps_wpr_number_items_per_page' ) : 10;
$columns = $this->get_columns();
$hidden = array();
Expand Down Expand Up @@ -251,19 +292,24 @@ public function prepare_items() {
* @param array $cloumnb column of the points.
*/
public function wps_wpr_usort_reorder( $cloumna, $cloumnb ) {

$orderby = ( ! empty( $_REQUEST['orderby'] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST['orderby'] ) ) : 'id';
$order = ( ! empty( $_REQUEST['order'] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST['order'] ) ) : 'desc';
if ( is_numeric( $cloumna[ $orderby ] ) && is_numeric( $cloumnb[ $orderby ] ) ) {
if ( $cloumna[ $orderby ] == $cloumnb[ $orderby ] ) {

return 0;
} elseif ( $cloumna[ $orderby ] < $cloumnb[ $orderby ] ) {

$result = -1;
return ( 'asc' === $order ) ? $result : -$result;
} elseif ( $cloumna[ $orderby ] > $cloumnb[ $orderby ] ) {

$result = 1;
return ( 'asc' === $order ) ? $result : -$result;
}
} else {

$result = strcmp( $cloumna[ $orderby ], $cloumnb[ $orderby ] );
return ( 'asc' === $order ) ? $result : -$result;
}
Expand All @@ -280,6 +326,7 @@ public function wps_wpr_usort_reorder( $cloumna, $cloumnb ) {
* @param array $item array of the items.
*/
public function column_cb( $item ) {

return sprintf(
'<input type="checkbox" name="mpr_points_ids[]" value="%s" />',
$item['id']
Expand All @@ -298,19 +345,15 @@ public function column_cb( $item ) {
* @param int $per_page no of pages.
*/
public function get_users_points( $current_page, $per_page ) {

$args = array(
'fields' => 'ID',
'meta_query' => array(
array(
'key' => 'wps_wpr_points',
'compare' => 'EXISTS',
),
),
'number' => $per_page,
'offset' => ( $current_page - 1 ) * $per_page,
'fields' => 'ID',
);

$args['number'] = $per_page;
$args['offset'] = ( $current_page - 1 ) * $per_page;
if ( isset( $_REQUEST['s'] ) ) {

$wps_request_search = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
$args['search'] = '*' . $wps_request_search . '*';
}
Expand All @@ -328,19 +371,21 @@ public function get_users_points( $current_page, $per_page ) {
}

if ( isset( $_POST['wps_wpr_import_user'] ) && isset( $_POST['points-log'] ) ) {

$wps_membership_nonce = sanitize_text_field( wp_unslash( $_POST['points-log'] ) );
$import_user = get_option( 'wps_wpr_user_imported', false );
if ( wp_verify_nonce( $wps_membership_nonce, 'points-log' ) ) {
if ( false == $import_user ) {
$user_data = get_users();

$user_data = get_users();
$points_data = array();
$flag = false;
$general_settings = get_option( 'wps_wpr_settings_gallery', true );
$coupon_settings_array = get_option( 'wps_wpr_coupons_gallery', array() );
foreach ( $user_data as $key => $value ) {
$check_user = get_user_meta( $value->data->ID, 'wps_wpr_points', false );
if ( false == $check_user ) {

$today_date = date_i18n( 'Y-m-d h:i:sa' );
$wps_signup_value = isset( $general_settings['wps_wpr_general_signup_value'] ) ? intval( $general_settings['wps_wpr_general_signup_value'] ) : 1;
$import_points['import_points'][] = array(
Expand All @@ -353,6 +398,7 @@ public function get_users_points( $current_page, $per_page ) {
$flag = true;
$wps_wpr_notificatin_array = get_option( 'wps_wpr_notificatin_array', true );
if ( is_array( $wps_wpr_notificatin_array ) && ! empty( $wps_wpr_notificatin_array ) ) {

$wps_per_currency_spent_value = isset( $coupon_settings_array['wps_wpr_coupon_conversion_points'] ) ? intval( $coupon_settings_array['wps_wpr_coupon_conversion_points'] ) : 1;
$wps_comment_value = isset( $general_settings['wps_comment_value'] ) ? intval( $general_settings['wps_comment_value'] ) : 1;
$wps_refer_value = isset( $general_settings['wps_refer_value'] ) ? intval( $general_settings['wps_refer_value'] ) : 1;
Expand Down Expand Up @@ -381,9 +427,11 @@ public function get_users_points( $current_page, $per_page ) {

// === Save items per page data here ===
if ( isset( $_POST['wps_wpr_items_per_page_nonce'] ) ) {

$wps_wpr_items_per_page_nonce = ! empty( $_POST['wps_wpr_items_per_page_nonce'] ) ? sanitize_text_field( wp_unslash( $_POST['wps_wpr_items_per_page_nonce'] ) ) : '';
if ( wp_verify_nonce( $wps_wpr_items_per_page_nonce, 'wps-wpr-items-per-page-nonce' ) ) {
if ( isset( $_POST['wps_wpr_save_items_per_page'] ) ) {

$wps_wpr_number_items_per_page = ! empty( $_POST['wps_wpr_number_items_per_page'] ) ? sanitize_text_field( wp_unslash( $_POST['wps_wpr_number_items_per_page'] ) ) : 10;
update_option( 'wps_wpr_number_items_per_page', $wps_wpr_number_items_per_page );
}
Expand All @@ -392,6 +440,7 @@ public function get_users_points( $current_page, $per_page ) {

if ( isset( $_GET['action'] ) && isset( $_GET['user_id'] ) ) {
if ( 'view' == $_GET['action'] ) {

$user_log_id = sanitize_text_field( wp_unslash( $_GET['user_id'] ) );
$user_log = get_user_meta( $user_log_id, 'wps_wpr_user_log', true );
?>
Expand Down Expand Up @@ -429,16 +478,17 @@ public function get_users_points( $current_page, $per_page ) {
foreach ( $user_log as $key => $wps_user_log ) :
$wps_user_log['delete'] = 'delete';
?>

<tr valign="top">
<?php foreach ( $wps_user_log as $column_id => $column_name ) : ?>
<td class="forminp forminp-text">
<?php
if ( 'left' == $column_id ) {

$wps_split = explode( '#', $key );
$column_name = get_post_meta( $wps_split[1], 'coupon_amount', true );
echo esc_html( get_woocommerce_currency_symbol() ) . esc_html( $column_name );
} elseif ( 'camount' == $column_id ) {

$wps_split = explode( '#', $key );
$column_name = get_post_meta( $wps_split[1], 'wps_coupon_static_amount', true );
echo esc_html( get_woocommerce_currency_symbol() ) . esc_html( $column_name );
Expand All @@ -451,15 +501,19 @@ public function get_users_points( $current_page, $per_page ) {

$column_name = get_post_meta( $wps_split[1], 'date_expires', true );
if ( ! empty( $column_name ) ) {

$dt = new DateTime( "@$column_name" );
echo esc_html( $dt->format( 'Y-m-d' ) );
} else {

esc_html_e( 'No Expiry', 'points-and-rewards-for-woocommerce' );
}
}
} elseif ( 'delete' == $column_name ) {

echo '<a href="#" class="wps_wpr_delete_user_coupon" data-id="' . esc_html( $wps_split[1] ) . '" data-user_id="' . esc_html( $user_log_id ) . '">' . esc_html__( 'Delete', 'points-and-rewards-for-woocommerce' ) . '</a>';
} else {

echo esc_html( $column_name );
}

Expand All @@ -473,6 +527,7 @@ public function get_users_points( $current_page, $per_page ) {

<?php
} else {

echo '<h3>' . esc_html__( 'No Coupons Generated Yet.', 'points-and-rewards-for-woocommerce' ) . '<h3>';
}
?>
Expand All @@ -481,6 +536,7 @@ public function get_users_points( $current_page, $per_page ) {
<?php

} elseif ( 'view_point_log' == $_GET['action'] ) {

$user_id = sanitize_text_field( wp_unslash( $_GET['user_id'] ) );
$point_log = get_user_meta( $user_id, 'points_details', true );
$total_points = get_user_meta( $user_id, 'wps_wpr_points', true );
Expand Down Expand Up @@ -1515,6 +1571,39 @@ public function get_users_points( $current_page, $per_page ) {
</div>
<?php
}
if ( array_key_exists( 'points_reset_by_admin', $point_log ) ) {
?>
<div class="wps_wpr_slide_toggle">
<p class="wps_wpr_view_log_notice wps_wpr_common_slider" ><?php esc_html_e( 'Points Reset By Admin', 'points-and-rewards-for-woocommerce' ); ?>
<a class ="wps_wpr_open_toggle" href="javascript:;"></a>
</p>
<div class="wps_wpr_points_view">
<table class = "form-table mwp_wpr_settings wps_wpr_common_table">
<thead>
<tr valign="top">
<th scope="row" class="wps_wpr_head_titledesc">
<span class="wps_wpr_nobr"><?php echo esc_html__( 'Date & Time', 'points-and-rewards-for-woocommerce' ); ?></span>
</th>
<th scope="row" class="wps_wpr_head_titledesc">
<span class="wps_wpr_nobr"><?php echo esc_html__( 'Point Status', 'points-and-rewards-for-woocommerce' ); ?></span>
</th>
</tr>
</thead>
<?php
foreach ( $point_log['points_reset_by_admin'] as $key => $value ) {
?>
<tr valign="top">
<td class="forminp forminp-text"><?php echo esc_html( $value['date'] ); ?></td>
<td class="forminp forminp-text"><?php echo '-' . esc_html( $value['points_reset_by_admin'] ); ?></td>
</tr>
<?php
}
?>
</table>
</div>
</div>
<?php
}
if ( array_key_exists( 'Sender_point_details', $point_log ) ) {
?>
<div class="wps_wpr_slide_toggle">
Expand Down
2 changes: 1 addition & 1 deletion includes/class-points-rewards-for-woocommerce.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function __construct() {
$this->version = REWARDEEM_WOOCOMMERCE_POINTS_REWARDS_VERSION;
} else {

$this->version = '1.6.0';
$this->version = '1.6.1';
}

$this->plugin_name = 'points-and-rewards-for-woocommerce';
Expand Down
4 changes: 2 additions & 2 deletions includes/class-wpswings-onboarding-helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function enqueue_styles() {
*/
if ( $this->is_valid_page_screen() ) {

wp_enqueue_style( 'makewebbetter-onboarding-style', WPS_RWPR_DIR_URL . 'admin/css/wpswings-onboarding-admin.css', array(), '1.6.0', 'all' );
wp_enqueue_style( 'makewebbetter-onboarding-style', WPS_RWPR_DIR_URL . 'admin/css/wpswings-onboarding-admin.css', array(), '1.6.1', 'all' );
wp_enqueue_style( 'select2' );
}
}
Expand All @@ -182,7 +182,7 @@ public function enqueue_scripts() {

if ( $this->is_valid_page_screen() ) {

wp_enqueue_script( 'makewebbetter-onboarding-scripts', WPS_RWPR_DIR_URL . 'admin/js/wpswings-onboarding-admin.js', array( 'jquery', 'select2' ), '1.6.0', true );
wp_enqueue_script( 'makewebbetter-onboarding-scripts', WPS_RWPR_DIR_URL . 'admin/js/wpswings-onboarding-admin.js', array( 'jquery', 'select2' ), '1.6.1', true );

global $pagenow;
$current_slug = ! empty( explode( '/', plugin_basename( __FILE__ ) ) ) ? explode( '/', plugin_basename( __FILE__ ) )[0] : '';
Expand Down
Binary file modified languages/points-and-rewards-for-woocommerce-en_US.mo
View file
Binary file not shown.
Loading

0 comments on commit b155c3a

Please sign in to comment.