Merge pull request #56 from codersaiful/2.7.8.1

2.7.8.1
codersaiful · Dec 8, 2020 · c56e564 · c56e564
2 parents 3a02637 + 8149600
commit c56e564
Show file tree

Hide file tree

Showing 4 changed files with 168 additions and 2 deletions.
diff --git a/admin/post_metabox.php b/admin/post_metabox.php
@@ -16,10 +16,54 @@
     function wpt_shortcode_metabox(){
         add_meta_box( 'wpt_shortcode_metabox_id', 'Shortcode', 'wpt_shortcode_metabox_render', 'wpt_product_table', 'normal' );
         add_meta_box( 'wpt_shortcode_configuration_metabox_id', 'Table Configuration', 'wpt_shortcode_configuration_metabox_render', 'wpt_product_table', 'normal' ); //Added at 4.1.4
+        //add_meta_box( 'wpt_column_panel_metabox_id', __( 'Available Columns', 'wpt' ), 'wpt_column_panel_metabox_render', 'wpt_product_table', 'side', 'low' ); //Added at 4.1.4
 
     }
 }
 
+if( !function_exists( 'wpt_column_panel_metabox_render' ) ){
+    /**
+     * This function showing column panel 
+     * 
+     * @since 2.7.8.1
+     */
+    function wpt_column_panel_metabox_render(){
+        global $post;
+        $default_enable_array = WPT_Product_Table::$default_enable_columns_array;
+        $columns_array = WPT_Product_Table::$columns_array;
+        $for_add =  $meta_column_array = $updated_columns_array = get_post_meta( $post->ID, 'column_array', true );
+        if( !$meta_column_array && empty( $meta_column_array ) ){
+            $for_add = $updated_columns_array = WPT_Product_Table::$columns_array;
+        }
+        if( $updated_columns_array && !empty( $updated_columns_array ) && !empty( $columns_array ) ){
+            $columns_array = array_merge( $columns_array, $updated_columns_array );
+        }
+        ksort($columns_array);
+//        $meta_enable_column_array = get_post_meta( $post->ID, 'enabled_column_array', true );
+//        if( $meta_enable_column_array && !empty( $meta_enable_column_array ) && !empty( $columns_array ) ){
+//            $columns_array = array_merge($meta_enable_column_array,$columns_array);
+//        }
+//
+//        $column_settings = get_post_meta( $post->ID, 'column_settings', true ); 
+//        if( empty( $column_settings ) ){
+//            $column_settings = array();
+//        }
+//        $additional_collumn = array_diff(array_keys($for_add), array_keys( WPT_Product_Table::$columns_array ));
+
+        ?>
+        <div class="section">
+            <p><?php echo esc_html__( 'Available columns for WOO Product Table. Add them in your table to enable column.', 'wpt' ); ?></p>
+            <ul id="wpt_column_sortable">
+                <?php foreach( $columns_array as $keyword => $title ){ ?>
+                <li data-column_key = "<?php echo esc_attr( $keyword ); ?>"><?php echo esc_html( $title ); ?></li>
+                <?php } ?>
+            </ul>
+        </div>
+        <?php
+    }
+
+}
+
 if( !function_exists( 'wpt_shortcode_metabox_render' ) ){
     function wpt_shortcode_metabox_render(){
         global $post;

diff --git a/admin/tabs/column_settings.php b/admin/tabs/column_settings.php
@@ -35,13 +35,28 @@
 //var_dump( $meta_enable_column_array, $columns_array );
 if( is_array( $meta_enable_column_array ) && !empty( $meta_enable_column_array ) ){
     //$columns_array = array_merge( $meta_enable_column_array, array_diff( $columns_array, $meta_enable_column_array ));
+    $final_cols_arr = $meta_enable_column_array;
+}else{
+   $final_cols_arr = $default_enable_array; 
+}
+
+if( !is_array( $final_cols_arr ) ){
+    return;
 }
 //$columns_array = array_merge($meta_enable_column_array,array_diff($columns_array,$meta_enable_column_array));
-//var_dump($column_settings);
+//var_dump($columns_array,$meta_enable_column_array);
 ?>
 <ul id="wpt_column_sortable">
     <?php
-    foreach( $columns_array as $keyword => $title ){
+    /**
+     * Here was $columns_array
+     * I have added new $meta_enable_column_array
+     * 
+     * Because: In new version, We will show only Enabled Col here
+     * 
+     * 
+     */
+    foreach( $columns_array as $keyword => $title ){  //Here was $columns_array in new: $meta_enable_column_array
         $updated_title = isset( $updated_columns_array[$keyword] ) ? $updated_columns_array[$keyword] : $title;
         if( $meta_enable_column_array && !empty( $meta_enable_column_array ) && is_array( $meta_enable_column_array ) ){
             $enabled_class = $checked_attribute = '';
@@ -126,6 +141,61 @@ class="checkbox_handle_input <?php echo esc_attr( $enabled_class ); ?>"
 </ul>
 
 
+<!-- Enable Active Collumn -->
+<div class="add_switch_col_wrapper">
+    <div class="section ultraaddons-panel add_new_column">
+        <h3 class="with-background dark-background slim-title"><?php echo esc_html__( 'Column Activation', 'wpt_pro' ); ?> <small style="color: orange; font-size: 12px;"></small></h3>
+
+        <?php
+
+
+        ksort($columns_array);
+//        $meta_enable_column_array = get_post_meta( $post->ID, 'enabled_column_array', true );
+//        if( $meta_enable_column_array && !empty( $meta_enable_column_array ) && !empty( $columns_array ) ){
+//            $columns_array = array_merge($meta_enable_column_array,$columns_array);
+//        }
+//
+//        $column_settings = get_post_meta( $post->ID, 'column_settings', true ); 
+//        if( empty( $column_settings ) ){
+//            $column_settings = array();
+//        }
+//        $additional_collumn = array_diff(array_keys($for_add), array_keys( WPT_Product_Table::$columns_array ));
+
+        ?>
+        <div class="section enable-available-cols switch-enable-available">
+            <p><?php echo esc_html__( 'Activate your Preferred Column.', 'wpt_pro' ); ?></p>
+            <ul id="wpt-switch-list">
+                <?php 
+                foreach( $columns_array as $keyword => $title ){ 
+                    $updated_title = isset( $updated_columns_array[$keyword] ) ? $updated_columns_array[$keyword] : $title;
+                    if( $meta_enable_column_array && !empty( $meta_enable_column_array ) && is_array( $meta_enable_column_array ) ){
+                        $enabled_class = 'item-disabled';
+                        $enabled_class = '';
+                        if( in_array( $keyword, array_keys( $meta_enable_column_array ) ) ){
+                            $enabled_class = 'item-enabled';
+                        }
+                    }else{
+                        $enabled_class = 'item-enabled';
+                        if( !in_array( $keyword, $default_enable_array ) ){
+                            $enabled_class = 'item-disabled';
+                            $enabled_class = '';
+                        }
+                    }
+
+                ?>
+                <li class="switch-enable-item switch-enable-item-<?php echo esc_attr( $keyword ); ?> <?php echo esc_attr( $enabled_class ); ?>" 
+                    data-column_keyword="<?php echo esc_attr( $keyword ); ?>">
+                        <?php echo esc_html( $updated_title ); ?>
+                </li>
+                <?php } ?>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+
+<!-- Add new Custom Collumn -->
 <div class="add_new_col_wrapper">
     <div class="section ultraaddons-panel add_new_column">
         <h3 class="with-background dark-background slim-title">ADD NEW COLUMN <small style="color: orange; font-size: 12px;"></small></h3>

diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -1041,6 +1041,40 @@ select.wpt_table_on_archive {
     color: #aabbcc94;
     font-size: 10px;
 }
+
+
+/*new code from v2.7.8.2*/
+
+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;
+    flex-wrap: wrap;
+}
+
+.add_switch_col_wrapper .enable-available-cols ul li {
+    width: 150px;
+}
+.add_switch_col_wrapper .enable-available-cols ul li.switch-enable-item {
+    /* border: 1px solid #ddd; */
+    /* height: 55px; */
+    margin-right: 2px;
+    margin-bottom: 2px;
+    padding: 5px;
+    cursor: pointer;
+    background: #e4e4e459;
+    color: black;
+}
+.add_switch_col_wrapper .enable-available-cols ul li.switch-enable-item.item-enabled {
+    background: #007694;
+    color: white;
+}
+.add_switch_col_wrapper .enable-available-cols ul li.switch-enable-item.item-disabled {
+    background: #e4e4e459;
+    color: black;
+}
+
 /* Responsive Design Starts */
 @media screen and (max-width: 782px){
     .wpt_column_setting_single_extra>div label {

diff --git a/assets/js/admin.js b/assets/js/admin.js
@@ -224,6 +224,23 @@
             }
         }
 
+        /**
+         * Managing Column from Activation Column List
+         * 
+         * @since We have added this featre at Version 2.7.8.2
+         */
+        $( 'body.wpt_admin_body' ).on('click', '.add_switch_col_wrapper .switch-enable-available li.switch-enable-item', function(){
+            var keyword = $(this).data('column_keyword');
+            $(this).toggleClass('item-enabled');
+            $('#wpt_column_sortable li.wpt_sortable_peritem input.checkbox_handle_input[data-column_keyword="' + keyword + '"]').trigger('click');
+
+//            var lenght = $( '.add_switch_col_wrapper .switch-enable-available li.switch-enable-item.item-enabled' ).length;
+//            console.log(lenght);
+//            if( lenght == 0 ){
+//                //$(this).toggleClass('item-enabled');
+//            }
+
+        });
         /**
          * Column Section Managing
          */
@@ -248,6 +265,7 @@
                 //Counting colum End here
 
                 $(this).removeClass('enabled');
+                $('.switch-enable-item-' + keyword).removeClass('item-enabled');
                 targetLiSelector.removeClass('enabled');
             }
         });