Merge pull request #93 from codersaiful/2.8.5.4

2.8.5.4
codersaiful · May 4, 2021 · 2675ac1 · 2675ac1
2 parents ab278af + da5f4be
commit 2675ac1
Show file tree

Hide file tree

Showing 13 changed files with 135 additions and 70 deletions.
diff --git a/admin/action-hook.php b/admin/action-hook.php
@@ -18,7 +18,7 @@ function wpt_admin_form_top(){
         if( $validation ){
         ?>
         <ul class="wpt_admin_form_links" style="margin: 0">
-            <li><a class="wpt_get_pro_form_top_link" target="_blank" title="Awesome Pro features is Waiting for you!" href="https://codecanyon.net/item/woo-product-table-pro/20676867">Get Pro</a></li>  
+            <li><a class="wpt_get_pro_form_top_link" target="_blank" title="Awesome Pro features is Waiting for you!" href="https://codecanyon.net/item/woo-product-table-pro/20676867?ref=CodeAstrology&utm_source=WPT_Installed_Plugin">Get Pro</a></li>  
             <li>
                 <a class="Header-link " href="https://github.com/codersaiful/woo-product-table" target="_blank">
   <svg class="octicon octicon-mark-github v-align-middle" height="16" 

diff --git a/admin/includes/right_side.php b/admin/includes/right_side.php
@@ -80,7 +80,7 @@
             <a href="https://codecanyon.net/downloads" target="_blank"><img class="rate_us_image" src="<?php echo WPT_Product_Table::getPath( 'BASE_URL' ); ?>assets/images/rate_us.png"></a>
             <h1>It can take only 2 Minutes.</h1>
             <a href="https://wordpress.org/support/plugin/woo-product-table/reviews/?filter=5#new-post" target="_blank">Rate Us on WordPress.org</a>
-            <a href="https://codecanyon.net/item/woo-product-table-pro/20676867" target="_blank">Rate Us on CodeCanyon</a>
+            <a href="https://codecanyon.net/item/woo-product-table-pro/20676867?ref=CodeAstrology&utm_source=WPT_Installed_Plugin" target="_blank">Rate Us on CodeCanyon</a>
         </div>
     </div>
 

diff --git a/admin/menu_plugin_setting_link.php b/admin/menu_plugin_setting_link.php
@@ -11,7 +11,7 @@
      */
     function wpt_add_action_links($links) {
         if( ! class_exists( 'WOO_Product_Table' ) ){
-            $wpt_links[] = '<a href="https://codecanyon.net/item/woo-product-table-pro/20676867" title="' . esc_attr__( 'Many awesome features is waiting for you', 'wpt_pro' ) . '" target="_blank">'.esc_html__( 'GET PRO VERSION','wpt_pro' ).'</a>';
+            $wpt_links[] = '<a href="https://codecanyon.net/item/woo-product-table-pro/20676867?ref=CodeAstrology&utm_source=WPT_Installed_Plugin" title="' . esc_attr__( 'Many awesome features is waiting for you', 'wpt_pro' ) . '" target="_blank">'.esc_html__( 'GET PRO VERSION','wpt_pro' ).'</a>';
         }
         $wpt_links[] = '<a href="' . admin_url( 'post-new.php?post_type=wpt_product_table' ) . '" title="' . esc_attr__( 'Add new Shortcode', 'wpt_pro' ) . '">' . esc_html__( 'Create Table', 'wpt_pro' ).'</a>';
         $wpt_links[] = '<a href="' . admin_url( 'edit.php?post_type=wpt_product_table&page=woo-product-table-config' ) . '" title="' . esc_attr__( 'Configure for Universal', 'wpt_pro' ) . '">' . esc_html__( 'Configure', 'wpt_pro' ) . '</a>';
@@ -36,7 +36,7 @@ function wpt_admin_menu() {
         add_submenu_page( 'edit.php?post_type=wpt_product_table', esc_html__( 'Configuration WPTpro', 'wpt_pro' ),  esc_html__( 'Configure', 'wpt_pro' ), WPT_CAPABILITY, 'woo-product-table-config', 'wpt_configuration_page' );
         add_submenu_page( 'edit.php?post_type=wpt_product_table', esc_html__( 'Contribute to our Github Repository', 'wpt_pro' ), sprintf( esc_html__( 'Github %s Repo%s', 'wpt_pro' ), '<span style="color:#ffff21;">', '</span>'), WPT_CAPABILITY, 'https://github.com/codersaiful/woo-product-table' );
         add_submenu_page( 'edit.php?post_type=wpt_product_table', esc_html__( 'FAQ & Support page - Contact With US', 'wpt_pro' ), sprintf( esc_html__( 'FAQ %s& Contact%s', 'wpt_pro' ), '<span style="color:#ff8921;">', '</span>'), WPT_CAPABILITY, 'wpt_fac_contact_page', 'wpt_fac_support_page' );
-        add_submenu_page( 'edit.php?post_type=wpt_product_table', esc_html__( 'GET PRO VERSION', 'wpt_pro' ),  __( '<i>Get <strong>Pro</strong></i>', 'wpt_pro' ), WPT_CAPABILITY, 'https://codecanyon.net/item/woo-product-table-pro/20676867' );
+        add_submenu_page( 'edit.php?post_type=wpt_product_table', esc_html__( 'GET PRO VERSION', 'wpt_pro' ),  __( '<i>Get <strong>Pro</strong></i>', 'wpt_pro' ), WPT_CAPABILITY, 'https://codecanyon.net/item/woo-product-table-pro/20676867?ref=CodeAstrology&utm_source=WPT_Installed_Plugin' );
         add_submenu_page( 'edit.php?post_type=wpt_product_table', esc_html__( 'Pro Features', 'wpt_pro' ),  __( 'Pro Features', 'wpt_pro' ), 'manage_options', 'wpt-pro-features', 'wpt_pro_features_content' );
         //add_submenu_page( 'edit.php?post_type=wpt_product_table', esc_html__( 'Browse Plugins', 'wpt_pro' ),  __( 'Browse Plugins', 'wpt_pro' ), WPT_CAPABILITY, 'wpt-browse-plugins', 'wpt_browse_all_plugin_list' );
     }

diff --git a/admin/tabs/column_settings.php b/admin/tabs/column_settings.php
@@ -57,7 +57,7 @@
 <div class="inside-column-settings-wrapper">
     <div class="inside-column-setting-header">
         <h2><?php echo esc_html__( 'Devicewise Column Setting', 'wpt_pro' ); ?></h2>
-        <p><?php echo esc_html__( 'Desktop is default, if not set any column for tablet and mobile.', 'wpt_pro' ); ?></p>
+        <br>
     </div>
     <nav class="inside-nav-tab-wrapper">
         <a data-target="inside-desktop" data-device="desktop" class="wpt_inside_nav_tab nav-tab nav-tab-active">Desktop</a>
@@ -84,6 +84,7 @@
 
 
     <div id="inside-tablet" class="inside_tab_content tab-content">
+
 <?php 
 
 
@@ -96,7 +97,9 @@
 
 $availe_column_list_file = __DIR__ . '/inc-column/available-column-list.php';
 include $availe_column_list_file;
-
+?>
+<p class="device_wise_col_message"><?php echo esc_html__( 'Set columns for tablet, otherwise desktop columns will be shown on tablet.', 'wpt_pro' ); ?></p>
+<?php
 $column_list_file = __DIR__ . '/inc-column/column-list.php';
 include $column_list_file;
 
@@ -117,7 +120,9 @@
 
 $availe_column_list_file = __DIR__ . '/inc-column/available-column-list.php';
 include $availe_column_list_file;
-
+?>
+<p class="device_wise_col_message"><?php echo esc_html__( 'Set columns for mobile, otherwise tablet columns will be shown on mobile.', 'wpt_pro' ); ?></p>
+<?php
 $column_list_file = __DIR__ . '/inc-column/column-list.php';
 include $column_list_file;
 

diff --git a/admin/tabs/conditions.php b/admin/tabs/conditions.php
@@ -71,7 +71,7 @@
         <table class="ultraaddons-table">
             <tr>
                 <th>
-                    <label class="wpt_label" for="wpt_product_min_price"><?php esc_html_e( 'Set Minimum Price', 'wpt_pro' ); ?></label>
+                    <label class="wpt_label" for="wpt_product_min_price"><?php esc_html_e( 'Minimum Price', 'wpt_pro' ); ?></label>
                 </th>
                 <td>
                     <input name="conditions[min_price]" data-name='min_price' value="<?php echo isset( $meta_conditions['min_price'] ) ?$meta_conditions['min_price'] : ''; ?>" id="wpt_product_min_price" class="wpt_fullwidth wpt_data_filed_atts ua_input" type="number" pattern="[0-9]*">
@@ -83,7 +83,7 @@
         <table class="ultraaddons-table">
             <tr>
                 <th>
-                    <label class="wpt_label" for="wpt_product_max_price"><?php esc_html_e( 'Set Maximum Price', 'wpt_pro' ); ?></label>
+                    <label class="wpt_label" for="wpt_product_max_price"><?php esc_html_e( 'Maximum Price', 'wpt_pro' ); ?></label>
                 </th>
                 <td>
                     <input name="conditions[max_price]" data-name='max_price' value="<?php echo isset( $meta_conditions['max_price'] ) ?$meta_conditions['max_price'] : ''; ?>" id="wpt_product_max_price" class="wpt_fullwidth wpt_data_filed_atts ua_input" type="number" pattern="[0-9]*">
@@ -112,11 +112,11 @@
         <table class="ultraaddons-table">
             <tr>
                 <th>
-                    <label class="wpt_label" for="wpt_table_only_stock"><?php esc_html_e( 'Only Stock Product', 'wpt_pro' ); ?></label>
+                    <label class="wpt_label" for="wpt_table_only_stock"><?php esc_html_e( 'Stock Status', 'wpt_pro' ); ?></label>
                 </th>
                 <td>
                     <select name="conditions[only_stock]" data-name='only_stock' id="wpt_table_only_stock" class="wpt_fullwidth wpt_data_filed_atts ua_input" >
-                        <option value="" <?php echo isset( $meta_conditions['only_stock'] ) && $meta_conditions['only_stock'] == '' ? 'selected' : ''; ?>><?php esc_html_e( 'All Product', 'wpt_pro' ); ?></option>
+                        <option value="" <?php echo isset( $meta_conditions['only_stock'] ) && $meta_conditions['only_stock'] == '' ? 'selected' : ''; ?>><?php esc_html_e( 'Default', 'wpt_pro' ); ?></option>
                         <option value="instock" <?php echo isset( $meta_conditions['only_stock'] ) && $meta_conditions['only_stock'] == 'instock' ? 'selected' : ''; ?>><?php esc_html_e( 'instock', 'wpt_pro' ); ?></option>
                         <option value="onbackorder" <?php echo isset( $meta_conditions['only_stock'] ) && $meta_conditions['only_stock'] == 'onbackorder' ? 'selected' : ''; ?>><?php esc_html_e( 'onbackorder', 'wpt_pro' ); ?></option>
                         <option value="outofstock" <?php echo isset( $meta_conditions['only_stock'] ) && $meta_conditions['only_stock'] == 'outofstock' ? 'selected' : ''; ?>><?php esc_html_e( 'outofstock', 'wpt_pro' ); ?></option>
@@ -130,12 +130,12 @@
         <table class="ultraaddons-table">
             <tr>
                 <th>
-                    <label class="wpt_label" for="wpt_table_only_sale"><?php esc_html_e( 'Only Sale Products', 'wpt_pro' ); ?></label>
+                    <label class="wpt_label" for="wpt_table_only_sale"><?php esc_html_e( 'Sale Products', 'wpt_pro' ); ?></label>
                 </th>
                 <td>
                     <select name="conditions[only_sale]" data-name='only_sale' id="wpt_table_only_sale" class="wpt_fullwidth wpt_data_filed_atts ua_input" >
-                        <option value="no" <?php echo isset( $meta_conditions['only_sale'] ) && $meta_conditions['only_sale'] == 'no' ? 'selected' : ''; ?>><?php esc_html_e( 'All Product', 'wpt_pro' ); ?></option>
-                        <option value="yes" <?php echo isset( $meta_conditions['only_sale'] ) && $meta_conditions['only_sale'] == 'yes' ? 'selected' : ''; ?>><?php esc_html_e( 'Yes (Only Sale)', 'wpt_pro' ); ?></option>
+                        <option value="no" <?php echo isset( $meta_conditions['only_sale'] ) && $meta_conditions['only_sale'] == 'no' ? 'selected' : ''; ?>><?php esc_html_e( 'Default', 'wpt_pro' ); ?></option>
+                        <option value="yes" <?php echo isset( $meta_conditions['only_sale'] ) && $meta_conditions['only_sale'] == 'yes' ? 'selected' : ''; ?>><?php esc_html_e( 'Only Sale', 'wpt_pro' ); ?></option>
                     </select>
                 </td>
             </tr>
@@ -160,12 +160,12 @@
         <table class="ultraaddons-table">
             <tr>
                 <th>
-                    <label class="wpt_label" for="wpt_table_table_type"><?php esc_html_e( 'Third Party Addons Supporting ', 'wpt_pro' ); ?></label>
+                    <label class="wpt_label" for="wpt_table_table_type"><?php esc_html_e( 'Third Party Plugin Supporting ', 'wpt_pro' ); ?></label>
                 </th>
                 <td>
                     <select name="conditions[table_type]" data-name='table_type' id="wpt_table_table_type" class="wpt_fullwidth wpt_data_filed_atts ua_input" >
-                        <option value="normal_table" <?php echo isset( $meta_conditions['table_type'] ) && $meta_conditions['table_type'] == 'normal_table' ? 'selected' : ''; ?>><?php esc_html_e( 'No', 'wpt_pro' ); ?></option>
-                        <option value="advance_table" <?php echo isset( $meta_conditions['table_type'] ) && $meta_conditions['table_type'] == 'advance_table' ? 'selected' : ''; ?>><?php esc_html_e( 'Yes', 'wpt_pro' ); ?></option>
+                        <option value="normal_table" <?php echo isset( $meta_conditions['table_type'] ) && $meta_conditions['table_type'] == 'normal_table' ? 'selected' : ''; ?>><?php esc_html_e( 'Default', 'wpt_pro' ); ?></option>
+                        <option value="advance_table" <?php echo isset( $meta_conditions['table_type'] ) && $meta_conditions['table_type'] == 'advance_table' ? 'selected' : ''; ?>><?php esc_html_e( 'Enable', 'wpt_pro' ); ?></option>
                     </select>
                 </td>
             </tr>

diff --git a/admin/tabs/inc-column/column-list.php b/admin/tabs/inc-column/column-list.php
@@ -62,12 +62,30 @@ class="colum_data_input <?php echo esc_attr( $keyword ); ?>"
 
 
             <div class="wpt_column_setting_single_extra">
-                <?php do_action( 'wpto_column_setting_form_' . $keyword, $_device_name, $column_settings, $columns_array, $updated_columns_array, $post, $additional_data ); ?>
+                <?php 
+                /**
+                 * Adding Extra Features Based on Specific keyword
+                 * 
+                 * *****************************
+                 * @HOOKED at includes/functions.php
+                 * wpto_column_setting_form_thumbnails wpt_thumbnails_column_add 10,2
+                 */
+                do_action( 'wpto_column_setting_form_' . $keyword, $_device_name, $column_settings, $columns_array, $updated_columns_array, $post, $additional_data ); ?>
             </div>
             <span data-key="<?php echo esc_attr( $keyword ); ?>" class="extra_all_on_off on_now"><i class="on_off_icon"></i>Expand</span>
             <div class="wpt_column_setting_extra for_all extra_all_<?php echo esc_attr( $keyword ); ?>">
                 <?php do_action( 'wpto_column_setting_form_inside_' . $keyword, $_device_name, $column_settings, $columns_array, $updated_columns_array, $post, $additional_data ); ?>
-                <?php do_action( 'wpto_column_setting_form', $keyword, $_device_name, $column_settings, $columns_array, $updated_columns_array, $post, $additional_data ); ?>
+                <?php 
+                /**
+                 * Adding Extra Feature based on action hook
+                 * 
+                 * *******************************
+                 * @HOOKED at includes/functions.php
+                 * wpt_column_add_extra_items 10,7
+                 * wpt_column_tag_for_all 10,3 
+                 */
+
+                do_action( 'wpto_column_setting_form', $keyword, $_device_name, $column_settings, $columns_array, $updated_columns_array, $post, $additional_data ); ?>
 
             </div>
             <div class="wpt_column_setting_extra for_all profeatures-message">

diff --git a/admin/tabs/search_n_filter.php b/admin/tabs/search_n_filter.php
@@ -16,7 +16,7 @@
                 </th>
                 <td>
                     <select name="search_n_filter[search_box]" data-name='search_box' id="wpt_search_box" class="wpt_fullwidth wpt_data_filed_atts ua_input wpt_toggle" data-on="yes|.wpt_snf_on_off" >
-                        <option value="no" <?php echo isset( $meta_search_n_filter['search_box'] ) && $meta_search_n_filter['search_box'] == 'no' ? 'selected' : ''; ?>><?php esc_html_e( 'No Search Box', 'wpt_pro' ); ?></option>
+                        <option value="no" <?php echo isset( $meta_search_n_filter['search_box'] ) && $meta_search_n_filter['search_box'] == 'no' ? 'selected' : ''; ?>><?php esc_html_e( 'Hide Search Box', 'wpt_pro' ); ?></option>
                         <option value="yes" <?php echo isset( $meta_search_n_filter['search_box'] ) && $meta_search_n_filter['search_box'] == 'yes' ? 'selected' : ''; ?>><?php esc_html_e( 'Show Search Box', 'wpt_pro' ); ?></option>
                     </select>
                 </td>
@@ -106,8 +106,8 @@
                 </th>
                 <td>
                     <select name="search_n_filter[filter_box]" data-name='filter_box' id="wpt_filter_box" class="wpt_fullwidth wpt_data_filed_atts ua_input wpt_toggle"  data-on="yes|.wpt_filtr_on_off">
-                        <option value="no" <?php echo isset( $meta_search_n_filter['filter_box'] ) && $meta_search_n_filter['filter_box'] == 'no' ? 'selected' : ''; ?>><?php esc_html_e( 'No Filter', 'wpt_pro' ); ?></option>
-                        <option value="yes" <?php echo isset( $meta_search_n_filter['filter_box'] ) && $meta_search_n_filter['filter_box'] == 'yes' ? 'selected' : ''; ?>><?php esc_html_e( 'Filter Show', 'wpt_pro' ); ?></option>
+                        <option value="no" <?php echo isset( $meta_search_n_filter['filter_box'] ) && $meta_search_n_filter['filter_box'] == 'no' ? 'selected' : ''; ?>><?php esc_html_e( 'Hide Filter', 'wpt_pro' ); ?></option>
+                        <option value="yes" <?php echo isset( $meta_search_n_filter['filter_box'] ) && $meta_search_n_filter['filter_box'] == 'yes' ? 'selected' : ''; ?>><?php esc_html_e( 'Show Filter', 'wpt_pro' ); ?></option>
                     </select>
                 </td>
             </tr>

diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -49,7 +49,7 @@ li.wpt_sortable_peritem,
 li.hide_on_mobile_permits
 {
     width: 100%;
-    border: 1px solid #cccccca1;
+    border: 0 none;
     padding-left: 0;
     display:  table;
     position:  relative;
@@ -87,7 +87,7 @@ ul#wpt_keyword_hide_mobile
     padding: 12px 10px 8px 10px;
 }
 li.expanded_li .wpt_shortable_data{
-    padding: 20px 10px 15px 10px;
+    padding: 20px 15px 15px 15px;
 }
 .wpt_shortable_data
 {
@@ -96,7 +96,7 @@ li.expanded_li .wpt_shortable_data{
 ul#wpt_column_sortable li>span.handle,
 ul#wpt_keyword_hide_mobile li>span.handle
 {
-    background: #c7c7c76e no-repeat center center;
+    background: #f9f9f9 no-repeat center center;
     width: 41px;
     position: relative;
     cursor: move;
@@ -135,12 +135,17 @@ ul#wpt_keyword_hide_mobile li>span.handle.checkbox_handle>input
     border: 1px solid #6c879438;
 }
 
-.enabled .wpt_shortable_data>input{
+.wpt_shortable_data>input{
     background: rgba(0, 118, 147, 0);
     border: 1px solid transparent;
 }
+.wpt_shortable_data>input{
+    font-weight: 500;
+    color: #333333;
+}
 .enabled:hover .wpt_shortable_data>input{
     border: 1px solid #00769324;
+    font-weight: normal;
 }
 
 .expanded_li.enabled .wpt_shortable_data>input {
@@ -529,12 +534,12 @@ span.purchase_code_active {
     background: #e5e5e5;
 }
 .wpt_column_setting_extra {
-    padding: 0 10px 16px 10px;
+    /* padding: 0 10px 16px 10px; */
     background: transparent;
     width: calc(100% - 20px);
     background: #ffffffd9;
     margin-top: 21px;
-    border: 1px solid #dddddd91;
+    /* border: 1px solid #dddddd91; */
     margin-bottom: 5px;
 }
 .wpt_column_setting_single_extra {
@@ -552,8 +557,8 @@ ul#wpt_column_sortable>li.wpt_sortable_peritem {
     display: flex;
     padding: 0;
 }
-ul#wpt_column_sortable>li.wpt_sortable_peritem.enabled {
-    /* border-top: 1px solid #607d8b40; */
+ul#wpt_column_sortable>li.wpt_sortable_peritem {
+    border-top: 0 none; 
     box-shadow: 0px 1px 16px 0 #bbbbbb9c;
 }
 ul#wpt_column_sortable li.wpt_sortable_peritem.enabled>span.handle, ul#wpt_keyword_hide_mobile li>span.handle {
@@ -1120,7 +1125,7 @@ ul#wpt_column_sortable>li.wpt_sortable_peritem{display: none;}
 ul#wpt_column_sortable>li.wpt_sortable_peritem.enabled{display: flex;}
 
 .add_switch_col_wrapper .enable-available-cols ul {
-    display: flex;
+    display: flex !important;
     flex-wrap: wrap;
 }
 
@@ -1190,7 +1195,7 @@ ul#wpt_column_sortable>li.wpt_sortable_peritem {
 ul#wpt_column_sortable>li.wpt_sortable_peritem.ui-sortable-helper {
         /* background: #000000; */
     box-shadow: 0 1px 12px 0 #00000057;
-    /* border-color: #100000;
+    /* border-color: #100000;*/
 }
 
 /* Notice Style for UltraAddons*/