Changeset 3492415

Timestamp:

03/27/2026 07:48:29 AM (30 hours ago)

Author:

addonsorg

Message:

Release new version

Location:

yeediscounts

Files:

• tags/1.0.6 (added)
• tags/1.0.6/assets (added)
• tags/1.0.6/assets/admin-rules.css (added)
• tags/1.0.6/assets/admin-rules.js (added)
• tags/1.0.6/assets/chart.js (added)
• tags/1.0.6/assets/chart.min.js (added)
• tags/1.0.6/assets/frontend.css (added)
• tags/1.0.6/assets/frontend.js (added)
• tags/1.0.6/assets/reports.js (added)
• tags/1.0.6/backend (added)
• tags/1.0.6/backend/blocks (added)
• tags/1.0.6/backend/blocks/bogo.php (added)
• tags/1.0.6/backend/blocks/bulk.php (added)
• tags/1.0.6/backend/blocks/bxgy.php (added)
• tags/1.0.6/backend/blocks/discount-bar.php (added)
• tags/1.0.6/backend/blocks/discount.php (added)
• tags/1.0.6/backend/blocks/filter.php (added)
• tags/1.0.6/backend/blocks/general.php (added)
• tags/1.0.6/backend/blocks/rules.php (added)
• tags/1.0.6/backend/blocks/set.php (added)
• tags/1.0.6/backend/import_export.php (added)
• tags/1.0.6/backend/order_tracker.php (added)
• tags/1.0.6/backend/orders.php (added)
• tags/1.0.6/backend/reports.php (added)
• tags/1.0.6/backend/rules.php (added)
• tags/1.0.6/backend/settings.php (added)
• tags/1.0.6/backend/table.php (added)
• tags/1.0.6/frontend (added)
• tags/1.0.6/frontend/bulk_discounts.php (added)
• tags/1.0.6/frontend/bulk_table.php (added)
• tags/1.0.6/frontend/buy_x_get_x.php (added)
• tags/1.0.6/frontend/buy_x_get_y.php (added)
• tags/1.0.6/frontend/bxgy_table.php (added)
• tags/1.0.6/frontend/cart_discount.php (added)
• tags/1.0.6/frontend/discount_bar.php (added)
• tags/1.0.6/frontend/discounts.php (added)
• tags/1.0.6/frontend/filter.php (added)
• tags/1.0.6/frontend/free_shipping.php (added)
• tags/1.0.6/frontend/price_display.php (added)
• tags/1.0.6/frontend/sale_badge.php (added)
• tags/1.0.6/frontend/set_discounts.php (added)
• tags/1.0.6/frontend/set_table.php (added)
• tags/1.0.6/frontend/simple_discount.php (added)
• tags/1.0.6/readme.txt (added)
• tags/1.0.6/yeediscounts.php (added)
• trunk/assets/admin-rules.js (modified) (2 diffs)
• trunk/backend/blocks/general.php (modified) (1 diff)
• trunk/frontend/bulk_table.php (modified) (12 diffs)
• trunk/frontend/discount_bar.php (modified) (1 diff)
• trunk/readme.txt (modified) (1 diff)
• trunk/yeediscounts.php (modified) (2 diffs)

yeediscounts/trunk/assets/admin-rules.js

@@ -458 +458 @@
             const $bxgyBlock = $('.yeekit-buyx-gety-block');
             const $titleRow = $('.yeekit-discount-title-row');
+            const $rulesBlock = $('#yeekit-dd-conditions-wrap').closest('.yeekit-dd-block');
+            const $discountBarBlock = $('.yeekit-discount-bar-block');
 
             // Reset Blocks
             $filterBlock.show();
+            $rulesBlock.show();
+            $discountBarBlock.show();
 
             $discountBlock.hide();
@@ -475 +479 @@
             }
 
