Skip to content

Commit 33d6c95

Browse files
pablo-sg-pachecopablo-sg-pacheco
committed
v3.1.2
1 parent 4ca134d commit 33d6c95

12 files changed

+186
-173
lines changed

‎includes/admin/class-alg-wc-wish-list-settings-texts.php

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Wishlist for WooCommerce Pro - Texts
44
*
5-
* @version 2.3.7
5+
* @version 3.1.2
66
* @since 1.0.0
77
* @author WPFactory.
88
*/
@@ -271,6 +271,13 @@ function get_settings( $settings = null ) {
271271
'type' => 'text',
272272
'class' => 'regular-input',
273273
),
274+
array(
275+
'title' => __( 'Default Wishlist', 'wish-list-for-woocommerce' ),
276+
'id' => 'alg_wc_wl_texts_default_wishlist',
277+
'default' => __('Default Wishlist', 'wish-list-for-woocommerce' ),
278+
'type' => 'text',
279+
'class' => 'regular-input',
280+
),
274281
array(
275282
'type' => 'sectionend',
276283
'id' => 'alg_wc_wl_texts_multiple_wishlist_opt',

‎includes/class-alg-wc-wish-list-core.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ final class Alg_WC_Wish_List_Core {
2121
* @var string
2222
* @since 1.0.0
2323
*/
24-
public $version = '3.1.1';
24+
public $version = '3.1.2';
2525

2626
/**
2727
* @var Alg_WC_Wish_List_Core The single instance of the class

‎includes/free/class-alg-wc-wish-list-ajax.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Wishlist for WooCommerce - Ajax.
44
*
5-
* @version 3.1.0
5+
* @version 3.1.2
66
* @since 1.0.0
77
* @author WPFactory
88
*/
@@ -719,7 +719,7 @@ public static function get_multiple_wishlist() {
719719
?>
720720
<li>
721721
<div class="algwcwishlistmodal-checkbox-wrapper">
722-
<span class="titlebox"><?php _e( 'Default Wishlist', 'wish-list-for-woocommerce' ); ?></span>
722+
<span class="titlebox"><?php echo esc_html( get_option( 'alg_wc_wl_texts_default_wishlist', __( 'Default Wishlist', 'wish-list-for-woocommerce' ) ) ); ?></span>
723723
<label for="algwcwishlistmodal-cbk">
724724
<input type="checkbox" id="algwcwishlistmodal-cbk" class="whichlist-check" value="-99" <?php echo $checked_default; ?>>
725725
<span class="cbx">

‎includes/free/class-alg-wc-wish-list-shortcodes.php

+54-55
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Wishlist for WooCommerce - Shortcodes.
44
*
5-
* @version 2.0.0
5+
* @version 3.1.2
66
* @since 1.0.0
77
* @author WPFactory
88
*/
@@ -204,16 +204,16 @@ public static function sc_alg_wc_wl_counter( $atts ) {
204204
/**
205205
* Shortcode for showing wishlist.
206206
*
207-
* @version 1.8.9
207+
* @version 3.1.2
208208
* @since 1.0.0
209209
*/
210210
public static function sc_alg_wc_wl( $atts ) {
211211
if ( 'no' === get_option( 'alg_wc_wl_sc_alg_wc_wl', 'yes' ) ) {
212212
return '[' . self::SHORTCODE_WISH_LIST . ']';
213213
}
214214
$atts = shortcode_atts( array(
215-
'is_email' => 'false',
216-
'ignore_excluded_items' => 'true'
215+
'is_email' => 'false',
216+
'ignore_excluded_items' => 'true'
217217
), $atts, self::SHORTCODE_WISH_LIST );
218218

219219
$user_id_from_query_string = isset( $_REQUEST[ Alg_WC_Wish_List_Query_Vars::USER ] ) ? sanitize_text_field( $_REQUEST[ Alg_WC_Wish_List_Query_Vars::USER ] ) : '';
@@ -232,69 +232,67 @@ public static function sc_alg_wc_wl( $atts ) {
232232
$user = wp_get_current_user();
233233
$user_id = $user->ID;
234234
}
235-
235+
236236
$current_tab_id = '';
237237

238-
if ( isset($_GET) && isset($_GET['wtab']) && $_GET['wtab'] > 0) {
238+
if ( isset( $_GET ) && isset( $_GET['wtab'] ) && $_GET['wtab'] > 0 ) {
239239
$current_tab_id = $_GET['wtab'];
240240
}
241-
242-
if( $current_tab_id > 0 ) {
241+
242+
if ( $current_tab_id > 0 ) {
243243
$wishlisted_items = Alg_WC_Wish_List::get_multiple_wishlist_items( $user_id, $use_id_from_unlogged_user, $ignore_excluded_items );
244244
} else {
245245
$wishlisted_items = Alg_WC_Wish_List::get_wish_list( $user_id, $use_id_from_unlogged_user, $ignore_excluded_items );
246246
}
247-
248-
$alg_wc_wl_orderby = (isset($_GET['alg_wc_wl_orderby']) ? $_GET['alg_wc_wl_orderby'] : '');
249-
247+
248+
$alg_wc_wl_orderby = ( isset( $_GET['alg_wc_wl_orderby'] ) ? $_GET['alg_wc_wl_orderby'] : '' );
249+
250250
switch ( $alg_wc_wl_orderby ) {
251-
case "name-asc":
252-
$order_by = 'title';
253-
$order = 'asc';
254-
break;
255-
case "name-desc":
256-
$order_by = 'title';
257-
$order = 'desc';
258-
break;
259-
case "date-asc":
260-
$order_by = 'modified';
261-
$order = 'asc';
262-
break;
263-
case "date-desc":
264-
$order_by = 'modified';
265-
$order = 'desc';
266-
break;
267-
case "price-asc":
268-
$meta_key = '_price';
269-
$order_by = 'meta_value_num';
270-
$order = 'asc';
271-
break;
272-
case "price-desc":
273-
$meta_key = '_price';
274-
$order_by = 'meta_value_num';
275-
$order = 'desc';
276-
break;
277-
case "sku-asc":
278-
$meta_key = '_sku';
279-
$order_by = 'meta_value';
280-
$order = 'asc';
281-
break;
282-
case "sku-desc":
283-
$meta_key = '_sku';
284-
$order_by = 'meta_value';
285-
$order = 'desc';
286-
break;
287-
default:
288-
$order_by = 'post__in';
289-
$order = 'asc';
251+
case "name-asc":
252+
$order_by = 'title';
253+
$order = 'asc';
254+
break;
255+
case "name-desc":
256+
$order_by = 'title';
257+
$order = 'desc';
258+
break;
259+
case "date-asc":
260+
$order_by = 'modified';
261+
$order = 'asc';
262+
break;
263+
case "date-desc":
264+
$order_by = 'modified';
265+
$order = 'desc';
266+
break;
267+
case "price-asc":
268+
$meta_key = '_price';
269+
$order_by = 'meta_value_num';
270+
$order = 'asc';
271+
break;
272+
case "price-desc":
273+
$meta_key = '_price';
274+
$order_by = 'meta_value_num';
275+
$order = 'desc';
276+
break;
277+
case "sku-asc":
278+
$meta_key = '_sku';
279+
$order_by = 'meta_value';
280+
$order = 'asc';
281+
break;
282+
case "sku-desc":
283+
$meta_key = '_sku';
284+
$order_by = 'meta_value';
285+
$order = 'desc';
286+
break;
287+
default:
288+
$order_by = 'post__in';
289+
$order = 'asc';
290290
}
291-
292291

293-
294292
if ( is_array( $wishlisted_items ) && count( $wishlisted_items ) > 0 ) {
295293
$query_args = array(
296294
'post_type' => array( 'product', 'product_variation' ),
297-
'post_status' => array( 'publish','trash' ),
295+
'post_status' => array( 'publish', 'trash' ),
298296
'posts_per_page' => - 1,
299297
'post__in' => $wishlisted_items,
300298
'orderby' => $order_by,
@@ -303,7 +301,7 @@ public static function sc_alg_wc_wl( $atts ) {
303301
if ( isset( $meta_key ) ) {
304302
$query_args['meta_key'] = $meta_key;
305303
}
306-
304+
307305
$the_query = new WP_Query( $query_args );
308306
} else {
309307
$the_query = null;
@@ -312,9 +310,10 @@ public static function sc_alg_wc_wl( $atts ) {
312310
$btn_params = Alg_WC_Wish_List_Toggle_Btn::get_toggle_btn_params();
313311
$btn_params['btn_class'] .= ' remove alg-wc-wl-remove-item-from-wl';
314312
$btn_params['remove_btn_icon_class'] = apply_filters( 'alg_wc_wl_fa_icon_class', '', 'remove_btn' );
315-
$params = array(
313+
$params = array(
316314
'the_query' => $the_query,
317315
'can_remove_items' => $can_remove_items,
316+
'default_wishlist_text' => get_option( 'alg_wc_wl_texts_default_wishlist', __( 'Default Wishlist', 'wish-list-for-woocommerce' ) ),
318317
'show_stock' => $show_stock,
319318
'remove_btn_params' => $btn_params,
320319
'show_add_to_cart_btn' => $show_add_to_cart_btn,

0 commit comments

Comments
 (0)