Changeset 3095871

Timestamp:

05/31/2024 08:16:07 PM (2 months ago)

Author:

aslamdoctor

Message:

Version 4.3.0

• Added settings to enable/disable override main loop or all loops
• tested with wordpress version 6.5.3
• tested with woocommerce version 8.9.1

Location:

rearrange-woocommerce-products/trunk

Files:

• readme.txt (modified) (8 diffs)
• rearrange-woocommerce-products.php (modified) (9 diffs)
• views/-rearrange-all-products.php (modified) (2 diffs)
• views/template-parts/-header.php (modified) (1 diff)
• views/template-parts/-tab-settings.php (added)

rearrange-woocommerce-products/trunk/readme.txt

@@ -4 +4 @@
 Tags: woocommerce, ecommerce, product, reorder, rearrange, sort, sortbycategory, Woo
 Requires at least: 4.6
-Tested up to: 6.4
-Stable tag: 4.2.0
+Tested up to: 6.
+Stable tag: 4..0
 Requires PHP: 7.4.0
 License: GPLv3 or later License
@@ -60 +60 @@
 2. Products rearranging WILL BE undone after deactivating or deleting the plugin if you are doing sorting on products by categories.
 
+
+
+
+
 == Troubleshooting ==
 
@@ -69 +73 @@
 4. Make sure it is set to “Default sorting (custom ordering + name)”
 
-**If you have huge list of product and the plugin is not saving the sort order changes** 
+**If you have huge list of product and the plugin is not saving the sort order changes**
 
 Then it may be issue with PHP configuration done on your server for `memory_limit` and `max_execution_time`.
@@ -91 +95 @@
 == ChangeLog ==
 
+
+
+
+
+
 = Version 4.2.0 =
 * Make plugin compatible with HPOS ( High-Performance Order Storage )
@@ -102 +111 @@
 
 = Version 4.1.6 =
-* Fix enqueue_assets hook not checking hook name properly when site is using different language. 
+* Fix enqueue_assets hook not checking hook name properly when site is using different language.
 Ref: https://wordpress.org/support/topic/products-are-no-longer-displayed-in-categories/#post-16934448
 
@@ -133 +142 @@
 - Spanish (Colombia)
 - Spanish (Venezuela)
-- Russian 
-- Hindi 
+- Russian
+- Hindi
 - Spanish (Ecuador)
 - Chinese (China)
@@ -189 +198 @@
 
 = Version 3.0.4 =
-* Fixed: While sorting by categories, some products that are added recently were not visible. 
-* Code re-factoring and cleanup. 
+* Fixed: While sorting by categories, some products that are added recently were not visible.
+* Code re-factoring and cleanup.
 
 = Version 3.0.3 =
-* Fixed: Keep default sort order on frontend if it was not updated for Categories. 
+* Fixed: Keep default sort order on frontend if it was not updated for Categories.
 
 = Version 3.0.2 =
-* Fixed: Category orders not showing any products due to meta_query not found. 
+* Fixed: Category orders not showing any products due to meta_query not found.
 
 = Version 3.0.1 =
@@ -270 +279 @@
 = Version 1.1.0 =
 
-* Added capability to handle huge amount of products.     
+* Added capability to handle huge amount of products.
 * Combined multiple sql update queries into one query.
 

rearrange-woocommerce-products/trunk/rearrange-woocommerce-products.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/rearrange-woocommerce-products/
  * Description: a WordPress plugin to Rearrange Woocommerce Products listed on the Shop page
- * Version: 4.2.0
+ * Version: 4..0
  * Author: Aslam Doctor
  * Author URI: https://aslamdoctor.com/
@@ -14 +14 @@
  *
  * WC requires at least: 4.3
- * WC tested up to: 8.2.1
+ * WC tested up to: 8..1
  *
  * License: GNU General Public License v3.0
@@ -54 +54 @@
 
             add_action( 'admin_init', array( $this, 'check_required_plugin' ) );
+
 
             add_action( 'plugins_loaded', array( $this, 'load_textdomain' ) );
@@ -67 +68 @@
             add_action( 'save_post_product', array( $this, 'new_product_added' ), 10, 3 );
             add_action( 'pre_get_posts', array( $this, 'sort_products_by_category' ), 999 );
+
+
+
 
             add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'add_settings_link_under_plugins_page' ) );
@@ -132 +136 @@
             $pagenow = sanitize_text_field( $_REQUEST['page'] );
 
-            if ( 'rwpp-page' !== $pagenow && 'rwpp-sortby-categories-page' !== $pagenow && 'rwpp-troubleshooting-page' !== $pagenow ) {
+            if ( 'rwpp-page' !== $pagenow && 'rwpp-sortby-categories-page' !== $pagenow && 'rwpp-troubleshooting-page' !== $pagenow ) {
                 return;
             }
@@ -151 +155 @@
             );
             wp_enqueue_script( 'rwpp_js' );
+
+
+
+
+
+
+
         }
 
@@ -221 +232 @@
             add_submenu_page(
                 'rwpp-page',
+
+
+
+
+
+
+
+
+
                 __( 'Troubleshooting', 'rearrange-woocommerce-products' ),
                 __( 'Troubleshooting', 'rearrange-woocommerce-products' ),
@@ -349 +369 @@
 
         /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
          * Modify Products loop query to sort by categories
          *
@@ -358 +418 @@
             }
 