-            if (type === 'yeekit_simple_discount' || type === 'yeekit_cart_discount' || type === 'not_selected' || !type) {
+            // If no type is selected, hide everything else
+            if (!type || type === 'not_selected') {
+                $filterBlock.hide();
+                $rulesBlock.hide();
+                $discountBarBlock.hide();
+                $discountBlock.hide();
+                return;
+            }
+
+            if (type === 'yeekit_simple_discount' || type === 'yeekit_cart_discount') {
                 $discountBlock.show();
                 // Show title ONLY for cart discount

yeediscounts/trunk/backend/blocks/general.php

@@ -59 +59 @@
                         <select name="rule[type]"
                             class="yeekit-product-discount-type yeekit-discount-type-selector">
-                            <option value="not_selected"><?php esc_html_e('Select Discount Type', 'yeediscounts'); ?></option>
+                            <option value=""><?php esc_html_e('Select Discount Type', 'yeediscounts'); ?></option>
                             <optgroup label="<?php esc_attr_e('Simple Discount', 'yeediscounts'); ?>">
                                 <option value="yeekit_simple_discount" <?php selected($rule['type'] ?? '', 'yeekit_simple_discount'); ?>><?php esc_html_e('Product Adjustment', 'yeediscounts'); ?></option>

yeediscounts/trunk/frontend/bulk_table.php

@@ -33 +33 @@
         $rules = Yeekit_Dynamic_Discounts_Rules_Manager::get_active_rules();
         foreach ($rules as $rule) {
-            if (empty($rule['type']) || $rule['type'] !== 'yeekit_buy_x_get_x') {
+            $type = $rule['type'] ?? '';
+            $supported_types = [
+                'yeekit_buy_x_get_x',
+                'yeekit_buy_x_get_y',
+                'yeekit_bulk_discount',
+                'yeekit_set_discount'
+            ];
+            if (! in_array($type, $supported_types, true)) {
                 continue;
             }
@@ -43 +50 @@
                 'quantity' => 1
             ];
+
             if (Yeekit_Dynamic_Discounts_Filter::validate_item($cart_item, $rule)) {
                 $matched_rule = $rule;
@@ -52 +60 @@
         }
         $tiers = [];
-        $is_bogo = ($matched_rule['type'] === 'yeekit_buy_x_get_x');
-        if ($is_bogo) {
-            $ranges = $matched_rule['buyx_getx_adjustments']['ranges'] ?? [];;
+        $rule_type = $matched_rule['type'] ?? '';
+        $is_bogo = ($rule_type === 'yeekit_buy_x_get_x');
+        $is_bxgy = ($rule_type === 'yeekit_buy_x_get_y');
+        $is_set = ($rule_type === 'yeekit_set_discount');
+
+        if ($is_bogo || $is_bxgy || $is_set) {
+            if ($is_bogo) {
+                $ranges = $matched_rule['buyx_getx_adjustments']['ranges'] ?? [];
+            } elseif ($is_bxgy) {
+                $ranges = $matched_rule['buyx_gety_adjustments']['ranges'] ?? [];
+            } else {
+                $ranges = $matched_rule['set_adjustments']['ranges'] ?? [];
+            }
             // Handle Recursive: Generate purely synthetic rows for display if recursive
-            // Assuming first valid range dictates the rule for simplicity?
-            // Or merge all? BOGO usually processes sequential ranges. 
-            // If recursive is set on a range, we expand it.
             foreach ($ranges as $r) {
                 if (!empty($r['is_recursive'])) {
                     // Generate 5 steps
-                    $step_min = intval($r['min_qty']);
-                    $step_get = intval($r['free_qty']);
+                    $step_min = intval($r['min_qty'] ?? ($r['qty'] ?? 1));
+                    $step_get = intval($r['free_qty'] ?? ($r['get_qty'] ?? 1));
                     if ($step_min <= 0) $step_min = 1;
                     for ($i = 1; $i <= 5; $i++) {
@@ -71 +86 @@
                             'min_qty' => $qty_buy,
                             'max_qty' => '', // Point value
-                            'type' => $r['free_type'] ?? 'free_product',
-                            'value' => $r['amount'] ?? 0,
+                            'type' => $r['free_type'] ?? ($r['discount_type'] ?? ($r['type'] ?? 'percentage')),
+                            'value' => $r['amount'] ?? ($r['discount_value'] ?? ($r['value'] ?? 0)),
                             'get_qty' => $qty_get,
                             'label' => __('Tier', 'yeediscounts') . ' ' . $i,
-                            'is_generated' => true
+                            'is_generated' => true,
+                            'get_product' => $r['get_product'] ?? []
                         ];
                     }
-                    // Recursive implies we stop processing other ranges usually?
-                    // Let's break to avoid table flooding if multiple recursive ranges exist (rare)
                     break;
                 } else {
                     // Normal Range
                     $tiers[] = [
-                        'min_qty' => $r['min_qty'],
-                        'max_qty' => $r['max_qty'],
-                        'type' => $r['free_type'] ?? 'free_product',
-                        'value' => $r['amount'] ?? 0,
-                        'get_qty' => $r['free_qty'] ?? 0,
-                        'label' => ''
+                        'min_qty' => $r['min_qty'] ?? ($r['qty'] ?? 1),
+                        'max_qty' => $r['max_qty'] ?? '',
+                        'type' => $r['free_type'] ?? ($r['discount_type'] ?? ($r['type'] ?? 'percentage')),
+                        'value' => $r['amount'] ?? ($r['discount_value'] ?? ($r['value'] ?? 0)),
+                        'get_qty' => $r['free_qty'] ?? ($r['get_qty'] ?? 0),
+                        'label' => $r['label'] ?? '',
+                        'get_product' => $r['get_product'] ?? []
                     ];
                 }
@@ -104 +119 @@
         });
         $product_price = floatval($product->get_price());
+
+        // Determine table title and headers
+        $table_title = $matched_rule['title'] ?? '';
+        if (empty($table_title)) {
+            if ($is_bogo) $table_title = __('Buy X Get X', 'yeediscounts');
+            elseif ($is_bxgy) $table_title = __('Buy X Get Y', 'yeediscounts');
+            elseif ($is_set) $table_title = __('Bundle Discount', 'yeediscounts');
+            else $table_title = __('Bulk Discount', 'yeediscounts');
+        }
+
+        $range_header = __('Range', 'yeediscounts');
+        if ($is_bogo || $is_bxgy) $range_header = __('Buy Quantity', 'yeediscounts');
+        elseif ($is_set) $range_header = __('Set Quantity', 'yeediscounts');
+
+        $benefit_header = __('Discount', 'yeediscounts');
+        if ($is_bogo || $is_bxgy) $benefit_header = __('Get Benefit', 'yeediscounts');
 ?>
         <div class="yeekit-bulk-table-wrapper">
-            <h3><?php echo esc_html($is_bogo) ? esc_html__('Buy X Get X', 'yeediscounts') : esc_html__('Bulk Discount', 'yeediscounts'); ?></h3>
+            <h3><?php echo esc_html($table_title); ?></h3>
             <table id="yeekit-bulk-table" class="yeekit-bulk-table-msg yeekit-table">
                 <thead class="yeekit-bulk-table-thead">
@@ -114 +145 @@
                         </th>
                         <th id="yeekit-bulk-table-range" class="yeekit-bulk-table-td">
-                            <span><?php echo esc_html($is_bogo) ? esc_html__('Buy Quantity', 'yeediscounts') : esc_html__('Range', 'yeediscounts'); ?></span>
+                            <span><?php echo esc_html($range_header); ?></span>
                         </th>
                         <th id="yeekit-bulk-table-discount" class="yeekit-bulk-table-td">
-                            <span><?php echo esc_html($is_bogo) ? esc_html__('Get Benefit', 'yeediscounts') : esc_html__('Discount', 'yeediscounts'); ?></span>
+                            <span><?php echo esc_html($benefit_header); ?></span>
                         </th>
                     </tr>
@@ -126 +157 @@
                         $max = $tier['max_qty'];
                         // Range display
-                        if ($is_bogo && !empty($tier['is_generated'])) {
+                        if (($is_bogo || $is_bxgy || $is_set) && !empty($tier['is_generated'])) {
                             $range = $min; // Point value for recursive steps
                         } else {
@@ -142 +173 @@
                         $discount_display_text = '';
                         $discounted_price_text = '';
-                        if ($is_bogo) {
-                            // BOGO Info
+                        $reward_desc = '';
+
+                        if ($is_bogo || $is_bxgy) {
+                            // BOGO / BXGY Info
                             if ($type === 'free_product') {
                                 /* translators: %s: Quantity */
@@ -150 +183 @@
                                 /* translators: 1: Quantity, 2: Percentage value */
                                 $discount_display_text = sprintf(__('Get %1$s at %2$s%% Off', 'yeediscounts'), $get_qty, $value);
-                            } elseif ($type === 'fixed_price') {
+                            } elseif ($type === 'fixed_price' || $type === 'fixed_set_price') {
                                 /* translators: 1: Quantity, 2: Price amount */
                                 $discount_display_text = sprintf(__('Get %1$s at %2$s', 'yeediscounts'), $get_qty, wc_price($value));
@@ -156 +189 @@
                                 /* translators: %s: Quantity */
                                 $discount_display_text = sprintf(__('Get %s (Discount)', 'yeediscounts'), $get_qty);
+                            }
+
+                            // BXGY Reward Description (Product/Category names)
+                            if ($is_bxgy) {
+                                $bxgy_adj_type = $matched_rule['buyx_gety_adjustments']['type'] ?? 'bxgy_product';
+                                $items_list = [];
+                                if ($bxgy_adj_type === 'bxgy_all') {
+                                    $items_list[] = __('Any Product', 'yeediscounts');
+                                } elseif ($bxgy_adj_type === 'bxgy_category') {
+                                    $cat_ids = $tier['get_product'] ?? [];
+                                    foreach ((array)$cat_ids as $cid) {
+                                        $term = get_term($cid, 'product_cat');
+                                        if ($term && !is_wp_error($term)) {
+                                            $items_list[] = esc_html($term->name);
+                                        }
+                                    }
+                                } else {
+                                    $p_ids = $tier['get_product'] ?? [];
+                                    if (count((array)$p_ids) > 3) {
+                                        $items_list[] = __('Selected Products', 'yeediscounts');
+                                    } else {
+                                        foreach ((array)$p_ids as $pid) {
+                                            $p = wc_get_product($pid);
+                                            if ($p) {
+                                                $items_list[] = esc_html($p->get_name());
+                                            }
+                                        }
+                                    }
+                                }
+                                if (!empty($items_list)) {
+                                    $reward_desc = '(' . implode(', ', $items_list) . ')';
+                                }
+                            }
+                        } elseif ($is_set) {
+                            // Set Discount Info
+                            if ($type === 'fixed_set_price') {
+                                $discount_display_text = sprintf(__('Set Price: %s', 'yeediscounts'), wc_price($value));
+                            } elseif ($type === 'percentage') {
+                                $discount_display_text = $value . '% ' . __('Off', 'yeediscounts');
+                            } else {
+                                $discount_display_text = wc_price($value) . ' ' . __('Off', 'yeediscounts');
                             }
                         } else {
@@ -163 +237 @@
                                 $discount_display_text = $value . '%';
                                 $discounted_price = $product_price * (1 - ($value / 100));
-                            } elseif ($type === 'fixed') {
+                            } elseif ($type === 'fixed' || $type === 'flat') {
                                 $discount_display_text = wc_price($value);
                                 $discounted_price = max(0, $product_price - $value);
@@ -185 +259 @@
                             <td class="yeekit-bulk-table-td yeekit-bulk-table-discount col_index_3" data-colindex="3">
                                 <span class="yeekit-table-discounted-value"><?php echo wp_kses_post($discount_display_text); ?></span>
-                                <?php if (!$is_bogo && $discounted_price_text): ?>
+                                <?php if ($reward_desc): ?>
+                                    <div class="yeekit-table-reward-desc" style="font-size: 0.85em; opacity: 0.8;"><?php echo esc_html($reward_desc); ?></div>
+                                <?php endif; ?>
+                                <?php if (!$is_bogo && !$is_bxgy && !$is_set && $discounted_price_text): ?>
                                     <span class="yeekit-table-discounted-price" style="display: none"><?php echo wp_kses_post($discounted_price_text); ?></span>
                                 <?php endif; ?>

yeediscounts/trunk/frontend/discount_bar.php

@@ -139 +139 @@
 
                 printf(
-                    '<div class="yeekit-discount-bar %4$s" style="--yk-bar-bg: %1$s; --yk-bar-text: %2$s;">
+                    '<div class="yeekit-discount-bar" style="--yk-bar-bg: %1$s; --yk-bar-text: %2$s;">
                         <span class="yeekit-bar-message">%3$s</span>
                     </div>',

yeediscounts/trunk/readme.txt

@@ -3 +3 @@
 Tags: woocommerce, dynamic pricing, discounts, bulk discount
 Tested up to: 6.9
-Stable tag: 1.0.5
+Stable tag: 1.0.6
 WC requires at least: 4.0
 WC tested up to: 10.5

yeediscounts/trunk/yeediscounts.php

@@ -5 +5 @@
  * Requires Plugins: woocommerce
  * Description: Easily create and manage dynamic pricing and discount rules for your WooCommerce store.
- * Version: 1.0.5
+ * Version: 1.0.6
  * Author: add-ons.org
  * Author URI: https://add-ons.org
@@ -31 +31 @@
         include YEEKIT_DYNAMIC_DISCOUNTS_WOOCOMMERCE_PATH . "frontend/discount_bar.php";
         include YEEKIT_DYNAMIC_DISCOUNTS_WOOCOMMERCE_PATH . "frontend/bulk_table.php";
-        include YEEKIT_DYNAMIC_DISCOUNTS_WOOCOMMERCE_PATH . "frontend/set_table.php";
-        include YEEKIT_DYNAMIC_DISCOUNTS_WOOCOMMERCE_PATH . "frontend/bxgy_table.php";
+        // include YEEKIT_DYNAMIC_DISCOUNTS_WOOCOMMERCE_PATH . "frontend/set_table.php";
+        // include YEEKIT_DYNAMIC_DISCOUNTS_WOOCOMMERCE_PATH . "frontend/bxgy_table.php";
         include YEEKIT_DYNAMIC_DISCOUNTS_WOOCOMMERCE_PATH . "frontend/sale_badge.php";
         include YEEKIT_DYNAMIC_DISCOUNTS_WOOCOMMERCE_PATH . "frontend/price_display.php";