';
$this->order_dropdown();
$this->product_dropdown();
@@ -255,9 +290,9 @@ protected function extra_tablenav( $which ) {
* @since 1.4.6
*/
public function process_bulk_actions( $doaction ) {
- if ( $doaction ) {
- if ( isset( $_REQUEST['id'] ) ) {
- $ids = wp_parse_id_list( $_REQUEST['id'] );
+ if ( $doaction && check_ajax_referer( 'bulk-' . $this->_args['plural'] ) ) {
+ if ( wp_unslash( isset( $_REQUEST['id'] ) ) ) {
+ $ids = wp_parse_id_list( wp_unslash( $_REQUEST['id'] ) );
$doaction = ( - 1 !== $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2']; // phpcs:ignore
} elseif ( isset( $_REQUEST['ids'] ) ) {
$ids = array_map( 'absint', $_REQUEST['ids'] );
@@ -331,7 +366,7 @@ public function get_columns() {
*
* @return array
*/
- function get_sortable_columns() {
+ public function get_sortable_columns() {
$sortable_columns = array(
'key' => array( 'serial_key', false ),
'product' => array( 'product_id', false ),
@@ -361,7 +396,7 @@ protected function get_primary_column_name() {
/**
* since 1.0.0
*
- * @param object $item
+ * @param \StdClass $item Item.
*
* @return string|void
*/
@@ -372,23 +407,24 @@ protected function column_cb( $item ) {
/**
* Display key.
*
- * @param $item
+ * @param Key $item Item.
*
* @since 1.4.6
*/
protected function column_key( $item ) {
- $is_hidden = 'yes' === get_option( 'wc_serial_numbers_hide_serial_number', 'yes' );
- $edit_url = add_query_arg( [ 'edit' => $item->id ], admin_url( 'admin.php?page=wc-serial-numbers' ) );
- $delete_url = add_query_arg(
- [
+ $is_hidden = 'yes' === get_option( 'wc_serial_numbers_hide_serial_number', 'yes' );
+ $edit_url = add_query_arg( array( 'edit' => $item->id ), admin_url( 'admin.php?page=wc-serial-numbers' ) );
+ $delete_url = add_query_arg(
+ array(
'id' => $item->id,
'action' => 'delete',
- ],
+ ),
admin_url( 'admin.php?page=wc-serial-numbers' )
);
- $actions['id'] = sprintf( __( 'ID: %d', 'wc-serial-numbers' ), $item->id );
+ // translators: %d: key id.
+ $actions['id'] = sprintf( __( 'ID: %d', 'wc-serial-numbers' ), esc_html( $item->id ) );
$actions['edit'] = sprintf( '
', $edit_url, __( 'Edit', 'wc-serial-numbers' ) );
- $actions['delete'] = sprintf( '
', $delete_url, __( 'Delete', 'wc-serial-numbers' ) );
+ $actions['delete'] = sprintf( '
', wp_nonce_url( $delete_url, 'bulk-keys' ), __( 'Delete', 'wc-serial-numbers' ) );
return sprintf( '%1$s %2$s', $item->print_key( $is_hidden ), $this->row_actions( $actions ) );
}
@@ -396,7 +432,7 @@ protected function column_key( $item ) {
/**
* Display column product.
*
- * @param Key $key Key object.
+ * @param Key $item Item.
*
* @since 1.4.6
*/
@@ -409,7 +445,7 @@ protected function column_product( $item ) {
/**
* Display column order.
*
- * @param Key $key Key object.
+ * @param Key $item Item.
*
* @since 1.4.6
*/
@@ -425,7 +461,7 @@ protected function column_order( $item ) {
/**
* Display column customer.
*
- * @param Key $key Key object.
+ * @param \StdClass $item Item.
*
* @since 1.4.6
*/
@@ -458,10 +494,10 @@ protected function column_activation( $key ) {
$limit = ! empty( $key->activation_limit ) ? $key->activation_limit : '∞';
$count = (int) $key->activation_count;
$link = add_query_arg(
- [
+ array(
'serial_id' => $key->id,
'page' => 'wc-serial-numbers-activations',
- ],
+ ),
admin_url( 'admin.php' )
);
@@ -478,7 +514,21 @@ protected function column_activation( $key ) {
* @since 1.4.6
*/
protected function column_valid_for( $key ) {
- return ! empty( $key->get_validity() ) ? sprintf( _n( '
', $key->get_validity(), 'wc-serial-numbers' ), number_format_i18n( $key->get_validity() ) ) : __( 'Lifetime', 'wc-serial-numbers' );
+ if ( ! empty( $key->get_validity() ) ) {
+ return wp_kses_post(
+ sprintf(
+ // translators: %1$s: validity, %2$s: validity.
+ _n(
+ '
',
+ $key->get_validity(),
+ 'wc-serial-numbers'
+ ),
+ number_format_i18n( $key->get_validity() )
+ )
+ );
+ }
+ return __( 'Lifetime', 'wc-serial-numbers' );
}
/**
@@ -489,7 +539,10 @@ protected function column_valid_for( $key ) {
* @since 1.4.6
*/
protected function column_order_date( $key ) {
- return ! empty( $key->order_date ) && '0000-00-00 00:00:00' !== $key->order_date ? date( get_option( 'date_format' ), strtotime( $key->order_date ) ) : '—';
+ if ( ! empty( $key->order_date ) && '0000-00-00 00:00:00' !== $key->order_date ) {
+ return wp_date( get_option( 'date_format' ), strtotime( $key->order_date ) );
+ }
+ return '—';
}
/**
diff --git a/src/Admin/ListTables/ListTable.php b/src/Admin/ListTables/ListTable.php
index f42e3ba7..3539c210 100644
--- a/src/Admin/ListTables/ListTable.php
+++ b/src/Admin/ListTables/ListTable.php
@@ -28,15 +28,15 @@ class ListTable extends \WP_List_Table {
/**
* Get a request var, or return the default if not set.
*
- * @param string $var Request var name.
- * @param mixed $default Default value.
+ * @param string $param Request var name.
+ * @param mixed $fallback Default value.
*
* @since 1.4.6
*
* @return mixed Un-sanitized request var
*/
- protected function get_request_var( $var = '', $default = false ) {
- return isset( $_REQUEST[ $var ] ) ? sanitize_text_field( wp_unslash( $_REQUEST[ $var ] ) ) : $default; // phpcs:ignore WordPress.Security.NonceVerification
+ protected function get_request_var( $param = '', $fallback = false ) {
+ return isset( $_REQUEST[ $param ] ) ? sanitize_text_field( wp_unslash( $_REQUEST[ $param ] ) ) : $fallback; // phpcs:ignore WordPress.Security.NonceVerification
}
/**
@@ -202,17 +202,6 @@ public function customer_dropdown() {
* @since 1.4.6
*/
public function process_bulk_actions( $doaction ) {
- if ( ! empty( $_GET['_wp_http_referer'] ) ) {
- wp_redirect(
- remove_query_arg(
- array(
- '_wp_http_referer',
- '_wpnonce',
- ),
- wp_unslash( $_SERVER['REQUEST_URI'] )
- )
- );
- exit;
- }
+ $referer = wp_get_referer();
}
}
diff --git a/src/Admin/ListTables/StockTable.php b/src/Admin/ListTables/StockTable.php
index 42f3e45b..6e08b512 100644
--- a/src/Admin/ListTables/StockTable.php
+++ b/src/Admin/ListTables/StockTable.php
@@ -32,14 +32,14 @@ public function __construct() {
public function prepare_items() {
$per_page = 20;
$columns = $this->get_columns();
- $hidden = [];
+ $hidden = array();
$sortable = $this->get_sortable_columns();
$this->_column_headers = array( $columns, $hidden, $sortable );
$current_page = $this->get_pagenum();
- $orderby = isset( $_GET['orderby'] ) ? sanitize_key( $_GET['orderby'] ) : 'order_date';
- $order = isset( $_GET['order'] ) ? sanitize_key( $_GET['order'] ) : 'desc';
- $search = isset( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : null;
- $product_id = isset( $_GET['product_id'] ) ? absint( $_GET['product_id'] ) : '';
+ $orderby = filter_input( INPUT_GET, 'orderby', FILTER_SANITIZE_SPECIAL_CHARS );
+ $order = filter_input( INPUT_GET, 'order', FILTER_SANITIZE_SPECIAL_CHARS );
+ $search = filter_input( INPUT_GET, 's', FILTER_SANITIZE_SPECIAL_CHARS );
+ $product_id = filter_input( INPUT_GET, 'product_id', FILTER_SANITIZE_NUMBER_INT );
$query_args = array(
'posts_per_page' => $per_page,
@@ -70,23 +70,13 @@ public function no_items() {
esc_html_e( 'No products selling serial keys from "stock" found.', 'wc-serial-numbers' );
}
- /**
- * Retrieve the view types
- *
- * @since 1.0.0
- * @return array $views All the views sellable
- */
- public function get_views() {
- return parent::get_views();
- }
-
/**
* Adds the order and product filters to the licenses list.
*
* @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
*/
protected function extra_tablenav( $which ) {
- if ( $which === 'top' ) {
+ if ( 'top' === $which ) {
echo '
';
$this->product_dropdown();
submit_button( __( 'Filter', 'wc-serial-numbers' ), '', 'filter-action', false );
@@ -116,7 +106,7 @@ public function get_columns() {
*
* @return array
*/
- function get_sortable_columns() {
+ public function get_sortable_columns() {
$columns = array(
'product' => array( 'product_id', false ),
);
@@ -169,7 +159,7 @@ public function column_default( $item, $column_name ) {
case 'sold':
$sold_count = wcsn_get_keys(
array(
- 'status__in' => [ 'sold', 'expired' ],
+ 'status__in' => array( 'sold', 'expired' ),
'product_id' => $item->get_id(),
'count' => true,
)
diff --git a/src/Admin/Menus.php b/src/Admin/Menus.php
index 2d96cfaf..5399f067 100644
--- a/src/Admin/Menus.php
+++ b/src/Admin/Menus.php
@@ -19,10 +19,6 @@ class Menus {
* @since 1.0.0
*/
public function __construct() {
- // add_action( 'current_screen', array( $this, 'setup_screen' ) );
- // add_action( 'check_ajax_referer', array( $this, 'setup_screen' ) );
- // add_filter( 'set-screen-option', array( __CLASS__, 'save_screen_options' ), 10, 3 );
-
// Register the menus.
add_action( 'admin_menu', array( $this, 'main_menu' ) );
add_action( 'admin_menu', array( $this, 'activations_menu' ), 40 );
@@ -48,7 +44,7 @@ public function __construct() {
* @since 1.4.6
*/
public function setup_screen() {
- if ( isset( $_GET['edit'] ) || isset( $_GET['delete'] ) || isset( $_GET['add'] ) || isset( $_GET['generate'] ) ) {
+ if ( isset( $_GET['edit'] ) || isset( $_GET['delete'] ) || isset( $_GET['add'] ) || isset( $_GET['generate'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
return;
}
@@ -59,12 +55,6 @@ public function setup_screen() {
$screen_id = isset( $screen, $screen->id ) ? $screen->id : '';
}
- // switch ( $screen_id ) {
- // case $plugin_screen_id . '-page-wc-serial-numbers':
- // $this->list_table = new ListTables\KeysTable();
- // break;
- // }
-
// Ensure the table handler is only loaded once. Prevents multiple loads if a plugin calls check_ajax_referer many times.
remove_action( 'current_screen', array( $this, 'setup_screen' ) );
remove_action( 'check_ajax_referer', array( $this, 'setup_screen' ) );
@@ -223,11 +213,11 @@ public function output_main_page() {
if ( $add ) {
$key = new Key();
- include dirname( __FILE__ ) . '/views/html-edit-key.php';
+ include __DIR__ . '/views/html-edit-key.php';
} elseif ( $edit ) {
- include dirname( __FILE__ ) . '/views/html-edit-key.php';
+ include __DIR__ . '/views/html-edit-key.php';
} else {
- include dirname( __FILE__ ) . '/views/html-list-keys.php';
+ include __DIR__ . '/views/html-list-keys.php';
}
}
@@ -263,8 +253,8 @@ public function output_tools_page() {
$tabs = apply_filters( 'wc_serial_numbers_tools_tabs', $tabs );
$tab_ids = array_keys( $tabs );
- $current_tab = isset( $_GET['tab'] ) ? sanitize_key( $_GET['tab'] ) : reset( $tab_ids );
- $page = isset( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : '';
+ $current_tab = isset( $_GET['tab'] ) ? sanitize_key( wp_unslash( $_GET['tab'] ) ) : reset( $tab_ids ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $page = isset( $_GET['page'] ) ? sanitize_key( wp_unslash( $_GET['page'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
Admin::view(
'html-tools.php',
@@ -285,14 +275,12 @@ public function output_tools_page() {
public function output_reports_page() {
$tabs = array(
'stock' => __( 'Stock', 'wc-serial-numbers' ),
- // 'sales' => __( 'Sales', 'wc-serial-numbers' ),
- // 'activations' => __( 'Activations', 'wc-serial-numbers' ),
);
$tabs = apply_filters( 'wc_serial_numbers_reports_tabs', $tabs );
$tab_ids = array_keys( $tabs );
- $current_tab = isset( $_GET['tab'] ) ? sanitize_key( $_GET['tab'] ) : reset( $tab_ids );
- $page = isset( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : '';
+ $current_tab = isset( $_GET['tab'] ) ? sanitize_key( wp_unslash( $_GET['tab'] ) ) : reset( $tab_ids ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $page = isset( $_GET['page'] ) ? sanitize_key( wp_unslash( $_GET['page'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
Admin::view(
'html-reports.php',
@@ -311,8 +299,8 @@ public function output_reports_page() {
* @return void
*/
public function go_pro_redirect() {
- if ( isset( $_GET['page'] ) && 'go_wcsn_pro' === $_GET['page'] ) {
- wp_redirect( 'https://pluginever.com/plugins/woocommerce-serial-numbers-pro/?utm_source=admin-menu&utm_medium=link&utm_campaign=upgrade&utm_id=wc-serial-numbers' );
+ if ( isset( $_GET['page'] ) && 'go_wcsn_pro' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ wp_redirect( 'https://pluginever.com/plugins/woocommerce-serial-numbers-pro/?utm_source=admin-menu&utm_medium=link&utm_campaign=upgrade&utm_id=wc-serial-numbers' ); // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect
die;
}
}
@@ -427,7 +415,8 @@ public static function status_tab() {
foreach ( $cron_jobs as $cron_job => $cron_job_name ) {
$next_scheduled = wp_next_scheduled( $cron_job );
if ( $next_scheduled ) {
- $statuses[ $cron_job_name ] = sprintf( __( 'Next run: %s', 'wc-serial-numbers' ), date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $next_scheduled ) );
+ // translators: %s: Next scheduled time.
+ $statuses[ $cron_job_name ] = sprintf( __( 'Next run: %s', 'wc-serial-numbers' ), esc_html( date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $next_scheduled ) ) );
} else {
$statuses[ $cron_job_name ] = __( 'Not scheduled', 'wc-serial-numbers' );
}
diff --git a/src/Admin/Metaboxes.php b/src/Admin/Metaboxes.php
index 3c4760a0..8aa38054 100644
--- a/src/Admin/Metaboxes.php
+++ b/src/Admin/Metaboxes.php
@@ -25,8 +25,11 @@ public function __construct() {
}
/**
- * product
- * since 1.0.0
+ * Add product data tab.
+ *
+ * @param array $tabs product data tabs.
+ *
+ * @return mixed
*/
public static function product_data_tab( $tabs ) {
$tabs['wc_serial_numbers'] = array(
@@ -46,7 +49,7 @@ public static function product_write_panel() {
global $post, $woocommerce;
?>
+ style="padding-bottom: 50px;display: none;">
'_software_version',
@@ -115,14 +118,24 @@ public static function product_write_panel() {
$stocks = wcsn_get_stocks_count();
$stock = isset( $stocks[ $post->ID ] ) ? $stocks[ $post->ID ] : 0;
- echo sprintf(
- '
%s %d %s
',
- __( 'Stock status', 'wc-serial-numbers' ),
- $stock,
- _n( 'key available.', 'keys available.', $stock, 'wc-serial-numbers' )
+ echo wp_kses_post(
+ sprintf(
+ '
%s %d %s
',
+ __( 'Key source', 'wc-serial-numbers' ),
+ $stock,
+ _n( 'key available.', 'keys available.', $stock, 'wc-serial-numbers' )
+ )
);
+
if ( ! WCSN()->is_premium_active() ) {
- echo sprintf( '
%s %s
', __( 'Want the keys to be generated automatically, auto assign with orders, and many more?', 'wc-serial-numbers' ), 'https://www.pluginever.com/plugins/woocommerce-serial-numbers-pro/?utm_source=product_page_license_area&utm_medium=link&utm_campaign=wc-serial-numbers&utm_content=Upgrade%20to%20Pro', __( 'Upgrade to Pro', 'wc-serial-numbers' ) );
+ echo wp_kses_post(
+ sprintf(
+ '
%s %s
',
+ __( 'Want to sell keys for variable products?', 'wc-serial-numbers' ),
+ 'https://www.pluginever.com/plugins/woocommerce-serial-numbers-pro/?utm_source=product_page_license_area&utm_medium=link&utm_campaign=wc-serial-numbers&utm_content=Upgrade%20to%20Pro',
+ __( 'Upgrade to Pro', 'wc-serial-numbers' ),
+ )
+ );
}
?>
@@ -132,18 +145,19 @@ public static function product_write_panel() {
/**
* Show promo box.
*
- * @param $variation_data
- * @param $variation
- *
- * @param $loop
- *
* @since 1.2.0
*/
- public static function variable_product_content( $loop, $variation_data, $variation ) {
+ public static function variable_product_content() {
if ( ! WCSN()->is_premium_active() ) {
- echo sprintf( '
%s %s
', __( 'The free version of Serial Numbers for WooCommerce does not support product variation.', 'wc-serial-numbers' ), 'https://www.pluginever.com/plugins/woocommerce-serial-numbers-pro/?utm_source=product_page_license_area&utm_medium=link&utm_campaign=wc-serial-numbers&utm_content=Upgrade%20to%20Pro', __( 'Upgrade to Pro', 'wc-serial-numbers' ) );
+ echo wp_kses_post(
+ sprintf(
+ '
%s %s
',
+ __( 'The free version of Serial Numbers for WooCommerce does not support product variation.', 'wc-serial-numbers' ),
+ 'https://www.pluginever.com/plugins/woocommerce-serial-numbers-pro/?utm_source=product_page_license_area&utm_medium=link&utm_campaign=wc-serial-numbers&utm_content=Upgrade%20to%20Pro',
+ __( 'Upgrade to Pro', 'wc-serial-numbers' )
+ )
+ );
}
-
}
/**
@@ -152,12 +166,13 @@ public static function variable_product_content( $loop, $variation_data, $variat
public static function product_save_data() {
global $post;
$status = isset( $_POST['_is_serial_number'] ) ? 'yes' : 'no';
- $source = isset( $_POST['_serial_key_source'] ) ? sanitize_text_field( $_POST['_serial_key_source'] ) : 'custom_source';
+ $source = isset( $_POST['_serial_key_source'] ) ? sanitize_text_field( wp_unslash( $_POST['_serial_key_source'] ) ) : 'custom_source';
update_post_meta( $post->ID, '_is_serial_number', $status );
update_post_meta( $post->ID, '_serial_key_source', $source );
- // save only if software licensing enabled
- if ( ! wc_serial_numbers_software_support_disabled() ) {
- update_post_meta( $post->ID, '_software_version', ! empty( $_POST['_software_version'] ) ? sanitize_text_field( $_POST['_software_version'] ) : '' );
+ // save only if software licensing enabled.
+ if ( wcsn_is_software_support_enabled() ) {
+ $software_version = isset( $_POST['_software_version'] ) ? sanitize_text_field( wp_unslash( $_POST['_software_version'] ) ) : '';
+ update_post_meta( $post->ID, '_software_version', $software_version );
}
do_action( 'wcsn_save_simple_product_meta', $post );
@@ -165,42 +180,40 @@ public static function product_save_data() {
/**
+ * Display serial numbers in order item meta.
*
- * @param $o_item
- * @param $product
- *
- * @param $o_item_id
+ * @param int $o_item_id order item id.
+ * @param \WC_Order_Item $o_item order item object.
+ * @param \WC_Product $product product object.
*
* @since 1.1.6
*
- * @return bool|string
+ * @return void
*/
public function order_itemmeta( $o_item_id, $o_item, $product ) {
global $post;
if ( ! is_object( $post ) || ! isset( $post->ID ) ) {
- return false;
+ return;
}
$order = wc_get_order( $post->ID );
- // bail for no order
+ // bail for no order.
if ( ! $order ) {
- return false;
+ return;
}
if ( 'completed' !== $order->get_status( 'edit' ) ) {
- return '';
+ return;
}
- // if this is not product then no need to process
+ // if this is not product then no need to process.
if ( empty( $product ) ) {
- return false;
+ return;
}
- $is_serial_product = 'yes' == get_post_meta( $product->get_id(), '_is_serial_number', true );
-
- if ( ! $is_serial_product ) {
- return false;
+ if ( 'yes' !== get_post_meta( $product->get_id(), '_is_serial_number', true ) ) {
+ return;
}
$items = wcsn_get_keys(
@@ -211,22 +224,28 @@ public function order_itemmeta( $o_item_id, $o_item, $product ) {
);
if ( empty( $items ) && $order ) {
- echo sprintf( '
%s
', __( 'Order missing serial numbers for this item.', 'wc-serial-numbers' ) );
-
- return true;
+ echo wp_kses_post(
+ sprintf(
+ '
%s
',
+ __( 'Order missing serial numbers for this item.', 'wc-serial-numbers' )
+ )
+ );
+ return;
}
$url = admin_url( 'admin.php?page=wc-serial-numbers' );
- echo sprintf(
+ printf(
'
%s→ ',
- add_query_arg(
- [
- 'order_id' => $post->ID,
- 'product_id' => $product->get_id(),
- ],
- $url
+ esc_url(
+ add_query_arg(
+ array(
+ 'order_id' => $post->ID,
+ 'product_id' => $product->get_id(),
+ ),
+ $url
+ )
),
- __( 'Serial Numbers', 'wc-serial-numbers' )
+ esc_html__( 'Serial Numbers', 'wc-serial-numbers' )
);
$url = admin_url( 'admin.php?page=wc-serial-numbers' );
@@ -237,15 +256,19 @@ public function order_itemmeta( $o_item_id, $o_item, $product ) {
$li .= sprintf(
'
→ %s',
add_query_arg(
- [
+ array(
'edit' => $item->id,
- ],
+ ),
$url
),
- wc_serial_numbers_decrypt_key( $item->serial_key )
+ wcsn_decrypt_key( $item->serial_key )
);
}
-
- echo sprintf( '
', $li );
+ echo wp_kses_post(
+ sprintf(
+ '
',
+ $li
+ )
+ );
}
}
diff --git a/src/Admin/Notices.php b/src/Admin/Notices.php
index 3972933b..014fc9d6 100644
--- a/src/Admin/Notices.php
+++ b/src/Admin/Notices.php
@@ -25,10 +25,10 @@ class Notices {
* @since 1.0.0
*/
public function __construct() {
- add_action( 'admin_init', [ $this, 'add_notices' ] );
- add_action( 'admin_notices', [ $this, 'output_notices' ] );
- add_action( 'wp_ajax_wc_serial_numbers_dismiss_notice', [ $this, 'dismiss_notice' ] );
- add_action( 'admin_footer', [ $this, 'add_notice_script' ] );
+ add_action( 'admin_init', array( $this, 'add_notices' ) );
+ add_action( 'admin_notices', array( $this, 'output_notices' ) );
+ add_action( 'wp_ajax_wc_serial_numbers_dismiss_notice', array( $this, 'dismiss_notice' ) );
+ add_action( 'admin_footer', array( $this, 'add_notice_script' ) );
}
/**
@@ -39,7 +39,7 @@ public function __construct() {
public function add_notices() {
$is_outdated_pro = defined( 'WC_SERIAL_NUMBER_PRO_PLUGIN_VERSION' ) && version_compare( WC_SERIAL_NUMBER_PRO_PLUGIN_VERSION, '1.2.1', '<' );
if ( ! $is_outdated_pro ) {
- $is_outdated_pro = function_exists( 'wc_serial_numbers_pro' ) && is_callable( [ 'wc_serial_numbers_pro', 'get_version' ] ) && wc_serial_numbers_pro()->get_version() && version_compare( wc_serial_numbers_pro()->get_version(), '1.2.1', '<' );
+ $is_outdated_pro = function_exists( 'wc_serial_numbers_pro' ) && is_callable( array( 'wc_serial_numbers_pro', 'get_version' ) ) && wc_serial_numbers_pro()->get_version() && version_compare( wc_serial_numbers_pro()->get_version(), '1.2.1', '<' );
}
if ( $is_outdated_pro ) {
$this->notices[] = array(
diff --git a/src/Admin/Orders.php b/src/Admin/Orders.php
index 0524a153..92ce2635 100644
--- a/src/Admin/Orders.php
+++ b/src/Admin/Orders.php
@@ -97,7 +97,7 @@ public static function add_order_serial_column( $columns ) {
public static function add_order_serial_column_content( $column, $order_id ) {
$order_status = wc_get_order( $order_id )->get_status();
if ( 'order_serials' === $column ) {
- if ( ! wcsn_order_has_products( $order_id ) || ! in_array( $order_status, [ 'completed', 'processing' ], true ) ) {
+ if ( ! wcsn_order_has_products( $order_id ) || ! in_array( $order_status, array( 'completed', 'processing' ), true ) ) {
echo '—';
} else {
if ( wcsn_order_is_fullfilled( $order_id ) ) {
@@ -107,8 +107,8 @@ public static function add_order_serial_column_content( $column, $order_id ) {
$style = 'color:red';
$title = __( 'Order is not fullfilled.', 'wc-serial-numbers' );
}
- $url = add_query_arg( [ 'order_id' => $order_id ], admin_url( 'admin.php?page=wc-serial-numbers' ) );
- echo sprintf( '
', esc_url( $url ), esc_html( $title ), esc_attr( $style ) );
+ $url = add_query_arg( array( 'order_id' => $order_id ), admin_url( 'admin.php?page=wc-serial-numbers' ) );
+ printf( '
', esc_url( $url ), esc_html( $title ), esc_attr( $style ) );
}
}
}
@@ -139,7 +139,7 @@ public function add_order_bulk_action( $actions ) {
* @return string
*/
public function handle_order_bulk_action( $redirect_to, $action, $order_ids ) {
- if ( in_array( $action, [ 'wcsn_add_keys', 'wcsn_remove_keys' ], true ) ) {
+ if ( in_array( $action, array( 'wcsn_add_keys', 'wcsn_remove_keys' ), true ) ) {
foreach ( $order_ids as $order_id ) {
switch ( $action ) {
case 'wcsn_add_keys':
@@ -217,7 +217,7 @@ public static function display_order_item_meta( $item_id, $item, $product ) {
-
+
$field ) : ?>
diff --git a/src/Admin/Products.php b/src/Admin/Products.php
index b7cbdf2b..d5e1e7b9 100644
--- a/src/Admin/Products.php
+++ b/src/Admin/Products.php
@@ -27,7 +27,6 @@ public function __construct() {
* @since 1.0.0
*/
public static function print_style() {
- ob_start();
?>
__( 'General Settings', 'wc-serial-numbers' ),
'type' => 'title',
'desc' => __( 'These options determine the behavior and operation of the plugin.', 'wc-serial-numbers' ),
'id' => 'section_serial_numbers',
- ],
- [
+ ),
+ array(
'title' => __( 'Auto-complete orders', 'wc-serial-numbers' ),
'id' => 'wc_serial_numbers_autocomplete_order',
'desc' => __( 'Automatically completes orders after successful payments.', 'wc-serial-numbers' ),
'type' => 'checkbox',
'default' => 'no',
- ],
- [
+ ),
+ array(
'title' => __( 'Reuse keys', 'wc-serial-numbers' ),
'id' => 'wc_serial_numbers_reuse_serial_number',
'desc' => __( 'Recover failed, refunded keys for selling again.', 'wc-serial-numbers' ),
'desc_tip' => __( 'If you enable this option, the keys will be available for selling again if the order is refunded or failed.', 'wc-serial-numbers' ),
'type' => 'checkbox',
'default' => 'no',
- ],
+ ),
// Revoke serial keys.
- [
+ array(
'title' => __( 'Revoke keys', 'wc-serial-numbers' ),
'id' => 'wc_serial_numbers_revoke_keys',
'desc' => __( 'Revoke keys when the order status changes to cancelled or refunded.', 'wc-serial-numbers' ),
'desc_tip' => __( 'If you enable this option, the keys will be revoked when the order status changes to cancelled or refunded.', 'wc-serial-numbers' ),
'type' => 'checkbox',
'default' => 'no',
- ],
- [
+ ),
+ array(
'title' => __( 'Hide keys', 'wc-serial-numbers' ),
'id' => 'wc_serial_numbers_hide_serial_number',
'desc' => __( 'Keys will be masked in the list table.', 'wc-serial-numbers' ),
'default' => 'yes',
'type' => 'checkbox',
- ],
- [
- 'title' => __( 'Disable software support', 'wc-serial-numbers' ),
- 'id' => 'wc_serial_numbers_disable_software_support',
- 'desc' => __( 'Disable Software Licensing support & API functionalities.', 'wc-serial-numbers' ),
+ ),
+ array(
+ 'title' => __( 'Disable software support', 'wc-serial-numbers' ),
+ 'id' => 'wc_serial_numbers_disable_software_support',
+ 'desc' => __( 'Disable Software Licensing support & API functionalities.', 'wc-serial-numbers' ),
'desc_tip' => __( 'If you enable this option, the activation menu and it’s functionality will be turned off.', 'wc-serial-numbers' ),
- 'default' => 'no',
- 'type' => 'checkbox',
- ],
- [
+ 'default' => 'no',
+ 'type' => 'checkbox',
+ ),
+ array(
'type' => 'sectionend',
'id' => 'section_serial_numbers',
- ],
- [
+ ),
+ array(
'title' => __( 'Stock Notification', 'wc-serial-numbers' ),
'type' => 'title',
'desc' => __( 'These options determine the operation of the key\'s stock notification.', 'wc-serial-numbers' ),
'id' => 'stock_section',
- ],
- [
+ ),
+ array(
'title' => __( 'Stock notification email', 'wc-serial-numbers' ),
'id' => 'wc_serial_numbers_enable_stock_notification',
'desc' => __( 'Sends notification emails when key stock is low.', 'wc-serial-numbers' ),
'type' => 'checkbox',
'sanitize_callback' => 'intval',
'default' => 'yes',
- ],
+ ),
array(
'title' => __( 'Stock threshold', 'wc-serial-numbers' ),
'id' => 'wc_serial_numbers_stock_threshold',
@@ -119,10 +119,10 @@ public function get_settings( $tab ) {
'type' => 'text',
'default' => get_option( 'admin_email' ),
),
- [
+ array(
'type' => 'sectionend',
'id' => 'stock_section',
- ],
+ ),
);
break;
}
@@ -187,7 +187,7 @@ protected function output_premium_widget() {
public function output_tabs( $tabs ) {
parent::output_tabs( $tabs );
if ( WCSN()->get_docs_url() ) {
- echo sprintf( '
%s ', WCSN()->get_docs_url(), __( 'Documentation', 'wc-serial-numbers' ) );
+ printf( '
%s ', esc_url( WCSN()->get_docs_url() ), esc_html__( 'Documentation', 'wc-serial-numbers' ) );
}
}
}
diff --git a/src/Admin/views/html-edit-key.php b/src/Admin/views/html-edit-key.php
index d99d676f..e018c16a 100644
--- a/src/Admin/views/html-edit-key.php
+++ b/src/Admin/views/html-edit-key.php
@@ -39,7 +39,7 @@
%s',
esc_attr( $key->get_product_id() ),
esc_html( $key->get_product_title() )
@@ -93,7 +93,7 @@
$option ) : ?>
- %s', esc_attr( $status ), selected( $key->get_status(), $status, false ), esc_html( $option ) ); ?>
+ %s', esc_attr( $status ), selected( $key->get_status(), $status, false ), esc_html( $option ) ); ?>
@@ -105,7 +105,7 @@
%s',
esc_attr( $key->get_order_id() ),
esc_html( $key->get_order_title() )
diff --git a/src/Ajax.php b/src/Ajax.php
index f6fa19c4..0d559be8 100644
--- a/src/Ajax.php
+++ b/src/Ajax.php
@@ -18,7 +18,7 @@ class Ajax {
* @since 1.0.0
*/
public function __construct() {
- add_action( 'wp_ajax_wc_serial_numbers_search_product', [ __CLASS__, 'search_product' ] );
+ add_action( 'wp_ajax_wc_serial_numbers_search_product', array( __CLASS__, 'search_product' ) );
add_action( 'wp_ajax_wc_serial_numbers_search_orders', array( __CLASS__, 'search_orders' ) );
add_action( 'wp_ajax_wc_serial_numbers_search_customers', array( __CLASS__, 'search_customers' ) );
}
@@ -31,7 +31,7 @@ public function __construct() {
*/
public static function search_product() {
check_ajax_referer( 'wc_serial_numbers_search_nonce', 'nonce' );
- $search = isset( $_REQUEST['search'] ) ? sanitize_text_field( $_REQUEST['search'] ) : '';
+ $search = isset( $_REQUEST['search'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['search'] ) ) : '';
$page = isset( $_REQUEST['page'] ) ? absint( $_REQUEST['page'] ) : 1;
$per_page = absint( 100 );
$args = array_merge(
@@ -87,7 +87,7 @@ public static function search_product() {
*/
public static function search_orders() {
check_ajax_referer( 'wc_serial_numbers_search_nonce', 'nonce' );
- $search = isset( $_REQUEST['search'] ) ? sanitize_text_field( $_REQUEST['search'] ) : '';
+ $search = isset( $_REQUEST['search'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['search'] ) ) : '';
$page = isset( $_REQUEST['page'] ) ? absint( $_REQUEST['page'] ) : 1;
$per_page = absint( 100 );
@@ -155,7 +155,7 @@ public static function search_orders() {
*/
public static function search_customers() {
check_ajax_referer( 'wc_serial_numbers_search_nonce', 'nonce' );
- $search = isset( $_REQUEST['search'] ) ? sanitize_text_field( $_REQUEST['search'] ) : '';
+ $search = isset( $_REQUEST['search'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['search'] ) ) : '';
$page = isset( $_REQUEST['page'] ) ? absint( $_REQUEST['page'] ) : 1;
$per_page = absint( 100 );
diff --git a/src/Compat.php b/src/Compat.php
index f74955da..d7bfdd79 100644
--- a/src/Compat.php
+++ b/src/Compat.php
@@ -26,8 +26,8 @@ public function __construct() {
/**
* WooCommerce PDF Invoices & Packing Slips plugin support.
*
- * @param $type
- * @param $order
+ * @param string $type Document type.
+ * @param \WC_Order $order Order object.
*
* @since 1.2.0
*/
@@ -38,8 +38,8 @@ public static function wpo_wcpdf_after_order_details( $type, $order ) {
/**
* WooCommerce PDF Invoices
*
- * @param $headers
- * @param $order_id
+ * @param string $headers Header content.
+ * @param int $order_id Order ID.
*
* @return string
* @since 1.1.1
@@ -55,10 +55,10 @@ public static function woocommerce_pdf_invoice_support( $headers, $order_id ) {
/**
* Support WooCommerce PDF Invoices, Packing Slips, Delivery Notes & Shipping Labels plugin
*
- * @param $find_replace
- * @param $html
- * @param $template_type
- * @param $order
+ * @param array $find_replace Find and replace array.
+ * @param string $html HTML content.
+ * @param string $template_type Template type.
+ * @param \WC_Order $order Order object.
*
* @return array
* @since 1.1.1
diff --git a/src/Deprecated/Functions.php b/src/Deprecated/Functions.php
index f2f4e2b4..9d1317cf 100644
--- a/src/Deprecated/Functions.php
+++ b/src/Deprecated/Functions.php
@@ -1,4 +1,6 @@
$label ) {
if ( in_array( $key, $software_columns ) ) {
unset( $columns[ $key ] );
diff --git a/src/Deprecated/class-encryption.php b/src/Deprecated/class-encryption.php
deleted file mode 100644
index 551a54cd..00000000
--- a/src/Deprecated/class-encryption.php
+++ /dev/null
@@ -1,211 +0,0 @@
-id = ! empty( $id ) ? $id : uniqid();
-
- return $builder;
- }
-
- /**
- * Adds select statement.
- *
- * @param $statement
- *
- * @return $this
- * @since 1.0.0
- */
- public function select( $statement ) {
- $this->select[] = $statement;
-
- return $this;
- }
-
- /**
- * Adds from statement.
- *
- * @param string $name
- * @param bool $add_prefix
- *
- * @since 1.0.0
- */
- public function table( $name, $add_prefix = true ) {
- global $wpdb;
- $table = ( $add_prefix ? $wpdb->prefix : '' ) . $name;
- $this->from = $table;
-
- return $this;
- }
-
- /**
- * Adds from statement.
- *
- * @param string $from
- * @param bool $add_prefix Should DB prefix be added.
- *
- * @return WC_Serial_Numbers_Query this for chaining.
- * @global object $wpdb
- *
- * @since 1.0.0
- */
- public function from( $from, $add_prefix = true ) {
- global $wpdb;
- $this->from = $this->from . ' ' . ( $add_prefix ? $wpdb->prefix : '' ) . $from;
-
- return $this;
- }
-
- /**
- * Adds search statement.
- *
- * @param $search
- * @param $columns
- * @param $joint
- *
- * @since 1.0.0
- */
- public function search( $search, $columns, $joint = 'AND' ) {
- if ( ! empty( $search ) ) {
- global $wpdb;
- foreach ( explode( ' ', $search ) as $word ) {
- $word = '%' . $this->sanitize_value( true, $word ) . '%';
- $this->where[] = [
- 'joint' => $joint,
- 'condition' => '(' . implode(
- ' OR ',
- array_map(
- function ( $column ) use ( &$wpdb, &$word ) {
- return $wpdb->prepare( $column . ' LIKE %s', $word );
- },
- $columns
- )
- ) . ')',
- ];
- }
- }
-
- return $this;
- }
-
- /**
- * Create a where statement.
- *
- * ->where('name', 'sultan')
- * ->where('age', '>', 18)
- * ->where('name', 'in', array('ayaan', 'ayaash', 'anaan'))
- * ->where(function($q){
- * $q->where('ID', '>', 21);
- * })
- *
- * @param string|array $column The SQL column
- * @param mixed $param1 Operator or value depending if $param2 isset.
- * @param mixed $param2 The value if $param1 is an operator.
- * @param string $joint the where type ( and, or )
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function where( $column, $param1 = null, $param2 = null, $joint = 'and' ) {
- global $wpdb;
- if ( ! in_array( strtolower( $joint ), [ 'and', 'or', 'where' ] ) ) {
- $this->exception( 'Invalid where type "' . $joint . '"' );
- }
-
- // when column is an array we assume to make a bulk and where.
- if ( is_array( $column ) ) {
- // create new query object
- $subquery = new WC_Serial_Numbers_Query();
- foreach ( $column as $key => $val ) {
- $subquery->where( $key, $val, null, $joint );
- }
-
- $this->where = array_merge( $this->where, $subquery->where );
-
- return $this;
- }
-
- if ( is_object( $column ) && ( $column instanceof \Closure ) ) {
- // create new query object
- $subquery = new WC_Serial_Numbers_Query();
-
- // run the closure callback on the sub query
- call_user_func_array( $column, array( &$subquery ) );
- $condition = '';
- for ( $i = 0; $i < count( $subquery->where ); ++ $i ) {
- $condition .= ( $i === 0 ? ' ' : ' ' . $subquery->where[ $i ]['joint'] . ' ' )
- . $subquery->where[ $i ]['condition'];
- }
-
- $this->where = array_merge(
- $this->where,
- array(
- array(
- 'joint' => $joint,
- 'condition' => "($condition)",
- ),
- )
- );
-
- return $this;
- }
-
- // when param2 is null we replace param2 with param one as the
- // value holder and make param1 to the = operator.
- if ( is_null( $param2 ) ) {
- $param2 = $param1;
- $param1 = '=';
- }
-
- // if the param2 is an array we filter it. when param2 is an array we probably
- // have an "in" or "between" statement which has no need for duplicates.
- if ( is_array( $param2 ) ) {
- $param2 = array_unique( $param2 );
- }
-
- // Between?
- if ( is_array( $param2 ) && strpos( $param1, 'BETWEEN' ) !== false ) {
- $min = isset( $param2[0] ) ? $param2[0] : false;
- $max = isset( $param2[1] ) ? $param2[1] : false;
- if ( ! $min || ! $max ) {
- $this->exception( 'BETWEEN min or max is missing' );
- }
-
- $min = $wpdb->prepare( is_numeric( $min ) ? '%d' : '%s', $min );
- $max = $wpdb->prepare( is_numeric( $max ) ? '%d' : '%s', $max );
-
- $this->where[] = [
- 'joint' => $joint,
- 'condition' => "($column BETWEEN $min AND $max)",
- ];
-
- return $this;
- }
-
- // Not Between?
- if ( is_array( $param2 ) && strpos( $param1, 'NOT BETWEEN' ) !== false ) {
- $min = isset( $param2[0] ) ? $param2[0] : false;
- $max = isset( $param2[1] ) ? $param2[1] : false;
- if ( ! $min || ! $max ) {
- $this->exception( 'NOT BETWEEN min or max is missing' );
- }
-
- $min = $wpdb->prepare( is_numeric( $min ) ? '%d' : '%s', $min );
- $max = $wpdb->prepare( is_numeric( $max ) ? '%d' : '%s', $max );
-
- $this->where[] = [
- 'joint' => $joint,
- 'condition' => "($column NOT BETWEEN $min AND $max)",
- ];
-
- return $this;
- }
-
- // first check if is array if so then make a string out of array
- // if not array but null then set value as null
- // if not null does it contains . it could be column so dont parse as string
- // If not column then use wpdb prepare
- // if contains $prefix
- $contain_join = preg_replace( '/^(\s?AND ?|\s?OR ?)|\s$/i', '', $param2 );
-
- $param2 = is_array( $param2 ) ? ( '("' . implode( '","', $param2 ) . '")' ) : ( $param2 === null
- ? 'null'
- : ( strpos( $param2, '.' ) !== false || strpos( $param2, $wpdb->prefix ) !== false ? $param2 : $wpdb->prepare( is_numeric( $param2 ) ? '%d' : '%s', $param2 ) )
- );
-
- $this->where[] = [
- 'joint' => $joint,
- 'condition' => implode( ' ', [ $column, $param1, $param2 ] ),
- ];
-
- return $this;
- }
-
-
- /**
- * Create an or where statement
- *
- * This is the same as the normal where just with a fixed type
- *
- * @param string $column The SQL column
- * @param mixed $param1
- * @param mixed $param2
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function orWhere( $column, $param1 = null, $param2 = null ) {
- return $this->where( $column, $param1, $param2, 'or' );
- }
-
- /**
- * Create an and where statement
- *
- * This is the same as the normal where just with a fixed type
- *
- * @param string $column The SQL column
- * @param mixed $param1
- * @param mixed $param2
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function andWhere( $column, $param1 = null, $param2 = null ) {
- return $this->where( $column, $param1, $param2, 'and' );
- }
-
- /**
- * Creates a where in statement
- *
- * ->whereIn('id', [42, 38, 12])
- *
- * @param string $column
- * @param array $options
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function whereIn( $column, array $options = array() ) {
- // when the options are empty we skip
- if ( empty( $options ) ) {
- return $this;
- }
-
- return $this->where( $column, 'in', $options );
- }
-
- /**
- * Creates a where not in statement
- *
- * ->whereNotIn('id', [42, 38, 12])
- *
- * @param string $column
- * @param array $options
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function whereNotIn( $column, array $options = array() ) {
- // when the options are empty we skip
- if ( empty( $options ) ) {
- return $this;
- }
-
- return $this->where( $column, 'not in', $options );
- }
-
- /**
- * Creates a where something is null statement
- *
- * ->whereNull('modified_at')
- *
- * @param string $column
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function whereNull( $column ) {
- return $this->where( $column, 'is', null );
- }
-
- /**
- * Creates a where something is not null statement
- *
- * ->whereNotNull('created_at')
- *
- * @param string $column
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function whereNotNull( $column ) {
- return $this->where( $column, 'is not', null );
- }
-
- /**
- * Creates a or where something is null statement
- *
- * ->orWhereNull('modified_at')
- *
- * @param string $column
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function orWhereNull( $column ) {
- return $this->orWhere( $column, 'is', null );
- }
-
- /**
- * Creates a or where something is not null statement
- *
- * ->orWhereNotNull('modified_at')
- *
- * @param string $column
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function orWhereNotNull( $column ) {
- return $this->orWhere( $column, 'is not', null );
- }
-
-
- /**
- * Creates a where between statement
- *
- * ->whereBetween('user_id', 1, 2000)
- *
- * @param string $column
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function whereBetween( $column, $min, $max ) {
- return $this->where( $column, 'BETWEEN', array( $min, $max ) );
- }
-
- /**
- * Creates a where not between statement
- *
- * ->whereNotBetween('user_id', 1, 2000)
- *
- * @param string $column
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function whereNotBetween( $column, $min, $max ) {
- return $this->where( $column, 'NOT BETWEEN', array( $min, $max ) );
- }
-
- /**
- * Creates a where date between statement
- *
- * ->whereDateBetween('date', '2014-02-01', '2014-02-28')
- *
- * @param string $column
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function whereDateBetween( $column, $start, $end ) {
- global $wpdb;
- $stat_date = $wpdb->get_var( $wpdb->prepare( 'SELECT CAST(%s as DATE)', $start ) );
- $end_date = $wpdb->get_var( $wpdb->prepare( 'SELECT CAST(%s as DATE)', $end ) );
-
- return $this->where( $column, 'BETWEEN', array( $stat_date, $end_date ) );
- }
-
-
- /**
- *
- * @param $query
- * @param string $joint
- *
- * @since 1.0.1
- */
- public function whereRaw( $query, $joint = 'AND' ) {
- $this->where[] = [
- 'joint' => $joint,
- 'condition' => $query,
- ];
-
- return $this;
- }
-
-
- /**
- * Add a join statement to the current query
- *
- * ->join('avatars', 'users.id', '=', 'avatars.user_id')
- *
- * @param array|string $table The table to join. (can contain an alias definition.)
- * @param string $localKey
- * @param string $operator The operator (=, !=, <, > etc.)
- * @param string $referenceKey
- * @param string $type The join type (inner, left, right, outer)
- * @param string $joint The join AND or Or
- * @param bool $add_prefix Add table prefix or not
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function join( $table, $localKey, $operator = null, $referenceKey = null, $type = 'left', $joint = 'AND', $add_prefix = true ) {
- global $wpdb;
- $type = is_string( $type ) ? strtoupper( trim( $type ) ) : ( $type ? 'LEFT' : '' );
- if ( ! in_array( $type, [ '', 'LEFT', 'RIGHT', 'INNER', 'CROSS', 'LEFT OUTER', 'RIGHT OUTER' ] ) ) {
- $this->exception( 'Invalid join type.' );
- }
-
- $join = [
- 'table' => ( $add_prefix ? $wpdb->prefix : '' ) . $table,
- 'type' => $type,
- 'on' => [],
- ];
-
- // to make nested joins possible you can pass an closure
- // which will create a new query where you can add your nested where
- if ( is_object( $localKey ) && ( $localKey instanceof \Closure ) ) {
- // create new query object
- $subquery = new WC_Serial_Numbers_Query();
- // run the closure callback on the sub query
- call_user_func_array( $localKey, array( &$subquery ) );
-
- $join['on'] = array_merge( $join['on'], $subquery->where );
- $this->join = array_merge( $this->join, array( $join ) );
-
- return $this;
- }
-
- // when $referenceKey is null we replace $operator with $referenceKey one as the
- // value holder and make $operator to the = operator.
- if ( is_null( $referenceKey ) ) {
- $referenceKey = $operator;
- $operator = '=';
- }
-
- $referenceKey = is_array( $referenceKey ) ? ( '(\'' . implode( '\',\'', $referenceKey ) . '\')' )
- : ( $referenceKey === null
- ? 'null'
- : ( strpos( $referenceKey, '.' ) !== false || strpos( $referenceKey, $wpdb->prefix ) !== false ? $referenceKey : $wpdb->prepare( is_numeric( $referenceKey ) ? '%d' : '%s', $referenceKey ) )
- );
-
- $join['on'][] = [
- 'joint' => $joint,
- 'condition' => implode( ' ', [ $localKey, $operator, $referenceKey ] ),
- ];
-
- $this->join[] = $join;
-
- return $this;
- }
-
- /**
- * Left join same as join with special type
- *
- * @param array|string $table The table to join. (can contain an alias definition.)
- * @param string $localKey
- * @param string $operator The operator (=, !=, <, > etc.)
- * @param string $referenceKey
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function leftJoin( $table, $localKey, $operator = null, $referenceKey = null ) {
- return $this->join( $table, $localKey, $operator, $referenceKey, 'left' );
- }
-
- /**
- * Alias of the `join` method with join type right.
- *
- * @param array|string $table The table to join. (can contain an alias definition.)
- * @param string $localKey
- * @param string $operator The operator (=, !=, <, > etc.)
- * @param string $referenceKey
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function rightJoin( $table, $localKey, $operator = null, $referenceKey = null ) {
- return $this->join( $table, $localKey, $operator, $referenceKey, 'right' );
- }
-
- /**
- * Alias of the `join` method with join type inner.
- *
- * @param array|string $table The table to join. (can contain an alias definition.)
- * @param string $localKey
- * @param string $operator The operator (=, !=, <, > etc.)
- * @param string $referenceKey
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function innerJoin( $table, $localKey, $operator = null, $referenceKey = null ) {
- return $this->join( $table, $localKey, $operator, $referenceKey, 'inner' );
- }
-
- /**
- * Alias of the `join` method with join type outer.
- *
- * @param array|string $table The table to join. (can contain an alias definition.)
- * @param string $localKey
- * @param string $operator The operator (=, !=, <, > etc.)
- * @param string $referenceKey
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function outerJoin( $table, $localKey, $operator = null, $referenceKey = null ) {
- return $this->join( $table, $localKey, $operator, $referenceKey, 'outer' );
- }
-
- /**
- *
- * @param $query
- * @param string $joint
- *
- * @since 1.0.1
- */
- public function joinRaw( $query, $joint = 'AND' ) {
- $this->join['on'][] = [
- 'joint' => $joint,
- 'condition' => $query,
- ];
-
- return $this;
- }
-
-
- /**
- * Adds group by statement.
- * ->groupBy('category')
- * ->gorupBy(['category', 'price'])
- *
- * @param string $field
- *
- * @return WC_Serial_Numbers_Query this for chaining.
- * @since 1.0.0
- */
- public function group_by( $field ) {
- if ( empty( $field ) ) {
- return $this;
- }
-
- if ( is_array( $field ) ) {
- foreach ( $field as $groupby ) {
- $this->group[] = $groupby;
- }
- } else {
- $this->group[] = $field;
- }
-
- return $this;
- }
-
- /**
- * Adds having statement.
- *
- * ->group_by('user.id')
- * ->having('count(user.id)>1')
- *
- * @param string $statement
- *
- * @return WC_Serial_Numbers_Query this for chaining.
- * @since 1.0.0
- */
- public function having( $statement ) {
- if ( ! empty( $statement ) ) {
- $this->having = $statement;
- }
-
- return $this;
- }
-
- /**
- * Adds order by statement.
- *
- * ->orderBy('created_at')
- * ->orderBy('modified_at', 'desc')
- *
- * @param string $key
- * @param string $direction
- *
- * @return WC_Serial_Numbers_Query this for chaining.
- * @throws Exception
- * @since 1.0.0
- */
- public function order_by( $key, $direction = 'ASC' ) {
- $direction = trim( strtoupper( $direction ) );
- if ( $direction !== 'ASC' && $direction !== 'DESC' ) {
- $this->exception( 'Invalid direction value.' );
- }
- if ( ! empty( $key ) ) {
- $this->order[] = $key . ' ' . $direction;
- }
-
- return $this;
- }
-
- /**
- * Set the query limit
- *
- * // limit()
- * ->limit(20)
- *
- * // limit(, )
- * ->limit(60, 20)
- *
- * @param int $limit
- * @param int $limit2
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- */
- public function limit( $limit, $limit2 = null ) {
- if ( ! is_null( $limit2 ) ) {
- $this->offset = (int) $limit;
- $this->limit = (int) $limit2;
- } else {
- $this->limit = (int) $limit;
- }
-
- return $this;
- }
-
- /**
- * Adds offset statement.
- *
- * ->offset(20)
- *
- * @param int $offset
- *
- * @return WC_Serial_Numbers_Query this for chaining.
- */
- public function offset( $offset ) {
- $this->offset = $offset;
-
- return $this;
- }
-
- /**
- * Create a query limit based on a page and a page size
- *
- * //page(, )
- * ->page(2, 20)
- *
- * @param int $page
- * @param int $size
- *
- * @return WC_Serial_Numbers_Query The current query builder.
- * @since 1.0.0
- */
- public function page( $page, $size = 20 ) {
- if ( ( $page = (int) $page ) <= 1 ) {
- $page = 0;
- } else {
- $page = $page - 1;
- }
-
- $this->limit = (int) $size;
- $this->offset = (int) $size * $page;
-
- return $this;
- }
-
- /**
- * Find something, means select one item by key
- *
- * ->find('manikdrmc@gmail.com', 'email')
- *
- * @param int $id
- * @param string $key
- *
- * @return mixed
- */
- public function find( $id, $key = 'id' ) {
- return $this->where( $key, $id )->one();
- }
-
- /**
- * Get the first result ordered by the given key.
- *
- * @param string $key By what should the first item be selected? Default is: 'id'
- *
- * @return mixed The first result.
- */
- public function first( $key = 'id' ) {
- return $this->order_by( $key, 'asc' )->one();
- }
-
- /**
- * Get the last result by key
- *
- * @param string $key
- *
- * @return mixed the last result.
- */
- public function last( $key = 'id' ) {
- return $this->order_by( $key, 'desc' )->one();
- }
-
- /**
- * Pluck item.
- * ->find('post_title')
- *
- * @return Object
- * @since 1.0.1
- */
- public function pluck() {
- $selects = func_get_args();
- $this->select = $selects;
-
- return $this->get();
- }
-
-
- /**
- * Returns results from builder statements.
- *
- * @param int $output WPDB output type.
- * @param callable $row_map Function callable to filter or map results to.
- * @param bool $calc_rows Flag that indicates to SQL if rows should be calculated or not.
- *
- * @return Object || Array
- * @since 1.0.0
- *
- * @global object $wpdb
- */
- public function get( $output = OBJECT, $row_map = null, $calc_rows = false ) {
- global $wpdb;
- do_action( 'wp_query_builder_get_builder', $this );
- do_action( 'wp_query_builder_get_builder_' . $this->id, $this );
-
- $query = '';
- $this->_query_select( $query, $calc_rows );
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
- $this->_query_order( $query );
- $this->_query_limit( $query );
- $this->_query_offset( $query );
-
- // Process
- $query = apply_filters( 'wp_query_builder_get_query', $query );
- $query = apply_filters( 'wp_query_builder_get_query_' . $this->id, $query );
-
- $results = $wpdb->get_results( $query, $output );
- if ( $row_map ) {
- $results = array_map(
- function ( $row ) use ( &$row_map ) {
- return call_user_func_array( $row_map, [ $row ] );
- },
- $results
- );
- }
-
- return $results;
- }
-
- /**
- * Sets the limit to 1, executes and returns the first result using get.
- *
- * @param string $output
- *
- * @return mixed The single result.
- */
- public function one( $output = OBJECT ) {
- global $wpdb;
- do_action( 'wp_query_builder_one_builder', $this );
- do_action( 'wp_query_builder_one_builder_' . $this->id, $this );
-
- $this->_query_select( $query );
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
- $this->_query_order( $query );
- $query .= ' LIMIT 1';
- $this->_query_offset( $query );
-
- $query = apply_filters( 'wp_query_builder_one_query', $query );
- $query = apply_filters( 'wp_query_builder_one_query_' . $this->id, $query );
-
- return $wpdb->get_row( $query, $output );
- }
-
- /**
- * Just return the number of results
- *
- * @param string|int $column
- *
- * @return int
- */
- public function count( $column = 1 ) {
- global $wpdb;
- do_action( 'wp_query_builder_count_builder', $this );
- do_action( 'wp_query_builder_count_builder_' . $this->id, $this );
-
- $query = 'SELECT count(' . $column . ') as `count`';
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
-
- return intval( $wpdb->get_var( $query ) );
- }
-
- /**
- * Just get a single value from the result
- *
- * @param string $column The index of the column.
- * @param bool $calc_rows Flag that indicates to SQL if rows should be calculated or not.
- *
- * @return mixed The columns value
- */
- public function column( $column = 0, $calc_rows = false ) {
- global $wpdb;
- do_action( 'wp_query_builder_column_builder', $this );
- do_action( 'wp_query_builder_column_builder_' . $this->id, $this );
-
- $query = '';
- $this->_query_select( $query, $calc_rows );
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
- $this->_query_order( $query );
- $this->_query_limit( $query );
- $this->_query_offset( $query );
-
- return $wpdb->get_col( $query, $column );
- }
-
- /**
- * Returns a value.
- *
- * @param int $x Column of value to return. Indexed from 0.
- * @param int $y Row of value to return. Indexed from 0.
- *
- * @return mixed
- * @global object $wpdb
- *
- * @since 1.0.0
- */
- public function value( $x = 0, $y = 0 ) {
- global $wpdb;
- do_action( 'wp_query_builder_value_builder', $this );
- do_action( 'wp_query_builder_value_builder_' . $this->id, $this );
-
- // Build
- // WC_Serial_Numbers_Query
- $query = '';
- $this->_query_select( $query );
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
- $this->_query_order( $query );
- $this->_query_limit( $query );
- $this->_query_offset( $query );
-
- return $wpdb->get_var( $query, $x, $y );
- }
-
-
- /**
- * Update or insert.
- *
- * @param $data
- *
- * @return array|string
- */
- public function updateOrInsert( $data ) {
- if ( $this->first() ) {
- return $this->update( $data );
- } else {
- return $this->insert( $data );
- }
- }
-
- /**
- * Find or insert.
- *
- * @param $data
- *
- * @return array|string
- */
- public function findOrInsert( $data ) {
- if ( $this->first() ) {
- return $this->update( $data );
- } else {
- return $this->insert( $data );
- }
- }
-
- /**
- * Get max value.
- *
- * @param $column
- *
- * @return int
- * @since 1.0.1
- */
- public function max( $column ) {
- global $wpdb;
- $query = 'SELECT MAX(' . $column . ')';
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
-
- return intval( $wpdb->get_var( $query ) );
- }
-
- /**
- * Get min value.
- *
- * @param $column
- *
- * @return int
- * @since 1.0.1
- */
- public function min( $column ) {
- global $wpdb;
- $query = 'SELECT MIN(' . $column . ')';
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
-
- return intval( $wpdb->get_var( $query ) );
- }
-
- /**
- * Get avg value.
- *
- * @param $column
- *
- * @return int
- * @since 1.0.1
- */
- public function avg( $column ) {
- global $wpdb;
- $query = 'SELECT AVG(' . $column . ')';
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
-
- return intval( $wpdb->get_var( $query ) );
- }
-
- /**
- * Get sum value.
- *
- * @param $column
- *
- * @return int
- * @since 1.0.1
- */
- public function sum( $column ) {
- global $wpdb;
- $query = 'SELECT SUM(' . $column . ')';
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
-
- return intval( $wpdb->get_var( $query ) );
- }
-
- /**
- * Returns flag indicating if query has been executed.
- *
- * @param string $sql
- *
- * @return bool
- * @since 1.0.0
- *
- * @global object $wpdb
- */
- public function query( $sql = '' ) {
- global $wpdb;
- $query = $sql;
- if ( empty( $query ) ) {
- $this->_query_select( $query, false );
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
- $this->_query_order( $query );
- $this->_query_limit( $query );
- $this->_query_offset( $query );
- }
-
- return $wpdb->query( $query );
- }
-
- /**
- * Returns query from builder statements.
- *
- * @return string
- * @since 1.0.0
- */
- public function toSql() {
- $query = '';
- $this->_query_select( $query );
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
- $this->_query_group( $query );
- $this->_query_having( $query );
- $this->_query_order( $query );
- $this->_query_limit( $query );
- $this->_query_offset( $query );
-
- return $query;
- }
-
- /**
- * Returns found rows in last query, if SQL_CALC_FOUND_ROWS is used and is supported.
- *
- * @return array
- * @global object $wpdb
- *
- * @since 1.0.0
- */
- public function rows_found() {
- global $wpdb;
- $query = 'SELECT FOUND_ROWS()';
- // Process
- $query = apply_filters( 'wp_query_builder_found_rows_query', $query );
- $query = apply_filters( 'wp_query_builder_found_rows_query_' . $this->id, $query );
-
- return $wpdb->get_var( $query );
- }
-
- /**
- * Returns flag indicating if delete query has been executed.
- *
- * @return bool
- * @global object $wpdb
- *
- * @since 1.0.0
- */
- public function delete() {
- global $wpdb;
- do_action( 'wp_query_builder_delete_builder', $this );
- do_action( 'wp_query_builder_delete_builder_' . $this->id, $this );
-
- $query = '';
- $this->_query_delete( $query );
- $this->_query_from( $query );
- $this->_query_join( $query );
- $this->_query_where( $query );
-
- return $wpdb->query( $query );
- }
-
- /**
- * Update
- *
- * @return bool
- * @global object $wpdb
- *
- * @since 1.0.0
- */
- public function update( $data ) {
- global $wpdb;
- $conditions = '';
- $this->_query_where( $conditions );
-
- if ( empty( trim( $conditions ) ) ) {
- false;
- }
-
- $fields = array();
- foreach ( $data as $column => $value ) {
-
- if ( is_null( $value ) ) {
- $fields[] = "`$column` = NULL";
- continue;
- }
-
- $fields[] = "`$column` = " . $wpdb->prepare( is_numeric( $value ) ? '%d' : '%s', $value );
- }
-
- $table = trim( $this->from );
- $fields = implode( ', ', $fields );
-
- $query = "UPDATE `$table` SET $fields $conditions";
-
- return $wpdb->query( $query );
- }
-
- /**
- * Insert data.
- *
- * @param $data
- * @param array $format
- *
- * @return bool|int
- * @since 1.0.1
- */
- public function insert( $data, $format = array() ) {
- global $wpdb;
-
- if ( false !== $wpdb->insert( trim( $this->from ), $data, $format ) ) {
- return $wpdb->insert_id;
- };
-
- return false;
- }
-
- /**
- * Return a cloned object from current builder.
- *
- * @return WC_Serial_Numbers_Query
- * @since 1.0.0
- */
- public function copy() {
- return clone( $this );
- }
-
- /**
- * Builds query's select statement.
- *
- * @param string &$query
- * @param bool $calc_rows
- *
- * @since 1.0.0
- */
- private function _query_select( &$query, $calc_rows = false ) {
- $query = 'SELECT ' . ( $calc_rows ? 'SQL_CALC_FOUND_ROWS ' : '' ) . (
- is_array( $this->select ) && count( $this->select )
- ? implode( ',', $this->select )
- : '*'
- );
- }
-
- /**
- * Builds query's from statement.
- *
- * @param string &$query
- *
- * @since 1.0.0
- */
- private function _query_from( &$query ) {
- $query .= ' FROM ' . $this->from;
- }
-
- /**
- * Builds query's join statement.
- *
- * @param string &$query
- *
- * @since 1.0.0
- */
- private function _query_join( &$query ) {
- foreach ( $this->join as $join ) {
- $query .= ( ! empty( $join['type'] ) ? ' ' . $join['type'] . ' JOIN ' : ' JOIN ' ) . $join['table'];
- for ( $i = 0; $i < count( $join['on'] ); ++ $i ) {
- $query .= ( $i === 0 ? ' ON ' : ' ' . $join['on'][ $i ]['joint'] . ' ' )
- . $join['on'][ $i ]['condition'];
- }
- }
- }
-
- /**
- * Builds query's where statement.
- *
- * @param string &$query
- *
- * @since 1.0.0
- */
- public function _query_where( &$query ) {
- for ( $i = 0; $i < count( $this->where ); ++ $i ) {
- $query .= ( $i === 0 ? ' WHERE ' : ' ' . $this->where[ $i ]['joint'] . ' ' )
- . $this->where[ $i ]['condition'];
- }
- }
-
- /**
- * Builds query's group by statement.
- *
- * @param string &$query
- *
- * @since 1.0.0
- */
- private function _query_group( &$query ) {
- if ( count( $this->group ) ) {
- $query .= ' GROUP BY ' . implode( ',', $this->group );
- }
- }
-
- /**
- * Builds query's having statement.
- *
- * @param string &$query
- *
- * @since 1.0.0
- */
- private function _query_having( &$query ) {
- if ( $this->having ) {
- $query .= ' HAVING ' . $this->having;
- }
- }
-
- /**
- * Builds query's order by statement.
- *
- * @param string &$query
- *
- * @since 1.0.0
- */
- private function _query_order( &$query ) {
- if ( count( $this->order ) ) {
- $query .= ' ORDER BY ' . implode( ',', $this->order );
- }
- }
-
- /**
- * Builds query's limit statement.
- *
- * @param string &$query
- *
- * @global object $wpdb
- *
- * @since 1.0.0
- */
- private function _query_limit( &$query ) {
- global $wpdb;
- if ( $this->limit ) {
- $query .= $wpdb->prepare( ' LIMIT %d', $this->limit );
- }
- }
-
- /**
- * Builds query's offset statement.
- *
- * @param string &$query
- *
- * @global object $wpdb
- *
- * @since 1.0.0
- */
- private function _query_offset( &$query ) {
- global $wpdb;
- if ( $this->offset ) {
- $query .= $wpdb->prepare( ' OFFSET %d', $this->offset );
- }
- }
-
- /**
- * Builds query's delete statement.
- *
- * @param string &$query
- *
- * @since 1.0.0
- */
- private function _query_delete( &$query ) {
- $query .= trim(
- 'DELETE ' . ( count( $this->join )
- ? preg_replace( '/\s[aA][sS][\s\S]+.*?/', '', $this->from )
- : ''
- )
- );
- }
-
- /**
- * Sanitize value.
- *
- * @param string|bool $callback Sanitize callback.
- * @param mixed $value
- *
- * @return mixed
- * @since 1.0.0
- */
- private function sanitize_value( $callback, $value ) {
- if ( $callback === true ) {
- $callback = ( is_numeric( $value ) && strpos( $value, '.' ) !== false )
- ? 'floatval'
- : ( is_numeric( $value )
- ? 'intval'
- : ( is_string( $value )
- ? 'sanitize_text_field'
- : null
- )
- );
- }
- if ( strpos( $callback, '_builder' ) !== false ) {
- $callback = [ &$this, $callback ];
- }
- if ( is_array( $value ) ) {
- for ( $i = count( $value ) - 1; $i >= 0; -- $i ) {
- $value[ $i ] = $this->sanitize_value( true, $value[ $i ] );
- }
- }
-
- return $callback && is_callable( $callback ) ? call_user_func_array( $callback, [ $value ] ) : $value;
- }
-
- /**
- * @param $message
- *
- * @throws \Exception
- * @since 1.0.0
- */
- private function exception( $message ) {
- throw new \Exception( $message );
- }
-}
diff --git a/src/Encryption.php b/src/Encryption.php
index 5478fa65..94c253b1 100644
--- a/src/Encryption.php
+++ b/src/Encryption.php
@@ -1,4 +1,6 @@
+
- %s', esc_url( get_permalink( $line_item['product_id'] ) ), esc_html( get_the_title( $line_item['product_id'] ) ) ); ?>
+ %s', esc_url( get_permalink( $line_item['product_id'] ) ), esc_html( get_the_title( $line_item['product_id'] ) ) ); ?>
@@ -302,7 +302,7 @@ function wcsn_display_order_keys_table( $order, $line_items ) {
- %s', apply_filters( 'wc_serial_numbers_pending_notice', esc_html__( 'Order is waiting for serial numbers to be assigned.', 'wc-serial-numbers' ) ) ); ?>
+ %s', esc_html( apply_filters( 'wc_serial_numbers_pending_notice', __( 'Order is waiting for serial numbers to be assigned.', 'wc-serial-numbers' ) ) ) ); ?>
diff --git a/src/Installer.php b/src/Installer.php
index 73a1eab7..39c2cb4d 100644
--- a/src/Installer.php
+++ b/src/Installer.php
@@ -138,7 +138,7 @@ public static function create_tables() {
global $wpdb;
$wpdb->hide_errors();
// todo rename table names to wcsn_keys and wcsn_activations.
- $tables = [
+ $tables = array(
"CREATE TABLE IF NOT EXISTS {$wpdb->prefix}serial_numbers(
id bigint(20) NOT NULL AUTO_INCREMENT,
serial_key longtext DEFAULT NULL,
@@ -173,7 +173,7 @@ public static function create_tables() {
PRIMARY KEY (id),
key serial_id (serial_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;",
- ];
+ );
require_once ABSPATH . 'wp-admin/includes/upgrade.php';
foreach ( $tables as $table ) {
@@ -238,23 +238,22 @@ protected function update_120() {
}
global $wpdb;
- $prefix = $wpdb->prefix;
- $wpdb->query( "RENAME TABLE `{$prefix}wcsn_serial_numbers` TO `{$prefix}serial_numbers`" );
- $wpdb->query( "RENAME TABLE `{$prefix}wcsn_activations` TO `{$prefix}serial_numbers_activations`" );
-
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers DROP COLUMN `serial_image`;" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers DROP COLUMN `activation_email`;" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers CHANGE `created` `created_date` DATETIME NULL DEFAULT NULL;" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers ADD vendor_id bigint(20) NOT NULL DEFAULT 0" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers ADD activation_count int(9) NOT NULL DEFAULT 0" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers ADD KEY vendor_id(`vendor_id`)" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers ADD source varchar(200) NOT NULL default 'custom_source'" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers_activations CHANGE platform platform varchar(200) DEFAULT NULL" );
- // status update
- $wpdb->query( $wpdb->prepare( "UPDATE {$prefix}serial_numbers set status=%s WHERE status=%s AND order_id=0", 'available', 'new' ) );
- $wpdb->query( $wpdb->prepare( "UPDATE {$prefix}serial_numbers set status=%s WHERE status=%s AND order_id != 0", 'sold', 'active' ) );
- $wpdb->query( $wpdb->prepare( "UPDATE {$prefix}serial_numbers set status=%s WHERE status=%s", 'cancelled', 'pending' ) );
- $wpdb->query( $wpdb->prepare( "UPDATE {$prefix}serial_numbers set status=%s WHERE status=%s", 'cancelled', 'rejected' ) );
+ $wpdb->query( "RENAME TABLE `{$wpdb->prefix}wcsn_serial_numbers` TO `{$wpdb->prefix}serial_numbers`" );
+ $wpdb->query( "RENAME TABLE `{$wpdb->prefix}wcsn_activations` TO `{$wpdb->prefix}serial_numbers_activations`" );
+
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers DROP COLUMN `serial_image`;" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers DROP COLUMN `activation_email`;" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers CHANGE `created` `created_date` DATETIME NULL DEFAULT NULL;" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers ADD vendor_id bigint(20) NOT NULL DEFAULT 0" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers ADD activation_count int(9) NOT NULL DEFAULT 0" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers ADD KEY vendor_id(`vendor_id`)" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers ADD source varchar(200) NOT NULL default 'custom_source'" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers_activations CHANGE platform platform varchar(200) DEFAULT NULL" );
+ // status update.
+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}serial_numbers set status=%s WHERE status=%s AND order_id=0", 'available', 'new' ) );
+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}serial_numbers set status=%s WHERE status=%s AND order_id != 0", 'sold', 'active' ) );
+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}serial_numbers set status=%s WHERE status=%s", 'cancelled', 'pending' ) );
+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}serial_numbers set status=%s WHERE status=%s", 'cancelled', 'rejected' ) );
global $current_user;
if ( ! empty( $current_user->ID ) && current_user_can( 'manage_options' ) ) {
$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}serial_numbers set vendor_id=%d", $current_user->ID ) );
@@ -268,7 +267,7 @@ protected function update_120() {
$wpdb->query( "UPDATE {$wpdb->prefix}serial_numbers set status='available', order_date='0000-00-00 00:00:00', order_id='0' WHERE status !='available' AND order_id='0' AND expire_date='0000-00-00 00:00:00'" );
- // settings update
+ // settings update.
$heading_text = $this->update_1_2_0_get_option( 'heading_text', 'Serial Numbers', 'wsn_delivery_settings' );
$serial_col_heading = $this->update_1_2_0_get_option( 'table_column_heading', 'Serial Number', 'wsn_delivery_settings' );
$serial_key_label = $this->update_1_2_0_get_option( 'serial_key_label', 'Serial Number', 'wsn_delivery_settings' );
@@ -276,33 +275,33 @@ protected function update_120() {
$show_validity = 'yes' === $this->update_1_2_0_get_option( 'show_validity', 'yes', 'wsn_delivery_settings' );
$show_activation_limit = 'yes' === $this->update_1_2_0_get_option( 'show_activation_limit', 'yes', 'wsn_delivery_settings' );
$license = get_option( 'woocommerce_serial_numbers_pro_pluginever_license' );
- $options = [
- 'wc_serial_numbers_autocomplete_order' => $this->update_1_2_0_get_option( 'wsn_auto_complete_order', 'yes', 'wsn_delivery_settings' ),
- 'wc_serial_numbers_reuse_serial_number' => $this->update_1_2_0_get_option( 'wsn_re_use_serial', 'no', 'wsn_delivery_settings' ),
- 'wc_serial_numbers_disable_software_support' => 'no',
- 'wc_serial_numbers_manual_delivery' => 'no',
- 'wc_serial_numbers_hide_serial_number' => 'yes',
- 'wc_serial_numbers_revoke_status_cancelled' => in_array( 'cancelled', $this->update_1_2_0_get_option( 'wsn_revoke_serial_number', [], 'wsn_delivery_settings' ), true ) ? 'yes' : 'no',
- 'wc_serial_numbers_revoke_status_refunded' => in_array( 'refunded', $this->update_1_2_0_get_option( 'wsn_revoke_serial_number', [], 'wsn_delivery_settings' ), true ) ? 'yes' : 'no',
- 'wc_serial_numbers_revoke_status_failed' => in_array( 'failed', $this->update_1_2_0_get_option( 'wsn_revoke_serial_number', [], 'wsn_delivery_settings' ), true ) ? 'yes' : 'no',
- 'wc_serial_numbers_enable_stock_notification' => $this->update_1_2_0_get_option( 'wsn_admin_bar_notification_send_email', 'yes', 'wsn_notification_settings' ),
- 'wc_serial_numbers_stock_threshold' => $this->update_1_2_0_get_option( 'wsn_admin_bar_notification_number', '5', 'wsn_notification_settings' ),
- 'wc_serial_numbers_notification_recipient' => $this->update_1_2_0_get_option( 'wsn_admin_bar_notification_email', get_option( 'admin_email' ), 'wsn_notification_settings' ),
- 'wc_serial_numbers_order_table_heading' => $heading_text,
+ $options = array(
+ 'wc_serial_numbers_autocomplete_order' => $this->update_1_2_0_get_option( 'wsn_auto_complete_order', 'yes', 'wsn_delivery_settings' ),
+ 'wc_serial_numbers_reuse_serial_number' => $this->update_1_2_0_get_option( 'wsn_re_use_serial', 'no', 'wsn_delivery_settings' ),
+ 'wc_serial_numbers_disable_software_support' => 'no',
+ 'wc_serial_numbers_manual_delivery' => 'no',
+ 'wc_serial_numbers_hide_serial_number' => 'yes',
+ 'wc_serial_numbers_revoke_status_cancelled' => in_array( 'cancelled', $this->update_1_2_0_get_option( 'wsn_revoke_serial_number', array(), 'wsn_delivery_settings' ), true ) ? 'yes' : 'no',
+ 'wc_serial_numbers_revoke_status_refunded' => in_array( 'refunded', $this->update_1_2_0_get_option( 'wsn_revoke_serial_number', array(), 'wsn_delivery_settings' ), true ) ? 'yes' : 'no',
+ 'wc_serial_numbers_revoke_status_failed' => in_array( 'failed', $this->update_1_2_0_get_option( 'wsn_revoke_serial_number', array(), 'wsn_delivery_settings' ), true ) ? 'yes' : 'no',
+ 'wc_serial_numbers_enable_stock_notification' => $this->update_1_2_0_get_option( 'wsn_admin_bar_notification_send_email', 'yes', 'wsn_notification_settings' ),
+ 'wc_serial_numbers_stock_threshold' => $this->update_1_2_0_get_option( 'wsn_admin_bar_notification_number', '5', 'wsn_notification_settings' ),
+ 'wc_serial_numbers_notification_recipient' => $this->update_1_2_0_get_option( 'wsn_admin_bar_notification_email', get_option( 'admin_email' ), 'wsn_notification_settings' ),
+ 'wc_serial_numbers_order_table_heading' => $heading_text,
'wc_serial_numbers_order_table_col_product_label' => 'Product',
- 'wc_serial_numbers_order_table_col_key_label' => $serial_key_label,
- 'wc_serial_numbers_order_table_col_email_label' => $serial_email_label,
- 'wc_serial_numbers_order_table_col_limit_label' => 'Activation Limit',
+ 'wc_serial_numbers_order_table_col_key_label' => $serial_key_label,
+ 'wc_serial_numbers_order_table_col_email_label' => $serial_email_label,
+ 'wc_serial_numbers_order_table_col_limit_label' => 'Activation Limit',
'wc_serial_numbers_order_table_col_expires_label' => 'Expire Date',
- 'wc_serial_numbers_order_table_col_product' => 'yes',
- 'wc_serial_numbers_order_table_col_key' => 'yes',
- 'wc_serial_numbers_order_table_col_email' => 'no',
- 'wc_serial_numbers_order_table_col_limit' => $show_activation_limit ? 'yes' : 'no',
- 'wc_serial_numbers_order_table_col_expires' => $show_validity ? 'yes' : 'no',
- 'wc_serial_numbers_install_time' => get_option( 'woocommerceserialnumbers_install_time' ),
- 'woocommerce-serial-numbers-pro_license_key' => array_key_exists( 'key', $license ) ? $license['key'] : '',
- 'woocommerce-serial-numbers-pro_license_status' => array_key_exists( 'license', $license ) ? $license['license'] : '',
- ];
+ 'wc_serial_numbers_order_table_col_product' => 'yes',
+ 'wc_serial_numbers_order_table_col_key' => 'yes',
+ 'wc_serial_numbers_order_table_col_email' => 'no',
+ 'wc_serial_numbers_order_table_col_limit' => $show_activation_limit ? 'yes' : 'no',
+ 'wc_serial_numbers_order_table_col_expires' => $show_validity ? 'yes' : 'no',
+ 'wc_serial_numbers_install_time' => get_option( 'woocommerceserialnumbers_install_time' ),
+ 'woocommerce-serial-numbers-pro_license_key' => array_key_exists( 'key', $license ) ? $license['key'] : '',
+ 'woocommerce-serial-numbers-pro_license_status' => array_key_exists( 'license', $license ) ? $license['license'] : '',
+ );
foreach ( $options as $key => $option ) {
add_option( $key, $option );
}
@@ -312,15 +311,15 @@ protected function update_120() {
* Get option from old settings.
*
* @param string $option_name Option name.
- * @param string $default Default value.
+ * @param string $default_value Default value.
* @param string $section Section name.
*
* @return string
*/
- protected function update_1_2_0_get_option( $option_name, $default, $section = 'serial_numbers_settings' ) {
- $settings = get_option( $section, [] );
+ protected function update_1_2_0_get_option( $option_name, $default_value, $section = 'serial_numbers_settings' ) {
+ $settings = get_option( $section, array() );
- return ! empty( $settings[ $option_name ] ) ? $settings[ $option_name ] : $default;
+ return ! empty( $settings[ $option_name ] ) ? $settings[ $option_name ] : $default_value;
}
/**
@@ -331,9 +330,8 @@ protected function update_1_2_0_get_option( $option_name, $default, $section = '
*/
protected function update_121() {
global $wpdb;
- $prefix = $wpdb->prefix;
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers CHANGE order_id order_id bigint(20) DEFAULT NULL" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers CHANGE vendor_id vendor_id bigint(20) DEFAULT NULL" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers CHANGE order_id order_id bigint(20) DEFAULT NULL" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers CHANGE vendor_id vendor_id bigint(20) DEFAULT NULL" );
}
/**
@@ -347,45 +345,42 @@ protected function update_146() {
// Update key status default value to 'available'.
// Change key status.
// Drop expired column.
- $statuses_map = [
+ $statuses_map = array(
'refunded' => 'cancelled',
'expired' => 'expired',
'failed' => 'cancelled',
'inactive' => 'sold',
- ];
- $prefix = $wpdb->prefix;
+ );
+
foreach ( $statuses_map as $old_status => $new_status ) {
- $wpdb->query( $wpdb->prepare( "UPDATE {$prefix}serial_numbers SET status = %s WHERE status = %s", $new_status, $old_status ) );
+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->prefix}serial_numbers SET status = %s WHERE status = %s", $new_status, $old_status ) );
}
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers DROP expire_date" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers DROP expire_date" );
// Remove all inactive activations.
- $wpdb->query( "DELETE FROM {$prefix}serial_numbers_activations WHERE active = 0" );
+ $wpdb->query( "DELETE FROM {$wpdb->prefix}serial_numbers_activations WHERE active = 0" );
// Drop active column.
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers_activations DROP active" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers_activations DROP active" );
}
/**
* Update to version 1.5.6
*
* @since 1.5.6
- * @return bool
*/
protected function update_156() {
global $wpdb;
- $prefix = $wpdb->prefix;
// if order_item_id column not exist then add it.
- if ( ! $wpdb->get_var( "SHOW COLUMNS FROM {$prefix}serial_numbers LIKE 'order_item_id'" ) ) {
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers ADD order_item_id bigint(20) DEFAULT NULL AFTER order_id" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers ADD KEY order_item_id (order_item_id)" );
+ if ( ! $wpdb->get_var( "SHOW COLUMNS FROM {$wpdb->prefix}serial_numbers LIKE 'order_item_id'" ) ) {
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers ADD order_item_id bigint(20) DEFAULT NULL AFTER order_id" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers ADD KEY order_item_id (order_item_id)" );
}
// if uuid column not exist then add it.
- if ( ! $wpdb->get_var( "SHOW COLUMNS FROM {$prefix}serial_numbers LIKE 'uuid'" ) ) {
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers ADD uuid varchar(50) DEFAULT NULL AFTER order_item_id" );
- $wpdb->query( "ALTER TABLE {$prefix}serial_numbers ADD UNIQUE KEY uuid (uuid)" );
- $wpdb->query( "UPDATE {$prefix}serial_numbers SET uuid = UUID()" );
+ if ( ! $wpdb->get_var( "SHOW COLUMNS FROM {$wpdb->prefix}serial_numbers LIKE 'uuid'" ) ) {
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers ADD uuid varchar(50) DEFAULT NULL AFTER order_item_id" );
+ $wpdb->query( "ALTER TABLE {$wpdb->prefix}serial_numbers ADD UNIQUE KEY uuid (uuid)" );
+ $wpdb->query( "UPDATE {$wpdb->prefix}serial_numbers SET uuid = UUID()" );
}
-
}
}
diff --git a/src/Models/Activation.php b/src/Models/Activation.php
index 68672de6..b4328b24 100644
--- a/src/Models/Activation.php
+++ b/src/Models/Activation.php
@@ -295,5 +295,4 @@ protected function prepare_where_query( $clauses, $args = array() ) {
return $clauses;
}
-
}
diff --git a/src/Models/Key.php b/src/Models/Key.php
index acd50db7..77c09881 100644
--- a/src/Models/Key.php
+++ b/src/Models/Key.php
@@ -534,6 +534,7 @@ public function save() {
return parent::save();
}
+
/*
|--------------------------------------------------------------------------
| Query Methods
@@ -760,7 +761,7 @@ public function get_expire_date() {
$expiry_date = strtotime( "+{$validity} days", strtotime( $order_date ) );
- return date( 'Y-m-d H:i:s', $expiry_date );
+ return wp_date( 'Y-m-d H:i:s', $expiry_date );
}
/**
@@ -831,6 +832,8 @@ public function get_activations( $args = array() ) {
/**
* Display the serial key.
*
+ * @param bool $masked Whether to mask the key or not.
+ *
* @since 1.5.0
* @return string
*/
diff --git a/src/Orders.php b/src/Orders.php
index d451a4eb..f837320c 100644
--- a/src/Orders.php
+++ b/src/Orders.php
@@ -45,7 +45,7 @@ public function __construct() {
public static function validate_checkout() {
$cart_products = WC()->cart->get_cart_contents();
foreach ( $cart_products as $id => $cart_product ) {
- /** @var \WC_Product $product */
+ // @var \WC_Product $product Product object.
$product = $cart_product['data'];
$product_id = $product->get_id();
$quantity = $cart_product['quantity'];
@@ -55,16 +55,16 @@ public static function validate_checkout() {
$per_item_quantity = absint( apply_filters( 'wc_serial_numbers_per_product_delivery_qty', 1, $product_id ) );
$needed_quantity = $quantity * ( empty( $per_item_quantity ) ? 1 : absint( $per_item_quantity ) );
$source = apply_filters( 'wc_serial_numbers_product_serial_source', 'custom_source', $product_id, $needed_quantity );
- if ( 'custom_source' == $source ) {
+ if ( 'custom_source' === $source ) {
$args = array(
'product_id' => $product_id,
'status' => 'available',
- 'source' => $source,
);
$total_found = Key::count( $args );
if ( $total_found < $needed_quantity ) {
- $stock = floor( $total_found / $per_item_quantity );
- $message = sprintf( __( 'Sorry, there aren’t enough Serial Keys for %1$s. Please remove this item or lower the quantity. For now, we have %2$s Serial Keys for this product.', 'wc-serial-numbers' ), '{product_title}', '{stock_quantity}' );
+ $stock = floor( $total_found / $per_item_quantity );
+ // translators: %1$s: product title, %2$s: stock quantity.
+ $message = sprintf( esc_html__( 'Sorry, there aren’t enough Serial Keys for %1$s. Please remove this item or lower the quantity. For now, we have %2$s Serial Keys for this product.', 'wc-serial-numbers' ), '{product_title}', '{stock_quantity}' );
$notice = apply_filters( 'wc_serial_numbers_low_stock_message', $message );
$notice = str_replace( '{product_title}', $product->get_title(), $notice );
$notice = str_replace( '{stock_quantity}', $stock, $notice );
@@ -83,9 +83,9 @@ public static function validate_checkout() {
/**
* Automatically set the order's status to complete.
*
- * @param string $new_order_status
- * @param int $order_id
- * @param \WC_Order $order
+ * @param string $new_order_status The new order status.
+ * @param int $order_id The order ID.
+ * @param \WC_Order $order The order object.
*
* @since 1.4.6
* @return string $new_order_status
diff --git a/src/Plugin.php b/src/Plugin.php
index baf18093..c562220b 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -33,13 +33,7 @@ protected function __construct( $data ) {
*/
public function includes() {
require_once __DIR__ . '/functions.php';
- require_once dirname( __FILE__ ) . '/Deprecated/Functions.php';
- if ( ! class_exists( '\WP_Async_Request', false ) ) {
- require_once dirname( __DIR__ ) . '/lib/classes/wp-async-request.php';
- }
- if ( ! class_exists( '\WP_Background_Process', false ) ) {
- require_once dirname( __DIR__ ) . '/lib/classes/wp-background-process.php';
- }
+ require_once __DIR__ . '/Deprecated/Functions.php';
}
/**
diff --git a/src/Utilities/Utilities.php b/src/Utilities/Utilities.php
index 7776477a..4dff1c35 100644
--- a/src/Utilities/Utilities.php
+++ b/src/Utilities/Utilities.php
@@ -2,7 +2,7 @@
namespace WooCommerceSerialNumbers\Utilities;
-defined('ABSPATH') || exit;
+defined( 'ABSPATH' ) || exit;
/**
* Class Utilities.
diff --git a/src/functions.php b/src/functions.php
index d3ffa602..9f807365 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -60,7 +60,7 @@ function wcsn_get_key_statuses() {
* @return bool
*/
function wcsn_is_reusing_keys() {
- return 'yes' == get_option( 'wc_serial_numbers_reuse_serial_number', 'no' );
+ return 'yes' === get_option( 'wc_serial_numbers_reuse_serial_number', 'no' );
}
/**
@@ -70,12 +70,12 @@ function wcsn_is_reusing_keys() {
* @return array
*/
function wcsn_get_revoke_statuses() {
- $statues = [
+ $statues = array(
'cancelled',
'refunded',
'failed',
'pending',
- ];
+ );
return apply_filters( 'wc_serial_numbers_revoke_statuses', $statues );
}
@@ -294,7 +294,7 @@ function wcsn_delete_activation( $activation_id ) {
* @return bool True if enabled, false otherwise.
*/
function wcsn_is_product_enabled( $product_id ) {
- return 'yes' == get_post_meta( $product_id, '_is_serial_number', true );
+ return 'yes' === get_post_meta( $product_id, '_is_serial_number', true );
}
/**
@@ -425,14 +425,9 @@ function wcsn_order_get_unfulfilled_items( $order_id ) {
if ( $key->get_product_id() !== $line_item['product_id'] ) {
continue;
}
-// todo uncomment this when we will support for order item id.
-// if ( $key->get_variation_id() !== $line_item['variation_id'] ) {
-// continue;
-// }
-// if ( $key->get_order_item_id() !== $line_item['order_item_id'] ) {
-// continue;
-// }
- $qty --;
+ // todo uncomment this when we will support for order item id.
+
+ --$qty;
}
if ( $qty > 0 ) {
$items[] = array_merge( $line_item, array( 'quantity' => $qty ) );
@@ -476,8 +471,7 @@ function wcsn_order_update_keys( $order_id ) {
$do_add = apply_filters( 'wc_serial_numbers_add_order_keys', true, $order_id, $line_items, $order_status );
-
- if ( in_array( $order_status, [ 'processing', 'completed' ], true ) && ! wcsn_order_is_fullfilled( $order_id ) && $do_add ) {
+ if ( in_array( $order_status, array( 'processing', 'completed' ), true ) && ! wcsn_order_is_fullfilled( $order_id ) && $do_add ) {
/**
* Action hook to pre add order keys.
@@ -495,11 +489,13 @@ function wcsn_order_update_keys( $order_id ) {
continue;
}
- $delivered_qty = Key::count( array(
- 'order_id' => $order_id,
- 'product_id' => $item['product_id'],
- 'status__not_in' => [ 'cancelled' ],
- ) );
+ $delivered_qty = Key::count(
+ array(
+ 'order_id' => $order_id,
+ 'product_id' => $item['product_id'],
+ 'status__not_in' => array( 'cancelled' ),
+ )
+ );
if ( $item['refunded_qty'] >= $item['quantity'] ) {
continue;
}
@@ -515,7 +511,7 @@ function wcsn_order_update_keys( $order_id ) {
* @param int $order_id Order ID.
* @param int $needed_count Needed count.
*/
- do_action( 'wc_serial_numbers_pre_add_order_item_eys', $item, $order_id, $needed_count );
+ do_action( 'wc_serial_numbers_pre_add_order_item_keys', $item, $order_id, $needed_count );
// Deprecated. use wc_serial_numbers_pre_order_add_keys instead. Will be removed in 1.5.0.
apply_filters( 'wc_serial_numbers_pre_order_item_connect_serial_numbers', $item['product_id'], $needed_count, $item['key_source'], $order_id );
@@ -527,7 +523,7 @@ function wcsn_order_update_keys( $order_id ) {
'status' => 'available',
'limit' => $needed_count,
'orderby' => 'id',
- 'order' => 'ASC'
+ 'order' => 'ASC',
)
);
if ( count( $keys ) < $needed_count ) {
@@ -547,15 +543,17 @@ function wcsn_order_update_keys( $order_id ) {
// Assign keys to order.
foreach ( $keys as $key ) {
- $key->set_data( array(
- 'order_id' => $order_id,
- 'order_item_id' => $item['order_item_id'],
- 'order_date' => $order->get_date_created() ? $order->get_date_created()->format( 'Y-m-d H:i:s' ) : current_time( 'mysql' ),
- 'customer_id' => $customer_id,
- 'status' => 'sold',
- ) );
+ $key->set_data(
+ array(
+ 'order_id' => $order_id,
+ 'order_item_id' => $item['order_item_id'],
+ 'order_date' => $order->get_date_created() ? $order->get_date_created()->format( 'Y-m-d H:i:s' ) : current_time( 'mysql' ),
+ 'customer_id' => $customer_id,
+ 'status' => 'sold',
+ )
+ );
if ( ! is_wp_error( $key->save() ) ) {
- $added ++;
+ ++$added;
}
}
@@ -599,10 +597,14 @@ function wcsn_order_update_keys( $order_id ) {
if ( $is_expired && 'expired' !== $key->get_status() ) {
$key->set_status( 'expired' );
$key->save();
- } elseif ( ! $is_expired && in_array( $order_status, [
+ } elseif ( ! $is_expired && in_array(
+ $order_status,
+ array(
'processing',
- 'complete'
- ], true ) && 'sold' !== $key->get_status() ) {
+ 'complete',
+ ),
+ true
+ ) && 'sold' !== $key->get_status() ) {
$key->set_status( 'sold' );
$key->save();
} elseif ( 'on-hold' === $order_status && ! $is_expired && 'pending' !== $key->get_status() ) {
@@ -627,8 +629,8 @@ function wcsn_order_update_keys( $order_id ) {
/**
* Order remove keys.
*
- * @param int $order_id Order ID.
- * @param array $line_items Order line items.
+ * @param int $order_id Order ID.
+ * @param int $product_id Product ID.
*
* @since 1.4.6
*
@@ -664,7 +666,7 @@ function wcsn_order_remove_keys( $order_id, $product_id = null ) {
foreach ( $keys as $key ) {
$props = array(
- 'status' => $is_reusing ? 'available' : 'cancelled'
+ 'status' => $is_reusing ? 'available' : 'cancelled',
);
if ( ! $is_reusing ) {
$props['order_id'] = 0;
@@ -737,7 +739,7 @@ function wcsn_order_replace_key( $order_id, $product_id = null, $key_id = null )
foreach ( $keys as $key ) {
$props = array(
- 'status' => $is_reusing ? 'available' : 'cancelled'
+ 'status' => $is_reusing ? 'available' : 'cancelled',
);
if ( ! $is_reusing ) {
$props['order_id'] = 0;
@@ -746,7 +748,7 @@ function wcsn_order_replace_key( $order_id, $product_id = null, $key_id = null )
}
$key->set_data( $props );
if ( $key->save() ) {
- $replaced ++;
+ ++$replaced;
}
}
@@ -801,13 +803,13 @@ function wcsn_get_product_title( $product ) {
*/
function wcsn_get_products_query_args() {
$args = array(
- 'post_type' => [ 'product' ],
+ 'post_type' => array( 'product' ),
'tax_query' => array( // @codingStandardsIgnoreLine
'relation' => 'OR',
array(
'taxonomy' => 'product_type',
'field' => 'slug',
- 'terms' => [ 'simple' ],
+ 'terms' => array( 'simple' ),
'operator' => 'IN',
),
),
@@ -819,13 +821,15 @@ function wcsn_get_products_query_args() {
/**
* Get enabled products.
*
+ * @param array $args Query args.
+ *
* @since 1.4.6
* @return array|int List of products or number of products.
*/
function wcsn_get_products( $args = array() ) {
$args = wp_parse_args( $args, wcsn_get_products_query_args() );
if ( empty( $args['meta_query'] ) ) {
- $args['meta_query'] = [];
+ $args['meta_query'] = array(); // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
}
$args['meta_query'][] = array(
'key' => '_is_serial_number',
@@ -883,34 +887,41 @@ function wcsn_get_stocks_count( $stock_limit = null, $force = true ) {
if ( $force || false === $counts ) {
$counts = array();
- $post_ids = wcsn_get_products( array(
- 'posts_per_page' => - 1,
- 'fields' => 'ids',
- 'meta_query' => array( // @codingStandardsIgnoreLine
- 'relation' => 'AND',
- array(
- 'key' => '_serial_key_source',
- 'value' => 'custom_source',
- 'compare' => '=',
- )
- ),
- ) );
+ $post_ids = wcsn_get_products(
+ array(
+ 'posts_per_page' => - 1,
+ 'fields' => 'ids',
+ 'meta_query' => array( // @codingStandardsIgnoreLine
+ 'relation' => 'AND',
+ array(
+ 'key' => '_serial_key_source',
+ 'value' => 'custom_source',
+ 'compare' => '=',
+ ),
+ ),
+ )
+ );
foreach ( $post_ids as $post_id ) {
- $counts[ $post_id ] = wcsn_get_keys( [
- 'product_id' => $post_id,
- 'status' => 'available',
- 'count' => true,
- ] );
+ $counts[ $post_id ] = wcsn_get_keys(
+ array(
+ 'product_id' => $post_id,
+ 'status' => 'available',
+ 'count' => true,
+ )
+ );
}
set_transient( $transient_key, $counts, 60 * 60 );
}
if ( $stock_limit > 0 ) {
// get the results where value is equal or less than max.
- $counts = array_filter( $counts, function ( $value ) use ( $stock_limit ) {
- return $value <= $stock_limit;
- } );
+ $counts = array_filter(
+ $counts,
+ function ( $value ) use ( $stock_limit ) {
+ return $value <= $stock_limit;
+ }
+ );
}
return $counts;
@@ -1029,8 +1040,8 @@ function wcsn_get_key_display_properties( $key, $context = 'order_details' ) {
/**
* Filter key properties.
*
- * @param array $props Key properties.
- * @param Key $key Key object.
+ * @param array $props Key properties.
+ * @param Key $key Key object.
* @param string $context Context.
*
* @since 1.4.9
@@ -1039,9 +1050,10 @@ function wcsn_get_key_display_properties( $key, $context = 'order_details' ) {
usort(
$properties,
- function( $a, $b ) {
+ function ( $a, $b ) {
$a_priority = isset( $a['priority'] ) ? $a['priority'] : 10;
$b_priority = isset( $b['priority'] ) ? $b['priority'] : 10;
+
return $a_priority - $b_priority;
}
);
diff --git a/templates/email-stock-notification.php b/templates/email-stock-notification.php
index 73eef989..47126236 100644
--- a/templates/email-stock-notification.php
+++ b/templates/email-stock-notification.php
@@ -4,7 +4,9 @@
*
* @since 1.2.0
* @package WooCommerceSerialNumbers
+ * @var array $low_stock_products List of low stock products.
*/
+
?>
@@ -20,11 +22,21 @@
}
$product = wc_get_product( $product_id );
- echo sprintf( "%s - Stock %s%s - Stock %s Serial Numbers for WooCommerce', 'wc-serial-numbers' ), 'https://pluginever.com/plugins/woocommerce-serial-numbers-pro/?utm_source=serialnumberemail&utm_medium=email&utm_campaign=lowstocknotification' ); ?>
+
+ Serial Numbers for WooCommerce', 'wc-serial-numbers' ),
+ 'https://pluginever.com/plugins/woocommerce-serial-numbers-pro/?utm_source=serialnumberemail&utm_medium=email&utm_campaign=lowstocknotification'
+ )
+ );
+ ?>
+
diff --git a/wc-serial-numbers.php b/wc-serial-numbers.php
index bf5337af..8a84d7fa 100644
--- a/wc-serial-numbers.php
+++ b/wc-serial-numbers.php
@@ -3,7 +3,7 @@
* Plugin Name: WC Serial Numbers
* Plugin URI: https://www.pluginever.com/plugins/wocommerce-serial-numbers-pro/
* Description: Sell and manage license keys/ serial numbers/ secret keys easily within your WooCommerce store.
- * Version: 1.6.2
+ * Version: 1.6.4
* Author: PluginEver
* Author URI: http://pluginever.com
* License: GPLv2+
@@ -11,7 +11,7 @@
* Domain Path: /languages
* Tested up to: 6.3
* WC requires at least: 5.0
- * WC tested up to: 8.0
+ * WC tested up to: 8.2
*
* @package WooCommerceSerialNumbers
*
@@ -32,33 +32,35 @@
defined( 'ABSPATH' ) || exit();
// Autoload function.
-spl_autoload_register( function ( $class ) {
- $prefix = 'WooCommerceSerialNumbers\\';
- $len = strlen( $prefix );
+spl_autoload_register(
+ function ( $class_name ) {
+ $prefix = 'WooCommerceSerialNumbers\\';
+ $len = strlen( $prefix );
- // Bail out if the class name doesn't start with our prefix.
- if ( strncmp( $prefix, $class, $len ) !== 0 ) {
- return;
- }
+ // Bail out if the class name doesn't start with our prefix.
+ if ( strncmp( $prefix, $class_name, $len ) !== 0 ) {
+ return;
+ }
- // Remove the prefix from the class name.
- $relative_class = substr( $class, $len );
- // Replace the namespace separator with the directory separator.
- $file = str_replace( '\\', DIRECTORY_SEPARATOR, $relative_class ) . '.php';
+ // Remove the prefix from the class name.
+ $relative_class = substr( $class_name, $len );
+ // Replace the namespace separator with the directory separator.
+ $file = str_replace( '\\', DIRECTORY_SEPARATOR, $relative_class ) . '.php';
- // Look for the file in the src and lib directories.
- $file_paths = array(
- __DIR__ . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . $file,
- __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . $file,
- );
+ // Look for the file in the src and lib directories.
+ $file_paths = array(
+ __DIR__ . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . $file,
+ __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . $file,
+ );
- foreach ( $file_paths as $file_path ) {
- if ( file_exists( $file_path ) ) {
- require_once $file_path;
- break;
+ foreach ( $file_paths as $file_path ) {
+ if ( file_exists( $file_path ) ) {
+ require_once $file_path;
+ break;
+ }
}
}
-} );
+);
/**
@@ -82,7 +84,7 @@ function () {
* @since 1.0.0
* @return Plugin
*/
-function WCSN() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid.
+function WCSN() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
$data = array(
'file' => __FILE__,
'settings_url' => admin_url( 'admin.php?page=wc-serial-numbers-settings' ),