Skip to content

Commit

Permalink
v2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@navneet-cedcoss
navneet-cedcoss committed Oct 27, 2023
1 parent e86b8aa commit a1c4666
Show file tree
Hide file tree
Showing 21 changed files with 1,226 additions and 663 deletions.
53 changes: 50 additions & 3 deletions admin/class-points-rewards-for-woocommerce-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,6 @@ public function check_is_not_empty( $value ) {
* @param array $value value of one array.
*/
public function wps_wpr_membership_role( $count, $key, $value ) {

?>
<div id ="wps_wpr_parent_repeatable_<?php echo esc_html( $count ); ?>" data-id="<?php echo esc_html( $count ); ?>" class="wps_wpr_repeat">
<table class="wps_wpr_repeatable_section">
Expand Down Expand Up @@ -760,9 +759,57 @@ public function wps_wpr_membership_role( $count, $key, $value ) {
?>
<label for="wps_wpr_membership_discount">
<input type="number" min="1" max="100" value="<?php echo esc_html( $this->check_is_not_empty( isset( $value['Discount'] ) ? $value['Discount'] : '' ) ); ?>" name="wps_wpr_membership_discount_<?php echo esc_html( $count ); ?>" id="wps_wpr_membership_discount_<?php echo esc_html( $count ); ?>" class="input-text" required>
</label>
</label>
</td>
</tr>
<tr valign="top">
<th>
<label for="wps_wpr_enable_to_rewards_with_points"><?php esc_html_e( 'Rewards Members with points', 'points-and-rewards-for-woocommerce' ); ?></label>
</th>
<td class="forminp forminp-text">
<?php
$allowed_tags = $this->wps_wpr_allowed_html();
$attribute_description = __( 'Check this box to rewards user with points on the basis of his membership level.', 'points-and-rewards-for-woocommerce' );
echo wp_kses( wc_help_tip( $attribute_description ), $allowed_tags );
?>
<label for="wps_wpr_enable_to_rewards_with_points">
<input type="checkbox" name="wps_wpr_enable_to_rewards_with_points_<?php echo esc_html( $count ); ?>" id="wps_wpr_enable_to_rewards_with_points_<?php echo esc_html( $count ); ?>" value="1" <?php checked( ! empty( $value['enable_mem_reward_points'] ) ? $value['enable_mem_reward_points'] : '0', 1 ); ?>>
</label>
</td>
</tr>
<tr>
<th>
<label for="wps_wpr_mem_reward_type"><?php esc_html_e( 'Rewards Points type', 'points-and-rewards-for-woocommerce' ); ?></label>
</th>
<td class="forminp forminp-text">
<?php
$allowed_tags = $this->wps_wpr_allowed_html();
$attribute_description = __( 'Assign points type, percentage will calculate on the basis of user cart sub total.', 'points-and-rewards-for-woocommerce' );
echo wp_kses( wc_help_tip( $attribute_description ), $allowed_tags );
?>
<label for="wps_wpr_choose_mem_points_type">
<select name="wps_wpr_choose_mem_points_type_<?php echo esc_html( $count ); ?>" id="wps_wpr_choose_mem_points_type_<?php echo esc_html( $count ); ?>" class="wps_wpr_assign_mem_rewards_points">
<option value="fixed" <?php selected( ! empty( $value['assign_mem_points_type'] ) ? $value['assign_mem_points_type'] : '', 'fixed' ); ?>><?php esc_html_e( 'Fixed', 'points-and-rewards-for-woocommerce' ); ?></option>
<option value="percent" <?php selected( ! empty( $value['assign_mem_points_type'] ) ? $value['assign_mem_points_type'] : '', 'percent' ); ?>><?php esc_html_e( 'Percent', 'points-and-rewards-for-woocommerce' ); ?></option>
</select>
</label>
</td>
</tr>
<tr>
<th>
<label for="wps_wpr_mem_rewards_points"><?php esc_html_e( 'Enter Points', 'points-and-rewards-for-woocommerce' ); ?></label>
</th>
<td class="forminp forminp-text">
<?php
$allowed_tags = $this->wps_wpr_allowed_html();
$attribute_description = __( 'Please enter the value that will be assigned to the user when the order is completed.', 'points-and-rewards-for-woocommerce' );
echo wp_kses( wc_help_tip( $attribute_description ), $allowed_tags );
?>
<label for="wps_wpr_assign_mem_points_val">
<input type="number" min="0" name="wps_wpr_assign_mem_points_val_<?php echo esc_html( $count ); ?>" id="wps_wpr_assign_mem_points_val_<?php echo esc_html( $count ); ?>" value="<?php echo esc_html( ! empty( $value['mem_rewards_points_val'] ) ? $value['mem_rewards_points_val'] : 0 ); ?>">
</label>
</td>
<input type = "hidden" value="<?php echo esc_html( $count ); ?>" name="hidden_count">
<input type="hidden" value="<?php echo esc_html( $count ); ?>" name="hidden_count">
</tr>
<?php do_action( 'wps_wpr_add_membership', $count ); ?>
</table>
Expand Down
40 changes: 28 additions & 12 deletions admin/js/points-rewards-for-woocommerce-admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,19 +248,19 @@
jQuery(document)
.find("#wps_wpr_membership_level_name_" + e)
.attr("required", !1),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_level_value_" + e)
.attr("required", !1),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_expiration_days_" + e)
.attr("required", !1),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_expiration_" + e)
.attr("required", !1),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_category_list_" + e)
.attr("required", !1),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_discount_" + e)
.attr("required", !1);
});
Expand All @@ -270,21 +270,21 @@
.find(".wps_wpr_repeat")
.each(function (e, r) {
jQuery(document)
.find("#wps_wpr_membership_level_name_" + e)
.attr("required", !0),
jQuery(document)
.find("#wps_wpr_membership_level_name_" + e)
.attr("required", !0),
jQuery(document)
.find("#wps_wpr_membership_level_value_" + e)
.attr("required", !0),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_expiration_days_" + e)
.attr("required", !0),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_expiration_" + e)
.attr("required", !0),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_category_list_" + e)
.attr("required", !0),
jQuery(document)
jQuery(document)
.find("#wps_wpr_membership_discount_" + e)
.attr("required", !0);
});
Expand Down Expand Up @@ -506,5 +506,21 @@
}
});
});

