Merge pull request #343 from codersaiful/3.5.0.0

3.5.0.0
codersaiful · Aug 18, 2024 · 8f9e149 · 8f9e149
2 parents c0db75f + 9227d3f
commit 8f9e149
Show file tree

Hide file tree

Showing 15 changed files with 147 additions and 18 deletions.
diff --git a/admin/page-loader.php b/admin/page-loader.php
@@ -59,6 +59,7 @@ public function admin_menu()
         if( ! $this->is_pro ){
             add_submenu_page( $this->main_slug, esc_html__( 'GET PRO VERSION', 'woo-product-table' ),  __( 'Get <strong>Pro</strong>', 'woo-product-table' ), 'read', 'https://wooproducttable.com/pricing/' );
         }
+        add_submenu_page( $this->main_slug, esc_html__( 'Product Bulk Edit', 'woo-product-table' ) . $proString,  __( 'Bulk Edit', 'woo-product-table' ), WPT_CAPABILITY, 'wpt-product-quick-edit', [$this, 'product_quick_edit'] );
 
     }
 
@@ -137,6 +138,14 @@ public function html_tutorial_page()
         include $this->page_folder_dir . 'tutorials.php';
     }
 
+    public function product_quick_edit()
+    {
+        $this->topbar_sub_title = __( 'Product Bulk Edit','woo-product-table' );
+        include $this->topbar_file;
+        include $this->page_folder_dir . 'product-bulk-edit.php';
+
+    }
+
     /**
      * If will work, when only found pro version
      * 

diff --git a/admin/page/product-bulk-edit.php b/admin/page/product-bulk-edit.php
@@ -0,0 +1,78 @@
+<?php
+$settings = array(
+    'page' => 'configuration_page',
+    'module' => 'free',
+);
+
+$settings = apply_filters('wpto_configuration_settings', $settings);
+
+$wrapper_class = isset($settings['module']) ? $settings['module'] : '';
+
+?>
+<div class="wrap wpt_wrap wpt-content <?php echo esc_attr($wrapper_class); ?>">
+
+    <h1 class="wp-heading "></h1>
+    <div class="fieldwrap">
+
+
+        <?php
+        if( ! class_exists( 'PSSGP_Init' ) ){
+        ?>
+        <a href="https://codeastrology.com/downloads/product-sync-master-sheet-premium/" target="_blank" style="margin-bottom: -30px;display:block;color: #d00;">Get <i>Sync Master Sheet Premium</i></a>
+        <?php    
+        }
+        if( class_exists( '\PSSG_Sync_Sheet\App\Handle\Quick_Table' ) ){
+
+            $quckTable = new \PSSG_Sync_Sheet\App\Handle\Quick_Table();
+            $quckTable->display_table_full();
+
+        }else{
+
+
+        ?>
+
+        <div class="wpt-section-panel supported-terms wpt-recomendation-area" id="wpt-recomendation-area">
+            <table class="wpt-my-table universal-setting">
+                <thead>
+                    <tr>
+                        <th class="wpt-inside">
+                            <div class="wpt-table-header-inside">
+                                <h3><?php echo esc_html__('Quick and Bulk Edit', 'wpt'); ?> <small class="wpt-small-title">Need to intall and activate following</small></h3>
+                            </div>
+
+                        </th>
+                        <th>
+                            <div class="wpt-table-header-right-side"></div>
+                        </th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                <tr>
+                    <td>
+                        <div class="wqpmb-form-control">
+                            <div class="form-label col-lg-12">
+                            <?php 
+
+                            do_action( 'wpt_sync_plugin_recommendation' ); ?>
+                            </div>
+
+                        </div>
+                    </td>
+                    <td>
+                        <div class="wqpmb-form-info">
+
+                            <p>Highly Recommeded this plugin. Which will help you to bulk edit of your all product.</p>
+                        </div> 
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+
+        </div> <!--/.wpt-recomendation-area -->
+        <?php
+        }
+        ?>
+    </div>
+
+</div> <!-- ./wrap wpt_wrap wpt-content -->
diff --git a/assets/css/new-admin.css b/assets/css/new-admin.css
@@ -745,6 +745,10 @@ small.wpt-small-title {
     div#wpt-recomendation-area .ca-notice.ca-reuire-plugin-notice.anwwhere-notice[data-notice_id='woo-product-table']{
         background-image: url('../images/products/woo-product-table.png');
     }
+
+    div#wpt-recomendation-area .ca-notice.ca-reuire-plugin-notice.anwwhere-notice[data-notice_id='product-sync-master-sheet']{
+        background-image: url('../images/products/product-sync-master-sheet.png');
+    }
     div#wpt-recomendation-area .ca-notice.ca-reuire-plugin-notice.anwwhere-notice[data-notice_id='woo-min-max-quantity-step-control-single']{
         background-image: url('../images/products/woo-min-max-quantity-step-control-single.png');
     }

diff --git a/assets/images/products/product-sync-master-sheet.png b/assets/images/products/product-sync-master-sheet.png
diff --git a/assets/js/custom.js b/assets/js/custom.js
@@ -996,7 +996,7 @@ jQuery(function($) {
                 //Return to Previous HTML Image
 
                 targetThumbs.attr('src', targetThumbsSRC);
-                targetThumbs.attr('srcset', targetThumbsSRCSET);
+                targetThumbs.attr('srcset', '');
                 //Unset variation ID data //Added at 4.0.20
                 targetThumbs.removeAttr('data-variation_id');
 
@@ -1839,7 +1839,7 @@ jQuery(function($) {
             if(outofstockVal){
                 Qty_Val = 0;
             }
-
+            $(thisRow).find('.yith-ywraq-add-to-quote input.input-text.qty.text').val(Qty_Val);
             // $( thisRow + ' input.input-text.qty.text').val(Qty_Val); // input.input-text.qty.text
             $( thisRow ).attr('data-quantity', Qty_Val);
             $( thisRow + ' .wpt_action a.wpt_woo_add_cart_button').attr('data-quantity', Qty_Val);

diff --git a/framework/handle.php b/framework/handle.php
@@ -81,7 +81,7 @@ public static function display_notice()
                 ]);
 
                 $offerNc->add_button([
-                    'text'  => 'Stock Sync',
+                    'text'  => 'WordPress Plugins',
                     'link'  => 'https://codeastrology.com/downloads/category/premium/'
                 ]);
 
@@ -99,7 +99,7 @@ private static function display_notice_on_pro()
             $target = 'https://codeastrology.com/downloads/?discount=' . $coupon_Code . '&campaign=' . $coupon_Code . '&ref=1&utm_source=Default_Offer_LINK';
             $my_message = 'Speciall Discount on All CodeAstrology Products'; 
             $offerNc = new Notice('wpt_'.$coupon_Code.'_offer');
-            $offerNc->set_title( 'SPECIAL OFFER 🍌' )
+            $offerNc->set_title( 'SPECIAL OFFER' )
             ->set_diff_limit(10)
             ->set_type('offer')
             ->set_img( WPT_BASE_URL. 'assets/images/brand/social/web.png')

diff --git a/framework/recommeded.php b/framework/recommeded.php
@@ -49,6 +49,10 @@ public static function check()
             $req_pssg->get_full_this_plugin_name($this_plugin2);
             $req_pssg->set_location('wpt_plugin_recommend_here');
             $req_pssg->run();
+
+            $req_pssg->get_full_this_plugin_name($this_plugin2);
+            $req_pssg->set_location('wpt_sync_plugin_recommendation');
+            $req_pssg->run();
         }
 
         $mmp_req_slug = 'woo-min-max-quantity-step-control-single/wcmmq.php';

diff --git a/inc/handle/checkbox-box.php b/inc/handle/checkbox-box.php
@@ -40,7 +40,7 @@ class='wpt_check_universal wpt_check_universal_header'
             id='wpt_check_uncheck_button_<?php echo esc_attr( $shortcode->table_id ); ?>' type='checkbox'>
             <label for='wpt_check_uncheck_button_<?php echo esc_attr( $shortcode->table_id ); ?>'>
             <?php echo wp_kses_post( $check_uncheck_text ) ?>
-            </lable>
+            </label>
             <?php } ?>
         </span>
             <?php

diff --git a/inc/handle/search-box.php b/inc/handle/search-box.php
@@ -92,6 +92,16 @@ public static function render( Shortcode $shortcode ){
 
         $html .=  apply_filters('end_part_advance_search_box','',$shortcode->table_id);
 
+        ob_start();
+        /**
+         * Used following hook to insert two insert other field
+         * such:
+         * Order By, Order and On sale
+         * 
+         * @author Saiful Islam <[email protected]>
+         */
+        do_action('wpt_search_box_bottom', $shortcode->table_id);
+        $html .= ob_get_clean();
         /**
          * Query by URL
          */

