Skip to content

Commit

Permalink
v2.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
navneet-cedcoss committed Oct 18, 2024
1 parent 0f79f4f commit facae4d
Show file tree
Hide file tree
Showing 32 changed files with 40,830 additions and 1,842 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
87 changes: 84 additions & 3 deletions admin/class-points-rewards-for-woocommerce-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@ public function enqueue_styles( $hook ) {
if ( isset( $screen->id ) ) {
$pagescreen = $screen->id;
}

$style_url = WPS_RWPR_DIR_URL . 'build/style-index.css';
wp_enqueue_style(
'wps-admin-react-styles',
$style_url,
array(),
time(),
false
);

if ( 'woocommerce_page_wps-rwpr-setting' == $hook || 'woocommerce_page_wps-rwpr-setting' === $pagescreen ) {
wp_enqueue_style( $this->plugin_name, WPS_RWPR_DIR_URL . 'admin/css/points-rewards-for-woocommerce-admin.min.css', array(), $this->version, 'all' );
wp_enqueue_style( 'select2' );
Expand Down Expand Up @@ -178,11 +188,84 @@ public function enqueue_scripts( $hook ) {

wp_enqueue_script( $this->plugin_name . 'admin-js', WPS_RWPR_DIR_URL . 'admin/js/points-rewards-for-woocommerce-admin.min.js', array( 'jquery', 'jquery-blockui', 'jquery-ui-sortable', 'jquery-ui-widget', 'jquery-ui-core', 'jquery-tiptip', 'select2', 'sticky_js' ), $this->version, false );
wp_localize_script( $this->plugin_name . 'admin-js', 'wps_wpr_object', $wps_wpr );

// user report work.
if ( isset( $_GET['wps_reports_userid'] ) ) {

$user_id = ! empty( $_GET['wps_reports_userid'] ) ? sanitize_text_field( wp_unslash( $_GET['wps_reports_userid'] ) ) : '';
$user_data = $this->wps_wpr_get_user_reports_data( $user_id );
// js for the multistep from.
$script_path = WPS_RWPR_DIR_URL . 'build/index.js';
$path = preg_replace( '/\?v=[\d]+$/', '', $script_path );
// $fileTime = filemtime($path);
$script_asset_path = WPS_RWPR_DIR_URL . 'build/index.asset.php';
$script_asset = file_exists( $script_asset_path )
? require $script_asset_path
: array(
'dependencies' => array(
'wp-hooks',
'wp-element',
'wp-i18n',
'wc-components',
),
'version' => $path,
);
$script_url = WPS_RWPR_DIR_URL . 'build/index.js';
wp_register_script(
'react-app-block',
$script_url,
$script_asset['dependencies'],
$script_asset['version'],
true
);

wp_enqueue_script( 'react-app-block' );
wp_localize_script(
'react-app-block',
'frontend_ajax_object',
array(
'ajaxurl' => admin_url( 'admin-ajax.php' ),
'wps_standard_nonce' => wp_create_nonce( 'ajax-nonce' ),
'name' => $user_data['name'],
'email' => $user_data['email'],
'membership_name' => $user_data['membership_name'],
'referral_count' => $user_data['referral_count'],
'redeem_points' => $user_data['redeem_points'],
'current_points' => $user_data['current_points'],
'overall_points' => $user_data['overall_points'],
)
);
}
}
}
}
}