-            if ( is_tax( 'product_cat' ) && $query->is_main_query() && ! is_admin() ) {
+            if ( get_option( 'rwpp_effected_loops' ) ) {
+                $checker = is_tax( 'product_cat' ) && ! is_admin();
+            } else {
+                $checker = is_tax( 'product_cat' ) && $query->is_main_query() && ! is_admin();
+            }
+
+            if ( $checker ) {
                 $term    = get_queried_object();
                 $term_id = $term->term_id;

rearrange-woocommerce-products/trunk/views/-rearrange-all-products.php

@@ -12 +12 @@
 <?php require 'template-parts/-header.php'; ?>
 
-<?php if ( ! ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-troubleshooting-page' === $_GET['page'] ) ) : // phpcs:ignore WordPress.Security.NonceVerification; ?>
+<?php if ( ! ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) &&  ) ) : // phpcs:ignore WordPress.Security.NonceVerification; ?>
 <div class="notice notice-warning inline top-notice">
     <ul>
         <li><strong><?php esc_html_e( 'Important Notes', 'rearrange-woocommerce-products' ); ?></strong></li>
         <li>- <?php esc_html_e( 'Use "single click" to select multiple products and drag them.', 'rearrange-woocommerce-products' ); // phpcs:ignore ?></li>
-        <?php if ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-sortby-categories-page' === $_GET['page'] ) {  // phpcs:ignore WordPress.Security.NonceVerification ?>
+        <?php
+        if ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-sortby-categories-page' === $_GET['page'] ) {  // phpcs:ignore WordPress.Security.NonceVerification
+            ?>
             <li>- <?php esc_html_e( 'Products arranged below', 'rearrange-woocommerce-products' );?> <strong><?php esc_html_e('will be reset', 'rearrange-woocommerce-products' );?></strong> <?php esc_html_e('after deactivating or deleting the plugin.', 'rearrange-woocommerce-products' ); // phpcs:ignore ?></li>
             <?php
         } else {
-            ;
             ?>
             <li>- <?php esc_html_e( 'Products arranged below', 'rearrange-woocommerce-products' );?> <strong><?php esc_html_e('can not be undone');?></strong> <?php esc_html_e('after deactivating or deleting the plugin.', 'rearrange-woocommerce-products' ); // phpcs:ignore ?></li>
-        <?php } ?>
+            <?php
+        }
+        ?>
     </ul>
 </div>
@@ -31 +34 @@
 <input type="hidden" name="rwpp_current_page_url" id="rwpp_current_page_url" value="<?php echo isset( $_SERVER['REQUEST_URI'] ) ? esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized ?>">
 
-    <?php
-    if ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-sortby-categories-page' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification
-        include 'template-parts/-tab-category-products.php';
-        if ( isset( $_GET['term_id'] ) && ! empty( $_GET['term_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-            include 'template-parts/-tab-all-products.php';
-        }
-    } elseif ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-troubleshooting-page' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification
-        include 'template-parts/-tab-troubleshooting.php';
-    } else {
+<?php
+if ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-sortby-categories-page' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification
+    include 'template-parts/-tab-category-products.php';
+    if ( isset( $_GET['term_id'] ) && ! empty( $_GET['term_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
         include 'template-parts/-tab-all-products.php';
     }
-    ?>
+} elseif ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-troubleshooting-page' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification
+    include 'template-parts/-tab-troubleshooting.php';
+} elseif ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-settings-page' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification
+    include 'template-parts/-tab-settings.php';
+} else {
+    include 'template-parts/-tab-all-products.php';
+}
+?>
 
-    <?php require 'template-parts/-footer.php'; ?>
+<?php require 'template-parts/-footer.php'; ?>

rearrange-woocommerce-products/trunk/views/template-parts/-header.php

@@ -18 +18 @@
 
         <a href="<?php echo esc_attr( admin_url( 'admin.php?page=rwpp-sortby-categories-page' ) ); ?>" class="nav-tab <?php echo ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-sortby-categories-page' === $_GET['page'] ) ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Sort by Categories', 'rearrange-woocommerce-products' ); ?></a>
-        
+
+        <a href="<?php echo esc_attr( admin_url( 'admin.php?page=rwpp-settings-page' ) ); ?>" class="nav-tab <?php echo ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-settings-page' === $_GET['page'] ) ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Settings', 'rearrange-woocommerce-products' ); ?></a>
+
         <a href="<?php echo esc_attr( admin_url( 'admin.php?page=rwpp-troubleshooting-page' ) ); ?>" class="nav-tab <?php echo ( isset( $_GET['page'] ) && ! empty( $_GET['page'] ) && 'rwpp-troubleshooting-page' === $_GET['page'] ) ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Troubleshooting', 'rearrange-woocommerce-products' ); ?></a>
-        
+
         <a href="https://github.com/sponsors/aslamdoctor" target="_blank" class="nav-tab"><img src="<?php echo plugin_dir_url( __DIR__ ) . '../img/icon-tea.png'; ?>." alt=""><?php esc_html_e( 'Sponsor me', 'rearrange-woocommerce-products' ); ?></a>
     </h2>