Skip to content

Commit

Permalink
Merge pull request #92 from codersaiful/2.8.5.4
Browse files Browse the repository at this point in the history 
2.8.5.4
  • Loading branch information
@codersaiful
codersaiful authored May 2, 2021
2 parents e9b399f + 3144602 commit ab278af
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 29 deletions.
43 changes: 23 additions & 20 deletions admin/action-hook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,11 @@ function wpt_configure_basic_part( $settings,$current_config_value,$field_name )
</tr>

<tr>
<th><label class="wpt_label" for="wpt_table_popup_notice"><?php esc_html_e( 'Popup Notice [New]', 'wpt_pro' ); ?></label></th>
<th><label class="wpt_label" for="wpt_table_popup_notice"><?php esc_html_e( 'Popup Notice', 'wpt_pro' ); ?></label></th>
<td>
<select name="<?php echo esc_attr( $field_name ); ?>[popup_notice]" id="wpt_table_popup_notice" class="wpt_fullwidth ua_input" >
<option value="1" <?php wpt_selected( 'popup_notice', '1', $current_config_value ); ?>><?php esc_html_e( 'Enable', 'wpt_pro' ); ?></option>
<option value="0" <?php wpt_selected( 'popup_notice', '0', $current_config_value ); ?>><?php esc_html_e( 'Disable', 'wpt_pro' ); ?></option>
<option value="1" <?php wpt_selected( 'popup_notice', '1', $current_config_value ); ?>><?php esc_html_e( 'Show', 'wpt_pro' ); ?></option>
<option value="0" <?php wpt_selected( 'popup_notice', '0', $current_config_value ); ?>><?php esc_html_e( 'Hide', 'wpt_pro' ); ?></option>
</select>
</td>
</tr>
Expand All @@ -221,40 +221,43 @@ function wpt_configure_basic_part( $settings,$current_config_value,$field_name )
</select>
</td>
</tr>

<tr>
<th><label class="wpt_label" for="wpt_table_all_selected_direct_checkout"><?php esc_html_e( 'Direct Checkout Page[for Add to cart Selected]', 'wpt_pro' ); ?></label></th>
<th> <label class="wpt_label" for="wpt_table_product_direct_checkout"><?php esc_html_e( 'Quick Buy', 'wpt_pro' ); ?></label></th>
<td>
<select name="<?php echo esc_attr( $field_name ); ?>[all_selected_direct_checkout]" id="wpt_table_all_selected_direct_checkout" class="wpt_fullwidth ua_input" >
<option value="no" <?php wpt_selected( 'all_selected_direct_checkout', 'no', $current_config_value ); ?>><?php esc_html_e( 'No', 'wpt_pro' ); ?></option>
<option value="yes" <?php wpt_selected( 'all_selected_direct_checkout', 'yes', $current_config_value ); ?>><?php esc_html_e( 'Yes', 'wpt_pro' ); ?></option>
<select name="<?php echo esc_attr( $field_name ); ?>[product_direct_checkout]" id="wpt_table_product_direct_checkout" class="wpt_fullwidth ua_input" >
<option value="no" <?php wpt_selected( 'product_direct_checkout', 'no', $current_config_value ); ?>><?php esc_html_e( 'Disable', 'wpt_pro' ); ?></option>
<option value="yes" <?php wpt_selected( 'product_direct_checkout', 'yes', $current_config_value ); ?>><?php esc_html_e( 'Enable', 'wpt_pro' ); ?></option>
</select>
<p><?php esc_html_e( 'Enable Quick Buy Button [Direct Checkout Page for each product]. Direct going to Checkout Page just after Added to cart for each product', 'wpt_pro' ); ?></p>
</td>
</tr>
<tr>
<th> <label class="wpt_label" for="wpt_table_product_direct_checkout"><?php esc_html_e( 'Enable Quick Buy Button [Direct Checkout Page for each product]', 'wpt_pro' ); ?></label></th>
<th><label class="wpt_label" for="wpt_table_all_selected_direct_checkout"><?php esc_html_e( 'Bundle Quick Buy ', 'wpt_pro' ); ?></label></th>
<td>
<select name="<?php echo esc_attr( $field_name ); ?>[product_direct_checkout]" id="wpt_table_product_direct_checkout" class="wpt_fullwidth ua_input" >
<option value="no" <?php wpt_selected( 'product_direct_checkout', 'no', $current_config_value ); ?>><?php esc_html_e( 'No', 'wpt_pro' ); ?></option>
<option value="yes" <?php wpt_selected( 'product_direct_checkout', 'yes', $current_config_value ); ?>><?php esc_html_e( 'Yes', 'wpt_pro' ); ?></option>
<select name="<?php echo esc_attr( $field_name ); ?>[all_selected_direct_checkout]" id="wpt_table_all_selected_direct_checkout" class="wpt_fullwidth ua_input" >
<option value="no" <?php wpt_selected( 'all_selected_direct_checkout', 'no', $current_config_value ); ?>><?php esc_html_e( 'Disable', 'wpt_pro' ); ?></option>
<option value="yes" <?php wpt_selected( 'all_selected_direct_checkout', 'yes', $current_config_value ); ?>><?php esc_html_e( 'Enable', 'wpt_pro' ); ?></option>
</select>
<p style="color: #0071a1;padding: 0;margin: 0;"><?php esc_html_e( 'Direct going to Checkout Page just after Added to cart for each product', 'wpt_pro' ); ?></p>
<p>Direct Checkout Page[for Add to cart Selected]</p>
</td>
</tr>

