Changeset 3788777

Timestamp:

11/06/2026 09:53:14 PM (8 hours ago)

Author:

brainiacbusiness

Message:

Rollora 1.0.1: fix stale Active price book line on approval response

Location:

rollora/trunk

Files:

• includes/class-blinds-admin.php (modified) (1 diff)
• includes/class-blinds-import-admin.php (modified) (2 diffs)
• includes/class-blinds-lifecycle.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• rollora.php (modified) (2 diffs)

rollora/trunk/includes/class-blinds-admin.php

@@ -404 +404 @@
             plugin_dir_url(__FILE__) . '../assets/admin.css',
             [],
-            '1.0.0'
+            '1.0.1'
         );
     });

rollora/trunk/includes/class-blinds-import-admin.php

@@ -235 +235 @@
     }
 
-    if ($active !== null) {
-        echo '<h2>Active price book</h2><p>Book #' . esc_html((string) $active['id'] ?? '')
-            . ' — source: ' . esc_html((string) $active['source_filename'] ?? '')
-            . ' — rows: ' . esc_html((string) count($active['rows'] ?? []))
-            . ' — label: ' . esc_html((string) ($active['data_label'] ?? 'SYNTHETIC'))
-            . ' — activated by user ' . esc_html((string) $active['activated_by'] ?? '')
-            . ' at ' . esc_html((string) $active['activated_at'] ?? '') . '</p>';
-    } else {
-        echo '<h2>Active price book</h2><p>None active yet.</p>';
-    }
-
     /* ---- Step (c): approve (handled before rendering the forms) ---- */
     if (!empty($_POST['blinds_price_books_approve'])
@@ -296 +285 @@
     }
 
+    /* ---- Active price book (rendered AFTER the approve/rollback
+     * handlers above, so it names the book that is active now) ----
+     * 1.0.1 fix: this line was previously rendered before the approve
+     * handler ran, so on the approval response it still named the
+     * previous active book while the notice and history table below
+     * already showed the newly activated one. $active is re-fetched
+     * by the handlers above after any activation or rollback. */
+    if ($active !== null) {
+        echo '<h2>Active price book</h2><p>Book #' . esc_html((string) $active['id'] ?? '')
+            . ' — source: ' . esc_html((string) $active['source_filename'] ?? '')
+            . ' — rows: ' . esc_html((string) count($active['rows'] ?? []))
+            . ' — label: ' . esc_html((string) ($active['data_label'] ?? 'SYNTHETIC'))
+            . ' — activated by user ' . esc_html((string) $active['activated_by'] ?? '')
+            . ' at ' . esc_html((string) $active['activated_at'] ?? '') . '</p>';
+    } else {
+        echo '<h2>Active price book</h2><p>None active yet.</p>';
+    }
+
     /* ---- Step (a): upload ---- */
     echo '<h2>Step 1 — Upload CSV</h2>';

rollora/trunk/includes/class-blinds-lifecycle.php

@@ -16 +16 @@
  * defaults ONLY if no valid stored config exists — an existing admin
  * config is never overwritten. It also records wp_option
- * 'blinds_plugin_version' = '1.0.0'.
+ * 'blinds_plugin_version' = '1.0.1'.
  *
  * Deactivation deletes nothing and removes no options, so a temporary
@@ -65 +65 @@
         }
     }
-    update_option('blinds_plugin_version', '1.0.0');
+    update_option('blinds_plugin_version', '1.0.1');
 }
 

rollora/trunk/readme.txt

@@ -7 +7 @@
 WC requires at least: 11.2
 WC tested up to: 11.2
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -27 +27 @@
 == Installation ==
 
-1. Install the plugin ZIP via WordPress Admin > Plugins > Add New > Upload Plugin, then activate it. Activation seeds the supplier configuration from the synthetic defaults and records plugin version 1.0.0. It never overwrites an existing admin configuration.
+1. Install the plugin ZIP via WordPress Admin > Plugins > Add New > Upload Plugin, then activate it. Activation seeds the supplier configuration from the synthetic defaults and records plugin version 1.0.1. It never overwrites an existing admin configuration.
 2. Create a simple WooCommerce product for a roller blind and note its ID.
 3. Add `[blinds_roller_configurator product_id="123"]` to a page, replacing 123 with your product ID.
@@ -106 +106 @@
 == Screenshots ==
 
-1. The customer configurator: width, drop, fit, fabric, control side, bracket, and options, with the price calculated server-side.
-2. Supplier Settings: deductions, size limits, roll widths, fabrics, and options, with the synthetic defaults clearly labelled.
-3. Price Books: controlled CSV import with preview, approval, and a history table with one-click rollback to a superseded book.
+Screenshots are to be captured at submission time from a working installation. None exist yet, and none are claimed here. Intended screenshots:
+
+1. Customer configurator: width, drop, fit, fabric, and options on a product page.
+2. Cart and checkout showing the server-calculated blind price and a per-order fee shown separately.
+3. Supplier Settings admin screen with deductions, size limits, and roll widths.
+4. Price Books screen: CSV preview with staged rows, row-level errors, and diff against the active book.
+5. Workshop production sheet generated from a saved order snapshot.
+6. Price-book history and rollback view.
 
 == Changelog ==
+
+= 1.0.1 — 2026-11-06 =
+
+* Fixed: the "Active price book" line on the Price Books admin page showed the previously active book on the approval response after activating a new price book, while the success notice and the history table already showed the newly activated book. The line is now rendered after the approve/rollback handlers run, so it always names the book that is active now. No pricing, measurement, activation, or other behaviour changed.
 
 = 1.0.0 — 2026-11-02 =

rollora/trunk/rollora.php

@@ -3 +3 @@
  * Plugin Name:       Rollora – Made-to-Measure Roller Blinds
  * Description:       Roller blinds only. Configurator, server-side matrix/band/per-m2 pricing, controlled CSV price-book import, immutable order snapshots, and workshop production sheets. Engine prices are tax-exclusive; WooCommerce calculates applicable taxes. Default data is SYNTHETIC until an admin replaces it with real supplier rules.
- * Version:           1.0.0
+ * Version:           1.0.1
  * Requires at least: 7.1
  * Requires PHP:      8.3
@@ -37 +37 @@
 /** Enqueue the responsive configurator/workshop stylesheet on the frontend. */
 add_action('wp_enqueue_scripts', function () {
-    wp_enqueue_style('blinds-configurator', BLINDS_PROTO_URL . 'assets/configurator.css', [], '1.0.0');
+    wp_enqueue_style('blinds-configurator', BLINDS_PROTO_URL . 'assets/configurator.css', [], '1.0.1');
 });