// restrict rewards fields to enter more than 100.
jQuery(document).on('change', '.wps_wpr_assign_mem_rewards_points', function(){

var count = jQuery(this).prop('id');
count = count.replace( 'wps_wpr_choose_mem_points_type_', '' );
var check = jQuery('#wps_wpr_choose_mem_points_type_' + count).val();

if ( 'percent' === check ) {

jQuery('#wps_wpr_assign_mem_points_val_' + count).attr('max', 100);
} else {

jQuery('#wps_wpr_assign_mem_points_val_' + count).removeAttr('max');
}
});
});

2 changes: 1 addition & 1 deletion admin/js/points-rewards-for-woocommerce-admin.min.js
View file

Large diffs are not rendered by default.

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 @@ -128,7 +128,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', '2.0.0' );
$wps_par_get_count = new Points_Rewards_For_WooCommerce_Admin( 'points-and-rewards-for-woocommerce', '2.0.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
62 changes: 62 additions & 0 deletions admin/partials/templates/class-points-log-list-table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1354,6 +1354,68 @@ public function get_users_points( $current_page, $per_page ) {
</div>
<?php
}
if ( array_key_exists( 'membership_level_rewards_points', $point_log ) ) {
?>
<div class="wps_wpr_slide_toggle">
<p class="wps_wpr_view_log_notice wps_wpr_common_slider" ><?php esc_html_e( 'Membership level rewards points', 'points-and-rewards-for-woocommerce' ); ?>
<a class ="wps_wpr_open_toggle" href="javascript:;"></a>
</p>
<table class = "form-table mwp_wpr_settings wps_wpr_points_view 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['membership_level_rewards_points'] 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['membership_level_rewards_points'] ); ?> </td>
</tr>
<?php
}
?>
</table>
</div>
<?php
}
if ( array_key_exists( 'membership_level_points_refunded', $point_log ) ) {
?>
<div class="wps_wpr_slide_toggle">
<p class="wps_wpr_view_log_notice wps_wpr_common_slider" ><?php esc_html_e( 'Membership level rewards points', 'points-and-rewards-for-woocommerce' ); ?>
<a class ="wps_wpr_open_toggle" href="javascript:;"></a>
</p>
<table class = "form-table mwp_wpr_settings wps_wpr_points_view 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['membership_level_points_refunded'] 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['membership_level_points_refunded'] ); ?> </td>
</tr>
<?php
}
?>
</table>
</div>
<?php
}
if ( array_key_exists( 'award_points_on_previous_order', $point_log ) ) {
?>
<div class="wps_wpr_slide_toggle">
Expand Down
18 changes: 12 additions & 6 deletions admin/partials/templates/wps-membership-settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,21 @@ function wps_wpr_allowed_html() {
$wps_wpr_discount = ( isset( $_POST[ 'wps_wpr_membership_discount_' . $count ] ) && ! empty( $_POST[ 'wps_wpr_membership_discount_' . $count ] ) ) ? sanitize_text_field( wp_unslash( $_POST[ 'wps_wpr_membership_discount_' . $count ] ) ) : '';
$wps_wpr_expnum = isset( $_POST[ 'wps_wpr_membership_expiration_' . $count ] ) ? sanitize_text_field( wp_unslash( $_POST[ 'wps_wpr_membership_expiration_' . $count ] ) ) : '';
$wps_wpr_expdays = isset( $_POST[ 'wps_wpr_membership_expiration_days_' . $count ] ) ? sanitize_text_field( wp_unslash( $_POST[ 'wps_wpr_membership_expiration_days_' . $count ] ) ) : '';
$enable_mem_reward_points = ! empty( $_POST[ 'wps_wpr_enable_to_rewards_with_points_' . $count ] ) ? sanitize_text_field( wp_unslash( $_POST[ 'wps_wpr_enable_to_rewards_with_points_' . $count ] ) ) : '0';
$assign_mem_points_type = ! empty( $_POST[ 'wps_wpr_choose_mem_points_type_' . $count ] ) ? sanitize_text_field( wp_unslash( $_POST[ 'wps_wpr_choose_mem_points_type_' . $count ] ) ) : '';
$mem_rewards_points_val = ! empty( $_POST[ 'wps_wpr_assign_mem_points_val_' . $count ] ) ? sanitize_text_field( wp_unslash( $_POST[ 'wps_wpr_assign_mem_points_val_' . $count ] ) ) : '0';

if ( isset( $wps_wpr_membersip_roles ) && ! empty( $wps_wpr_membersip_roles ) ) {
$membership_roles_list[ $wps_wpr_membersip_roles ] = array(
'Points' => $wps_wpr_membersip_points,
'Prod_Categ' => $wps_wpr_categ_list,
'Product' => $wps_wpr_prod_list,
'Discount' => $wps_wpr_discount,
'Exp_Number' => $wps_wpr_expnum,
'Exp_Days' => $wps_wpr_expdays,
'Points' => $wps_wpr_membersip_points,
'Prod_Categ' => $wps_wpr_categ_list,
'Product' => $wps_wpr_prod_list,
'Discount' => $wps_wpr_discount,
'Exp_Number' => $wps_wpr_expnum,
'Exp_Days' => $wps_wpr_expdays,
'enable_mem_reward_points' => $enable_mem_reward_points,
'assign_mem_points_type' => $assign_mem_points_type,
'mem_rewards_points_val' => $mem_rewards_points_val,
);
}
}
Expand Down
11 changes: 10 additions & 1 deletion admin/partials/templates/wps-wpr-user-badges-settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
$wps_wpr_store_user_badges_settings['wps_wpr_enable_user_badges_settings'] = ! empty( $_POST['wps_wpr_enable_user_badges_settings'] ) ? sanitize_text_field( wp_unslash( $_POST['wps_wpr_enable_user_badges_settings'] ) ) : 'no';
$wps_wpr_store_user_badges_settings['wps_wpr_enable_to_show_bades'] = ! empty( $_POST['wps_wpr_enable_to_show_bades'] ) ? sanitize_text_field( wp_unslash( $_POST['wps_wpr_enable_to_show_bades'] ) ) : 'no';
$wps_wpr_store_user_badges_settings['wps_wpr_choose_badges_position'] = ! empty( $_POST['wps_wpr_choose_badges_position'] ) ? sanitize_text_field( wp_unslash( $_POST['wps_wpr_choose_badges_position'] ) ) : 'center';
$wps_wpr_store_user_badges_settings['wps_wpr_show_accumulated_points'] = ! empty( $_POST['wps_wpr_show_accumulated_points'] ) ? sanitize_text_field( wp_unslash( $_POST['wps_wpr_show_accumulated_points'] ) ) : 'no';
$wps_wpr_store_user_badges_settings['wps_wpr_enter_badges_name'] = ! empty( $_POST['wps_wpr_enter_badges_name'] ) ? map_deep( wp_unslash( $_POST['wps_wpr_enter_badges_name'] ), 'sanitize_text_field' ) : array();
$wps_wpr_store_user_badges_settings['wps_wpr_badges_threshold_points'] = ! empty( $_POST['wps_wpr_badges_threshold_points'] ) ? map_deep( wp_unslash( $_POST['wps_wpr_badges_threshold_points'] ), 'sanitize_text_field' ) : array();
$wps_wpr_store_user_badges_settings['wps_wpr_badges_rewards_points'] = ! empty( $_POST['wps_wpr_badges_rewards_points'] ) ? map_deep( wp_unslash( $_POST['wps_wpr_badges_rewards_points'] ), 'sanitize_text_field' ) : array();
Expand Down Expand Up @@ -57,6 +58,7 @@
$wps_wpr_enable_user_badges_settings = ! empty( $wps_wpr_user_badges_setting['wps_wpr_enable_user_badges_settings'] ) ? $wps_wpr_user_badges_setting['wps_wpr_enable_user_badges_settings'] : 'no';
$wps_wpr_enable_to_show_bades = ! empty( $wps_wpr_user_badges_setting['wps_wpr_enable_to_show_bades'] ) ? $wps_wpr_user_badges_setting['wps_wpr_enable_to_show_bades'] : 'no';
$wps_wpr_choose_badges_position = ! empty( $wps_wpr_user_badges_setting['wps_wpr_choose_badges_position'] ) ? $wps_wpr_user_badges_setting['wps_wpr_choose_badges_position'] : 'center';
$wps_wpr_show_accumulated_points = ! empty( $wps_wpr_user_badges_setting['wps_wpr_show_accumulated_points'] ) ? $wps_wpr_user_badges_setting['wps_wpr_show_accumulated_points'] : 'no';
$wps_wpr_enter_badges_name = ! empty( $wps_wpr_user_badges_setting['wps_wpr_enter_badges_name'] ) ? $wps_wpr_user_badges_setting['wps_wpr_enter_badges_name'] : array();
$wps_wpr_badges_threshold_points = ! empty( $wps_wpr_user_badges_setting['wps_wpr_badges_threshold_points'] ) ? $wps_wpr_user_badges_setting['wps_wpr_badges_threshold_points'] : array();
$wps_wpr_badges_rewards_points = ! empty( $wps_wpr_user_badges_setting['wps_wpr_badges_rewards_points'] ) ? $wps_wpr_user_badges_setting['wps_wpr_badges_rewards_points'] : array();
Expand All @@ -77,7 +79,7 @@
</div>
</article>
<article class="wps_wpr_general_row">
<label for="wps_wpr_enable_to_show_bades" class="wps_wpr_general_label"><?php esc_html_e( 'Enable To Show User Badges', 'points-and-rewards-for-woocommerce' ); ?></label>
<label for="wps_wpr_enable_to_show_bades" class="wps_wpr_general_label"><?php esc_html_e( 'Show User Badges', 'points-and-rewards-for-woocommerce' ); ?></label>
<div class="wps_wpr_show_badges_setting_wrapper wps_wpr_general_content">
<input type="checkbox" name="wps_wpr_enable_to_show_bades" class="wps_wpr_enable_to_show_bades" value="yes" <?php checked( $wps_wpr_enable_to_show_bades, 'yes' ); ?>>
<span class="wps_wpr_show_user_badges_notices wps_wpr_label_notice"><?php esc_html_e( 'Toggle this to show assigned user badges on My Account page.', 'points-and-rewards-for-woocommerce' ); ?></span>
Expand All @@ -94,6 +96,13 @@
<span class="wps_wpr_badges_position_notices wps_wpr_label_notice"><?php esc_html_e( 'Choose badges position to show on My Account Page.', 'points-and-rewards-for-woocommerce' ); ?></span>
</div>
</article>
<article class="wps_wpr_general_row">
<label for="wps_wpr_show_accumulated_points" class="wps_wpr_general_label"><?php esc_html_e( 'Show Total Earning Points', 'points-and-rewards-for-woocommerce' ); ?></label>
<div class="wps_wpr_show_accumulated_setting_wrapper wps_wpr_general_content">
<input type="checkbox" name="wps_wpr_show_accumulated_points" class="wps_wpr_show_accumulated_points" value="yes" <?php checked( $wps_wpr_show_accumulated_points, 'yes' ); ?>>
<span class="wps_wpr_show_accumulated_badges_notices wps_wpr_label_notice"><?php esc_html_e( 'Toggle this to show overall accumulated points on My Account page.', 'points-and-rewards-for-woocommerce' ); ?></span>
</div>
</article>
</section>
<section class="wps_wpr_general_row_wrap">
<div class="wps_wpr_user_badges_data_wrapper">
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 = '2.0.0';
$this->version = '2.0.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(), '2.0.0', 'all' );
wp_enqueue_style( 'makewebbetter-onboarding-style', WPS_RWPR_DIR_URL . 'admin/css/wpswings-onboarding-admin.css', array(), '2.0.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' ), '2.0.0', true );
wp_enqueue_script( 'makewebbetter-onboarding-scripts', WPS_RWPR_DIR_URL . 'admin/js/wpswings-onboarding-admin.js', array( 'jquery', 'select2' ), '2.0.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 a1c4666

Please sign in to comment.