<tr>
<th><label class="wpt_label" for="wpt_table_disable_cat_tag_link"><?php echo sprintf(esc_html__( 'Disable %s[Categories and Tags]%s Link', 'wpt_pro' ), '<strong>', '</strong>' ); ?></label> </th>
<th><label class="wpt_label" for="wpt_table_disable_cat_tag_link"><?php echo sprintf(esc_html__( '%sCategories, Tags%s Link', 'wpt_pro' ), '<strong>', '</strong>' ); ?></label> </th>
<td>
<select name="<?php echo esc_attr( $field_name ); ?>[disable_cat_tag_link]" id="wpt_table_disable_cat_tag_link" class="wpt_fullwidth ua_input" >
<option value="1" <?php wpt_selected( 'disable_cat_tag_link', '1', $current_config_value ); ?>><?php esc_html_e( 'Yes', 'wpt_pro' ); ?></option>
<option value="0" <?php wpt_selected( 'disable_cat_tag_link', '0', $current_config_value ); ?>><?php esc_html_e( 'No', 'wpt_pro' ); ?></option>
<option value="1" <?php wpt_selected( 'disable_cat_tag_link', '1', $current_config_value ); ?>><?php esc_html_e( 'Disable', 'wpt_pro' ); ?></option>
<option value="0" <?php wpt_selected( 'disable_cat_tag_link', '0', $current_config_value ); ?>><?php esc_html_e( 'Enable', 'wpt_pro' ); ?></option>
</select>
</td>
</tr>
<tr>
<th> <label class="wpt_label" for="wpt_table_disable_loading_more"><?php echo sprintf(esc_html__( 'Disable %s[Load More]%s Button', 'wpt_pro' ), '<b>', '</b>' ); ?></label></th>
<th> <label class="wpt_label" for="wpt_table_disable_loading_more"><?php echo sprintf(esc_html__( '%sLoad More%s Button', 'wpt_pro' ), '<b>', '</b>' ); ?></label></th>
<td>
<select name="<?php echo esc_attr( $field_name ); ?>[disable_loading_more]" id="wpt_table_disable_loading_more" class="wpt_fullwidth ua_input" >
<option value="load_more_hidden" <?php wpt_selected( 'disable_loading_more', 'load_more_hidden', $current_config_value ); ?>><?php esc_html_e( 'Yes', 'wpt_pro' ); ?></option>
<option value="normal" <?php wpt_selected( 'disable_loading_more', 'normal', $current_config_value ); ?>><?php esc_html_e( 'No', 'wpt_pro' ); ?></option>
<option value="load_more_hidden" <?php wpt_selected( 'disable_loading_more', 'load_more_hidden', $current_config_value ); ?>><?php esc_html_e( 'Hide', 'wpt_pro' ); ?></option>
<option value="normal" <?php wpt_selected( 'disable_loading_more', 'normal', $current_config_value ); ?>><?php esc_html_e( 'Show', 'wpt_pro' ); ?></option>
</select>
</td>
</tr>
Expand All @@ -263,8 +266,8 @@ function wpt_configure_basic_part( $settings,$current_config_value,$field_name )
<th> <label class="wpt_label" for="wpt_table_instant_search_filter"><?php esc_html_e( 'Instant Search Filter', 'wpt_pro' ); ?></label></th>
<td>
<select name="<?php echo esc_attr( $field_name ); ?>[instant_search_filter]" id="wpt_table_instant_search_filter" class="wpt_fullwidth ua_input" >
<option value="1" <?php wpt_selected( 'instant_search_filter', '1', $current_config_value ); ?>><?php esc_html_e( 'Yes', 'wpt_pro' ); ?></option>
<option value="0" <?php wpt_selected( 'instant_search_filter', '0', $current_config_value ); ?>><?php esc_html_e( 'No', 'wpt_pro' ); ?></option>
<option value="1" <?php wpt_selected( 'instant_search_filter', '1', $current_config_value ); ?>><?php esc_html_e( 'Show', 'wpt_pro' ); ?></option>
<option value="0" <?php wpt_selected( 'instant_search_filter', '0', $current_config_value ); ?>><?php esc_html_e( 'Hide', 'wpt_pro' ); ?></option>
</select>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions admin/admin-enqueue.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
*/
function wpt_admin_enqueue(){

wp_enqueue_style( 'wpt-admin', WPT_Product_Table::getPath( 'BASE_URL' ) . 'assets/css/admin.css', array(), '1.0.0', 'all' );
wp_enqueue_style( 'wpt-admin', WPT_Product_Table::getPath( 'BASE_URL' ) . 'assets/css/admin.css', array(), WPT_DEV_VERSION, 'all' );

/**
* Including UltraAddons CSS form Style
*/
wp_enqueue_style( 'ultraaddons-css', WPT_Product_Table::getPath( 'BASE_URL' ) . 'assets/css/admin-common.css', array(), '1.0.0', 'all' );
wp_enqueue_style( 'ultraaddons-css', WPT_Product_Table::getPath( 'BASE_URL' ) . 'assets/css/admin-common.css', array(), WPT_DEV_VERSION, 'all' );
wp_enqueue_style('ultraaddons-css');

/**
Expand Down
2 changes: 1 addition & 1 deletion admin/post_metabox_form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class="button-primary button-primary primary button <?php echo esc_attr( $ajax_s
background-image: url('<?php echo WPT_BASE_URL . 'assets/images/move_color_3.png'; ?>');
}
ul#wpt_column_sortable li.wpt_sortable_peritem.enabled>span.handle{
background-image: url('<?php echo WPT_BASE_URL . 'assets/images/move_color_2.png'; ?>');
background-image: url('<?php echo WPT_BASE_URL . 'assets/images/move_color_3.png'; ?>');
}

</style>
1 change: 1 addition & 0 deletions admin/tabs/inc-column/column-list.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
data-keyword="<?php echo esc_attr( $keyword ); ?>"
class="colum_data_input <?php echo esc_attr( $keyword ); ?>"
type="text"
title="<?php echo esc_attr__( 'Click for Expand/Collapse. Edit your Column Title here.', 'wpt_pro' ); ?>"
value="<?php echo htmlentities( $updated_title ); ?>" <?php echo $readOnly; ?>>

<?php
Expand Down
16 changes: 13 additions & 3 deletions assets/css/admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,12 @@ ul#wpt_keyword_hide_mobile
.wpt_shortable_data,
.wpt_mobile_hide_keyword
{
transition: 0.3s all;
width: 100%;
padding: 15px 10px;
padding: 12px 10px 8px 10px;
}
li.expanded_li .wpt_shortable_data{
padding: 20px 10px 15px 10px;
}
.wpt_shortable_data
{
Expand Down Expand Up @@ -133,8 +137,12 @@ ul#wpt_keyword_hide_mobile li>span.handle.checkbox_handle>input

.enabled .wpt_shortable_data>input{
background: rgba(0, 118, 147, 0);
border: 1px solid transparent;
}
.enabled:hover .wpt_shortable_data>input{
border: 1px solid #00769324;
}

.expanded_li.enabled .wpt_shortable_data>input {
background: #00769314;
border: 1px solid #00769324;
Expand Down Expand Up @@ -433,7 +441,9 @@ span.wpt_keyword {
cursor: pointer;
opacity: 1;
font-size: 11px;
display: none;
}
ul#wpt_column_sortable>li.wpt_sortable_peritem:hover span.wpt_column_cross{display: inline-block;}

.highlighted_text{color: #d00;}

Expand Down Expand Up @@ -611,7 +621,7 @@ span.extra_all_on_off {
li.wpt_sortable_peritem.enabled span.extra_all_on_off {


background: #007693;
background: #636161;
color: white;
}
span.extra_all_on_off.off_now {
Expand Down Expand Up @@ -1125,7 +1135,7 @@ ul#wpt_column_sortable>li.wpt_sortable_peritem.enabled{display: flex;}
cursor: pointer;
background: #e4e4e459;
color: black;
border-radius: 9px;
border-radius: 5px;
padding: 5px 8px;
border: 1px solid #ddd;
}
Expand Down
4 changes: 2 additions & 2 deletions assets/js/admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@
});

});
$(document).on('click','.wpt_column_arrow',function(){
$(document).on('click','ul#wpt_column_sortable>li.wpt_sortable_peritem.enabled .wpt_column_arrow',function(){
var target = $(this).attr('data-target');
var keyword = $(this).attr('data-keyword');
var thisElement = $(this).parents('.wpt_sortable_peritem');
var thisElement = $(this).closest('li.wpt_sortable_peritem.enabled');
var prev = thisElement.prev();
var prevClass = prev.attr('class');
var next = thisElement.next();
Expand Down
7 changes: 6 additions & 1 deletion assets/js/custom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,12 @@
var temp_number = thisID.replace('single_keyword_','');
$('#wpt_query_search_button_' + temp_number).trigger('click');
}));
$('body').on('change,focus','.search_select,.query_box_direct_value',function(){
$('body').on('change','.search_select',function(){
var thisID = $(this).parents('.wpt_product_table_wrapper').attr('id');
var temp_number = thisID.replace('table_id_','');
$('#wpt_query_search_button_' + temp_number).trigger('click');
});
$('body').on('change,focus','.query_box_direct_value',function(){
var thisID = $(this).parents('.wpt_product_table_wrapper').attr('id');
var temp_number = thisID.replace('table_id_','');
$('#wpt_query_search_button_' + temp_number).trigger('click');
Expand Down

0 comments on commit ab278af

Please sign in to comment.