diff --git a/inc/shortcode.php b/inc/shortcode.php
@@ -945,7 +945,7 @@ protected function get_product_loop(){
         // if( ! $this->args_organized ){
 
         // }
-        // var_dump($this->args);
+        // dd($this->args);
         return new \WP_Query( $this->args );
     }
 

diff --git a/includes/functions.php b/includes/functions.php
@@ -63,6 +63,18 @@ function wpt_detect_current_device(){
         return $device;
     }
 }
+if( ! function_exists( 'wpt_extra_variation_title' ) ){
+
+    function wpt_extra_variation_title($product_type, $data){
+        if( $product_type !== 'variation' ) return;
+
+        $attribtues = $data['attributes'] ?? [];
+        if( ! is_array( $attribtues ) ) return;
+        if( count( $attribtues ) <= 2 ) return;
+        $ext = implode(', ', $attribtues);
+        return ! empty( $ext ) ? ' - ' . ucwords( $ext ) : '';
+    }
+}
 
 if( ! function_exists( 'wpt_col_settingwise_device' ) ){
 
@@ -211,13 +223,16 @@ function wpt_product_title_column_add( $_device_name, $column_settings ){
 
         $variation_in_title =  $column_settings['product_title']['variation_in_title'] ?? '';
         $variation_in_title = $variation_in_title == 'on' ? 'checked="checked"' : '';
+        $variation_title_hide =  $column_settings['product_title']['variation_title_hide'] ?? '';
+        $variation_title_hide = $variation_title_hide == 'on' ? 'checked="checked"' : '';
 
         $description_off =  isset( $column_settings['description_off'] ) ? $column_settings['description_off'] : 'on';
         $description_off = $description_off == 'off' ? 'checked="checked"' : '';
        ?>
         <div class="description_off_wrapper">
             <label for="description_off<?php echo esc_attr( $_device_name ); ?>"><input id="description_off<?php echo esc_attr( $_device_name ); ?>" title="Disable Deactivate Description from Title Column" name="column_settings<?php echo esc_attr( $_device_name ); ?>[description_off]" id="description_off" class="description_off" type="checkbox" value="off" <?php echo esc_attr( $description_off ); ?>> <?php echo esc_html__( 'Disable Description', 'woo-product-table' ); ?></label>
-            <label for="variation_in_title<?php echo esc_attr( $_device_name ); ?>"><input id="variation_in_title<?php echo esc_attr( $_device_name ); ?>" title="Show variation names with title" name="column_settings<?php echo esc_attr( $_device_name ); ?>[product_title][variation_in_title]" id="variation_in_title" class="variation_in_title" type="checkbox" <?php echo esc_attr( $variation_in_title ); ?>> <?php echo esc_html__( 'Show Variation Name With Title', 'woo-product-table' ); ?></label>
+            <label for="variation_in_title<?php echo esc_attr( $_device_name ); ?>" style="display:none;"><input id="variation_in_title<?php echo esc_attr( $_device_name ); ?>" title="Show variation names with title" name="column_settings<?php echo esc_attr( $_device_name ); ?>[product_title][variation_in_title]" id="variation_in_title" class="variation_in_title" type="checkbox" <?php echo esc_attr( $variation_in_title ); ?>> <?php echo esc_html__( 'Show Variation Name With Title', 'woo-product-table' ); ?></label>
+            <label for="variation_title_hide<?php echo esc_attr( $_device_name ); ?>" style="color: #607D8B;margin: 0 10px;font-weight: normal;"><input id="variation_title_hide<?php echo esc_attr( $_device_name ); ?>" title="Hide variation names from title" name="column_settings<?php echo esc_attr( $_device_name ); ?>[product_title][variation_title_hide]" id="variation_title_hide" class="variation_title_hide" type="checkbox" <?php echo esc_attr( $variation_title_hide ); ?>> <?php echo esc_html__( 'Hide Variation Name From Title', 'woo-product-table' ); ?></label>
         </div>
         <div class="title_variation">
             <label for="link<?php echo esc_attr( $_device_name ); ?>"><input type="radio" id="link<?php echo esc_attr( $_device_name ); ?>" name="column_settings<?php echo esc_attr( $_device_name ); ?>[title_variation]" value="link" <?php echo !$title_variation || $title_variation == 'link' ? 'checked' : ''; ?>> <?php echo esc_html__( 'Link Enable', 'woo-product-table' ); ?></label>

diff --git a/includes/items/product_title.php b/includes/items/product_title.php
@@ -3,8 +3,10 @@
 
 
 $the_title = $product->get_title();
-if(isset($settings['variation_in_title'])){
+
+if( $product_type == 'variation' && ! isset($settings['variation_title_hide']) ){
     $the_title = get_the_title();
+    $the_title .= wpt_extra_variation_title( $product_type, $data );
 }
 
 $title_variation = isset( $column_settings['title_variation'] ) ? $column_settings['title_variation'] : 'link';

diff --git a/readme.txt b/readme.txt
@@ -1,15 +1,15 @@
 === Product Table for WooCommerce by CodeAstrology (wooproducttable.com) ===
-Contributors: codersaiful,,mdibrahimk48,ultraaddons,unikforce,rafiul17,fazlebari
+Contributors: codersaiful,mdibrahimk48,ultraaddons,unikforce,rafiul17,fazlebari
 Donate link: https://donate.stripe.com/4gw2bB2Pzdjd8mYfYZ
 Tags: wc product table, woo table, woo product table,woocommerce product table, product table
 Requires at least: 4.0.0
-Tested up to: 6.5.0
-Stable tag: 3.4.8
+Tested up to: 6.5.5
+Stable tag: 3.5.0
 Requires PHP: 5.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
-Helps you to display your products in a searchable table layout with filters. Woo Product Table is best for Wholesale.
+Helps you to display your products in a searchable table layout with filters.
 
 == Description ==
 (**Woo Product Table**) Product Table plugin helps you to display your WooCommerce products in a searchable table layout with filters.  Add a table on any page or post via a shortcode. You can create tables as many as you want.
@@ -333,10 +333,17 @@ You can easily show specific category products. While creating new table click o
 
 == Changelog ==
 
+= 3.5.0 =
+* Fixed: Quote Request premium version issue fixed.
+* Fixed: variation title issue fixed.
+* Bug fixed 
+* Code Optimized
+
 = 3.4.9 =
 * Fixed: YITH qutoe request button quantity issue solved.
 * Variation List showing on Shop Page for Variable product issue has been fixed
 * Fixed: last-active-tab issue has been fixed.
+* Fixed: variation default image issue has been fixed.
 * Bug fixed 
 * Code Optimized
 

diff --git a/woo-product-table.php b/woo-product-table.php
@@ -8,11 +8,11 @@
  * Author URI: https://wooproducttable.com/?utm_source=WPT+Plugin+Dashboard&utm_medium=Free+Version
  * Tags: wooproducttable, woocommerce product list,woocommerce product table, wc product table, product grid view, inventory, shop product table
  * 
- * Version: 3.4.9
+ * Version: 3.5.0
  * Requires at least:    4.0.0
- * Tested up to:         6.5.2
+ * Tested up to:         6.5.5
  * WC requires at least: 5.0.0
- * WC tested up to: 	 8.8.3
+ * WC tested up to: 	 9.0.2
  * 
  * 
  * Text Domain: woo-product-table
@@ -34,7 +34,7 @@
 }
 
 if( ! defined( 'WPT_DEV_VERSION' ) ){
-    define( 'WPT_DEV_VERSION', '3.4.8.0' );
+    define( 'WPT_DEV_VERSION', '3.5.0.0' );
 }
 
 if( ! defined( 'WPT_CAPABILITY' ) ){

diff --git a/wpml/admin-area.php b/wpml/admin-area.php
@@ -37,7 +37,7 @@ function wpt_wpml_column_title( $keyword, $_device_name, $current_colum_settings
                     $flag = $active_lang['country_flag_url'];
                 ?>
                 <p class="wpt-each-input">
-                    <lable><img src="<?php echo esc_url( $flag ); ?>" class="wpt-wpml-admin-flag"> <?php echo esc_html( $lang_name ); ?></lable>
+                    <label><img src="<?php echo esc_url( $flag ); ?>" class="wpt-wpml-admin-flag"> <?php echo esc_html( $lang_name ); ?></label>
                     <input 
                     class="wpml-col-title"
                     name="column_settings<?php echo esc_attr( $_device_name ); ?>[<?php echo esc_attr( $keyword ); ?>][<?php echo esc_attr( $code ); ?>]" 
@@ -100,7 +100,7 @@ function wpt_wpml_basic_tab( $meta_basics ){
                     $flag = $active_lang['country_flag_url'];
                 ?>
                 <div class="wpt-each-input">
-                    <lable><img src="<?php echo esc_url( $flag ); ?>" class="wpt-wpml-admin-flag"> <?php echo esc_html( $lang_name ); ?></lable>
+                    <label><img src="<?php echo esc_url( $flag ); ?>" class="wpt-wpml-admin-flag"> <?php echo esc_html( $lang_name ); ?></label>
                 <div class="wpml-inside-fields">
 
                 <?php