Changeset 2803642

Timestamp:

10/24/2022 09:15:06 PM (3 years ago)

Author:

olivierwpt

Message:

Version 1.2 - Update (CSS, code, bug,...)

Location:

obselling/trunk

Files:

• admin/admin.php (modified) (1 diff)
• admin/css/admin.css (modified) (2 diffs)
• includes/functions.php (modified) (2 diffs)
• includes/views/html-product-page-recommended-products-block.php (modified) (3 diffs)
• obselling.php (modified) (4 diffs)
• readme.txt (modified) (3 diffs)

obselling/trunk/admin/admin.php

@@ -8 +8 @@
 function obselling_admin_enqueue_scripts( $hook_suffix ) {
 
-    $admin_pages = array('post.php', 'edit.php', 'settings_page_obselling-pro');
+    $admin_pages = array('post.php', 'edit.php', 'woocommerce_page_obselling-pro');
 
     if( ! in_array( $hook_suffix, $admin_pages) ){

obselling/trunk/admin/css/admin.css

@@ -203 +203 @@
     color: #555;
     position: relative;
-    background-color: #eee;
-}
-
-table.wp-list-table mark.obsolete {
-    font-weight: 700;
-    background: transparent none;
-    line-height: 1;
-    color: #a44;
+    background-color: #eee
+}
+
+.wp-list-table .obsolete {
+    background-color: FireBrick;
+    padding: 2px 4px;
+    color: white;
+    font-weight: 600;
+    border-radius: 4px;
 }
 
@@ -218 +219 @@
     color: white;
     margin: 10px;
-    border-radius: 10px;
-    display: block;
-    font-size: 1.5rem;
-    line-height: 4rem;
+    border-radius: 4px;
+    display: block;
+    width: 50%;
+    font-size: 1.3rem;
+    line-height: 3rem;
     text-align: center;
     text-decoration: none;

obselling/trunk/includes/functions.php

@@ -13 +13 @@
 function obselling_product_is_visible( $is_visible, $product_id ){
     $product = wc_get_product($product_id);
+
     if ( obselling_is_product_obsolete( $product ) ) {
-        $is_visible = true;
+        $is_visible = apply_filters( 'obselling_product_is_visible', true );
     }
 
@@ -42 +43 @@
 function obselling_before_single_product_summary(){
   global $product;
-
   $recommended_ids = $product->get_meta( 'recommended_ids', true );
   if( obselling_is_product_obsolete( $product ) && !empty($recommended_ids) && count($recommended_ids) ) {

obselling/trunk/includes/views/html-product-page-recommended-products-block.php

@@ -5 +5 @@
 global $post;
 
-$params = array(
-    'post_type' => 'product',
-    'post__in' => $product->get_meta( 'recommended_ids', true ),
+$product_orig = $product;
+$args = array(
+    'include' =>  $product->get_meta( 'recommended_ids', true ),
 );
-$query = new WP_Query( $params );
+$products = wc_get_products( $args );
+$products  = apply_filters( 'obselling_recommended_products_orderby', wc_products_array_orderby( $products, 'shuffle', ) );
 // not sure why but 'loop' is at '1' after loading the page.
 // so we have to set it to 'O' so wc_product_class can work properly.
@@ -16 +17 @@
 ?>
 <div class="obselling-product-page">
-  <div class="obselling-product-alert"><?php _e( "This product is no longer available. We recommend this selection:", 'obselling' )?></div>
+  <div class="obselling-product-alert"><?php echo apply_filters( 'obselling_recommended_products_text', __( "This product is no longer available. We recommend this selection:", 'obselling' ) ) ?></div>
   <ul class="products columns-<?php esc_attr_e( wc_get_loop_prop( 'columns' ) )?>">
-  <?php while( $query->have_posts() ): $query->the_post(); ?>
+  <?php foreach( $products as $product ):?>
           <li <?php wc_product_class('recommended_product') ?> >
               <?php
               woocommerce_template_loop_product_link_open();
               woocommerce_template_loop_product_thumbnail();
-              woocommerce_template_loop_product_title(); //! prends le titre de la page et non de $product
+              // we can"t use woocommerce_template_loop_product_title() because it uses the title of the page
+              // copied from include/wc-template-functions.php
+              echo '<h2 class="' . esc_attr( apply_filters( 'woocommerce_product_loop_title_classes', 'woocommerce-loop-product__title' ) ) . '">' . get_the_title( $product->get_id() ) . '</h2>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
               woocommerce_template_loop_rating();
 
-              $product_type = WC_Product_Factory::get_product_type( $post->ID );
-                $classname    = WC_Product_Factory::get_product_classname( $post->ID, $product_type ? $product_type : 'simple' );
-                $product      = new $classname( $post->ID );
               if( !obselling_is_product_obsolete( $product ) ){
                 woocommerce_template_loop_price();
@@ -38 +38 @@
           </li>
   <?php
-    endwhile;
-    wp_reset_query();
+  endforeach;
+  wp_reset_query();
+  $product = $product_orig;
    ?>
   </ul>

obselling/trunk/obselling.php

@@ -4 +4 @@
  * Plugin URI: https://obselling.com/
  * Description: Sell other products of an obsolete product or out of stock.
- * Version: 1.0.1
+ * Version: 1.2
  * Author: Korteex
  * Author URI: https://korteex.fr/
@@ -16 +16 @@
 defined( 'ABSPATH' ) || exit;
 
-define( 'OBSELLING_VERSION', '1.0.1' );
+define( 'OBSELLING_VERSION', '1.2' );
 
 define( 'OBSELLING_PLUGIN', __FILE__ );
@@ -90 +90 @@
 
 function obselling_enqueue_scripts() {
-    wp_enqueue_style( 'OBSELLING',
+    wp_enqueue_style( 'obselling',
         plugins_url( 'includes/css/style.css', OBSELLING_PLUGIN_BASENAME ),
         array(), OBSELLING_VERSION, 'all'
@@ -97 +97 @@
     // right-to-left styling
     if ( is_rtl() ) {
-        wp_enqueue_style( 'OBSELLING-rtl',
+        wp_enqueue_style( 'obselling-rtl',
             plugins_url( 'includes/css/style-rtl.css', OBSELLING_PLUGIN_BASENAME ),
             array(), OBSELLING_VERSION, 'all'

obselling/trunk/readme.txt

@@ -6 +6 @@
 Plugin URI: https://obselling.com/
 Requires at least: 4.7+
-Tested up to: 6.0.1
+Tested up to: 6.0.3
 Requires PHP: 7.0
-Stable tag: 1.0.1
+Stable tag: 1.2
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -54 +54 @@
 * Number of recommended products: *4*
 * Add recommended products if the product is *out of stock*
-* Shortcode (Divi, Elementor,…) (coming soon)
-* Product display order (Name / Price) (coming soon)
-* Message customization (coming soon)
-* Redirection 301 (coming soon)
-* Hide: In Lists / Views (coming soon)
+* Shortcode (Divi, Elementor,…)
+* Product display order (Name / Price)
+* Message customization
+* Hide: In Lists / Views
 
 Get PRO version: [Obselling EN](https://obselling.com/) | [Obselling FR](https://obselling.fr/)
@@ -108 +107 @@
 == Changelogs ==
 
-= 1.0.1 - 2022-07-26 =
+= 1.2 - 2022-10-24 =
+* Design CSS
+* Bug
+* Improvement: Code
+* Updated: Translate
+
+= 1.1 - 2022-07-26 =
+* Add recommended products if the product is *out of stock*
 * Improvement: Code
 * Updated: Translate