/**
* Undocumented function.
*
* @param int $user_id user_id.
* @return array
*/
public function wps_wpr_get_user_reports_data( $user_id ) {

$data = array();
if ( ! empty( $user_id ) ) {

$user = get_user_by( 'ID', $user_id );
$data = array(
'name' => $user->display_name,
'email' => $user->user_email,
'membership_name' => get_user_meta( $user_id, 'membership_level', true ),
'referral_count' => ! empty( get_user_meta( $user_id, 'wps_referral_counting', true ) ) ? get_user_meta( $user_id, 'wps_referral_counting', true ) : 0,
'redeem_points' => ! empty( get_user_meta( $user_id, 'wps_wpr_redeemed_points', true ) ) ? get_user_meta( $user_id, 'wps_wpr_redeemed_points', true ) : 0,
'current_points' => ! empty( get_user_meta( $user_id, 'wps_wpr_points', true ) ) ? get_user_meta( $user_id, 'wps_wpr_points', true ) : 0,
'overall_points' => ! empty( get_user_meta( $user_id, 'wps_wpr_overall__accumulated_points', true ) ) ? get_user_meta( $user_id, 'wps_wpr_overall__accumulated_points', true ) : 0,
);
}
return $data;
}

/**
* Add a submenu inside the Woocommerce Menu Page
*
Expand Down Expand Up @@ -942,9 +1025,7 @@ public function wps_wpr_get_update_notification_data() {
/**
* This function is used to display notoification bar at admin.
*
* @since 1.0.7
* @author WP Swings <webmaster@wpswings.com>
* @link https://www.wpswings.com/
* @return void
*/
public function wps_wpr_display_notification_bar() {
$screen = get_current_screen();
Expand Down
4 changes: 2 additions & 2 deletions admin/class-points-rewards-for-woocommerce-dummy-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -2353,9 +2353,9 @@ public function wps_wpr_enqueue_dummy_file() {
if ( wp_verify_nonce( ! empty( $_GET['nonce'] ) ? sanitize_text_field( wp_unslash( $_GET['nonce'] ) ) : '', 'par_main_setting' ) ) {
if ( ! empty( $_GET['page'] ) && 'wps-rwpr-setting' == $_GET['page'] ) {

wp_register_style( 'wps_wpr_dummy_css_file', WPS_RWPR_DIR_URL . 'admin/partials/dummyfile/dummycss/wps-points-and-rewards-dummy.css', array(), '2.5.0' );
wp_register_style( 'wps_wpr_dummy_css_file', WPS_RWPR_DIR_URL . 'admin/partials/dummyfile/dummycss/wps-points-and-rewards-dummy.css', array(), '2.5.1' );
wp_enqueue_style( 'wps_wpr_dummy_css_file' );
wp_register_script( 'wps_wpr_dummy_js_file', WPS_RWPR_DIR_URL . 'admin/partials/dummyfile/dummyjs/wps-points-and-rewards-dummy.js', array(), '2.5.0', true );
wp_register_script( 'wps_wpr_dummy_js_file', WPS_RWPR_DIR_URL . 'admin/partials/dummyfile/dummyjs/wps-points-and-rewards-dummy.js', array(), '2.5.1', true );
wp_enqueue_script( 'wps_wpr_dummy_js_file' );
wp_localize_script(
'wps_wpr_dummy_js_file',
Expand Down
22 changes: 22 additions & 0 deletions admin/css/points-rewards-for-woocommerce-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -1468,3 +1468,25 @@ span.wps_wpr_all_referral_view {
span.wps_wpr_all_referral_name:hover~span.wps_wpr_all_referral_view, span.wps_wpr_all_referral_view:hover {
display: inline-block;
}

/* User Report CSS */
.wps_wpr_user_reports {
margin: 20px 0 40px;
overflow: auto;
}

.wps_wpr_user_reports table td,.wps_wpr_user_reports table th {
border: 1px solid #ccc;
text-align: left;
padding: 5px;
font-size: 14px;
}

.wps_wpr_user_reports table {
width: 100%;
border-collapse: collapse;
}

.wps_wpr_user_reports table th {
background: #f2f2f2;
}
2 changes: 1 addition & 1 deletion admin/css/points-rewards-for-woocommerce-admin.min.css

Large diffs are not rendered by default.

Binary file added admin/images/report-colored.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
'title' => __( 'Badges', 'points-and-rewards-for-woocommerce' ),
'file_path' => WPS_RWPR_DIR_PATH . 'admin/partials/templates/wps-wpr-user-badges-settings.php',
),
'wps-wpr-user-report-settings' => array(
'title' => '',
'file_path' => WPS_RWPR_DIR_PATH . 'admin/partials/templates/wps-wpr-user-report-settings.php',
),
);

$wps_wpr_setting_tab = apply_filters( 'wps_rwpr_add_setting_tab', $wps_wpr_setting_tab );
Expand Down
23 changes: 23 additions & 0 deletions admin/partials/templates/class-points-log-list-table.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public function get_columns() {
'reason' => __( 'Enter Remark', 'points-and-rewards-for-woocommerce' ),
'details' => __( 'Action', 'points-and-rewards-for-woocommerce' ),
'ban_user' => __( 'Restrict User', 'points-and-rewards-for-woocommerce' ),
'user_report' => __( 'Report', 'points-and-rewards-for-woocommerce' ),
);
return $columns;
}
Expand Down Expand Up @@ -106,6 +107,8 @@ public function column_default( $item, $column_name ) {
return $this->view_html( $item['id'] );
case 'ban_user':
return $this->wps_wpr_ban_use( $item['id'] );
case 'user_report':
return $this->wps_wpr_user_reports( $item['id'] );
default:
return false;
}
Expand Down Expand Up @@ -142,6 +145,26 @@ public function wps_wpr_ban_use( $user_id ) {
<?php
}

/**
* Undocumented function.
*
* @param int $user_id user_id.
* @return string
*/
public function wps_wpr_user_reports( $user_id ) {

$nonce = wp_create_nonce( 'par_main_setting' ); // Create nonce 'wps-par-admin-nonce' par_main_setting.
$url_report = esc_url( admin_url( 'admin.php?page=wps-rwpr-setting&nonce=' ) . $nonce . '&tab=wps-wpr-user-report-settings&wps_reports_userid=' . $user_id );

$data = '';
$data .= '<span>';

$data .= '<a href="' . $url_report . '" title="View Reports" >';
$data .= '<img height="36" src="' . esc_url( WPS_RWPR_DIR_URL ) . 'admin/images/report-colored.png"></a>';
$data .= '</span>';
return $data;
}

/**
* Perform admin bulk action setting for points table.
*
Expand Down
28 changes: 28 additions & 0 deletions admin/partials/templates/wps-wpr-user-report-settings.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php
/**
* Exit if accessed directly
*
* @since 1.0.0
* @package points-and-rewards-for-wooCommerce
* @subpackage points-and-rewards-for-wooCommerce/admin/partials
*/

if ( ! defined( 'ABSPATH' ) ) {
exit;
}

if ( isset( $_GET['wps_reports_userid'] ) ) {

$user_id = ! empty( $_GET['wps_reports_userid'] ) ? sanitize_text_field( wp_unslash( $_GET['wps_reports_userid'] ) ) : '';
}
?>
<div class="wps-wpg-gen-section-form-container">
<div class="wpg-secion-wrap">
<h3><?php esc_html_e( 'Points Report', 'points-and-rewards-for-woocommerce' ); ?></h3>
<div id="react-app"></div>
</div>
<input type="hidden" id="wps_reports_userid" name="wps_reports_userid" value="<?php echo esc_attr( $user_id ); ?>" >

</div>


12 changes: 12 additions & 0 deletions build/index.asset.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php
/**
* The admin-specific functionality of the plugin.
*
* @link https://makewebbetter.com/
* @since 1.0.0
*
* @package points-and-rewards-for-wooCommerce
* @subpackage points-and-rewards-for-wooCommerce/admin
*/

return array('dependencies' => array('react', 'react-dom'), 'version' => '2cf89828298f59f4cafb');
44 changes: 44 additions & 0 deletions build/index.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build/index.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit facae4d

Please sign in to comment.